From fae40e0bdfb32b9f024e5fa2c8d51bf2e6016e7e Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 19 Feb 2012 19:58:34 -0500
Subject: [PATCH 001/199] Fix to "Replace all NotifyCautionBoxColor's and
 AlertCautionBoxColor's that were using tan with
 black"(0fef1407e3477a35041eb5111af4bb4a0cd913c3), to only apply to skins
 where the tan background was too similar to the font color.

Also, for skins now using this black background, adjust foreground color to show up and match the skin, in cases where it was black.
---
 indra/newview/skins/Pony-Aquablue/colors_base.xml | 4 ++--
 indra/newview/skins/Pony-Purple/colors_base.xml   | 4 ++--
 indra/newview/skins/dark/colors_base.xml          | 2 +-
 indra/newview/skins/darkgred/colors_base.xml      | 4 ++--
 indra/newview/skins/emerald/colors_base.xml       | 2 +-
 indra/newview/skins/gemini/colors_base.xml        | 4 ++--
 indra/newview/skins/gred/colors_base.xml          | 4 ++--
 indra/newview/skins/kdarknv/colors.xml            | 4 ++--
 indra/newview/skins/kdarknv/colors_base.xml       | 4 ++--
 indra/newview/skins/kliteat/colors_base.xml       | 4 ++--
 indra/newview/skins/openlife/colors.xml           | 4 ++--
 indra/newview/skins/openlife/colors_base.xml      | 4 ++--
 indra/newview/skins/pslgreen/colors_base.xml      | 2 +-
 indra/newview/skins/pslpurple/colors_base.xml     | 2 +-
 indra/newview/skins/ruby/colors_base.xml          | 4 ++--
 indra/newview/skins/sapphire/colors_base.xml      | 2 +-
 indra/newview/skins/silver/colors_base.xml        | 4 ++--
 indra/newview/skins/wisdom/colors_base.xml        | 4 ++--
 18 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/indra/newview/skins/Pony-Aquablue/colors_base.xml b/indra/newview/skins/Pony-Aquablue/colors_base.xml
index 9f8689260..b48208f68 100644
--- a/indra/newview/skins/Pony-Aquablue/colors_base.xml
+++ b/indra/newview/skins/Pony-Aquablue/colors_base.xml
@@ -99,7 +99,7 @@
 <!-- NOTIFICATION POP-UPS -->
 <NotifyBoxColor value="70, 170, 255, 255" />
 <NotifyTextColor value="0, 0, 0, 255" />
-<NotifyCautionBoxColor value="0, 0, 0, 255" /> 	<!-- the background color of caution permissions prompts -->
+<NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="70, 170, 255, 255" />
 <GroupNotifyTextColor value="0, 30, 60, 255" />
@@ -195,7 +195,7 @@
 <!-- Alert box colors -->
 <AlertBoxColor value="62, 62, 62, 255" />               <!-- Warnings floaters, like when returning objects -->
 <AlertTextColor value="147, 169, 213, 255" />
-<AlertCautionBoxColor value="0, 0, 0, 255" />	<!-- Background color of caution alerts -->
+<AlertCautionBoxColor value="254, 209, 118, 255" />	<!-- Background color of caution alerts -->
 <AlertCautionTextColor value="0, 0, 0, 255" />		<!-- Foreground color of the special title text in caution alerts -->
 
 <!--  Multi sliders, as in the sky animation setting -->
diff --git a/indra/newview/skins/Pony-Purple/colors_base.xml b/indra/newview/skins/Pony-Purple/colors_base.xml
index b359f55db..8cde4c258 100644
--- a/indra/newview/skins/Pony-Purple/colors_base.xml
+++ b/indra/newview/skins/Pony-Purple/colors_base.xml
@@ -98,7 +98,7 @@
 <!-- NOTIFICATION POP-UPS -->
 <NotifyBoxColor value="255, 174, 70, 255" />
 <NotifyTextColor value="0, 0, 0, 255" />
-<NotifyCautionBoxColor value="0, 0, 0, 255" /> 	<!-- the background color of caution permissions prompts -->
+<NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="255, 179, 70, 255" />
 <GroupNotifyTextColor value="0, 30, 60, 255" />
@@ -195,7 +195,7 @@
 <!-- Alert box colors -->
 <AlertBoxColor value="62, 62, 62, 255" />               <!-- Warnings floaters, like when returning objects -->
 <AlertTextColor value="215, 200, 150, 255" />
-<AlertCautionBoxColor value="0, 0, 0, 255" />	<!-- Background color of caution alerts -->
+<AlertCautionBoxColor value="254, 209, 118, 255" />	<!-- Background color of caution alerts -->
 <AlertCautionTextColor value="0, 0, 0, 255" />		<!-- Foreground color of the special title text in caution alerts -->
 
 <!--  Multi sliders, as in the sky animation setting -->
diff --git a/indra/newview/skins/dark/colors_base.xml b/indra/newview/skins/dark/colors_base.xml
index 2d8802b0f..b8ea90735 100644
--- a/indra/newview/skins/dark/colors_base.xml
+++ b/indra/newview/skins/dark/colors_base.xml
@@ -97,7 +97,7 @@
 <NotifyBoxColor value="66, 66, 66, 255"/>
 <NotifyTextColor value="200, 200, 200, 255"/>
 <NotifyCautionBoxColor value="0, 0, 0, 255"/>		<!-- the background color of caution permissions prompts -->
-<NotifyCautionWarnColor value="0, 0, 0, 255"/>			<!-- the foreground color of the special title text in caution permissions prompts -->
+<NotifyCautionWarnColor value="200, 200, 200, 255"/>			<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="70, 170, 255, 255"/>
 <GroupNotifyTextColor value="0, 0, 0 255" />
 
diff --git a/indra/newview/skins/darkgred/colors_base.xml b/indra/newview/skins/darkgred/colors_base.xml
index 7404c0598..d7132d44d 100644
--- a/indra/newview/skins/darkgred/colors_base.xml
+++ b/indra/newview/skins/darkgred/colors_base.xml
@@ -96,7 +96,7 @@
 <!-- NOTIFICATION POP-UPS -->
 <NotifyBoxColor value="0, 0, 0, 220" />
 <NotifyTextColor value="255, 0, 0, 255" />
-<NotifyCautionBoxColor value="0, 0, 0, 255" /> 	<!-- the background color of caution permissions prompts -->
+<NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="189, 0, 0, 240" />
 <GroupNotifyTextColor value="1, 0, 0, 255" />
@@ -192,7 +192,7 @@
  <!-- Alert box colors -->
 <AlertBoxColor value="0, 0, 0, 245"/>
 <AlertTextColor value="228, 0, 0, 255"/>
-<AlertCautionBoxColor value="0, 0, 0, 255"/>	<!-- Background color of caution alerts -->
+<AlertCautionBoxColor value="254, 209, 118, 255"/>	<!-- Background color of caution alerts -->
 <AlertCautionTextColor value="0, 0, 0, 255"/>		<!-- Foreground color of the special title text in caution alerts -->
 
 <!--  Multi sliders, as in the sky animation setting -->
diff --git a/indra/newview/skins/emerald/colors_base.xml b/indra/newview/skins/emerald/colors_base.xml
index 18eea5cd3..57f34271a 100644
--- a/indra/newview/skins/emerald/colors_base.xml
+++ b/indra/newview/skins/emerald/colors_base.xml
@@ -194,7 +194,7 @@
 <!-- Alert box colors -->
 <AlertBoxColor value="0, 0, 0, 255" />               <!-- Warnings floaters, like when returning objects -->
 <AlertTextColor value="91, 187, 83, 255" />
-<AlertCautionBoxColor value="0, 0, 0, 255" />	<!-- Background color of caution alerts -->
+<AlertCautionBoxColor value="254, 209, 118, 255" />	<!-- Background color of caution alerts -->
 <AlertCautionTextColor value="0, 0, 0, 255" />		<!-- Foreground color of the special title text in caution alerts -->
 
 <!--  Multi sliders, as in the sky animation setting -->
diff --git a/indra/newview/skins/gemini/colors_base.xml b/indra/newview/skins/gemini/colors_base.xml
index cab6c8270..326606d0c 100644
--- a/indra/newview/skins/gemini/colors_base.xml
+++ b/indra/newview/skins/gemini/colors_base.xml
@@ -99,7 +99,7 @@
 <NotifyBoxColor value="66, 66, 66, 255" />
 <NotifyTextColor value="255, 255, 255, 128" />
 <NotifyCautionBoxColor value="0, 0, 0, 255" /> 	<!-- the background color of caution permissions prompts -->
-<NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
+<NotifyCautionWarnColor value="255, 255, 255, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="66, 66, 66, 255" />
 <GroupNotifyTextColor value="255, 255, 255, 128" />
 
@@ -196,7 +196,7 @@
 <!-- Alert box colors -->
 <AlertBoxColor value="33, 33, 33, 255" />               <!-- Warnings floaters, like when returning objects -->
 <AlertTextColor value="128, 128, 128, 255" />
-<AlertCautionBoxColor value="0, 0, 0, 255" />	<!-- Background color of caution alerts -->
+<AlertCautionBoxColor value="254, 209, 118, 255" />	<!-- Background color of caution alerts -->
 <AlertCautionTextColor value="0, 0, 0, 255" />		<!-- Foreground color of the special title text in caution alerts -->
 
 <!--  Multi sliders, as in the sky animation setting -->
diff --git a/indra/newview/skins/gred/colors_base.xml b/indra/newview/skins/gred/colors_base.xml
index 91f728ecf..6ecb33e97 100644
--- a/indra/newview/skins/gred/colors_base.xml
+++ b/indra/newview/skins/gred/colors_base.xml
@@ -96,7 +96,7 @@
 <!-- NOTIFICATION POP-UPS -->
 <NotifyBoxColor value="189, 0, 0, 240" />
 <NotifyTextColor value="1, 0, 0, 255" />
-<NotifyCautionBoxColor value="0, 0, 0, 255" /> 	<!-- the background color of caution permissions prompts -->
+<NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="189, 0, 0, 240" />
 <GroupNotifyTextColor value="1, 0, 0, 255" />
@@ -193,7 +193,7 @@
  <!-- Alert box colors -->
 <AlertBoxColor value="227, 0, 0, 245"/>
 <AlertTextColor value="1, 0, 0, 255"/>
-<AlertCautionBoxColor value="0, 0, 0, 255"/>	<!-- Background color of caution alerts -->
+<AlertCautionBoxColor value="254, 209, 118, 255"/>	<!-- Background color of caution alerts -->
 <AlertCautionTextColor value="0, 0, 0, 255"/>		<!-- Foreground color of the special title text in caution alerts -->
 
 <!--  Multi sliders, as in the sky animation setting -->
diff --git a/indra/newview/skins/kdarknv/colors.xml b/indra/newview/skins/kdarknv/colors.xml
index 4c129ebbc..2a87bd898 100644
--- a/indra/newview/skins/kdarknv/colors.xml
+++ b/indra/newview/skins/kdarknv/colors.xml
@@ -87,7 +87,7 @@
 <!-- NOTIFICATION POP-UPS -->
 <NotifyBoxColor value="166, 166, 166, 255"/>
 <NotifyTextColor value="0, 0, 0, 255"/>
-<NotifyCautionBoxColor value="0, 0, 0, 255"/>		<!-- the background color of caution permissions prompts -->
+<NotifyCautionBoxColor value="254, 209, 118, 255"/>		<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255"/>			<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="70, 170, 255, 255"/>
 <GroupNotifyTextColor value="0, 0, 0 255" />
@@ -181,4 +181,4 @@
 <MultiSliderThumbCenterSelectedColor value="50, 50, 255, 255"/>
 <MultiSliderTriangleColor value="50, 255, 255, 255"/>
 
-</settings>
+</settings>
\ No newline at end of file
diff --git a/indra/newview/skins/kdarknv/colors_base.xml b/indra/newview/skins/kdarknv/colors_base.xml
index 3f7cac358..477527766 100644
--- a/indra/newview/skins/kdarknv/colors_base.xml
+++ b/indra/newview/skins/kdarknv/colors_base.xml
@@ -99,7 +99,7 @@
 <!-- NOTIFICATION POP-UPS -->
 <NotifyBoxColor value="70, 170, 255, 255" />
 <NotifyTextColor value="0, 0, 0, 255" />
-<NotifyCautionBoxColor value="0, 0, 0, 255" /> 	<!-- the background color of caution permissions prompts -->
+<NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="70, 170, 255, 255" />
 <GroupNotifyTextColor value="0, 30, 60, 255" />
@@ -188,7 +188,7 @@
 <!-- Alert box colors -->
 <AlertBoxColor value="62, 62, 62, 255" />               <!-- Warnings floaters, like when returning objects -->
 <AlertTextColor value="147, 169, 213, 255" />
-<AlertCautionBoxColor value="0, 0, 0, 255" />	<!-- Background color of caution alerts -->
+<AlertCautionBoxColor value="254, 209, 118, 255" />	<!-- Background color of caution alerts -->
 <AlertCautionTextColor value="0, 0, 0, 255" />		<!-- Foreground color of the special title text in caution alerts -->
 
 <!--  Multi sliders, as in the sky animation setting -->
diff --git a/indra/newview/skins/kliteat/colors_base.xml b/indra/newview/skins/kliteat/colors_base.xml
index 3f7cac358..477527766 100644
--- a/indra/newview/skins/kliteat/colors_base.xml
+++ b/indra/newview/skins/kliteat/colors_base.xml
@@ -99,7 +99,7 @@
 <!-- NOTIFICATION POP-UPS -->
 <NotifyBoxColor value="70, 170, 255, 255" />
 <NotifyTextColor value="0, 0, 0, 255" />
-<NotifyCautionBoxColor value="0, 0, 0, 255" /> 	<!-- the background color of caution permissions prompts -->
+<NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="70, 170, 255, 255" />
 <GroupNotifyTextColor value="0, 30, 60, 255" />
@@ -188,7 +188,7 @@
 <!-- Alert box colors -->
 <AlertBoxColor value="62, 62, 62, 255" />               <!-- Warnings floaters, like when returning objects -->
 <AlertTextColor value="147, 169, 213, 255" />
-<AlertCautionBoxColor value="0, 0, 0, 255" />	<!-- Background color of caution alerts -->
+<AlertCautionBoxColor value="254, 209, 118, 255" />	<!-- Background color of caution alerts -->
 <AlertCautionTextColor value="0, 0, 0, 255" />		<!-- Foreground color of the special title text in caution alerts -->
 
 <!--  Multi sliders, as in the sky animation setting -->
diff --git a/indra/newview/skins/openlife/colors.xml b/indra/newview/skins/openlife/colors.xml
index cdfd54701..2008d0804 100644
--- a/indra/newview/skins/openlife/colors.xml
+++ b/indra/newview/skins/openlife/colors.xml
@@ -96,7 +96,7 @@
 <!-- NOTIFICATION POP-UPS -->
 <NotifyBoxColor value="152, 160, 160, 255"/>
 <NotifyTextColor value="0, 0, 0, 255"/>
-<NotifyCautionBoxColor value="0, 0, 0, 255"/>
+<NotifyCautionBoxColor value="254, 209, 118, 255"/>
 <NotifyCautionWarnColor value="0, 0, 0, 255"/>
 <FocusBackgroundColor value="176, 184, 184, 255"/>
 <GroupNotifyBoxColor value="255, 170, 70, 255"/>
@@ -182,7 +182,7 @@
  <!-- Alert box colors -->
 <AlertBoxColor value="176, 184, 184, 255"/>
 <AlertTextColor value="0, 0, 0, 255"/>
-<AlertCautionBoxColor value="0, 0, 0, 255"/>	<!-- Background color of caution alerts -->
+<AlertCautionBoxColor value="254, 209, 118, 255"/>	<!-- Background color of caution alerts -->
 <AlertCautionTextColor value="0, 0, 0, 255"/>		<!-- Foreground color of the special title text in caution alerts -->
 
 <!--  Multi sliders, as in the sky animation setting -->
diff --git a/indra/newview/skins/openlife/colors_base.xml b/indra/newview/skins/openlife/colors_base.xml
index 94c67c241..39f897639 100644
--- a/indra/newview/skins/openlife/colors_base.xml
+++ b/indra/newview/skins/openlife/colors_base.xml
@@ -96,7 +96,7 @@
 <!-- NOTIFICATION POP-UPS -->
 <NotifyBoxColor value="70, 170, 255, 255" />
 <NotifyTextColor value="0, 0, 0, 255" />
-<NotifyCautionBoxColor value="0, 0, 0, 255" /> 	<!-- the background color of caution permissions prompts -->
+<NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="70, 170, 255, 255" />
 <GroupNotifyTextColor value="0, 30, 60, 255" />
@@ -176,7 +176,7 @@
 <!-- Alert box colors -->
 <AlertBoxColor value="62, 62, 62, 255" />               <!-- Warnings floaters, like when returning objects -->
 <AlertTextColor value="147, 169, 213, 255" />
-<AlertCautionBoxColor value="0, 0, 0, 255" />	<!-- Background color of caution alerts -->
+<AlertCautionBoxColor value="254, 209, 118, 255" />	<!-- Background color of caution alerts -->
 <AlertCautionTextColor value="0, 0, 0, 255" />		<!-- Foreground color of the special title text in caution alerts -->
 
 <!--  Multi sliders, as in the sky animation setting -->
diff --git a/indra/newview/skins/pslgreen/colors_base.xml b/indra/newview/skins/pslgreen/colors_base.xml
index 2494452fa..6943cf675 100644
--- a/indra/newview/skins/pslgreen/colors_base.xml
+++ b/indra/newview/skins/pslgreen/colors_base.xml
@@ -97,7 +97,7 @@
 <NotifyBoxColor value="66, 66, 66, 255"/>
 <NotifyTextColor value="200, 200, 200, 255"/>
 <NotifyCautionBoxColor value="0, 0, 0, 255"/>		<!-- the background color of caution permissions prompts -->
-<NotifyCautionWarnColor value="0, 0, 0, 255"/>			<!-- the foreground color of the special title text in caution permissions prompts -->
+<NotifyCautionWarnColor value="200, 200, 200, 255"/>			<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="70, 170, 255, 255"/>
 <GroupNotifyTextColor value="0, 0, 0 255" />
 
diff --git a/indra/newview/skins/pslpurple/colors_base.xml b/indra/newview/skins/pslpurple/colors_base.xml
index 2494452fa..6943cf675 100644
--- a/indra/newview/skins/pslpurple/colors_base.xml
+++ b/indra/newview/skins/pslpurple/colors_base.xml
@@ -97,7 +97,7 @@
 <NotifyBoxColor value="66, 66, 66, 255"/>
 <NotifyTextColor value="200, 200, 200, 255"/>
 <NotifyCautionBoxColor value="0, 0, 0, 255"/>		<!-- the background color of caution permissions prompts -->
-<NotifyCautionWarnColor value="0, 0, 0, 255"/>			<!-- the foreground color of the special title text in caution permissions prompts -->
+<NotifyCautionWarnColor value="200, 200, 200, 255"/>			<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="70, 170, 255, 255"/>
 <GroupNotifyTextColor value="0, 0, 0 255" />
 
diff --git a/indra/newview/skins/ruby/colors_base.xml b/indra/newview/skins/ruby/colors_base.xml
index 6ab840c02..f55f4c2e5 100644
--- a/indra/newview/skins/ruby/colors_base.xml
+++ b/indra/newview/skins/ruby/colors_base.xml
@@ -96,7 +96,7 @@
 <!-- NOTIFICATION POP-UPS -->
 <NotifyBoxColor value="0, 0, 0, 220" />
 <NotifyTextColor value="255, 0, 0, 255" />
-<NotifyCautionBoxColor value="0, 0, 0, 255" /> 	<!-- the background color of caution permissions prompts -->
+<NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="189, 0, 0, 240" />
 <GroupNotifyTextColor value="1, 0, 0, 255" />
@@ -192,7 +192,7 @@
  <!-- Alert box colors -->
 <AlertBoxColor value="0, 0, 0, 245"/>
 <AlertTextColor value="228, 0, 0, 255"/>
-<AlertCautionBoxColor value="0, 0, 0, 255"/>	<!-- Background color of caution alerts -->
+<AlertCautionBoxColor value="254, 209, 118, 255"/>	<!-- Background color of caution alerts -->
 <AlertCautionTextColor value="0, 0, 0, 255"/>		<!-- Foreground color of the special title text in caution alerts -->
 
 <!--  Multi sliders, as in the sky animation setting -->
diff --git a/indra/newview/skins/sapphire/colors_base.xml b/indra/newview/skins/sapphire/colors_base.xml
index 587f47bf5..f2ad36445 100644
--- a/indra/newview/skins/sapphire/colors_base.xml
+++ b/indra/newview/skins/sapphire/colors_base.xml
@@ -97,7 +97,7 @@
 <NotifyBoxColor value="66, 66, 66, 255"/>
 <NotifyTextColor value="200, 200, 200, 255"/>
 <NotifyCautionBoxColor value="0, 0, 0, 255"/>		<!-- the background color of caution permissions prompts -->
-<NotifyCautionWarnColor value="0, 0, 0, 255"/>			<!-- the foreground color of the special title text in caution permissions prompts -->
+<NotifyCautionWarnColor value="200, 200, 200, 255"/>			<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="70, 170, 255, 255"/>
 <GroupNotifyTextColor value="0, 0, 0 255" />
 
diff --git a/indra/newview/skins/silver/colors_base.xml b/indra/newview/skins/silver/colors_base.xml
index ada05d3ed..7ae59a490 100644
--- a/indra/newview/skins/silver/colors_base.xml
+++ b/indra/newview/skins/silver/colors_base.xml
@@ -98,7 +98,7 @@
 <!-- NOTIFICATION POP-UPS -->
 <NotifyBoxColor value="170, 210, 255, 240" />
 <NotifyTextColor value="0, 30, 60, 255" />
-<NotifyCautionBoxColor value="0, 0, 0, 255" /> 	<!-- the background color of caution permissions prompts -->
+<NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="170, 210, 255, 240" />
 <GroupNotifyTextColor value="0, 30, 60, 255" />
@@ -199,7 +199,7 @@
  <!-- Alert box colors -->
 <AlertBoxColor value="165, 180, 200, 245"/>
 <AlertTextColor value="0, 30, 60, 255"/>
-<AlertCautionBoxColor value="0, 0, 0, 255"/>	<!-- Background color of caution alerts -->
+<AlertCautionBoxColor value="254, 209, 118, 255"/>	<!-- Background color of caution alerts -->
 <AlertCautionTextColor value="0, 0, 0, 255"/>		<!-- Foreground color of the special title text in caution alerts -->
 
 <!--  Multi sliders, as in the sky animation setting -->
diff --git a/indra/newview/skins/wisdom/colors_base.xml b/indra/newview/skins/wisdom/colors_base.xml
index 5bdc1f360..cfb056c21 100644
--- a/indra/newview/skins/wisdom/colors_base.xml
+++ b/indra/newview/skins/wisdom/colors_base.xml
@@ -99,7 +99,7 @@
 <!-- NOTIFICATION POP-UPS -->
 <NotifyBoxColor value="70, 70, 70, 155" />
 <NotifyTextColor value="0, 0, 0, 255" />
-<NotifyCautionBoxColor value="0, 0, 0, 255" />     <!-- the background color of caution permissions prompts -->
+<NotifyCautionBoxColor value="254, 209, 118, 255" />     <!-- the background color of caution permissions prompts -->
 <NotifyCautionWarnColor value="0, 0, 0, 255" />     <!-- the foreground color of the special title text in caution permissions prompts -->
 <GroupNotifyBoxColor value="70, 70, 70, 255" />
 <GroupNotifyTextColor value="0, 30, 60, 255" />
@@ -191,7 +191,7 @@
 <!-- Alert box colors -->
 <AlertBoxColor value="62, 62, 62, 255" />               <!-- Warnings floaters, like when returning objects -->
 <AlertTextColor value="147, 169, 213, 255" />
-<AlertCautionBoxColor value="0, 0, 0, 255" />    <!-- Background color of caution alerts -->
+<AlertCautionBoxColor value="254, 209, 118, 255" />    <!-- Background color of caution alerts -->
 <AlertCautionTextColor value="0, 0, 0, 255" />        <!-- Foreground color of the special title text in caution alerts -->
 
 <!--  Multi sliders, as in the sky animation setting -->

From f253da09ec5cb809af648a89a4ca9df1197bf983 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Mon, 20 Feb 2012 16:02:56 -0500
Subject: [PATCH 002/199] Added gesture muting feature, like phoenix has.

---
 indra/newview/app_settings/settings.xml             | 13 ++++++++++++-
 indra/newview/llviewermessage.cpp                   |  2 ++
 .../newview/skins/default/xui/en-us/panel_audio.xml |  3 ++-
 .../default/xui/en-us/panel_preferences_audio.xml   |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 2b521fed4..88e6062ba 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8499,7 +8499,18 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>NearMeRange</key>
+	<key>SinguMuteGestures</key>
+    <map>
+      <key>Comment</key>
+      <string>Mute gestures other than your own.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+	<key>NearMeRange</key>
     <map>
       <key>Comment</key>
       <string>Search radius for nearby avatars</string>
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 97ac3eb05..72bba1d56 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -4521,6 +4521,8 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
 	msg->getVector3Fast(_PREHASH_SoundData, _PREHASH_Position, pos_local);
 	msg->getF32Fast(_PREHASH_SoundData, _PREHASH_Gain, gain);
 
+	// Stop here if gesture muting, the user isn't playing this sound, and this is likely to be a gesture.
+	if(gSavedSettings.getBOOL("SinguMuteGestures") && owner_id != gAgent.getID() && object_id == owner_id) return;
 	// adjust sound location to true global coords
 	LLVector3d	pos_global = from_region_handle(region_handle);
 	pos_global.mdV[VX] += pos_local.mV[VX];
diff --git a/indra/newview/skins/default/xui/en-us/panel_audio.xml b/indra/newview/skins/default/xui/en-us/panel_audio.xml
index 1ede1d908..3f0496751 100644
--- a/indra/newview/skins/default/xui/en-us/panel_audio.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_audio.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="false" height="100" label="Audio &amp; Video" name="Media panel" width="250">
-	<slider control_name="AudioLevelMaster" follows="top" height="15" increment="0.005" initial_val="0.5" label="Master" label_width="55" left="10" max_val="1" min_val="0" name="System Volume" show_text="false" volume="true" width="181"/>
+	<slider bottom_delta="-15" control_name="AudioLevelMaster" follows="top" height="15" increment="0.005" initial_val="0.5" label="Master" label_width="55" left="10" max_val="1" min_val="0" name="System Volume" show_text="false" volume="true" width="181"/>
 	<button bottom_delta="0" control_name="MuteAudio" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_audio" toggle="true" width="25"/>
 	<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="top" height="15" increment="0.005" initial_val="0.5" label="Music" label_width="55" left="10" max_val="1" min_val="0" name="Music Volume" show_text="false" volume="true" width="181"/>
 	<button bottom_delta="0" control_name="MuteMusic" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_music" toggle="true" width="25"/>
@@ -14,4 +14,5 @@
 	<button bottom_delta="0" control_name="MuteAmbient" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_wind" toggle="true" width="25"/>
 	<slider control_name="AudioLevelUI" follows="top" height="15" increment="0.005" initial_val="0.5" label="UI" label_width="55" left="10" max_val="1" min_val="0" name="UI Volume" show_text="false" volume="true" width="181"/>
 	<button bottom_delta="0" control_name="MuteUI" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_ui" toggle="true" width="25"/>
+	<button bottom_delta="-18" follows="top" control_name="SinguMuteGestures" font="SansSerifSmall" height="16" label_selected="Unmute Gestures" label_unselected="Mute Gestures" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-10" left="10" name="Mute gestures" toggle="true" tool_tip="When active, gesture sounds other than your own will not be played for you."/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 2ca59db4b..d9b7c2ff2 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -3,7 +3,7 @@
 	<text bottom="-22" height="12" left="10" name="muting_text">Volume:</text>
 	<text bottom="-215" name="streaming_prefs_text">Streaming Preferences:</text>
 	<text bottom="-300" height="12" name="audio_prefs_text">Audio Preferences:</text>
-	<panel border="true" bottom="-175" filename="panel_audio.xml" height="140" label="Volume" left="142" name="Volume Panel" width="260"/>
+	<panel border="true" bottom="-200" filename="panel_audio.xml" height="165" label="Volume" left="142" name="Volume Panel" width="260"/>
 	<check_box bottom="-220" control_name="AudioStreamingMusic" height="16" initial_value="true" label="Play Streaming Music When Available (uses more bandwidth)" left="142" name="streaming_music"/>
 	<check_box bottom_delta="-20" control_name="AudioStreamingVideo" follows="top" height="16" initial_value="true" label="Play Streaming Media When Available (uses more bandwidth)" name="streaming_video"/>
 	<check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" follows="top" height="16" initial_value="true" label="Automatically play media" left="162" name="auto_streaming_video"/>

From 2b8a55f396e98dcc69716ff0de5df534e11b0780 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Mon, 20 Feb 2012 17:13:35 -0500
Subject: [PATCH 003/199] Add DisableCameraConstraints to the "Camera Options:"
 checkboxes on Input & Camera Preferences(panel_preferences_input.xml)

---
 .../newview/skins/default/xui/en-us/panel_preferences_input.xml  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
index c5ed1c4b4..81aa81211 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml
@@ -15,5 +15,6 @@
 	<check_box bottom_delta="-24" follows="top" initial_value="false" label="Automatic Edit Camera Movement" left="148" name="edit_camera_movement" tool_tip="Use automatic camera positioning when entering and exiting edit mode"/>
 	<check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Automatic Appearance Camera Movement" left="148" name="appearance_camera_movement" tool_tip="Use automatic camera positioning while in edit mode"/>
 	<check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Unsit Avatar on Camera Reset" left="148" name="unsit_on_camera_reset" tool_tip="Stand up automatically when you press Esc and the camera switches to third person mode"/>
+	<check_box bottom_delta="-18" follows="top" height="16" label="Disable Camera Constraints" left="148" control_name="DisableCameraConstraints" name="DisableCameraConstraints" tool_tip="Prevent the camera from automatically zooming when you approach walls, objects, etc., too closely."/>
 	<button bottom_delta="-30" follows="top" font="SansSerif" height="20" label="Joystick Setup" name="joystick_setup_button" width="155"/>
 </panel>

From 81521b98fda1d17e1753f3fea6524557ba3dd292 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 22 Feb 2012 06:22:05 -0500
Subject: [PATCH 004/199] Added gesture_muted icon, reworked the panel_audio to
 look better, and have mute gesture look more like the rest of the panel.

---
 .../default/textures/inv_item_gesture_muted.tga   | Bin 0 -> 721 bytes
 .../skins/default/xui/en-us/panel_audio.xml       |   3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 indra/newview/skins/default/textures/inv_item_gesture_muted.tga

diff --git a/indra/newview/skins/default/textures/inv_item_gesture_muted.tga b/indra/newview/skins/default/textures/inv_item_gesture_muted.tga
new file mode 100644
index 0000000000000000000000000000000000000000..31efb90623af9e4e66c06922bf4c75c858260047
GIT binary patch
literal 721
zcma)(&27R!5QS&?jdF-g2V8uFQ(7RBr6@=wK^$BL4cLH^8tBE%q=2-r+3&5^=1&T~
zcy{J{?~T1?kCvXyGMhf^%Ca<<=ed909{uk7$9qRbN3(x{3Wo~b5bm!n90WiOa5w{M
zX8n}U2&Se{aq3b1dha<XMR{im!T2bo!a(F8>F5AmW!+Fl50RJhAvj*_lKgnrG){z<
zTpVGi&%yjI8DRI#cWL%$9PavIWOj?is$KQ~t6!~Kh|^Y~i?^W9qGzZkt-!RJvYMuW
zvgi@2p>C*``r$p+OzjSJh=AIlCt=!(;V2B<7a8gKSbZ+m#e1=Qn{8f-*Tvla0Pp8J
Ah5!Hn

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/xui/en-us/panel_audio.xml b/indra/newview/skins/default/xui/en-us/panel_audio.xml
index 3f0496751..a60b7a81a 100644
--- a/indra/newview/skins/default/xui/en-us/panel_audio.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_audio.xml
@@ -14,5 +14,6 @@
 	<button bottom_delta="0" control_name="MuteAmbient" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_wind" toggle="true" width="25"/>
 	<slider control_name="AudioLevelUI" follows="top" height="15" increment="0.005" initial_val="0.5" label="UI" label_width="55" left="10" max_val="1" min_val="0" name="UI Volume" show_text="false" volume="true" width="181"/>
 	<button bottom_delta="0" control_name="MuteUI" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_ui" toggle="true" width="25"/>
-	<button bottom_delta="-18" follows="top" control_name="SinguMuteGestures" font="SansSerifSmall" height="16" label_selected="Unmute Gestures" label_unselected="Mute Gestures" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-10" left="10" name="Mute gestures" toggle="true" tool_tip="When active, gesture sounds other than your own will not be played for you."/>
+	<button bottom_delta="-18" follows="top" control_name="SinguMuteGestures" font="SansSerifSmall" height="16" label_selected="Unmute Gestures" label_unselected="Mute Gestures" image_selected="inv_item_gesture_muted.tga" image_unselected="inv_item_gesture.tga" right="-10" left="10" name="Mute gestures" toggle="true" tool_tip="When active, gesture sounds other than your own will not be played for you."/>
+	<button bottom_delta="0" follows="top" control_name="SinguMuteGestures" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" toggle="true" width="25"/>
 </panel>

From 22530cd77ee2e223e9008437fb10099667004a60 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 22 Feb 2012 09:23:09 -0500
Subject: [PATCH 005/199] Prevent snapshot resolution from going over window
 size, when showing UI or HUD in snapshots is enabled.

Otherwise snapshots do not have UI/HUD shown, despite enabling RenderUIInSnapshot or RenderHUDInSnapshot.
---
 indra/newview/llfloatersnapshot.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp
index 2164a9eac..393dd78af 100644
--- a/indra/newview/llfloatersnapshot.cpp
+++ b/indra/newview/llfloatersnapshot.cpp
@@ -1708,7 +1708,7 @@ void LLFloaterSnapshot::Impl::updateResolution(LLUICtrl* ctrl, void* data, BOOL
 		S32 original_width = 0 , original_height = 0 ;
 		previewp->getSize(original_width, original_height) ;
 		
-		if (width == 0 || height == 0)
+		if (width == 0 || height == 0 || gSavedSettings.getBOOL("RenderUIInSnapshot") || gSavedSettings.getBOOL("RenderHUDInSnapshot"))
 		{
 			// take resolution from current window size
 			previewp->setSize(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight());

From 513002416c36c16d465744a5d5caaf973b3f0dfe Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 22 Feb 2012 09:50:19 -0500
Subject: [PATCH 006/199] Corrected text to say viewer's website, since we are
 not Imprudence.

---
 .../newview/skins/default/xui/en-us/floater_dictionaries.xml  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/floater_dictionaries.xml b/indra/newview/skins/default/xui/en-us/floater_dictionaries.xml
index 0aec71578..b6dd20688 100644
--- a/indra/newview/skins/default/xui/en-us/floater_dictionaries.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_dictionaries.xml
@@ -2,7 +2,7 @@
 <floater border="false" can_close="true" can_minimize="true" bottom="500" left="500" can_resize="false" height="180" name="EmeraldIRC_dictionaries" title="Download new Dictionaries" width="300">
      <text bottom="-50" follows="left|top" font="SansSerifSmall" height="20" left="15" name="EmDics_txt" width="300">
 Below is a list of additional dictionaries that can
-be downloaded from the Imprudence website.
+be downloaded from the viewer's website.
 
 Please select the dictionary you wish to have available
 for install, and then press the download button.</text>
@@ -12,4 +12,4 @@ for install, and then press the download button.</text>
      <button bottom_delta="-35" enabled="true" follows="left|top" font="SansSerif"
 	     halign="center" height="22" label="Download" left_delta="0"
 	     mouse_opaque="true" name="Emerald_dic_download" scale_image="true" width="290" />
-</floater> 
\ No newline at end of file
+</floater> 

From 90ac17426074e5c0507ce0ea76c976d52de57c9c Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Fri, 24 Feb 2012 14:07:58 -0500
Subject: [PATCH 007/199] Added Ctrl-D for creating a landmark

Most browsers use this for creating bookmarks, landmarks are pretty much
the same.
---
 indra/newview/skins/default/xui/en-us/menu_viewer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index c256172bd..cdfaff532 100644
--- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -495,7 +495,7 @@
 			<on_enable function="World.EnableCreateLandmark" userdata="" />
 		</menu_item_call>
 		<menu_item_call bottom="-132" enabled="true" height="19" label="Set Home to Here" left="0"
-		     mouse_opaque="true" name="Set Home to Here" width="185">
+		     mouse_opaque="true" name="Set Home to Here" shortcut="control|D" width="185">
 			<on_click function="World.SetHomeLocation" userdata="" />
 			<on_enable function="World.EnableSetHomeLocation" userdata="" />
 		</menu_item_call>

From 0dc05a39e6c139ccd819de5d303436c25c185af0 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 26 Feb 2012 17:42:52 -0500
Subject: [PATCH 008/199] Use Ctrl-shift-D for creating a landmarks, instead,
 and fix previous misplacement of the shortcut.

---
 indra/newview/skins/default/xui/en-us/menu_viewer.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index cdfaff532..4836b0913 100644
--- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -490,12 +490,12 @@
 		<menu_item_separator bottom="-94" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator" width="185" />
 		<menu_item_call bottom="-113" enabled="true" height="19" label="Create Landmark Here" left="0"
-		     mouse_opaque="true" name="Create Landmark Here" width="185">
+		     mouse_opaque="true" name="Create Landmark Here" shortcut="control|shift|D" width="185">
 			<on_click function="World.CreateLandmark" userdata="" />
 			<on_enable function="World.EnableCreateLandmark" userdata="" />
 		</menu_item_call>
 		<menu_item_call bottom="-132" enabled="true" height="19" label="Set Home to Here" left="0"
-		     mouse_opaque="true" name="Set Home to Here" shortcut="control|D" width="185">
+		     mouse_opaque="true" name="Set Home to Here" width="185">
 			<on_click function="World.SetHomeLocation" userdata="" />
 			<on_enable function="World.EnableSetHomeLocation" userdata="" />
 		</menu_item_call>

From 96ddbf2a8b1f95f033f11520cd5f5b1cd69ee601 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sat, 3 Mar 2012 01:38:53 -0500
Subject: [PATCH 009/199] Added scale_image="false" to the gesture mute button
 so it won't span the width of the button.

---
 indra/newview/skins/default/xui/en-us/panel_audio.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en-us/panel_audio.xml b/indra/newview/skins/default/xui/en-us/panel_audio.xml
index a60b7a81a..75dc766d0 100644
--- a/indra/newview/skins/default/xui/en-us/panel_audio.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_audio.xml
@@ -14,6 +14,6 @@
 	<button bottom_delta="0" control_name="MuteAmbient" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_wind" toggle="true" width="25"/>
 	<slider control_name="AudioLevelUI" follows="top" height="15" increment="0.005" initial_val="0.5" label="UI" label_width="55" left="10" max_val="1" min_val="0" name="UI Volume" show_text="false" volume="true" width="181"/>
 	<button bottom_delta="0" control_name="MuteUI" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_ui" toggle="true" width="25"/>
-	<button bottom_delta="-18" follows="top" control_name="SinguMuteGestures" font="SansSerifSmall" height="16" label_selected="Unmute Gestures" label_unselected="Mute Gestures" image_selected="inv_item_gesture_muted.tga" image_unselected="inv_item_gesture.tga" right="-10" left="10" name="Mute gestures" toggle="true" tool_tip="When active, gesture sounds other than your own will not be played for you."/>
+	<button bottom_delta="-18" follows="top" control_name="SinguMuteGestures" font="SansSerifSmall" height="16" label_selected="Unmute Gestures" label_unselected="Mute Gestures" image_selected="inv_item_gesture_muted.tga" image_unselected="inv_item_gesture.tga" scale_image="false" right="-10" left="10" name="Mute gestures" toggle="true" tool_tip="When active, gesture sounds other than your own will not be played for you."/>
 	<button bottom_delta="0" follows="top" control_name="SinguMuteGestures" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" toggle="true" width="25"/>
 </panel>

From 376be8b990998e12aaa3886ffbcc1fff10257d0d Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 14 Mar 2012 02:53:44 -0400
Subject: [PATCH 010/199] Spelling fix in a comment.

---
 indra/newview/llfloaterfriends.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llfloaterfriends.cpp b/indra/newview/llfloaterfriends.cpp
index 078e0e507..d94c7cf8d 100644
--- a/indra/newview/llfloaterfriends.cpp
+++ b/indra/newview/llfloaterfriends.cpp
@@ -1184,7 +1184,7 @@ void LLPanelFriends::onClickImport_filepicker_continued(AIFilePicker* filepicker
 		if(!content.has("can_mod"))continue;
 
 		LLUUID agent_id = LLUUID(iter->first);
-		if(merging && importstatellsd.has(agent_id.asString()))continue;//dont need to request what weve already requested from another list import and have not got a reply yet
+		if(merging && importstatellsd.has(agent_id.asString()))continue;//dont need to request what we've already requested from another list import and have not got a reply yet
 
 		std::string agent_name = content["name"];
 		if(!is_agent_friend(agent_id))//dont need to request what we have

From 385ec62e53b2e998c4431eadcd10dbe12f073ff8 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 14 Mar 2012 08:55:10 -0400
Subject: [PATCH 011/199] Added scale_image="false" to all mute buttons.

This will allow the mute icons to retain their normal look,
with Shyotl's changes to the UI code.
---
 .../xui/en-us/floater_active_speakers.xml        |  2 +-
 .../xui/en-us/floater_instant_message.xml        |  2 +-
 .../skins/default/xui/en-us/panel_audio.xml      | 16 ++++++++--------
 .../default/xui/en-us/panel_master_volume.xml    |  2 +-
 .../default/xui/en-us/panel_media_controls.xml   |  2 +-
 .../default/xui/en-us/panel_speaker_controls.xml |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml b/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
index c74da2f54..a808fc5f8 100644
--- a/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_active_speakers.xml
@@ -23,7 +23,7 @@
 			<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga"
 			     image_unselected="icn_speaker_dark.tga" label="" left_delta="115"
 			     name="mute_btn" toggle="true" tool_tip="Mute voice for this resident"
-			     width="25" />
+			     width="25" scale_image="false" />
 		</panel>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/en-us/floater_instant_message.xml b/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
index e72b13d98..432cf712a 100644
--- a/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_instant_message.xml
@@ -19,7 +19,7 @@
 	<button bottom="-37" follows="top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End" name="end_call_btn" visible="false" width="80"/>
 	<panel border="false" bottom="-34" follows="left|top" height="20" left_delta="50" name="speaker_controls" width="100">
 		<volume_slider bottom="0" follows="bottom" height="15" increment="0.05" initial_val="0.5" max_val="1.0" min_val="0.0" name="speaker_volume" width="56"/>
-		<button bottom="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" left_delta="56" name="mute_btn" tool_tip="Mute voice" width="25"/>
+		<button bottom="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" left_delta="56" name="mute_btn" tool_tip="Mute voice" width="25"/>
 	</panel>
 	<text_editor bottom="28" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"	enabled="false" follows="left|top|right|bottom" height="228" left="5" max_length="2147483647" name="im_history" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="488" word_wrap="true"/>
 	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5" follows="left|right" font="SansSerif" height="20" label="Click here to instant message" max_length="2147483647" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="423" spell_check="true"/>
diff --git a/indra/newview/skins/default/xui/en-us/panel_audio.xml b/indra/newview/skins/default/xui/en-us/panel_audio.xml
index 75dc766d0..ff04c9252 100644
--- a/indra/newview/skins/default/xui/en-us/panel_audio.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_audio.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel border="false" height="100" label="Audio &amp; Video" name="Media panel" width="250">
 	<slider bottom_delta="-15" control_name="AudioLevelMaster" follows="top" height="15" increment="0.005" initial_val="0.5" label="Master" label_width="55" left="10" max_val="1" min_val="0" name="System Volume" show_text="false" volume="true" width="181"/>
-	<button bottom_delta="0" control_name="MuteAudio" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_audio" toggle="true" width="25"/>
+	<button bottom_delta="0" control_name="MuteAudio" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" right="-28" name="mute_audio" toggle="true" width="25"/>
 	<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="top" height="15" increment="0.005" initial_val="0.5" label="Music" label_width="55" left="10" max_val="1" min_val="0" name="Music Volume" show_text="false" volume="true" width="181"/>
-	<button bottom_delta="0" control_name="MuteMusic" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_music" toggle="true" width="25"/>
+	<button bottom_delta="0" control_name="MuteMusic" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" right="-28" name="mute_music" toggle="true" width="25"/>
 	<slider control_name="AudioLevelMedia" follows="top" height="15" increment="0.005" initial_val="0.5" label="Media" label_width="55" left="10" max_val="1" min_val="0" name="Media Volume" show_text="false" volume="true" width="181"/>
-	<button bottom_delta="0" control_name="MuteMedia" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_media" toggle="true" width="25"/>
+	<button bottom_delta="0" control_name="MuteMedia" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" right="-28" name="mute_media" toggle="true" width="25"/>
 	<slider control_name="AudioLevelVoice" follows="top" height="15" increment="0.005" initial_val="0.5" label="Voice" label_width="55" left="10" max_val="1" min_val="0" name="Voice Volume" show_text="false" volume="true" width="181"/>
-	<button bottom_delta="0" control_name="MuteVoice" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_voice" toggle="true" width="25"/>
+	<button bottom_delta="0" control_name="MuteVoice" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" right="-28" name="mute_voice" toggle="true" width="25"/>
 	<slider control_name="AudioLevelSFX" follows="top" height="15" increment="0.005" initial_val="0.5" label="Sounds" label_width="55" left="10" max_val="1" min_val="0" name="SFX Volume" show_text="false" volume="true" width="181"/>
-	<button bottom_delta="0" control_name="MuteSounds" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_sfx" toggle="true" width="25"/>
+	<button bottom_delta="0" control_name="MuteSounds" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" right="-28" name="mute_sfx" toggle="true" width="25"/>
 	<slider control_name="AudioLevelAmbient" follows="top" height="15" increment="0.005" initial_val="0.5" label="Ambient" label_width="55" left="10" max_val="1" min_val="0" name="Wind Volume" show_text="false" volume="true" width="181"/>
-	<button bottom_delta="0" control_name="MuteAmbient" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_wind" toggle="true" width="25"/>
+	<button bottom_delta="0" control_name="MuteAmbient" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" right="-28" label="" name="mute_wind" toggle="true" width="25"/>
 	<slider control_name="AudioLevelUI" follows="top" height="15" increment="0.005" initial_val="0.5" label="UI" label_width="55" left="10" max_val="1" min_val="0" name="UI Volume" show_text="false" volume="true" width="181"/>
-	<button bottom_delta="0" control_name="MuteUI" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_ui" toggle="true" width="25"/>
+	<button bottom_delta="0" control_name="MuteUI" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" right="-28" label="" name="mute_ui" toggle="true" width="25"/>
 	<button bottom_delta="-18" follows="top" control_name="SinguMuteGestures" font="SansSerifSmall" height="16" label_selected="Unmute Gestures" label_unselected="Mute Gestures" image_selected="inv_item_gesture_muted.tga" image_unselected="inv_item_gesture.tga" scale_image="false" right="-10" left="10" name="Mute gestures" toggle="true" tool_tip="When active, gesture sounds other than your own will not be played for you."/>
-	<button bottom_delta="0" follows="top" control_name="SinguMuteGestures" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" toggle="true" width="25"/>
+	<button bottom_delta="0" follows="top" control_name="SinguMuteGestures" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" right="-28" label="" toggle="true" width="25"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_master_volume.xml b/indra/newview/skins/default/xui/en-us/panel_master_volume.xml
index 27bace7ea..45dc3cfa4 100644
--- a/indra/newview/skins/default/xui/en-us/panel_master_volume.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_master_volume.xml
@@ -8,7 +8,7 @@
 	     initial_val="0.5" left_delta="22" max_val="1" min_val="0"
 	     mouse_opaque="true" name="volume_slider"
 	     tool_tip="Change the volume using this slider" width="50" />
-	<button bottom="-20" control_name="MuteAudio" height="20"
+	<button bottom="-20" control_name="MuteAudio" height="20" scale_image="false"
 	     image_selected="icn_speaker-muted_dark.tga"
 	     image_unselected="icn_speaker_dark.tga" label="" left_delta="52"
 	     name="mute_master" toggle="true" width="25" />
diff --git a/indra/newview/skins/default/xui/en-us/panel_media_controls.xml b/indra/newview/skins/default/xui/en-us/panel_media_controls.xml
index a8ecfcab8..d6341631b 100644
--- a/indra/newview/skins/default/xui/en-us/panel_media_controls.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_media_controls.xml
@@ -63,7 +63,7 @@
 	     initial_val="0.5" left_delta="15" max_val="1" min_val="0"
 	     mouse_opaque="true" name="volume_slider" tool_tip="Master Volume"
 	     width="56" />
-	<button bottom="-19" control_name="MuteAudio" height="20"
+	<button bottom="-19" control_name="MuteAudio" height="20" scale_image="false" 
 	     image_selected="icn_speaker-muted_dark.tga"
 	     image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
 	     name="mute_master" toggle="true" tool_tip="Master Mute" width="24" />
diff --git a/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml b/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
index 9ea1d591f..47a59e536 100644
--- a/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
@@ -18,7 +18,7 @@
 				<button bottom="-28" enabled="false" follows="left|top" height="20" image_overlay="icon_avatar_offline.tga" label="" left="4" name="profile_btn" right="34" scale_image="true"/>
 				<text bottom_delta="9" follows="left|top|right" left_delta="34" name="resident_name" valign="center" width="140">Rumplstiltskin Califragilistic</text>
 				<volume_slider bottom_delta="-29" follows="left|top" height="15" increment="0.05" initial_val="0.5" left="0" max_val="1.0" min_val="0.0" name="speaker_volume" width="110"/>
-				<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" left_delta="110" name="mute_btn" tool_tip="Mute voice for this resident" width="25"/>
+				<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="false" label="" left_delta="110" name="mute_btn" tool_tip="Mute voice for this resident" width="25"/>
 				<check_box bottom_delta="-25" enabled="false" follows="left|top" height="25" label="Mute Text" left="3" name="mute_text_btn"/>
 			</panel>
 		</layout_panel>

From c3f3db518b2bbfe797b7096c0b274689eba3351c Mon Sep 17 00:00:00 2001
From: Lirusaito <Inusaito@gmail.com>
Date: Mon, 19 Mar 2012 18:08:17 -0400
Subject: [PATCH 012/199] Fixed Issue 340, multiple instances of same name
 breaking translation.

Applies to advanced chat preferences only.
---
 .../default/xui/en-us/panel_preferences_ascent_chat.xml     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
index 5c954dca4..fc5e3634d 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
@@ -16,7 +16,7 @@
 		 <view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"
 		left="235" name="CmdDivisor" width="0"/>
 	  -->
-      <text bottom="-15" left="250" name="objects_link_text_box" width="300">Chat:</text>
+      <text bottom="-15" left="250" name="objects_link_text_box1" width="300">Chat:</text>
       <check_box bottom_delta="-25" left_delta="-5" follows="left|top" control_name="PlayTypingSound" initial_value="true"
         label="Play the typing sound for local chat" tool_tip="Silences the chatting type sound, making it quieter for things like performances." name="play_typing_sound_check"/>
       <check_box bottom_delta="-20" follows="left|top" control_name="HideNotificationsInChat" initial_value="false"
@@ -25,7 +25,7 @@
         label="Allow MU pose method." tool_tip="Allows the use of both /me and : to perform emotes." name="allow_mu_pose_check"/>
       <check_box bottom_delta="-20" follows="left|top" control_name="AscentAutoCloseOOC"
         label="Auto-close OOC comments." tool_tip="Will automatically append '))' to any message starting with '((', or visa versa." name="close_ooc_check"/>
-      <text bottom_delta="-15" follows="left|top" name="objects_link_text_box">Show links on chatting object names in chat history for:</text>
+      <text bottom_delta="-15" follows="left|top" name="objects_link_text_box2">Show links on chatting object names in chat history for:</text>
       <radio_group bottom_delta="-26" control_name="LinksForChattingObjects" tool_tip="Enables a link to show you the owner of the speaking object."
         follows="top" height="20" left="20" name="objects_link" width="350">
         <radio_item bottom_delta="0" left_delta="5" name="no_object" width="48">No object</radio_item>
@@ -58,7 +58,7 @@
       <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Send an item along with the response" name="AscentInstantMessageResponseItem" tool_tip="You can include an inventory item to send along with your auto response by dragging it from your inventory to the location below"/>
 	  <text bottom_delta="120" left_delta="245" follows="left|top" height="18" name="text_box1">Response Text:</text>
       <text_editor bottom_delta="-110" follows="left|top" height="110" max_length="1100" name="im_response" width="230" word_wrap="true" spell_check="true"/>
-      <text bottom_delta="-25" follows="left|top" height="18" name="text_box1">
+      <text bottom_delta="-25" follows="left|top" height="18" name="text_box2">
 #f for user's first name, #l for last name,
 #t for timestamp, #r for SLURL to you,
 #i for your idle time. (e.g. "5 mins")

From 8b25d44bcf656f23019d66b4e5bfc0e2487cd8e9 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Fri, 23 Mar 2012 17:21:50 -0400
Subject: [PATCH 013/199] Replaced a tab with a space in XML so Windows doesn't
 show an awkward square there.

---
 .../skins/default/xui/en-us/floater_hardware_settings.xml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
index b9889f8c9..0a33c0ca8 100644
--- a/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
@@ -25,7 +25,7 @@
 		width="300"/>
 	<spinner bottom_delta="-24" control_name="RenderFogRatio" decimal_digits="1" height="16" increment="0.1" initial_val="4" label="Fog Distance Ratio:" label_width="138" left="10" max_val="10" min_val="0.5" name="fog" width="202"/>
 	<text bottom_delta="-50" height="40" left="10" name="note">
-		Note: the Gamma and Fog Distance Ratio settings are	unavailable
+		Note: the Gamma and Fog Distance Ratio settings are unavailable
         (since useless) when the Atmospheric Shaders are enabled.
 	</text>
 	<button bottom="10" height="20" label="OK" label_selected="OK" left="-110" name="OK" scale_image="true" width="90"/>

From d9cbd52ea890b7e1b6545b05df862b4a13cb246c Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Fri, 23 Mar 2012 22:45:55 -0400
Subject: [PATCH 014/199] Fix for compiler warning in
 LLVertexBuffer::setupVertexArray.

---
 indra/llrender/llvertexbuffer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index 794d5c794..73313fb17 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -1223,7 +1223,7 @@ void LLVertexBuffer::setupVertexArray()
 		if (mTypeMask & (1 << i))
 		{
 			glEnableVertexAttribArrayARB(i);
-			glVertexAttribPointerARB(i, attrib_size[i], attrib_type[i], attrib_normalized[i], sTypeSize[i], (void*) mOffsets[i]); 
+			glVertexAttribPointerARB(i, attrib_size[i], attrib_type[i], attrib_normalized[i], sTypeSize[i], (void*)((U8*)NULL + mOffsets[i]));
 		}
 		else
 		{

From 8805e3fb27720b0dd4251a52f22ee2eaa5b6cf40 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 28 Mar 2012 00:00:42 -0400
Subject: [PATCH 015/199] Nomade Zhao's 4 fixes for translation. Re: Issue 340

---
 indra/newview/skins/default/xui/en-us/floater_about_land.xml  | 2 +-
 .../newview/skins/default/xui/en-us/floater_display_name.xml  | 4 ++--
 .../skins/default/xui/en-us/panel_preferences_ascent_chat.xml | 4 ++--
 .../skins/default/xui/en-us/panel_preferences_network.xml     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index b091777c6..08a6c38f7 100644
--- a/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -911,7 +911,7 @@ Only large parcels can be listed in search.
 				 height="16"
 				 left="10"
 				 length="1"
-				 name="at URL:"
+				 name="at URL2:"
 				 type="string"
 				 width="65">
 				Current URL:
diff --git a/indra/newview/skins/default/xui/en-us/floater_display_name.xml b/indra/newview/skins/default/xui/en-us/floater_display_name.xml
index d31e9271e..9e49c9d93 100644
--- a/indra/newview/skins/default/xui/en-us/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_display_name.xml
@@ -19,10 +19,10 @@
     <button height="20" bottom_delta="-28" label="Save" font="SansSerif" left="20" name="save_btn" tool_tip="Save your new Display Name" width="113" />
     <button height="20" bottom_delta="0" label="Reset" font="SansSerif" left_delta="123" name="reset_btn" tool_tip="Make Display Name the same as Username" width="113" />
     <button height="20" bottom_delta="0" label="Cancel" font="SansSerif" left_delta="123" name="cancel_btn" tool_tip="Cancel and close this Dialog" width="113" />
-    <text left="20" bottom_delta="-25" width="360" height="18" font="SansSerif" name="name_confirm_label">
+    <text left="20" bottom_delta="-25" width="360" height="18" font="SansSerif" name="name_confirm_label2">
       The name you give your avatar is called yours Display Name.
     </text>
-     <text left="20" bottom_delta="-18" width="360" height="18" font="SansSerif" name="name_confirm_label">
+     <text left="20" bottom_delta="-18" width="360" height="18" font="SansSerif" name="name_confirm_label3">
       You can change it once a week.
     </text>
 </floater>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
index fc5e3634d..1c6e649e4 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
@@ -16,7 +16,7 @@
 		 <view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"
 		left="235" name="CmdDivisor" width="0"/>
 	  -->
-      <text bottom="-15" left="250" name="objects_link_text_box1" width="300">Chat:</text>
+      <text bottom="-15" left="250" name="objects_link_text_box2" width="300">Chat:</text>
       <check_box bottom_delta="-25" left_delta="-5" follows="left|top" control_name="PlayTypingSound" initial_value="true"
         label="Play the typing sound for local chat" tool_tip="Silences the chatting type sound, making it quieter for things like performances." name="play_typing_sound_check"/>
       <check_box bottom_delta="-20" follows="left|top" control_name="HideNotificationsInChat" initial_value="false"
@@ -25,7 +25,7 @@
         label="Allow MU pose method." tool_tip="Allows the use of both /me and : to perform emotes." name="allow_mu_pose_check"/>
       <check_box bottom_delta="-20" follows="left|top" control_name="AscentAutoCloseOOC"
         label="Auto-close OOC comments." tool_tip="Will automatically append '))' to any message starting with '((', or visa versa." name="close_ooc_check"/>
-      <text bottom_delta="-15" follows="left|top" name="objects_link_text_box2">Show links on chatting object names in chat history for:</text>
+      <text bottom_delta="-15" follows="left|top" name="objects_link_text_box3">Show links on chatting object names in chat history for:</text>
       <radio_group bottom_delta="-26" control_name="LinksForChattingObjects" tool_tip="Enables a link to show you the owner of the speaking object."
         follows="top" height="20" left="20" name="objects_link" width="350">
         <radio_item bottom_delta="0" left_delta="5" name="no_object" width="48">No object</radio_item>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
index d8d200259..2a1b8255b 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_network.xml
@@ -24,7 +24,7 @@
 	<text bottom_delta="-26" follows="top" height="10" left="12" name="socks5_host_label">Socks 5 Host:</text>
 	<line_editor bottom_delta="-6" follows="top" font="SansSerif" height="20" left="90" name="socks5_proxy_host" tool_tip="The name or IP address of the SOCKS5 proxy you would like to use" width="311"/>
 	<spinner bottom_delta="-30" decimal_digits="0" follows="top" height="16" increment="1" initial_val="80" label="Port Number:" label_width="75" max_val="65535" min_val="0" name="socks5_proxy_port" width="140"/>
-	<text bottom_delta="-20" follows="top" height="10" left="12" name="socks5_auth_label">Socks5 Authentication:</text>
+	<text bottom_delta="-20" follows="top" height="10" left="12" name="socks5_auth_label2">Socks5 Authentication:</text>
 	<radio_group bottom_delta="-6" draw_border="false" follows="top" height="20" name="socks5_auth" width="420">
 		<radio_item bottom="0" height="20" left_delta="80" name="None" tool_tip="No authentication">None</radio_item>
 		<radio_item bottom="0" height="20" left_delta="50" name="UserPass" tool_tip="Username / Password authentication">Username/Password</radio_item>

From d31c062693093151605dec43fcff27c2edb0550a Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Wed, 4 Jul 2012 12:44:05 +0200
Subject: [PATCH 016/199] Fix building with libcwd

---
 indra/llinventory/llsaleinfo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llinventory/llsaleinfo.cpp b/indra/llinventory/llsaleinfo.cpp
index 930901f30..88e7da7ac 100644
--- a/indra/llinventory/llsaleinfo.cpp
+++ b/indra/llinventory/llsaleinfo.cpp
@@ -30,8 +30,8 @@
  * $/LicenseInfo$
  */
 
-#include <iostream>
 #include "linden_common.h"
+#include <iostream>
 
 #include "llsaleinfo.h"
 

From 8baceee06c27c1f1e5df541f028461bed37bb7dc Mon Sep 17 00:00:00 2001
From: Damian Zhaoying <damian.zhaoying@avataresargentinos.com.ar>
Date: Fri, 13 Jul 2012 06:23:37 -0300
Subject: [PATCH 017/199] Add Spanish Translation

---
 indra/newview/skins/default/xui/es/alerts.xml |    5 +
 .../skins/default/xui/es/floater_about.xml    |   47 +
 .../default/xui/es/floater_about_land.xml     |  594 ++
 .../xui/es/floater_active_speakers.xml        |   14 +
 .../xui/es/floater_animation_preview.xml      |  172 +
 .../skins/default/xui/es/floater_ao.xml       |   97 +
 .../default/xui/es/floater_area_search.xml    |   30 +
 .../xui/es/floater_asset_text_editor.xml      |    9 +
 .../skins/default/xui/es/floater_auction.xml  |   11 +
 .../default/xui/es/floater_audio_volume.xml   |    4 +
 .../default/xui/es/floater_avatar_picker.xml  |   50 +
 .../xui/es/floater_avatar_textures.xml        |   29 +
 .../skins/default/xui/es/floater_beacons.xml  |   17 +
 .../default/xui/es/floater_blacklist.xml      |   21 +
 .../default/xui/es/floater_build_options.xml  |   10 +
 .../default/xui/es/floater_bulk_perms.xml     |   56 +
 .../skins/default/xui/es/floater_bumps.xml    |   22 +
 .../default/xui/es/floater_buy_contents.xml   |   25 +
 .../default/xui/es/floater_buy_currency.xml   |   70 +
 .../skins/default/xui/es/floater_buy_land.xml |  256 +
 .../default/xui/es/floater_buy_object.xml     |   34 +
 .../skins/default/xui/es/floater_camera.xml   |   13 +
 .../default/xui/es/floater_chat_history.xml   |   96 +
 .../default/xui/es/floater_chatterbox.xml     |    8 +
 .../xui/es/floater_chatterbox_wolf.xml        |    5 +
 .../default/xui/es/floater_choose_group.xml   |   14 +
 .../skins/default/xui/es/floater_clothing.xml |   10 +
 .../default/xui/es/floater_color_picker.xml   |   41 +
 .../default/xui/es/floater_contact_groups.xml |   23 +
 .../skins/default/xui/es/floater_critical.xml |   13 +
 .../default/xui/es/floater_customize.xml      |  657 ++
 .../xui/es/floater_day_cycle_options.xml      |  113 +
 .../xui/es/floater_device_settings.xml        |    4 +
 .../default/xui/es/floater_dictionaries.xml   |   11 +
 .../default/xui/es/floater_directory.xml      |  451 +
 .../default/xui/es/floater_directory2.xml     |  638 ++
 .../default/xui/es/floater_directory3.xml     |  759 ++
 .../default/xui/es/floater_display_name.xml   |   25 +
 .../default/xui/es/floater_env_settings.xml   |   29 +
 .../xui/es/floater_explore_animations.xml     |    7 +
 .../default/xui/es/floater_explore_sounds.xml |   25 +
 .../default/xui/es/floater_fast_timers.xml    |   10 +
 .../default/xui/es/floater_font_test.xml      |   87 +
 .../skins/default/xui/es/floater_gesture.xml  |   20 +
 .../default/xui/es/floater_god_tools.xml      |  285 +
 .../default/xui/es/floater_group_titles.xml   |   10 +
 .../xui/es/floater_hardware_settings.xml      |   47 +
 .../skins/default/xui/es/floater_hex.xml      |   10 +
 .../skins/default/xui/es/floater_html.xml     |   15 +
 .../default/xui/es/floater_html_simple.xml    |    4 +
 .../skins/default/xui/es/floater_hud.xml      |    9 +
 .../skins/default/xui/es/floater_im.xml       |   47 +
 .../default/xui/es/floater_image_preview.xml  |   55 +
 .../skins/default/xui/es/floater_inspect.xml  |   16 +
 .../xui/es/floater_instant_message.xml        |   54 +
 .../xui/es/floater_instant_message_ad_hoc.xml |   43 +
 .../xui/es/floater_instant_message_group.xml  |   50 +
 .../default/xui/es/floater_inventory.xml      |  228 +
 .../xui/es/floater_inventory_backup.xml       |   10 +
 .../es/floater_inventory_backup_settings.xml  |   15 +
 .../es/floater_inventory_item_properties.xml  |   89 +
 .../xui/es/floater_inventory_view_finder.xml  |   35 +
 .../skins/default/xui/es/floater_joystick.xml |  124 +
 .../skins/default/xui/es/floater_lagmeter.xml |  155 +
 .../default/xui/es/floater_land_holdings.xml  |   40 +
 .../default/xui/es/floater_landmark_ctrl.xml  |   12 +
 .../default/xui/es/floater_live_lsleditor.xml |   13 +
 .../xui/es/floater_local_asset_browse.xml     |   53 +
 .../default/xui/es/floater_lsl_guide.xml      |    8 +
 .../default/xui/es/floater_media_browser.xml  |   36 +
 .../default/xui/es/floater_media_filter.xml   |   27 +
 .../default/xui/es/floater_mem_leaking.xml    |   18 +
 .../xui/es/floater_message_builder.xml        |   14 +
 .../default/xui/es/floater_message_log.xml    |   28 +
 .../skins/default/xui/es/floater_mini_map.xml |    4 +
 .../skins/default/xui/es/floater_moveview.xml |   17 +
 .../skins/default/xui/es/floater_mute.xml     |    7 +
 .../default/xui/es/floater_mute_object.xml    |   13 +
 .../default/xui/es/floater_my_friends.xml     |    7 +
 .../xui/es/floater_name_description.xml       |   13 +
 .../skins/default/xui/es/floater_new_im.xml   |    9 +
 .../xui/es/floater_new_local_inventory.xml    |   96 +
 .../xui/es/floater_new_outfit_dialog.xml      |   99 +
 .../default/xui/es/floater_notification.xml   |    8 +
 .../xui/es/floater_notifications_console.xml  |    7 +
 .../default/xui/es/floater_object_backup.xml  |    6 +
 .../default/xui/es/floater_object_im_info.xml |   20 +
 .../default/xui/es/floater_openobject.xml     |    9 +
 .../skins/default/xui/es/floater_pay.xml      |   26 +
 .../default/xui/es/floater_pay_object.xml     |   31 +
 .../default/xui/es/floater_perm_prefs.xml     |   16 +
 .../default/xui/es/floater_post_process.xml   |  141 +
 .../skins/default/xui/es/floater_postcard.xml |   54 +
 .../default/xui/es/floater_preferences.xml    |   28 +
 .../xui/es/floater_preview_animation.xml      |   32 +
 .../xui/es/floater_preview_classified.xml     |    9 +
 .../es/floater_preview_embedded_texture.xml   |    5 +
 .../default/xui/es/floater_preview_event.xml  |    8 +
 .../es/floater_preview_existing_landmark.xml  |    8 +
 .../xui/es/floater_preview_gesture.xml        |  108 +
 .../xui/es/floater_preview_new_landmark.xml   |    5 +
 .../xui/es/floater_preview_notecard.xml       |   68 +
 .../floater_preview_notecard_keep_discard.xml |   71 +
 .../default/xui/es/floater_preview_sound.xml  |   26 +
 .../xui/es/floater_preview_texture.xml        |   89 +
 .../floater_preview_texture_keep_discard.xml  |   29 +
 .../default/xui/es/floater_preview_url.xml    |    8 +
 .../xui/es/floater_price_for_listing.xml      |   25 +
 .../skins/default/xui/es/floater_profile.xml  |    4 +
 .../skins/default/xui/es/floater_radar.xml    |  329 +
 .../default/xui/es/floater_region_info.xml    |    4 +
 .../default/xui/es/floater_report_abuse.xml   |  246 +
 .../default/xui/es/floater_report_bug.xml     |  176 +
 .../default/xui/es/floater_rlv_behaviours.xml |   89 +
 .../default/xui/es/floater_rlv_locks.xml      |   12 +
 .../default/xui/es/floater_script_debug.xml   |   15 +
 .../xui/es/floater_script_ed_panel.xml        |   89 +
 .../default/xui/es/floater_script_preview.xml |   23 +
 .../default/xui/es/floater_script_queue.xml   |   13 +
 .../default/xui/es/floater_script_search.xml  |   40 +
 .../default/xui/es/floater_sculpt_preview.xml |   41 +
 .../default/xui/es/floater_search_replace.xml |   40 +
 .../default/xui/es/floater_select_key.xml     |   15 +
 .../default/xui/es/floater_sell_land.xml      |   99 +
 .../default/xui/es/floater_settings_debug.xml |   31 +
 .../xui/es/floater_sim_release_message.xml    |   21 +
 .../xui/es/floater_skin_preview_template.xml  |   80 +
 .../skins/default/xui/es/floater_snapshot.xml |  172 +
 .../default/xui/es/floater_sound_preview.xml  |   29 +
 .../default/xui/es/floater_statistics.xml     |   14 +
 .../skins/default/xui/es/floater_telehub.xml  |   43 +
 .../skins/default/xui/es/floater_teleport.xml |   55 +
 .../xui/es/floater_teleport_history.xml       |   28 +
 .../skins/default/xui/es/floater_test.xml     |    4 +
 .../default/xui/es/floater_texture_ctrl.xml   |  112 +
 .../skins/default/xui/es/floater_tools.xml    | 1552 ++++
 .../default/xui/es/floater_top_objects.xml    |   90 +
 .../skins/default/xui/es/floater_tos.xml      |   36 +
 .../default/xui/es/floater_url_entry.xml      |   21 +
 .../skins/default/xui/es/floater_vfs.xml      |    6 +
 .../default/xui/es/floater_vfs_explorer.xml   |    6 +
 .../default/xui/es/floater_voice_license.xml  |   39 +
 .../default/xui/es/floater_voice_wizard.xml   |   19 +
 .../skins/default/xui/es/floater_water.xml    |  260 +
 .../xui/es/floater_wearable_save_as.xml       |   25 +
 .../xui/es/floater_windlight_options.xml      |  593 ++
 .../default/xui/es/floater_world_map.xml      |  178 +
 indra/newview/skins/default/xui/es/fonts.xml  |  110 +
 .../skins/default/xui/es/menu_inventory.xml   |  230 +
 .../skins/default/xui/es/menu_login.xml       |   23 +
 .../skins/default/xui/es/menu_mini_map.xml    |   59 +
 .../default/xui/es/menu_pie_attachment.xml    |   47 +
 .../skins/default/xui/es/menu_pie_avatar.xml  |   63 +
 .../skins/default/xui/es/menu_pie_land.xml    |   29 +
 .../skins/default/xui/es/menu_pie_object.xml  |  101 +
 .../skins/default/xui/es/menu_pie_self.xml    |   98 +
 .../skins/default/xui/es/menu_slurl.xml       |   14 +
 .../skins/default/xui/es/menu_viewer.xml      |  666 ++
 .../skins/default/xui/es/mime_types_linux.xml |  478 ++
 .../skins/default/xui/es/mime_types_mac.xml   |  478 ++
 .../default/xui/es/mime_types_windows.xml     |  478 ++
 .../skins/default/xui/es/notifications.xml    | 7288 +++++++++++++++++
 indra/newview/skins/default/xui/es/notify.xml |    4 +
 .../skins/default/xui/es/panel_ao_remote.xml  |    5 +
 .../xui/es/panel_ao_remote_controls.xml       |    5 +
 .../xui/es/panel_ao_remote_expanded.xml       |    6 +
 .../skins/default/xui/es/panel_audio.xml      |   17 +
 .../default/xui/es/panel_audio_device.xml     |   27 +
 .../skins/default/xui/es/panel_avatar.xml     |  229 +
 .../xui/es/panel_avatar_classified.xml        |   37 +
 .../default/xui/es/panel_avatar_pick.xml      |   10 +
 .../skins/default/xui/es/panel_bars.xml       |    9 +
 .../skins/default/xui/es/panel_bg_tab.xml     |    4 +
 .../skins/default/xui/es/panel_bg_toolbar.xml |    4 +
 .../skins/default/xui/es/panel_chat_bar.xml   |   21 +
 .../skins/default/xui/es/panel_classified.xml |   31 +
 .../skins/default/xui/es/panel_event.xml      |   70 +
 .../skins/default/xui/es/panel_friends.xml    |   37 +
 .../skins/default/xui/es/panel_group.xml      |   20 +
 .../default/xui/es/panel_group_finder.xml     |   16 +
 .../default/xui/es/panel_group_general.xml    |   86 +
 .../default/xui/es/panel_group_invite.xml     |   24 +
 .../default/xui/es/panel_group_land_money.xml |   82 +
 .../default/xui/es/panel_group_notices.xml    |   73 +
 .../default/xui/es/panel_group_roles.xml      |  156 +
 .../default/xui/es/panel_group_voting.xml     |  214 +
 .../skins/default/xui/es/panel_groups.xml     |   52 +
 .../skins/default/xui/es/panel_hud.xml        |    4 +
 .../default/xui/es/panel_land_covenant.xml    |   60 +
 .../skins/default/xui/es/panel_login.xml      |   50 +
 .../default/xui/es/panel_master_volume.xml    |   15 +
 .../default/xui/es/panel_media_controls.xml   |   98 +
 .../skins/default/xui/es/panel_media_hud.xml  |   68 +
 .../default/xui/es/panel_media_remote.xml     |    7 +
 .../xui/es/panel_media_remote_expanded.xml    |   33 +
 .../skins/default/xui/es/panel_mini_map.xml   |   53 +
 .../xui/es/panel_notifications_channel.xml    |   16 +
 .../skins/default/xui/es/panel_overlaybar.xml |   78 +
 .../skins/default/xui/es/panel_place.xml      |   55 +
 .../default/xui/es/panel_place_small.xml      |   60 +
 .../xui/es/panel_preferences_ascent_chat.xml  |  134 +
 .../es/panel_preferences_ascent_system.xml    |  170 +
 .../es/panel_preferences_ascent_vanity.xml    |   66 +
 .../xui/es/panel_preferences_audio.xml        |   22 +
 .../default/xui/es/panel_preferences_chat.xml |   80 +
 .../xui/es/panel_preferences_general.xml      |  153 +
 .../xui/es/panel_preferences_graphics1.xml    |  189 +
 .../xui/es/panel_preferences_grids.xml        |   73 +
 .../default/xui/es/panel_preferences_im.xml   |   32 +
 .../xui/es/panel_preferences_input.xml        |   29 +
 .../xui/es/panel_preferences_network.xml      |   62 +
 .../xui/es/panel_preferences_popups.xml       |   19 +
 .../xui/es/panel_preferences_skins.xml        |   29 +
 .../xui/es/panel_preferences_voice.xml        |   41 +
 .../default/xui/es/panel_preferences_web.xml  |   28 +
 .../skins/default/xui/es/panel_progress.xml   |   22 +
 .../default/xui/es/panel_region_covenant.xml  |  142 +
 .../default/xui/es/panel_region_debug.xml     |   80 +
 .../default/xui/es/panel_region_estate.xml    |  145 +
 .../default/xui/es/panel_region_general.xml   |   98 +
 .../default/xui/es/panel_region_terrain.xml   |   60 +
 .../default/xui/es/panel_region_texture.xml   |   98 +
 .../default/xui/es/panel_scrolling_param.xml  |   42 +
 .../default/xui/es/panel_speaker_controls.xml |   31 +
 .../skins/default/xui/es/panel_status_bar.xml |   42 +
 .../skins/default/xui/es/panel_toolbar.xml    |   19 +
 .../skins/default/xui/es/panel_top_pick.xml   |   29 +
 .../default/xui/es/panel_voice_controls.xml   |   19 +
 .../default/xui/es/panel_voice_enable.xml     |   37 +
 .../default/xui/es/panel_voice_options.xml    |   43 +
 .../default/xui/es/panel_voice_remote.xml     |    8 +
 .../xui/es/panel_voice_remote_expanded.xml    |   20 +
 .../skins/default/xui/es/rlva_strings.xml     |   77 +
 .../skins/default/xui/es/role_actions.xml     |  180 +
 .../xui/es/sh_floater_media_ticker.xml        |   16 +
 .../es/sh_floater_media_ticker_visualizer.xml |   16 +
 .../newview/skins/default/xui/es/strings.xml  | 2672 ++++++
 .../skins/default/xui/es/teleport_strings.xml |   82 +
 .../skins/default/xui/es/ui_strings.xml       |   17 +
 .../default/xui/es/wlfPanel_AdvSettings.xml   |    5 +
 .../xui/es/wlfPanel_AdvSettings_expanded.xml  |   22 +
 .../skins/default/xui/es/xui_version.xml      |    4 +
 242 files changed, 29084 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/es/alerts.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_about.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_about_land.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_active_speakers.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_animation_preview.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_ao.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_area_search.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_asset_text_editor.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_auction.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_audio_volume.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_avatar_picker.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_avatar_textures.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_beacons.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_blacklist.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_build_options.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_bulk_perms.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_bumps.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_buy_contents.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_buy_currency.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_buy_land.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_buy_object.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_camera.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_chat_history.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_chatterbox.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_chatterbox_wolf.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_choose_group.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_clothing.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_color_picker.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_contact_groups.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_critical.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_customize.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_device_settings.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_dictionaries.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_directory.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_directory2.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_directory3.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_display_name.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_env_settings.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_explore_animations.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_explore_sounds.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_fast_timers.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_font_test.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_gesture.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_god_tools.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_group_titles.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_hardware_settings.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_hex.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_html.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_html_simple.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_hud.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_im.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_image_preview.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_inspect.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_instant_message.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_instant_message_ad_hoc.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_instant_message_group.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_inventory.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_inventory_backup.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_inventory_backup_settings.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_joystick.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_lagmeter.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_land_holdings.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_landmark_ctrl.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_local_asset_browse.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_lsl_guide.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_media_browser.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_media_filter.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_mem_leaking.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_message_builder.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_message_log.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_mini_map.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_moveview.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_mute.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_mute_object.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_my_friends.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_name_description.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_new_im.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_new_local_inventory.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_new_outfit_dialog.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_notification.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_notifications_console.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_object_backup.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_object_im_info.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_openobject.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_pay.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_pay_object.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_perm_prefs.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_post_process.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_postcard.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_preferences.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_preview_animation.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_preview_classified.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_preview_embedded_texture.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_preview_event.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_preview_existing_landmark.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_preview_gesture.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_preview_new_landmark.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_preview_notecard.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_preview_notecard_keep_discard.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_preview_sound.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_preview_texture.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_preview_texture_keep_discard.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_preview_url.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_price_for_listing.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_profile.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_radar.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_region_info.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_report_abuse.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_report_bug.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_rlv_behaviours.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_rlv_locks.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_script_debug.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_script_ed_panel.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_script_preview.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_script_queue.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_script_search.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_sculpt_preview.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_search_replace.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_select_key.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_sell_land.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_settings_debug.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_sim_release_message.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_skin_preview_template.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_snapshot.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_sound_preview.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_statistics.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_telehub.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_teleport.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_teleport_history.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_test.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_tools.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_top_objects.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_tos.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_url_entry.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_vfs.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_vfs_explorer.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_voice_license.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_voice_wizard.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_water.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_wearable_save_as.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_windlight_options.xml
 create mode 100644 indra/newview/skins/default/xui/es/floater_world_map.xml
 create mode 100644 indra/newview/skins/default/xui/es/fonts.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_inventory.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_login.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_mini_map.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_pie_attachment.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_pie_avatar.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_pie_land.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_pie_object.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_pie_self.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_slurl.xml
 create mode 100644 indra/newview/skins/default/xui/es/menu_viewer.xml
 create mode 100644 indra/newview/skins/default/xui/es/mime_types_linux.xml
 create mode 100644 indra/newview/skins/default/xui/es/mime_types_mac.xml
 create mode 100644 indra/newview/skins/default/xui/es/mime_types_windows.xml
 create mode 100644 indra/newview/skins/default/xui/es/notifications.xml
 create mode 100644 indra/newview/skins/default/xui/es/notify.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_ao_remote.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_ao_remote_controls.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_ao_remote_expanded.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_audio.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_audio_device.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_avatar.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_avatar_classified.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_avatar_pick.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_bars.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_bg_tab.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_bg_toolbar.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_chat_bar.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_classified.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_event.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_friends.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_group.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_group_finder.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_group_general.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_group_invite.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_group_land_money.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_group_notices.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_group_roles.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_group_voting.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_groups.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_hud.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_land_covenant.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_login.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_master_volume.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_media_controls.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_media_hud.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_media_remote.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_media_remote_expanded.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_mini_map.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_notifications_channel.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_overlaybar.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_place.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_place_small.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_preferences_ascent_chat.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_preferences_audio.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_preferences_chat.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_preferences_general.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_preferences_grids.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_preferences_im.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_preferences_input.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_preferences_network.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_preferences_popups.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_preferences_skins.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_preferences_voice.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_preferences_web.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_progress.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_region_covenant.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_region_debug.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_region_estate.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_region_general.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_region_terrain.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_region_texture.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_scrolling_param.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_speaker_controls.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_status_bar.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_toolbar.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_top_pick.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_voice_controls.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_voice_enable.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_voice_options.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_voice_remote.xml
 create mode 100644 indra/newview/skins/default/xui/es/panel_voice_remote_expanded.xml
 create mode 100644 indra/newview/skins/default/xui/es/rlva_strings.xml
 create mode 100644 indra/newview/skins/default/xui/es/role_actions.xml
 create mode 100644 indra/newview/skins/default/xui/es/sh_floater_media_ticker.xml
 create mode 100644 indra/newview/skins/default/xui/es/sh_floater_media_ticker_visualizer.xml
 create mode 100644 indra/newview/skins/default/xui/es/strings.xml
 create mode 100644 indra/newview/skins/default/xui/es/teleport_strings.xml
 create mode 100644 indra/newview/skins/default/xui/es/ui_strings.xml
 create mode 100644 indra/newview/skins/default/xui/es/wlfPanel_AdvSettings.xml
 create mode 100644 indra/newview/skins/default/xui/es/wlfPanel_AdvSettings_expanded.xml
 create mode 100644 indra/newview/skins/default/xui/es/xui_version.xml

diff --git a/indra/newview/skins/default/xui/es/alerts.xml b/indra/newview/skins/default/xui/es/alerts.xml
new file mode 100644
index 000000000..e2ac429e4
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/alerts.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<alerts>
+</alerts>
+
+<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
new file mode 100644
index 000000000..a7484f4f3
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_about" title="Acerca de Singularity Viewer">
+	  <tab_container name="about_tab">
+			 <panel label="Información" help_topic="about_support_tab" name="support_panel">
+					<button label="Copiar al portapapeles" name="copy_btn"/>
+			 </panel>
+			 <panel label="Créditos" help_topic="about_credits_tab" name="credits_panel">
+					<text_editor name="credits_editor">
+Singularity Viewer es desarrollado y mantenido por Siana Gearz, Shyotl Kuhr, Aleric Inglewood and Narv Czervik, con contribuciones de Henri Beauchamp, Kitty Barnett, Thickbrick Sleaford, Zauber Parecelsus, Wolfspirit Magic y otros. Singularity está basado en el código fuente del Visor  Ascent. Los créditos del Visor Ascent incluyen a Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, y otros. El Visor Ascent está basado en el código fuente del visor Inertia.
+
+Singularity Viewer incluye código fuente aportado por los siguientes residentes: Able Whitman, Adam Marker, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Argent Stonecutter, Asuka Neely, Balp Allen, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fractured Crystal, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kunnis Basiat, Lisa Lowe, Lockhart Cordoso, maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas, Franxisco Romano, Damian Zhaoying
+
+Second Life llega a ti gracias a 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, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl y muchos otro más.
+
+Linden Lab agradece a los siguientes residentes: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
+
+
+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.
+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.
+google-perftools Copyright (c) 2005, Google Inc.
+
+All rights reserved.  ver licenses.txt para mayor información.
+
+Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+
+
+Para ser exitoso en los negocios, se audaz, se el primero, se diferente. --Henry Marchant</text_editor>
+			 </panel>
+	  </tab_container>  
+	  <string name="you_are_at">
+			 Estás en [POSITION]
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
new file mode 100644
index 000000000..9bfbfd172
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -0,0 +1,594 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floaterland" title="Acerca del terreno">
+	  <tab_container name="landtab">
+			 <!-- Panel General -->
+			 <panel label="General" name="land_general_panel">
+					<text name="Name:">
+						  Nombre:
+					</text>
+					<text name="Description:">
+						  Descripción:
+					</text>
+					<text name="LandType">
+						  Tipo:
+					</text>
+					<text name="LandTypeText">
+						  Mainland / Homestead
+					</text>
+					<text name="ContentRating">
+						  Calificación:
+					</text>
+					<text name="ContentRatingText">
+						  Adulto
+					</text>
+					<text name="Owner:">
+						  Propietario:
+					</text>
+					<text name="OwnerText">
+						  Leyla Linden
+					</text>
+					<button label="Perfil..." label_selected="Perfil..." name="Profile..."/>
+					<string name="group_owned_text">
+						  (Propiedad del Grupo)
+					</string>
+					<string name="profile_text">
+						  Perfil...
+					</string>
+					<string name="info_text">
+						  Información...
+					</string>
+					<string name="public_text">
+						  (público)
+					</string>
+					<string name="none_text">
+						  (ninguno)
+					</string>					
+					<text name="Group:">
+						  Grupo:
+					</text>
+					<button label="Definir..." label_selected="Definir..." name="Set..."/>
+					<button bottom="-160"  label="Info" name="group_profile"/>
+					<check_box label="Permitir transferir al grupo" name="check deed" tool_tip="Un oficial del grupo puede transferir este terreno al grupo. El terreno será sostenido por el grupo en sus asignaciones de terreno."/>
+					<button label="Transferir..." label_selected="Transferir..." name="Deed..." tool_tip="Sólo puedes transferir un terreno si eres un oficial del grupo seleccionado."/>
+					<check_box label="El propietario hace una contribución transfiriendo" name="check contrib" tool_tip="Cuando el terreno se transfiere al grupo, el antiguo propietario contribuye con una asignación suficiente de terreno."/>
+					<text name="For Sale:">
+						  En Venta:
+					</text>
+					<text name="Not for sale.">
+						  No está en Venta.
+					</text>
+					<text name="For Sale: Price L$[PRICE].">
+						  Precio: [CURRENCY][PRICE] ([CURRENCY][PRICE_PER_SQM]/m².).
+					</text>
+					<text name="SalePending"/>
+					<button label="Vender el Terreno..." label_selected="Vender el Terreno..." name="Sell Land..."/>
+					<text name="For sale to">
+						  En venta a: [BUYER]
+					</text>
+					<text name="Sell with landowners objects in parcel.">
+						  Los objetos se incluyen en la venta.
+					</text>
+					<text name="Selling with no objects in parcel.">
+						  Los objetos no se incluyen en la venta.
+					</text>
+					<button label="Cancelar la venta del terreno" label_selected="Cancelar la venta del terreno" name="Cancel Land Sale"/>
+					<text name="Claimed:">
+						  Reclamada:
+					</text>
+					<text name="DateClaimText">
+						  Mar 15 Ago 13:47:25 2006
+					</text>
+					<text name="PriceLabel">
+						  Superficie:
+					</text>
+					<text name="PriceText">
+						  4048 m²
+					</text>
+					<text name="Traffic:">
+						  Tráfico:
+					</text>
+					<text name="DwellText">
+						  0
+					</text>
+					<button label="Comprar terreno..." label_selected="Comprar terreno..." name="Buy Land..." width="120"/>
+					<button label="Comprar para el grupo..." label_selected="Comprar para el grupo..." name="Buy For Group..." width="160" left="280"/>
+					<button label="Comprar un Pase..." label_selected="Comprar un Pase..." name="Buy Pass..." tool_tip="Un pase te da acceso temporal a este terreno." width="120"/>
+					<button label="Abandonar terreno..." label_selected="Abandonar terreno..." name="Abandon Land..." width="160" left="280"/>
+					<button label="Reclamar tereno..." label_selected="Reclamar terreno..." name="Reclaim Land..."/>
+					<button label="Venta Linden..." label_selected="Venta Linden..." name="Linden Sale..." tool_tip="El terreno debe estar en propiedad, con contenido, y no estar en subasta."/>
+					<string name="new users only">
+						  Sólo usuarios nuevos
+					</string>
+					<string name="anyone">
+						  Cualquiera
+					</string>
+					<string name="area_text">
+						  Superficie
+					</string>
+					<string name="area_size_text">
+						  [AREA] m²
+					</string>
+					<string name="auction_id_text">
+						  ID de la subasta: [ID]
+					</string>
+					<string name="need_tier_to_modify">
+						  Debe aprobar su compra para modificar este terreno.
+					</string>
+					<string name="sale_pending_text">
+						  (Venta pendiente)
+					</string>
+					<string name="no_selection_text">
+						  No se ha seleccionado una parcela.
+Ve al Menú Mundo > Acerca del terreno o selecciona otra parcela para ver sus características.
+					</string>
+			 </panel>
+			 <!-- Panel Convenio -->
+			 <panel label="Convenio" name="land_covenant_panel" >
+					<text name="estate_section_lbl">
+						  Estado:
+					</text>
+					<text name="estate_name_lbl">
+						  Nombre:
+					</text>
+					<text name="estate_name_text">
+						  mainland
+					</text>
+					<text name="estate_owner_lbl">
+						  Propietario:
+					</text>
+					<text name="estate_owner_text">
+						  (ninguno)
+					</text>
+					<text_editor name="covenant_editor">
+						  No se ha aportado un contrato para este estado.
+					</text_editor>
+					<text name="covenant_timestamp_text">
+						  Última modificación Mie 31 Dic 16:00:00 1969
+					</text>
+					<text name="region_section_lbl">
+						  Región:
+					</text>
+					<text name="region_name_lbl">
+						  Nombre:
+					</text>
+					<text name="region_name_text">
+						  leyla
+					</text>
+					<text name="region_landtype_lbl">
+						  Tipo:
+					</text>
+					<text name="region_landtype_text">
+						  Mainland / Homestead
+					</text>
+					<text name="region_maturity_lbl">
+						  Calificación:
+					</text>
+					<text name="region_maturity_text">
+						  Adulto
+					</text>
+					<text name="resellable_lbl">
+						  Revender:
+					</text>
+					<text name="resellable_clause">
+						  El terreno de esta región no se podrá revender.
+					</text>
+					<text name="changeable_lbl">
+						  Subdividir:
+					</text>
+					<text name="changeable_clause">
+						  El terreno de esta región no se podrá unir/subdividir.
+					</text>
+					<string name="can_resell">
+						  El terreno comprado en esta región se podrá revender.
+					</string>
+					<string name="can_not_resell">
+						  El terreno comprado en esta región no se podrá revender.
+					</string>
+					<string name="can_change">
+						  El terreno comprado en esta región se podrá unir o subdividir.
+					</string>
+					<string name="can_not_change">
+						  El terreno comprado en esta región no se podrá unir o dividir.
+					</string>
+			 </panel>
+			 <!-- Panel Objetos -->
+			 <panel label="Objetos" name="land_objects_panel">
+					<text name="parcel_object_bonus">
+						  Plus de Objectos en la Región: [BONUS]
+					</text>
+					<text name="Simulator primitive usage:">
+						  Uso de primitivas en el Simulador:
+					</text>
+					<text name="objects_available" left="180" width="250">
+						  [COUNT] de un máximo de [MAX] ([AVAILABLE] disponibles)
+					</text>
+					<string name="objects_available_text" left="180" width="250">
+						  [COUNT] de un máximo de  [MAX] ([AVAILABLE] disponibles)
+					</string>
+					<string name="objects_deleted_text" left="180" width="250">
+						  [COUNT] de un máximo de [MAX] ([DELETED] serán borrados)
+					</string>
+					<text name="Primitives parcel supports:">
+						  Prims que acepta la parcela:
+					</text>
+					<text name="object_contrib_text" left="180">
+						  [COUNT]
+					</text>
+					<text name="Primitives on parcel:">
+						  Prims en la parcela:
+					</text>
+					<text name="total_objects_text" left="180">
+						  [COUNT]
+					</text>
+					<text name="Owned by parcel owner:">
+						  Del propietario de la parcela:
+					</text>
+					<text name="owner_objects_text" left="180">
+						  [COUNT]
+					</text>
+					<button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-150"/>
+					<button label="Retornar..." label_selected="Retornar..." name="ReturnOwner..." tool_tip="Return objects to their owners." right="-20"/>
+					<text name="Set to group:">
+						  Del grupo:
+					</text>
+					<text name="group_objects_text" left="180">
+						  [COUNT]
+					</text>
+					<button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-150"/>
+					<button label="Retornar..." label_selected="Retornar..." name="ReturnGroup..." tool_tip="Retornar objetos a sus propietarios." right="-20"/>
+					<text name="Owned by others:">
+						  Propiedad de Otros:
+					</text>
+					<text name="other_objects_text" left="180">
+						  [COUNT]
+					</text>
+					<button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-150"/>
+					<button label="Retornar..." label_selected="Retornar..." name="ReturnOther..." tool_tip="Retornar objetos a sus propietarios." right="-20"/>
+					<text name="Selected / sat upon:">
+						  Selecc./con gente sentada:
+					</text>
+					<text name="selected_objects_text" left="180">
+						  [COUNT]
+					</text>
+					<text name="Autoreturn" width="350">
+						  Autoretorno de objetos a otros residentes (minutos; 0 para desactivar):
+					</text>
+					<line_editor name="clean other time" right="-25"/>
+					<text name="Object Owners:" width="250">
+						  Propietarios de los objetos:
+					</text>
+					<button label="Actualizar la lista" label_selected="Actualizar la lista" name="Refresh List" left="190" widht="50"/>
+					<button label="Retornar objetos..." label_selected="Retornar objetos..." name="Return objects..." left="300" width="120"/>
+					<name_list name="owner list">
+						  <column name="type" label="Tipo"/>
+						  <column name="online_status"/>
+						  <column name="name" label="Nombre" />
+						  <column name="count" label="Cantidad"/>
+						  <column name="mostrecent" label="Recientes"/>
+					</name_list>
+					</panel>
+					<!-- Panel de Opciones -->
+					<panel label="Opciones" name="land_options_panel">
+						  <text name="allow_label">
+								 Permitir a otros residentes:
+						  </text>
+						  <check_box label="Editar Terreno" name="edit land check" tool_tip="Si se marca, cualquiera podrá modificar tu terreno. Mejor dejarlo desmarcado, pues siempre puedes modificar tu terreno."/>
+						  <check_box label="Crear Hitos" name="check landmark"/>
+						  <check_box label="Volar" name="check fly" tool_tip="Si se marca, los residentes podrán volar en tu terreno. Si no, sólo podrán volar al cruzarlo o hasta que aterricen en él."/>
+						  <text name="allow_label2" left="160">
+								 Crear Objetos:
+						  </text>
+						  <check_box label="Todos los Residentes" name="edit objects check" left="240"/>
+						  <check_box label="Grupo" name="edit group objects check"/>
+						  <text name="allow_label3" left="160">
+								 Dejar Objetos:
+						  </text>
+						  <check_box label="Todos los Residentes" name="all object entry check" left="240"/>
+						  <check_box label="Grupo" name="group object entry check"/>
+						  <text name="allow_label4" left="160">
+								 Ejecutar Scripts:
+						  </text>
+						  <check_box label="Todos los Residentes" name="check other scripts" left="240"/>
+						  <check_box label="Grupo" name="check group scripts"/>
+						  <text name="land_options_label">
+								 Opciones del terreno:
+						  </text>
+						  <check_box label="Seguro (sin daño)" name="check safe" tool_tip="Marcado, convierte el terreno en &apos;seguro&apos;, desactivando el daño en combate. Si no, se activa el daño en combate."/>
+						  <string name="push_restrict_text">
+								 Sin empujones
+						  </string>
+						  <string name="push_restrict_region_text">
+								 Sin empujones (Prevalece lo marcado en la Región)
+						  </string>						  
+						  <check_box name="PushRestrictCheck" tool_tip="Previene scripts que empujen. Marcando esta opción evitará que en tu terreno haya comportamientos destructivos."/>
+						  <check_box label="Mostrar parcela en la busqueda ([DIRECTORYFEE]) en" left="14" name="ShowDirectoryCheck" tool_tip="Permitir que aparezca esta parcela en los resultados de la búsqueda"/>
+						  <string name="search_enabled_tooltip">
+								 Permitir que aparezca esta parcela en los resultados de la búsqueda
+						  </string>
+						  <string name="search_disabled_small_tooltip">
+								 Esta opción está desactivada porque la parcela tiene 128 m² o menos.
+Sólo las parcelas más grandes pueden listarse en la búsqueda.
+						  </string>
+						  <string name="search_disabled_permissions_tooltip">
+										Esta opción no esta activada porque no puedes modificar las opciones de la parcela.
+						  </string>
+						  <combo_box name="land category with adult" left="280">
+								 <combo_item name="AnyCategory" value="any">
+										Cualquier Categoría
+								 </combo_item>
+								 <combo_item name="LindenLocation" value="linden">
+										Localización Linden
+								 </combo_item>
+								 <combo_item name="Adult" value="adult">
+										Adulto
+								 </combo_item>
+								 <combo_item name="Arts&amp;Culture" value="arts">
+										Arte y Cultura
+								 </combo_item>
+								 <combo_item name="Business" value="store">
+										Negocios
+								 </combo_item>
+								 <combo_item name="Educational" value="educational">
+										Educativo
+								 </combo_item>
+								 <combo_item name="Gaming" value="game">
+										Juegos de azar
+								 </combo_item>
+								 <combo_item name="Hangout" value="gather">
+										Entretenimiento
+								 </combo_item>
+								 <combo_item name="NewcomerFriendly" value="newcomer">
+										Para recién llegados
+								 </combo_item>
+								 <combo_item name="Parks&amp;Nature" value="park">
+										Parques y Naturaleza
+								 </combo_item>
+								 <combo_item name="Residential" value="home">
+										Residencial
+								 </combo_item>
+								 <combo_item name="Shopping" value="shopping">
+										Compras
+								 </combo_item>
+								 <combo_item name="Other" value="other">
+										Otros
+								 </combo_item>
+								 <combo_item name="Rental" value="rental">
+										Alquiler
+								 </combo_item>
+						  </combo_box>
+						  <!-- The following combo box is identical to the previous one, except for the
+						  fact that the Adult item is missing. This seems to be the only way to safely
+						  delete the adult item with our UI toolkit.
+						  Once we have completed the transition period, the one WITH adult can be deleted. -->
+						  <combo_box name="land category" left="280">
+								 <combo_item name="AnyCategory" value="any">
+										Cualquier Categoría
+								 </combo_item>
+								 <combo_item name="LindenLocation" value="linden">
+										Localización Linden
+								 </combo_item>
+								 <combo_item name="Arts&amp;Culture" value="arts">
+										Arte y Cultura
+								 </combo_item>
+								 <combo_item name="Business" value="store">
+										Negocios
+								 </combo_item>
+								 <combo_item name="Educational" value="educational">
+										Educativo
+								 </combo_item>
+								 <combo_item name="Gaming" value="game">
+										Juegos de Azar
+								 </combo_item>
+								 <combo_item name="Hangout" value="gather">
+										Entretenimiento
+								 </combo_item>
+								 <combo_item name="NewcomerFriendly" value="newcomer">
+										Para recién llegados
+								 </combo_item>
+								 <combo_item name="Parks&amp;Nature" value="park">
+										Parques y Naturaleza
+								 </combo_item>
+								 <combo_item name="Residential" value="home">
+										Residencial
+								 </combo_item>
+								 <combo_item name="Shopping" value="shopping">
+										Compras
+								 </combo_item>
+								 <combo_item name="Other" value="other">
+										Otros
+								 </combo_item>
+								 <combo_item name="Rental" value="rental">
+										Alquiler
+								 </combo_item>
+						  </combo_box>
+						  <button label="?" label_selected="?" name="?" left="420"/>
+						  <check_box label="Contenido Mature" name="MatureCheck"/>
+						  <string name="mature_check_mature">
+								 Contenido Mature
+						  </string>
+						  <string name="mature_check_adult">
+								 Contenido Adulto
+						  </string>
+						  <string name="mature_check_mature_tooltip">
+								 La información o el contenido de su parcela se considera mature.
+						  </string>
+						  <string name="mature_check_adult_tooltip">
+								 La información o el contenido de su parcela se considera adulto.
+						  </string>
+						  <text name="allow_label5">
+								 Permitir a residentes en otras parcelas:
+						  </text>
+						  <check_box label="Ver Avatares" name="SeeAvatarsCheck" tool_tip="Premite a los residentes en otras parcelas ver y conversar con los residentes en esta parcela, y tu prodrás verlos y conversar también con ellos."/>
+						  <string name="see_avs_text">
+								 Ver y conversar con residentes en esta parcela
+						  </string>
+						  <text name="Snapshot:">
+								 Foto:
+						  </text>
+						  <texture_picker name="snapshot_ctrl" tool_tip="Pulsa aquí para elegir una imagen"/>
+						  <text name="landing_point">
+								 Punto de llegada: [LANDING]
+						  </text>
+						  <string name="landing_point_none">
+								 (ninguno)
+						  </string>
+						  <button label="Definir" label_selected="Definir" name="Set" tool_tip="Configura el punto de llegada donde aparecerán los visitantes. Configúralo a la posición de tu avatar dentro de esta parcela."/>
+						  <button label="Borrar" label_selected="Borrar" name="Clear" tool_tip="Borra el punto de llegada."/>
+						  <text name="Teleport Routing: ">
+								 Punto de Teleporte:
+						  </text>
+						  <combo_box name="landing type" tool_tip="Punto de Teleporte -- define como manejar los teleportes en tu terreno.">
+								 <combo_item name="Blocked" value="Blocked">
+										Bloqueado
+								 </combo_item>
+								 <combo_item name="LandingPoint" value="Landing Point">
+										Punto de Llegada
+								 </combo_item>
+								 <combo_item name="Anywhere" value="Anywhere">
+										Cualquiera
+								 </combo_item>
+						  </combo_box>
+			 </panel>
+			 <!-- Panel de Media -->
+			 <panel label="Media" name="land_media_panel" >
+					<text name="with media:" width="70">
+						  Tipo de media:
+					</text>
+					<combo_box name="media type" tool_tip="Especifica si la URL es una película, página web u otro tipo de media" left="90"/>
+					<text name="mime_type" />
+					<text name="at URL:">
+						  URL base:
+					</text>
+					<line_editor name="media_url"/>
+					<button label="Definir..." label_selected="Definir..." name="set_media_url"/>
+					<text name="at URL2:">
+						  URL actual:
+					</text>
+					<text name="current_url"/>
+					<button label="Reiniciar..." label_selected="Reiniciar..." name="reset_media_url"/>
+					<text name="media_reset" tool_tip="Tiempo transcurrido para revertir al URL por defecto de la parcela (0 para no retornar el valor defecto)" width="300">
+						  Retornar al URL por defecto en:
+					</text>
+					<spinner name="media_reset_time" tool_tip="Tiempo transcurrido para revertir al URL por defecto de la parcela (0 para no retornar el valor defecto)" left_delta="170"/>
+					<text name="minutes">
+						  minutos
+					</text>
+					<text name="Description:">
+						  Descripción:
+					</text>
+					<line_editor name="url_description" tool_tip="Texto mostrado al lado del botón Ejecutar/Cargar" />
+					<text name="Media texture:">
+						  Textura:
+					</text>
+					<texture_picker label="" name="media texture" tool_tip="Pulsa aquí para elegir una textura"/>
+					<text name="replace_texture_help">
+						  Los objetos que usen esta textura mostrarán la
+película o la web cuando pulse la flecha de ejecución.
+
+Selecciona la miniatura para elegir una textura diferente.
+					</text>
+					<text name="Options:">
+						  Opciones:
+					</text>
+					<check_box label="Bucle" name="media_loop" tool_tip="El media se ejecuta en bucle permanente. Cuando haya terminado su ejecución, se reiniciará desde el comienzo."/>
+					<check_box label="Escala automática" name="media_auto_scale" tool_tip="Marcando esta opción, se ajustará el tamaño del contenido automáticamente. Puede ser ligeramente más lento y con menor calidad visual, pero no tendrás que ajustar ni alinear ninguna textura."/>
+					<text name="media_size" tool_tip="Tamaño para mostrar la webs, déjalo en  0 para el valor por defecto."  width="100">
+						  Tamaño de Media:
+					</text>
+					<spinner name="media_size_width" tool_tip="Ancho para mostrar la webs, déjalo en  0 para el valor por defecto." left="110"/>
+					<spinner name="media_size_height" tool_tip="Alto para mostrar la webs, déjalo en  0 para el valor por defecto."/>
+					<text name="pixels">
+						  pixeles
+					</text>
+					<text name="Interaction:">
+						  Interactivo:
+					</text>
+					<radio_group name="radio_navigate_allow">
+						  <radio_item name="Anyone" tool_tip="Cualquier residente puede interactuar con el media.">
+								 Cualquiera
+						  </radio_item>
+						  <radio_item name="Group" tool_tip="Sólo miembros del Grupo con permiso de control puede interactuar con el media.">
+								 Grupo
+						  </radio_item>
+					</radio_group>
+					<check_box label="Permitir navegar solamente en estos dominios:" name="check navigate filter" />
+					<line_editor name="navigate_filter_domain" />
+					<button label="Agregar..." label_selected="Agregar.." name="add_navigate_filter"/>
+					<scroll_list name="filter_list" >
+						  <column label="Dominio" name="domain" sort="domain"/>
+					</scroll_list>
+					<button label="Quitar" label_selected="Quitar" name="remove_navigate_filter"/>
+			 </panel>
+			 <!-- Panel de Audio -->
+			 <panel name="land_audio_panel">
+					<text name="MusicURL:">
+						  URL de la música:
+					</text>
+					<line_editor name="music_url" left="110"/>
+					<text name="Sound:">
+						  Música:
+					</text>
+					<check_box label="Restringir gestos y sonidos de objetos a esta parcela" name="check_sound_local"/>
+					<button label="?" label_selected="?" name="?"/>
+					<text name="Avatar Sounds:">
+						  Sonidos de Avatares:
+					</text>
+					<check_box label="Cualquiera" name="all av sound check"/>
+					<check_box label="Grupo" name="group av sound check"/>
+					<text name="Voice:">
+						  Voz:
+					</text>
+					<radio_group name="parcel_voice_channel">
+						  <radio_item name="Estate" tool_tip="Utilizar el canal de voz del estado.">
+								 Canal del Estado
+						  </radio_item>
+						  <radio_item name="Parcel" tool_tip="Restringir la Voz a esta parcela.">
+								 Canal de la Parcela
+						  </radio_item>
+						  <radio_item name="Disabled" tool_tip="Deshabilitar la voz en esta parcela.">
+								 Deshabilitada
+						  </radio_item>
+					</radio_group>
+			 </panel>
+			 <!-- Panel de Acceso -->
+			 <panel label="Acceso" name="land_access_panel">
+					<text name="Limit access to this parcel to:">
+						  Acceso a esta parcela
+					</text>
+					<check_box label="Permitir Acceso Público" name="public_access"/>
+					<text name="Only Allow">
+						  Bloquear acceso por:
+					</text>
+					<check_box label="Residentes que no tengan información de pago en archivo" name="limit_payment" tool_tip="Prohibir a residentes no identificados."/>
+					<check_box label="Residentes no verificados como adultos" name="limit_age_verified" tool_tip="Prohibir a los residentes que no han verificado su edad. Ver support.secondlife.com para mayor información."/>
+					<string name="estate_override">
+						  Una o mas de estas opciones está configurada a nivel del Estado
+					</string>
+					<check_box label="Permitir Acceso al Grupo: [GROUP]" name="GroupCheck" tool_tip="Definir el Grupo en la pestaña General."/>
+					<check_box label="Vender pases para:" name="PassCheck" tool_tip="Permitir acceso temporario a esta parcela"/>
+					<combo_box name="pass_combo">
+					<combo_item name="Anyone" value="anyone">
+						  Cualquiera
+					</combo_item>
+					<combo_item name="Group" value="group">
+						  Grupo
+					</combo_item>
+					</combo_box>
+					<spinner label="Precio en [CURRENCY]:" name="PriceSpin"/>
+					<spinner label="Horas de acceso:" name="HoursSpin"/>
+					<text label="Permitir siempre" name="AllowedText">
+						  Residentes permitidos
+					</text>
+					<name_list name="AccessList" tool_tip="([LISTED] listados, [MAX] max)"/>
+					<button label="Agregar..." label_selected="Agregar..." name="add_allowed"/>
+					<button label="Quitar" label_selected="Quitar" name="remove_allowed"/>
+					<text label="Ban" name="BanCheck">
+						  Residentes prohibidos
+					</text>
+					<name_list name="BannedList" tool_tip="([LISTED] listados, [MAX] max)"/>
+					<button label="Agregar..." label_selected="Agregar..." name="add_banned"/>
+					<button label="Quitar" label_selected="Quitar" name="remove_banned"/>
+			 </panel>
+	  </tab_container>
+</floater>
+<!--   -->
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_active_speakers.xml b/indra/newview/skins/default/xui/es/floater_active_speakers.xml
new file mode 100644
index 000000000..ba202b456
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_active_speakers.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="active_speakers" title="Participantes Activos">
+	  <panel name="active_speakers_panel">
+			 <scroll_list name="speakers_list">
+					<column name="icon_speaking_status"/>
+					<column label="Nombre" name="speaker_name" />
+					<column label="" name="speaking_status"/>
+			 </scroll_list>
+			 <panel name="volume_container">
+					<volume_slider name="speaker_volume" />
+					<button label="" name="mute_btn" tool_tip="Ignorar la voz de este residente"/>
+			 </panel>
+	  </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_animation_preview.xml b/indra/newview/skins/default/xui/es/floater_animation_preview.xml
new file mode 100644
index 000000000..a398dac25
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_animation_preview.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Animation Preview" >
+	  <pad height="12" />
+	  <text name="name_label">
+			 Nombre:
+	  </text>
+	  <line_editor name="name_form"/>
+	  <text name="description_label">
+			 Descripción:
+	  </text>
+	  <line_editor name="description_form"/>
+	  <pad height="0" />
+	  <spinner label="Prioridad" name="priority" tool_tip="Controla qué otras animaciones pueden ser anuladas por ésta."/>
+	  <check_box label="Bucle" name="loop_check" tool_tip="Haz esta animación en bucle." />
+	  <spinner label="Inicio(%)"  label_width="40" name="loop_in_point" tool_tip="Indica el punto en el que la animación empieza el bucle." left="85" />
+	  <spinner label="Fin(%)"  label_width="30" name="loop_out_point" tool_tip="Indica el punto en el que la animación termina el bucle." />
+	  <text name="hand_label">
+			 Posición de las Manos
+	  </text>
+	  <combo_box name="hand_pose_combo" right="190" tool_tip="Controla lo que hacen las manos durante la animación" left_delta="110">
+			 <combo_item name="Spread" value="">
+					Extendidas
+			 </combo_item>
+			 <combo_item name="Relaxed" value="Hands_Relaxed">
+					Relajadas
+			 </combo_item>
+			 <combo_item name="PointBoth" value="Hands_Point">
+					Ambas Señalando
+			 </combo_item>
+			 <combo_item name="Fist" value="Hands_Fist">
+					Puño
+			 </combo_item>
+			 <combo_item name="RelaxedLeft" value="Hands_Relaxed_L">
+					La izquierda relajada
+			 </combo_item>
+			 <combo_item name="PointLeft" value="Hands_Point_L">
+					La izquierda señalando
+			 </combo_item>
+			 <combo_item name="FistLeft" value="Hands_Fist_L">
+					La izquierda en puño
+			 </combo_item>
+			 <combo_item name="RelaxedRight" value="Hands_Relaxed_R">
+					La derecha relajada
+			 </combo_item>
+			 <combo_item name="PointRight" value="Hands_Point_R">
+					La derecha señalando
+			 </combo_item>
+			 <combo_item name="FistRight" value="Hands_Fist_R">
+					La derecha en puño
+			 </combo_item>
+			 <combo_item name="SaluteRight" value="Hands_Salute_R">
+					La derecha saludando
+			 </combo_item>
+			 <combo_item name="Typing" value="Hands_Typing">
+					Escribiendo
+			 </combo_item>
+			 <combo_item name="PeaceRight" value="Hands_Peace_R">
+					Derecha en Signo de Paz
+			 </combo_item>
+	  </combo_box>
+	  <text bottom_delta="-22" follows="top|left" height="15" left="10" name="emote_label" >
+			 Expresión
+	  </text>
+	<combo_box label="" name="emote_combo" tool_tip="Controla qué hace la cara durante la animación" left_delta="110">
+			 <combo_item name="[None]">
+					[Nada]
+			 </combo_item>
+			 <combo_item name="Aaaaah">
+					Aaaaah
+			 </combo_item>
+			 <combo_item name="Afraid">
+					Con Miedo
+			 </combo_item>
+			 <combo_item name="Angry">
+					Enfadada
+			 </combo_item>
+			 <combo_item name="BigSmile">
+					Gran Sonrisa
+			 </combo_item>
+			 <combo_item name="Bored">
+					Aburrida
+			 </combo_item>
+			 <combo_item name="Cry">
+					Llorar
+			 </combo_item>
+			 <combo_item name="Disdain">
+					Desdén
+			 </combo_item>
+			 <combo_item name="Embarrassed">
+					Avergonzada
+			 </combo_item>
+			 <combo_item name="Frown">
+					Fruncir el ceño
+			 </combo_item>
+			 <combo_item name="Kiss">
+					Besar
+			 </combo_item>
+			 <combo_item name="Laugh">
+					Carcajada
+			 </combo_item>
+			 <combo_item name="Plllppt">
+					Sacar la lengua
+			 </combo_item>
+			 <combo_item name="Repulsed">
+					Rechazo
+			 </combo_item>
+			 <combo_item name="Sad">
+					Triste
+			 </combo_item>
+			 <combo_item name="Shrug">
+					Encogerse de hombros
+			 </combo_item>
+			 <combo_item name="Smile">
+					Sonrisa
+			 </combo_item>
+			 <combo_item name="Surprise">
+					Sorpresa
+			 </combo_item>
+			 <combo_item name="Wink">
+					Guiño
+			 </combo_item>
+			 <combo_item name="Worry">
+					Preocupación
+			 </combo_item>
+	  </combo_box>
+	  <text name="preview_label">
+			 Vista Previa
+	  </text>
+	  <combo_box label="" name="preview_base_anim" tool_tip="Comprueba cómo se comporta tu animación a la vez que el avatar realiza acciones comunes." left_delta="110">
+			 <combo_item name="Standing">
+					De Pie
+			 </combo_item>
+			 <combo_item name="Walking">
+					Caminando
+			 </combo_item>
+			 <combo_item name="Sitting">
+					Sentado
+			 </combo_item>
+			 <combo_item name="Flying">
+					Volando
+			 </combo_item>
+	  </combo_box>
+	  <spinner label="Combinar (seg)" label_width="72"  name="ease_in_time" tool_tip="Tiempo (en segundos) en el que se combinan las animaciones." width="122"/>
+	  <spinner label="No Combinar (seg)" label_width="90"  name="ease_out_time" tool_tip="Tiempo (en segundos) en el que dejan de combinarse las animaciones." left="145" width="140"/>
+	  <button label="" name="play_btn" tool_tip="Reproducir/pausar tu animación." />
+	  <button label="" name="stop_btn" tool_tip="Detener la reproducción de la animación" />
+	  <slider label="" name="playback_slider" />
+	  <text name="bad_animation_text">
+			 No se ha podido leer el archivo de la animación.
+
+Recomendamos usar archivos BVH exportados de
+Poser 4
+	  </text>
+	  <button label="Cancelar" name="cancel_btn"/>
+	  <button label="Subir ([UPLOADFEE])" name="ok_btn"/>
+	  <string name="failed_to_initialize">
+			 Fallo al iniciar el movimiento
+	  </string>
+	  <string name="anim_too_long">
+			 El archivo de la Animación dura [LENGTH] segundos.
+
+La duración máxima de una animación es de [MAX_LENGTH] segundos.
+	  </string>
+	  <string name="failed_file_read">
+			 No se ha podido leer el archivo de la animación.
+
+[STATUS]
+	  </string>
+	  <string name="in_world">
+			 La vista previa se reproduce en tu avatar.
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_ao.xml b/indra/newview/skins/default/xui/es/floater_ao.xml
new file mode 100644
index 000000000..06925ab5d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_ao.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="geminifloater" title="Animation Overrider">
+	  <view_border name="ao_notecard"/>
+	  <view_border name="ao_notecard_vis"/>
+	  <text name="Give inventory" tool_tip="Arrastra aquí una nota de configuración de ZHAO. Las animaciones tienen que estar en la misma carpeta que la nota de configuración">
+			 Arrastra aquí la nota del ZHAO II
+	  </text>
+	  <view_border name="ao_notecard_disp"/>
+	  <text name="ao_nc_text" tool_tip="">
+			 Utilizando: ITEM
+	  </text>
+	  <button name="opencard" label="Ver Notecard"/>
+	  <button name="reloadcard" label="Recargar"/>
+	  <check_box control_name="AOEnabled" label="Activar animations override" name="AOEnabled"/>
+	  <check_box control_name="AOSitsEnabled" label="Activar sits override" name="AOSitsEnabled"/>
+	  <text name="buttons_desc">
+			 De Pie:
+	  </text>
+	  <combo_box name="stands" label=""/>
+	  <button name="prevstand" tool_tip="Vista Previa de Pie" label="&lt;&lt;"/>
+	  <button name="nextstand" tool_tip="Siguiente Animación de Pie" label="&gt;&gt;"/>
+	  <check_box control_name="AOStandRandomize" label="Orden de Reprodución al azar" name="AOStandRandomize"/>
+	  <check_box control_name="AONoStandsInMouselook" label="Desactiva De Pie en Vista Subjetiva" name="AONoStandsInMouselook"/>
+	  <check_box control_name="EnableAORemote" label="Mostrar AO En Barra de Herram." name="ao_remote_checkbox"/>
+	  <spinner control_name="AOStandInterval" name="standtime" label="Tiempo de Ejecución:" label_width="120" tool_tip="Tiempo de ejecuón de la animación, en segundos" />
+	  <button name="newcard" label="Nueva Plantilla de Nota" />
+	  <button label="Más &gt;&gt;" name="more_btn" tool_tip="Opciones Avanzadas" />
+	  <button label="&lt;&lt; Menos" name="less_btn" tool_tip="Opciones Avanzadas" />
+	  <tab_container label="Por Defecto" name="tabcontainer" >
+			 <panel label="Animaciones por Defecto" name="tabdefaultanims">
+					<text name="textdefaultwalk">
+						  Caminar:
+					</text>
+					<combo_box name="walks" label="" control_name="AODefaultWalk" />
+					<text name="textdefaultrun">
+						  Correr:
+					</text>
+					<combo_box name="runs" label="" control_name="AODefaultRun" />
+					<text name="textdefaultjump">
+						  Saltar:
+					</text>
+					<combo_box name="jumps" label="" control_name="AODefaultJump" />
+					<text name="textdefaultsit">
+						  Sentado:
+					</text>
+					<combo_box name="sits" label="" control_name="AODefaultSit" />
+					<text name="textdefaultgsit">
+						  Sentado en el Suelo:
+					</text>
+					<combo_box name="gsits" label="" control_name="AODefaultGroundSit" />
+					<text name="textdefaultcrouch">
+						  Agachado:
+					</text>
+					<combo_box name="crouchs" label="" control_name="AODefaultCrouch" />
+					<text name="textdefaultcrouchwalk">
+						  Caminar Agachado:
+					</text>
+					<combo_box name="cwalks" label="" control_name="AODefaultCrouchWalk" />
+					<text name="textdefaultfall">
+						  Caer:
+					</text>
+					<combo_box name="falls" label="" control_name="AODefaultFall" />
+					<text name="textdefaulthover">
+						  Flotar:
+					</text>
+					<combo_box name="hovers" label="" control_name="AODefaultHover" />
+					<text name="textdefaultfly">
+						  Volar:
+					</text>
+					<combo_box name="flys" label="" control_name="AODefaultFly" />
+					<text name="textdefaultflyslow">
+						  Vuelo Lento:
+					</text>
+					<combo_box name="flyslows" label="" control_name="AODefaultFlySlow" />
+					<text name="textdefaultflyup">
+						  Volar Subiendo:
+					</text>
+					<combo_box name="flyups" label="" control_name="AODefaultFlyUp" />
+					<text name="textdefaultflydown">
+						  Volar Bajando:
+					</text>
+					<combo_box name="flydowns" label="" control_name="AODefaultFlyDown" />
+					<text name="textdefaultland">
+						  Aterrizar:
+					</text>
+					<combo_box name="lands" label="" control_name="AODefaultLand" />
+					<text name="textdefaultstandup">
+						  Ponerse de Pie:
+					</text>
+					<combo_box name="standups" label="" control_name="AODefaultStandUp" />
+					<text name="textdefaultprejump">
+						  Antes de Saltar:
+					</text>
+					<combo_box name="prejumps" label="" control_name="AODefaultPreJump" />
+			 </panel>
+	  </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_area_search.xml b/indra/newview/skins/default/xui/es/floater_area_search.xml
new file mode 100644
index 000000000..b9c0a9563
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_area_search.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="area search" title="Búsqueda de Objetos en el �rea">
+	  <text name="name_label">
+			 Búsqueda por Nombre:
+	  </text>
+	  <text name="desc_label">
+			 Búsqueda por Descrición:
+	  </text>
+	  <line_editor name="Name query chunk" tool_tip=""/>
+	  <line_editor name="Description query chunk" tool_tip=""/>
+	  <text name="owner_label">
+			 Búsqueda por Propietario:
+	  </text>
+	  <text name="group_label">
+			 Búsqueda por Grupo:
+	  </text>
+	  <line_editor name="Owner query chunk" tool_tip=""/>
+	  <line_editor name="Group query chunk" tool_tip=""/>
+	  <scroll_list name="result_list">
+			 <column name="Name" label="Nombre" tool_tip="Haz doble click en cualquier resultado para marcar su posición"/>
+			 <column name="Description" label="Descripción" tool_tip="Haz doble click en cualquier resultado para marcar su posición"/>
+			 <column name="Owner" label="Propietario" tool_tip="Haz doble click en cualquier resultado para marcar su posición"/>
+			 <column name="Group" label="Grupo" tool_tip="Haz doble click en cualquier resultado para marcar su posición"/>
+	  </scroll_list>
+	  <button name="Refresh" label="Actualizar"/>
+	  <button name="Stop" label="Detener"/>
+	  <text name="counter" >
+			 Listados/Pendientes/Total
+	  </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_asset_text_editor.xml b/indra/newview/skins/default/xui/es/floater_asset_text_editor.xml
new file mode 100644
index 000000000..55cd428e0
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_asset_text_editor.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_asset_text_editor" title="Editor de Textos">
+	  <text name="status_text">
+			 Cargando...
+	  </text>
+	  <button name="upload_btn" label="[UPLOAD]"/>
+	  <button name="save_btn" label="Grabar"/>
+	  <simple_text_editor name="text_editor" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_auction.xml b/indra/newview/skins/default/xui/es/floater_auction.xml
new file mode 100644
index 000000000..3caaadc6e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_auction.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_auction" title="Iniciar venta de terreno Linden">
+	  <icon name="snapshot_icon" />
+	  <text name="parcel_text"/>
+	  <check_box label="Incluir la valla amarilla de selección" name="fence_check"/>
+	  <button label="Instantánea" label_selected="Instantánea" name="snapshot_btn"/>
+	  <button label="OK" label_selected="OK" name="ok_btn"/>
+	  <string name="already for sale">
+			 No puedes subastar parcelas que ya están en venta.
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_audio_volume.xml b/indra/newview/skins/default/xui/es/floater_audio_volume.xml
new file mode 100644
index 000000000..f366ccb52
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_audio_volume.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Volume" title="Volumen">
+	  <label="Volumen" name="Volume Panel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
new file mode 100644
index 000000000..e60f26468
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="avatarpicker" title="Elegir a un Residente">
+	  <tab_container name="ResidentChooserTabs" >
+			 <panel name="SearchPanel" label="Buscar" >
+					<text name="InstructSearchResidentName" >
+						  Escribe parte del nombre del residente:
+					</text>
+					<line_editor name="Edit" />
+					<button label="Buscar" label_selected="Buscar" name="Find"/>
+					<scroll_list name="SearchResults"/>
+			 </panel>
+			 <panel name="CallingCardsPanel" label="Tarjeta de Llamada" >
+					<text name="InstructSelectCallingCard">
+						  Elige una Tarjeta de Llamada:
+					</text>
+					<inventory_panel name="InventoryPanel" />
+			 </panel>
+			 <panel name="NearMePanel" label="Cercanos" >
+					<text name="InstructSelectResident">
+						  Seleccionar un residente cercano:
+					</text>
+					<button label="Actualizar Lista" label_selected="Actualizar Lista" name="Refresh"/>
+					<slider name="near_me_range" label="Alcance" />
+					<text name="meters">
+						  Metros
+					</text>
+					<scroll_list name="NearMe"  />
+			 </panel>
+			 <panel name="KeyPanel" label="Por UUID" >
+					<text name="InstructSelectResident">
+						  UUID del Avatar o Grupo:
+					</text>
+					<line_editor name="EditUUID"/>
+			 </panel>
+	  </tab_container>
+	  <button label="Elegir" label_selected="Elegir" name="Select"/>
+	  <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	  <string name="not_found">
+			 No se ha encontrado a &apos;[TEXT]&apos;
+	  </string>
+	  <string name="no_one_near">
+			 Nadie Cercano
+	  </string>
+	  <string name="no_results">
+			 Sin resultados
+	  </string>
+	  <string name="searching">
+			 Buscando...
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
new file mode 100644
index 000000000..7ea3a01dc
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="avatar_texture_debug" title="Texturas del Avatar" >
+	  <button label="Enviar IDs a la Consola" label_selected="Volcado" name="Dump"/>
+	  <!-- The names of the following must match the definitions in llvoavatardefines.cpp -->
+	  <texture_picker label="Pelo Base" name="hair-baked"/>
+	  <texture_picker label="Pelo" name="hair_grain"/>
+	  <texture_picker label="Ojos Base" name="eyes-baked"/>
+	  <texture_picker label="ojos" name="eyes_iris"/>
+	  <texture_picker label="Cabeza Base" name="head-baked"/>
+	  <texture_picker label="Maquillaje" name="head_bodypaint"/>
+	  <texture_picker label="Tatuajes Cabeza" name="head_tattoo"/>
+	  <texture_picker label="Tatuaje Parte Superior del Cuerpo" name="upper_tattoo"/>
+	  <texture_picker label="Tatuaje Parte Inferior del Cuerpo" name="lower_tattoo"/>
+	  <texture_picker label="Base Parte Superior del Cuerpo" name="upper-baked"/>
+	  <texture_picker label="Piel Parte Superior del Cuerpo" name="upper_bodypaint"/>
+	  <texture_picker label="Camiseta" name="upper_undershirt"/>
+	  <texture_picker label="Camisa" name="upper_shirt"/>
+	  <texture_picker label="Chaqueta" name="upper_jacket" />
+	  <texture_picker label="Guantes" name="upper_gloves"/>
+	  <texture_picker label="Base Parte Inferior del Cuerpo" name="lower-baked"/>
+	  <texture_picker label="Piel Parte Inferior del cuerpo" name="lower_bodypaint"/>
+	  <texture_picker label="Calzoncillos" name="lower_underpants"/>
+	  <texture_picker label="Pants" name="Pantalones"/>
+	  <texture_picker label="Fada Chaqueta" name="lower_jacket"/>
+	  <texture_picker label="Medias" name="lower_socks"/>
+	  <texture_picker label="Falda Base" name="skirt-baked"/>
+	  <texture_picker label="Falda" name="skirt"/>
+	  <texture_picker label="Zapatos" name="lower_shoes"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_beacons.xml b/indra/newview/skins/default/xui/es/floater_beacons.xml
new file mode 100644
index 000000000..cf5077c9a
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_beacons.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="beacons" title="Balizas" control_name="ShowBeaconsFloater">
+	  <panel name="beacons_panel">
+			 <check_box name="always_on" label="Mantener balizas activas al cerrar" control_name="keepbeacons" />
+			 <check_box name="touch_only" label="Solo Objetos con script de toque" control_name="scripttouchbeacon" />
+			 <check_box name="scripted" label="Objetos con Scripts" control_name="scriptsbeacon" />
+			 <check_box name="physical" label="Objetos Materiales" control_name="physicalbeacon" />
+			 <check_box name="sounds" label="Fuentes de Sonidos" control_name="soundsbeacon" />
+			 <check_box name="particles" label="Fuentes de Partículas" control_name="particlesbeacon" />
+			 <check_box name="highlights" label="Activar los Realzados" control_name="renderhighlights" />
+			 <check_box name="beacons" label="Activar Balizas" control_name="renderbeacons" />
+			 <text type="string" name="beacon_width_label">
+					Ancho de la Baliza:
+			 </text>
+			 <slider name="beacon_width" control_name="DebugBeaconLineWidth"/>    
+	  </panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_blacklist.xml b/indra/newview/skins/default/xui/es/floater_blacklist.xml
new file mode 100644
index 000000000..cbdd77af3
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_blacklist.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_blacklist" title="Lista Negra">
+	  <button name="add_btn" label="Agregar..."/>
+	  <button name="remove_btn" label="Borrar"/>
+	  <combo_box name="asset_combo" label="Tipo de Asset"/>
+	  <line_editor name="id_edit" label="Colocar aquí el UUID del Asset UUID." />
+	  <line_editor name="name_edit" label="Colocar aquí el Nombre de la entrada."/>
+	  <scroll_list name="file_list">
+			 <column name="asset_id" label="ID del Asset"/>
+			 <column name="entry_name" label="Nombre" />
+			 <column name="entry_type" label="Tipo"/>
+			 <column name="entry_agent" label="Agregado por"/>
+			 <column name="entry_date" label="Fecha"/>
+			 <!--column dynamicwidth="false" name="asset_id" label="Asset-ID" width="130"/-->
+	  </scroll_list>
+	  <button name="save_btn" label="Guardar XML" width="100" />
+	  <button name="load_btn" label="Cargar XML" left_delta="110" width="100"/>
+	  <button name="clear_btn" label="Limpiar" left_delta="110" />
+	  <!--button name="rerender_btn" follows="right|bottom" width="150" bottom_delta="0" left_delta="400" height="20" label="Rerender all Objects"/-->
+	  <button name="copy_uuid_btn" label="Copiar UUID"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_build_options.xml b/indra/newview/skins/default/xui/es/floater_build_options.xml
new file mode 100644
index 000000000..c45fe8e79
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_build_options.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="build options floater" title="Opciones de la Grilla">
+	  <spinner label="Unidad de la Grilla (metros)" label_width="145" name="GridResolution"/>
+	  <spinner label="Extensión de la Grilla (metros)" label_width="146" name="GridDrawSize"/>
+	  <check_box label="Activar Subunidades" name="GridSubUnit"/>
+	  <check_box label="Ver la Sección Transversal" name="GridCrossSection"/>
+	  <slider label="Opacidad de la Grilla" name="GridOpacity"/>
+	  <spinner label="Pasos Restringidos" name="GridProtractorSize"/>
+	  <spinner label="Pasos sin Restricción" name="RotationStep"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_bulk_perms.xml b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml
new file mode 100644
index 000000000..ab046b8b3
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floaterbulkperms" title="Modificación masiva de Permisos del Contenido" >
+	  <text name="applyto">
+			 Tipos de Contenido
+	  </text>
+	  <icon name="icon_animation"/>
+	  <check_box label="Animación" name="check_animation"/>
+	  <icon name="icon_bodypart"/>
+	  <check_box label="Partes del Cuerpo" name="check_bodypart"/>
+	  <icon name="icon_clothing"/>
+	  <check_box label="Ropas" name="check_clothing"/>
+	  <icon name="icon_gesture"/>
+	  <check_box label="Gestos" name="check_gesture"/>
+	  <icon name="icon_landmark"/>
+	  <check_box label="Hitos" name="check_landmark"/>
+	  <icon name="icon_notecard"/>
+	  <check_box label="Notas" name="check_notecard"/>
+	  <icon name="icon_object"/>
+	  <check_box label="Objetos" name="check_object"/>
+	  <icon name="icon_script"/>
+	  <check_box label="Scripts" name="check_script"/>
+	  <icon name="icon_sound"/>
+	  <check_box label="Sonidos" name="check_sound"/>
+	  <icon name="icon_texture"/>
+	  <check_box label="Texturas" name="check_texture"/>
+	  <button label="Marcar Todo" label_selected="Todo" name="check_all" width="110"/>
+	  <button label="Desmarcar Todo" label_selected="Ninguno" name="check_none" width="110"/>
+	  <text name="newperms">
+			 Nuevos Permisos
+	  </text>
+	  <check_box label="Compartir con el Grupo" name="share_with_group"/>
+	  <check_box label="Permitir a Cualquiera que lo copie" name="everyone_copy"/>
+	  <text name="NextOwnerLabel">
+			 El próximo propietario puede:
+	  </text>
+	  <check_box label="Modificarlo" name="next_owner_modify"/>
+	  <check_box label="Copiarlo" name="next_owner_copy"/>
+	  <check_box label="Revenderlo/Darlo" name="next_owner_transfer"/>
+	  <scroll_list name="queue output" />
+	  <button label="Ayuda" name="help"/>
+	  <button label="Aplicar" name="apply"/>
+	  <button label="Cerrar" name="close"/>
+	  <string name="nothing_to_modify_text">
+			 Lo seleccionado tiene contenido no editable..
+	  </string>
+	  <string name="status_text">
+			 Configurando permisos de [NAME]
+	  </string>
+	  <string name="start_text">
+			 Iniciando el cambio de permisos solicitado...
+	  </string>
+	  <string name="done_text">
+			 Finalizando el cambio de permisos solicitado.
+	  </string>
+
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_bumps.xml b/indra/newview/skins/default/xui/es/floater_bumps.xml
new file mode 100644
index 000000000..9075f6f73
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_bumps.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_bumps" title="Choques, empujones y golpes">
+	  <scroll_list name="bump_list"/>
+	  <string name="none_detected">
+			 No se han detectado
+	  </string>
+	  <string name="bump">
+			 [TIME]  [NAME] ha chocado contigo
+	  </string>
+	  <string name="llpushobject">
+			 [TIME]  [NAME] Te ha empujado con un script
+	  </string>
+	  <string name="selected_object_collide">
+			 [TIME]  [NAME] te ha golpeado con un objeto
+	  </string>
+	  <string name="scripted_object_collide">
+			 [TIME]  [NAME] te ha golpeado con un objeto con script
+	  </string>
+	  <string name="physical_object_collide">
+			 [TIME]  [NAME] te ha impactado con un objeto material
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_contents.xml b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
new file mode 100644
index 000000000..970e367cf
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_buy_contents"  title="Comprar el Contenido">
+	  <text name="contains_text">
+			 [NAME] contiene:
+	  </text>
+	  <scroll_list name="item_list">
+			 <column name="icon"/>
+			 <column name="text"/>
+	  </scroll_list>
+	  <text name="buy_text">
+			 Comprar por [CURRENCY][AMOUNT] a [NAME]?
+	  </text>
+	  <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	  <button label="Comprar" label_selected="Comprar" name="buy_btn"/>
+	  <check_box label="Vestirse la ropa ahora" name="wear_check"/>
+	  <string name="no_copy_text">
+			 (no copiable)
+	  </string>
+	  <string name="no_modify_text">
+			 (no modificable)
+	  </string>
+	  <string name="no_transfer_text">
+			 (no transferible)
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
new file mode 100644
index 000000000..33ba2dba6
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="buy currency" title="Comprar Dinero">
+	  <text name="info_buying">
+			 Comprando Dinero:
+	  </text>
+	  <text name="info_cannot_buy">
+			 No puedes comprar en este momento:
+	  </text>
+	  <text name="info_need_more">
+			 Necesitas más dinero:
+	  </text>
+	  <icon name="step_error"/>
+	  <text name="error_message" >
+			 Algo no va bien.
+	  </text>
+	  <button label="Ir al sitio web" name="error_web"/>
+	  <icon name="step_1"/>
+	  <text name="contacting">
+			 Contactando con LindeX...
+	  </text>
+	  <text name="buy_action_unknown">
+			 Comprar [CURRENCY] en el sistema LindeX de cambio
+	  </text>
+	  <text name="buy_action" >
+			 [NAME] [CURRENCY] [PRICE]
+	  </text>
+	  <text name="currency_action">
+			 Comprar [CURRENCY]
+	  </text>
+	  <line_editor name="currency_amt">
+			 1234
+	  </line_editor>
+	  <text name="currency_est">
+			  [CURRENCY] por aprox. US$ [USD]
+	  </text>
+	  <text name="getting_data">
+			 Obteniendo datos...
+	  </text>
+	  <text name="balance_label">
+			 Actualmente tienes
+	  </text>
+	  <text name="balance_amount">
+			 [CURRENCY] [AMT]
+	  </text>
+	  <text name="buying_label">
+			 Estás comprando
+	  </text>
+	  <text name="buying_amount">
+			 [CURRENCY] [AMT]
+	  </text>
+	  <text name="total_label">
+			 Tu saldo será de
+	  </text>
+	  <text name="total_amount">
+			 [CURRENCY] [AMT]
+	  </text>
+	  <text name="purchase_warning_repurchase">
+			 Confirmando esta compra sólo compras la moneda.
+Tendrá ques intentar de nuevo la operación.
+	  </text>
+	  <text name="purchase_warning_notenough">
+			 No estás comprando dinero suficiente.
+Aumenta la cantidad a comprar.
+	  </text>
+	  <button label="Cancelar" name="cancel_btn"/>
+	  <button label="Comprar" name="buy_btn"/>
+	  <string name="buy_currency">
+			 Comprar [CURRENCY] [LINDENS] por aprox. US$ [USD]
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_land.xml b/indra/newview/skins/default/xui/es/floater_buy_land.xml
new file mode 100644
index 000000000..b6da85409
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_buy_land.xml
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="buy land" title="Comprar Terreno">
+	  <text name="region_name_label">
+			 Región:
+	  </text>
+	  <text name="region_name_text">
+			 (desconocida)
+	  </text>
+	  <text name="region_type_label">
+			 Tipo:
+	  </text>
+	  <text name="region_type_text">
+			 (desconocido)
+	  </text>
+	  <text name="estate_name_label">
+			 Estado:
+	  </text>
+	  <text name="estate_name_text">
+			 (desconocido)
+	  </text>
+	  <text name="estate_owner_label">
+			 Propietario del Estado:
+	  </text>
+	  <text name="estate_owner_text">
+			 (desconocido)
+	  </text>
+	  <text name="resellable_changeable_label">
+			 El Terreno comprado en esta región:
+	  </text>
+	  <text name="resellable_clause">
+			 Podrá o no revenderse.
+	  </text>
+	  <text name="changeable_clause">
+			 Podrá o no unirse o dividirse.
+	  </text>
+	  <text name="covenant_text">
+			 Debes aceptar el Contrato del Estado:
+	  </text>
+	  <text name="covenant_timestamp_text" />
+	  <text_editor name="covenant_editor">
+			 Cargando...
+	  </text_editor>
+	  <check_box label="Estoy de acuerdo con el contrato descrito arriba." name="agree_covenant"/>
+	  <texture_picker name="info_image"/>
+	  <text name="info_parcel_label">
+			 Parcela:
+	  </text>
+	  <text name="info_parcel">
+			 Scotopteryx 138,204
+	  </text>
+	  <text name="info_size_label">
+			 Superficie:
+	  </text>
+	  <text name="info_size">
+			 1024 sq.m.
+	  </text>
+	  <text name="info_price_label">
+			 Precio:
+	  </text>
+	  <text name="info_price">
+			 L$ 1500
+(L$ 1.1/m²)
+incluyendo los objetos
+	  </text>
+	  <text name="info_action">
+			 Al comprar este terreno:
+	  </text>
+	  <pad height="6" />
+	  <icon name="step_error"/>
+	  <text name="error_message">
+			 Algo no va bien.
+	  </text>
+	  <button label="Ir al sitio web" name="error_web"/>
+	  <pad height="-200" />
+	  <icon name="step_1"/>
+	  <text name="account_action">
+			 Actualiza a la categoría de Miembro Premium.
+	  </text>
+	  <text name="account_reason">
+			 Sólo pueden ser propietarios de terreno los miembros premium.
+	  </text>
+	  <combo_box name="account_level">
+			 <combo_item name="US$9.95/month,billedmonthly">
+					US$9.95/mes, facturados mensualmente
+			 </combo_item>
+			 <combo_item name="US$7.50/month,billedquarterly">
+					US$7.50/mes, facturados cuatrimestralmente
+			 </combo_item>
+			 <combo_item name="US$6.00/month,billedannually">
+					US$6.00/mes, facturados anualmente
+			 </combo_item>
+	  </combo_box>
+	  <pad height="10" />
+	  <icon name="step_2"/>
+	  <text name="land_use_action">
+			 Aumenta tu cuota mensual por uso de terreno a 40 US$/mes.
+	  </text>
+	  <text name="land_use_reason">
+			 Posees 1309 m². de terreno
+Esta parcela tiene 512 m²sq.m. de terreno.
+	  </text>
+	  <pad height="10" />
+	  <icon name="step_3"/>
+	  <text name="purchase_action">
+			 Pagar al Residente  Joe L$ 4000 por el terreno
+	  </text>
+	  <text name="currency_reason">
+			 Tienes L$ 2,100.
+	  </text>
+	  <text name="currency_action">
+			 Comprar más [CURRENCY]
+	  </text>
+	  <pad height="0" width="8" />
+	  <line_editor name="currency_amt">
+			 1000
+	  </line_editor>
+	  <pad height="0" width="8" />
+	  <text name="currency_est">
+			 por aprox. US$ [AMOUNT2]
+	  </text>
+	  <text name="currency_balance">
+			 Tienes L$ 2,100.
+	  </text>
+	  <check_box label="Quitar [AMOUNT] m² de la contribución del grupo" name="remove_contribution" />
+	  <button label="Comprar" name="buy_btn"/>
+	  <button label="Cancelar" name="cancel_btn"/>
+	  <string name="can_resell">
+			 Puede revenderse.
+	  </string>
+	  <string name="can_not_resell">
+			 No puede revenderse.
+	  </string>
+	  <string name="can_change">
+			 Puede unirse o dividirse.
+	  </string>
+	  <string name="can_not_change">
+			 No puede unirse ni dividirse.
+	  </string>
+	  <string name="cant_buy_for_group">
+			 No tienea permiso de comprar terreno para el grupo que tienes activado.	  
+	  </string>
+	  <string name="no_land_selected">
+			 No se ha seleccionado terreno.
+	  </string>
+	  <string name="multiple_parcels_selected">
+			 Se han seleccionado varias parcelas diferentes. 
+Inténtalo seleccionando un área más pequeña.
+	  </string>
+	  <string name="no_permission">
+			 No tienes permiso de comprar terreno para el grupo que tienes activado.
+	  </string>
+	  <string name="parcel_not_for_sale">
+			 La parcela seleccionada no está en venta.
+	  </string>
+	  <string name="group_already_owns">
+			 El grupo ya es propietario de la parcela.
+	  </string>
+	  <string name="you_already_own">
+			 Ya eres propietario de la parcela.
+	  </string>
+	  <string name="set_to_sell_to_other">
+			 La parcela seleccionada está marcada para ser vendida a otro
+	  </string>
+	  <string name="no_public_land">
+			 El área seleccionada no tiene terreno público.
+	  </string>
+	  <string name="not_owned_by_you">
+			 Se ha seleccionado terreno propiedad de otro. 
+Inténtlo seleccionando un área más pequeña.	  
+	  </string>
+	  <string name="processing">
+			 Procesando tu compra...
+ 
+(Tomará uno o dos minutos).)
+	  </string>
+	  <string name="fetching_error">
+			 Se ha producido un error al ir a buscar la información de compra de terreno.
+	  </string>
+	  <string name="buying_will">
+			 Al comprar este terreno:
+	  </string>
+	  <string name="buying_for_group">
+			 Comprando terreno para el grupo:
+	  </string>
+	  <string name="cannot_buy_now">
+			 No se puede comprar ahora:
+	  </string>
+	  <string name="not_for_sale">
+			 No está en venta:
+	  </string>
+	  <string name="none_needed">
+			 no necesita
+	  </string>
+	  <string name="must_upgrade">
+			 Para poseer terreno, tu cuenta debe ascender de categoría.
+	  </string>
+	  <string name="cant_own_land">
+			 Tu cuenta puede poseer terreno.
+	  </string>
+	  <string name="land_holdings">
+			 Tienes [BUYER] m² de terreno.
+	  </string>
+	  <string name="pay_to_for_land">
+			 Pagar [CURRENCY] [AMOUNT] a [SELLER] por este terreno
+	  </string>
+	  <string name="buy_for_US">
+			 Comprar [CURRENCY] [AMOUNT] por aprox. US$ [AMOUNT2],
+	  </string>
+	  <string name="parcel_meters">
+			 Esta parcela tiene [AMOUNT] m².	  
+	  </string>
+	  <string name="premium_land">
+			 Este terreno es premium, y se contará como de [AMOUNT] m².
+	  </string>
+	  <string name="discounted_land">
+			 Este terreno tiene descuento, y se contará como de [AMOUNT] m².
+	  </string>
+	  <string name="meters_supports_object">
+			 [AMOUNT] m².
+admite [AMOUNT2] objetos
+	  </string>
+	  <string name="sold_with_objects">
+			 vendido con los objetos
+	  </string>
+	  <string name="sold_without_objects">
+			 objetos no incluidos
+	  </string>
+	  <string name="info_price_string">
+			 [CURRENCY] [PRICE]
+([CURRENCY] [PRICE_PER_SQM]/m².)
+[SOLD_WITH_OBJECTS]
+	  </string>
+	  <string name="insufficient_land_credits">
+		Antes de que se complete la compra, el grupo [GROUP] necesitará
+los suficientes créditos de uso en contribución de terreno
+para cubrir esta parcela.
+	  </string>
+	  <string name="have_enough_lindens">
+			 Tienes [CURRENCY] [AMOUNT], que es suficiente para comprar este terreno
+	  </string>
+	  <string name="not_enough_lindens">
+			 Sólo tienes [CURRENCY] [AMOUNT], y necesitas [CURRENCY] [AMOUNT2] más.
+	  </string>
+	  <string name="balance_left">
+			 Luego de la compra, te quedarán [CURRENCY] [AMOUNT] en tu cuenta.
+	  </string>
+	  <string name="balance_needed">
+			 Deberás comprar, al menos, [CURRENCY] [AMOUNT] para costearte este terreno.
+	  </string>
+	  <string name="no_parcel_selected">
+			 (No se ha seleccionado una parcela)
+	  </string>
+	  <string name="buy_currency">
+			 Comprar [CURRENCY] [LINDENS] por aprox. US$ [USD]
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_object.xml b/indra/newview/skins/default/xui/es/floater_buy_object.xml
new file mode 100644
index 000000000..c19c5554a
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_buy_object.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="contents" title="Comprar una copia del Objeto">
+	  <scroll_list name="object_list">
+			 <column name="icon"/>
+			 <column name="text"/>
+	  </scroll_list>
+	  <text name="contents_text">
+			 y su contenido:
+	  </text>
+	  <scroll_list name="item_list">
+			 <column name="icon"/>
+			 <column name="text"/>
+	  </scroll_list>
+	  <text name="buy_text">
+			 Comprar por [CURRENCY] [AMOUNT] a [NAME]?
+	  </text>
+	  <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 una copia de
+	  </string>
+	  <string name="no_copy_text">
+			 (no copiable)
+	  </string>
+	  <string name="no_modify_text">
+			 (no modificable)
+	  </string>
+	  <string name="no_transfer_text">
+			 (no transferible)
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_camera.xml b/indra/newview/skins/default/xui/es/floater_camera.xml
new file mode 100644
index 000000000..6eb608111
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_camera.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="move floater" title="">
+	  <!-- Icons are custom buttons in the code -->
+	  <string name="rotate_tooltip">
+			 Girar la cámara alrededor de lo enfocado
+	  </string>
+	  <string name="zoom_tooltip">
+			 Hacer zoom con la cámara en lo enfocado
+	  </string>
+	  <string name="move_tooltip">
+			 Mover la cámara arriba y abajo, izquierda y derecha.
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_chat_history.xml b/indra/newview/skins/default/xui/es/floater_chat_history.xml
new file mode 100644
index 000000000..5548839b4
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_chat_history.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="chat floater" title="Chat Local">
+	  <string name="ringing">
+			 Conectando al Chat de Voz...
+	  </string>
+	  <string name="connected">
+			 Conectado
+		</string>
+	  <string name="unavailable">
+			 La Voz no está disponible en su ubicación actual
+	  </string>
+	  <string name="hang_up">
+			 Desconectado del Chat de Voz
+	  </string>
+	  <string name="voice_icon">
+			 icn_voice-localchat.tga
+	  </string>
+	  <string name="IM_logging_string">
+			 -- Registro de Mensajes Instantáneos activado --
+	  </string>
+	  <string name="IM_end_log_string">
+			 -- Fin del Registro --
+	  </string>
+	  <string name="ScriptQuestionCautionChatGranted">
+			 el objeto '[OBJECTNAME]', propiedad de  '[OWNERNAME]', ubicado en [REGIONNAME] en la posición [REGIONPOS], ha recibido permiso para: [PERMISSIONS].
+	  </string>
+	  <string name="ScriptQuestionCautionChatDenied">
+			 al objeto '[OBJECTNAME]', propiedad de  '[OWNERNAME]', ubicado en [REGIONNAME] en la posición [REGIONPOS], se le ha denegado el permiso para: [PERMISSIONS].
+	  </string>
+	  <string name="ScriptTakeMoney">
+			 Transferir  ([CURRENCY]) de tu cuenta
+	  </string>
+	  <string name="ActOnControlInputs">
+			 Actuar en tus controles de entrada
+	  </string>
+	  <string name="RemapControlInputs">
+			 Reconfigurar tus controles de entrada
+	  </string>
+	  <string name="AnimateYourAvatar">
+			 Animar tu avatar
+	  </string>
+	  <string name="AttachToYourAvatar">
+			 Anexarse a tu avatar
+	  </string>
+	  <string name="ReleaseOwnership">
+			 Anular propiedad y pasar a ser público
+	  </string>
+	  <string name="LinkAndDelink">
+			 Enlazar y desenlazar de otros objetos
+	  </string>
+	  <string name="AddAndRemoveJoints">
+			 Añadir y quitar uniones con otros objetos
+	  </string>
+	  <string name="ChangePermissions">
+			 Cambiar sus permisos
+	  </string>
+	  <string name="TrackYourCamera">
+			 Seguir tu cámara
+	  </string>
+	  <string name="ControlYourCamera">
+			 Controlar tu cámara
+	  </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 Ignorado" name="show mutes"/>
+					<!--check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Translate Chat (powered by Google)" name="translate chat" width="100"/-->
+					<button label="Abrir Historial" name="chat_history_open" tool_tip="Pulsá aquí para abrir el historial de chat en un editor externo." left_delta="150" />
+					<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Pulsa aqui para ver la lista de los participantes en esta sesión de MI"/>
+					<text_editor name="Chat History Editor" />
+					<text_editor name="Chat History Editor with mute" />
+					<panel name="chat_panel">
+						  <string name="gesture_label">
+								 Gestos
+						  </string>
+						  <line_editor label="Pulsa aquí para escribir en el chat." name="Chat Editor" />
+						  <flyout_button label="Decir" name="Say" tool_tip="(Intro)" left="-62" width="68">
+								 <flyout_button_item name="shout_item">
+										Gritar
+								 </flyout_button_item>
+								 <flyout_button_item name="say_item">
+										Decir
+								 </flyout_button_item>
+								 <flyout_button_item name="whisper_item">
+										Susurrar
+								 </flyout_button_item>
+						  </flyout_button>
+					</panel>
+			 </layout_panel>
+			 <layout_panel name="active_speakers_panel" />
+	  </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_chatterbox.xml b/indra/newview/skins/default/xui/es/floater_chatterbox.xml
new file mode 100644
index 000000000..f9ace1d79
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_chatterbox.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater name="floater_chatterbox" title="Comunicarse">
+	  <icon name="chatterbox_tab_container"></icon>
+	  <tab_container name="chatterbox_tabs_horiz" />
+	  <!--<tab_container bottom="2" follows="left|right|top|bottom" height="370" left="0"
+			 name="chatterbox_tabs_vert" tab_position="left" tab_width="110" width="395" />-->
+</multi_floater>
+
diff --git a/indra/newview/skins/default/xui/es/floater_chatterbox_wolf.xml b/indra/newview/skins/default/xui/es/floater_chatterbox_wolf.xml
new file mode 100644
index 000000000..7c49ab088
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_chatterbox_wolf.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater name="floater_chatterbox" title="Comunicarse">
+	  <tab_container name="chatterbox_tabs"/>
+</multi_floater>
+
diff --git a/indra/newview/skins/default/xui/es/floater_choose_group.xml b/indra/newview/skins/default/xui/es/floater_choose_group.xml
new file mode 100644
index 000000000..6d21315e2
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_choose_group.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="groups" title="Grupos">
+	  <text name="groupdesc">
+			 Elegir un Grupo:
+	  </text>
+	  <scroll_list name="group list">
+			 <column name="name"/>
+	  </scroll_list>
+	  <button label="OK" label_selected="OK" name="OK"/>
+	  <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	  <string name="none">
+			 ninguno
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_clothing.xml b/indra/newview/skins/default/xui/es/floater_clothing.xml
new file mode 100644
index 000000000..5877a02c2
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_clothing.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="clothing" title="Ropas">
+	  <scroll_list name="clothing_list">
+			 <column label="" name="icon"/>
+			 <column label="Nombre" name="name"/>
+			 <column name="sort" width="-1" />
+	  </scroll_list>
+	  <button label="Quitarse" name="take_off_btn"/>
+	  <button label="Vestirse" name="wear_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_color_picker.xml b/indra/newview/skins/default/xui/es/floater_color_picker.xml
new file mode 100644
index 000000000..208d0fbf1
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_color_picker.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="ColorPicker" title="Paleta de Colores">
+	  <text name="r_val_text">
+			 Rojo:
+	  </text>
+	  <spinner name="rspin"/>
+	  <text name="g_val_text">
+			 Verde:
+	  </text>
+	  <spinner name="gspin"/>
+	  <text name="b_val_text">
+			 Azul:
+	  </text>
+	  <spinner name="bspin"/>
+	  <text name="h_val_text">
+			 Tono:
+	  </text>
+	  <spinner name="hspin"/>
+	  <text name="s_val_text">
+			 Sat:
+	  </text>
+	  <spinner name="sspin"/>
+	  <text name="l_val_text">
+			 Lum:
+	  </text>
+	  <spinner name="lspin"/>
+	  <check_box label="Aplicar ahora mismo" name="apply_immediate"/>
+	  <button label="" label_selected="" name="color_pipette"/>
+	  <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	  <button label="Elegir" label_selected="Elegir" name="select_btn"/>
+	  <text name="Hex Value:">
+			 Hex:
+	  </text>
+	  <line_editor tool_tip="" name="hexval"/>
+	  <text name="Current color:">
+			 Color Actual:
+	  </text>
+	  <text name="(Drag below to save.)">
+			 Arrástralo abajo para guardarlo
+	  </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_contact_groups.xml b/indra/newview/skins/default/xui/es/floater_contact_groups.xml
new file mode 100644
index 000000000..116e0a978
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_contact_groups.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- All our XML is utf-8 encoded. -->
+
+<!-- Floaters can optionally have their titlebar drag handle on the left.
+			 If so, the title is not visible.
+			 When a floater is resizable, a min_width and min_height must be specified. -->
+	  <floater name="floater_contact_groups" title="Administrar Grupos">
+	  <text name="InstructManageContacts">
+			 Selecciona un Grupo (o Presiona Nuevo para crear uno):
+	  </text>
+	  <combo_box tool_tip="Grupos de Contactos" name="buddy_group_combobox">
+			 <combo_item name="All" value="All">
+					Todos
+			 </combo_item>
+	  </combo_box>
+	  <button label="+" name="combo_group_add"/>
+	  <button label="-" name="combo_group_remove"/>
+	  <button label="Nuevo" name="combo_group_create"/>
+	  <text name="contact_list_text">
+			 Actualmente en:
+	  </text>
+	  <scroll_list name="group_scroll_list"/>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_critical.xml b/indra/newview/skins/default/xui/es/floater_critical.xml
new file mode 100644
index 000000000..98d0058fd
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_critical.xml
@@ -0,0 +1,13 @@
+<?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"/>
+	  <!-- No title text here because our "critical message" is usually the
+			 community standards. JC -->
+	  <text name="tos_heading">
+			 Por favor, lee cuidadosamente el siguiente mensaje.
+	  </text>
+	  <text_editor name="tos_text">
+			 TOS_TEXT
+	  </text_editor>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_customize.xml b/indra/newview/skins/default/xui/es/floater_customize.xml
new file mode 100644
index 000000000..fd63d9856
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_customize.xml
@@ -0,0 +1,657 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater customize" title="Apariencia">
+	  <tab_container name="customize tab container">
+			 <panel label="Partes del Cuerpo" name="body_parts_placeholder" />
+			 <panel label="Forma" name="Shape">
+					<icon name="square"/>
+					<icon name="icon"/>
+					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+					<button label="Cuerpo" label_selected="Cuerpo" name="Body"/>
+					<button label="Cabeza" label_selected="Cabeza" name="Head"/>
+					<button label="Ojos" label_selected="Ojos" name="Eyes"/>
+					<button label="Orejas" label_selected="Orejas" name="Ears"/>
+					<button label="Nariz" label_selected="Nariz" name="Nose"/>
+					<button label="Boca" label_selected="Boca" name="Mouth"/>
+					<button label="Barbilla" label_selected="Barbilla" name="Chin"/>
+					<button label="Torso" label_selected="Torso" name="Torso"/>
+					<button label="Piernas" label_selected="Piernas" name="Legs"/>
+					<radio_group name="sex radio">
+						  <radio_item name="radio">
+								 Mujer
+						  </radio_item>
+						  <radio_item name="radio2">
+								 Varón
+						  </radio_item>
+					</radio_group>
+					<text name="title">
+						  [DESC]
+					</text>
+					<text name="title_no_modify">
+						  [DESC]: no modificable
+					</text>
+					<text name="title_loading">
+						  [DESC]: cargando...
+					</text>
+					<text name="title_not_worn">
+						  [DESC]: no llevas
+					</text>
+					<text name="path">
+						  Situada en [PATH]
+					</text>
+					<text name="not worn instructions">
+						  Ponte una forma nueva arrastrando una desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+una nueva y vistiéndotela.
+					</text>
+					<text name="no modify instructions">
+						  No tienes permiso para modificar este ítem.
+					</text>
+					<text name="Item Action Label">
+						  Forma:
+					</text>
+					<button label="Crear una Nueva Forma" label_selected="Crear una Nueva Forma" name="Create New"/>
+					<text name="avatar_height_label">
+						  Altura:
+					</text>
+					<text name="avheight">
+						  [AVHEIGHT]
+					</text>
+					<text name="includes_shoes">
+						  (zapatos incluidos)
+					</text>
+					<button label="Guardar" label_selected="Guardar" name="Save"/>
+					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+			 </panel>
+			 <panel label="Piel" name="Skin">
+					<icon name="square"/>
+					<icon name="icon"/>
+					<button label="Color de Piel" label_selected="Color de Piel" name="Skin Color"/>
+					<button label="Detalles Faciales" label_selected="Detalles Faciales" name="Face Detail"/>
+					<button label="Maquillaje" label_selected="Maquillaje" name="Makeup"/>
+					<button label="Detalles del Cuerpo" label_selected="Detalles del Cuerpo" name="Body Detail"/>
+					<text name="title">
+						  [DESC]
+					</text>
+					<text name="title_no_modify">
+						  [DESC]: no modificable
+					</text>
+					<text name="title_loading">
+						  [DESC]: cargando...
+					</text>
+					<text name="title_not_worn">
+						  [DESC]: no llevas
+					</text>
+					<text name="path">
+						  Situada en [PATH]
+					</text>
+					<text name="not worn instructions">
+						  Ponte una piel nueva arrastrando una desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+una nueva y vistiéndotela.      
+					</text>
+					<text name="no modify instructions">
+						  No tienes permiso para modificar este item.
+					</text>
+					<text name="Item Action Label">
+						  Piel:
+					</text>
+					<texture_picker label="Tatuaje: Cabeza" name="Head Tattoos" tool_tip="Pulsa para elegir una imagen" />
+					<texture_picker label="Tatuaje: Superior" name="Upper Tattoos" tool_tip="Pulsa para elegir una imagen" />
+					<texture_picker label="Tatuaje: Inferior" name="Lower Tattoos" tool_tip="Pulsa para elegir una imagen"/>
+					<button label="Crear una Nueva Piel" label_selected="Crear una Nueva Piel" name="Create New"/>
+					<button label="Guardar" label_selected="Guardar" name="Save"/>
+					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+			 </panel>
+			 <panel label="Pelo" name="Hair">
+					<icon name="square"/>
+					<icon name="icon"/>
+					<button label="Color" label_selected="Color" name="Color"/>
+					<button label="Peinado" label_selected="Peinado" name="Style"/>
+					<button label="Cejas" label_selected="Cejas" name="Eyebrows"/>
+					<button label="Facial" label_selected="Facial" name="Facial"/>
+					<text name="title">
+						  [DESC]
+					</text>
+					<text name="title_no_modify">
+						  [DESC]: no modificable
+					</text>
+					<text name="title_loading">
+						  [DESC]: cargando...
+					</text>
+					<text name="title_not_worn">
+						  [DESC]: no llevas
+					</text>
+					<text name="path">
+						  Situado en [PATH]
+					</text>
+					<text name="not worn instructions">
+						  Ponte un pelo nuevo arrastrando uno desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+uno nuevo y vistiéndotelo.
+					</text>
+					<text name="no modify instructions">
+						  No tienes permiso para modificar este item.
+					</text>
+					<text name="Item Action Label">
+						  Pelo:
+					</text>
+					<texture_picker label="Textura" name="Texture" tool_tip="Pulsa para elegir una imagen"/>
+					<button label="Crear un Pelo Nuevo" label_selected="Crear un Pelo Nuevo" name="Create New"/>
+					<button label="Guardar" label_selected="Guardar" name="Save"/>
+					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+			 </panel>
+			 <panel label="Ojos" name="Eyes">
+					<icon name="square"/>
+					<icon name="icon"/>
+					<text name="title">
+						  [DESC]
+					</text>
+					<text name="title_no_modify">
+						  [DESC]: no modificable
+					</text>
+					<text name="title_loading">
+						  [DESC]: cargando...
+					</text>
+					<text name="title_not_worn">
+						  [DESC]: no llevas
+					</text>
+					<text name="path">
+						  Situados en [PATH]
+					</text>
+					<text name="not worn instructions">
+						  Ponte ojos nuevos arrastrando uno desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+uno nuevo y vistiéndotelo.					
+					</text>
+					<text name="no modify instructions">
+						  No tienes permiso para modificar este item.
+					</text>
+					<text name="Item Action Label">
+						  Ojos:
+					</text>
+					<texture_picker label="Iris" name="Iris" tool_tip="Pulsa para elegir una imagen"/>
+					<button label="Crear Ojos Nuevos" label_selected="Crear Ojos Nuevos" name="Create New"/>
+					<button label="Guardar" label_selected="Guardar" name="Save"/>
+					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+			 </panel>
+			 <panel label="Ropa" name="clothes_placeholder" />
+			 <panel label="Camisa" name="Shirt">
+					<icon name="square"/>
+					<icon name="icon"/>
+					<texture_picker label="Tela" name="Tela" tool_tip="Pulsa para elegir una imagen"/>
+					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/>
+					<button label="Crear una Camisa Nuevo" label_selected="Crear una Camisa Nuevo" name="Create New"/>
+					<button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
+					<button label="Guardar" label_selected="Guardar" name="Save"/>
+					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+					<text name="title">
+						  [DESC]
+					</text>
+					<text name="title_no_modify">
+						  [DESC]: no modificable
+					</text>
+					<text name="title_loading">
+						  [DESC]: cargando...
+					</text>
+					<text name="title_not_worn">
+						  [DESC]: no llevas
+					</text>
+					<text name="path">
+						  Situada en [PATH]
+					</text>
+					<text name="not worn instructions">
+						  Ponte una camisa nueva arrastrando una desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+una nueva y vistiéndotela.					
+					</text>
+					<text name="no modify instructions">
+						  No tienes permiso para modificar este item.
+					</text>
+					<text name="Item Action Label">
+						  Camisa:
+					</text>
+			 </panel>
+			 <panel label="Pantalones" name="Pants">
+					<icon name="square"/>
+					<icon name="icon"/>
+					<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/>
+					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
+					<button label="Crear un Nuevo Pantalón" label_selected="Crear un Nuevo Pantalón" name="Create New"/>
+					<button label="Quitarlo" label_selected="Quitarlo" name="Take Off"/>
+					<button label="Guardar" label_selected="Guardar" name="Save"/>
+					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+					<text name="title">
+						  [DESC]
+					</text>
+					<text name="title_no_modify">
+						  [DESC]: no modificable
+					</text>
+					<text name="title_loading">
+						  [DESC]: cargando...
+					</text>
+					<text name="title_not_worn">
+						  [DESC]: no llevas
+					</text>
+					<text name="path">
+						  Situado en [PATH]
+					</text>
+					<text name="not worn instructions">
+						  Ponte un pantalón nuevo arrastrando uno desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+uno nuevo y vistiéndotelo.					
+					</text>
+					<text name="no modify instructions">
+						  No tienes permiso para modificar este iem.
+					</text>
+					<text name="Item Action Label">
+						  Pantalones:
+					</text>
+			 </panel>
+			 <panel label="Zapatos" name="Shoes">
+					<icon name="square"/>
+					<icon name="icon"/>
+					<text name="title">
+						  [DESC]
+					</text>
+					<text name="title_no_modify">
+						  [DESC]: no modificable
+					</text>
+					<text name="title_loading">
+						  [DESC]: cargando...
+					</text>
+					<text name="title_not_worn">
+						  [DESC]: no llevas
+					</text>
+					<text name="path">
+						  Situados en [PATH]
+					</text>
+					<text name="not worn instructions">
+						  Ponte nuevos zapatos arrastrándolos desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+un par nuevo y vistiéndotelo.					
+					</text>
+					<text name="no modify instructions">
+						  No tienes permiso para modificar este item.
+					</text>
+					<text name="Item Action Label">
+						  Zapatos:
+					</text>
+					<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/>
+					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
+					<button label="Crear Zapatos Nuevos" label_selected="Crear Zapatos Nuevos" name="Create New"/>
+					<button label="Quitárselos" label_selected="Quitárselos" name="Take Off"/>
+					<button label="Guardar" label_selected="Guardar" name="Save"/>
+					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+			 </panel>
+			 <panel label="Medias" name="Socks">
+					<icon name="square"/>
+					<icon name="icon"/>
+					<text name="title">
+						  [DESC]
+					</text>
+					<text name="title_no_modify">
+						  [DESC]: no modificable
+					</text>
+					<text name="title_loading">
+						  [DESC]: cargando...
+					</text>
+					<text name="title_not_worn">
+						  [DESC]: no llevas
+					</text>
+					<text name="path">
+						  Situados en [PATH]
+					</text>
+					<text name="not worn instructions">
+						  Ponte medias nuevas arrastrándolas desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+un par nuevo y vistiéndotelas.						
+					</text>
+					<text name="no modify instructions">
+						  No tienes permiso para modificar este item.
+					</text>
+					<text name="Item Action Label">
+						  Medias:
+					</text>
+					<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen" />
+					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
+					<button label="Crear Medias Nuevas" label_selected="Crear Medias Nuevas" name="Create New"/>
+					<button label="Quitárselas" label_selected="Quitárselas" name="Take Off"/>
+					<button label="Guardar" label_selected="Guardar" name="Save"/>
+					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+			 </panel>
+			 <panel label="Chaqueta" name="Jacket">
+					<icon name="square"/>
+					<icon name="icon"/>
+					<text name="title">
+						  [DESC]
+					</text>
+					<text name="title_no_modify">
+						  [DESC]: no modificable
+					</text>
+					<text name="title_loading">
+						  [DESC]: cargando...
+					</text>
+					<text name="title_not_worn">
+						  [DESC]: no llevas
+					</text>
+					<text name="path">
+						  Situada en [PATH]
+					</text>
+					<text name="not worn instructions">
+						  Ponte una chaqueta nueva arrastrándola desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+una nueva y vistiéndotela.
+					</text>
+					<text name="no modify instructions">
+						  No tienes permiso para modificar este item.
+					</text>
+					<text name="Item Action Label">
+						  Chaqueta:
+					</text>
+					<texture_picker label="Tela Superior" name="Upper Fabric" tool_tip="Pulsa para elegir una imagen" />
+					<texture_picker label="Tela Inferior" name="Lower Fabric" tool_tip="Pulsa para elegir una imagen" />
+					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
+					<button label="Crear una Nueva Chaqueta" label_selected="Crear una Nueva Chaqueta" name="Create New"/>
+					<button label="Quitársela" label_selected="Quitársela" name="Take Off"/>
+					<button label="Guardar" label_selected="Guardar" name="Save"/>
+					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+			 </panel>
+			 <panel label="Guantes" name="Gloves">
+					<icon name="square"/>
+					<icon name="icon"/>
+					<text name="title">
+						  [DESC]
+					</text>
+					<text name="title_no_modify">
+						  [DESC]: no modificable
+					</text>
+					<text name="title_loading">
+						  [DESC]: cargando...
+					</text>
+					<text name="title_not_worn">
+						  [DESC]: no llevas
+					</text>
+					<text name="path">
+						  Situados en [PATH]
+					</text>
+					<text name="not worn instructions">
+						  Ponte guantes nuevos arrastrándolos desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+nuevos y vistiéndotelos.					
+					</text>
+					<text name="no modify instructions">
+						  No tienes permiso para modificar este item.
+					</text>
+					<text name="Item Action Label">
+						  Guantes:
+					</text>
+					<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen" />
+					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
+					<button label="Crear Guantes Nuevos" label_selected="Crear Guantes Nuevos" name="Create New"/>
+					<button label="Quitárselos" label_selected="Quitárselos" name="Take Off"/>
+					<button label="Guardar" label_selected="Guardar" name="Save"/>
+					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+			 </panel>
+			 <panel label="Camiseta" name="Undershirt">
+					<icon name="square"/>
+					<icon name="icon"/>
+					<text name="title">
+						  [DESC]
+					</text>	
+					<text name="title_no_modify">
+						  [DESC]: no modificable
+					</text>
+					<text name="title_loading">
+						  [DESC]: cargando...
+					</text>
+					<text name="title_not_worn">
+						  [DESC]: no llevas
+					</text>
+					<text name="path">
+						  Situada en [PATH]
+					</text>
+					<text name="not worn instructions">
+						  Ponte una camiseta nueva arrastrándola desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+una camiseta y vistiéndotela.
+					</text>
+					<text name="no modify instructions">
+						  No tienes permiso para modificar este item.
+					</text>
+					<text name="Item Action Label">
+						  Ropa Interior:
+					</text>
+					<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen" />
+					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
+					<button label="Crear una Camiseta Nueva" label_selected="Crear una Camiseta Nueva" name="Create New"/>
+					<button label="Quitársela" label_selected="Quitársela" name="Take Off"/>
+					<button label="Guardar" label_selected="Guardar" name="Save"/>
+					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+			 </panel>
+			 <panel label="Ropa Interior" name="Underpants">
+					<icon name="square"/>
+					<icon name="icon"/>
+					<text name="title">
+						  [DESC]
+					</text>
+					<text name="title_no_modify">
+						  [DESC]: no modificable
+					</text>
+					<text name="title_loading">
+						  [DESC]: cargando...
+					</text>
+					<text name="title_not_worn">
+						  [DESC]: no llevas
+					</text>
+					<text name="path">
+						  Situada en [PATH]
+					</text>
+					<text name="not worn instructions">
+						  Ponte ropa interior nueva arrastrándola desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+ropa interior y vistiéndotela.					
+					</text>
+					<text name="no modify instructions">
+						  No tienes permiso para modificar este item.
+					</text>
+					<text name="Item Action Label">
+						  Ropa Interior:
+					</text>
+					<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen" />
+					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
+					<button label="Crear nueva Ropa Interior" label_selected="Crear nueva Ropa Interior" name="Create New"/>
+					<button label="Quitársela" label_selected="Quitársela" name="Take Off"/>
+					<button label="Guardar" label_selected="Guardar" name="Save"/>
+					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+			 </panel>
+			 <panel label="Falda" name="Skirt">
+					<icon name="square"/>
+					<icon name="icon"/>
+					<text name="title">
+						  [DESC]
+					</text>
+					<text name="title_no_modify">
+						  [DESC]: no modificable
+					</text>
+					<text name="title_loading">
+						  [DESC]: cargando...
+					</text>
+					<text name="title_not_worn">
+						  [DESC]: no llevas
+					</text>
+					<text name="path">
+						  Situada en [PATH]
+					</text>
+					<text name="not worn instructions">
+						  Ponte una falda nueva arrastrándola desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+una nueva y vistiéndotela.					
+					</text>
+					<text name="no modify instructions">
+						  No tienes permiso para modificar este item.
+					</text>
+					<text name="Item Action Label">
+						  Falda:
+					</text>
+					<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/>
+					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
+					<button label="Crear una Nueva Falda" label_selected="Crear una Nueva Falda" name="Create New"/>
+					<button label="Quitársela" label_selected="Quitársela" name="Take Off"/>
+					<button label="Guardar" label_selected="Guardar" name="Save"/>
+					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+			 </panel>
+			 <panel name="Tattoo" label="Tatuaje" >
+					<icon name="square"/>
+					<icon name="icon"/>
+					<text name="title">
+						  [DESC]
+					</text>
+					<text name="title_no_modify">
+						  [DESC]: no modificable
+					</text>
+					<text name="title_loading">
+						  [DESC]: cargando...
+					</text>
+					<text name="title_not_worn">
+						  [DESC]: no llevas
+					</text>
+					<text name="path">
+						  Situada en [PATH]
+					</text>
+					<text name="not worn instructions">
+						  Ponte un nuevo Tatuaje arrastrándolo desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+uno nuevo y vistiéndotelo.
+					</text>
+					<text name="no modify instructions">
+						  No tienes permiso para modificar este item.
+					</text>
+					<text name="Item Action Label">
+						  Tatuaje:
+					</text>
+					<texture_picker name="Head Tattoo" label="Tatuaje: Cabeza" tool_tip="Pulsa para elegir una imagen" />
+					<texture_picker name="Upper Tattoo" label="Tatuaje:Superior" tool_tip="Pulsa para elegir una imagen"/>
+					<texture_picker name="Lower Tattoo" label="Tatuaje: Inferior" tool_tip="Pulsa para elegir una imagen"/>
+					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
+					<button name="Create New" label="Crear Nuevo Tatuaje" label_selected="Crear Nuevo Tatuaje"/>
+					<button name="Take Off" label="Quitárselo" label_selected="Quitárselo"/>
+					<button name="Save" label="Guardar" label_selected="Guardar"/>
+					<button name="Save As" label="Guardar Como..." label_selected="Guardar Como..."/>
+					<button name="Revert" label="Restablecer" label_selected="Restablecer"/>
+			 </panel>
+			 <panel name="Alpha" label="Alfa">
+					<icon name="square"/>
+					<icon name="icon"/>
+					<text name="title">
+						  [DESC]
+					</text>
+					<text name="title_no_modify">
+						  [DESC]: no modificable
+					</text>
+					<text name="title_loading">
+						  [DESC]: cargando...
+					</text>
+					<text name="title_not_worn">
+						  [DESC]: no llevas
+					</text>
+					<text name="path">
+						  Situado en [PATH]
+					</text>
+					<text name="not worn instructions">
+						  Ponte una nueva Capa Alfa arrastrándola desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+una nueva y vistiéndotela.
+					</text>
+					<text name="no modify instructions">
+						  No tienes permiso para modificar este item.
+					</text>
+					<text name="Item Action Label">
+						  Alfa:
+					</text>
+					<texture_picker name="Head Alpha" label="Alfa: Cabeza" tool_tip="Pulsa para elegir una imagen"/>
+					<texture_picker name="Upper Alpha" label="Alfa Superior" tool_tip="Pulsa para elegir una imagen"/>
+					<texture_picker  name="Lower Alpha" label="Alfa Inferior" tool_tip="Pulsa para elegir una imagen"/>
+					<check_box name="head alpha texture invisible"/>
+					<check_box name="upper alpha texture invisible"/>
+					<check_box name="lower alpha texture invisible"/>
+					<texture_picker name="Hair Alpha" label="Alfa: Pelo" tool_tip="Pulsa para elegir una imagen"/>
+					<texture_picker name="Eye Alpha" label="Alfa: Ojos" tool_tip="Pulsa para elegir una imagen"/>
+					<check_box name="hair alpha texture invisible"/>
+					<check_box name="eye alpha texture invisible"/>
+					<button name="Create New" label="Crear Nuevo Alfa" label_selected="Crear Nuevo Alfa"/>
+					<button name="Take Off" label="Quitárselo" label_selected="Quitárselo"/>
+					<button name="Save" label="Guardar" label_selected="Guardar"/>
+					<button name="Save As" label="Guardar Como..." label_selected="Guardar Como..."/>
+					<button name="Revert" label="Restablecer" label_selected="Restablecer"/>
+			 </panel>
+			 <panel label="Física" name="Physics">
+					<icon name="square"/>
+					<icon name="icon"/>
+					<button label="Rebote del Vientre" label_selected="Rebote del Vientre" name="Belly Bounce"/>
+					<button label="Rebote de Senos" label_selected="Rebote de Senos" name="Breast Bounce"/>
+					<button label="Escote" label_selected="Escote" name="Breast Cleavage"/>
+					<button label="Balanceo de Senos" label_selected="Balanceo de Senos" name="Breast Sway"/>
+					<button label="Rebote de Glúteos" label_selected="Rebote de Glúteos" name="Butt Bounce"/>
+					<button label="Balanceo de Glúteos" label_selected="Balanceo de Glúteos" name="Butt Sway"/>
+					<button label="Parámetros Avanzados" label_selected="Parámetros Avanzados" name="Advanced Parameters"/>
+					<button name="Take Off" label="Quitarse" label_selected="Quitarse"/>
+					<text name="title">
+						  [DESC]
+					</text>
+					<text name="title_no_modify">
+						  [DESC]: no modificable
+					</text>
+					<text name="title_loading">
+						  [DESC]: cargando...
+					</text>
+					<text name="title_not_worn">
+						  [DESC]: no llevas
+					</text>
+					<text name="path">
+						  Situada en  [PATH]
+					</text>
+					<text name="not worn instructions">
+						  Ponte una nueva Capa Física arrastrándola desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+una nueva y vistiéndotela.					
+					</text>
+					<text name="no modify instructions">
+						  No tienes permiso para modificar este item.
+					</text>
+					<text name="Item Action Label">
+						  Física:
+					</text>
+					<button label="Crear Nueva Capa Física" label_selected="Crear Nueva Capa Física" name="Create New"/>
+					<button label="Guardar" label_selected="Guardar" name="Save"/>
+					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+			 </panel>
+	  </tab_container>
+	  <scroll_container name="panel_container"/>
+	  <text name="AvatarHeightText">
+			 Altura del Avatar:
+	  </text>
+	  <text name="HeightTextM">
+			 (métrico)
+	  </text>
+	  <text name="HeightTextI">
+			 (imperial)
+	  </text>
+	  <button name="Import" label="Importar"/>
+	  <button name="Export" label="Exportar"/>	
+	  <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	  <button label="OK" label_selected="OK" name="Ok"/>
+	  <button label="Hacer un Vestuario..." label_selected="Hacer un Vestuario..." name="Make Outfit"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
new file mode 100644
index 000000000..67f5c7347
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Day Cycle Floater" title="Editor del Ciclo Diario">
+	  <tab_container name="Day Cycle Tabs">
+			 <panel label="Ciclo Diario" name="Day Cycle">
+					<button label="?" name="WLDayCycleHelp"/>
+					<multi_slider label="" name="WLTimeSlider"/>
+					<multi_slider name="WLDayCycleKeys"/>
+					<text name="WL12am">
+						  00:00
+					</text>
+					<text name="WL3am">
+						  03:00
+					</text>
+					<text name="WL6am">
+						  06:00
+					</text>
+					<text name="WL9amHash">
+						  09:00
+					</text>
+					<text name="WL12pmHash">
+						  12:00
+					</text>
+					<text name="WL3pm">
+						  15:00
+					</text>
+					<text name="WL6pm">
+						  18:00
+					</text>
+					<text name="WL9pm">
+						  21:00
+					</text>
+					<text name="WL12am2">
+						  24:00
+					</text>
+					<text name="WL12amHash">
+						  |
+					</text>
+					<text name="WL3amHash">
+						  I
+					</text>
+					<text name="WL6amHash">
+						  |
+					</text>
+					<text name="WL9amHash2">
+						  I
+					</text>
+					<text name="WL12pmHash2">
+						  |
+					</text>
+					<text name="WL3pmHash">
+						  I
+					</text>
+					<text name="WL6pmHash">
+						  |
+					</text>
+					<text name="WL9pmHash">
+						  I
+					</text>
+					<text name="WL12amHash2">
+						  |
+					</text>
+					<button label="Añadir Punto" label_selected="Añadir Punto" name="WLAddKey"/>
+					<button label="Quitar Punto" label_selected="Quitar Punto" name="WLDeleteKey"/>
+					<text name="WLCurKeyFrameText" width="200">
+						  Configuración fotográma clave:
+					</text>
+					<text name="WLCurKeyTimeText">
+						  Hora Clave:
+					</text>
+					<spinner label="Hora" name="WLCurKeyHour"/>
+					<spinner label="Min" name="WLCurKeyMin"/>
+					<text name="WLCurKeyTimeText2">
+						  Modelo Predifinido:
+					</text>
+					<combo_box label="Predifinido" name="WLKeyPresets"/>
+					<view_border height="115" left="12" width="190" />
+					<text name="DayCycleText">
+						  Intervalo:
+					</text>
+					<combo_box label="5 min" name="WLSnapOptions"/>
+					<text name="DayCycleText2">
+						  Duración del Ciclo:
+					</text>
+					<spinner label="Hora" name="WLLengthOfDayHour"/>
+					<spinner label="Min" name="WLLengthOfDayMin"/>
+					<spinner label="Seg" name="WLLengthOfDaySec"/>
+					<text name="DayCycleText3">
+						  Vista Previa:
+					</text>
+					<button label="Ver" label_selected="Ver" name="WLAnimSky"/>
+					<button label="Parar" label_selected="Parar" name="WLStopAnimSky"/>
+					<button label="Usar Horario del Estado" label_selected="Usar Horario del Estado" name="WLUseLindenTime"/>
+					<text name="KeyFramePresetsText">
+						  Predefinidos:
+					</text>
+					<combo_box name="DayCyclePresetsCombo"/>
+					<button label="Nuevo" label_selected="Nuevo" name="DayCycleNewPreset"/>
+					<button label="Guardar" label_selected="Guardar" name="DayCycleSavePreset"/>
+					<button label="Borrar" label_selected="Borrar" name="DayCycleDeletePreset"/>
+					<!--<button bottom="-295" enabled="true" font="SansSerif" halign="center" height="20"
+						  label="Save Test Day" label_selected="Save Test Day"
+						  left="480" mouse_opaque="true" name="WLSaveDayCycle" scale_image="true"
+						  width="150" />
+					<button bottom="-320" enabled="true" font="SansSerif" halign="center" height="20"
+						  label="Load Test Day" label_selected="Load Test Day"
+						  left="480" mouse_opaque="true" name="WLLoadDayCycle" scale_image="true"
+						  width="150" /> -->
+			 </panel>
+	  </tab_container>
+	  <string name="DaycycleDefaultNames">
+			 Default:Happy%20Bivouac
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_device_settings.xml b/indra/newview/skins/default/xui/es/floater_device_settings.xml
new file mode 100644
index 000000000..f82219e75
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_device_settings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_device_settings" title="Configuración Dispositivos de Voz">
+	  <panel name="device_settings" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_dictionaries.xml b/indra/newview/skins/default/xui/es/floater_dictionaries.xml
new file mode 100644
index 000000000..bb9b1135a
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_dictionaries.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="EmeraldIRC_dictionaries" title="Descargar Diccionarios">
+	  <text name="EmDics_txt">
+A continuación hay un a lista de diccionarios adicionales
+que puedes descargar desde el sitio de Imprudence.
+
+Selecciona el diccionario que deseas tener para instalar
+y luego presiona el botón Descargar
+	  <combo_box name="Emerald_combo_dics" tool_tip=""/>
+	  <button label="Descargar" name="Emerald_dic_download"/>
+</floater> 
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_directory.xml b/indra/newview/skins/default/xui/es/floater_directory.xml
new file mode 100644
index 000000000..57b26204b
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_directory.xml
@@ -0,0 +1,451 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="directory" title="Buscar en Second Life">
+	  <tab_container name="Directory Tabs" >
+			 <panel label="Todo" name="find_all_panel">
+					<string name="searching_text">
+						  Buscando...
+					</string>
+					<string name="not_found_text">
+						  Nada encontrado.
+					</string>
+					<text name="find">
+						  Buscar:
+					</text>
+					<line_editor label="Buscar" name="search_editor" tool_tip="Buscar en Second Life"/>
+					<button label="" name="back_btn"/>
+					<button label="" name="forward_btn"/>
+					<button label="" name="reload_btn"/>
+					<button label="Buscar" name="search_btn"/>
+					<combo_box name="Category">
+						  <combo_item name="AnyCategory" value="All">
+								 Cualquier Categoría
+						  </combo_item>
+						  <combo_item name="Events" value="Events">
+								 Eventos
+						  </combo_item>
+						  <combo_item name="Groups" value="Groups">
+								 Grupos
+						  </combo_item>
+						  <combo_item name="People" value="People">
+								 Gente
+						  </combo_item>
+						  <combo_item name="Places" value="Places">
+								 Lugares
+						  </combo_item>
+						  <combo_item name="Wiki" value="Wiki">
+								 Wiki
+						  </combo_item>
+					</combo_box>
+					<check_box label="Contenido PG" name="incpg"/>
+					<check_box label="Contenido Mature" name="incmature"/>
+					<check_box label="Contenido Adulto" name="incadult"/>
+					<button label="?" label_selected="?" name="?"/>
+					<web_browser name="find_browser"/>
+					<text name="status_text"/>
+					<string name="loading_text">
+						  Cargando...
+					</string>
+					<string name="done_text">
+						  Hecho
+					</string>
+					<string name="redirect_404_url">
+						  http://secondlife.com/app/search/notfound.html
+					</string>
+					<string name="default_search_page">
+						  "http://secondlife.com/app/search/index.php?"
+					</string>
+			 </panel>
+			 <panel label="Clasificados" name="classified_panel">
+					<string name="searching_text">
+						  Buscando...
+					</string>
+					<string name="not_found_text">
+						  Nada encontrado.
+					</string>
+					<text name="find">
+						  Buscar:
+					</text>
+					<line_editor name="name"/>
+					<check_box label="Contenido PG" name="incpg"/>
+					<check_box label="Contenido Mature" name="incmature"/>
+					<check_box label="Adult content" name="incadult"/>
+					<combo_box name="Category">
+						  <combo_item name="AnyCategory" value="0">
+								 Cualquier Categoría
+						  </combo_item>
+						  <combo_item name="Shopping" value="1">
+								 Compras
+						  </combo_item>
+						  <combo_item name="LandRental" value="2">
+								 Terreno en alquiler
+						  </combo_item>
+						  <combo_item name="PropertyRental" value="3">
+								 Propiedad en alquiler
+						  </combo_item>
+						  <combo_item name="SpecialAttraction" value="4">
+								 Atracciones Especiales
+						  </combo_item>
+						  <combo_item name="NewProducts" value="5">
+								 Nuevos Productos
+						  </combo_item>
+						  <combo_item name="Employment" value="6">
+								 Empleos
+						  </combo_item>
+						  <combo_item name="Wanted" value="7">
+								 Se busca
+						  </combo_item>
+						  <combo_item name="Service" value="8">
+								 Servicios
+						  </combo_item>
+						  <combo_item name="Personal" value="9">
+								 Personal
+						  </combo_item>
+					</combo_box>
+					<button label="Navegar" label_selected="Navegar" name="Browse"/>
+					<button label="Buscar" label_selected="Buscar" name="Search"/>
+					<button label="Poner un Anuncio..." label_selected="Poner un Anuncio..." name="Place an Ad..."/>
+					<button label="Borrar" label_selected="Borrar" name="Delete"/>
+					<scroll_list name="results">
+						  <column label="" name="icon"/>
+						  <column label="" name="type"/>
+						  <column label="Nombre" name="name"/>
+						  <column label="Precio" name="price"/>
+					</scroll_list>
+					<text name="result_text"/>
+					<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
+					<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+			 </panel>
+			 <panel label="Eventos" name="events_panel">
+					<string name="searching_text">
+						  Buscando...
+					</string>
+					<string name="not_found_text">
+						  Nada encontrado.
+					</string>
+					<text name="text2">
+						  Buscar:
+					</text>
+					<line_editor name="event_search_text"/>
+					<radio_group name="date_mode">
+						  <radio_item name="current">
+								 En curso y próximos
+						  </radio_item>
+						  <radio_item name="date">
+								 Fecha
+						  </radio_item>
+					</radio_group>
+					<button label="&lt;&lt;" label_selected="&lt;&lt;" name="&lt;&lt;" tool_tip="Retroceder un día"/>
+					<text name="date_text">
+						  6/6
+					</text>
+					<button label="&gt;&gt;" label_selected="&gt;&gt;" name="&gt;&gt;" tool_tip="Avanzar un día" />
+					<button label="Hoy" label_selected="Hoy" name="Today" tool_tip="Mostrar los eventos del día de hoy"/>
+					<text name="text">
+						  Categoría:
+					</text>
+					<combo_box name="category combo">
+						  <combo_item name="All" value="0">
+								 Cualquier categoría
+						  </combo_item>
+						  <combo_item name="Discussion" value="18">
+								 Debates
+						  </combo_item>
+						  <combo_item name="Sports" value="19">
+								 Deportes
+						  </combo_item>
+						  <combo_item name="LiveMusic" value="20">
+								 Música en Vivo
+						  </combo_item>
+						  <combo_item name="Commercial" value="22">
+								 Comercial
+						  </combo_item>
+						  <combo_item name="Nightlife/Entertainment" value="23">
+								 Vida Nocturna/Entretenimiento
+						  </combo_item>
+						  <combo_item name="Games/Contests" value="24">
+								 Juegos/Concursos
+						  </combo_item>
+						  <combo_item name="Pageants" value="25">
+								 Representaciones
+						  </combo_item>
+						  <combo_item name="Education" value="26">
+								 Educación
+						  </combo_item>
+						  <combo_item name="ArtsandCulture" value="27">
+								 Arte y Cultura
+						  </combo_item>
+						  <combo_item name="Charity/SupportGroups" value="28">
+								 Representaciones
+						  </combo_item>
+						  <combo_item name="Miscellaneous" value="29">
+								 Miscelaneos
+						  </combo_item>
+					</combo_box>
+					<check_box label="Contenido PG" name="incpg"/>
+					<check_box label="Contenido Mature" name="incmature"/>
+					<check_box label="Contenido Adulto" name="incadult"/>
+					<button label="Buscar" label_selected="Buscar" name="Search"/>
+					<button label="Borrar" label_selected="Borrar" name="Delete"/>
+					<scroll_list name="results">
+						  <column label="" name="icon"/>
+						  <column label="" name="type"/>
+						  <column label="Nombre" name="name" />
+						  <column label="Hora (PT)" name="date"/>
+						  <column label="" name="event_id"/>
+						  <column label="Hora" name="time"/>
+					</scroll_list>
+					<text name="result_text"/>
+					<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
+					<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+			 </panel>
+			 <panel label="Escaparate" name="showcase_panel">
+					<string name="searching_text">
+						  Buscando...
+					</string>
+					<string name="not_found_text">
+						  Nada encontrado.
+					</string>
+					<button label="" name="back_btn"/>
+					<button label="" name="forward_btn"/>
+					<button label="" name="reload_btn"/>
+					<!-- No mature content checkbox, showcase is all PG -->
+					<web_browser name="showcase_browser" />
+					<text name="status_text"/>
+					<string name="loading_text">
+						  Cargando...
+					</string>
+					<string name="done_text">
+						  Hecho
+					</string>
+					<string name="redirect_404_url">
+						  http://secondlife.com/app/search/notfound.html
+					</string>
+					<string name="default_search_page">
+						  "http://secondlife.com/app/showcase/index.php?"
+					</string>
+			 </panel>
+			 <panel label="Venta de Terrenos" name="land_sales_panel">
+					<string name="searching_text">
+						  Buscando...
+					</string>
+					<string name="not_found_text">
+						  Ninguno encontrado.
+					</string>
+					<string name="land_help_text">
+						  El terreno puede comprarse directamente en la moneda del mundo ([CURRENCY]) , o con [CURRENCY] o [REALCURRENCY]. en una
+subasta. Para comprarlo directamente, visítalo y pulsa en el nombre del terreno en la barra superior del visor.					
+					</string>
+					<text name="find">
+						  Buscar:
+					</text>
+					<check_box label="Contenido PG" name="incpg"/>
+					<check_box label="Contenido Mature" name="incmature"/>
+					<check_box label="Contenido Adulto" name="incadult"/>
+					<combo_box name="type">
+						  <combo_item name="AllTypes" value="All Types">
+								 Todos los tipos
+						  </combo_item>
+						  <combo_item name="Auction" value="Auction">
+								 Subasta
+						  </combo_item>
+						  <combo_item name="MainlandSales" value="Mainland Sales">
+								 En Venta - Mainland
+						  </combo_item>
+						  <combo_item name="EstateSales" value="Estate Sales">
+								 En Venta - Estado
+						  </combo_item>
+					</combo_box>
+					<check_box label="Precio &#8804; " name="pricecheck"/>
+					<text name="pricecheck_symbol">
+						  [CURRENCY]
+					</text>
+					<check_box label="Superficie &#8805; " name="areacheck"/>
+					<text name="areacheck_symbol">
+						  m²
+					</text>
+					<line_editor name="priceedit"/>
+					<line_editor name="areaedit"/>
+					<button label="Buscar" label_selected="Buscar" name="Search"/>
+					<scroll_list name="results">
+						  <column label="" name="icon"/>
+						  <column label="" name="type"/>
+						  <column label="Nombre" name="name" />
+						  <column label="Tipo" name="landtype"/>
+						  <column label="Precio [CURRENCY]" name="price"/>
+						  <column label="Superifice" name="area"/>
+						  <column label="[CURRENCY]/m²" name="per_meter"/>
+					</scroll_list>
+					<text name="result_text"/>
+					<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
+					<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+			 </panel>
+			 <panel label="Lugares" name="places_panel">
+					<string name="searching_text">
+						  Buscando...
+					</string>
+					<string name="not_found_text">
+						  Ninguno Encontrado.
+					</string>
+					<text name="find">
+						  Buscar:
+					</text>
+					<line_editor name="name"/>
+					<check_box label="Contenido PG" name="incpg"/>
+					<check_box label="Contenido Mature" name="incmature"/>
+					<check_box label="Contenido Adulto" name="incadult"/>
+					<combo_box name="Category">
+						  <combo_item name="AnyCategory" value="any">
+								 Cualquier Categoría
+						  </combo_item>
+						  <combo_item name="LindenLocation" value="linden">
+								 Localización Linden
+						  </combo_item>
+						  <combo_item name="Arts&amp;Culture" value="arts">
+								 Arte y Cultura
+						  </combo_item>
+						  <combo_item name="Business" value="store">
+								 Negocios
+						  </combo_item>
+						  <combo_item name="Educational" value="educational">
+								 Educacional
+						  </combo_item>
+						  <combo_item name="Gaming" value="game">
+								 Juegos de Azar
+						  </combo_item>
+						  <combo_item name="Hangout" value="gather">
+								 Entretenimiento
+						  </combo_item>
+						  <combo_item name="NewcomerFriendly" value="newcomer">
+								 Para recién llegados
+						  </combo_item>
+						  <combo_item name="Parks&amp;Nature" value="park">
+								 Parques y Naturaleza
+						  </combo_item>
+						  <combo_item name="Residential" value="home">
+								 Residencial
+						  </combo_item>
+						  <combo_item name="Shopping" value="shopping">
+								 Compras
+						  </combo_item>
+						  <combo_item name="Other" value="other">
+								 Otra
+						  </combo_item>
+						  <combo_item name="Rental" value="rental">
+								 Alquiler
+						  </combo_item>
+					</combo_box>
+						  <!-- This is used only during the AO transition and can be deleted once the AO transition is
+						  complete. It is identical to the combo box above except that it has the Adult category. 
+						  You might also want to set it back to default visible and enabled. -->
+					<combo_box name="Category_Adult">
+						  <combo_item name="AnyCategory" value="any">
+								 Cualquier Categoría
+						  </combo_item>
+						  <combo_item name="LindenLocation" value="linden">
+								 Localización Linden
+						  </combo_item>				
+						  <combo_item name="Adult" value="adult">
+								 Adulto
+						  </combo_item>
+						  <combo_item name="Arts&amp;Culture" value="arts">
+								 Arte y Cultura
+						  </combo_item>
+						  <combo_item name="Business" value="store">
+								 Negocios
+						  </combo_item>
+						  <combo_item name="Educational" value="educational">
+								 Educacional
+						  </combo_item>
+						  <combo_item name="Gaming" value="game">
+								 Juegos de Azar
+						  </combo_item>
+						  <combo_item name="Hangout" value="gather">
+								 Entretenimiento
+						  </combo_item>
+						  <combo_item name="NewcomerFriendly" value="newcomer">
+								 Para recién llegados
+						  </combo_item>
+						  <combo_item name="Parks&amp;Nature" value="park">
+								 Parques y Naturaleza
+						  </combo_item>
+						  <combo_item name="Residential" value="home">
+								 Residencial
+						  </combo_item>
+						  <combo_item name="Shopping" value="shopping">
+								 Compras
+						  </combo_item>
+						  <combo_item name="Other" value="other">
+								 Otra
+						  </combo_item>
+						  <combo_item name="Rental" value="rental">
+								 Alquiler
+						  </combo_item>						  
+					</combo_box>
+					<button label="Buscar" label_selected="Buscar" name="Search"/>
+					<scroll_list name="results">
+						  <column label="" name="icon"/>
+						  <column label="" name="type"/>
+						  <column label="Nombre" name="name" />
+						  <column label="Tráfico" name="dwell"/>
+					</scroll_list>
+					<text name="result_text"/>
+					<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
+					<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+			 </panel>
+			 <panel label="Personas" name="people_panel">
+					<string name="searching_text">
+						  Buscando...
+					</string>
+					<string name="not_found_text">
+						  Nadie Encontrado.
+					</string>
+					<text name="find">
+						  Buscar:
+					</text>
+					<line_editor name="name"/>
+					<button label="Buscar" label_selected="Buscar" name="Search"/>
+					<scroll_list name="results">
+						  <column label="" name="icon"/>
+						  <column label="" name="type"/>
+						  <column label="Nombre" name="name"/>
+					</scroll_list>
+					<text name="result_text"/>
+					<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
+					<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+			 </panel>
+			 <panel label="Grupos" name="groups_panel">
+					<string name="searching_text">
+						  Buscando...
+					</string>
+					<string name="not_found_text">
+						  Ninguno Encontrado.
+					</string>
+					<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
+					<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+					<text name="find">
+						  Buscar:
+					</text>
+					<line_editor name="name"/>
+					<button label="Buscar" label_selected="Buscar" name="Search"/>
+					<check_box label="Contenido PG" name="incpg"/>
+					<check_box label="Contenido Mature" name="incmature"/>
+					<check_box label="Contenido Adulto" name="incadult"/>
+					<scroll_list name="results">
+						  <column label="" name="icon"/>
+						  <column label="" name="type"/>
+						  <column label="Nombre" name="name" />
+						  <column label="Miembros" name="members"/>
+						  <column label="" name="score"/>
+					</scroll_list>
+					<text name="result_text"/>
+			 </panel>
+	  </tab_container>
+	  <panel name="classified_details_panel"/>
+	  <panel name="Panel Avatar"/>
+	  <panel name="event_details_panel"/>
+	  <panel name="group_details_panel_holder">
+			 <panel name="group_details_panel"/>
+	  </panel>
+	  <panel name="place_details_panel"/>
+	  <panel name="place_details_small_panel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_directory2.xml b/indra/newview/skins/default/xui/es/floater_directory2.xml
new file mode 100644
index 000000000..8e33522e1
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_directory2.xml
@@ -0,0 +1,638 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="true" height="570" min_height="570" min_width="780"
+     name="directory" rect_control="FloaterFindRect2" title="Search Second Life"
+     width="780">
+	<tab_container bottom="-570" follows="left|top|right|bottom" height="550" left="0"
+	     mouse_opaque="false" name="Directory Tabs" tab_position="top" width="780">
+		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+		     label="All" left="1" mouse_opaque="false" name="find_all_old_panel" width="778">
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+			     height="20" label="&lt; Prev" label_selected="&lt; Prev" left="80"
+			     mouse_opaque="true" name="&lt; Prev" width="60" />
+			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+			     height="20" label="Next &gt;" label_selected="Next &gt;"
+			     mouse_opaque="true" name="Next &gt;" width="60" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+			     name="find" v_pad="0" width="50">
+				Find:
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+			     follows="left|top" font="SansSerif" height="18" left_delta="38"
+			     max_length="63" mouse_opaque="true" name="name" width="128" spell_check="true" />
+			<button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
+			     label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
+			     name="Search" width="70" />
+			<check_box bottom="-22" control_name="ShowPGSearchAll" follows="left|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="PG content" left_delta="78" mouse_opaque="true"
+			     name="incpg" width="156" />
+			<check_box bottom="-22" control_name="ShowMatureSearchAll" follows="left|top"
+			     font="SansSerifSmall" height="16" initial_value="false"
+			     label="Mature content" left_delta="100" mouse_opaque="true"
+			     name="incmature" width="156" />
+			<check_box bottom="-22" control_name="ShowAdultSearchAll" follows="left|top"
+			     font="SansSerifSmall" height="16" initial_value="false"
+			     label="Adult content" left_delta="120" mouse_opaque="true"
+			     name="incadult" width="156" />
+			<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
+			     draw_heading="false" fg_disable_color="1, 1, 1, 1"
+			     follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+			     multi_select="false" name="results" search_column="1" width="339">
+				<column label="" name="icon" width="24" />
+				<column label="Name" name="name" width="235" />
+				<column label="Price" name="price" width="90" />
+				<column label="Time (PT)" name="date" width="90" />
+				<column label="Time" name="time" width="-1" />
+				<column label="Traffic" name="dwell" width="90" />
+				<column label="Area" name="area" width="90" />
+				<column label="L$/sq.m" name="per_meter" width="90" />
+				<column label="Online" name="online" width="90" />
+				<column label="Members" name="members" width="90" />
+			</scroll_list>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+		</panel>
+		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+		     label="Classifieds" left="1" left_delta="68" mouse_opaque="false"
+		     name="classified_panel" width="778">
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+			     name="find" v_pad="0" width="50">
+				Find:
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+			     follows="left|right|top" font="SansSerif" height="18" left="56"
+			     max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
+			<check_box bottom="-22" control_name="ShowPGClassifieds" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="PG content" left="420" mouse_opaque="true"
+			     name="incpg" width="156" />
+			<check_box bottom="-40" control_name="ShowMatureClassifieds" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="Mature content" left="420" mouse_opaque="true"
+			     name="incmature" width="156" />
+			<check_box bottom="-58" control_name="ShowAdultClassifieds" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="false"
+			     label="Adult content" left="420" mouse_opaque="true"
+			     name="incadult" width="156" />
+			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
+			     max_chars="20" mouse_opaque="true" name="Category" width="158">
+				<combo_item name="AnyCategory" value="0">
+					Any Category
+				</combo_item>
+				<combo_item name="Shopping" value="1">
+					Shopping
+				</combo_item>
+				<combo_item name="LandRental" value="2">
+					Land Rental
+				</combo_item>
+				<combo_item name="PropertyRental" value="3">
+					Property Rental
+				</combo_item>
+				<combo_item name="SpecialAttraction" value="4">
+					Special Attraction
+				</combo_item>
+				<combo_item name="NewProducts" value="5">
+					New Products
+				</combo_item>
+				<combo_item name="Employment" value="6">
+					Employment
+				</combo_item>
+				<combo_item name="Wanted" value="7">
+					Wanted
+				</combo_item>
+				<combo_item name="Service" value="8">
+					Service
+				</combo_item>
+				<combo_item name="Personal" value="9">
+					Personal
+				</combo_item>
+			</combo_box>
+			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
+			     label="Browse" label_selected="Browse" left="121" mouse_opaque="true"
+			     name="Browse" width="95" />
+			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
+			     label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
+			     visible="false" width="95" />
+			<button bottom="-46" follows="right|top" font="SansSerif" halign="center" height="20"
+			     label="Place an Ad..." label_selected="Place an Ad..." left="630"
+			     mouse_opaque="true" name="Place an Ad..." width="145" />
+			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+			     height="20" label="Delete" label_selected="Delete" left="80"
+			     mouse_opaque="true" name="Delete" width="80" />
+			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" 
+				 draw_heading="true" follows="left|top|right|bottom" height="450" left="4" 
+				 mouse_opaque="true" multi_select="false" name="results" search_column="2" width="339">
+				<column label="" name="icon" width="24" />
+				<column label="" name="type" width="-1" />
+				<column label="Name" name="name" width="225" />
+				<column label="Price" name="price" width="55" />
+			</scroll_list>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="result_text" v_pad="0" width="80" />
+			<button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
+			     height="20" label="Next &gt;" label_selected="Next &gt;"
+			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
+			<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
+			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
+			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+		</panel>
+		<panel border="true" bottom="-549" default_tab_group="1"
+		     follows="left|top|right|bottom" height="533" label="Events" left="1"
+		     mouse_opaque="false" name="events_panel" width="778">
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+			     name="text2" v_pad="0" width="50">
+				Find:
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+			     follows="left|right|top" font="SansSerif" height="18" left="56"
+			     max_length="63" mouse_opaque="true" name="event_search_text" width="160" spell_check="true" />
+			<radio_group bottom="-40" draw_border="false" follows="right|top" height="40" left="560"
+			     mouse_opaque="true" name="date_mode" width="300">
+				<radio_item bottom="-20" follows="left|top" height="20" left="0" mouse_opaque="true"
+				     name="current" width="174">
+					In-Progress and Upcoming
+				</radio_item>
+				<radio_item bottom_delta="-10" follows="left|top" height="20" left="0" mouse_opaque="true"
+				     name="date" width="56">
+					Date
+				</radio_item>
+			</radio_group>
+			<button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
+			     label="&lt;&lt;" label_selected="&lt;&lt;" left_delta="54"
+			     mouse_opaque="true" name="&lt;&lt;" tool_tip="Go back a day" width="24" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-36" drop_shadow_visible="true" follows="right|top" font="SansSerif"
+			     h_pad="0" halign="center" height="14" left_delta="22" mouse_opaque="true"
+			     name="date_text" v_pad="0" width="48">
+				6/6
+			</text>
+			<button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
+			     label="&gt;&gt;" label_selected="&gt;&gt;" left_delta="50"
+			     mouse_opaque="true" name="&gt;&gt;" tool_tip="Go forward a day" width="24" />
+			<button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
+			     label="Today" label_selected="Today" left_delta="28" mouse_opaque="true"
+			     name="Today" tool_tip="Show today&apos;s events" width="60" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-24" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="289"
+			     mouse_opaque="true" name="text" v_pad="0" width="90" visible="false">
+				Category:
+			</text>
+			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
+			     max_chars="20" mouse_opaque="true" name="category combo" width="158">
+				<combo_item name="All" value="0">
+					Any Category
+				</combo_item>
+				<combo_item name="Discussion" value="18">
+					Discussion
+				</combo_item>
+				<combo_item name="Sports" value="19">
+					Sports
+				</combo_item>
+				<combo_item name="LiveMusic" value="20">
+					Live Music
+				</combo_item>
+				<combo_item name="Commercial" value="22">
+					Commercial
+				</combo_item>
+				<combo_item name="Nightlife/Entertainment" value="23">
+					Nightlife/Entertainment
+				</combo_item>
+				<combo_item name="Games/Contests" value="24">
+					Games/Contests
+				</combo_item>
+				<combo_item name="Pageants" value="25">
+					Pageants
+				</combo_item>
+				<combo_item name="Education" value="26">
+					Education
+				</combo_item>
+				<combo_item name="ArtsandCulture" value="27">
+					Arts and Culture
+				</combo_item>
+				<combo_item name="Charity/SupportGroups" value="28">
+					Charity/Support Groups
+				</combo_item>
+				<combo_item name="Miscellaneous" value="29">
+					Miscellaneous
+				</combo_item>
+			</combo_box>
+			<check_box bottom="-22" control_name="ShowPGEvents" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="PG content" left="420" mouse_opaque="true"
+			     name="incpg" width="156" />
+			<check_box bottom="-40" control_name="ShowMatureEvents" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="Mature content" left="420" mouse_opaque="true"
+			     name="incmature" width="156" />
+			<check_box bottom="-58" control_name="ShowAdultEvents" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="false"
+			     label="Adult content" left="420" mouse_opaque="true"
+			     name="incadult" width="156" />
+			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
+			     label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
+			     visible="true" width="95" />
+			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+			     height="20" label="Delete" label_selected="Delete" left="80"
+			     mouse_opaque="true" name="Delete" width="80" />
+			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true" 
+			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
+			     multi_select="false" name="results" search_column="2" width="339">
+				<column label="" name="icon" width="24" />
+				<column label="" name="type" width="-1" />
+				<column dynamicwidth="true" label="Name" name="name" />
+				<column label="Time (PT)" name="date" sort="time" width="106" />
+				<column label="" name="event_id" width="-1" />
+				<column label="Time" name="time" width="-1" />
+			</scroll_list>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="result_text" v_pad="0" width="80" />
+			<button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
+			     height="20" label="Next &gt;" label_selected="Next &gt;"
+			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
+			<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
+			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
+			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+		</panel>
+		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+		     label="Land Sales" left="1" mouse_opaque="false" name="land_sales_panel"
+		     width="778" default_tab_group="1">
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<string name="land_help_text">
+			Land can be bought direct for in-world money ([CURRENCY]) or at auction for either [CURRENCY] or [REALCURRENCY].
+To buy direct, visit the land and click on the place name in the title bar.
+			</string>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+			     name="find" v_pad="0" width="50">
+				Find:
+			</text>
+			<check_box bottom="-22" control_name="ShowPGLand" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="PG content" left="420" mouse_opaque="true"
+			     name="incpg" tab_group="7" width="156" />
+			<check_box bottom="-40" control_name="ShowMatureLand" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="Mature content" left="420" mouse_opaque="true"
+			     name="incmature" tab_group="8" width="156" />
+			<check_box bottom="-58" control_name="ShowAdultLand" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="false"
+			     label="Adult content" left="420" mouse_opaque="true"
+			     name="incadult" tab_group="9" width="156" />
+			<combo_box allow_text_entry="false" bottom="-46" follows="left|top|right" height="18" left="282"
+			     max_chars="20" mouse_opaque="true" name="type" tab_group="6" width="128">
+				<combo_item name="AllTypes" value="All Types">
+					All Types
+				</combo_item>
+				<combo_item name="Auction" value="Auction">
+					Auction
+				</combo_item>
+				<combo_item name="MainlandSales" value="Mainland Sales">
+					For Sale - Mainland
+				</combo_item>
+				<combo_item name="EstateSales" value="Estate Sales">
+					For Sale - Estate
+				</combo_item>
+			</combo_box>
+			<check_box bottom="-24" control_name="FindLandPrice" follows="left|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="Price &#8804; " left="56" mouse_opaque="true" name="pricecheck"
+			     tab_group="1" width="88" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
+			     bottom="-24" font="SansSerifSmall" halign="left" height="16" left="116" mouse_opaque="true"
+			     name="pricecheck_symbol" width="15">
+				L$
+			</text>
+			<check_box bottom_delta="-18" control_name="FindLandArea" follows="left|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="Area &#8805; " left="56" mouse_opaque="true" name="areacheck"
+			     tab_group="3" width="80" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
+			     bottom="-42" font="SansSerifSmall" halign="left" height="16" left="170" mouse_opaque="true"
+			     name="areacheck_symbol" width="15">
+				m²
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-22"
+			     follows="left|top" font="SansSerifSmall" height="16" left="132"
+			     max_length="10" mouse_opaque="true" name="priceedit" tab_group="2" width="50" spell_check="true" />
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-18"
+			     follows="left|top" font="SansSerifSmall" height="16" left="117"
+			     max_length="10" mouse_opaque="true" name="areaedit" tab_group="4" width="50" spell_check="true" />
+			<button bottom="-48" follows="left|top" font="SansSerif" halign="center" height="20"
+			     label="Search" label_selected="Search" left="208" mouse_opaque="true"
+			     name="Search" tab_group="5" width="70" />
+			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true" 
+			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
+			     multi_select="false" name="results" search_column="2" tab_group="10" width="387">
+				<column label="" name="icon" width="24" />
+				<column label="" name="type" width="-1" />
+				<column dynamicwidth="true" label="Name" name="name" />
+				<column label="Type" name="landtype" width="50" />
+				<column label="L$ Price" name="price" width="65" />
+				<column label="Area" name="area" width="50" />
+				<column label="L$/m²" name="per_meter" width="65" />
+			</scroll_list>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+			<button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
+			     height="20" label="Next &gt;" label_selected="Next &gt;"
+			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
+			<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
+			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
+			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+		</panel>
+		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+		     label="Places" left="1" mouse_opaque="false" name="places_panel"
+		     width="778">
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+			     name="find" v_pad="0" width="50">
+				Find:
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+			     follows="left|right|top" font="SansSerif" height="18" left="56"
+			     max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
+			<check_box bottom="-22" control_name="ShowPGSims" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="PG content" left="420" mouse_opaque="true"
+			     name="incpg" width="156" />
+			<check_box bottom="-40" control_name="ShowMatureSims" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="Mature content" left="420" mouse_opaque="true"
+			     name="incmature" width="156" />
+			<check_box bottom="-58" control_name="ShowAdultSims" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="false"
+			     label="Adult content" left="420" mouse_opaque="true"
+			     name="incadult" width="156" />
+			<combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
+			     max_chars="20" mouse_opaque="true" name="Category" width="128" visible="false">
+				<combo_item name="AnyCategory" value="any">
+					Any Category
+				</combo_item>
+				<combo_item name="LindenLocation" value="linden">
+					Official Location
+				</combo_item>
+				<combo_item name="Arts&amp;Culture" value="arts">
+					Artsand Culture
+				</combo_item>
+				<combo_item name="Business" value="store">
+					Business
+				</combo_item>
+				<combo_item name="Educational" value="educational">
+					Educational
+				</combo_item>
+				<combo_item name="Gaming" value="game">
+					Gaming
+				</combo_item>
+				<combo_item name="Hangout" value="gather">
+					Hangout
+				</combo_item>
+				<combo_item name="NewcomerFriendly" value="newcomer">
+					Newcomer Friendly
+				</combo_item>
+				<combo_item name="Parks&amp;Nature" value="park">
+					Parks and Nature
+				</combo_item>
+				<combo_item name="Residential" value="home">
+					Residential
+				</combo_item>
+				<combo_item name="Shopping" value="shopping">
+					Shopping
+				</combo_item>
+				<combo_item name="Other" value="other">
+					Other
+				</combo_item>
+        <combo_item name="Rental" value="rental">
+          Rental
+        </combo_item>
+			</combo_box>
+			<!-- This is used only during the AO transition and can be deleted once the AO transition is
+			complete. It is identical to the combo box above except that it has the Adult category. 
+			You might also want to set it back to default visible and enabled. -->
+			<combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
+			     max_chars="20" mouse_opaque="true" name="Category_Adult" width="128" visible="false">
+				<combo_item name="AnyCategory" value="any">
+					Any Category
+				</combo_item>
+				<combo_item name="LindenLocation" value="linden">
+					Linden Location
+				</combo_item>
+				<combo_item name="Adult" value="adult">
+					Adult
+				</combo_item>
+				<combo_item name="Arts&amp;Culture" value="arts">
+					Arts and Culture
+				</combo_item>
+				<combo_item name="Business" value="store">
+					Business
+				</combo_item>
+				<combo_item name="Educational" value="educational">
+					Educational
+				</combo_item>
+				<combo_item name="Gaming" value="game">
+					Gaming
+				</combo_item>
+				<combo_item name="Hangout" value="gather">
+					Hangout
+				</combo_item>
+				<combo_item name="NewcomerFriendly" value="newcomer">
+					Newcomer Friendly
+				</combo_item>
+				<combo_item name="Parks&amp;Nature" value="park">
+					Parks and Nature
+				</combo_item>
+				<combo_item name="Residential" value="home">
+					Residential
+				</combo_item>
+				<combo_item name="Shopping" value="shopping">
+					Shopping
+				</combo_item>
+				<combo_item name="Other" value="other">
+					Other
+				</combo_item>
+        <combo_item name="Rental" value="rental">
+          Rental
+        </combo_item>
+			</combo_box>
+			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
+			     label="Search" label_selected="Search" left="121" mouse_opaque="true"
+			     name="Search" width="95" />
+			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
+			     draw_heading="true" 
+			     
+			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
+			     multi_select="false" name="results" search_column="2" width="339">
+				<column label="" name="icon" width="24" />
+				<column label="" name="type" width="-1" />
+				<column dynamicwidth="true" label="Name" name="name" />
+				<column label="Traffic" name="dwell" width="75" />
+			</scroll_list>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+			     height="20" label="Next &gt;" label_selected="Next &gt;"
+			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
+			<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
+			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
+			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+		</panel>
+    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+		     label="People" left="1" mouse_opaque="false" name="people_panel"
+		     width="778">
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+			     name="find" v_pad="0" width="50">
+        Find:
+      </text>
+	  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+			     follows="left|right|top" font="SansSerif" height="18" left="56"
+			     max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
+		<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
+			     label="Search" label_selected="Search" left="121" mouse_opaque="true"
+			     name="Search" width="95" />
+      <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
+			     draw_heading="true" 
+                               
+			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
+			     multi_select="false" name="results" search_column="2" width="326">
+        <column label="" name="icon" width="24" />
+        <column label="" name="type" width="-1" />
+        <column label="Name" name="name" width="274" />
+      </scroll_list>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+			     height="20" label="Next &gt;" label_selected="Next &gt;"
+			     mouse_opaque="true" name="Next &gt;" right="330" width="80" />
+      		<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
+			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
+			     mouse_opaque="true" name="&lt; Prev" right="244" width="80" />
+		</panel>
+		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+		     label="Groups" left="1" mouse_opaque="false" name="groups_panel"
+		     width="778">
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+			     height="20" label="Next &gt;" label_selected="Next &gt;"
+			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
+			<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
+			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
+			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+			     name="find" v_pad="0" width="50">
+				Find:
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+			     follows="left|top" font="SansSerif" height="18" left_delta="38"
+			     max_length="63" mouse_opaque="true" name="name" width="200" spell_check="true" />
+			<button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
+			     label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"
+			     name="Search" width="70" />
+			<check_box bottom="-46" control_name="ShowPGGroups" follows="left|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="PG content" left="4" mouse_opaque="true"
+			     name="incpg" width="204" />
+			<check_box bottom="-46" control_name="ShowMatureGroups" follows="left|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="Mature content" left_delta="90" mouse_opaque="true"
+			     name="incmature" width="204" />
+			<check_box bottom="-46" control_name="ShowAdultGroups" follows="left|top"
+			     font="SansSerifSmall" height="16" initial_value="false"
+			     label="Adult content" left_delta="110" mouse_opaque="true"
+			     name="incadult" width="204" />
+			<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
+			     draw_heading="true"
+			     follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+			     multi_select="false" name="results" search_column="2" width="339">
+				<column label="" name="icon" sort="score" sort_ascending="false" width="24" />
+				<column label="" name="type" width="-1" />
+				<column dynamicwidth="true" label="Name" name="name" />
+				<column halign="left" label="Members" name="members" sort_ascending="false" width="100" />
+				<column label="" name="score" width="-1" />
+			</scroll_list>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+		</panel>
+	</tab_container>
+	<panel bottom="-560" follows="right|top" height="470" left="340"
+	     name="classified_details_panel" width="440" />
+	<panel bottom="-560" follows="right|top" height="486" left="350" name="Panel Avatar"
+	     width="430" />
+	<panel bottom="-560" follows="right|top" height="470" left="340"
+	     name="event_details_panel" width="440" />
+	<panel bottom="-580" follows="right|top" height="515" left="350"
+	     name="group_details_panel_holder" width="430">
+		<panel bottom="0" follows="right|top" height="470" left="0" name="group_details_panel"
+		     width="430" />
+	</panel>
+	<panel bottom="-560" follows="right|top" height="470" left="340"
+	     name="place_details_panel" width="440" />
+	<panel bottom="-560" follows="right|top" height="470" left="385"
+	     name="place_details_small_panel" width="395" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_directory3.xml b/indra/newview/skins/default/xui/es/floater_directory3.xml
new file mode 100644
index 000000000..8823c5ba9
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_directory3.xml
@@ -0,0 +1,759 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="true" height="570" min_height="570" min_width="780"
+     name="directory" rect_control="FloaterFindRect2" title="Search Second Life"
+     width="780">
+	<tab_container bottom="-570" follows="left|top|right|bottom" height="550" left="0"
+	     mouse_opaque="false" name="Directory Tabs" tab_position="top" width="780">
+		 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+			  label="All Classic" left="1" mouse_opaque="false" name="find_all_old_panel" width="778">
+			 <string name="searching_text">
+				 Searching...
+			 </string>
+			 <string name="not_found_text">
+				 None Found.
+			 </string>
+			 <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+				  height="20" label="&lt; Prev" label_selected="&lt; Prev" left="80"
+				  mouse_opaque="true" name="&lt; Prev" width="60" />
+			 <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+				  height="20" label="Next &gt;" label_selected="Next &gt;"
+				  mouse_opaque="true" name="Next &gt;" width="60" />
+			 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+				  bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+				  h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+				  name="find" v_pad="0" width="50">
+				 Find:
+			 </text>
+			 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+				  follows="left|top" font="SansSerif" height="18" left_delta="38"
+				  max_length="63" mouse_opaque="true" name="name" width="128" spell_check="true" />
+			 <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
+				  label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
+				  name="Search" width="70" />
+			 <check_box bottom="-22" control_name="ShowPGSearchAll" follows="left|top"
+				  font="SansSerifSmall" height="16" initial_value="true"
+				  label="PG content" left_delta="78" mouse_opaque="true"
+				  name="incpg" width="156" />
+			 <check_box bottom="-22" control_name="ShowMatureSearchAll" follows="left|top"
+				  font="SansSerifSmall" height="16" initial_value="false"
+				  label="Mature content" left_delta="100" mouse_opaque="true"
+				  name="incmature" width="156" />
+			 <check_box bottom="-22" control_name="ShowAdultSearchAll" follows="left|top"
+				  font="SansSerifSmall" height="16" initial_value="false"
+				  label="Adult content" left_delta="120" mouse_opaque="true"
+				  name="incadult" width="156" />
+			 <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
+				  draw_heading="false" fg_disable_color="1, 1, 1, 1"
+				  follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+				  multi_select="false" name="results" search_column="1" width="339">
+				 <column label="" name="icon" width="24" />
+				 <column label="Name" name="name" width="235" />
+				 <column label="Price" name="price" width="90" />
+				 <column label="Time (PT)" name="date" width="90" />
+				 <column label="Time" name="time" width="-1" />
+				 <column label="Traffic" name="dwell" width="90" />
+				 <column label="Area" name="area" width="90" />
+				 <column label="L$/sq.m" name="per_meter" width="90" />
+				 <column label="Online" name="online" width="90" />
+				 <column label="Members" name="members" width="90" />
+			 </scroll_list>
+			 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+				  bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+				  font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+				  mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+		</panel>		 
+		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+		     label="All" left="1" mouse_opaque="false" name="find_all_panel" width="778">
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+			     name="find" v_pad="0" width="50">
+				Find:
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+			     commit_on_focus_lost="false" enabled="true" follows="top|left|right"
+			     font="SansSerif" handle_edit_keys_directly="false" height="18"
+			     label="Search" left_delta="56" max_length="254" mouse_opaque="true"
+			     name="search_editor" select_all_on_focus_received="false"
+			     select_on_focus="false" tab_group="1" tool_tip="Search Second Life"
+			     width="160" spell_check="true" />
+			<button bottom="-26" follows="top|right" font="SansSerifSmall" height="25" 
+            label="" left="230" name="back_btn" width="25" image_overlay="go-previous-4.png"/>
+			<button bottom="-26" follows="top|right" font="SansSerifSmall" height="25"
+			     label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next-4.png" />
+      <button bottom="-26" follows="top|right" font="SansSerifSmall" height="25"
+			     label="" left_delta="27" name="reload_btn" width="25" image_overlay="view-refresh-5.png"/>
+			<button bottom="-48" follows="top|right" font="SansSerif" height="20"
+			     label="Search" left="121" name="search_btn" width="95" />
+			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18"
+			     left="230" max_chars="20" mouse_opaque="true" name="Category"
+			     width="158">
+				<combo_item name="AnyCategory" value="All">
+					Any Category
+				</combo_item>
+				<combo_item name="Events" value="Events">
+					Events
+				</combo_item>
+				<combo_item name="Groups" value="Groups">
+					Groups
+				</combo_item>
+				<combo_item name="People" value="People">
+					People
+				</combo_item>
+				<combo_item name="Places" value="Places">
+					Places
+				</combo_item>
+				<combo_item name="Wiki" value="Wiki">
+					Wiki
+				</combo_item>
+			</combo_box>
+			<check_box bottom="-22" control_name="ShowPGSearchAll" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="PG content" left="450" mouse_opaque="true"
+			     name="incpg" width="156" />
+			<check_box bottom="-40" control_name="ShowMatureSearchAll" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="Mature content" left="450" mouse_opaque="true"
+			     name="incmature" width="156" />
+			<check_box bottom="-58" control_name="ShowAdultSearchAll" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="false"
+			     label="Adult content" left="450" mouse_opaque="true"
+			     name="incadult" width="156" />
+	                <button bottom="-22" enabled="true" follows="right|top" font="SansSerif"
+                             halign="center" height="18" label="?" label_selected="?" left="-25"
+                             mouse_opaque="true" name="?" width="18" />
+			<web_browser bottom="25" follows="top|left|bottom|right" font="SansSerifSmall" left="10"
+			     name="find_browser" right="-10" top="-60" />
+			<text bottom="5" follows="bottom|left" halign="left" height="16" left="10"
+			     name="status_text" width="150" />
+			<string name="loading_text">
+				Loading...
+			</string>
+			<string name="done_text">
+				Done
+			</string>
+			<string name="redirect_404_url">
+				http://secondlife.com/app/search/notfound.html
+			</string>
+      <string name="default_search_page">"http://secondlife.com/app/search/index.php?"</string>
+    </panel>
+		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+		     label="Classifieds" left="1" left_delta="68" mouse_opaque="false"
+		     name="classified_panel" width="778">
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+			     name="find" v_pad="0" width="50">
+				Find:
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+			     follows="left|right|top" font="SansSerif" height="18" left="56"
+			     max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
+			<check_box bottom="-22" control_name="ShowPGClassifieds" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="PG content" left="420" mouse_opaque="true"
+			     name="incpg" width="156" />
+			<check_box bottom="-40" control_name="ShowMatureClassifieds" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="Mature content" left="420" mouse_opaque="true"
+			     name="incmature" width="156" />
+			<check_box bottom="-58" control_name="ShowAdultClassifieds" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="false"
+			     label="Adult content" left="420" mouse_opaque="true"
+			     name="incadult" width="156" />
+			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
+			     max_chars="20" mouse_opaque="true" name="Category" width="158">
+				<combo_item name="AnyCategory" value="0">
+					Any Category
+				</combo_item>
+				<combo_item name="Shopping" value="1">
+					Shopping
+				</combo_item>
+				<combo_item name="LandRental" value="2">
+					Land Rental
+				</combo_item>
+				<combo_item name="PropertyRental" value="3">
+					Property Rental
+				</combo_item>
+				<combo_item name="SpecialAttraction" value="4">
+					Special Attraction
+				</combo_item>
+				<combo_item name="NewProducts" value="5">
+					New Products
+				</combo_item>
+				<combo_item name="Employment" value="6">
+					Employment
+				</combo_item>
+				<combo_item name="Wanted" value="7">
+					Wanted
+				</combo_item>
+				<combo_item name="Service" value="8">
+					Service
+				</combo_item>
+				<combo_item name="Personal" value="9">
+					Personal
+				</combo_item>
+			</combo_box>
+			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
+			     label="Browse" label_selected="Browse" left="121" mouse_opaque="true"
+			     name="Browse" width="95" />
+			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
+			     label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
+			     visible="false" width="95" />
+			<button bottom="-46" follows="right|top" font="SansSerif" halign="center" height="20"
+			     label="Place an Ad..." label_selected="Place an Ad..." left="630"
+			     mouse_opaque="true" name="Place an Ad..." width="145" />
+			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+			     height="20" label="Delete" label_selected="Delete" left="80"
+			     mouse_opaque="true" name="Delete" width="80" />
+			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" 
+				 draw_heading="true" follows="left|top|right|bottom" height="450" left="4" 
+				 mouse_opaque="true" multi_select="false" name="results" search_column="2" width="339">
+				<column label="" name="icon" width="24" />
+				<column label="" name="type" width="-1" />
+				<column label="Name" name="name" width="225" />
+				<column label="Price" name="price" width="55" />
+			</scroll_list>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="result_text" v_pad="0" width="80" />
+			<button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
+			     height="20" label="Next &gt;" label_selected="Next &gt;"
+			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
+			<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
+			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
+			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+		</panel>
+		<panel border="true" bottom="-549" default_tab_group="1"
+		     follows="left|top|right|bottom" height="533" label="Events" left="1"
+		     mouse_opaque="false" name="events_panel" width="778">
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+			     name="text2" v_pad="0" width="50">
+				Find:
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+			     follows="left|right|top" font="SansSerif" height="18" left="56"
+			     max_length="63" mouse_opaque="true" name="event_search_text" width="160" spell_check="true" />
+			<radio_group bottom="-40" draw_border="false" follows="right|top" height="40" left="560"
+			     mouse_opaque="true" name="date_mode" width="300">
+				<radio_item bottom="-20" follows="left|top" height="20" left="0" mouse_opaque="true"
+				     name="current" width="174">
+					In-Progress and Upcoming
+				</radio_item>
+				<radio_item bottom_delta="-10" follows="left|top" height="20" left="0" mouse_opaque="true"
+				     name="date" width="56">
+					Date
+				</radio_item>
+			</radio_group>
+			<button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
+			     label="&lt;&lt;" label_selected="&lt;&lt;" left_delta="54"
+			     mouse_opaque="true" name="&lt;&lt;" tool_tip="Go back a day" width="24" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-36" drop_shadow_visible="true" follows="right|top" font="SansSerif"
+			     h_pad="0" halign="center" height="14" left_delta="22" mouse_opaque="true"
+			     name="date_text" v_pad="0" width="48">
+				6/6
+			</text>
+			<button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
+			     label="&gt;&gt;" label_selected="&gt;&gt;" left_delta="50"
+			     mouse_opaque="true" name="&gt;&gt;" tool_tip="Go forward a day" width="24" />
+			<button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
+			     label="Today" label_selected="Today" left_delta="28" mouse_opaque="true"
+			     name="Today" tool_tip="Show today&apos;s events" width="60" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-24" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="289"
+			     mouse_opaque="true" name="text" v_pad="0" width="90" visible="false">
+				Category:
+			</text>
+			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
+			     max_chars="20" mouse_opaque="true" name="category combo" width="158">
+				<combo_item name="All" value="0">
+					Any Category
+				</combo_item>
+				<combo_item name="Discussion" value="18">
+					Discussion
+				</combo_item>
+				<combo_item name="Sports" value="19">
+					Sports
+				</combo_item>
+				<combo_item name="LiveMusic" value="20">
+					Live Music
+				</combo_item>
+				<combo_item name="Commercial" value="22">
+					Commercial
+				</combo_item>
+				<combo_item name="Nightlife/Entertainment" value="23">
+					Nightlife/Entertainment
+				</combo_item>
+				<combo_item name="Games/Contests" value="24">
+					Games/Contests
+				</combo_item>
+				<combo_item name="Pageants" value="25">
+					Pageants
+				</combo_item>
+				<combo_item name="Education" value="26">
+					Education
+				</combo_item>
+				<combo_item name="ArtsandCulture" value="27">
+					Arts and Culture
+				</combo_item>
+				<combo_item name="Charity/SupportGroups" value="28">
+					Charity/Support Groups
+				</combo_item>
+				<combo_item name="Miscellaneous" value="29">
+					Miscellaneous
+				</combo_item>
+			</combo_box>
+			<check_box bottom="-22" control_name="ShowPGEvents" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="PG content" left="420" mouse_opaque="true"
+			     name="incpg" width="156" />
+			<check_box bottom="-40" control_name="ShowMatureEvents" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="Mature content" left="420" mouse_opaque="true"
+			     name="incmature" width="156" />
+			<check_box bottom="-58" control_name="ShowAdultEvents" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="false"
+			     label="Adult content" left="420" mouse_opaque="true"
+			     name="incadult" width="156" />
+			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
+			     label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
+			     visible="true" width="95" />
+			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+			     height="20" label="Delete" label_selected="Delete" left="80"
+			     mouse_opaque="true" name="Delete" width="80" />
+			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true" 
+			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
+			     multi_select="false" name="results" search_column="2" width="339">
+				<column label="" name="icon" width="24" />
+				<column label="" name="type" width="-1" />
+				<column dynamicwidth="true" label="Name" name="name" />
+				<column label="Time (PT)" name="date" sort="time" width="106" />
+				<column label="" name="event_id" width="-1" />
+				<column label="Time" name="time" width="-1" />
+			</scroll_list>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="result_text" v_pad="0" width="80" />
+			<button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
+			     height="20" label="Next &gt;" label_selected="Next &gt;"
+			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
+			<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
+			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
+			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+		</panel>
+		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+		     label="Showcase" left="1" mouse_opaque="false" name="showcase_panel"
+		     width="778">
+        <string name="searching_text">Searching...</string>
+        <string name="not_found_text">None Found.</string>
+        <button bottom="-30" follows="top|left" font="SansSerifSmall" height="25"
+          label=""
+          image_overlay="go-previous-4.png"
+          left="10"
+          name="back_btn" width="25" />
+        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="25"
+          label=""
+          image_overlay="go-next-4.png"
+          left_delta="27"
+          name="forward_btn" width="25" />
+        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="25"
+         label=""
+         image_overlay="view-refresh-5.png"
+         left_delta="27"
+         name="reload_btn" width="25" />
+        <!-- No mature content checkbox, showcase is all PG -->
+        <web_browser name="showcase_browser"
+          bottom="25"
+          follows="top|left|bottom|right"
+          font="SansSerifSmall"
+          left="10"
+          right="-10"
+          top="-40" />
+        <text bottom="5"
+          follows="bottom|left"
+          halign="left"
+          left="10"
+          width="150"
+          name="status_text"
+          height="16" />
+        <string name="loading_text">Loading...</string>
+        <string name="done_text">Done</string>
+        <string name="redirect_404_url">http://secondlife.com/app/search/notfound.html</string>
+        <string name="default_search_page">"http://secondlife.com/app/showcase/index.php?"</string>
+    </panel>
+		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+		     label="Land Sales" left="1" mouse_opaque="false" name="land_sales_panel"
+		     width="778" default_tab_group="1">
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<string name="land_help_text">
+				Land can be bought direct for in-world money ([CURRENCY]) or at auction for either [CURRENCY] or [REALCURRENCY].
+To buy direct, visit the land and click on the place name in the title bar.
+			</string>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+			     name="find" v_pad="0" width="50">
+				Find:
+			</text>
+			<check_box bottom="-22" control_name="ShowPGLand" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="PG content" left="420" mouse_opaque="true"
+			     name="incpg" tab_group="7" width="156" />
+			<check_box bottom="-40" control_name="ShowMatureLand" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="Mature content" left="420" mouse_opaque="true"
+			     name="incmature" tab_group="8" width="156" />
+			<check_box bottom="-58" control_name="ShowAdultLand" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="false"
+			     label="Adult content" left="420" mouse_opaque="true"
+			     name="incadult" tab_group="9" width="156" />
+			<combo_box allow_text_entry="false" bottom="-46" follows="left|top|right" height="18" left="282"
+			     max_chars="20" mouse_opaque="true" name="type" tab_group="6" width="128">
+				<combo_item name="AllTypes" value="All Types">
+					All Types
+				</combo_item>
+				<combo_item name="Auction" value="Auction">
+					Auction
+				</combo_item>
+				<combo_item name="MainlandSales" value="Mainland Sales">
+					For Sale - Mainland
+				</combo_item>
+				<combo_item name="EstateSales" value="Estate Sales">
+					For Sale - Estate
+				</combo_item>
+			</combo_box>
+			<check_box bottom="-24" control_name="FindLandPrice" follows="left|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="Price &#8804; " left="56" mouse_opaque="true" name="pricecheck"
+			     tab_group="1" width="88" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
+			     bottom="-24" font="SansSerifSmall" halign="left" height="16" left="116" mouse_opaque="true"
+			     name="pricecheck_symbol" width="15">
+				[CURRENCY]
+			</text>
+			<check_box bottom_delta="-18" control_name="FindLandArea" follows="left|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="Area &#8805; " left="56" mouse_opaque="true" name="areacheck"
+			     tab_group="3" width="80" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
+			     bottom="-42" font="SansSerifSmall" halign="left" height="16" left="170" mouse_opaque="true"
+			     name="areacheck_symbol" width="15">
+				m²
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-22"
+			     follows="left|top" font="SansSerifSmall" height="16" left="132"
+			     max_length="10" mouse_opaque="true" name="priceedit" tab_group="2" width="50" spell_check="true" />
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-18"
+			     follows="left|top" font="SansSerifSmall" height="16" left="117"
+			     max_length="10" mouse_opaque="true" name="areaedit" tab_group="4" width="50" spell_check="true" />
+			<button bottom="-48" follows="left|top" font="SansSerif" halign="center" height="20"
+			     label="Search" label_selected="Search" left="208" mouse_opaque="true"
+			     name="Search" tab_group="5" width="70" />
+			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true" 
+			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
+			     multi_select="false" name="results" search_column="2" tab_group="10" width="387">
+				<column label="" name="icon" width="24" />
+				<column label="" name="type" width="-1" />
+				<column dynamicwidth="true" label="Name" name="name" />
+				<column label="Type" name="landtype" width="50" />
+				<column label="[CURRENCY] Price" name="price" width="65" />
+				<column label="Area" name="area" width="50" />
+				<column label="[CURRENCY]/m²" name="per_meter" width="65" />
+			</scroll_list>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+			<button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
+			     height="20" label="Next &gt;" label_selected="Next &gt;"
+			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
+			<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
+			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
+			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+		</panel>
+		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+		     label="Places" left="1" mouse_opaque="false" name="places_panel"
+		     width="778">
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+			     name="find" v_pad="0" width="50">
+				Find:
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+			     follows="left|right|top" font="SansSerif" height="18" left="56"
+			     max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
+			<check_box bottom="-22" control_name="ShowPGSims" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="PG content" left="420" mouse_opaque="true"
+			     name="incpg" width="156" />
+			<check_box bottom="-40" control_name="ShowMatureSims" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="Mature content" left="420" mouse_opaque="true"
+			     name="incmature" width="156" />
+			<check_box bottom="-58" control_name="ShowAdultSims" follows="right|top"
+			     font="SansSerifSmall" height="16" initial_value="false"
+			     label="Adult content" left="420" mouse_opaque="true"
+			     name="incadult" width="156" />
+			<combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
+			     max_chars="20" mouse_opaque="true" name="Category" width="128" visible="false">
+				<combo_item name="AnyCategory" value="any">
+					Any Category
+				</combo_item>
+				<combo_item name="LindenLocation" value="linden">
+					Official Location
+				</combo_item>
+				<combo_item name="Arts&amp;Culture" value="arts">
+					Arts and Culture
+				</combo_item>
+				<combo_item name="Business" value="store">
+					Business
+				</combo_item>
+				<combo_item name="Educational" value="educational">
+					Educational
+				</combo_item>
+				<combo_item name="Gaming" value="game">
+					Gaming
+				</combo_item>
+				<combo_item name="Hangout" value="gather">
+					Hangout
+				</combo_item>
+				<combo_item name="NewcomerFriendly" value="newcomer">
+					Newcomer Friendly
+				</combo_item>
+				<combo_item name="Parks&amp;Nature" value="park">
+					Parks and Nature
+				</combo_item>
+				<combo_item name="Residential" value="home">
+					Residential
+				</combo_item>
+				<combo_item name="Shopping" value="shopping">
+					Shopping
+				</combo_item>
+				<combo_item name="Other" value="other">
+					Other
+				</combo_item>
+        <combo_item name="Rental" value="rental">
+          Rental
+        </combo_item>
+			</combo_box>
+			<!-- This is used only during the AO transition and can be deleted once the AO transition is
+			complete. It is identical to the combo box above except that it has the Adult category. 
+			You might also want to set it back to default visible and enabled. -->
+			<combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
+			     max_chars="20" mouse_opaque="true" name="Category_Adult" width="128" visible="false">
+				<combo_item name="AnyCategory" value="any">
+					Any Category
+				</combo_item>
+				<combo_item name="LindenLocation" value="linden">
+					Linden Location
+				</combo_item>
+				<combo_item name="Adult" value="adult">
+					Adult
+				</combo_item>
+				<combo_item name="Arts&amp;Culture" value="arts">
+					Arts and Culture
+				</combo_item>
+				<combo_item name="Business" value="store">
+					Business
+				</combo_item>
+				<combo_item name="Educational" value="educational">
+					Educational
+				</combo_item>
+				<combo_item name="Gaming" value="game">
+					Gaming
+				</combo_item>
+				<combo_item name="Hangout" value="gather">
+					Hangout
+				</combo_item>
+				<combo_item name="NewcomerFriendly" value="newcomer">
+					Newcomer Friendly
+				</combo_item>
+				<combo_item name="Parks&amp;Nature" value="park">
+					Parks and Nature
+				</combo_item>
+				<combo_item name="Residential" value="home">
+					Residential
+				</combo_item>
+				<combo_item name="Shopping" value="shopping">
+					Shopping
+				</combo_item>
+				<combo_item name="Other" value="other">
+					Other
+				</combo_item>
+        <combo_item name="Rental" value="rental">
+          Rental
+        </combo_item>
+			</combo_box>
+			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
+			     label="Search" label_selected="Search" left="121" mouse_opaque="true"
+			     name="Search" width="95" />
+			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
+			     draw_heading="true" 
+			     
+			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
+			     multi_select="false" name="results" search_column="2" width="339">
+				<column label="" name="icon" width="24" />
+				<column label="" name="type" width="-1" />
+				<column dynamicwidth="true" label="Name" name="name" />
+				<column label="Traffic" name="dwell" width="75" />
+			</scroll_list>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+			     height="20" label="Next &gt;" label_selected="Next &gt;"
+			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
+			<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
+			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
+			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+		</panel>
+    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+		     label="People" left="1" mouse_opaque="false" name="people_panel"
+		     width="778">
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+			     name="find" v_pad="0" width="50">
+        Find:
+      </text>
+	  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+			     follows="left|right|top" font="SansSerif" height="18" left="56"
+			     max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
+		<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
+			     label="Search" label_selected="Search" left="121" mouse_opaque="true"
+			     name="Search" width="95" />
+      <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
+			     draw_heading="true" 
+                               
+			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
+			     multi_select="false" name="results" search_column="2" width="326">
+        <column label="" name="icon" width="24" />
+        <column label="" name="type" width="-1" />
+        <column label="Name" name="name" width="274" />
+      </scroll_list>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+			     height="20" label="Next &gt;" label_selected="Next &gt;"
+			     mouse_opaque="true" name="Next &gt;" right="330" width="80" />
+      		<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
+			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
+			     mouse_opaque="true" name="&lt; Prev" right="244" width="80" />
+		</panel>
+    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
+		     label="Groups" left="1" mouse_opaque="false" name="groups_panel"
+		     width="778">
+			<string name="searching_text">
+				Searching...
+			</string>
+			<string name="not_found_text">
+				None Found.
+			</string>
+			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
+			     height="20" label="Next &gt;" label_selected="Next &gt;"
+			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
+			<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
+			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
+			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
+			     name="find" v_pad="0" width="50">
+				Find:
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
+			     follows="left|top" font="SansSerif" height="18" left_delta="38"
+			     max_length="63" mouse_opaque="true" name="name" width="200" spell_check="true" />
+			<button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
+			     label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"
+			     name="Search" width="70" />
+			<check_box bottom="-46" control_name="ShowPGGroups" follows="left|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="PG content" left="4" mouse_opaque="true"
+			     name="incpg" width="204" />
+			<check_box bottom="-46" control_name="ShowMatureGroups" follows="left|top"
+			     font="SansSerifSmall" height="16" initial_value="true"
+			     label="Mature content" left_delta="90" mouse_opaque="true"
+			     name="incmature" width="204" />
+			<check_box bottom="-46" control_name="ShowAdultGroups" follows="left|top"
+		     font="SansSerifSmall" height="16" initial_value="false"
+			     label="Adult content" left_delta="110" mouse_opaque="true"
+			     name="incadult" width="204" />
+			<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
+			     draw_heading="true"
+			     follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
+			     multi_select="false" name="results" search_column="2" width="339">
+				<column label="" name="icon" sort="score" sort_ascending="false" width="24" />
+				<column label="" name="type" width="-1" />
+				<column dynamicwidth="true" label="Name" name="name" />
+				<column halign="left" label="Members" name="members" sort_ascending="false" width="100" />
+				<column label="" name="score" width="-1" />
+			</scroll_list>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
+    </panel>
+	</tab_container>
+	<panel bottom="-560" follows="right|top" height="470" left="340"
+	     name="classified_details_panel" width="440" />
+	<panel bottom="-560" follows="right|top" height="486" left="350" name="Panel Avatar"
+	     width="430" />
+	<panel bottom="-560" follows="right|top" height="470" left="340"
+	     name="event_details_panel" width="440" />
+	<panel bottom="-580" follows="right|top" height="515" left="350"
+	     name="group_details_panel_holder" width="430">
+		<panel bottom="0" follows="right|top" height="470" left="0" name="group_details_panel"
+		     width="430" />
+	</panel>
+	<panel bottom="-560" follows="right|top" height="470" left="340"
+	     name="place_details_panel" width="440" />
+	<panel bottom="-560" follows="right|top" height="470" left="385"
+	     name="place_details_small_panel" width="395" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_display_name.xml b/indra/newview/skins/default/xui/es/floater_display_name.xml
new file mode 100644
index 000000000..299c78256
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_display_name.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Display Name" title="CAMBIAR TU NOMBRE A MOSTRAR">
+	  <text name="lockout_text">
+			 No puedes cambiar el nombre mostrado hasta: [TIME].
+	  </text>
+	  <text name="set_name_label">
+			 Nuevo Nombre a Mostrar:
+	  </text>
+	  <line_editor name="display_name_editor"/>
+	  <text name="name_confirm_label">
+			 Vuelve a escribir tu nombre nuevo para confirmarlo:
+	  </text>
+	  <line_editor name="display_name_confirm"/>
+	  <button label="Guardar" name="save_btn" tool_tip="Guardar tu nuevo Nombre a Mostrar" />
+	  <button label="Restablecer" name="reset_btn" tool_tip="Hacer que tu Nombre a Mostrar sea el mismo que tu nombre de usuario" />
+	  <button label="Cancelar" name="cancel_btn" tool_tip="Cancelar y cerrar esta ventana" />
+	  <text name="name_confirm_label2"  bottom_delta="-23">
+			 El nombre que le has dado a tu avatar se denomina 
+Nombre a Mostrar.
+	  </text>
+	  <text name="name_confirm_label3"  bottom_delta="-30">
+			 Puedes cambiarlo una vez a la semana.
+	  </text>
+</floater>
+    
diff --git a/indra/newview/skins/default/xui/es/floater_env_settings.xml b/indra/newview/skins/default/xui/es/floater_env_settings.xml
new file mode 100644
index 000000000..133997fb7
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_env_settings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Environment Editor Floater" title="Editor de Entorno">
+	  <text name="EnvTimeText">
+			 Duración del Día:
+	  </text>
+	  <text name="EnvTimeText2">
+			 12:00 PM
+	  </text>
+	  <icon name="EnvDayCycle"/>
+	  <slider label="" name="EnvTimeSlider"/>
+	  <text name="EnvCloudText">
+			 Nubosidad
+	  </text>
+	  <slider label="" name="EnvCloudSlider"/>
+	  <text name="EnvWaterColorText">
+			 Color del
+Agua
+	  </text>
+	  <color_swatch label="" name="EnvWaterColor" tool_tip="Pulsa para abrir el Selector de Color" />
+	  <text name="EnvWaterFogText">
+			 Claridad del 
+Agua
+	  </text>
+	  <slider label="" name="EnvWaterFogSlider"/>
+	  <button label="Usar Horario del Estado" name="EnvUseEstateTimeButton"/>
+	  <button label="Cielo Avanzado" name="EnvAdvancedSkyButton"/>
+	  <button label="Agua Avanzada" name="EnvAdvancedWaterButton"/>
+	  <button label="?" name="EnvSettingsHelpButton"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_explore_animations.xml b/indra/newview/skins/default/xui/es/floater_explore_animations.xml
new file mode 100644
index 000000000..423f89de8
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_explore_animations.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_explore_animations" title="Animaciones">
+	  <scroll_list name="anim_list">
+			 <column label="Nombre" name="name" />
+			 <column label="" name="info" />
+	  </scroll_list>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_explore_sounds.xml b/indra/newview/skins/default/xui/es/floater_explore_sounds.xml
new file mode 100644
index 000000000..7b7d26742
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_explore_sounds.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_explore_sounds" title="Sonidos">
+	  <text name="result_label">
+			 Fuentes:
+	  </text>
+	  <check_box name="avatars_chk"  label="Avatares"/>
+	  <check_box name="objects_chk"  label="Objetos"/>
+	  <check_box name="collision_chk"  label="Sonido de Colisión por Defecto" />
+	  <text name="result_label">
+			 Controles:
+	  </text>	
+	  <check_box name="repeated_asset_chk"  label="Mostrar Repeticiones"/>
+	  <check_box name="pause_chk"  label="Pausar Registro"  left_delta="130" />
+	  <scroll_list name="sound_list">
+			 <column tool_tip="Tipo" name="type" />
+			 <column label="Tiempo" name="playing" width="60" />
+			 <column label="Propietario" name="owner" />
+			 <column label="Sonido" name="sound" />
+	  </scroll_list>
+	  <button label="Mirar Hacia" name="look_at_btn" />
+	  <button label="Reproducir Localmente" name="play_locally_btn" width="150"/>
+	  <button label="Reproducir en el Mundo" name="play_ambient_btn" left_delta="155" width="155"/>
+	  <button label="Detener" name="stop_btn"/>
+	  <button label="Agregar a Lista Negra" name="bl_btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_fast_timers.xml b/indra/newview/skins/default/xui/es/floater_fast_timers.xml
new file mode 100644
index 000000000..4c0c9581e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_fast_timers.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="fast_timers">
+	  <string name="pause" >
+			 Pausa
+	  </string>
+	  <string name="run">
+			 Ejecutar
+	  </string>
+	  <button name="pause_btn"label="Pausa"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_font_test.xml b/indra/newview/skins/default/xui/es/floater_font_test.xml
new file mode 100644
index 000000000..f8c01dc4e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_font_test.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="contents" title="Prueba de Fuentes">
+	  <text font="SansSerifSmall">
+			 SansSerifSmall
+	  </text>
+	  <text font="SansSerifMedium">
+			 SansSerifMedium
+	  </text>
+	  <text font="SansSerif">
+			 SansSerif, sin tamaño ni estilo (Debería ser igual a Medium)
+	  </text>
+	  <text font="SansSerifLarge">
+			 SansSerifLarge
+	  </text>
+	  <text font="SansSerifHuge">
+			 SansSerifHuge
+	  </text>
+	  <text font="Monospace">
+			 Monospace
+	  </text>
+	  <text font="Monospace" font_size="Large">
+			 Monospace tamaño=Grande
+	  </text>
+	  <text font="SansSerifLarge" font_style="BOLD">
+			 SansSerifLarge estilo=NEGRITA
+	  </text>
+	  <text font="SansSerifBold">
+			 SansSerifBold
+	  </text>
+	  <text font="SansSerif" font_style="BOLD">
+			 SansSerif estilo=NEGRITA (debería ser igual a SansSerifBold)
+	  </text>
+	  <text font="SansSerif" font-style="ITALIC">
+			 SansSerif estilo=IT�LICA
+	  </text>
+	  <text font="SansSerif" font-style="BOLD|ITALIC">
+			 SansSerif estilo=NEGRITA|IT�LICA
+	  </text>
+	  <text font="SansSerif" font-style="BOLD|ITALIC" font-shadow="soft">
+			 SansSerif estilo=NEGRITA|IT�LICA sombreado = DROP_SHADOW_SOFT
+	  </text>
+	  <text font="SansSerif" font-style="UNDERLINE">
+			 SansSerif estilo=SUBRAYADO
+	  </text>
+	  <text font="SansSerif" font-shadow="hard">
+			 SansSerif sombreado =DROP_SHADOW
+	  </text>
+	  <text font="SansSerif" font-shadow="soft">
+			 SansSerif sombreado=DROP_SHADOW_SOFT
+	  </text>
+	  <text font="DejaVu">
+			 DejaVu
+	  </text>
+	  <text font="DejaVu" font-style="BOLD">
+			 DejaVu estilo=NEGRITA
+	  </text>
+	  <text font="DejaVu" font-style="ITALIC">
+			 DejaVu estilo=ITALIC
+	  </text>
+	  <text font="DejaVu" font-style="BOLD|ITALIC">
+			 DejaVu estilo=NEGRITA|IT�LICA
+	  </text>
+	  <text font="DejaVu" font_size="Large" font-style="BOLD|ITALIC">
+			 DejaVu tamaño=grande estilo=NEGRITA|IT�LICA
+	  </text>
+	  <text font="Helvetica">
+			 Helvetica
+	  </text>
+	  <text font="Helvetica" font-style="BOLD">
+			 Helvetica estilo=NEGRITA
+	  </text>
+	  <text font="Helvetica" font-style="ITALIC">
+			 Helvetica estilo=ITALIC
+	  </text>
+	  <text font="Helvetica" font-style="BOLD|ITALIC">
+			 Helvetica estilo=NEGRITA|IT�LICA
+	  </text>
+	  <text font="Helvetica" font_size="Large" font-style="BOLD|ITALIC">
+			 Helvetica tamaño=grande estilo=NEGRITA|IT�LICA
+	  </text>
+	  <text name="linea">
+			 OverrideTest, debería de aparecer aquí en Times. (Desde default/xui/en-us)
+	  </text>
+	  <text font="BogusFontName">
+			 BogusFontName
+	  </text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_gesture.xml b/indra/newview/skins/default/xui/es/floater_gesture.xml
new file mode 100644
index 000000000..06560f600
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_gesture.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="gestures" title="Gestos Activos">
+	  <text name="help_label">
+			 Pulsa dos veces en un gesto para reproducir las animaciones
+	  </text>
+	  <scroll_list name="gesture_list">
+			 <column label="Disparador" name="trigger" width="75"/>
+			 <column label="Tecla" name="shortcut"/>
+			 <column label="" name="key"/>
+			 <column label="Nombre" name="name"/>
+	  </scroll_list>
+	  <button label="Nueva" name="new_gesture_btn"/>
+	  <!--
+	  <button bottom_delta="0" follows="bottom|right" height="20" label="Inventory"
+			 left_delta="89" name="inventory_btn" width="83" />
+	  -->
+	  <button label="Editar" name="edit_btn"/>
+	  <button label="Reproducir" name="play_btn"/>
+	  <button label="Detener" name="stop_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_god_tools.xml b/indra/newview/skins/default/xui/es/floater_god_tools.xml
new file mode 100644
index 000000000..c4dd40f74
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_god_tools.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-534" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="384" left="433" min_height="384" min_width="400"
+     mouse_opaque="true" name="godtools floater" title="God Tools" width="400">
+	<tab_container bottom="-384" follows="left|top" height="364" left="0" mouse_opaque="false"
+	     name="GodTools Tabs" tab_position="top" width="400">
+		<panel border="true" bottom="-363" follows="left|top|right|bottom" height="347"
+		     label="Grid" left="1" mouse_opaque="false" name="grid" width="398">
+			<button bottom="-28" follows="left|top" font="SansSerif" halign="center" height="20"
+			     label="Kick all users" label_selected="Kick all users" left="10"
+			     mouse_opaque="true" name="Kick all users" width="100" />
+			<button bottom_delta="-28" follows="left|top" font="SansSerif" halign="center"
+			     height="20" label="Flush This Region&apos;s Map Visibility Caches"
+			     label_selected="Flush This Region&apos;s Map Visibility Caches" left="10"
+			     mouse_opaque="true" name="Flush This Region&apos;s Map Visibility Caches"
+			     width="250" />
+		</panel>
+		<panel border="true" bottom="-363" follows="left|top|right|bottom" height="347"
+		     label="Region" left="1" mouse_opaque="false" name="region" width="398">
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="Sim Name:" v_pad="0" width="50">
+				Sim Name:
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-26"
+			     follows="left|top|right" font="SansSerifSmall" height="16" left="70"
+			     max_length="63" mouse_opaque="true" name="region name" width="208" />
+			<check_box bottom="-46" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Prelude" left="10" mouse_opaque="true"
+			     name="check prelude" tool_tip="Set this to make the region a prelude."
+			     width="180" />
+			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Fixed Sun" left="10" mouse_opaque="true"
+			     name="check fixed sun"
+			     tool_tip="Fix the sun position (like in Region/Estate &gt; Terrain."
+			     width="180" />
+			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Reset Home On Teleport" left="10"
+			     mouse_opaque="true" name="check reset home"
+			     tool_tip="When resident teleports out, reset their home to the destination position."
+			     width="180" />
+			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Visible" left="10" mouse_opaque="true"
+			     name="check visible"
+			     tool_tip="Set this to make the region visible to non-gods." width="180" />
+			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Damage" left="10" mouse_opaque="true"
+			     name="check damage" tool_tip="Set this to enable damage in this region."
+			     width="180" />
+			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Block Traffic Tracking" left="10"
+			     mouse_opaque="true" name="block dwell"
+			     tool_tip="Set this to make the region not compute traffic." width="180" />
+			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Block Terraform" left="10" mouse_opaque="true"
+			     name="block terraform"
+			     tool_tip="Set this to disallow people terraforming their land" width="180" />
+			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Sandbox" left="10" mouse_opaque="true"
+			     name="is sandbox" tool_tip="Toggle whether this is a sandbox region."
+			     width="180" />
+			<button bottom_delta="-52" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="20" label="Bake Terrain" label_selected="Bake Terrain" left="8"
+			     mouse_opaque="true" name="Bake Terrain"
+			     tool_tip="Save the current terrain as default." width="110" />
+			<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="20" label="Revert Terrain" label_selected="Revert Terrain" left="8"
+			     mouse_opaque="true" name="Revert Terrain"
+			     tool_tip="Replace the current terrain with default." width="110" />
+			<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="20" label="Swap Terrain" label_selected="Swap Terrain" left="8"
+			     mouse_opaque="true" name="Swap Terrain"
+			     tool_tip="Swap current terrain with default." width="110" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-46" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+			     h_pad="0" halign="left" height="16" left="200" mouse_opaque="true"
+			     name="estate id" v_pad="0" width="190">
+				Estate ID:
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-46"
+			     follows="top|right" font="SansSerifSmall" height="16" left_delta="108"
+			     max_length="10" mouse_opaque="true" name="estate" width="50" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-66" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+			     h_pad="0" halign="left" height="16" left="200" mouse_opaque="true"
+			     name="parent id" v_pad="0" width="190">
+				Parent ID:
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-66"
+			     follows="top|right" font="SansSerifSmall" height="16" left_delta="108"
+			     max_length="10" mouse_opaque="true" name="parentestate"
+			     tool_tip="This is the parent estate for this region" width="50" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-86" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="200"
+			     mouse_opaque="true" name="Grid Pos: " v_pad="0" width="190">
+				Grid Pos:
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-86"
+			     follows="top|right" font="SansSerifSmall" height="16" left_delta="88"
+			     max_length="10" mouse_opaque="true" name="gridposx"
+			     tool_tip="This is the grid x position for this region" width="50" />
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-86"
+			     follows="top|right" font="SansSerifSmall" height="16" left_delta="60"
+			     max_length="10" mouse_opaque="true" name="gridposy"
+			     tool_tip="This is the grid y position for this region" width="40" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-106" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="200"
+			     mouse_opaque="true" name="Redirect to Grid: " v_pad="0" width="190">
+				Redirect to Grid:
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-106"
+			     follows="top|right" font="SansSerifSmall" height="16" left_delta="88"
+			     max_length="10" mouse_opaque="true" name="redirectx" width="50" />
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-106"
+			     follows="top|right" font="SansSerifSmall" height="16" left_delta="60"
+			     max_length="10" mouse_opaque="true" name="redirecty" width="40" />
+			<spinner bottom="-126" decimal_digits="3" follows="top|right" height="16"
+			     increment="0.1" initial_val="1" left="308" max_val="4" min_val="0"
+			     mouse_opaque="true" name="billable factor" width="80" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-126" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerif" h_pad="0" halign="left" height="16" left_delta="-108"
+			     mouse_opaque="true" name="billable factor text" v_pad="0" width="110">
+				Billable Factor:
+			</text>
+			<spinner bottom="-146" decimal_digits="3" follows="top|right" height="16" increment="1"
+			     initial_val="1" left="308" max_val="100" min_val="0" mouse_opaque="true"
+			     name="land cost" width="80" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-146" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerif" h_pad="0" halign="left" height="16" left_delta="-108"
+			     mouse_opaque="true" name="land cost text" v_pad="0" width="110">
+				[CURRENCY] per sq. meter:
+			</text>
+			<button bottom="-170" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="20" label="Refresh" label_selected="Refresh" left="278"
+			     mouse_opaque="true" name="Refresh"
+			     tool_tip="Click here to refresh the above information." width="110" />
+			<button bottom_delta="-56" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="20" label="Apply" label_selected="Apply" left="278"
+			     mouse_opaque="true" name="Apply"
+			     tool_tip="Click here to apply any changes from above." width="110" />
+			<button bottom="-258" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="20" label="Select Region" label_selected="Select Region" left="128"
+			     mouse_opaque="true" name="Select Region"
+			     tool_tip="Select the whole region with the land tool." width="110" />
+			<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="20" label="Autosave now" label_selected="Autosave now" left="128"
+			     mouse_opaque="true" name="Autosave now"
+			     tool_tip="Save gzipped state to autosave directory." width="110" />
+		</panel>
+		<panel border="true" bottom="-363" follows="left|top|right|bottom" height="347"
+		     label="Objects" left="1" mouse_opaque="false" name="objects" width="398">
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="Sim Name:" v_pad="0" width="50">
+				Sim Name:
+			</text>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="60"
+			     mouse_opaque="true" name="region name" v_pad="0" width="320">
+				Welsh
+			</text>
+			<check_box bottom="-46" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Disable Scripts" left="10" mouse_opaque="true"
+			     name="disable scripts"
+			     tool_tip="Set this to disable all scripts in this region" width="110" />
+			<check_box bottom="-46" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Disable Collisions" left_delta="120"
+			     mouse_opaque="true" name="disable collisions"
+			     tool_tip="Set this to disable non-agent collisions in this region"
+			     width="121" />
+			<check_box bottom="-46" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Disable Physics" left_delta="120"
+			     mouse_opaque="true" name="disable physics"
+			     tool_tip="Set this to disable all physics in this region" width="130" />
+			<button bottom="-74" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="20" label="Apply" label_selected="Apply" left="278"
+			     mouse_opaque="true" name="Apply"
+			     tool_tip="Click here to apply any changes from above." width="110" />
+			<button bottom="-98" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="20" label="Set Target" label_selected="Set Target" left="8"
+			     mouse_opaque="true" name="Set Target"
+			     tool_tip="Set the target avatar for object deletion." width="110" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-88" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="130"
+			     mouse_opaque="true" name="target_avatar_name" v_pad="0" width="260">
+				(no target)
+			</text>
+			<button bottom="-146" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="20" label="Delete Target&apos;s Scripted Objects On Others Land"
+			     label_selected="Delete Target&apos;s Scripted Objects On Others Land"
+			     left="8" mouse_opaque="true"
+			     name="Delete Target&apos;s Scripted Objects On Others Land"
+			     tool_tip="Delete all scripted objects owned by the target on land not owned by the target. (no copy) objects will be returned."
+			     width="380" />
+			<button bottom_delta="-48" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="20" label="Delete Target&apos;s Scripted Objects On *Any* Land"
+			     label_selected="Delete Target&apos;s Scripted Objects On *Any* Land"
+			     left="8" mouse_opaque="true"
+			     name="Delete Target&apos;s Scripted Objects On *Any* Land"
+			     tool_tip="Delete all scripted objects owned by the target in this region. (no copy) objects will be returned."
+			     width="380" />
+			<button bottom_delta="-48" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="20" label="Delete *ALL* Of Target&apos;s Objects"
+			     label_selected="Delete *ALL* Of Target&apos;s Objects" left="8"
+			     mouse_opaque="true" name="Delete *ALL* Of Target&apos;s Objects"
+			     tool_tip="Delete all objects owned by the target in this region. (no copy) objects will be returned."
+			     width="380" />
+			<button bottom_delta="-48" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="20" label="Get Top Colliders" label_selected="Get Top Colliders"
+			     left="8" mouse_opaque="true" name="Get Top Colliders"
+			     tool_tip="Gets list of objects experiencing the most narrowphase callbacks."
+			     width="110" />
+			<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="20" label="Get Top Scripts" label_selected="Get Top Scripts"
+			     left="8" mouse_opaque="true" name="Get Top Scripts"
+			     tool_tip="Gets list of objects spending the most time running scripts."
+			     width="110" />
+			<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="20" label="Scripts digest" label_selected="Scripts digest" left="8"
+			     mouse_opaque="true" name="Scripts digest"
+			     tool_tip="Gets a list of all scripts and number of occurences of each."
+			     width="110" />
+		</panel>
+		<panel border="true" bottom="-363" follows="left|top|right|bottom" height="347"
+		     label="Request" left="1" mouse_opaque="true" name="request" width="398">
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-14" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="Destination:" v_pad="0" width="80">
+				Destination:
+			</text>
+			<combo_box allow_text_entry="false" bottom="-20" follows="left|top" height="16" left="100"
+			     max_chars="20" mouse_opaque="true" name="destination" width="290">
+				<combo_item name="Selection" value="Selection">
+					Selection
+				</combo_item>
+				<combo_item name="AgentRegion" value="Agent Region">
+					Agent Region
+				</combo_item>
+			</combo_box>
+			<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="10" left="10"
+			     mouse_opaque="true" name="Request:" v_pad="0" width="80">
+				Request:
+			</text>
+			<combo_box allow_text_entry="true" bottom="-44" follows="left|top" height="16" left="100"
+			     max_chars="20" mouse_opaque="true" name="request" width="290">
+				<combo_item name="colliders&lt;steps&gt;" value="colliders &lt;steps&gt;">
+					colliders &lt;steps&gt;
+				</combo_item>
+				<combo_item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;"
+				     value="scripts &lt;count&gt;,&lt;optional pattern&gt;">
+					scripts &lt;count&gt;,&lt;optional pattern&gt;
+				</combo_item>
+				<combo_item name="objects&lt;pattern&gt;" value="objects &lt;pattern&gt;">
+					objects &lt;pattern&gt;
+				</combo_item>
+				<combo_item name="rez&lt;asset_id&gt;" value="rez &lt;asset_id&gt;">
+					rez &lt;asset_id&gt;
+				</combo_item>
+			</combo_box>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-62" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="Parameter:" v_pad="0" width="80">
+				Parameter:
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-68"
+			     follows="left|top" font="SansSerifSmall" height="16" left="100"
+			     max_length="63" mouse_opaque="true" name="parameter" width="290" />
+			<button bottom="-116" follows="left|top" font="SansSerif" halign="center" height="20"
+			     label="Make Request" label_selected="Make Request" left="10"
+			     mouse_opaque="true" name="Make Request" width="100" />
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_group_titles.xml b/indra/newview/skins/default/xui/es/floater_group_titles.xml
new file mode 100644
index 000000000..5e381ccff
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_group_titles.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="goup titles" title="Títulos del Grupo (Tags)" >
+	  <scroll_list name="titles_list">
+			 <column name="title" label="Título" />
+			 <column name="group_name" label="Grupo"/>
+			 <!--Hidden field, used as storage for UUID, please keep at width 0-->
+			 <column name="group_id" label="" width="0" />
+	  </scroll_list>
+	  <button name="activate" label="Activar" tool_tip="Activa el título de Grupo Seleccionado"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
new file mode 100644
index 000000000..ff23c256d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Hardware Settings Floater" title="Opciones del Dispositivo">
+	  <text name="Filtering:">
+			 Filtrado:
+	  </text>
+	  <check_box label="Filtrado Anisotrópico (más lento si se activa)" name="ani"/>
+	  <text name="Antialiasing:">
+			 Antialiasing:
+	  </text>
+	  <combo_box label="Antialiasing" name="fsaa">
+			 <combo_item name="FSAADisabled" value="0">
+					Desactivado
+			 </combo_item>
+			 <combo_item name="2x" value="2">
+					2x
+			 </combo_item>
+			 <combo_item name="4x" value="4">
+					4x
+			 </combo_item>
+			 <combo_item name="8x" value="8">
+					8x
+			 </combo_item>
+			 <combo_item name="16x" value="16">
+					16x
+			 </combo_item>
+	  </combo_box>
+	  <spinner label="Gama:" name="gamma"/>
+	  <text name="(brightness, lower is brighter)">
+			 (brillo; menor es más brillante, 0=predeterminado)
+	  </text>
+	  <text name="Enable VBO:">
+			 Activar VBO:
+	  </text>
+	  <check_box label="Activar OpenGL Vertex Buffer Objects" name="vbo" tool_tip="En hardware moderno, habilitar esta opción mejora el rendimiento. Pero en hardware antiguo, el habilitarlo hace que, frecuentemente, se obtenga una implementación pobre de VBO, lo que puede provocarle caídas."/>
+	  <check_box label="Activar Streamed VBOs" left="157" name="vbo_stream" tool_tip="Desactivar esta opción puede mejorar el rendimiento cuando se habilita VBO. Desactivarlo produce una mejora visible en diversas GPUs de AMD."/>
+	  <text name="Enable FBO:">
+			 Activar Framebuffer Objects:
+	  </text>
+	  <check_box label="Activar OpenGL Frame Buffer Objects" name="fbo" tool_tip="Habilitar esta opción en hardware moderno puede proporcionar una mejora en el rendimiento. Sin embargo, si se habilita en combinacoón con el antialiasing en GPUs de AMD pueden causar problemas de mezcla de texturas. Este ajuste es necesario para renderizado diferido.."/>
+	  <slider label="Memoria para Texturas (MB):" name="GrapicsCardTextureMemory" tool_tip="Cantidad de memoria asignada a las texturas. Por defecto es la memoria de la tarjeta de vídeo. Reducir esta cantidad puede mejorar el rendimiento, pero también puede hacer que las texturas se vean borrosas."/>
+	  <spinner label="Intensidad de la Niebla:" name="fog"/>
+	  <text name="note">
+			 Nota: Las configuraciones de Gama e Intensidad de la Niebla no están
+disponibles cuando se activan las Sombras de la Atmósfera.
+	  </text>
+	  <button label="OK" label_selected="OK"name="OK"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_hex.xml b/indra/newview/skins/default/xui/es/floater_hex.xml
new file mode 100644
index 000000000..11523c830
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_hex.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_hex" title="Editor Hexadecimal" >
+	  <text name="status_text" >
+			 Cargando...
+	  </text>
+	  <slider label="Columnas" name="column_count"/>
+	  <button name="upload_btn" label="[UPLOAD]"/>
+	  <button name="save_btn" label="Guardar"/>
+	  <hex_editor name="hex"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_html.xml b/indra/newview/skins/default/xui/es/floater_html.xml
new file mode 100644
index 000000000..4ed62caf4
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_html.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="htmlfloater" title="">
+	  <button label="Cerrar" name="close_btn"/>
+	  <web_browser name="html_floater_browser"/>
+	  <button label="Volver" name="back_btn"/>
+	  <button label="Avanzar" name="forward_btn"/>
+	  <line_editor name="url_edit" />
+	  <button label="Ir" name="go_btn"/>
+	  <string name="home_page_url">
+			 http://www.secondlife.com
+	  </string>
+	  <string name="support_page_url">
+			 http://wiki.secondlife.com/wiki/Knowledge_Base
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_html_simple.xml b/indra/newview/skins/default/xui/es/floater_html_simple.xml
new file mode 100644
index 000000000..ae3a13efe
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_html_simple.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_html_simple" title="">
+	  <web_browser name="browser"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_hud.xml b/indra/newview/skins/default/xui/es/floater_hud.xml
new file mode 100644
index 000000000..88737c9b9
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_hud.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_hud" title="Tutorial">
+	  <!-- NOTE: Height and width must match values in settings.xml for 
+					FloaterHUDRect because this floater is resized to those values 
+					in LLViewerWindow initialization. JC -->
+	  <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%0ALoading...%3C/tt%3E%3C/h1%3E%3C/body%3E%3C/html%3E"
+	  />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_im.xml b/indra/newview/skins/default/xui/es/floater_im.xml
new file mode 100644
index 000000000..c17e81326
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_im.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater name="im_floater" title="Mensaje Instantáneo">
+	  <tab_container name="Preview Tabs" />
+			 <string name="only_user_message">
+					Eres el único usuario en la sesión.
+			 </string>
+			 <string name="offline_message">
+					[NAME] está fuera de línea.
+			 </string>
+			 <string name="invite_message">
+					Pulsa el botón [BUTTON NAME] para aceptar/conectar este chat de voz.
+			 </string>
+			 <string name="muted_message">
+					Has ignorado a este residente. Al enviarle un mensaje, automáticamente dejarás de ignorarle.
+			 </string>
+			 <string name="generic_request_error">
+					Error al hacer lo solicitado; por favor, inténtalo más tarde.
+			 </string>
+			 <string name="insufficient_perms_error">
+					No tienes los permisos suficientes.
+			 </string>
+			 <string name="session_does_not_exist_error">
+					La sesión ya acabó
+			 </string>
+			 <string name="no_ability_error">
+					No tienes esa capacidad.
+			 </string>
+			 <string name="not_a_mod_error">
+					No eres un moderador de la sesión.
+			 </string>
+			 <string name="muted_error">
+					Un moderador del grupo ha desactivado tu chat de texto.
+			 </string>
+			 <!-- ALL of the event strings should have [RECIPIENT] in them -->
+			 <string name="add_session_event">
+					No se ha podido añadir usuarios a la sesión de chat con [RECIPIENT].
+			 </string>
+			 <string name="message_session_event">
+					No se ha podido enviar tu mensaje a la sesión de chat con [RECIPIENT].
+			 </string>
+			 <string name="removed_from_group">
+					Has sido expulsado del grupo.
+			 </string>
+			 <string name="close_on_no_ability">
+					Ya no tendrás más la capacidad de estar en la sesión de chat.
+			 </string>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/es/floater_image_preview.xml b/indra/newview/skins/default/xui/es/floater_image_preview.xml
new file mode 100644
index 000000000..dc8542c24
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_image_preview.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Image Preview" title="">
+	  <text name="name_label">
+			 Nombre:
+	  </text>
+	  <line_editor name="name_form"/>
+	  <text name="description_label">
+			 Descripción:
+	  </text>
+	  <line_editor name="description_form"/>
+	  <text name="preview_label">
+			 Vista Previa como:
+	  </text>
+	  <combo_box label="Ropa" name="clothing_type_combo">
+			 <combo_item name="Image">
+					Imagen
+			 </combo_item>
+			 <combo_item name="Hair">
+					Pelo
+			 </combo_item>
+			 <combo_item name="FemaleHead">
+					Cabeza Femenina
+			 </combo_item>
+			 <combo_item name="FemaleUpperBody">
+					Cuerpo Superior Femenino
+			 </combo_item>
+			 <combo_item name="FemaleLowerBody">
+					Cuerpo Inferior Femenino
+			 </combo_item>
+			 <combo_item name="MaleHead">
+					Cabeza Masculina
+			 </combo_item>
+			 <combo_item name="MaleUpperBody">
+					Cuerpo Superior Masculino
+			 </combo_item>
+			 <combo_item name="MaleLowerBody">
+					Cuerpo Inferior Masculino
+			 </combo_item>
+			 <combo_item name="Skirt">
+					Falda
+			 </combo_item>
+			 <combo_item name="SculptedPrim">
+					Prim Sculpt
+			 </combo_item>
+	  </combo_box>
+	  <text name="bad_image_text">
+			 No se puede leer la imagen.
+
+Intenta guardándola como Targa de 24 bits (.tga).
+	  </text>
+	  <check_box label="Usar Compresión sin pérdid" name="lossless_check"/>
+	  <check_box label="Temporaria (Gratis)" name="temp_check" tooltip="Fija el item como temporario, lo cual significa que es gratis pero por un período de tiempo luego del cual, desaparece"/>
+	  <button label="Cancelar" name="cancel_btn"/>
+	  <button label="Subir ([UPLOADFEE])" name="ok_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inspect.xml b/indra/newview/skins/default/xui/es/floater_inspect.xml
new file mode 100644
index 000000000..7a6ebed49
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_inspect.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floatername="inspect" title="Inspeccionar Objetos">
+	  <scroll_list name="object_list" tool_tip="Elige un objeto de la lista para ubicarlo en el mundo">
+			 <column label="Objeto" name="object_name" />
+			 <column label="Propietario" name="owner_name" />
+			 <column label="Último Propietario" name="last_owner_name" />
+			 <column label="Creador" name="creator_name" />
+			 <column label="Caras" name="face_num" width="35" />
+			 <column label="Vértices" name="vertex_num" width="35" />
+			 <column label="Scripts" name="script_num" width="35" />
+			 <column label="Total Inv." name="inv_num" width="35" />
+			 <column label="Fecha de Creación" name="creation_date" width="150" />
+	  </scroll_list>
+	  <button label="Ver Perfil de Propietario..." label_selected="" name="button owner" tool_tip="Ver Perfil del Propietario del objeto seleccionado"/>
+	  <button label="Ver Perfil del Creador..." label_selected="" name="button creator" tool_tip="Ver Perfil del Creador del objeto seleccionado"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_instant_message.xml b/indra/newview/skins/default/xui/es/floater_instant_message.xml
new file mode 100644
index 000000000..1e05dd469
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_instant_message.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater label="(desconocido)" name="im_floater" title="(desconocido)">
+	  <string name="answering">
+			 Conectando...
+	  </string>
+	  <string name="ringing">
+			 Llamando...
+	  </string>
+	  <string name="connected">
+			 Conectado, pulsa Colgar para terminar
+	  </string>
+	  <string name="hang_up">
+			 Llamada terminada
+	  </string>
+	  <string name="voice_icon">icn_voice-pvtfocus.tga</string>
+	  <string name="title_string">
+			 Mensaje Instantáneo con [NAME]
+	  </string>
+	  <string name="typing_start_string">
+			 [NAME] está escribiendo...
+	  </string>
+	  <string name="session_start_string">
+			 Iniciando sesión con [NAME], espera por favor.
+	  </string>
+	  <string name="default_text_label">
+			 Pulsa aquí para enviar un Mensaje Instantáneo.
+	  </string>
+	  <string name="unavailable_text_label">
+			 El chat de texto no está disponible para esta llamada.
+	  </string>
+	  <string name="inventory_item_offered">
+			 Ofrecido un Item de Inventario
+	  </string>
+	  <button label="Perfil" name="profile_callee_btn"/>
+	  <button label="Teleportar" name="profile_tele_btn"/>
+	  <button label="Historial" name="history_btn"/>
+	  <check_box name="rp_mode">
+			 Modo RP
+	  </check_box>
+	  <button label="Llamar" name="start_call_btn"/>
+	  <button label="Colgar" name="end_call_btn"/>
+	  <panel name="speaker_controls">
+			 <volume_slider name="speaker_volume"/>
+			 <button label="" name="mute_btn" tool_tip="Silenciar la Voz" width="25"/>
+	  </panel>
+	  <text_editor name="im_history" />
+	  <line_editor label="Pulsa aquí para iniciar un Mensaje Instantáneo" name="chat_editor"/>
+	  <button label="Enviar" name="send_btn"/>
+	  <string name="live_help_dialog">
+			 *** Bienvenido a la Petición de Ayuda *** 
+Por favor, en primer lugar revisa nuestras páginas de ayuda de SL pulsando F1, o accede a la Base de Conocimientos http://secondlife.com/knowledgebase/ 
+Si no encuentras allí la respuesta que buscas, por favor, empiecza el proceso escribiendo tu pregunta, y espera unos momentos a que responda algún ayudante que esté disponible.
+-=-=- El tiempo de respuesta puede variar, especialmente durante las horas punta -=-=-	  
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_instant_message_ad_hoc.xml b/indra/newview/skins/default/xui/es/floater_instant_message_ad_hoc.xml
new file mode 100644
index 000000000..dc2f6ef45
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_instant_message_ad_hoc.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater label="(desconocido)" name="im_floater" title="(desconocido)">
+	  <string name="ringing">
+			 Conectando el chat de voz...
+	  </string>
+	  <string name="connected">
+			 Conectado, pulsa Colgar para terminar
+	  </string>
+	  <string name="hang_up">
+			Salir del chat de voz
+	  </string>
+	  <string name="voice_icon">
+			 icn_voice-groupfocus.tga
+	  </string>
+	  <string name="title_string">
+			 Mensaje Instantáneo con [NAME]
+	  </string>
+	  <string name="typing_start_string">
+			 [NAME] está escribiendo...
+	  </string>
+	  <string name="session_start_string">
+			 Iniciando sesión con [NAME], espera por favor.
+	  </string>
+	  <string name="default_text_label">
+			 Pulsa aquí para enviar un Mensaje Instantáneo.
+	  </string>
+	  <layout_stack name="panels">
+			 <layout_panel name="im_contents_panel">
+					<button label="Llamar" name="start_call_btn"/>
+					<button label="Colgar" name="end_call_btn"/>
+					<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Pulse aquí para moverse por la lista de participantes activos en esta sesión de MI."/>
+					<text_editor name="im_history" />
+					<line_editor label="Pulsa aquí para enviar un Mensaje Instantáneo" name="chat_editor" />
+					<button label="Enviar" name="send_btn"/>
+			 </layout_panel>
+			 <layout_panel name="active_speakers_panel"/>
+	  </layout_stack>
+	  <string name="live_help_dialog">
+			 *** Bienvenido a la Petición de Ayuda *** 
+Por favor, en primer lugar revisa nuestras páginas de ayuda de SL pulsando F1, o accede a la Base de Conocimientos http://secondlife.com/knowledgebase/ 
+Si no encuentras allí la respuesta que buscas, por favor, empieza el proceso escribiendo tu pregunta, y espera unos momentos a que responda algunos de los ayudantes disponibles.
+-=-=- El tiempo de respuesta puede variar, especialmente durante las horas punta -=-=-	  
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_instant_message_group.xml b/indra/newview/skins/default/xui/es/floater_instant_message_group.xml
new file mode 100644
index 000000000..60c4a1508
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_instant_message_group.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater label="(desconocido)" name="im_floater" title="(desconocido)">
+	  <string name="ringing">
+			 Joining Voice Chat...
+	  </string>
+	  <string name="connected">
+			 Connected, click End Call to hang up
+	  </string>
+	  <string name="hang_up">
+			 Left Voice Chat
+	  </string>
+	  <string name="voice_icon">
+			 icn_voice-groupfocus.tga
+	  </string>
+	  <string name="title_string">
+			 Instant Message with [NAME]
+	  </string>
+	  <string name="typing_start_string">
+			 [NAME] is typing...
+	  </string>
+	  <string name="session_start_string">
+			 Starting session with [NAME], please wait.
+	  </string>
+	  <string name="default_text_label">
+			 Click here to instant message.
+	  </string>
+	  <string name="moderated_chat_label">
+			 (Moderated: Voices off by default)
+	  </string>
+	  <string name="muted_text_label">
+			 Your text chat has been disabled by a Group Moderator.
+	  </string>
+	  <layout_stack name="panels">
+			 <layout_panel name="im_contents_panel" >
+					<button label="Group Info" name="group_info_btn"/>
+					<button label="Join Call" name="start_call_btn"/>
+					<button label="End Call" name="end_call_btn"/>
+					<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Click here to toggle a list of active participants in this IM session."/>
+					<text_editor name="im_history"/>
+					<line_editor name="chat_editor"/>
+					<button label="Enviar" name="send_btn"/>
+			 </layout_panel>
+			 <layout_panel name="active_speakers_panel"/>
+	  </layout_stack>
+	  <string name="live_help_dialog">
+			 *** Bienvenido a la Petición de Ayuda *** 
+Por favor, en primer lugar revisa nuestras páginas de ayuda de SL pulsando F1, o accede a la Base de Conocimientos http://secondlife.com/knowledgebase/ 
+Si no encuentras allí la respuesta que buscas, por favor, empieza el proceso escribiendo tu pregunta, y espera unos momentos a que responda algunos de los ayudantes disponibles.
+-=-=- El tiempo de respuesta puede variar, especialmente durante las horas punta -=-=-	  
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory.xml b/indra/newview/skins/default/xui/es/floater_inventory.xml
new file mode 100644
index 000000000..1e46da38d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_inventory.xml
@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Inventory" title="Inventario">
+	  <search_editor label="Escribe aquí para buscar" name="inventory search editor"/>
+	  <button label="" name="collapse_btn" tool_tip="Cerrar Todo" />
+	  <text name="group_titles_textbox">
+			 Filtro Rápido:
+	  </text>
+	  <!-- Inventory Type Filter Labels -->
+	  <string name="filter_type_all">
+			 Todos los Tipos
+	  </string>
+	  <string name="filter_type_animation">
+			 Animaciones
+	  </string>
+	  <string name="filter_type_callingcard">
+			 Tarjestas de Llamada
+	  </string>
+	  <string name="filter_type_wearable">
+			 Ropas / Partes de Cuerpo
+	  </string>
+	  <string name="filter_type_gesture">
+			 Gestos
+	  </string>
+	  <string name="filter_type_landmark">
+			 Hitos
+	  </string>
+	  <string name="filter_type_notecard">
+			 Notas
+	  </string>
+	  <string name="filter_type_object">
+			 Objetos
+	  </string>
+	  <string name="filter_type_script">
+			 Scripts
+	  </string>
+	  <string name="filter_type_sound">
+			 Sonidos
+	  </string>
+	  <string name="filter_type_texture">
+			 Texturas
+	  </string>
+	  <string name="filter_type_snapshot">
+			 Fotos
+	  </string>
+	  <string name="filter_type_custom">
+			 Personalizado...
+	  </string>
+	  <combo_box name="Quick Filter" label="Filtro Rápido">
+			 <combo_item name="filter_type_all">
+					Todos los Tipos
+			 </combo_item>
+			 <separator />
+			 <combo_item name="filter_type_animation">
+					Animaciones
+			 </combo_item>
+			 <combo_item name="filter_type_callingcard">
+					Tarjetas de Llamada
+			 </combo_item>
+			 <combo_item name="filter_type_wearable">
+					Ropas / Partes de Cuerpo
+			 </combo_item>
+			 <combo_item name="filter_type_gesture">
+					Gestos
+			 </combo_item>
+			 <combo_item name="filter_type_landmark">
+					Hitos
+			 </combo_item>
+			 <combo_item name="filter_type_notecard">
+					Notas
+			 </combo_item>
+			 <combo_item name="filter_type_object">
+					Objetos
+			 </combo_item>
+			 <combo_item name="filter_type_script">
+					Scripts
+			 </combo_item>
+			 <combo_item name="filter_type_sound">
+					Sonidos
+			 </combo_item>
+			 <combo_item name="filter_type_texture">
+					Texturas
+			 </combo_item>
+			 <combo_item name="filter_type_snapshot">
+					Fotos
+			 </combo_item>
+			 <separator />
+			 <combo_item name="filter_type_custom">
+					Personalizado...
+			 </combo_item>
+	  </combo_box>
+	  <tab_container name="inventory filter tabs" follows="left|top|right|bottom"
+	     bottom_delta="-487" height="480" left="2" width="463"
+	     mouse_opaque="false" tab_position="top">
+
+		<inventory_panel allow_multi_select="true" border="true" bottom="-507"
+		     follows="left|top|right|bottom" height="491" label="All Items" left="1"
+		     mouse_opaque="true" name="All Items" sort_order="InventorySortOrder"
+		     width="461" />
+		<inventory_panel allow_multi_select="true" border="true" bottom_delta="0"
+		     follows="left|top|right|bottom" height="491" label="Recent Items"
+		     left_delta="0" mouse_opaque="true" name="Recent Items"
+		     sort_order="RecentItemsSortOrder" width="461" />
+		<inventory_panel allow_multi_select="true" border="true" bottom_delta="0"
+		     follows="left|top|right|bottom" height="491" label="Worn Items"
+		     left_delta="0" mouse_opaque="true" name="Worn Items"
+		     sort_order="WornItemsSortOrder" width="461" />
+	</tab_container>
+	<menu_bar name="Inventory Menu">
+			 <menu label="Archivo" name="File">
+					<menu_item_call label="Abrir" name="Open">
+						  <on_click filter="" function="Inventory.DoToSelected" userdata="open" />
+					</menu_item_call>
+					<menu_item_separator name="separator"/>
+					<menu_item_call label="Nueva Ventana" name="New Window">
+						  <on_click filter="" function="Inventory.NewWindow" userdata="" />
+					</menu_item_call>
+					<menu_item_separator name="separator2"/>
+					<menu_item_call label="Mostrar Filtros" name="Show Filters">
+						  <on_click filter="" function="Inventory.ShowFilters" userdata="" />
+					</menu_item_call>
+					<menu_item_call label="Restablecer Filtros" name="Reset Current">
+						  <on_click filter="" function="Inventory.ResetFilter" userdata="" />
+					</menu_item_call>
+					<menu_item_call label="Cerrar todas las Carpetas" name="Close All Folders">
+						  <on_click filter="" function="Inventory.CloseAllFolders" userdata="" />
+					</menu_item_call>
+					<menu_item_separator name="separator3"/>
+					<menu_item_call label="Vaciar la Papelera" name="Empty Trash">
+						  <on_click filter="" function="Inventory.EmptyTrash" userdata="" />
+					</menu_item_call>
+					<menu_item_call label="Actualizar Inventario" name="Refresh Inventory">
+						  <on_click filter="" function="Inventory.RefreshInvModel" userdata="" />
+					</menu_item_call>
+			 </menu>
+			 <menu label="Crear" name="Create">
+					<menu_item_call label="Nueva Carpeta" name="New Folder">
+						  <on_click filter="" function="Inventory.DoCreate" userdata="category" />
+					</menu_item_call>
+					<menu_item_call label="Nuevo Script" name="New Script">
+						  <on_click filter="" function="Inventory.DoCreate" userdata="lsl" />
+					</menu_item_call>
+					<menu_item_call label="Nueva Nota" name="New Note">
+						  <on_click filter="" function="Inventory.DoCreate" userdata="notecard" />
+					</menu_item_call>
+					<menu_item_call label="Nuevo Gesto" name="New Gesture">
+						  <on_click filter="" function="Inventory.DoCreate" userdata="gesture" />
+					</menu_item_call>
+					<menu name="New Clothes">
+						  <menu_item_call label="Nueva Camisa" name="New Shirt">
+								 <on_click filter="" function="Inventory.DoCreate" userdata="shirt" />
+						  </menu_item_call>
+						  <menu_item_call label="Nuevos Pantalones" name="New Pants">
+								 <on_click filter="" function="Inventory.DoCreate" userdata="pants" />
+						  </menu_item_call>
+						  <menu_item_call label="Nuevos Zapatos" name="New Shoes">
+								 <on_click filter="" function="Inventory.DoCreate" userdata="shoes" />
+						  </menu_item_call>
+						  <menu_item_call label="Nuevas Medias" name="New Socks">
+								 <on_click filter="" function="Inventory.DoCreate" userdata="socks" />
+						  </menu_item_call>
+						  <menu_item_call label="Nueva Chaqueta" name="New Jacket">
+								 <on_click filter="" function="Inventory.DoCreate" userdata="jacket" />
+						  </menu_item_call>
+						  <menu_item_call label="Nueva Falda" name="New Skirt">
+								 <on_click filter="" function="Inventory.DoCreate" userdata="skirt" />
+						  </menu_item_call>
+						  <menu_item_call label="Nuevos Guantes" name="New Gloves">
+								 <on_click filter="" function="Inventory.DoCreate" userdata="gloves" />
+						  </menu_item_call>
+						  <menu_item_call label="Nueva Camiseta" name="New Undershirt">
+								 <on_click filter="" function="Inventory.DoCreate" userdata="undershirt" />
+						  </menu_item_call>
+						  <menu_item_call label="Nueva Ropa Interior" name="New Underpants">
+								 <on_click filter="" function="Inventory.DoCreate" userdata="underpants" />
+						  </menu_item_call>
+						  <menu_item_call label="Nuevo Tatuaje" name="New Tattoo">
+								 <on_click filter="" function="Inventory.DoCreate" userdata="tattoo" />
+						  </menu_item_call>
+						  <menu_item_call label="Nueva Capa Alfa" name="New Alpha">
+								 <on_click filter="" function="Inventory.DoCreate" userdata="alpha" />
+						  </menu_item_call>
+						  <menu_item_call label="Nueva Física" name="New Physics">
+								 <on_click filter="" function="Inventory.DoCreate" userdata="physics" />
+						  </menu_item_call>
+					</menu>
+					<menu name="New Body Parts">
+						  <menu_item_call label="Nueva Forma" name="New Shape">
+								 <on_click filter="" function="Inventory.DoCreate" userdata="shape" />
+						  </menu_item_call>
+						  <menu_item_call label="Nueva Piel" name="New Skin">
+								 <on_click filter="" function="Inventory.DoCreate" userdata="skin" />
+						  </menu_item_call>
+						  <menu_item_call label="Nuevo Pelo" name="New Hair">
+								 <on_click filter="" function="Inventory.DoCreate" userdata="hair" />
+						  </menu_item_call>
+						  <menu_item_call label="Nuevos Ojos" name="New Eyes">
+								 <on_click filter="" function="Inventory.DoCreate" userdata="eyes" />
+						  </menu_item_call>
+					</menu>
+			 </menu>
+			 <menu label="Ordenar" name="Sort">
+					<menu_item_check label="Por Nombre" name="By Name">
+						  <on_click filter="" function="Inventory.SetSortBy" userdata="name" />
+					</menu_item_check>
+					<menu_item_check label="Por Fecha" name="By Date">
+						  <on_click filter="" function="Inventory.SetSortBy" userdata="date" />
+					</menu_item_check>
+					<menu_item_separator name="separator"/>
+					<menu_item_check label="Carpetas, siempre por Nombre" name="Folders Always By Name">
+						  <on_click filter="" function="Inventory.SetSortBy" userdata="foldersalwaysbyname" />
+					</menu_item_check>
+					<menu_item_check label="Carpeta de Sistema al Principio" name="System Folders To Top">
+						  <on_click filter="" function="Inventory.SetSortBy" userdata="systemfolderstotop" />
+					</menu_item_check>
+			 </menu>
+			 <menu label="Buscar" name="Search">
+					<menu_item_check label="Nombre del Item" name="Item name">
+						  <on_click filter="" function="Inventory.SetSearchType" userdata="name" />
+					</menu_item_check>
+					<menu_item_check label="Descripción del Item" name="Item description">
+						  <on_click filter="" function="Inventory.SetSearchType" userdata="description" />
+					</menu_item_check>
+					<menu_item_check label="Creador del Item" name="Item creatorr">
+						  <on_click filter="" function="Inventory.SetSearchType" userdata="creator" />
+					</menu_item_check>
+			 </menu>
+	  </menu_bar>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_backup.xml b/indra/newview/skins/default/xui/es/floater_inventory_backup.xml
new file mode 100644
index 000000000..34e8fa1dd
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_inventory_backup.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_inventory_backup" title="Respaldar Inventario">
+	  <scroll_list name="item_list">
+			 <column name="type" width="20" />
+			 <column label="Nombre" name="name" />
+			 <column label="Estado" name="status"/>
+	  </scroll_list>
+	  <line_editor name="progress_background" />
+	  <line_editor name="progress_foreground"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_backup_settings.xml b/indra/newview/skins/default/xui/es/floater_inventory_backup_settings.xml
new file mode 100644
index 000000000..4c1f50ab2
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_inventory_backup_settings.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="inventory_backup_settings" title="Opciones de Descarga">
+	  <check_box name="chk_textures" label="Texturas" />
+	  <check_box name="chk_sounds" label="Sonidos" />
+	  <check_box name="chk_callingcards" label="Tarjetas de LLamada" />
+	  <check_box name="chk_landmarks" label="Hitos" />
+	  <check_box name="chk_scripts" label="Scripts" />
+	  <check_box name="chk_wearables" label="Wearables" />
+	  <check_box name="chk_objects" label="Objetos" />
+	  <check_box name="chk_notecards" label="Notas" />
+	  <check_box name="chk_animations" label="Animaciones" />
+	  <check_box bottom_delta="-20" follows="left|top" left="10" ="chk_gestures" label="Gestos" />
+	  <!--<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_others" label="Others" />-->
+	  <button label="Siguiente >>" name="next_btn" />
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
new file mode 100644
index 000000000..17af8b173
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="item properties" title="Propiedades de los Items de Inventario">
+	  <icon name="IconLocked"/>
+	  <text name="LabelItemNameTitle">
+			 Nombre:
+	  </text>
+	  <line_editor name="LabelItemName"/>
+	  <text name="LabelItemDescTitle">
+			 Descripción:
+	  </text>
+	  <line_editor name="LabelItemDesc"/>
+	  <text name="LabelCreatorTitle">
+			 Creador:
+	  </text>
+	  <text name="LabelCreatorName" >
+			 Nicole Linden
+	  </text>
+	  <button label="Perfil..." label_selected="" name="BtnCreator"/>
+	  <text name="LabelOwnerTitle">
+			 Propietario:
+	  </text>
+	  <text name="LabelOwnerName">
+			 Thrax Linden
+	  </text>
+	  <button label="Perfil..." label_selected="" name="BtnOwner"/>
+	  <text name="LabelAcquiredTitle">
+			 Adquirido:
+	  </text>
+	  <text name="LabelAcquiredDate">
+			 Mie May 24 12:50:46 2006
+	  </text>
+	  <text name="OwnerLabel">
+			 Puedes:
+	  </text>	  
+	  <check_box label="Modificar" name="CheckOwnerModify"/>
+	  <check_box label="Copiar" name="CheckOwnerCopy"/>
+	  <check_box label="Venderlo/Darlo" name="CheckOwnerTransfer"/>
+	  <text name="BaseMaskDebug">
+			 B:
+	  </text>
+	  <text name="OwnerMaskDebug">
+			 O:
+	  </text>
+	  <text name="GroupMaskDebug">
+			 G:
+	  </text>
+	  <text name="EveryoneMaskDebug">
+			 E:
+	  </text>
+	  <text name="NextMaskDebug">
+			 N:
+	  </text>
+	  <check_box label="Compartir con el Grupo" name="CheckShareWithGroup"/>
+	  <check_box label="Permitir a cualquiera que lo copie" name="CheckEveryoneCopy"/>
+	  <text name="NextOwnerLabel"  width="250">
+			 El próximo propietario puede:
+	  </text>
+	  <check_box label="Modificarlo" name="CheckNextOwnerModify"/>
+	  <check_box label="Copiarlo" name="CheckNextOwnerCopy"/>
+	  <check_box label="Venderlo/Darlo" name="CheckNextOwnerTransfer"/>
+	  <text name="SaleLabel" width="150">
+			 Marcar Item como:
+	  </text>
+	  <check_box label="En Venta" name="CheckPurchase"/>
+	  <radio_group name="RadioSaleType">
+			 <radio_item name="radio">
+					Original
+			 </radio_item>
+			 <radio_item name="radio2">
+					Copia
+			 </radio_item>
+	  </radio_group>
+	  <text name="TextPrice">
+			 Precio:  [CURRENCY]
+	  </text>
+	  <line_editor name="EditPrice"/>
+	  <string name="unknown">
+			 (desconocido)
+	  </string>
+	  <string name="public">
+			 (público)
+	  </string>
+	  <string name="you_can">
+			 Puedes:
+	  </string>	  
+	  <string name="owner_can">
+			 El Propietario Puede:
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
new file mode 100644
index 000000000..736572f4d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Inventory Finder" title="ítems_recientes_del_inventario" width="160">
+	  <icon name="icon_animation"/>
+	  <check_box label="Animación" name="check_animation"/>
+	  <icon name="icon_calling_card"/>
+	  <check_box label="Tarjetas de Llamada" name="check_calling_card"/>
+	  <icon name="icon_clothing" />
+	  <check_box label="Ropas" name="check_clothing"/>
+	  <icon name="icon_gesture"/>
+	  <check_box label="Gestos" name="check_gesture"/>
+	  <icon name="icon_landmark"/>
+	  <check_box label="Hitos" name="check_landmark"/>
+	  <icon name="icon_notecard"/>
+	  <check_box label="Notas" name="check_notecard"/>
+	  <icon name="icon_object"/>
+	  <check_box label="Objetos" name="check_object"/>
+	  <icon name="icon_script"/>
+	  <check_box label="Scripts" name="check_script"/>
+	  <icon name="icon_sound"/>
+	  <check_box label="Sonidos" name="check_sound"/>
+	  <icon name="icon_texture"/>
+	  <check_box label="Texturas" name="check_texture"/>
+	  <icon name="icon_snapshot"/>
+	  <check_box label="Fotos" name="check_snapshot"/>
+	  <button label="Todo" label_selected="Todo" name="All"/>
+	  <button label="Nada" label_selected="Nada" name="None"/>
+	  <check_box label="Mostrar Carpetas Siempre" name="check_show_empty"/>
+	  <check_box label="Desde Fin Sesión Anterior" name="check_since_logoff"/>
+	  <text name="- OR -">
+			 - O -
+	  </text>
+	  <spinner label="Horas Atrás" name="spin_hours_ago"/>
+	  <spinner label="Días Atrás" name="spin_days_ago"/>
+	  <button label="Cerrar" label_selected="Cerrar" name="Close"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_joystick.xml b/indra/newview/skins/default/xui/es/floater_joystick.xml
new file mode 100644
index 000000000..e265833ff
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_joystick.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Joystick" title="Configuración del Joystick">
+	  <check_box name="enable_joystick" >
+			 Activar Joystick:
+	  </check_box>
+	  <text name="joystick_type"></text>
+	  <string name="JoystickMonitor">
+			 Monitor de Joystick
+	  </string>
+	  <string name="Axis">
+			 Eje [NUM]
+	  </string>
+	  <string name="NoDevice">
+			 No se ha detectado el dispositivo
+	  </string>
+	  <spinner name="JoystickAxis1" label="Mapeo Eje X"/>
+	  <spinner name="JoystickAxis4" label="Mapeo Arriba/Abajo"/>
+	  <spinner name="JoystickAxis6" label="Mapeo de Zoom"/>
+	  <spinner name="JoystickAxis2" label="Mapeo Eje Y"/>
+	  <spinner name="JoystickAxis5" label="Mapeo Izq./der."/>
+	  <spinner name="JoystickAxis0" label="Mapeo Eje Z"/>
+	  <spinner name="JoystickAxis3" label="Mapeo de Giro"/>
+	  <check_box label="Zoom Directo" name="ZoomDirect"/>
+	  <check_box label="Cursor 3D" name="Cursor3D"/>
+	  <check_box label="Nivel Automático" name="AutoLeveling"/>
+	  <text name="Control Modes:">
+			 Modos de Control:
+	  </text>
+	  <check_box name="JoystickAvatarEnabled">
+			 Avatar
+	  </check_box>
+	  <check_box name="JoystickBuildEnabled">
+			 Construir
+	  </check_box>
+	  <check_box name="JoystickFlycamEnabled">
+			 Flycam
+	  </check_box>
+	  <text name="XScale">
+			 Escala de X
+	  </text>
+	  <spinner name="AvatarAxisScale1"/>
+	  <spinner name="BuildAxisScale1"/>
+	  <spinner name="FlycamAxisScale1"/>
+	  <text name="YScale">
+			 Escala de Y
+	  </text>
+	  <spinner name="AvatarAxisScale2"/>
+	  <spinner name="BuildAxisScale2"/>
+	  <spinner name="FlycamAxisScale2"/>
+	  <text name="ZScale">
+			 Escala de Z
+	  </text>
+	  <spinner name="AvatarAxisScale0"/>
+	  <spinner name="BuildAxisScale0"/>
+	  <spinner name="FlycamAxisScale0"/>
+	  <text name="PitchScale">
+			 Escala Arriba/Abajo
+	  </text>
+	  <spinner name="AvatarAxisScale4"/>
+	  <spinner name="BuildAxisScale4"/>
+	  <spinner name="FlycamAxisScale4"/>
+	  <text name="YawScale">
+			 Escala Izq./Der.
+	  </text>
+	  <spinner name="AvatarAxisScale5"/>
+	  <spinner name="BuildAxisScale5"/>
+	  <spinner name="FlycamAxisScale5"/>
+	  <text name="RollScale">
+			 Escala de Giro
+	  </text>
+	  <spinner name="BuildAxisScale3"/>
+	  <spinner name="FlycamAxisScale3"/>
+	  <text name="XDeadZone">
+			 Zona Muerta de X
+	  </text>
+	  <spinner name="AvatarAxisDeadZone1"/>
+	  <spinner name="BuildAxisDeadZone1"/>
+	  <spinner name="FlycamAxisDeadZone1"/>
+	  <text name="YDeadZone">
+			 Zona Muerta de Y</text>
+	  <spinner name="AvatarAxisDeadZone2"/>
+	  <spinner name="BuildAxisDeadZone2"/>
+	  <spinner name="FlycamAxisDeadZone2"/>
+	  <text name="ZDeadZone">
+			 Zona Muerta de Z
+	  </text>
+	  <spinner name="AvatarAxisDeadZone0"/>
+	  <spinner name="BuildAxisDeadZone0"/>
+	  <spinner name="FlycamAxisDeadZone0"/>
+	  <text name="PitchDeadZone">
+			 Zona Muerta Arriba/Abajo
+	  </text>
+	  <spinner name="AvatarAxisDeadZone4"/>
+	  <spinner name="BuildAxisDeadZone4"/>
+	  <spinner name="FlycamAxisDeadZone4"/>
+	  <text name="YawDeadZone">
+			 Zona Muerta Izq./der.
+	  </text>
+	  <spinner name="AvatarAxisDeadZone5"/>
+	  <spinner name="BuildAxisDeadZone5"/>
+	  <spinner name="FlycamAxisDeadZone5"/>
+	  <text name="RollDeadZone">
+			 Zona Muerta de Giro
+	  </text>
+	  <spinner name="BuildAxisDeadZone3"/>
+	  <spinner name="FlycamAxisDeadZone3"/>
+	  <text name="Feathering">
+			 Rigidez
+	  </text>
+	  <spinner name="AvatarFeathering"/>
+	  <spinner name="BuildFeathering"/>
+	  <spinner name="FlycamFeathering"/>
+	  <text name="ZoomScale2">
+			 Escala de Zoom
+	  </text>
+	  <spinner name="FlycamAxisScale6"/>
+	  <text name="ZoomDeadZone">
+			 Zona Muerta de Zoom
+	  </text>
+	  <spinner name="FlycamAxisDeadZone6"/>
+	  <button label="Predeterminado SpaceNavigator" name="SpaceNavigatorDefaults" left="330" width="210"/>
+	  <button label="OK" label_selected="OK" name="ok_btn"/>
+	  <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_lagmeter.xml b/indra/newview/skins/default/xui/es/floater_lagmeter.xml
new file mode 100644
index 000000000..1d8dd271b
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_lagmeter.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_lagmeter" title="Medidor de Lag">
+	  <button label="" label_selected="" name="client_lagmeter" tool_tip="Estado de lag del Cliente" />
+	  <text name="client">
+			 Cliente:
+	  </text>
+	  <text name="client_text">
+			 Normal
+	  </text>
+	  <text name="client_lag_cause"/>
+	  <button label="" label_selected="" name="network_lagmeter" tool_tip="Estado de lag de la Red"/>
+	  <text name="network">
+			 Red:
+	  </text>
+	  <text name="network_text">
+			 Normal
+	  </text>
+	  <text name="network_lag_cause"/>
+	  <button label="" label_selected="" name="server_lagmeter" tool_tip="Estado de lag del Servidor"/>
+	  <text name="server">
+			 Servidor:
+	  </text>
+	  <text name="server_text">
+			 Normal
+	  </text>
+	  <text name="server_lag_cause"/>
+	  <button help_url="https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=4851"  label="?" name="server_help"/>
+	  <button label="&gt;&gt;" name="minimize"/>
+	  <string name="max_title_msg">
+			 Medidor de Lag
+	  </string>
+	  <string name="max_width_px">
+			 360
+	  </string>
+	  <string name="min_title_msg">
+			 Lag
+	  </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, ventana en segundo plano
+	  </string>
+	  <string name="client_frame_time_critical_msg">
+			 Frames del cliente valorados por debajo de [CLIENT_FRAME_RATE_CRITICAL]
+	  </string>
+	  <string name="client_frame_time_warning_msg">
+			 Frames del cliente valorados entre [CLIENT_FRAME_RATE_CRITICAL] and [CLIENT_FRAME_RATE_WARNING]
+	  </string>
+	  <string name="client_frame_time_normal_msg">
+			 Normal
+	  </string>
+	  <string name="client_draw_distance_cause_msg">
+			 Causa posible: Distancia de dibujo fijada muy alta
+	  </string>
+	  <string name="client_texture_loading_cause_msg">
+			 Posible causa: imágenes cargándose
+	  </string>
+	  <string name="client_texture_memory_cause_msg">
+			 Posible causa: demasiadas imágenes en la memoria
+	  </string>
+	  <string name="client_complex_objects_cause_msg">
+			 Posible causa: demasiados objetos complejos en la escena
+	  </string>
+	  <string name="network_text_msg">
+			 Red
+	  </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">
+			 La conexión deja caer más del  [NETWORK_PACKET_LOSS_CRITICAL]% de los paquetes
+	  </string>
+	  <string name="network_packet_loss_warning_msg">
+			 La conexión deja caer [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% de los paquetes
+	  </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">
+			 El tiempo de conexión (ping) supera los [NETWORK_PING_CRITICAL] ms
+	  </string>
+	  <string name="network_ping_warning_msg">
+			 El tiempo de conexión (ping) es de [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
+	  </string>
+	  <string name="network_packet_loss_cause_msg">
+			 Posiblemente una mala conexión o se ha fijado un ancho de banda demasiado alto.
+	  </string>
+	  <string name="network_ping_cause_msg">
+			 Posiblemente una mala conexión o se está ejecutando una aplicación de archivos compartidos.
+	  </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">
+			 Frecuencia (framerate) por debajo de [SERVER_FRAME_RATE_CRITICAL]
+	  </string>
+	  <string name="server_frame_time_warning_msg">
+			 Frecuencia (framerate) entre [SERVER_FRAME_RATE_CRITICAL] y [SERVER_FRAME_RATE_WARNING]
+	  </string>
+	  <string name="server_frame_time_normal_msg">
+			 Normal
+	  </string>
+	  <string name="server_physics_cause_msg">
+			 Causa Posible: Demasiados objetos físicos
+	  </string>
+	  <string name="server_scripts_cause_msg">
+			 Causa Posible: Demasiados objetos con Scripts
+	  </string>
+	  <string name="server_net_cause_msg">
+			 Causa Posible: Demasiado tráfico en la red
+	  </string>
+	  <string name="server_agent_cause_msg">
+			 Causa Posible: demasiada gente moviéndose en la región
+	  </string>
+	  <string name="server_images_cause_msg">
+			 Causa Posible: demasiados cálculos de imágenes
+	  </string>
+	  <string name="server_generic_cause_msg">
+			 Causa Posible: Demasiada carga en el servidor
+	  </string>
+	  <string name="smaller_label">
+			 &gt;&gt;
+	  </string>
+	  <string name="bigger_label">
+			 &lt;&lt;
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_land_holdings.xml b/indra/newview/skins/default/xui/es/floater_land_holdings.xml
new file mode 100644
index 000000000..af49f8253
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_land_holdings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="land holdings floater" title="Mis Propiedades">
+	  <scroll_list name="parcel list">
+			 <column label="Nombre de la Parcela" name="name"/>
+			 <column label="Región" name="location"/>
+			 <column label="Tipo" name="type"/>
+			 <column label="Superficie" name="area"/>
+			 <column label="" name="hidden" width="-1" />
+	  </scroll_list>
+	  <button label="Teleportar" label_selected="Teleportar" name="Teleport" tool_tip="Teleportar al centro de este terreno" />
+	  <button label="Mostrar en el Mapa" label_selected="Mostrar en el Mapa" name="Show on Map" tool_tip="Mostrar este terreno en el mapa del mundo" />
+	  <text name="contrib_label">
+			 Contribuciones a tus grupos:
+	  </text>
+	  <scroll_list name="grant list">
+			 <column label="Grupo" name="group"/>
+			 <column label="Superficie" name="area"/>
+	  </scroll_list>
+	  <text name="allowed_label">
+			 Propiedades de terreno permitidas en el plan de pago actual:
+	  </text>
+	  <text name="allowed_text">
+			 [AREA] m²
+	  </text>
+	  <text name="current_label">
+			 Propiedades de terreno actuales:
+	  </text>
+	  <text name="current_text">
+			 [AREA] m²
+	  </text>
+	  <text name="available_label">
+			 Disponible para compras de terreno:
+	  </text>
+	  <text name="available_text">
+			 [AREA] m²
+	  </text>
+	  <string name="area_string">
+			 [AREA] m²
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_landmark_ctrl.xml b/indra/newview/skins/default/xui/es/floater_landmark_ctrl.xml
new file mode 100644
index 000000000..436936c5a
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_landmark_ctrl.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="landmarkpicker" title="Organizar: Hitos">
+	  <check_box label="Mostrar Carpetas" name="show_folders_check"/>
+	  <search_editor name="inventory search editor"/>
+	  <inventory_panel name="inventory panel"/>
+	  <button label="Nuevo" label_selected="Nuevo" name="New"/>
+	  <button label="Renombrar" label_selected="Renombrar" name="Rename"/>
+	  <button label="Nueva Carpeta" label_selected="Nueva Carpeta" name="NewFolder"/>
+	  <button label="Editar" label_selected="Editar" name="Edit"/>
+	  <button label="Borrar" label_selected="Borrar" name="Delete"/>
+	  <button label="Cerrar" label_selected="Cerrar" name="Close"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
new file mode 100644
index 000000000..1af605dc8
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script ed float" title="Script: Nuevo Script" >
+	  <button label="Restablecer" label_selected="Restablecer" name="Reset"/>
+	  <check_box label="Ejecuntándose" name="running"/>
+	  <check_box label="Mono" name="mono"/>
+	  <panel name="script ed panel" />
+	  <string name="not_allowed">
+			 No tienes permiso para ver este script.
+	  </string>
+	  <string name="script_running">
+			 Ejecutándose
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_local_asset_browse.xml b/indra/newview/skins/default/xui/es/floater_local_asset_browse.xml
new file mode 100644
index 000000000..fecb59a41
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_local_asset_browse.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- Local Asset Browser: xui -->
+<!-- floater definition start -->
+<floater name="local_bitmap_browser_floater" title="Navegador Local de Bitmap" >
+<!-- floater definition end, left side begin -->
+	  <button name="add_btn" label="Agregar"/>
+	  <button name="del_btn" label="Quitar"/>
+	  <button name="upload_btn" label="Subir"/>
+	  <button name="more_btn" label="Mas"/>
+	  <button name="less_btn" label="Menos"/>
+	  <scroll_list name="bitmap_list" >
+			 <column name="bitmap_name" label="Nombre"/>
+			 <column name="bitmap_uuid" label="UUID"/>
+	  </scroll_list>
+	  <!-- left side done, right side begin -->
+	  <line_editor  name="path_text"/>
+	  <text name="path_caption_text">
+			 Ruta Local:
+	  </text>
+	  <line_editor name="uuid_text" />
+	  <text name="uuid_caption_text">
+			 Local UdddUID:
+	  </text>
+	  <texture_picker label="Textura" name="texture_view"/>
+	  <check_box label="Mantener Actualizado" name="keep_updating_checkbox" tool_tip="Activar o desactivar el control periódico de las fuentes de bitmaps en tu disco duro para ver si han sido actualizadas"/>
+	  <combo_box name="type_combobox">
+			 <combo_item name="type_texture" value="type_texture">
+					Textura
+			 </combo_item>
+			 <combo_item name="type_sculptie" value="type_sculptie">
+					Sculptmap
+			 </combo_item>
+			 <combo_item name="type_layer" value="type_layer">
+					Ropas
+			 </combo_item>
+	  </combo_box>
+	  <text name="time_caption_text">
+			 Hora:
+	  </text>
+	  <text name="time_text">
+			 (aqui la fecha)
+	  </text>
+	  <text name="link_caption_text">
+			 Enlace:
+	  </text>
+	  <text name="link_text">
+			 (Estado del Link)
+	  </text>
+	  <text name="name_caption_text">
+			 Nombre:
+	  </text>
+	  <line_editor name="name_text"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_lsl_guide.xml b/indra/newview/skins/default/xui/es/floater_lsl_guide.xml
new file mode 100644
index 000000000..b673261f4
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_lsl_guide.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script ed float" title="LSL Wiki">
+	  <check_box label="Seguimiento del Cursor" name="lock_check"/>
+	  <combo_box label="Bloquear" name="history_combo"/>
+	  <button label="Retroceder" name="back_btn"/>
+	  <button label="Avanzar" name="fwd_btn"/>
+	  <web_browser name="lsl_guide_html"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_media_browser.xml b/indra/newview/skins/default/xui/es/floater_media_browser.xml
new file mode 100644
index 000000000..fd29cd0b0
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_media_browser.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_about" title="Navegador de Medios">
+	  <layout_stack name="stack1">
+			 <layout_panel name="nav_controls" >
+					<button label="" name="back"/>
+					<button label="" name="forward"/>
+					<button label="" name="reload"/>
+					<combo_box name="address"/>
+					<button label="Ir" name="go"/>
+					<!--button bottom_delta="0" enabled="true" follows="right|top" height="25" label="" image_overlay="go-home-4.png" 
+			     l		eft_delta="58" name="home" width="35" /-->
+			 </layout_panel>
+			 <layout_panel name="time_controls">
+					<button name="rewind"/>
+					<button label="" name="play" />
+					<button label="" name="pause" />
+					<button label="Parar" name="stop"/>
+					<button label="Avanzar" name="seek"/>
+			 </layout_panel>
+			 <layout_panel name="parcel_owner_controls">
+					<button label="Enviar URL actual a la parecela" name="assign"/>
+			 </layout_panel>
+			 <layout_panel name="external_controls">
+					<web_browser name="browser"/>
+					<button label="Abrir en mi Navegador externo" name="open_browser"/>
+					<check_box label="Abrir siempre en mi Navegador externo" name="open_always"/>
+					<!--button bottom="5" follows="bottom|right" height="20" label="Close" left="-70" name="close" width="70" /-->
+			 </layout_panel>
+	  </layout_stack>
+	  <string name="home_page_url">
+			 http://www.secondlife.com
+	  </string>
+	  <string name="support_page_url">
+			 http://wiki.secondlife.com/wiki/Knowledge_Base
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_media_filter.xml b/indra/newview/skins/default/xui/es/floater_media_filter.xml
new file mode 100644
index 000000000..088b7abb2
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_media_filter.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floatermediafilter" title="Filtro de Medios">
+	  <text name="info1" >
+			 Los dominios en Negrita están en la lista permanente (ej.: en lista blanca o lista negra).
+	  </text>
+	  <text name="info2" >
+			 Los dominios en itálica están en la lista de sesión (ej: permitidos o denegados temporariamente).
+	  </text>
+	  <scroll_list name="whitelist_list" >
+			 <column name="whitelist_col" label="Dominios Permitidos u objetos del servidor" />
+	  </scroll_list>
+	  <scroll_list name="blacklist_list" >
+			 <column name="blacklist_col" label="Dominios bloqueados u objetos del servidor" />
+	  </scroll_list>
+	  <button name="add_whitelist" label="Añadir..." tool_tip="Añadir un servidor a la Lista Blanca"/>
+	  <button name="remove_whitelist" label="Quitar" tool_tip="Quitar el servidor seleccionado de la Lista Blanca"/>
+	  <button name="clear_lists" label="Limpiar Listas" tool_tip="Limpiar todas las Listas" />
+	  <button name="show_ips" label="Mostrar IPs" tool_tip="Mostrar las direcciones IP asociadas a cada nombre de dominio (Hace que el visor entre en paus mientras actualiza la lista debido a la búsqueda de DNSs)"/>
+	  <button name="add_blacklist" label="Añadir..." tool_tip="Añadir un server a la Lista Negra"/>
+	  <button name="remove_blacklist" label="Quitar" tool_tip="Quitar el servidor seleccionado de la Lista Negra"/>
+	  <text name="add_text">
+			 Nuevo dominio:
+	  </text>
+	  <check_box name="match_ip" label="Añadir/Quitar IP coincidente" tool_tip="Añadir o Quitar cualquier IP asociada con un nombre de dominio agregado o quitado"/>
+	  <line_editor name="input_domain" tool_tip="Ingresa la nueva URL, nombre de dominio, IP o ruta HTTP del servidor del objeto con script"/>
+	  <button name="commit_domain" label="Añadir" tool_tip="Añadir a la Lista"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_mem_leaking.xml b/indra/newview/skins/default/xui/es/floater_mem_leaking.xml
new file mode 100644
index 000000000..dbc695e74
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_mem_leaking.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="MemLeak" title="Simulación de Fuga de Memoria">
+	  <spinner label="Velocidad de fuga (bytes por cuadro):" name="leak_speed"/>
+	  <spinner label="Fuga Máxima de Memoria (MB):" name="max_leak"/>
+	  <text name="total_leaked_label">
+			 Memoria fugada actualmente: [SIZE] KB
+	  </text>	
+	  <text name="note_label_1">
+			 [NOTE1]
+	  </text>
+	  <text name="note_label_2">
+			 [NOTE2]
+	  </text>	
+	  <button label="Iniciar" name="start_btn"/>
+	  <button label="Detener" name="stop_btn"/>
+	  <button label="Liberar" name="release_btn"/>
+	  <button label="Cerrar"  name="close_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_message_builder.xml b/indra/newview/skins/default/xui/es/floater_message_builder.xml
new file mode 100644
index 000000000..e75916d4e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_message_builder.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Message Builder" title="Constructor de Mensajes" >
+	  <scroll_list name="net_list">
+			 <column name="text" label="texto" />
+			 <column name="state" label="Estado" />
+	  </scroll_list>
+	  <combo_box name="untrusted_message_combo" tool_tip="No Seguro">
+	  </combo_box>
+	  <combo_box name="trusted_message_combo" tool_tip="Seguro">
+	  </combo_box>
+	  <text_editor name="message_edit" >
+	  </text_editor>
+	  <button name="send_btn" label="Enviar" tool_tip="Enviar (Ctrl+Intro)"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_message_log.xml b/indra/newview/skins/default/xui/es/floater_message_log.xml
new file mode 100644
index 000000000..1e87c654c
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_message_log.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Message Log" title="Registro de Mensajes" >
+	  <scroll_list name="net_list">
+			 <column name="text" label="texto" />
+			 <column name="icon0" label="icon0"/>
+			 <column name="icon1" label="icon1"/>
+	  </scroll_list>
+	  <button name="filter_choice_btn" label="…"/>
+	  <line_editor name="filter_edit" />
+	  <button name="filter_apply_btn" label="✔"/>
+	  <button name="clear_log_btn" label="C"/>
+	  <scroll_list name="message_log">
+			 <column name="sequence" label="secuencia"/>
+			 <column name="type" label="tipo"/>
+			 <column name="direction" label="dirección"/>
+			 <column name="net" label="red"/>
+			 <column name="name" label="nombre"/>
+			 <!--<column name="flag_zer" label="zer" width="8"/>
+			 <column name="flag_rel" label="rel" width="8"/>
+			 <column name="flag_rsd" label="rsd" width="8"/>
+			 <column name="flag_ack" label="ack" width="8"/>-->
+			 <column name="summary" label="sumario"/>
+	  </scroll_list>
+	  <text name="log_status_text">
+	  </text>
+	  <text_editor name="net_info" >
+	  </text_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_mini_map.xml b/indra/newview/skins/default/xui/es/floater_mini_map.xml
new file mode 100644
index 000000000..185252e45
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_mini_map.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="minimap" >
+	  <panel label="Mini Mapa" name="mini_mapview" tool_tip="(haz doble click para abrir el Mapa, Mayus+Click y arrastra para desplazar)"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_moveview.xml b/indra/newview/skins/default/xui/es/floater_moveview.xml
new file mode 100644
index 000000000..97a963be0
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_moveview.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="move floater" title="">
+	  <button label="" label_selected="" name="turn left btn" tool_tip="Girar a la Izquierda" />
+	  <button label="" label_selected="" name="turn right btn" tool_tip="Girar a la Derecha" />
+	  <button label="" label_selected="" name="move up btn" tool_tip="Saltar o iniciar vuelo" />
+	  <button label="" label_selected="" name="move down btn" tool_tip="Agacharse o Descender"/>
+	  <!--
+	  <button bottom="-54" control_name="FlyBtnState" enabled="true" follows="left|bottom"
+			 font="SansSerif" halign="center" height="20" label="Fly"
+			 label_selected="Fly" left="116" mouse_opaque="true" name="fly btn"
+			 scale_image="true" tool_tip="Start or stop flying" width="65" />
+	  -->
+	  <joystick_slide name="slide left btn" tool_tip="Moverse a la Izquierda" />
+	  <joystick_slide name="slide right btn" tool_tip="Moverse a la Derecha" />
+	  <joystick_turn name="forward btn" tool_tip="Avanzar" />
+	  <joystick_turn name="backward btn" tool_tip="Retroceder" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_mute.xml b/indra/newview/skins/default/xui/es/floater_mute.xml
new file mode 100644
index 000000000..491b34091
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_mute.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="mute floater" short_title="Lista de Ignorados" title="Residentes y Objetos Ignorados">
+	  <scroll_list name="mutes" tool_tip="Lista de residentes ignorados actualmente" />
+	  <button label="Residente Ignorado..." label_selected="Residente Ignorado..." name="Mute resident..." tool_tip="Selecciona un residente para ignorar" />
+	  <button label="Ignorar objeto por su nombre..." label_selected="Ignorar objeto por su nombre..." name="Mute object by name..."/>
+	  <button label="No Ignorar" label_selected="No Ignorar" name="Unmute" tool_tip="Quitar un residente u objeto de la lista de ignorados" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_mute_object.xml b/indra/newview/skins/default/xui/es/floater_mute_object.xml
new file mode 100644
index 000000000..7bcfba5eb
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_mute_object.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="mute by name" title="Ignorar Objeto por su Nombre">
+	  <text name="message">
+			 Ignorar según el nombre sólo afecta al chat y los MI del
+objeto, no a sus sonidos. 
+Debes escribir exactamente el nombre del objeto.	  
+	  </text>
+	  <line_editor name="object_name">
+			 Nombre del Objeto
+	  </line_editor>
+	  <button label="Ok" name="OK"/>
+	  <button label="Cancelar" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_my_friends.xml b/indra/newview/skins/default/xui/es/floater_my_friends.xml
new file mode 100644
index 000000000..80b2d14f1
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_my_friends.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_my_friends" title="Contactos">
+	  <tab_container name="friends_and_groups" >
+			 <panel label="Amigos" name="friends_panel"/>
+			 <panel label="Grupos" name="groups_panel"/>
+	  </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_name_description.xml b/indra/newview/skins/default/xui/es/floater_name_description.xml
new file mode 100644
index 000000000..e02262097
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_name_description.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Name/Description">
+	  <text name="name_label">
+			 Nombre:
+	  </text>
+	  <line_editor name="name_form"/>
+	  <text name="description_label">
+			 Descripción:
+	  </text>
+	  <line_editor name="description_form"/>
+	  <button label="Cancelar" name="cancel_btn"/>
+	  <button label="Subir ([UPLOADFEE])" name="ok_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_new_im.xml b/indra/newview/skins/default/xui/es/floater_new_im.xml
new file mode 100644
index 000000000..55ccd342d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_new_im.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater label="Nuevo MI" name="New IM" title="Nuevo MI">
+	  <name_list name="user_list"/>
+	  <button label="Iniciar" label_selected="Iniciar" name="start_btn"/>
+	  <button label="Cerrar" label_selected="Cerrar" name="close_btn"/>
+	  <string name="online_descriptor">
+			 (en línea)
+	  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_new_local_inventory.xml b/indra/newview/skins/default/xui/es/floater_new_local_inventory.xml
new file mode 100644
index 000000000..e86cb1a2a
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_new_local_inventory.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="item properties" title="Propiedades de los Items del Inventario">
+	  <text name="LabelItemNameTitle">
+			 Nombre:
+	  </text>
+	  <line_editor name="name_line"/>
+	  <text name="LabelItemDescTitle">
+			 Descripción:
+	  </text>
+	  <line_editor name="desc_line"/>
+	  <text name="LabelAssetTitle">
+			 Asset:
+	  </text>
+	  <line_editor name="asset_id_line"/>
+	  <text name="LabelCreatorTitle">
+			 Creador:
+	  </text>
+	  <line_editor name="creator_id_line"/>
+	  <text name="LabelOwnerTitle">
+			 Propietario:
+	  </text>
+	  <line_editor name="owner_id_line"/>
+	  <combo_box name="type_combo">
+			 <combo_item name="texture" value="texture">
+					textura
+			 </combo_item>
+			 <combo_item name="sound" value="sound">
+					sonido
+			 </combo_item>
+			 <combo_item name="callcard" value="callcard">
+					tarjeta de llamada
+			 </combo_item>
+			 <combo_item name="landmark" value="landmark">
+					hito
+			 </combo_item>
+			 <combo_item name="script" value="script">
+					script
+			 </combo_item>
+			 <combo_item name="clothing" value="clothing">
+					Ropa
+			 </combo_item>
+			 <combo_item name="object" value="object">
+					objeto
+			 </combo_item>
+			 <combo_item name="notecard" value="notecard">
+					nota
+			 </combo_item>
+			 <combo_item name="category" value="category">
+					categoría
+			 </combo_item>
+			 <combo_item name="root" value="root">
+					raíz
+			 </combo_item>
+			 <combo_item name="lsltext" value="lsltext">
+					lsltext
+			 </combo_item>
+			 <combo_item name="lslbyte" value="lslbyte">
+					lslbyte
+			 </combo_item>
+			 <combo_item name="txtr_tga" value="txtr_tga">
+					txtr_tga
+			 </combo_item>
+			 <combo_item name="bodypart" value="bodypart">
+					parte de cuerpo
+			 </combo_item>
+			 <combo_item name="trash" value="trash">
+					papelera
+			 </combo_item>
+			 <combo_item name="snapshot" value="snapshot">
+					foto
+			 </combo_item>
+			 <combo_item name="lstndfnd" value="lstndfnd">
+					lstndfnd
+			 </combo_item>
+			 <combo_item name="snd_wav" value="snd_wav">
+					snd_wav
+			 </combo_item>
+			 <combo_item name="img_tga" value="img_tga">
+					img_tga
+			 </combo_item>
+			 <combo_item name="jpeg" value="jpeg">
+					jpeg
+			 </combo_item>
+			 <combo_item name="animatn" value="animatn">
+					animación
+			 </combo_item>
+			 <combo_item name="gesture" value="gesture">
+					gesto
+			 </combo_item>
+			 <combo_item name="simstate" value="simstate">
+					simstate
+			 </combo_item>
+	  </combo_box>
+	  <check_box label="Abrir inmediatamente" name="chk_open"/>
+	  <button label="OK" name="ok_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_new_outfit_dialog.xml b/indra/newview/skins/default/xui/es/floater_new_outfit_dialog.xml
new file mode 100644
index 000000000..a5a2a3578
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_new_outfit_dialog.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container" title="" >
+	  <button label="Guardar" label_selected="Guardar" name="Save"/>
+	  <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	  <check_box label="Forma" name="checkbox_shape"/>
+	  <check_box label="Piel" name="checkbox_skin"/>
+	  <check_box label="Pelo" name="checkbox_hair"/>
+	  <check_box label="Ojos" name="checkbox_eyes"/>
+	  <text name="Options:">
+			 Opciones:
+	  </text>
+	  <!--<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
+			 height="16" initial_value="false" label="Rename Clothing To Folder Name"
+			 left="13" mouse_opaque="true" name="rename" radio_style="false" width="210" />-->
+	  <check_box name="checkbox_use_outfits" label="Usar Carpetas de Vestuario del  Viewer 2" />
+	  <check_box name="checkbox_use_links" label="Usar enlaces para item no copiables, no modificables o de punto multiple" />
+	  <check_box label="Camisa" name="checkbox_shirt"/>
+	  <check_box label="Pantalones" name="checkbox_pants"/>
+	  <check_box label="Zapatos" name="checkbox_shoes"/>
+	  <check_box label="Medias" name="checkbox_socks"/>
+	  <check_box label="Chaqueta" name="checkbox_jacket"/>
+	  <check_box label="Guantes" name="checkbox_gloves"/>
+	  <check_box label="Camiseta" name="checkbox_undershirt"/>
+	  <check_box label="Ropa Interior" name="checkbox_underpants"/>
+	  <check_box label="Flada" name="checkbox_skirt"/>
+	  <check_box label="Tatuaje" name="checkbox_tattoo"/>
+	  <check_box label="Alfa" name="checkbox_alpha"/>
+	  <check_box label="Física" name="checkbox_physics"/>
+	  <check_box label="Pecho" name="checkbox_Chest"/>
+	  <check_box label="Cráneo" name="checkbox_Skull"/>
+	  <check_box label="Hombro Izquierdo" name="checkbox_Left Shoulder"/>
+	  <check_box label="Hombro Derecho" name="checkbox_Right Shoulder"/>
+	  <check_box label="Mano Izquierda" name="checkbox_Left Hand"/>
+	  <check_box label="Mano Derecha" name="checkbox_Right Hand"/>
+	  <check_box label="Pié Izquierdo" name="checkbox_Left Foot"/>
+	  <check_box label="Pié Derecho" name="checkbox_Right Foot"/>
+	  <check_box label="Columna" name="checkbox_Spine"/>
+	  <check_box label="Pelvis" name="checkbox_Pelvis"/>
+	  <check_box label="Boca" name="checkbox_Mouth"/>
+	  <check_box label="Mentón" name="checkbox_Chin"/>
+	  <check_box label="Oreja Izquierda" name="checkbox_Left Ear"/>
+	  <check_box label="Oreja Derecha" name="checkbox_Right Ear"/>
+	  <check_box label="Globo Ocular Izquierdo" name="checkbox_Left Eyeball"/>
+	  <check_box label="Globo Ocular Derecho" name="checkbox_Right Eyeball"/>
+	  <check_box label="Nariz" name="checkbox_Nose"/>
+	  <check_box label="Brazo Derecho" name="checkbox_R Upper Arm"/>
+	  <check_box label="Antebrazo Derecho" name="checkbox_R Forearm"/>
+	  <check_box label="Brazo Izquierdo" name="checkbox_L Upper Arm"/>
+	  <check_box label="Antebrazo Izquierdo" name="checkbox_L Forearm"/>
+	  <check_box label="Cadera Derecha" name="checkbox_Right Hip"/>
+	  <check_box label="Muslo Derecho" name="checkbox_R Upper Leg"/>
+	  <check_box label="Pierna Derecha" name="checkbox_R Lower Leg"/>
+	  <check_box label="Cadera Izquierda" name="checkbox_Left Hip"/>
+	  <check_box label="Muslo Izquierdo" name="checkbox_L Upper Leg"/>
+	  <check_box label="Pierna Izquierda" name="checkbox_L Lower Leg"/>
+	  <check_box label="Estómago" name="checkbox_Stomach"/>
+	  <check_box label="Pectoral Izquierdo" name="checkbox_Left Pec"/>
+	  <check_box label="Pectoral Derecho" name="checkbox_Right Pec"/>
+	  <check_box label="Cuello" name="checkbox_Neck"/>
+	  <check_box label="Root" left="413" name="checkbox_Root"/>
+	  <check_box label="Centro 2" name="checkbox_Center 2"/>
+	  <check_box label="Superior Derecha" name="checkbox_Top Right"/>
+	  <check_box label="Arriba" name="checkbox_Top"/>
+	  <check_box label="Superior Izquierda" name="checkbox_Top Left"/>
+	  <check_box label="CentrO" name="checkbox_Center"/>
+	  <check_box label="Inferior Izquierdo" name="checkbox_Bottom Left"/>
+	  <check_box label="Abajo" name="checkbox_Bottom"/>
+	  <check_box label="Inferior Derecha" name="checkbox_Bottom Right"/>
+	  <text name="Make New Outfit">
+			 Hacer Nuevo Vestuario
+	  </text>
+	  <text 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.">
+			 Los Vestuarios son carpetas que contienen ropas y partes de cuerpo.
+Arrastra una carpeta de Vestuario a tu avatar para verstirtelo.			 
+
+&quot;Hacer Nuevo Vestuario&quot; crea una carpeta nueva y guarda en ella
+los items que actualmente tienes vestidos.
+	  </text>
+	  <text name="Folder name:">
+			 Nombre de Carpeta:
+	  </text>
+	  <text name="Items to include in outfit:">
+			 Items a incluir en el vestuario:
+	  </text>
+	  <button label="Marcar Todo" name="Check All"/>
+	  <button label="Desmarcar Todo" name="Uncheck All"/>
+	  <text name="Body Parts:">
+			 Partes del Cuerpo:
+	  </text>
+	  <text name="Clothes:">
+			 Ropas:
+	  </text>
+	  <text name="Attachments:">
+			 Accesorios:
+	  </text>
+	  <line_editor name="name ed">
+			 Nuevo Vestuario
+	  </line_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_notification.xml b/indra/newview/skins/default/xui/es/floater_notification.xml
new file mode 100644
index 000000000..39bd8e680
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_notification.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater title="Consola de Notificaciones" name="notification">
+	  <text_editor name="payload" >
+			 Cargando...
+	  </text_editor>
+	  <combo_box label="Respuesta" name="response" >
+	  </combo_box>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_notifications_console.xml b/indra/newview/skins/default/xui/es/floater_notifications_console.xml
new file mode 100644
index 000000000..c3e180c1c
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_notifications_console.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater title="Consola de Notificaciones" name="notifications_console">
+	  <combo_box name="notification_types" label="Elige el tipo de Notificación"/>
+	  <button name="add_notification" label="Añadir"/>
+	  <layout_stack name="notification_channels" >
+	  </layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_object_backup.xml b/indra/newview/skins/default/xui/es/floater_object_backup.xml
new file mode 100644
index 000000000..990f8d5e3
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_object_backup.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Import" title="Progreso de la Importación">
+	  <text name="name_label"> 
+			 Progreso
+	  </text>  
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_object_im_info.xml b/indra/newview/skins/default/xui/es/floater_object_im_info.xml
new file mode 100644
index 000000000..305b5e11c
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_object_im_info.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="object im info" title="Información del Objeto" >
+	  <text name="LabelItemNameTitle">
+			 Objeto:
+	  </text>
+	  <text name="ObjectName"/>
+	  <text name="LabelSlurlTitle">
+			Ubicación:
+	  </text>
+	  <text name="Slurl"/>
+	  <!-- A new viewer talking to an old sim will not have a slurl available and will show this. -->
+	  <text name="Unknown_Slurl">
+			 (Información de la ubicación no disponible)
+	  </text>
+	  <text name="LabelOwnerNameTitle">
+			 Propietario:
+	  </text>
+	  <text name="OwnerName"/>
+	  <button label="Ignorar al Propietario" label_selected="Ignorar al Propietario" name="Mute"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_openobject.xml b/indra/newview/skins/default/xui/es/floater_openobject.xml
new file mode 100644
index 000000000..db5c404ee
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_openobject.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="objectcontents" title="Contenido del Objeto">
+	  <panel name="object_contents"/>
+	  <text name="object_name">
+			 [DESC]:
+	  </text>
+	  <button label="Copiar al Inventario" label_selected="Copiar al Inventario" name="copy_to_inventory_button"/>
+	  <button label="Copiar y Vestirse" label_selected="Copiar y Vestirse" name="copy_and_wear_button"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pay.xml b/indra/newview/skins/default/xui/es/floater_pay.xml
new file mode 100644
index 000000000..eef3b9982
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_pay.xml
@@ -0,0 +1,26 @@
+<?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$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="Pagar" label_selected="Pagar" name="pay btn"/>
+	  <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
+	  <text name="payee_label" width="150">
+			 Pagar al Residente:
+	  </text>
+	  <text name="payee_name" left="130">
+			 [NAME]
+	  </text>
+	  <text name="fastpay text">
+			 Pago Rápido:
+	  </text>
+	  <text name="message text" >
+			 Mensaje:
+	  </text>
+	  <line_editor name="message" />
+	  <text name="amount text">
+			 Importe:
+	  </text>
+	  <line_editor name="amount" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pay_object.xml b/indra/newview/skins/default/xui/es/floater_pay_object.xml
new file mode 100644
index 000000000..75283e834
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_pay_object.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Give Money" title="">
+	  <text name="payee_group">
+			 Pagar al Grupo:
+	  </text>
+	  <text name="payee_resident" left="10" width="110">
+			 Pagar al Residente:
+	  </text>
+	  <text name="payee_name" left="125">
+			 [NAME]
+	  </text>
+	  <text name="object_name_label" left="10" width="80">
+			 Vía el Objeto:
+	  </text>
+	  <text name="object_name_text" left="95">
+			 ...
+	  </text>
+	  <text name="fastpay text" left="5">
+			 Pago Rápido:
+	  </text>
+	  <text name="amount text">
+			 Importe:
+	  </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="Pagar" label_selected="Pagar" name="pay btn"/>
+	  <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
+	  <line_editor name="amount"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_perm_prefs.xml b/indra/newview/skins/default/xui/es/floater_perm_prefs.xml
new file mode 100644
index 000000000..fd0b8de3f
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_perm_prefs.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="perm prefs" title="Permisos de subida por defecto" >
+	  <panel label="Permisos" name="permissions" >
+			 <button name="help" label="?" label_selected="?" />
+			 <check_box label="Compartir con el Grupo" name="share_with_group"/>
+			 <check_box label="Permitir copiar a cualquiera" name="everyone_copy"/>
+			 <text name="NextOwnerLabel">
+					El Próximo propietario puede:
+			 </text>
+			 <check_box label="Modificar" name="next_owner_modify"/>
+			 <check_box label="Copiar" name="next_owner_copy"/>
+			 <check_box label="Venderlo/Darlo" name="next_owner_transfer"/>
+	  </panel>
+	  <button label="OK" label_selected="OK"name="ok"/>
+	  <button label="Cancelar" label_selected="Cancelar" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_post_process.xml b/indra/newview/skins/default/xui/es/floater_post_process.xml
new file mode 100644
index 000000000..aef810211
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_post_process.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Post-Process Floater" title="Configuración de Post Procesado">
+	  <tab_container name="Post-Process Tabs">
+			 <panel label="Filtro de Color" name="ColorFilterPanel">
+					<check_box label="Activar" name="enable_color_filter"/>
+					<text name="ColorFilterGammaText">
+						  Gama
+					</text>
+					<slider label="" name="gamma" />
+					<text name="ColorFilterBrightnessText">
+						  Brillo
+					</text>
+					<slider label="" name="brightness" />
+					<text name="ColorFilterSaturationText">
+						  Saturación
+					</text>
+					<slider label="" name="saturation"/>
+					<text name="ColorFilterContrastText">
+						  Contraste
+					</text>
+					<slider label="" name="contrast"/>
+					<text name="ColorFilterBaseText">
+						  Color base del contraste
+					</text>
+					<slider label="R" name="contrast_base[0]"/>
+					<slider label="G" name="contrast_base[1]"/>
+					<slider label="B" name="contrast_base[2]"/>
+					<slider label="I" name="contrast_base[3]"/>
+			 </panel>
+			 <panel label="Desenfoque Gaussiano" name="GaussBlurPanel">
+					<check_box label="Activar" name="enable_gauss_blur"/>
+					<text name="GaussBlurPassesText">
+						  Pasos a aplicar
+					</text>
+					<slider label="" name="gauss_blur_passes"/>
+			 </panel>
+		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
+		     label="Night Vision" left="1" mouse_opaque="false"
+		     name="NightVisionPanel" width="398">
+			<check_box bottom="-20" follows="left|top"
+			     font="SansSerifSmall" height="16" initial_value="false" label="Enable"
+			     left="14" mouse_opaque="true" name="enable_night_vision" width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16" 
+			     left="10" mouse_opaque="true" name="NightVisionBrightMultText" v_pad="0"
+			     width="355">
+				Light Amplification Multiple
+			</text>
+			<slider bottom_delta="-30" can_edit_text="true"
+			     decimal_digits="3" follows="left"
+			     height="18" increment="0.01" initial_val="3.0" label="" left="14"
+			     max_val="10" min_val="1" mouse_opaque="true"
+			     name="brightness_multiplier" show_text="true" value="0.7" width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16" 
+			     left="10" mouse_opaque="true" name="NightVisionNoiseSizeText" v_pad="0"
+			     width="355">
+				Noise Size
+			</text>
+			<slider bottom_delta="-30" can_edit_text="true"
+			     decimal_digits="3" follows="left" height="18" increment="0.1"
+			     initial_val="1" label="" left="14" max_val="100" min_val="1"
+			     mouse_opaque="true" name="noise_size" show_text="true"
+			     value="1.0" width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16" 
+			     left="10" mouse_opaque="true" name="NightVisionNoiseStrengthText"
+			     v_pad="0" width="355">
+				Noise Strength
+			</text>
+			<slider bottom_delta="-30" can_edit_text="true" decimal_digits="3"
+			     follows="left" height="18" increment="0.01" initial_val="0.3" label=""
+			     left="14" max_val="1" min_val="0" mouse_opaque="true"
+			     name="noise_strength" show_text="true" value="1.0" width="200" />
+		</panel>
+		<!--<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
+		     label="Bloom" left="1" mouse_opaque="true"
+		     name="BloomPanel" width="398">
+			<check_box bottom="-20" control_name="BloomToggle" follows="left|top"
+			     font="SansSerifSmall" height="16" initial_value="false" label="Enable"
+			     left="14" mouse_opaque="true" name="BloomToggle" width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16" 
+			     left="10" mouse_opaque="true" name="BloomExtractText" v_pad="0"
+			     width="355">
+				Luminosity Extraction
+			</text>
+			<slider bottom_delta="-30" can_edit_text="true" control_name="BloomExtract"
+			     decimal_digits="3" follows="left" height="18" increment="0.01"
+			     initial_val="0.9" label="" left="14" max_val="1" min_val="0"
+			     mouse_opaque="true" name="BloomExtract" show_text="true" value="0.7"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16" 
+			     left="10" mouse_opaque="true" name="BloomSizeText" v_pad="0" width="355">
+				Bloom Size
+			</text>
+			<slider bottom_delta="-30" can_edit_text="true" control_name="BloomSize"
+			     decimal_digits="3" follows="left" height="18" increment="0.01"
+			     initial_val="3.0" label="" left="14" max_val="20" min_val="0"
+			     mouse_opaque="true" name="BloomSize" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16" 
+			     left="10" mouse_opaque="true" name="BloomStrengthText" v_pad="0"
+			     width="355">
+				Bloom Strength
+			</text>
+			<slider bottom_delta="-30" can_edit_text="true" control_name="BloomStrength"
+			     decimal_digits="3" follows="left" height="18" increment="0.01"
+			     initial_val="1.2" label="" left="14" max_val="10" min_val="0"
+			     mouse_opaque="true" name="BloomStrength" show_text="true" value="1.0"
+			     width="200" />
+		</panel>-->
+		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
+		     label="Extras" left="1" mouse_opaque="false" name="Extras"
+		     width="398">
+			<button bottom="-33" enabled="true" font="SansSerif" halign="center" height="20"
+			      label="LoadEffect" label_selected="LoadEffect" left="15"
+			     mouse_opaque="true" name="PPLoadEffect" scale_image="true" width="100" />
+			<button bottom="-60" enabled="true" font="SansSerif" halign="center" height="20"
+			      label="SaveEffect" label_selected="SaveEffect" left="15"
+			     mouse_opaque="true" name="PPSaveEffect" scale_image="true" width="100" />
+			<combo_box allow_text_entry="false" bottom="-33" follows="left|top" height="18"
+			     left_delta="120" max_chars="20" mouse_opaque="true" name="PPEffectsCombo"
+			     width="150" />
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-75"
+			     enabled="true" follows="left|right|bottom" font="SansSerif"
+			     handle_edit_keys_directly="false" height="20"
+			     label="Effect Name" left="135" max_length="40" mouse_opaque="true"
+			     name="PPEffectNameEditor" select_all_on_focus_received="false"
+			     select_on_focus="false" tab_group="1" width="150" />
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_postcard.xml b/indra/newview/skins/default/xui/es/floater_postcard.xml
new file mode 100644
index 000000000..b6aabcf94
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_postcard.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="false"
+     can_resize="true" height="380" min_height="380" min_width="450"
+     name="Postcard" title="Email Snapshot" width="450">
+	<text bottom="-35" follows="top|left" font="SansSerif" left="12" name="to_label">
+		Recipient&apos;s Email:
+	</text>
+	<line_editor bottom_delta="-6" follows="left|top" height="20" left="120" max_length="254"
+	     name="to_form" width="150" />
+	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="12"
+	     name="from_label">
+		Your Email:
+	</text>
+	<line_editor bottom_delta="-6" follows="left|top" height="20" left="120" max_length="254"
+	     name="from_form" width="150" />
+	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="12"
+	     name="name_label">
+		Your Name:
+	</text>
+	<line_editor bottom_delta="-6" follows="left|top" height="20" left="120" max_length="100"
+	     name="name_form" width="150" />
+	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="12"
+	     name="subject_label">
+		Subject:
+	</text>
+	<line_editor bottom_delta="-6" follows="left|top" height="20"
+	     label="Type your subject here." left="120" max_length="100"
+	     name="subject_form" width="150" spell_check="true" />
+	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="12"
+	     name="msg_label">
+		Message:
+	</text>
+	<text_editor bottom_delta="-150" follows="left|top|right|bottom" height="140" left="12"
+	     max_length="700" name="msg_form" width="420" spell_check="true">
+		Type your message here.
+	</text_editor>
+	<text bottom_delta="-37" follows="left|bottom" font="SansSerifSmall" left="12"
+	     name="fine_print">
+		If your recipient joins our universe, you&apos;ll get a referral bonus.
+	</text>
+	<button bottom_delta="-32" follows="right|bottom" height="20" label="Cancel"
+	     name="cancel_btn" right="-10" width="100" />
+	<button bottom_delta="0" follows="right|bottom" height="20" label="Send"
+	     left_delta="-106" name="send_btn" width="100" />
+	<string name="default_subject">
+    Postcard from [SECOND_LIFE].
+  </string>
+	<string name="default_message">
+		Check this out!
+	</string>
+	<string name="upload_message">
+	 "Sending..."
+	</string>	
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preferences.xml b/indra/newview/skins/default/xui/es/floater_preferences.xml
new file mode 100644
index 000000000..ea850207c
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_preferences.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-666" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" can_tear_off="true" default_tab_group="1" enabled="true"
+     height="510" left="330" min_height="213" min_width="324"
+     mouse_opaque="true" name="Preferences" title="Preferences" width="620">
+	<button bottom="-505" enabled="true" follows="right|bottom" font="SansSerif"
+	     halign="center" height="20" label="OK" label_selected="OK" left="335"
+	     mouse_opaque="true" name="OK" scale_image="true" width="90" />
+	<button bottom="-505" enabled="true" follows="right|bottom" font="SansSerif"
+	     halign="center" height="20" label="Cancel" label_selected="Cancel"
+	     left_delta="93" mouse_opaque="true" name="Cancel" scale_image="true"
+	     width="90" />
+	<button bottom="-505" enabled="true" follows="right|bottom" font="SansSerif"
+	     halign="center" height="20" label="Apply" label_selected="Apply"
+	     left_delta="93" mouse_opaque="true" name="Apply" scale_image="true"
+	     width="90" />
+	<button bottom="-505" enabled="true" follows="left|bottom" font="SansSerif"
+	     halign="center" height="20" label="About" label_selected="About" left="9"
+	     mouse_opaque="true" name="About..." scale_image="true" width="90" />
+	<button bottom="-505" enabled="true" follows="left|bottom" font="SansSerif"
+	     halign="center" height="20"
+	     help_url="http://secondlife.com/app/help/technical/preferences.php"
+	     label="Help" label_selected="Help" left_delta="93" mouse_opaque="true"
+	     name="Help" scale_image="true" width="90" />
+	<tab_container bottom="-466" enabled="true" follows="left|top|right|bottom" height="445"
+	     left="0" mouse_opaque="false" name="pref core" tab_group="1"
+	     tab_position="left" tab_width="120" width="620" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_animation.xml b/indra/newview/skins/default/xui/es/floater_preview_animation.xml
new file mode 100644
index 000000000..8eaf14b06
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_preview_animation.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-366" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" enabled="true" height="85" left="239" min_height="0"
+     min_width="0" mouse_opaque="true" name="preview_anim" width="300">
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
+	     enabled="true" follows="left|top|right" font="SansSerif"
+	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
+	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
+	     select_on_focus="false" width="194" spell_check="true" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
+	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
+		Description:
+	</text>
+	<!--<button bottom="-66" enabled="true" font="SansSerif" halign="center" height="19"
+	     label="Play in World" label_selected="Stop" left="27" mouse_opaque="true"
+	     name="Anim play btn" scale_image="true"
+	     tool_tip="Play this animation so that others can see it." width="96" />
+	<button bottom="-66" enabled="true" font="SansSerif" halign="center" height="19"
+	     label="Play Locally" label_selected="Stop" left="177" mouse_opaque="true"
+	     name="Anim audition btn" scale_image="true"
+	     tool_tip="Play this animation so that only you can see it." width="96" />-->
+	<button bottom="-66" enabled="true" font="SansSerif" halign="center" height="19"
+	     label="Play in World" label_selected="Stop" left="4" mouse_opaque="true"
+	     name="Anim play btn" scale_image="true"
+	     tool_tip="Play this animation so that others can see it." width="96" />
+	<button bottom="-66" enabled="true" font="SansSerif" halign="center" height="19"
+	     label="Play Locally" label_selected="Stop" left_delta="98" mouse_opaque="true"
+	     name="Anim audition btn" scale_image="true"
+	     tool_tip="Play this animation so that only you can see it." width="96" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_classified.xml b/indra/newview/skins/default/xui/es/floater_preview_classified.xml
new file mode 100644
index 000000000..3b116b3fe
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_preview_classified.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" enabled="true" height="510" left="242" min_height="480"
+     min_width="450" mouse_opaque="true" name="classified_preview"
+     rect_control="PreviewClassifiedRect" title="Classified Information"
+     width="440">
+	<panel bottom="20" follows="bottom|left" height="470" left="0"
+	     name="classified_details_panel" width="440" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_embedded_texture.xml b/indra/newview/skins/default/xui/es/floater_preview_embedded_texture.xml
new file mode 100644
index 000000000..951708401
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_preview_embedded_texture.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-338" can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" height="331" left="201" min_height="120" min_width="300" name="preview_texture" width="300">
+	<button bottom="-325" font="SansSerif" height="20" label="Copy To Inventory" left="105" name="Copy To Inventory" scale_image="true" width="172" />
+	<text bottom="30" font="SansSerifSmall" height="14" left="13" name="dimensions">Dimensions: [WIDTH] x [HEIGHT]</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_event.xml b/indra/newview/skins/default/xui/es/floater_preview_event.xml
new file mode 100644
index 000000000..8aab4676d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_preview_event.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" enabled="true" height="510" left="242" min_height="480"
+     min_width="450" mouse_opaque="true" name="event_preview"
+     rect_control="PreviewEventRect" title="Event Information" width="440">
+	<panel bottom="20" follows="bottom|left" height="470" left="0"
+	     name="event_details_panel" width="440" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_existing_landmark.xml b/indra/newview/skins/default/xui/es/floater_preview_existing_landmark.xml
new file mode 100644
index 000000000..efe3aca47
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_preview_existing_landmark.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" enabled="true" height="495" left="242" min_height="510"
+     min_width="460" mouse_opaque="true" name="existing_landmark_preview"
+     width="440">
+	<panel bottom="0" follows="bottom|left" height="475" left="0"
+	     name="place_details_panel" width="440" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
new file mode 100644
index 000000000..c596107a5
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="350" min_height="350" min_width="450"
+     name="gesture_preview" width="450">
+	<string name="step_anim" />
+	<string name="step_sound" />
+	<string name="step_chat" />
+	<string name="step_wait" />
+	<string name="stop_txt">
+		Stop
+	</string>
+	<string name="preview_txt">
+		Preview
+	</string>
+	<string name="none_text">
+		-- None --
+	</string>
+	<text bottom="-35" follows="top|left" font="SansSerif" left="16" name="desc_label">
+		Description:
+	</text>
+	<line_editor bottom_delta="-6" follows="left|top" height="20" left="100" max_length="254"
+	     name="desc" width="330" spell_check="true" />
+	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="16"
+	     name="trigger_label">
+		Trigger:
+	</text>
+	<line_editor bottom_delta="-6" follows="left|top" height="20" left="100" max_length="31"
+	     name="trigger_editor" width="105" />
+	<text bottom_delta="6" follows="top|left" font="SansSerif" left="220"
+	     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!">
+		Replace with:
+	</text>
+	<line_editor bottom_delta="-6" follows="left|top" height="20" left="300" max_length="31"
+	     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"
+	     width="130" spell_check="true" />
+	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="16"
+	     name="key_label">
+		Shortcut Key:
+	</text>
+	<combo_box bottom_delta="-6" follows="left|top" height="20" label="None" left="100"
+	     name="modifier_combo" width="50" />
+	<combo_box bottom_delta="0" follows="left|top" height="20" label="None" left_delta="60"
+	     name="key_combo" width="45" />
+	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="16" name="library_label">
+		Library:
+	</text>
+	<text bottom_delta="0" follows="top|left" font="SansSerif" left="220" name="steps_label">
+		Steps:
+	</text>
+	<scroll_list bottom_delta="-120" draw_border="true" follows="top|left" height="110"
+	     left="16" multi_select="false" name="library_list" width="100">
+		Animation
+Sound
+Chat
+Wait
+	</scroll_list>
+	<button bottom_delta="90" follows="top|left" height="20" label="Add &gt;&gt;"
+	     left="130" name="add_btn" width="80" />
+	<button bottom_delta="-30" follows="top|left" height="20" label="Move Up"
+	     left_delta="0" name="up_btn" width="80" />
+	<button bottom_delta="-30" follows="top|left" height="20" label="Move Down"
+	     left_delta="0" name="down_btn" width="80" />
+	<button bottom_delta="-30" follows="top|left" height="20" label="Remove" left_delta="0"
+	     name="delete_btn" width="80" />
+	<scroll_list bottom_delta="0" draw_border="true" follows="top|left" height="110" left="220"
+	     multi_select="false" name="step_list" width="210" />
+	<text bottom_delta="-70" follows="top|left" font="SansSerif" height="60" left="16"
+	     name="help_label">
+		All steps happen simultaneously, 
+unless you add wait steps.
+	</text>
+	<text bottom_delta="0" follows="top|left" height="60" left="222" name="options_text"
+	     width="205" />
+	<combo_box bottom_delta="20" follows="top|left" height="20" left_delta="10"
+	     name="animation_list" width="100" />
+	<combo_box bottom_delta="0" follows="top|left" height="20" left_delta="0"
+	     name="sound_list" width="100" />
+	<line_editor bottom_delta="0" follows="top|left" height="20" left_delta="0" max_length="127"
+	     name="chat_editor" width="100" spell_check="true" />
+	<radio_group bottom_delta="-20" draw_border="false" follows="top|left" height="40"
+	     left="340" name="animation_trigger_type" width="80">
+		<radio_item bottom_delta="-5" follows="left|top" height="16" left="3" mouse_opaque="true"
+		     width="80" name="start">
+			Start
+		</radio_item>
+		<radio_item bottom_delta="-10" follows="left|top" height="16" left="3" mouse_opaque="true"
+		     width="80" name="stop">
+			Stop
+		</radio_item>
+	</radio_group>
+	<check_box bottom_delta="25" follows="top|left" height="20"
+	     label="until animations are done" left="232" name="wait_anim_check"
+	     width="100" />
+	<check_box bottom_delta="-20" follows="top|left" height="20" label="time in seconds"
+	     left_delta="0" name="wait_time_check" width="100" />
+	<line_editor bottom_delta="0" follows="top|left" height="20" left_delta="105"
+	     max_length="15" name="wait_time_editor" width="50" />
+	<check_box bottom="7" follows="top|left" height="20" label="Active" left="140"
+	     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."
+	     width="100" />
+	<button bottom="5" follows="top|left" height="20" label="Preview" left_delta="80"
+	     name="preview_btn" width="80" />
+	<button bottom="5" follows="top|left" height="20" label="Save" left_delta="90"
+	     name="save_btn" width="80" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_new_landmark.xml b/indra/newview/skins/default/xui/es/floater_preview_new_landmark.xml
new file mode 100644
index 000000000..9e4bcc2e9
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_preview_new_landmark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="existing_landmark_preview">
+  <panel name="place_details_panel"/>
+    <button label="Descartar" name="Discard btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
new file mode 100644
index 000000000..5307864c6
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-762" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="true" enabled="true" follows="left|top" height="377" left="273"
+     min_height="259" min_width="234" mouse_opaque="true"
+     name="preview notecard" title="Note:" width="400">
+	<button bottom="-370" enabled="true" follows="left|bottom" font="SansSerif"
+	     halign="center" height="20" label="Get Items" label_selected="Get Items" left_delta="120"
+	     mouse_opaque="false" name="Get Items" scale_image="true" width="100" />
+	<!--<check_box follows="left|bottom" bottom_delta="0" left_delta="110" name="https_chk" label="Saves via HTTPS" />-->
+	<icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16"
+	     image_name="icon_lock.tga" left="344" mouse_opaque="true" name="lock"
+	     width="16" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
+	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
+		Description:
+	</text>
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
+	     enabled="true" follows="left|top|right" font="SansSerif"
+	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
+	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
+	     select_on_focus="false" width="294" spell_check="true" />
+	<menu_bar bottom="-56" drop_shadow="false" enabled="true" follows="left|top|right"
+	     height="18" left="8" mouse_opaque="false" name="motecard_menu" opaque="false"
+	     tear_off="false" width="220">
+		<menu bottom_delta="16" left="0" drop_shadow="true" enabled="true" height="198" width="150"
+		     mouse_opaque="false" name="Edit" opaque="true" tear_off="false">
+			<menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
+			     mouse_opaque="true" name="Undo" width="139" />
+			<menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"
+			     mouse_opaque="true" name="Redo" width="139" />
+			<menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator1" width="139" />
+			<menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0"
+			     mouse_opaque="true" name="Cut" width="139" />
+			<menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0"
+			     mouse_opaque="true" name="Copy" width="139" />
+			<menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0"
+			     mouse_opaque="true" name="Paste" width="139" />
+			<menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator2" width="139" />
+			<menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0"
+			     mouse_opaque="true" name="Select All" width="139" />
+			<menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0"
+			     mouse_opaque="true" name="Deselect" width="139" />
+			<menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator3" width="139" />
+			<menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."
+			     left="0" mouse_opaque="true" name="Search / Replace..." width="139" />
+		</menu>
+	</menu_bar>
+	<text_editor type="string" length="1" bottom="-344" embedded_items="true" enabled="true"
+	     follows="left|top|right|bottom" font="SansSerif" height="285"
+	     ignore_tab="false" left="4" max_length="65536" mouse_opaque="true"
+	     name="Notecard Editor" width="392" word_wrap="true" spell_check="true">
+		Loading...
+	</text_editor>
+	<button bottom="-370" enabled="false" follows="left|bottom" font="SansSerif"
+	     halign="center" height="20" label="Save" label_selected="Save" left="9"
+	     mouse_opaque="false" name="Save" scale_image="true" width="100" />
+	<string name="no_object">
+		Unable to find object containing this note.
+	</string>
+	<string name="not_allowed">
+		You are not allowed to view this note.
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_notecard_keep_discard.xml b/indra/newview/skins/default/xui/es/floater_preview_notecard_keep_discard.xml
new file mode 100644
index 000000000..96fd2633d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_preview_notecard_keep_discard.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-762" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="true" enabled="true" follows="left|top" height="377" left="273"
+     min_height="259" min_width="350" mouse_opaque="true"
+     name="preview notecard" title="Note:" width="400">
+	<icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16"
+	     image_name="icon_lock.tga" left="344" mouse_opaque="true" name="lock"
+	     width="16" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
+	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
+		Description:
+	</text>
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
+	     enabled="true" follows="left|top|right" font="SansSerif"
+	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
+	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
+	     select_on_focus="false" width="294" spell_check="true" />
+	<menu_bar bottom="-56" drop_shadow="false" enabled="true" follows="left|top|right"
+	     height="18" left="8" mouse_opaque="false" name="motecard_menu" opaque="false"
+	     tear_off="false" width="220">
+		<menu bottom_delta="16" left="0" drop_shadow="true" enabled="true" height="198" width="150"
+		     mouse_opaque="false" name="Edit" opaque="true" tear_off="false">
+			<menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
+			     mouse_opaque="true" name="Undo" width="139" />
+			<menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"
+			     mouse_opaque="true" name="Redo" width="139" />
+			<menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator1" width="139" />
+			<menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0"
+			     mouse_opaque="true" name="Cut" width="139" />
+			<menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0"
+			     mouse_opaque="true" name="Copy" width="139" />
+			<menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0"
+			     mouse_opaque="true" name="Paste" width="139" />
+			<menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator2" width="139" />
+			<menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0"
+			     mouse_opaque="true" name="Select All" width="139" />
+			<menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0"
+			     mouse_opaque="true" name="Deselect" width="139" />
+			<menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator3" width="139" />
+			<menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."
+			     left="0" mouse_opaque="true" name="Search / Replace..." width="139" />
+		</menu>
+	</menu_bar>
+	<text_editor type="string" length="1" bottom="-344" embedded_items="true" enabled="true"
+	     follows="left|top|right|bottom" font="SansSerif" height="285"
+	     ignore_tab="false" left="4" max_length="65536" mouse_opaque="true"
+	     name="Notecard Editor" width="392" word_wrap="true">
+		Loading...
+	</text_editor>
+	<button bottom="-370" enabled="true" follows="left|bottom" font="SansSerif"
+	     halign="center" height="20" label="Keep" label_selected="Keep" left="9"
+	     mouse_opaque="true" name="Keep" scale_image="true" width="100" />
+	<button bottom="-370" enabled="false" follows="left|bottom" font="SansSerif"
+	     halign="center" height="20" label="Save" label_selected="Save" left="114"
+	     mouse_opaque="false" name="Save" scale_image="true" width="100" />
+	<button bottom="-370" enabled="true" follows="left|bottom" font="SansSerif"
+	     halign="center" height="20" label="Discard" label_selected="Discard"
+	     left="219" mouse_opaque="true" name="Discard" scale_image="true"
+	     width="100" />
+	<string name="no_object">
+		Unable to find object containing this note.
+	</string>
+	<string name="not_allowed">
+		You are not allowed to view this note.
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_sound.xml b/indra/newview/skins/default/xui/es/floater_preview_sound.xml
new file mode 100644
index 000000000..0c422f1c8
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_preview_sound.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-85" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" enabled="true" height="85" left="176" min_height="0"
+     min_width="0" mouse_opaque="true" name="preview_sound" width="300">
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
+	     enabled="true" follows="left|top|right" font="SansSerif"
+	     handle_edit_keys_directly="false" height="19" left="95" max_length="127"
+	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
+	     select_on_focus="false" width="192" spell_check="true" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
+	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
+		Description:
+	</text>
+	<button bottom="-70" enabled="true" font="SansSerif" halign="center" height="19"
+	     label="Play Locally" label_selected="Play Locally" left="168"
+	     mouse_opaque="true" name="Sound audition btn" scale_image="true"
+	     sound_flags="0" tool_tip="Play this sound so that only you can hear it."
+	     width="120" />
+	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="19"
+	     label="Play in World" label_selected="Play in World" left_delta="-126"
+	     mouse_opaque="true" name="Sound play btn" scale_image="true"
+	     sound_flags="0" tool_tip="Play this sound so that others can hear it."
+	     width="120" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_texture.xml b/indra/newview/skins/default/xui/es/floater_preview_texture.xml
new file mode 100644
index 000000000..9a8681b7e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_preview_texture.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-331" can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" enabled="true" height="324" left="300" min_height="150" min_width="300" mouse_opaque="true" name="preview_texture" width="335">
+	<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="15"
+		left="13" mouse_opaque="true" name="desc txt" v_pad="0" width="80">
+			Description:
+	</text>
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-43" enabled="false"
+		follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="false" height="17" left="93" 
+		max_length="127" mouse_opaque="true" name="desc" select_all_on_focus_received="false" select_on_focus="false" 
+		width="229" spell_check="true" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
+		bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall" h_pad="0" 
+		halign="left" height="16" left="13" mouse_opaque="true" name="uuid txt" v_pad="0" width="80">
+			UUID:
+	</text>
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" enabled="false" 
+		follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="false" height="16" left="93" 
+		max_length="127" mouse_opaque="true" name="uuid" select_all_on_focus_received="false" select_on_focus="false" 
+		width="229" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
+		bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall" h_pad="0" 
+		halign="left" height="16" left="13" mouse_opaque="true" name="uploader txt" v_pad="0" width="80">
+			Uploaded by:
+	</text>
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" enabled="false" 
+		follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="false" height="16" left="93" 
+		right="-80" max_length="127" mouse_opaque="true" name="uploader" select_all_on_focus_received="false" 
+		select_on_focus="false" width="420" />
+	<button bottom_delta="-1" enabled="true" follows="right|top" font="SansSerifSmall" halign="center" height="18" 
+		label="Profile" right="320" mouse_opaque="true" name="openprofile" scale_image="true" width="60" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
+		bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall" 
+		h_pad="0" halign="left" height="16" left="13" mouse_opaque="true" name="uploadtime txt" v_pad="0" width="80">
+			Uploaded on:
+	</text>
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" enabled="false" 
+		follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="false" height="16" left="93" 
+		right="-80" max_length="127" mouse_opaque="true" name="uploadtime" select_all_on_focus_received="false" 
+		select_on_focus="false" width="420" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
+		bottom_delta="-1" drop_shadow_visible="true" enabled="true" follows="right|top" font="SansSerifSmall" 
+		h_pad="50" halign="left" height="16" right="345" mouse_opaque="true" name="alphanote" v_pad="0" width="80">
+			Loading...
+	</text>
+	<button bottom="8" enabled="true" follows="left|bottom" font="SansSerif" halign="center" height="20" 
+		label="Keep" label_selected="Keep" left="9" mouse_opaque="true" name="Keep" scale_image="true" width="100" />
+	<button bottom="8" enabled="true" follows="left|bottom" font="SansSerif" halign="center" height="20" 
+		label="Discard" label_selected="Discard" left="114" mouse_opaque="true" name="Discard" scale_image="true" width="100" />
+	<button bottom="8" enabled="true" follows="left|bottom" font="SansSerif" halign="center" height="20" 
+		label="Copy To Inventory" left="9" mouse_opaque="true" name="Copy To Inventory" scale_image="true" width="170" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
+		bottom="35" drop_shadow_visible="true" enabled="true" follows="left|bottom" font="SansSerifSmall" h_pad="0" 
+		halign="left" height="14" left="13" mouse_opaque="true" name="dimensions" v_pad="0" width="135">
+			Dimensions: [WIDTH] x [HEIGHT]
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
+		bottom="35" drop_shadow_visible="true" enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0" 
+		halign="right" height="14" left="86" mouse_opaque="true" name="aspect_ratio" v_pad="0" width="110">
+			Preview Aspect Ratio
+	</text>
+	<combo_box allow_text_entry="true" bottom="32" follows="right|bottom" height="20" left="202" max_chars="20" 
+		mouse_opaque="true" enabled="true" width="108" name="combo_aspect_ratio" tool_tip="Preview at a fixed aspect ratio">
+		<combo_item name="Unconstrained" value="Unconstrained">
+			Unconstrained
+		</combo_item>
+		<combo_item name="1:1" value="1:1" tool_tip="Group Insignia or 1st Life Profile">
+			1:1
+		</combo_item>
+		<combo_item name="4:3" value="4:3" tool_tip="2nd Life Profile">
+			4:3
+		</combo_item>
+		<combo_item name="10:7" value="10:7" tool_tip="Classifieds and search listings, landmarks">
+			10:7
+		</combo_item>
+		<combo_item name="3:2" value="3:2" tool_tip="About land">
+			3:2
+		</combo_item>
+		<combo_item name="16:10" value="16:10">
+			16:10
+		</combo_item>
+		<combo_item name="16:9" value="16:9" tool_tip="Profile Picks">
+			16:9
+		</combo_item>
+		<combo_item name="2:1" value="2:1">
+			2:1
+		</combo_item>
+	</combo_box>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_preview_texture_keep_discard.xml b/indra/newview/skins/default/xui/es/floater_preview_texture_keep_discard.xml
new file mode 100644
index 000000000..2c24f4519
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_preview_texture_keep_discard.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-331" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="true" enabled="true" height="331" left="176" min_height="120"
+     min_width="300" mouse_opaque="true" name="preview_texture" width="300">
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
+	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
+		Description:
+	</text>
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
+	     enabled="true" follows="left|top|right" font="SansSerif"
+	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
+	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
+	     select_on_focus="false" width="194" spell_check="true" />
+	<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
+	     halign="center" height="20" label="Keep" label_selected="Keep" left="9"
+	     mouse_opaque="true" name="Keep" scale_image="true" width="100" />
+	<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
+	     halign="center" height="20" label="Discard" label_selected="Discard"
+	     left="114" mouse_opaque="true" name="Discard" scale_image="true"
+	     width="100" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="30" drop_shadow_visible="true" enabled="true" follows="left|bottom"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
+	     mouse_opaque="true" name="dimensions" v_pad="0" width="163">
+		Dimensions: [WIDTH] x [HEIGHT]
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_url.xml b/indra/newview/skins/default/xui/es/floater_preview_url.xml
new file mode 100644
index 000000000..055a5fc5b
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_preview_url.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" enabled="true" height="495" mouse_opaque="true"
+     name="url_preview" rect_control="PreviewURLRect" title="Place Information"
+     width="440">
+	<panel bottom="0" follows="bottom|left" height="475" left="0"
+	     name="place_details_panel" width="440" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_price_for_listing.xml b/indra/newview/skins/default/xui/es/floater_price_for_listing.xml
new file mode 100644
index 000000000..873102394
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_price_for_listing.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="false"
+     can_resize="false" height="240" min_height="300" min_width="300"
+     name="price_for_listing" title="Publish Classified Ad" width="320">
+	<text bottom="-200" follows="top|left" font="SansSerif" height="165" left="15"
+	     name="explanation_text">
+		Your classified ad will run for one week from 
+the date it is published. 
+ 
+Your ad&apos;s position in the classified listings 
+is determined by how much you choose to pay.
+The highest paid ads go to the top of the list, 
+and appear higher in searches.
+	</text>
+	<text bottom="50" follows="top|left" font="SansSerif" height="20" left="15"
+	     name="price_text" width="120">
+		Price for Ad ([CURRENCY]):
+	</text>
+	<line_editor bottom_delta="2" follows="top|left" height="20" left="125" max_length="6"
+	     name="price_edit" width="60" />
+	<button bottom="13" follows="top|left" height="20" label="Cancel" left="205"
+	     name="cancel_btn" width="100" />
+	<button bottom_delta="0" follows="top|left" height="20" label="Set Price"
+	     left_delta="-106" name="set_price_btn" width="100" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_profile.xml b/indra/newview/skins/default/xui/es/floater_profile.xml
new file mode 100644
index 000000000..7a0cfd15f
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_profile.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="avatarinfo" title="Perfil">
+	<panel name="Panel Avatar"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_radar.xml b/indra/newview/skins/default/xui/es/floater_radar.xml
new file mode 100644
index 000000000..d0b67529b
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_radar.xml
@@ -0,0 +1,329 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="radar" title="Radar"
+	can_resize="true" can_minimize="true" can_close="true" can_drag_on_left="false"
+	rect_control="FloaterRadarRect" min_width="300"	min_height="300">
+
+	<scroll_list name="avatar_list"
+		    left="10" right="-10" top="-20" bottom="140" can_resize="true"
+		    column_padding="0" follows="left|top|bottom|right"
+		    draw_heading="true" multi_select="true" search_column="1"
+		    tool_tip="Hold shift or control while clicking to select multiple avatars">
+		<column name="marked" label="Mark" width="12" tool_tip="Marked avatars"/>
+		<column name="avatar_name" label="Name" width="150" tool_tip="Hold shift or control while clicking to select multiple avatars"/>
+		<column name="distance" label="Dist." width="48" tool_tip="Distance from your avatar (red=within chat range, yellow=within shout range, green=within draw distance)"/>
+		<column name="position" label="Pos." width="60" tool_tip="Position (X, Y) within this sim, or general direction (cardinal point) for outside sims"/>
+		<column name="altitude" label="Alt." width="48" tool_tip="Altitude"/>
+    <column name="activity" label="Act." width="24" tool_tip="Activity"/>
+    <column name="client" label="Client" width="80" dynamicwidth="true" tool_tip="Client the avatar is possibly using"/>
+	</scroll_list>
+
+	<tab_container border="false" bottom_delta="-130" height="120" left="6" mouse_opaque="false"
+		       name="actions_tab_container" tab_position="top" follows="left|right|bottom">
+		<panel border="true" bottom_delta="-130" follows="left|top|right|bottom" height="255"
+		       label="Avatar" left="1" mouse_opaque="true"
+		     name="actions_tab" width="398">
+			<!-- upper row -->
+			<button
+			       name="profile_btn"
+			       label="Profile"
+			       tool_tip="Show picture, groups, and other information"
+			       left="10"
+			       bottom_delta="-180"
+			       width="80"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />
+			<button
+			       name="track_btn"
+			       label="(Un)Track"
+			       tool_tip="Toggle tracking of this avatar's position"
+			       left_delta="90"
+			       bottom_delta="0"
+			       width="80"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />
+			<button
+			       name="get_key_btn"
+			       label="Get Key"
+			       tool_tip="Copies avatar's key to the clipboard"
+			       left_delta="90"
+			       bottom_delta="0"
+			       width="80"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />
+			<!-- upper middle row -->
+			<button
+			       name="im_btn"
+			       label="IM"
+			       tool_tip="Open Instant Message session"
+			       left="10"
+			       bottom_delta="-22"
+			       width="80"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />
+			<button
+			       name="offer_btn"
+			       label="Offer TP"
+			       tool_tip="Offer Teleport"
+			       left_delta="90"
+			       bottom_delta="0"
+			       width="80"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />
+			<button
+			       name="teleport_btn"
+			       label="TP to"
+			       tool_tip="Teleport to avatar's position"
+			       left_delta="90"
+			       bottom_delta="0"
+			       width="80"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />			
+			<!-- lower middle row-->
+			<button
+			       name="mark_btn"
+			       label="(Un)Mark"
+			       tool_tip="(Un)Mark this avatar in the list"
+			       left="10"
+			       bottom_delta="-22"
+			       width="80"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />
+			<button
+			       name="prev_marked_btn"
+			       label="Prev Marked"
+			       tool_tip="Focus camera on previous marked avatar"
+			       left_delta="90"
+			       bottom_delta="0"
+			       width="80"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />
+			<button
+			       name="next_marked_btn"
+			       label="Next Marked"
+			       tool_tip="Focus camera on next marked avatar"
+			       left_delta="90"
+			       bottom_delta="0"
+			       width="80"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />
+			<!-- lower row-->
+			<button
+			       name="focus_btn"
+			       label="Focus"
+			       tool_tip="Focus camera on this avatar in the list"
+			       left="10"
+			       bottom_delta="-22"
+			       width="80"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />
+			<button
+			       name="prev_in_list_btn"
+			       label="Previous"
+			       tool_tip="Focus camera on previous avatar in list"
+			       left_delta="90"
+			       bottom_delta="0"
+			       width="80"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />
+			<button
+			       name="next_in_list_btn"
+			       label="Next"
+			       tool_tip="Focus camera on next avatar in list"
+			       left_delta="90"
+			       bottom_delta="0"
+			       width="80"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />
+
+		</panel>
+
+		<panel border="true" bottom_delta="-150" follows="left|top|right|bottom" height="255"
+		       label="Alerts" left="1" mouse_opaque="true"
+		       name="alerts_tab" width="398">
+			<check_box height="16" label="Display alerts in chat"
+				   left="10" bottom_delta="-176" name="radar_alerts" 
+				   width="200" follows="bottom|left"
+				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+				   initial_value="true" enabled="true" radio_style="false" 
+				   control_name="RadarChatAlerts"
+				   tool_tip="Announce alerts about incoming and outgoing avatars in chat" />
+
+			<check_box height="16" label="Avatars entering/exiting the sim"
+				   left="20" bottom_delta="-18" name="alerts_sim"
+				   width="200" follows="bottom|left"
+				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+				   initial_value="true" enabled="true" radio_style="false"
+				   control_name="RadarAlertSim"
+				   tool_tip="Report avatars entering or exiting the sim" />
+
+			<check_box height="16" label="Avatars within/beyond the draw distance"
+				   left="20" bottom_delta="-18" name="alerts_draw"
+				   width="200" follows="bottom|left"
+				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+				   initial_value="true" enabled="true" radio_style="false"
+				   control_name="RadarAlertDraw"
+				   tool_tip="Report avatars getting within or beyond the draw distance" />
+
+			<check_box height="16" label="Avatars within/beyond the shout range"
+				   left="20" bottom_delta="-18" name="alerts_chat"
+				   width="200" follows="bottom|left"
+				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+				   initial_value="true" enabled="true" radio_style="false"
+				   control_name="RadarAlertShoutRange"
+				   tool_tip="Report avatars getting within or beyond the shout range" />
+
+			<check_box height="16" label="Avatars within/beyond the chat range"
+				   left="20" bottom_delta="-18" name="alerts_chat"
+				   width="200" follows="bottom|left"
+				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+				   initial_value="true" enabled="true" radio_style="false"
+				   control_name="RadarAlertChatRange"
+				   tool_tip="Report avatars getting within or beyond the chat range" />
+		</panel>
+
+		<panel border="true" bottom_delta="-130" follows="left|top|right|bottom" height="255"
+		       label="Moderation" left="1" mouse_opaque="true"
+		       name="land_tab" width="398">
+			
+			<!-- Upper row -->
+			<button
+			       name="mute_btn"
+			       label="(Un)Mute"
+			       tool_tip="Mute or unmute this avatar (muted avatars' names are highlighted in red in the list)."
+			       left="10"
+			       bottom_delta="-200"
+			       width="80"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />
+			<button
+			       name="freeze_btn"
+			       label="Freeze"
+			       tool_tip="Freeze the avatar, preventing it from moving"
+			       left_delta="90"
+			       bottom_delta="0"
+			       width="80"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />
+			<button
+			       name="ar_btn"
+			       label="AR"
+			       tool_tip="Report abuse on this avatar"
+			       left_delta="90"
+			       bottom_delta="0"
+			       width="80"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />
+			<!-- Lower row -->
+			<button
+			       name="eject_btn"
+			       label="Eject"
+			       tool_tip="Eject the avatar from the parcel"
+			       left="10"
+			       bottom_delta="-24"
+			       width="80"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />
+			
+			<button
+			       name="estate_eject_btn"
+			       label="Eject from estate"
+			       tool_tip="Eject this avatar from the estate"
+			       left_delta="90"
+			       bottom_delta="0"
+			       width="170"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />
+		</panel>
+
+		<panel border="true" bottom_delta="-150" follows="left|top|right|bottom" height="255"
+		       label="Options" left="1" mouse_opaque="true"
+		       name="options_tab" width="398">
+			<check_box height="16" label="Update"
+				   left="10" bottom_delta="-180" name="update_enabled_cb" 
+				   width="200" follows="bottom|left"
+				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+				   initial_value="true" enabled="true" radio_style="false" 
+				   tool_tip="Set whether the avatar list should update" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+				   bottom_delta="-24" drop_shadow_visible="true" enabled="true" font="SansSerifSmall" height="18" left="24"
+				   mouse_opaque="false" name="rate" width="30">
+					Rate:
+			</text>
+			<radio_group draw_border="true" bottom_delta="2" left_delta="44" follows="bottom|left" width="196" height="20"
+				   mouse_opaque="true" name="update_rate" control_name="RadarUpdateRate" enabled="true"
+				   tool_tip="Rate of the radar updates (eats up more FPS when higher)">
+				<radio_item type="string" length="1" bottom_delta="0" height="16" left_delta="4" mouse_opaque="true"
+		     		 	name="high" width="20" follows="bottom|left">
+					High
+				</radio_item>
+				<radio_item type="string" length="1" bottom_delta="0" height="16" left_delta="30" mouse_opaque="true"
+		     		 	name="medium" width="25" follows="bottom|left">
+					Medium
+				</radio_item>
+				<radio_item type="string" length="1" bottom_delta="0" height="16" left_delta="35" mouse_opaque="true"
+		     		 	name="low" width="20" follows="bottom|left">
+					Low
+				</radio_item>
+			</radio_group>
+			<check_box height="16" label="Announce even when closed"
+				   left="10" bottom_delta="-24" name="keep_open"
+				   width="200" follows="bottom|left"
+				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+				   initial_value="true" enabled="true" radio_style="false"
+				   control_name="RadarKeepOpen"
+				   tool_tip="Hides floater instead of closing to still announce in chat" />
+			<check_box height="16" label="Announce keys to HUD"
+				   left="10" bottom_delta="-20" name="radar_chat_keys" 
+				   width="200" follows="bottom|left"
+				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
+				   initial_value="true" enabled="true" radio_style="false" 
+				   control_name="RadarChatKeys"
+				   tool_tip="Set whether to send keys of avatars to LSL scripts" />
+			<button
+			       name="send_keys_btn"
+			       label="Announce now"
+			       tool_tip="Send all keys to HUD now"
+			       left_delta="150"
+			       bottom_delta="-2"
+			       width="100"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_region_info.xml b/indra/newview/skins/default/xui/es/floater_region_info.xml
new file mode 100644
index 000000000..31da354ac
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_region_info.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="regioninfo" title="Región/Estado">
+	<tab_container name="region_panels"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_report_abuse.xml b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
new file mode 100644
index 000000000..95e9ad79c
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
@@ -0,0 +1,246 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="590" min_height="100" min_width="100"
+     name="floater_report_abuse" title="Report Abuse" width="390">
+	<texture_picker allow_no_texture="true" bottom="-150" default_image_name="None"
+	     follows="left|top" height="114" label="" left="238" mouse_opaque="true"
+	     name="screenshot" width="134" />
+	<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Include screenshot" left="13"
+	     mouse_opaque="true" name="screen_check" width="116" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-48" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="reporter_title" v_pad="0" width="50">
+		Reporter:
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-48" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
+	     mouse_opaque="true" name="reporter_field" v_pad="0" width="150">
+		Loremipsum Dolorsitamut
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-64" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="sim_title" v_pad="0" width="60">
+		Region:
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-64" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
+	     mouse_opaque="true" name="sim_field" v_pad="0" width="120">
+		Region Name
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-80" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="pos_title" v_pad="0" width="50">
+		Position:
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-80" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
+	     mouse_opaque="true" name="pos_field" v_pad="0" width="120">
+		{128.1, 128.1, 15.4}
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="select_object_label" v_pad="0" width="220">
+		Click the button then the object:
+	</text>
+	<button bottom_delta="-30" font="SansSerif" halign="center" height="32" label=""
+	     label_selected="" left="16" mouse_opaque="true" name="pick_btn"
+	     tool_tip="Object Picker - Identify an object as the subject of this report"
+	     width="32" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="16" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="53"
+	     mouse_opaque="true" name="object_name_label" v_pad="0" width="60">
+		Name:
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="66"
+	     mouse_opaque="true" name="object_name" v_pad="0" width="109">
+		Consetetur Sadipscing
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="53"
+	     mouse_opaque="true" name="owner_name_label" v_pad="0" width="60">
+		Owner:
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="66"
+	     mouse_opaque="true" name="owner_name" v_pad="0" width="109">
+		Hendrerit Vulputate
+	</text>
+	<combo_box bottom_delta="-48" follows="left|top" height="20" left="16" mouse_opaque="true"
+	     name="category_combo"
+	     tool_tip="Category -- select the category that best describes this report"
+	     width="356">
+    <combo_item name="Select_category" value="0">
+    Select category
+    </combo_item><combo_item name="Age__Age_play" value="31">
+    Age > Age play
+    </combo_item><combo_item name="Age__Adult_resident_on_Teen_Second_Life" value="32">
+    Age > Adult resident on Teen Second Life
+    </combo_item><combo_item name="Age__Underage_resident_outside_of_Teen_Second_Life" value="33">
+    Age > Underage resident outside of Teen Second Life
+    </combo_item><combo_item name="Assault__Combat_sandbox___unsafe_area" value="34">
+    Assault > Combat sandbox / unsafe area
+    </combo_item><combo_item name="Assault__Safe_area" value="35">
+    Assault > Safe area
+    </combo_item><combo_item name="Assault__Weapons_testing_sandbox" value="36">
+    Assault > Weapons testing sandbox
+    </combo_item><combo_item name="Commerce__Failure_to_deliver_product_or_service" value="38">
+    Commerce > Failure to deliver product or service
+    </combo_item><combo_item name="Disclosure__Real_world_information" value="39">
+    Disclosure > Real world information
+    </combo_item><combo_item name="Disclosure__Remotely_monitoring chat" value="40">
+    Disclosure > Remotely monitoring chat
+    </combo_item><combo_item name="Disclosure__Second_Life_information_chat_IMs" value="41">
+    Disclosure > Second Life information/chat/IMs
+    </combo_item><combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources" value="42">
+    Disturbing the peace > Unfair use of region resources
+    </combo_item><combo_item name="Disturbing_the_peace__Excessive_scripted_objects" value="43">
+    Disturbing the peace > Excessive scripted objects
+    </combo_item><combo_item name="Disturbing_the_peace__Object_littering" value="44">
+    Disturbing the peace > Object littering
+    </combo_item><combo_item name="Disturbing_the_peace__Repetitive_spam" value="45">
+    Disturbing the peace > Repetitive spam
+    </combo_item><combo_item name="Disturbing_the_peace__Unwanted_advert_spam" value="46">
+    Disturbing the peace > Unwanted advert spam
+    </combo_item><combo_item name="Fraud__L$" value="47">
+    Fraud > L$
+    </combo_item><combo_item name="Fraud__Land" value="48">
+    Fraud > Land
+    </combo_item><combo_item name="Fraud__Pyramid_scheme_or_chain_letter" value="49">
+    Fraud > Pyramid scheme or chain letter
+    </combo_item><combo_item name="Fraud__US$" value="50">
+    Fraud > US$
+    </combo_item><combo_item name="Ridiculous3" value="71">
+    Freud > User has taken an interest in their mother
+    </combo_item><combo_item name="Harassment__Advert_farms___visual_spam" value="51">
+    Harassment > Advert farms / visual spam
+    </combo_item><combo_item name="Harassment__Defaming_individuals_or_groups" value="52">
+    Harassment > Defaming individuals or groups
+    </combo_item><combo_item name="Harassment__Impeding_movement" value="53">
+    Harassment > Impeding movement
+    </combo_item><combo_item name="Harassment__Sexual_harassment" value="54">
+    Harassment > Sexual harassment
+    </combo_item><combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS" value="55">
+    Harassment > Solicting/inciting others to violate ToS
+    </combo_item><combo_item name="Harassment__Verbal_abuse" value="56">
+    Harassment > Verbal abuse
+    </combo_item><combo_item name="Ridiculous1" value="69">
+    Harassment > User keeps licking finger and touching me
+    </combo_item><combo_item name="Indecency__Broadly_offensive_content_or_conduct" value="57">
+    Indecency > Broadly offensive content or conduct
+    <!--  58 = deprecated by AO -->
+    </combo_item><combo_item name="Indecency__Inappropriate_avatar_name" value="59">
+    Indecency > Inappropriate avatar name
+    </combo_item><combo_item name="Indecency__Mature_content_in_PG_region" value="60">
+    Indecency > Inappropriate content or conduct in a PG region
+    </combo_item><combo_item name="Indecency__Inappropriate_content_in_Mature_region" value="69">
+    Indecency > Inappropriate content or conduct in a Mature region
+    </combo_item><combo_item name="Intellectual_property_infringement_Content_Removal" value="66">
+    Intellectual property infringement > Content Removal
+    </combo_item><combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" value="37">
+    Intellectual property infringement > CopyBot or Permissions Exploit
+    </combo_item><combo_item name="Intolerance" value="61">
+    Intolerance
+    </combo_item><combo_item name="Land__Abuse_of_sandbox_resources" value="62">
+    Land > Abuse of sandbox resources
+    </combo_item><combo_item name="Land__Encroachment__Objects_textures" value="63">
+    Land > Encroachment > Objects/textures
+    </combo_item><combo_item name="Land__Encroachment__Particles" value="64">
+    Land > Encroachment > Particles
+    </combo_item><combo_item name="Land__Encroachment__Trees_plants" value="65">
+    Land > Encroachment > Trees/plants
+    </combo_item><combo_item name="Ridiculous2" value="70">
+    Land > Encroachment > User won't stay on their side of the car
+    </combo_item><combo_item name="Wagering_gambling" value="67">
+    Wagering/gambling
+    </combo_item>
+    <combo_item name="Other" value="68">
+      Other
+    </combo_item>
+    </combo_box>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="abuser_name_title" v_pad="0" width="180">
+		Abuser name:
+	</text>
+	<line_editor bevel_style="in" border_style="line"
+	     border_thickness="1" bottom_delta="-18" follows="left|top"
+	     font="SansSerifSmall" height="16" left="16" max_length="32"
+	     mouse_opaque="true" name="abuser_name_edit"
+	     width="180" />
+	<button bottom_delta="-2" font="SansSerif" halign="center" height="20"
+	     label="Choose Resident" label_selected="" left_delta="190"
+	     mouse_opaque="true" name="select_abuser"
+	     tool_tip="Select the name of the abuser from a list" width="160" />
+
+	<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Don't know abuser's name" left="13" visible="false"
+	     mouse_opaque="true" name="omit_abuser_name" width="116" 
+		 tool_tip="Check this if you are unable to provide the abuser's name"/>
+
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="abuser_name_title2" v_pad="0" width="180">
+		Location of Abuse:
+	</text>
+	<line_editor bevel_style="in" border_style="line"
+	     border_thickness="1" bottom_delta="-18" follows="left|top"
+	     font="SansSerifSmall" height="16" left="16" max_length="256"
+	     mouse_opaque="true" name="abuse_location_edit"
+	     width="356" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="sum_title" v_pad="0" width="180">
+		Summary:
+	</text>
+	<line_editor bevel_style="in" border_style="line"
+	     border_thickness="1" bottom_delta="-18" follows="left|top"
+	     font="SansSerifSmall" height="16" left="16" max_length="64"
+	     mouse_opaque="true" name="summary_edit" 
+	     width="356" spell_check="true" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="dscr_title" v_pad="0" width="180">
+		Details:
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-32" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="48" left="70"
+	     mouse_opaque="true" name="bug_aviso" v_pad="0" width="308">
+		Please be specific about the date, location, nature of
+abuse, relevant chat/IM text, and select the object
+if possible.
+	</text>
+	<text_editor bottom_delta="-152" embedded_items="false"
+	     follows="left|top" font="SansSerifSmall" height="146" left="16"
+	     max_length="800" mouse_opaque="false" name="details_edit"
+	     width="356" word_wrap="true" spell_check="true" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="incomplete_title" v_pad="0" width="342">
+		Note: Incomplete reports will not be investigated.
+	</text>
+	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
+	     label="Cancel" label_selected="Cancel" mouse_opaque="true"
+	     name="cancel_btn" right="373" width="150" />
+	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
+	     label="Report Abuse" label_selected="Report Abuse" mouse_opaque="true"
+	     name="send_btn" right="217" width="150" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_report_bug.xml b/indra/newview/skins/default/xui/es/floater_report_bug.xml
new file mode 100644
index 000000000..83d7a5c46
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_report_bug.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="455" min_height="100" min_width="100"
+     name="bug_reporter" title="Report Bug" width="390">
+	<texture_picker allow_no_texture="true" bottom="-150" default_image_name="None"
+	     follows="left|top" height="114" label="" left="238" mouse_opaque="true"
+	     name="screenshot" width="134" />
+	<check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Include screenshot" left="234"
+	     mouse_opaque="true" name="screen_check" width="116" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-48" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="reporter_title" v_pad="0" width="50">
+		Reporter:
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-48" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
+	     mouse_opaque="true" name="reporter_field" v_pad="0" width="120" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-64" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="sim_title" v_pad="0" width="50">
+		Region:
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-64" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
+	     mouse_opaque="true" name="sim_field" v_pad="0" width="120" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-80" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="pos_title" v_pad="0" width="50">
+		Position:
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-80" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
+	     mouse_opaque="true" name="pos_field" v_pad="0" width="120" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="select_object_label" v_pad="0" width="200">
+		Click the button then the object:
+	</text>
+	<button bottom_delta="-32" font="SansSerif" halign="center" height="32" label=""
+	     label_selected="" left="16" mouse_opaque="true" name="pick_btn"
+	     tool_tip="Object Picker - Identify an object as the subject of this report"
+	     width="32" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="16" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="53"
+	     mouse_opaque="true" name="object_name_label" v_pad="0" width="60">
+		Name:
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="66"
+	     mouse_opaque="true" name="object_name" v_pad="0" width="109">
+		Consetetur Sadipscing
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="53"
+	     mouse_opaque="true" name="owner_name_label" v_pad="0" width="60">
+		Owner:
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="66"
+	     mouse_opaque="true" name="owner_name" v_pad="0" width="109">
+		Hendrerit Vulputate
+	</text>
+	<combo_box bottom_delta="-28" follows="left|top" height="20" left="16" mouse_opaque="true"
+	     name="category_combo"
+	     tool_tip="Category -- select the category that best describes this report"
+	     width="180">
+		<combo_item name="Selectcategory" value="0">
+			Select category
+		</combo_item>
+		<combo_item name="Building" value="9">
+			Building
+		</combo_item>
+		<combo_item name="Character" value="8">
+			Character
+		</combo_item>
+		<combo_item name="Chat/IM" value="3">
+			Chat/IM
+		</combo_item>
+		<combo_item name="Documentation" value="10">
+			Documentation
+		</combo_item>
+		<combo_item name="Exploit" value="22">
+			Exploit
+		</combo_item>
+		<combo_item name="Graphics" value="11">
+			Graphics
+		</combo_item>
+		<combo_item name="Inventory" value="12">
+			Inventory
+		</combo_item>
+		<combo_item name="Lag" value="13">
+			Lag
+		</combo_item>
+		<combo_item name="MissingContent" value="21">
+			Missing Content
+		</combo_item>
+		<combo_item name="LindenDollars(L$)" value="14">
+			Linden Dollars (L$)
+		</combo_item>
+		<combo_item name="Permissions" value="15">
+			Permissions
+		</combo_item>
+		<combo_item name="Physics" value="16">
+			Physics
+		</combo_item>
+		<combo_item name="Script" value="17">
+			Script
+		</combo_item>
+		<combo_item name="Sound" value="6">
+			Sound
+		</combo_item>
+		<combo_item name="Stipends" value="18">
+			Stipends
+		</combo_item>
+		<combo_item name="Userinterface" value="19">
+			User interface
+		</combo_item>
+		<combo_item name="Miscellaneous" value="20">
+			Miscellaneous
+		</combo_item>
+	</combo_box>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="sum_title" v_pad="0" width="180">
+		Summary:
+	</text>
+	<line_editor bevel_style="in" border_style="line"
+	     border_thickness="1" bottom_delta="-16" follows="left|top"
+	     font="SansSerifSmall" height="16" left="16" max_length="64"
+	     mouse_opaque="true" name="summary_edit" 
+	     width="356" spell_check="true" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
+	     mouse_opaque="true" name="dscr_title" v_pad="0" width="342">
+		Details: (Please provide as much information as possible)
+	</text>
+	<text_editor bottom_delta="-112" embedded_items="false"
+	     follows="left|top" font="SansSerifSmall" height="112" left="16"
+	     max_length="900" mouse_opaque="false" name="details_edit"
+	     width="356" word_wrap="true" spell_check="true">
+		Steps to reproduce the bug:
+
+Observed results:
+
+Expected results:
+	</text_editor>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-40" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="32" left="16"
+	     mouse_opaque="true" name="bug_aviso" v_pad="0" width="342">
+		Note: Incomplete reports will not be investigated
+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 bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
+	     label="Cancel" label_selected="Cancel" mouse_opaque="true"
+	     name="cancel_btn" right="380" width="150" />
+	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
+	     label="Report Bug" label_selected="Report Bug" mouse_opaque="true"
+	     name="send_btn" right="224" width="150" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_rlv_behaviours.xml b/indra/newview/skins/default/xui/es/floater_rlv_behaviours.xml
new file mode 100644
index 000000000..c4c9abc3b
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_rlv_behaviours.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater 
+  can_close="true"
+  can_drag_on_left="false"
+  can_minimize="true"
+  can_resize="true"
+  height="455"
+  min_height="200"
+  min_width="375"
+  name="rlv_behaviours"
+  title="Active RLV Restrictions"
+  width="350">
+
+  <tab_container
+    follows="top|left|bottom|right"
+    bottom="-445"
+    left="5"
+    height="420"
+    width="338"
+    name="behaviour_tab"
+    tab_position="top">
+    <panel
+      border="true"
+      label="Restrictions"
+      name="behaviour_panel">
+      
+      <scroll_list
+        top_pad="17"
+	height="-30"
+	follows="top|left|bottom|right"
+	draw_border="false"
+	multi_select="false"
+	name="behaviour_list"
+	draw_heading="true"
+	draw_stripes="true"
+	left="2"
+	right="-2">
+	 <column
+	   label="Restriction"
+	   name="behaviour"
+	   width="170" />
+         <column
+	   label="Object Name"
+	   name="issuer"
+	   width="170" />
+      </scroll_list>
+    </panel>
+    <panel
+      border="true"
+      label="Exceptions"
+      name="exception_panel">
+      
+      <scroll_list
+top_pad="17"
+	height="-30"
+	follows="top|left|bottom|right"
+	draw_border="false"
+	multi_select="false"
+	name="exception_list"
+	draw_heading="true"
+	draw_stripes="true"
+	left="2"
+	right="-2">
+	 <column
+	   label="Restriction"
+	   name="behaviour"
+	   width="70" />
+	 <column
+	   label="Option"
+	   name="option"
+	   width="170" />
+         <column
+	   label="Object Name"
+	   name="issuer"
+	   width="170" />
+      </scroll_list>
+    </panel>
+  </tab_container>
+
+  <button
+    follows="bottom|left"
+    height="25"
+    label="Copy to Clipboard"
+    left="10"
+    name="copy_btn"
+    bottom="-440"
+    width="180" />
+
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_rlv_locks.xml b/indra/newview/skins/default/xui/es/floater_rlv_locks.xml
new file mode 100644
index 000000000..b2a836a8c
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_rlv_locks.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
+         height="425" min_height="200" min_width="375" name="rlvLocks" title="Active RLV Locks" width="375"
+         save_rect="true" save_visibility="true" single_instance="true">
+  <scroll_list bottom="-410" left="2" right="-2" draw_border="false" follows="top|left|bottom|right" height="390" multi_select="false"
+               name="lock_list" draw_heading="true" draw_stripes="true" layout="topleft">
+    <column label="Lock Type" name="lock_type" width="110" />
+    <column label="Add / Rem" name="lock_addrem" width="65" />
+    <column label="Lock Target" name="lock_target" width="150" />
+    <column label="Held By" name="lock_origin" width="150" />
+  </scroll_list>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_script_debug.xml b/indra/newview/skins/default/xui/es/floater_script_debug.xml
new file mode 100644
index 000000000..2abd503be
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_script_debug.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater bottom="-463" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="true" height="233" left="337" min_height="100" min_width="100"
+     mouse_opaque="true" name="script debug floater"
+     rect_control="FloaterScriptDebugRect" title="Script Warning/Error"
+     width="450">
+	<tab_container border="false" bottom="-233" follows="left|top|right|bottom" height="217"
+	     left="1" mouse_opaque="false" name="Preview Tabs" tab_position="bottom"
+	     width="448">
+		<floater bottom="-202" can_close="false" can_drag_on_left="false" can_minimize="true"
+		     can_resize="false" follows="left|top|right|bottom" height="201"
+		     label="Script" left="1" min_height="100" min_width="100"
+		     mouse_opaque="true" name="all_scripts" title="[All scripts]" width="446" />
+	</tab_container>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/es/floater_script_ed_panel.xml b/indra/newview/skins/default/xui/es/floater_script_ed_panel.xml
new file mode 100644
index 000000000..9e5147595
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_script_ed_panel.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bottom="-550" enabled="true" follows="left|top|right|bottom" height="508"
+     left="0" mouse_opaque="true" name="script panel" width="500" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0">
+	<text_editor type="string" length="1" bottom="-393"
+	     embedded_items="false" enabled="true" follows="left|top|right|bottom"
+	     font="Monospace" height="376" ignore_tab="false" left="4"
+	     max_length="65536" mouse_opaque="true" name="Script Editor" width="492" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0"
+	     word_wrap="true" show_line_numbers="true">
+		Loading...
+	</text_editor>
+  <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
+	     halign="center" height="20" label="Edit..." label_selected="Edit..." left="230"
+	     mouse_opaque="true" name="Edit_btn" width="128" />
+  <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
+	     halign="center" height="20" label="Save" label_selected="Save" left="360"
+	     mouse_opaque="true" name="Save_btn" width="128" />
+	<scroll_list background_visible="true" bottom="-457" column_padding="5" draw_border="true"
+	     draw_heading="false" draw_stripes="true" enabled="true"
+	     follows="left|right|bottom" height="60" left="4" mouse_opaque="true"
+	     multi_select="false" name="lsl errors" width="492" />
+	<combo_box allow_text_entry="false" bottom="-499" enabled="true" follows="left|bottom"
+	     height="20" label="Insert..." left="12" max_chars="20" mouse_opaque="true"
+	     name="Insert..." width="128" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0"
+	     bottom="-473" drop_shadow_visible="true" enabled="true"
+	     follows="left|bottom" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="12" left="12" mouse_opaque="true" name="line_col" v_pad="0"
+	     width="128" />
+	<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
+	     height="18" left="8" mouse_opaque="false" name="script_menu" opaque="false"
+	     tear_off="false" width="476">
+		<menu bottom="0" drop_shadow="true" enabled="true" height="62"
+		     left="0" mouse_opaque="false" name="File" opaque="true" tear_off="false"
+		     width="138">
+			<menu_item_call bottom_delta="-30" height="20" label="Save" left="0" mouse_opaque="true"
+			     name="Save" width="138" />
+			<menu_item_separator bottom_delta="-38" height="8" left="0" mouse_opaque="true" name="separator"
+			     width="138" />
+			<menu_item_call bottom_delta="-58" height="20" label="Revert All Changes" left="0"
+			     mouse_opaque="true" name="Revert All Changes" width="138" />
+		</menu>
+		<menu bottom="665" drop_shadow="true" enabled="true" height="198"
+		     left="222" mouse_opaque="false" name="Edit" opaque="true" tear_off="false"
+		     width="139">
+			<menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
+			     mouse_opaque="true" name="Undo" width="139" />
+			<menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"
+			     mouse_opaque="true" name="Redo" width="139" />
+			<menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator" width="139" />
+			<menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0"
+			     mouse_opaque="true" name="Cut" width="139" />
+			<menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0"
+			     mouse_opaque="true" name="Copy" width="139" />
+			<menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0"
+			     mouse_opaque="true" name="Paste" width="139" />
+			<menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator2" width="139" />
+			<menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0"
+			     mouse_opaque="true" name="Select All" width="139" />
+			<menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0"
+			     mouse_opaque="true" name="Deselect" width="139" />
+			<menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0"
+			     mouse_opaque="true" name="separator3" width="139" />
+			<menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."
+			     left="0" mouse_opaque="true" name="Search / Replace..." width="139" />
+		</menu>
+		<menu bottom="-18" drop_shadow="true" enabled="true" height="34"
+		     left="0" mouse_opaque="false" name="Help" opaque="true" tear_off="false"
+		     width="112">
+			<menu_item_call bottom="-30" enabled="true" height="20" label="Help..." left="0"
+			     mouse_opaque="true" name="Help..." width="112" />
+			<menu_item_call bottom="-30" enabled="true" height="20" label="LSL Wiki Help..." left="0"
+			     mouse_opaque="true" name="LSL Wiki Help..." width="112" />
+		</menu>
+	</menu_bar>
+	<string name="loading">
+		Loading...
+	</string>
+	<string name="can_not_view">
+		You are not allowed to view this script.
+	</string>
+	<string name="public_objects_can_not_run">
+		Public Objects cannot run scripts
+	</string>
+	<string name="script_running">
+		Running
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/floater_script_preview.xml b/indra/newview/skins/default/xui/es/floater_script_preview.xml
new file mode 100644
index 000000000..11735ea8b
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_script_preview.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-757" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="true" enabled="true" height="550" left="358" min_height="271"
+     min_width="290" mouse_opaque="true" name="preview lsl text"
+     rect_control="PreviewScriptRect" title="Script: Rotation Script"
+     width="500">
+	<panel bottom="-550" enabled="true" follows="left|top|right|bottom" height="508"
+	     left="1" name="script panel" width="497" border_thickness="0"/>
+	<icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16"
+	     image_name="icon_lock.tga" left="444" mouse_opaque="true" name="lock"
+	     width="16" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
+	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
+		Description:
+	</text>
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
+	     enabled="true" follows="left|top|right" font="SansSerif"
+	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
+	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
+	     select_on_focus="false" width="394" spell_check="true" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_script_queue.xml b/indra/newview/skins/default/xui/es/floater_script_queue.xml
new file mode 100644
index 000000000..90d1ac12e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_script_queue.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-763" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="true" enabled="true" height="400" left="408" min_height="100"
+     min_width="100" mouse_opaque="true" name="queue" title="Reset Progress"
+     width="300" border_bevel="none" border_thickness="0">
+	<button bottom="-392" enabled="true" follows="right|bottom" font="SansSerif"
+	     halign="center" height="24" label="Close" label_selected="Close" left="220"
+	     mouse_opaque="true" name="close" width="64" />
+	<scroll_list background_visible="true" bottom="-364" column_padding="5" draw_border="true"
+	     draw_heading="false" draw_stripes="true" enabled="true"
+	     follows="left|top|right|bottom" height="344" left="4" mouse_opaque="true"
+	     multi_select="false" name="queue output" width="292" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_script_search.xml b/indra/newview/skins/default/xui/es/floater_script_search.xml
new file mode 100644
index 000000000..d8e6cb547
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_script_search.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-423" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" can_tear_off="true" enabled="true" height="120"
+     left="223" min_height="100" min_width="100" mouse_opaque="true"
+     name="script search" title="Script Search" width="300">
+	<check_box bottom="-77" control_name="LSLFindCaseInsensitivity" enabled="true" follows="left|top" font="SansSerifSmall"
+	     height="16" initial_value="false" label="Case Insensitive" left="55"
+	     mouse_opaque="true" name="case_text" radio_style="false" width="240" />
+	<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
+	     label="Search" label_selected="Search" left="10" mouse_opaque="true"
+	     name="search_btn" scale_image="true" width="90" />
+	<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
+	     label="Replace" label_selected="Replace" left="105" mouse_opaque="true"
+	     name="replace_btn" scale_image="true" width="90" />
+	<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
+	     label="Replace All" label_selected="Replace All" left="200"
+	     mouse_opaque="true" name="replace_all_btn" scale_image="true" width="90" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-37" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="5"
+	     mouse_opaque="true" name="txt" v_pad="0" width="45">
+		Search
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-58" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="5"
+	     mouse_opaque="true" name="txt2" v_pad="0" width="45">
+		Replace
+	</text>
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-37"
+	     enabled="true" follows="left|top" font="SansSerifSmall"
+	     handle_edit_keys_directly="false" height="16" left="55" max_length="254"
+	     mouse_opaque="true" name="search_text" select_all_on_focus_received="false"
+	     select_on_focus="false" width="240" />
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-58"
+	     enabled="true" follows="left|top" font="SansSerifSmall"
+	     handle_edit_keys_directly="false" height="16" left="55" max_length="254"
+	     mouse_opaque="true" name="replace_text"
+	     select_all_on_focus_received="false" select_on_focus="false" width="240" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_sculpt_preview.xml b/indra/newview/skins/default/xui/es/floater_sculpt_preview.xml
new file mode 100644
index 000000000..cc4071f3b
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_sculpt_preview.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="false"
+     can_resize="false" height="550" min_height="140" min_width="300"
+     name="Image Preview" title="" width="550">
+	<text left ="20" bottom_delta="-25" follows="top|left" height="15" name="preview_label" font="SansSerifLarge">
+		Preview image as:
+	</text>
+	<combo_box bottom_delta="-8" follows="left|top" height="24" label="Clothing Type"
+	     left="145" name="clothing_type_combo" width="160">
+		<combo_item name="Image">
+			Image
+		</combo_item>
+		<combo_item name="Hair">
+			Hair
+		</combo_item>
+		<combo_item name="FemaleHead">
+			Female Head
+		</combo_item>
+		<combo_item name="FemaleUpperBody">
+			Female Upper Body
+		</combo_item>
+		<combo_item name="FemaleLowerBody">
+			Female Lower Body
+		</combo_item>
+		<combo_item name="MaleHead">
+			Male Head
+		</combo_item>
+		<combo_item name="MaleUpperBody">
+			Male Upper Body
+		</combo_item>
+		<combo_item name="MaleLowerBody">
+			Male Lower Body
+		</combo_item>
+		<combo_item name="Skirt">
+			Skirt
+		</combo_item>
+		<combo_item name="SculptedPrim">
+			Sculpted Prim
+		</combo_item>
+	</combo_box>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_search_replace.xml b/indra/newview/skins/default/xui/es/floater_search_replace.xml
new file mode 100644
index 000000000..930cf37b6
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_search_replace.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-423" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" can_tear_off="true" enabled="true" height="120"
+     left="223" min_height="100" min_width="100" mouse_opaque="true"
+     name="script search" title="Search / Replace" width="300">
+	<check_box bottom="-77" control_name="LSLFindCaseInsensitivity" enabled="true" follows="left|top" font="SansSerifSmall"
+	     height="16" initial_value="false" label="Case Insensitive" left="55"
+	     mouse_opaque="true" name="case_text" radio_style="false" width="240" />
+	<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
+	     label="Search" label_selected="Search" left="10" mouse_opaque="true"
+	     name="search_btn" scale_image="true" width="90" />
+	<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
+	     label="Replace" label_selected="Replace" left="105" mouse_opaque="true"
+	     name="replace_btn" scale_image="true" width="90" />
+	<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
+	     label="Replace All" label_selected="Replace All" left="200"
+	     mouse_opaque="true" name="replace_all_btn" scale_image="true" width="90" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-37" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="5"
+	     mouse_opaque="true" name="search_label" v_pad="0" width="45">
+		Search
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-58" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="5"
+	     mouse_opaque="true" name="replace_label" v_pad="0" width="45">
+		Replace
+	</text>
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-37"
+	     enabled="true" follows="left|top" font="SansSerifSmall"
+	     handle_edit_keys_directly="false" height="16" left="55" max_length="254"
+	     mouse_opaque="true" name="search_text" select_all_on_focus_received="false"
+	     select_on_focus="false" width="240" />
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-58"
+	     enabled="true" follows="left|top" font="SansSerifSmall"
+	     handle_edit_keys_directly="false" height="16" left="55" max_length="254"
+	     mouse_opaque="true" name="replace_text"
+	     select_all_on_focus_received="false" select_on_focus="false" width="240" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_select_key.xml b/indra/newview/skins/default/xui/es/floater_select_key.xml
new file mode 100644
index 000000000..e68ced28a
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_select_key.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater border="true" bottom="372" can_close="false" can_drag_on_left="false"
+     can_minimize="false" can_resize="false" can_tear_off="true" enabled="true"
+     height="100" left="415" min_height="100" min_width="100"
+     mouse_opaque="true" name="modal container" title="" width="240">
+	<button bottom="-90" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="Cancel" label_selected="Cancel" left="138" mouse_opaque="true"
+	     name="Cancel" scale_image="true" width="82" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-26" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerif" h_pad="0" halign="left" height="16" left="20"
+	     mouse_opaque="true" name="Save item as:" v_pad="0" width="200">
+		Press a key to select
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_sell_land.xml b/indra/newview/skins/default/xui/es/floater_sell_land.xml
new file mode 100644
index 000000000..d91b5ffcf
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_sell_land.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="false"
+     can_resize="false" height="485" min_height="485" min_width="450"
+     name="sell land" title="Sell Land" width="450">
+	<texture_picker bottom_delta="-175" enabled="false" follows="top|left" height="135" left="244"
+	     name="info_image" right="424" width="180" />
+	<text bottom_delta="144" follows="top|left" font="SansSerifSmall" left="16"
+	     name="info_parcel_label"  width="64">
+		Parcel:
+	</text>
+	<text bottom_delta="-5" follows="top|left" font="SansSerif" height="16" left="72"
+	     name="info_parcel" right="-20" >
+		PARCEL NAME
+	</text>
+	<text follows="top|left" font="SansSerifSmall" left="16" name="info_size_label"
+	      width="64">
+		Size:
+	</text>
+	<text bottom_delta="-21" follows="top|left" font="SansSerif" height="32" left="72"
+	     name="info_size" right="-20" >
+		[AREA] sq.m.
+	</text>
+	<text bottom_delta="-94" follows="top|left" font="SansSerifHuge" height="24"
+	     left="16" name="info_action" text_color="white" width="210">
+		To sell this parcel:
+	</text>
+	<icon bottom_delta="-66" follows="top|left" height="64" image_name="badge_note.j2c"
+	     left="0" name="step_price" width="64" />
+	<text bottom_delta="38" follows="top|left" height="16" left="72" name="price_label"
+	     right="-20" font="SansSerifBig" >
+		Set a price:
+	</text>
+	<text follows="top|left" height="16" left="72" name="price_text" right="-20">
+		Choose an appropriate price for this land.
+	</text>
+	<text height="16" left="72" name="price_ld" width="20">
+		[CURRENCY]
+	</text>
+	<line_editor bottom_delta="0" follows="top|left" height="16" increment="1" initial_val="0"
+	     left_delta="20" max_val="999999999" min_val="0" name="price" width="100" />
+	<text bottom_delta="0" height="16" left_delta="110" name="price_per_m" width="200">
+		([CURRENCY][PER_METER] per square meter)
+	</text>
+	<icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
+	     name="step_sell_to" width="64" />
+	<text bottom_delta="38" follows="top|left" height="16" left="72" name="sell_to_label"
+	     right="-20" font="SansSerifBig" >
+		Sell the land to:
+	</text>
+	<text follows="top|left" height="16" left="72" name="sell_to_text" right="-20">
+		Choose whether to sell to anyone or a particular buyer.
+	</text>
+	<combo_box bottom_delta="-16" follows="top|right" height="16" left="72" name="sell_to"
+	     width="140">
+		<combo_item enabled="false" name="--selectone--" value="select">
+			-- select one --
+		</combo_item>
+		<combo_item name="Anyone" value="anyone">
+			Anyone
+		</combo_item>
+		<combo_item name="Specificuser:" value="user">
+			Specific user:
+		</combo_item>
+	</combo_box>
+	<line_editor bottom_delta="-20" enabled="false" follows="top|right" height="16"
+	     name="sell_to_agent"  width="150" />
+	<button bottom_delta="0" height="16" label="Select..." left_delta="155"
+	     name="sell_to_select_agent" width="110" />
+	<icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
+	     name="step_sell_objects" width="64" />
+	<text bottom_delta="38" follows="top|left" height="16" left="72"
+	     name="sell_objects_label" right="-20" font="SansSerifBig" >
+		Sell the objects with the land?
+	</text>
+	<text bottom_delta="-20" follows="top|left" height="16" left="72"
+	     name="sell_objects_text">
+		Land owner&apos;s transferable objects on parcel will change ownership.
+	</text>
+	<radio_group bottom_delta="-44" follows="top|right" height="40" left="72"
+	     name="sell_objects" right="420">
+		<radio_item bottom="0" height="0" left="10" name="none" visible="false" />
+		<radio_item bottom="-20" height="16" left="10" name="no">
+			No, keep ownership of objects
+		</radio_item>
+		<radio_item bottom="-40" height="16" left="10" name="yes">
+			Yes, sell objects with land
+		</radio_item>
+	</radio_group>
+	<button bottom_delta="4" height="16" label="Show Objects" name="show_objects"
+	     right="414" width="110" />
+	<text bottom_delta="-35" follows="top|left" height="16" left="72"
+	     name="nag_message_label" right="-20" font="SansSerifBig" >
+		REMEMBER: All sales are final.
+	</text>
+	<button bottom="-479" follows="bottom|left" height="20" label="Set Land For Sale"
+	     left="72" name="sell_btn" width="160" />
+	<button bottom_delta="0" follows="bottom|right" height="20" label="Cancel"
+	     name="cancel_btn" right="444" width="90" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_settings_debug.xml b/indra/newview/skins/default/xui/es/floater_settings_debug.xml
new file mode 100644
index 000000000..a8c0840a1
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_settings_debug.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="false"
+     can_resize="false" height="215" name="settings_debug"
+     title="Debug Settings" width="350">
+	<combo_box allow_text_entry="true" bottom="-50" follows="top|left" font="SansSerifSmall"
+	     height="20" left="15" max_chars="255" name="settings_combo" />
+	<text_editor bottom_delta="-75" enabled="false" height="60" width="320" hide_scrollbar="true"
+	     name="comment_text" word_wrap="true" />
+	<combo_box bottom_delta="-30" follows="top|left" font="SansSerifSmall" height="20"
+	     left="15" name="boolean_combo" visible="false">
+		<combo_item name="TRUE" value="true">
+			TRUE
+		</combo_item>
+		<combo_item name="FALSE" value="">
+			FALSE
+		</combo_item>
+	</combo_box>
+	<line_editor bottom_delta="0" height="20" name="val_text" visible="false" width="300" />
+	<color_swatch bottom="30" can_apply_immediately="true" height="55" label="Color"
+	     name="color_swatch" visible="true" width="37" />
+	<spinner bottom_delta="25" height="20" label="x" label_width="40" max_val="10000000"
+	     name="val_spinner_1" visible="false" width="120" />
+	<spinner bottom_delta="0" height="20" label="x" label_width="40" left_delta="135"
+	     max_val="10000000" name="val_spinner_2" visible="false" width="120" />
+	<spinner bottom_delta="-20" height="20" label="x" label_width="40" left="15"
+	     max_val="10000000" name="val_spinner_3" visible="false" width="120" />
+	<spinner bottom_delta="0" height="20" label="x" label_width="40" left_delta="135"
+	     max_val="10000000" name="val_spinner_4" visible="false" width="120" />
+	<button bottom="5" height="20" label="Reset to default" left="15" name="default_btn"
+	     width="150" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_sim_release_message.xml b/indra/newview/skins/default/xui/es/floater_sim_release_message.xml
new file mode 100644
index 000000000..72e8b27f3
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_sim_release_message.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
+     height="500" min_height="300" min_width="300" name="floaterreleasemessage"
+     title="Entering Region" width="700">
+	<button bottom="10" follows="bottom|right" font="SansSerifSmall" height="20"
+	     label="Close" name="close_btn" right="-10" width="50" />
+	<web_browser bottom="40" follows="top|left|bottom|right" font="SansSerifSmall" left="15"
+	     name="release_message_floater_browser" right="-15" top="-30" />
+	<string name="in-world_help_title">
+		In-World Help
+	</string>
+	<string name="in-world_help_url">
+		http://www.secondlife.com/app/support/inworld.html
+	</string>
+	<string name="additional_help_title">
+		Additional Help
+	</string>
+	<string name="additional_help_url">
+		http://www.secondlife.com/app/support/support.html
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_skin_preview_template.xml b/indra/newview/skins/default/xui/es/floater_skin_preview_template.xml
new file mode 100644
index 000000000..2822d9bf4
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_skin_preview_template.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater bottom="256" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="148" left="256" name="floater_chatterbox" title="" title_bar="true" width="300" rect_control="ChatterboxRect">
+    <icon image_name="checkerboard_transparency_bg.png" follows="left|right|top|bottom" bottom="0" left="0" height="128" width="300" />
+    <panel name="panel_littletoolbar" width="300" height="28" left="0" bottom="0" background_opaque="true" background_visible="true">
+        <panel bottom="0" filename="panel_bg_toolbar.xml" height="26" left="0" width="300" follows="left|right|top|bottom"/>
+        <button bottom="0" font="SansSerif" height="24"
+            image_selected="btn_chatbar_selected.tga" scale_image="true"
+            image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn"
+            image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)"
+            width="50" auto_resize="false" follows="left|right" user_resize="false"/>
+            <icon image_name="spacer24.tga" left_delta="2" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
+        <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left_delta="52"
+           name="communicate_btn" tool_tip="Communicate with your Friends and Groups."
+            list_position="above" auto_resize="false"
+            width="120" follows="left|right" user_resize="false"/>
+        <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
+        <button bottom="0" left_delta="122"
+            font="SansSerif"
+            height="24"
+            label="Fly"
+            image_overlay="icn_toolbar_fly.tga"
+            image_overlay_alignment="left"
+            image_selected="toolbar_btn_selected.tga"
+            image_unselected="toolbar_btn_enabled.tga"
+            toggle="true"
+            auto_resize="false"
+            image_disabled="toolbar_btn_disabled.tga"
+            scale_image="true"
+            label_selected="Stop Flying" left="0" name="fly_btn"
+            tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."
+            width="120"
+            follows="left|right"
+            user_resize="false"/>
+    </panel>
+        <panel name="panel_unfocused_floater" background_opaque="false" background_visible="true" bg_alpha_color="DefaultBackgroundColor" height="100" width="148" left="2" bottom="29" border="true" border_color="FloaterUnfocusBorderColor">
+            <panel background_opaque="false" background_visible="false" bg_alpha_color="0,0,0,0" height="17" width="148" bottom="83" />
+            <text name="titlebar_focused" text_color="LabelDisabledColor" bottom_delta="6" left_delta="15" font="SansSerif">Unfocused</text>
+            <icon image_name="closebox.tga" left_delta="116" bottom="83" width="16" height="16" color="FloaterButtonImageColor"/>
+            <icon image_name="minimize.tga" left_delta="-17" bottom_delta="0" width="16" height="16" color="FloaterButtonImageColor"/>
+            
+        <combo_box name="combo_box_1" label="Combo Box" height="20" width="90" bottom_delta="-22" left="2" />
+        <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
+			     bottom="5" embedded_items="false" enabled="false"
+			     follows="left|top|right|bottom" font="SansSerif" height="50" left="5"
+			     max_length="2147483647" mouse_opaque="true" name="Chat History Editor"
+			     text_color="ChatHistoryTextColor"
+			     text_readonly_color="ChatHistoryTextColor" width="140" word_wrap="true">Text</text_editor>
+        </panel>
+        <panel name="panel_focused_floater" background_opaque="true" background_visible="true" height="100" width="148" left="152" bottom="29" border="true">
+            <panel background_opaque="false" background_visible="true" bg_alpha_color="TitleBarFocusColor" height="17" width="148" bottom="83" />
+            <text name="titlebar_focused" text_color="LabelTextColor" bottom_delta="6" left_delta="15" font="SansSerif">Focused</text>
+            <icon image_name="closebox.tga" left_delta="116" bottom="83" width="16" height="16" color="FloaterButtonImageColor" />
+            <icon image_name="minimize.tga" left_delta="-17" bottom_delta="0" width="16" height="16" color="FloaterButtonImageColor"/>
+<icon enabled="false" image_name="tabarea.tga"
+	     bg_alpha_color="blue" color="DefaultShadowLight" border="false"
+	     bottom="0" follows="left|right|bottom" height="17" left="1" scale_image="true"
+	     mouse_opaque="false" name="chatterbox_tab_container" width="148"></icon>
+    <tab_container bottom="0" follows="left|right|top|bottom" height="102" left="0"
+	     name="chatterbox_tabs" tab_position="bottom" tab_min_width="40" width="148" >
+        <panel name="test_1" label="Focused">
+            <slider bottom_delta="-36" control_name="SliderTest" follows="left|top|right"
+	     height="15" increment="0.05" initial_val="0.5" label="Slider"
+	     label_width="36" left="5" max_val="1" min_val="0" name="SliderTestName"
+	     show_text="false" volume="true" width="140" />
+            <check_box name="check_box_test_1" label="True" bottom_delta="56" initial_value="true" left="0" />
+        <check_box name="check_box_test_2" label="False" bottom_delta="0" left_delta="50" initial_value="false" />
+            <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
+			     bottom="8" embedded_items="false" enabled="false"
+			      font="SansSerif" height="22" left="2"
+			     max_length="2147483647" mouse_opaque="true" name="Chat History Editor" hide_scrollbar="true"
+			     text_color="ChatHistoryTextColor"
+			     text_readonly_color="ChatHistoryTextColor" width="140" word_wrap="true">Chat Text</text_editor>
+        
+        </panel>
+        <panel name="test_2" label="Unfocused" />
+    </tab_container>
+        </panel>
+
+</multi_floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_snapshot.xml b/indra/newview/skins/default/xui/es/floater_snapshot.xml
new file mode 100644
index 000000000..b48c2ca1c
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_snapshot.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="false"
+     can_resize="false" follows="left|top" height="566" name="Snapshot"
+     rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="215">
+	<text bottom_delta="-40" follows="top|left" height="15" left="10" name="type_label"
+	     width="195">
+    Snapshot destination
+  </text>
+	<radio_group bottom_delta="-65" follows="left|top" height="60" label="Snapshot type"
+	     left="10" name="snapshot_type_radio" width="195">
+		<radio_item bottom="-19" height="16" name="postcard">
+			Send via email
+		</radio_item>
+		<radio_item bottom="-38" height="16" name="texture">
+      Save to your inventory ([UPLOADFEE])
+    </radio_item>
+		<radio_item bottom="-57" height="16" name="local">
+			Save to your hard drive
+		</radio_item>
+	</radio_group>
+	<text bottom="-236" follows="left|top" height="25" left="10" name="file_size_label"
+	     width="195">
+		File size: [SIZE] KB
+	</text>
+	<button bottom="-246" follows="left|top" height="20" label="Refresh Snapshot" left="10"
+	     name="new_snapshot_btn" width="195" />
+	<button bottom_delta="-22" follows="left|top" height="20" label="Send" left="10"
+	     name="send_btn" width="105" />
+	<button bottom_delta="0" follows="left|top" height="20" label="Save ([UPLOADFEE])" left="10"
+	     name="upload_btn" width="105" />
+  <flyout_button bottom_delta="0" follows="left|top" height="20" label="Save" left="10"
+       list_position="below" mouse_opaque="true" name="save_btn" tool_tip="Save image to a file"
+       width="105">
+    <flyout_button_item value="save" name="save_item">Save</flyout_button_item>
+    <flyout_button_item value="saveas" name="saveas_item">Save As...</flyout_button_item>
+  </flyout_button>
+	<button bottom_delta="0" follows="left|top" height="20" label="Cancel" left="120"
+	     name="discard_btn" width="85" />
+	<button bottom="-290" follows="left|top" font="SansSerifSmall" halign="center"
+	     height="20" label="More &gt;&gt;" left="10"
+	     mouse_opaque="true" name="more_btn" scale_image="TRUE"
+	     tool_tip="Advanced Options" width="80" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
+	     height="20" label="&lt;&lt; Less" left_delta="0"
+	     mouse_opaque="true" name="less_btn" scale_image="TRUE"
+	     tool_tip="Advanced Options" width="80" />
+	<text bottom_delta="-20" follows="top|left" height="15" left="10" name="type_label2"
+	     width="115">
+	Size
+  </text>
+  <text bottom_delta="0" follows="top|left" height="15" left="130" name="format_label"
+       width="70">
+  Format
+  </text>
+	<combo_box bottom_delta="-22" follows="left|top" height="20" label="Resolution" left="10"
+	     name="postcard_size_combo" width="115">
+		<combo_item name="CurrentWindow" value="[i0,i0]">
+			Current Window
+		</combo_item>
+		<combo_item name="640x480" value="[i640,i480]">
+			640x480
+		</combo_item>
+		<combo_item name="800x600" value="[i800,i600]">
+			800x600
+		</combo_item>
+		<combo_item name="1024x768" value="[i1024,i768]">
+			1024x768
+		</combo_item>
+		<combo_item name="Custom" value="[i-1,i-1]">
+			Custom
+		</combo_item>
+	</combo_box>
+	<combo_box bottom_delta="0" follows="left|top" height="20" label="Resolution" left="10"
+	     name="texture_size_combo" width="115">
+		<combo_item name="CurrentWindow" value="[i0,i0]">
+			Current Window
+		</combo_item>
+		<combo_item name="Small(128x128)" value="[i128,i128]">
+			Small (128x128)
+		</combo_item>
+		<combo_item name="Medium(256x256)" value="[i256,i256]">
+			Medium (256x256)
+		</combo_item>
+		<combo_item name="Large(512x512)" value="[i512,i512]">
+			Large (512x512)
+		</combo_item>
+		<combo_item name="Custom" value="[i-1,i-1]">
+			Custom
+		</combo_item>
+	</combo_box>
+	<combo_box bottom_delta="0" follows="left|top" height="20" label="Resolution" left="10"
+	     name="local_size_combo" width="115">
+		<combo_item name="CurrentWindow" value="[i0,i0]">
+			Current Window
+		</combo_item>
+		<combo_item name="320x240" value="[i320,i240]">
+			320x240
+		</combo_item>
+		<combo_item name="640x480" value="[i640,i480]">
+			640x480
+		</combo_item>
+		<combo_item name="800x600" value="[i800,i600]">
+			800x600
+		</combo_item>
+		<combo_item name="1024x768" value="[i1024,i768]">
+			1024x768
+		</combo_item>
+		<combo_item name="1280x1024" value="[i1280,i1024]">
+			1280x1024
+		</combo_item>
+		<combo_item name="1600x1200" value="[i1600,i1200]">
+			1600x1200
+		</combo_item>
+		<combo_item name="Custom" value="[i-1,i-1]">
+			Custom
+		</combo_item>
+	</combo_box>
+	<combo_box bottom_delta="0" follows="left|top" height="20" label="Format" left="130"
+	     name="local_format_combo" width="70">
+		<combo_item name="PNG">
+			PNG
+		</combo_item>
+		<combo_item name="JPEG">
+			JPEG
+		</combo_item>
+		<combo_item name="BMP">
+			BMP
+		</combo_item>
+	</combo_box>
+
+	<spinner bottom_delta="-25" decimal_digits="0" follows="left|top" height="20"
+	     increment="32" label="Width" label_width="30" left="10" max_val="6016"
+	     min_val="32" name="snapshot_width" width="95" allow_text_entry="false"/>
+	<spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="20"
+	     increment="32" label="Height" label_width="35" left="110" max_val="6016"
+	     min_val="32" name="snapshot_height" width="95" allow_text_entry="false"/>
+	<check_box bottom_delta="-20" follows="left|top" label="Constrain Proportions" left="10"
+	     name="keep_aspect_check" />
+	<slider bottom_delta="-20" decimal_digits="0" follows="left|top" height="15"
+	     increment="1" initial_val="75" label="Image Quality" left="10"
+	     max_val="100" min_val="0" name="image_quality_slider" width="210" />
+	<text bottom_delta="-28" follows="left|top" height="20" left="10"
+	     name="layer_type_label" width="50">
+		Capture:
+	</text>
+	<combo_box bottom_delta="3" follows="left|top" height="20" label="Image Layers" left="60"
+	     name="layer_types" width="145">
+		<combo_item name="Colors" value="colors">
+			Colors
+		</combo_item>
+		<combo_item name="Depth" value="depth">
+			Depth
+		</combo_item>
+	</combo_box>
+	<check_box bottom_delta="-20" follows="left|top" label="Show interface in snapshot"
+	     left="10" name="ui_check" />
+	<check_box bottom_delta="-20" follows="left|top" label="Show HUD objects in snapshot"
+	     left="10" name="hud_check" />
+	<check_box bottom_delta="-20" follows="left|top" label="Keep open after saving" left="10"
+	     name="keep_open_check" />
+	<check_box bottom_delta="-20" follows="left|top" label="Freeze frame (fullscreen preview)"
+	     left="10" name="freeze_frame_check" />
+	<check_box bottom_delta="-20" follows="left|top" label="Auto-refresh" left="10"
+	     name="auto_snapshot_check" />
+	<check_box bottom_delta="-20" follows="left|top" control_name="TemporaryUpload" enabled="true"
+             initial_value="false" label="Temporary Image (Free)" left="10"
+             name="temp_check" tooltip="Sets the asset to be temporary, meaning it's free, but in return, only good for a short time before it ceases to exist." />
+	<string name="unknown">
+		unknown
+	</string>
+</floater>
+ 
diff --git a/indra/newview/skins/default/xui/es/floater_sound_preview.xml b/indra/newview/skins/default/xui/es/floater_sound_preview.xml
new file mode 100644
index 000000000..0a755e8e5
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_sound_preview.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="190" min_height="140" min_width="300"
+     name="Sound Preview" title="sound.wav" width="300">
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-35" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="15" left="10"
+	     mouse_opaque="false" name="name_label" v_pad="0" width="275">
+		Name:
+	</text>
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-23"
+	     follows="left|top|right" font="SansSerifSmall" height="19" left="10"
+	     max_length="63" mouse_opaque="true" name="name_form" width="280" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-19" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="15" left="10"
+	     mouse_opaque="false" name="description_label" v_pad="0" width="270">
+		Description:
+	</text>
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-23"
+	     follows="left|top|right" font="SansSerifSmall" height="19" left="10"
+	     max_length="127" mouse_opaque="true" name="description_form" width="280" spell_check="true" />
+	<button bottom="-180" follows="right|bottom" font="SansSerif" halign="center"
+	     height="20" label="Cancel" label_selected="Cancel" left="200"
+	     mouse_opaque="true" name="cancel_btn" width="90" />
+	<button bottom="-180" follows="left|bottom" font="SansSerif" halign="center"
+	     height="20" label="Upload ([UPLOADFEE])"
+	     left_delta="-135" mouse_opaque="true" name="ok_btn" width="130" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_statistics.xml b/indra/newview/skins/default/xui/es/floater_statistics.xml
new file mode 100644
index 000000000..b11e26611
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_statistics.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true"
+	follows="right|top"
+    width="250"
+    height="392"
+	min_width="100"
+	min_height="100"
+    mouse_opaque="false"
+	name="stats floater"
+    can_resize="true"
+	rect_control="FloaterStatisticsRect"
+    title="Statistics"
+	>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_telehub.xml b/indra/newview/skins/default/xui/es/floater_telehub.xml
new file mode 100644
index 000000000..1c3662207
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_telehub.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="250" min_height="220" min_width="83"
+     name="telehub" title="Telehub" width="272">
+	<text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16"
+	     left="10" name="status_text_connected" width="260">
+		Telehub connected to object [OBJECT]
+	</text>
+	<text bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" left="10"
+	     name="status_text_not_connected" width="200">
+		No telehub connected.
+	</text>
+	<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
+	     left="10" name="help_text_connected" width="260">
+		To remove, click Disconnect.
+	</text>
+	<text bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" left="10"
+	     name="help_text_not_connected" width="260">
+		Select object and click Connect Telehub.
+	</text>
+	<button bottom_delta="-20" follows="top|left" font="SansSerifSmall" height="20"
+	     label="Connect Telehub" left="10" name="connect_btn" width="110" />
+	<button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
+	     label="Disconnect" left="130" name="disconnect_btn" width="110" />
+	<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+	     left="10" name="spawn_points_text" width="200">
+		Spawn Points (positions, not objects):
+	</text>
+	<scroll_list bottom_delta="-60" draw_border="true" follows="left|top" font="SansSerifSmall"
+	     height="60" left="10" multi_select="false" name="spawn_points_list"
+	     width="230" />
+	<button bottom_delta="-25" follows="top|left" font="SansSerifSmall" height="20"
+	     label="Add Spawn" left="10" name="add_spawn_point_btn" width="110" />
+	<button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
+	     label="Remove Spawn" left="130" name="remove_spawn_point_btn" width="110" />
+	<text bottom_delta="-85" follows="top|left" font="SansSerifSmall" height="80"
+	     left="10" name="spawn_point_help" width="260">
+		Select object and click Add to specify position.
+You may then move or delete the object.
+Positions are relative to the telehub center.
+Select item in list to show position in world.
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_teleport.xml b/indra/newview/skins/default/xui/es/floater_teleport.xml
new file mode 100644
index 000000000..9460de5f6
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_teleport.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!--agentd teleport floater-->
+<floater
+	name="teleport_floater"
+	title="Teleport"
+	can_resize="true"
+	can_minimize="true"
+	can_close="true"
+	can_drag_on_left="false"
+	width="300"
+	height="150"
+	min_width="80"
+	min_height="150"
+	>
+
+	<text name="teleport_text"
+		font="SansSerifSmall"
+		left="10"
+		bottom_delta="-40"
+		width="260"
+		height="16"
+                follows="left|top"
+		> Public Region Seed: </text>
+
+
+	<combo_box allow_text_entry="true"
+		name="teleport_edit"
+		width="250"
+		height="20"
+		left="10"
+		bottom_delta="-30"
+		follows="left|top"
+		hidden="false"
+		mouse_opaque="true"
+		max_length="420"
+		font="SansSerif"
+		bevel_style="in"
+		border_style="line"
+		border_thickness="1"
+		select_all_on_focus_received="true"
+	/>
+
+	<button
+		name="teleport_btn"
+		label="Teleport"
+		font="SansSerifSmall"
+		left="10"
+		bottom_delta="-25"
+		width="100"
+		height="20"
+		follows="top|left"
+		/>
+	<button bottom_delta="0" follows="bottom|right" height="20" label="Cancel" right="224"
+	     name="cancel_btn" width="90" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_teleport_history.xml b/indra/newview/skins/default/xui/es/floater_teleport_history.xml
new file mode 100644
index 000000000..1f4827f79
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_teleport_history.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="teleporthistory" title="Teleport History" rect_control="FloaterTeleportHistoryRect"
+	can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
+	min_width="550" min_height="150" width="550" height="200">
+	<scroll_list name="places_list" can_resize="true" multi_select="false"
+		background_visible="true" draw_border="true" draw_stripes="true" draw_heading="true"
+		height="150" width="530" bottom_delta="-170" top="10" left="10" follows="left|top|right|bottom">
+		<column name="parcel" label="Parcel" dynamicwidth="true" />
+		<column name="region" label="Region" width="150" />
+		<column name="position" label="Position" width="90" />
+		<column name="visited" label="Visited" width="110" />
+		<!--Hidden fields, used as storage for prebuilt strings, please keep at width 0-->
+		<column name="slurl" label="" width="0" />
+		<column name="simstring" label="" width="0" />
+	</scroll_list>
+	<button name="teleport" label="Teleport" tool_tip="Teleport to selected location"
+		enabled="false" mouse_opaque="true" font="SansSerif" halign="center"
+		height="20" width="90" bottom_delta="-24" left="10" follows="left|bottom"
+	/>
+	<button name="show_on_map" label="Show on map" tool_tip="Center map on selected location."
+		enabled="false" mouse_opaque="true" font="SansSerif" halign="center"
+		height="20" width="125" bottom_delta="0" left_delta="100" follows="left|bottom"
+	/>
+	<button name="copy_slurl" label="Copy SLURL to clipboard" tool_tip="Copy selected location as SLURL."
+		enabled="false" mouse_opaque="true" font="SansSerif" halign="center"
+		height="20" width="180" bottom_delta="0" left_delta="135" follows="left|bottom"
+	/>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_test.xml b/indra/newview/skins/default/xui/es/floater_test.xml
new file mode 100644
index 000000000..58e519fa9
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_test.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="40" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="225" left="40" name="Test" title="Test"
+     width="180" />
diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
new file mode 100644
index 000000000..7a15bccaa
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-516" can_close="true" can_drag_on_left="false" can_minimize="false"
+     can_resize="true" can_tear_off="true" enabled="true" height="360"
+     left="478" min_height="360" min_width="460" mouse_opaque="true"
+     name="texture picker" title="Pick: Texture" width="460">
+	<string name="choose_picture">
+		Click to choose a picture
+	</string>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-110" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="center" height="14" left="4"
+	     mouse_opaque="true" name="Multiple" v_pad="0" width="163">
+		Multiple
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-204" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="4"
+	     mouse_opaque="true" name="unknown" v_pad="0" width="163">
+		Dimensions: [DIMENSIONS]
+	</text>
+	<button bottom="-228" enabled="false" follows="left|bottom" font="SansSerifSmall"
+	     halign="center" height="20" label="Default" label_selected="Default"
+	     left="4" mouse_opaque="true" name="Default" scale_image="true" width="64" />
+	<button bottom="-228" enabled="false" follows="left|bottom" font="SansSerifSmall"
+	     halign="center" height="20" label="Alpha" label_selected="Alpha" left="72"
+	     mouse_opaque="true" name="Alpha" scale_image="true" width="64" />
+	<button bottom="-252" enabled="true" follows="left|bottom" font="SansSerifSmall"
+	     halign="center" height="20" label="Blank" label_selected="Blank" left="4"
+	     mouse_opaque="true" name="Blank" scale_image="true" width="64" />
+	<button bottom="-252" enabled="false" follows="left|bottom" font="SansSerifSmall"
+	     halign="center" height="20" label="Invisible" label_selected="Invisible" left="72"
+	     mouse_opaque="true" name="Invisible" scale_image="true" width="64" />
+	<check_box bottom="-305" enabled="true" follows="left|bottom" font="SansSerifSmall"
+	     height="20" initial_value="true" label="Show Folders" left="4"
+	     mouse_opaque="true" name="show_folders_check" radio_style="false"
+	     width="150" />
+	<check_box bottom="-322" enabled="true" follows="left|bottom" font="SansSerifSmall"
+	     height="20" initial_value="true" label="Apply Immediately" left="4"
+	     mouse_opaque="true" name="apply_immediate_check" radio_style="false"
+	     width="150" />
+	<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
+	     halign="center" height="32" image_selected="eye_button_active.tga"
+	     image_unselected="eye_button_inactive.tga" label="" label_selected=""
+	     left="139" mouse_opaque="true" name="Pipette" scale_image="true" width="32" />
+	<button bottom="-322" enabled="true" follows="right|bottom" font="SansSerif"
+	     halign="center" height="20" label="Cancel" label_selected="Cancel"
+	     left="176" mouse_opaque="true" name="Cancel" scale_image="true" width="100" />
+	<button bottom="-322" enabled="true" follows="right|bottom" font="SansSerif"
+	     halign="center" height="20" label="Select" label_selected="Select"
+	     left="280" mouse_opaque="true" name="Select" scale_image="true" width="100" />
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-345"
+	     left="8" follows="bottom|left" font="SansSerif" handle_edit_keys_directly="false"
+	     height="20" max_length="36" mouse_opaque="true" name="texture_uuid"
+	     select_all_on_focus_received="false" width="230" />
+	<button enabled="true" follows="left|bottom" font="SansSerif"
+	     height="20" label="Apply UUID" label_selected="Apply UUID"
+	     left="238" bottom="-345" mouse_opaque="true" 
+	     name="ApplyUUID" scale_image="true" width="100" />
+	<string name="pick title">
+		Pick:
+	</string>
+
+  	<tab_container border="false" bottom_delta="20" width="410" height="300" left="175" mouse_opaque="false" name="actions_tab_container" tab_position="top" follows="left|top|right|bottom">
+    <panel border="false" bottom_delta="0" follows="right|top" height="300" label="Inventory" left="0" mouse_opaque="false" name="server_tab" width="410">
+        <search_editor bottom_delta="-20" enabled="true" follows="left|top|right" height="16"
+	         label="Type here to search" left="0" mouse_opaque="true"
+	         name="inventory search editor" width="271" />
+        <inventory_panel allow_multi_select="false" border="true" bottom="-270" enabled="true"
+	         follows="left|top|right|bottom" height="245" left="0" mouse_opaque="true"
+	         name="inventory panel" sort_order="TexturePickerSortOrder" width="271" />
+    </panel>
+    <panel border="false" bottom_delta="0" follows="left|top" height="300" label="Computer" left="175" mouse_opaque="false" name="local_tab" width="410">
+  <!-- tag: vaa emerald local_asset_browser [begin] -->
+      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+           bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+           font="SansSerifSmall" h_pad="0" halign="left" height="14" left="4"
+           mouse_opaque="true" name="select_local" v_pad="0" width="400">
+        Select texture on your computer to preview inworld
+      </text>
+      <button bottom_delta="-22" enabled="true" follows="left|top" 
+              font="SansSerifSmall" halign="center" height="20" 
+              label="Add" left="4" mouse_opaque="true" 
+              name="Add" scale_image="true" width="70" visible="true" />
+      <button bottom_delta="0" enabled="true" follows="left|top" 
+              font="SansSerifSmall" halign="center" height="20" 
+              label="Remove" left_delta="73" mouse_opaque="true" 
+              name="Remove" scale_image="true" width="70" visible="true" />
+      <button bottom_delta="0" enabled="true" follows="left|top" 
+              font="SansSerifSmall" halign="center" height="20" 
+              label="Properties..." left_delta="103" mouse_opaque="true" 
+              name="Browser" scale_image="true" width="90" visible="true" />
+      <scroll_list
+              name="local_name_list"
+              left="0"
+              bottom="-270"
+              width="271"
+              height="225"
+              follows="left|top|right|bottom"
+              column_padding="0"
+              can_resize="false"
+              draw_heading="true"
+              multi_select="true"
+              search_column="1"
+              visible="true"
+	  	        >
+	      <column name="unit_name" label="Name" dynamicwidth="true" />
+	      <column name="unit_id_HIDDEN" label="ID" width="0" />
+	    </scroll_list>
+	  <!-- tag: vaa emerald local_asset_browser [end] -->
+    </panel>
+  </tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
new file mode 100644
index 000000000..2375b379f
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -0,0 +1,1552 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-359" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" follows="left|top" height="550" 
+     left="308" min_height="100" min_width="100" mouse_opaque="true"
+     name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
+     short_title="Build" width="272">
+
+<!-- Main floater tabs -->
+
+	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
+	    image_disabled="tool_zoom.tga" image_disabled_selected="tool_zoom_active.tga"
+	    image_selected="tool_zoom_active.tga" image_unselected="tool_zoom.tga"
+	    label="" label_selected="" left="4" mouse_opaque="true" name="button focus"
+	    tool_tip="Focus" width="32" />
+	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
+	    image_disabled="UIImgGrabUUID" image_disabled_selected="UIImgGrabSelectedUUID"
+	    image_selected="UIImgGrabSelectedUUID" image_unselected="UIImgGrabUUID"
+	    label="" label_selected="" left="40" mouse_opaque="true" name="button move"
+	    tool_tip="Move" width="32" />
+	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
+	    image_disabled="UIImgFaceUUID" image_disabled_selected="UIImgFaceSelectedUUID"
+	    image_selected="UIImgFaceSelectedUUID" image_unselected="UIImgFaceUUID"
+	    label="" label_selected="" left="76" mouse_opaque="true" name="button edit"
+	    tool_tip="Edit" width="32" />
+	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
+	    image_disabled="UIImgCreateUUID" image_disabled_selected="UIImgCreateSelectedUUID"
+	    image_selected="UIImgCreateSelectedUUID" image_unselected="UIImgCreateUUID"
+	    label="" label_selected="" left="112" mouse_opaque="true"
+	    name="button create" tool_tip="Create" width="32" />
+	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
+	    image_disabled="tool_dozer.tga" image_disabled_selected="tool_dozer_active.tga"
+	    image_selected="tool_dozer_active.tga" image_unselected="tool_dozer.tga"
+	    label="" label_selected="" left="148" mouse_opaque="true"
+	    name="button land" tool_tip="Land" width="32" />
+
+<!-- Focus panel -->
+
+	<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
+	    initial_value="false" label="Zoom" left="4" mouse_opaque="true"
+	    name="radio zoom" radio_style="true" width="114" />
+	<volume_slider bottom="-69" follows="left|top" height="14" increment="0.01"
+	    initial_val="0.125" left="114" max_val="0.5" min_val="0"
+	    mouse_opaque="true" name="slider zoom" width="134" />
+	<check_box bottom="-84" follows="left|top" font="SansSerifSmall" height="16"
+	    initial_value="false" label="Orbit (Ctrl)" left="4" mouse_opaque="true"
+	    name="radio orbit" radio_style="true" width="114" />
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	    initial_value="false" label="Pan (Ctrl-Shift)" left="4"
+	    mouse_opaque="true" name="radio pan" radio_style="true" width="114" />
+
+<!-- Move panel -->
+
+	<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
+	    initial_value="false" label="Move" left="4" mouse_opaque="true"
+	    name="radio move" radio_style="true" width="114" />
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	    initial_value="false" label="Lift (Ctrl)" left="4" mouse_opaque="true"
+	    name="radio lift" radio_style="true" width="114" />
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	    initial_value="false" label="Spin (Ctrl-Shift)" left="4"
+	    mouse_opaque="true" name="radio spin" radio_style="true" width="114" />
+
+<!-- Edit panel -->
+	<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
+	    initial_value="false" label="Position" left="4" mouse_opaque="true"
+	    name="radio position" radio_style="true" width="114" />
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	    initial_value="false" label="Rotate (Ctrl)" left="4" mouse_opaque="true"
+	    name="radio rotate" radio_style="true" width="114" />
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	    initial_value="false" label="Stretch (Ctrl-Shift)" left="4"
+	    mouse_opaque="true" name="radio stretch" radio_style="true" width="123" />
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	    initial_value="false" label="Select Texture" left="4" mouse_opaque="true"
+	    name="radio select face" radio_style="true" width="114" />
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	    initial_value="false" label="Align (Ctrl-A)" left="4" mouse_opaque="true"
+	    name="radio align" radio_style="true" width="114" />
+	<check_box bottom_delta="-15" control_name="EditLinkedParts" follows="left|top"
+	    font="SansSerifSmall" height="16" initial_value="false"
+	    label="Edit linked parts" left="4" mouse_opaque="true"
+	    name="checkbox edit linked parts" width="114" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	    bottom_delta="-17" drop_shadow_visible="true" follows="left|top"
+	    font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"
+	    mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">
+		Ruler:
+	</text>
+	<combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
+	    left_delta="40" max_chars="20" mouse_opaque="true"
+	    name="combobox grid mode" width="86">
+		<combo_item name="World" value="World">
+			World
+		</combo_item>
+		<combo_item name="Local" value="Local">
+			Local
+		</combo_item>
+		<combo_item name="Reference" value="Reference">
+			Reference
+		</combo_item>
+	</combo_box>
+	<check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
+	    font="SansSerifSmall" height="15" initial_value="false"
+	    label="Stretch Both Sides" left="143" mouse_opaque="true"
+	    name="checkbox uniform" width="134" />
+	<check_box bottom_delta="-16" control_name="ScaleStretchTextures" follows="left|top"
+	    font="SansSerifSmall" height="15" initial_value="true"
+	    label="Stretch Textures" left_delta="0" mouse_opaque="true"
+	    name="checkbox stretch textures" width="134" />
+	<check_box bottom_delta="-16" control_name="LimitDragDistance" follows="left|top"
+	    font="SansSerifSmall" height="15" initial_value="true"
+	    label="Limit drag distance" left_delta="0" mouse_opaque="true"
+	    name="checkbox limit drag distance" width="134" />
+	<check_box bottom_delta="-16" control_name="SnapEnabled" follows="left|top"
+	    font="SansSerifSmall" height="15" initial_value="true" label="Use Grid"
+	    left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
+	<button bottom_delta="-17" follows="left|top" font="SansSerifSmall" halign="center" 
+		valign="center" height="20" label="Options..." label_selected="Options..." 
+		left_delta="20" mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
+
+<!-- Help text -->
+
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	    bottom="-52" drop_shadow_visible="true" follows="left|top"
+	    font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+	    mouse_opaque="true" name="text status" v_pad="0" width="264">
+		Drag to move, shift-drag to copy
+	</text>
+
+<!-- Create panel -->
+
+	<button bottom="-75" follows="left|top" font="SansSerif" halign="center" height="24"
+	    image_disabled="object_cube.tga"
+	    image_disabled_selected="object_cube_active.tga"
+	    image_selected="object_cube_active.tga" image_unselected="object_cube.tga"
+	    label="" label_selected="" left="4" mouse_opaque="true" name="ToolCube"
+	    scale_image="TRUE" width="24" tool_tip="Cube"/>
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	    height="24" image_disabled="object_prism.tga" image_disabled_selected="object_prism_active.tga"
+	    image_selected="object_prism_active.tga" image_unselected="object_prism.tga" 
+		label="" label_selected="" left_delta="23" mouse_opaque="true" name="ToolPrism" 
+		scale_image="TRUE" tool_tip="Prism" width="24" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	    height="24" image_disabled="object_pyramid.tga"
+	    image_disabled_selected="object_pyramid_active.tga"
+	    image_selected="object_pyramid_active.tga"
+	    image_unselected="object_pyramid.tga" label="" label_selected=""
+	    left_delta="23" mouse_opaque="true" name="ToolPyramid" scale_image="TRUE"
+ tool_tip="Pyramid" width="24" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	    height="24" image_disabled="object_tetrahedron.tga"
+	    image_disabled_selected="object_tetrahedron_active.tga"
+	    image_selected="object_tetrahedron_active.tga"
+	    image_unselected="object_tetrahedron.tga" label="" label_selected=""
+	    left_delta="23" mouse_opaque="true" name="ToolTetrahedron"
+	    scale_image="TRUE" tool_tip="Tetrahedron" width="24" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	    height="24" width="24" image_disabled="object_cylinder.tga"
+	    image_disabled_selected="object_cylinder_active.tga"
+	    image_selected="object_cylinder_active.tga"
+	    image_unselected="object_cylinder.tga" label="" label_selected=""
+	    left_delta="23" mouse_opaque="true" tool_tip="Cylinder" name="ToolCylinder" scale_image="TRUE"/>
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	    height="24" image_disabled="object_hemi_cylinder.tga"
+	    image_disabled_selected="object_hemi_cylinder_active.tga"
+	    image_selected="object_hemi_cylinder_active.tga"
+	    image_unselected="object_hemi_cylinder.tga" label="" label_selected=""
+	    left_delta="23" mouse_opaque="true" name="ToolHemiCylinder"
+	    scale_image="TRUE" tool_tip="Hemicylinder" width="24" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	    height="24" image_disabled="object_cone.tga"
+	    image_disabled_selected="object_cone_active.tga"
+	    image_selected="object_cone_active.tga" image_unselected="object_cone.tga"
+	    label="" label_selected="" left_delta="23" mouse_opaque="true"
+	    name="ToolCone" scale_image="TRUE" tool_tip="Cone" width="24" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	    height="24" image_disabled="object_hemi_cone.tga"
+	    image_disabled_selected="object_hemi_cone_active.tga"
+	    image_selected="object_hemi_cone_active.tga"
+	    image_unselected="object_hemi_cone.tga" label="" label_selected=""
+	    left_delta="23" mouse_opaque="true" name="ToolHemiCone" scale_image="TRUE"
+		tool_tip="Hemicone" width="24" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	    height="24" image_disabled="object_sphere.tga"
+	    image_disabled_selected="object_sphere_active.tga"
+	    image_selected="object_sphere_active.tga"
+	    image_unselected="object_sphere.tga" label="" label_selected=""
+	    left_delta="23" mouse_opaque="true" name="ToolSphere" scale_image="TRUE"
+	    width="24" tool_tip="Sphere" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	    height="24" image_disabled="object_hemi_sphere.tga"
+	    image_disabled_selected="object_hemi_sphere_active.tga"
+	    image_selected="object_hemi_sphere_active.tga"
+	    image_unselected="object_hemi_sphere.tga" label="" label_selected=""
+	    left_delta="23" mouse_opaque="true" name="ToolHemiSphere"
+	    scale_image="TRUE" tool_tip="Hemisphere" width="24" />
+	<button bottom_delta="-23" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_torus.tga"
+	     image_disabled_selected="object_torus_active.tga"
+	     image_selected="object_torus_active.tga"
+	     image_unselected="object_torus.tga" label="" label_selected="" left="4"
+	     mouse_opaque="true" name="ToolTorus" scale_image="TRUE" tool_tip="Torus" width="24" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_tube.tga"
+	     image_disabled_selected="object_tube_active.tga"
+	     image_selected="object_tube_active.tga" image_unselected="object_tube.tga"
+	     label="" label_selected="" left_delta="23" mouse_opaque="true"
+	     name="ToolTube" scale_image="TRUE" tool_tip="Tube" width="24" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_ring.tga"
+	     image_disabled_selected="object_ring_active.tga"
+	     image_selected="object_ring_active.tga" image_unselected="object_ring.tga"
+	     label="" label_selected="" left_delta="23" mouse_opaque="true"
+	     name="ToolRing" scale_image="TRUE" tool_tip="Ring" width="24" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_tree.tga"
+	     image_disabled_selected="object_tree_active.tga"
+	     image_selected="object_tree_active.tga" image_unselected="object_tree.tga"
+	     label="" label_selected="" left_delta="23" mouse_opaque="true"
+	     name="ToolTree" scale_image="TRUE" tool_tip="Tree" width="24" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="24" image_disabled="object_grass.tga"
+	     image_disabled_selected="object_grass_active.tga"
+	     image_selected="object_grass_active.tga"
+	     image_unselected="object_grass.tga" label="" label_selected=""
+	     left_delta="23" mouse_opaque="true" name="ToolGrass" scale_image="TRUE"
+	     tool_tip="Grass" width="24" />
+	<check_box bottom="-117" control_name="CreateToolKeepSelected" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="false"
+	     label="Keep selected" left="4" mouse_opaque="true"
+	     name="checkbox sticky" width="128" />
+	<check_box bottom_delta="-15" control_name="CreateToolCopySelection" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="false"
+	     label="Copy selected" left_delta="0" mouse_opaque="true"
+	     name="checkbox copy selection" width="134" />
+	<check_box bottom_delta="-16" control_name="CreateToolCopyCenters" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="true" label="Center"
+	     left_delta="18" mouse_opaque="true" name="checkbox copy centers"
+	     width="134" />
+	<check_box bottom_delta="-16" control_name="CreateToolCopyRotates" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="false" label="Rotate"
+	     left_delta="0" mouse_opaque="true" name="checkbox copy rotates" width="134" />
+
+<!-- Land panel -->
+
+	<check_box bottom="-69" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Select Land" left="4" mouse_opaque="true"
+	     name="radio select land" radio_style="true" width="114" />
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Flatten" left="4" mouse_opaque="true"
+	     name="radio flatten" radio_style="true" width="114" />
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Raise" left="4" mouse_opaque="true"
+	     name="radio raise" radio_style="true" width="114" />
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Lower" left="4" mouse_opaque="true"
+	     name="radio lower" radio_style="true" width="114" />
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Smooth" left="4" mouse_opaque="true"
+	     name="radio smooth" radio_style="true" width="114" />
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Roughen" left="4" mouse_opaque="true"
+	     name="radio noise" radio_style="true" width="114" />
+	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Revert" left="4" mouse_opaque="true"
+	     name="radio revert" radio_style="true" width="114" />
+	<button bottom="-72" follows="left|top" font="SansSerifSmall" halign="center"
+	     height="20" label="Apply" label_selected="Apply"
+	     left="116" mouse_opaque="true" name="button apply to selection"
+	     scale_image="TRUE" tool_tip="Modify Selected Land" width="78" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
+	     border_visible="false" bottom_delta="-16" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="118"
+	     hidden="false" mouse_opaque="true" name="Bulldozer:" v_pad="0" width="100">
+	          Bulldozer:
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
+	     border_visible="false" bottom_delta="-18" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="132"
+	     hidden="false" mouse_opaque="true" name="Dozer Size:" v_pad="0" width="100">
+	          Size
+	</text>
+	<volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
+         increment="0.1" initial_val="2.0" left="178" max_val="11.0" min_val="1.0"
+	     mouse_opaque="true" name="slider brush size" width="80" />	
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
+	     border_visible="false" bottom_delta="-18" drop_shadow_visible="true" enabled="true"
+	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="132"
+	      hidden="false" mouse_opaque="true" name="Strength:" v_pad="0" width="100">
+	          Strength
+	</text>
+	<volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
+	     increment="0.1" initial_val="0.00" left="178" max_val="2.0" min_val="-1.0"
+	     mouse_opaque="true" name="slider force" width="80" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+         bottom="-151" left="118" drop_shadow_visible="true" follows="left|top"
+         font="SansSerifSmall" h_pad="0" halign="right" height="16" visible="false" 
+         mouse_opaque="true" name="link_num_obj_count" v_pad="0" width="143">
+		[DESC] [NUM]
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+       bottom="-163" left="118" drop_shadow_visible="true" follows="left|top"
+       font="SansSerifSmall" h_pad="0" halign="right" height="16"
+       mouse_opaque="true" name="prim_count" v_pad="0" width="143"/>
+
+<!-- Sub-tabs -->
+
+	<tab_container bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="false"
+	     name="Object Info Tabs" tab_max_width="52" tab_min_width="40"
+	     tab_position="top" width="272">
+		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
+		     label="General" left="1" mouse_opaque="false" name="General" width="270">
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="Name:" v_pad="0" width="78">
+				Name:
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-26"
+			     follows="left|top|right" font="SansSerifSmall" height="16" left="88"
+			     max_length="63" mouse_opaque="true" name="Object Name"
+			     select_all_on_focus_received="true" width="172" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-40" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="Description:" v_pad="0" width="78">
+				Description:
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-46"
+			     follows="left|top|right" font="SansSerifSmall" height="16" left="88"
+			     max_length="127" mouse_opaque="true" name="Object Description"
+			     select_all_on_focus_received="true" width="172" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-66" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+			     mouse_opaque="true" name="Creator:" v_pad="0" width="78">
+				Creator:
+			</text>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-66" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
+			     mouse_opaque="true" name="Creator Name" v_pad="0" width="88">
+		        Thrax Linden
+      		</text>
+      		<button bottom="-66" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="16" label="Profile..." label_selected="Profile..." left_delta="94"
+			     mouse_opaque="true" name="button creator profile" scale_image="TRUE"
+			     width="78" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-86" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+			     mouse_opaque="true" name="Owner:" v_pad="0" width="78">
+				Owner:
+			</text>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-86" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
+			     mouse_opaque="true" name="Owner Name" v_pad="0" width="88">
+		        Thrax Linden
+		    </text>
+		    <button bottom="-86" follows="top|right" font="SansSerifSmall" halign="center"
+			    height="16" label="Profile..." label_selected="Profile..." left_delta="94"
+			    mouse_opaque="true" name="button owner profile" scale_image="TRUE"
+			    width="78" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+				bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+				font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+				mouse_opaque="true" name="Last Owner:" v_pad="0" width="78">
+				Last Owner:
+			</text>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+				bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+				font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
+				mouse_opaque="true" name="Last Owner Name" v_pad="0" width="88">
+				Thrax Linden
+			</text>
+			<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
+				height="16" label="Profile..." label_selected="Profile..." left_delta="94"
+				mouse_opaque="true" name="button last owner profile" scale_image="TRUE"
+				width="78" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+				bottom="-126" drop_shadow_visible="true" follows="left|top"
+				font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+				mouse_opaque="true" name="Group:" v_pad="0" width="78">
+				Group:
+			</text>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			    bottom="-126" drop_shadow_visible="true" follows="left|top"
+			    font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
+			    mouse_opaque="true" name="Group Name Proxy" v_pad="0" visible="false"
+			    width="88">
+				The Lindens
+			</text>
+			<button bottom="-126" follows="top|right" font="SansSerifSmall" halign="center"
+			    height="16" label="Set" label_selected="Set..." left_delta="94"
+			    mouse_opaque="true" name="button set group" scale_image="TRUE" width="30" />
+			<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
+			    height="16" label="View" label_selected="Open" left_delta="30"
+			    mouse_opaque="true" name="button open group" scale_image="TRUE" width="48" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			    bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+			    font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+			    mouse_opaque="true" name="Permissions:" v_pad="0" width="85">
+				Permissions:
+			</text>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			    bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+			    font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+			    mouse_opaque="true" name="perm_modify" v_pad="0" width="250">
+				You can modify this object.
+			</text>
+			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			    initial_value="false" label="Share with group" left="10"
+			    mouse_opaque="true" name="checkbox share with group"
+			    tool_tip="Allow all members of the set group to share and use your permissions for this object. You must Deed to enable role restrictions."
+			    width="166" />
+			<string name="text deed continued">
+				Deed...
+			</string>
+			<string name="text deed">
+				Deed
+			</string>
+			<button bottom="-186" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="20" label="Deed..." label_selected="Deed..." left_delta="172"
+			     mouse_opaque="true" name="button deed" scale_image="TRUE"
+			     tool_tip="Group shared objects can be deeded by a group officer."
+			     width="78" />
+			<check_box bottom="-206" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Allow anyone to move" left="10"
+			     mouse_opaque="true" name="checkbox allow everyone move" width="142" />
+			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Allow anyone to copy" left="10"
+			     mouse_opaque="true" name="checkbox allow everyone copy" width="141" />
+			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Show in search" left="10" name="search_check"
+			     tool_tip="Let people see this object in search results" width="78" />
+			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="For Sale" left="10" mouse_opaque="true"
+			     name="checkbox for sale" width="78" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="90"
+			     mouse_opaque="true" name="Cost" v_pad="0" width="78">
+				Price:  [CURRENCY]
+			</text>
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
+			     follows="left|top|right" font="SansSerifSmall" height="16" left_delta="80"
+			     max_length="25" mouse_opaque="true" name="Edit Cost" width="75" />
+			<radio_group bottom="-286" draw_border="false" follows="left|top|right" height="16"
+			     left="42" mouse_opaque="true" name="sale type" width="218">
+				<radio_item bottom="-16" follows="left|top" height="16" left="0" mouse_opaque="true"
+				     name="Original" width="70">
+					Original
+				</radio_item>
+				<radio_item bottom="-16" follows="left|top" height="16" left="70" mouse_opaque="true"
+				     name="Copy" width="70">
+					Copy
+				</radio_item>
+				<radio_item bottom="-16" follows="left|top" height="16" left="140" mouse_opaque="true"
+				     name="Contents" width="76">
+					Contents
+				</radio_item>
+			</radio_group>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-298" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="Next owner can:" v_pad="0" width="250">
+				Next owner can:
+			</text>
+			<check_box bottom_delta="-22" follows="left|top|right" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Modify" left="10" mouse_opaque="true"
+			     name="checkbox next owner can modify" width="250" />
+			<check_box bottom_delta="0" follows="left|top|right" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Copy" left_delta="60" mouse_opaque="true"
+			     name="checkbox next owner can copy" width="190" />
+			<check_box bottom_delta="0" follows="left|top|right" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Resell/Give away" left_delta="60"
+			     mouse_opaque="true" name="checkbox next owner can transfer" width="130" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-332" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="label click action" v_pad="0" width="150">
+				When Left-Clicked:
+			</text>
+			<combo_box allow_text_entry="false" bottom_delta="-25" follows="left|top" height="18"
+			     left="10" max_chars="20" mouse_opaque="true" name="clickaction" width="150">
+			     <!-- Do not reorder these items, the index numbers are
+					used internally. JC -->
+			<combo_item name="Touch/grab(default)" value="Touch/grab (default)">
+					Touch/grab (default)
+				</combo_item>
+				<combo_item name="Sitonobject" value="Sit on object">
+					Sit on object
+				</combo_item>
+				<combo_item name="Buyobject" value="Buy object">
+					Buy object
+				</combo_item>
+				<combo_item name="Payobject" value="Pay object">
+					Pay object
+				</combo_item>
+				<combo_item name="Open" value="Open">
+					Open
+				</combo_item>
+				<combo_item name="Play" value="Play">
+					Play parcel media
+				</combo_item>
+				<combo_item name="Opemmedia" value="Open Media">
+					Open parcel media
+				</combo_item>
+			</combo_box>
+			<button bottom="-358" follows="top|right" font="SansSerifSmall" halign="center"
+				height="20" label="Copy Key" label_selected="Copy Key" left_delta="172"
+				mouse_opaque="true" name="button cpy_key" scale_image="TRUE"
+				tool_tip="Copies the object key to the clipboard."
+				width="78" />
+      		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-135" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
+			     mouse_opaque="true" name="B:" v_pad="0" width="174">
+				B:
+			</text>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-115" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
+			     mouse_opaque="true" name="O:" v_pad="0" width="124">
+				O;
+			</text>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-115" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
+			     mouse_opaque="true" name="G:" v_pad="0" width="74">
+				G:
+			</text>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-127" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
+			     mouse_opaque="true" name="E:" v_pad="0" width="174">
+				E:
+			</text>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-127" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
+			     mouse_opaque="true" name="N:" v_pad="0" width="124">
+				N:
+			</text>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-127" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
+			     mouse_opaque="true" name="F:" v_pad="0" width="74">
+				F:
+			</text>
+			<string name="text modify info 1">
+				You can modify this object.
+			</string>
+			<string name="text modify info 2">
+				You can modify these objects.
+			</string>
+			<string name="text modify info 3">
+				You cannot modify this object.
+			</string>
+			<string name="text modify info 4">
+				You cannot modify these objects.
+			</string>
+			<string name="text modify warning">
+				Must select entire object to set permissions.
+			</string>
+			<string name="Cost Default">
+			Price:           [CURRENCY]
+			</string>
+			<string name="Cost Total">
+			Total Price:  [CURRENCY]
+			</string>
+			<string name="Cost Per Unit">
+			Price Per:     [CURRENCY]
+			</string>
+			<string name="Cost Mixed">
+			Mixed Price
+			</string>
+			<string name="Sale Mixed">
+			Mixed Sale
+			</string>
+		</panel>
+
+<!-- Object sub-tab -->
+
+		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
+		     label="Object" left="1" mouse_opaque="false" name="Object" width="270">
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="select_single" v_pad="0" width="252">
+			</text>
+			<button bottom="-26" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="18" label="Link" left="10" mouse_opaque="true" name="link_obj"  enabled="true"
+			     tool_tip="He come to town..."  width="50" />
+			<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="18" label="Unlink" left_delta="50" mouse_opaque="true" name="unlink_obj"  enabled="true"
+			     tool_tip="Unlinks linkset."  width="50" />
+			<check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Locked" left="5" mouse_opaque="true"
+			     name="checkbox locked"
+			     tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."
+			     width="123" />
+			<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Physical" left_delta="0" mouse_opaque="true"
+			     name="Physical Checkbox Ctrl"
+			     tool_tip="Allows object to be pushed and affected by gravity" width="123" />
+			<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Temporary" left_delta="0" mouse_opaque="true"
+			     name="Temporary Checkbox Ctrl"
+			     tool_tip="Causes object to be deleted 1 minute after creation." width="123" />
+			<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Phantom" left_delta="0" mouse_opaque="true"
+			     name="Phantom Checkbox Ctrl"
+			     tool_tip="Causes object to not collide with other objects or avatars"
+			     width="123" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="2"
+			     mouse_opaque="true" name="label position" v_pad="0" width="121">
+				Position (meters)
+			</text>
+			<spinner bottom_delta="-22" decimal_digits="4" follows="left|top" height="16"
+			     increment="0.01" initial_val="0" label="X" label_width="10" left_delta="0"
+			     max_val="512" min_val="-256" mouse_opaque="true" name="Pos X"
+			     text_enabled_color="110, 15, 15, 255" width="87" />
+			<spinner bottom_delta="-18" decimal_digits="4" follows="left|top" height="16"
+			     increment="0.01" initial_val="0" label="Y" label_width="10" left_delta="0"
+			     max_val="512" min_val="-256" mouse_opaque="true" name="Pos Y"
+			     text_enabled_color="0, 100, 40, 255" width="87" />
+			<spinner bottom_delta="-18" decimal_digits="4" follows="left|top" height="16"
+			     increment="0.01" initial_val="0" label="Z" label_width="10" left_delta="0"
+			     max_val="4096" min_val="-3.5" mouse_opaque="true" name="Pos Z"
+			     text_enabled_color="0, 67, 132, 255" width="87" />
+			<button bottom_delta="35" follows="top|right" font="SansSerifSmall" halign="center"
+				 height="18" label="C" left_delta="90" mouse_opaque="true" name="copypos" enabled="true"
+				 tool_tip="Copy Position"  width="20" />
+			<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="18" label="P" left_delta="0" mouse_opaque="true" name="pastepos"  enabled="true"
+			     tool_tip="Paste Position"  width="20" />
+			<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="18" label="p" left_delta="0" mouse_opaque="true" name="pasteposclip"  enabled="true"
+			     tool_tip="Paste Position from Clipboard"  width="20" />
+							 
+				 
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="7"
+			     mouse_opaque="true" name="label size" v_pad="0" width="121">
+				Size
+			</text>
+			<spinner bottom_delta="-22" decimal_digits="5" follows="left|top" height="16"
+			     increment="0.01" initial_val="0" label="X" label_width="10" left_delta="0"
+			     max_val="256" min_val="0.01" mouse_opaque="true" name="Scale X"
+			     text_enabled_color="1, 1, 1, 1" width="87" />
+			<spinner bottom_delta="-18" decimal_digits="5" follows="left|top" height="16"
+			     increment="0.01" initial_val="0" label="Y" label_width="10" left_delta="0"
+			     max_val="256" min_val="0.01" mouse_opaque="true" name="Scale Y"
+			     text_enabled_color="1, 1, 1, 1" width="87" />
+			<spinner bottom_delta="-18" decimal_digits="5" follows="left|top" height="16"
+			     increment="0.01" initial_val="0" label="Z" label_width="10" left_delta="0"
+			     max_val="256" min_val="0.01" mouse_opaque="true" name="Scale Z"
+			     text_enabled_color="1, 1, 1, 1" width="87" />
+			<button bottom_delta="35" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="18" label="C" left_delta="90" mouse_opaque="true" name="copysize"  enabled="true"
+			     tool_tip="Copy Size"  width="20" />
+			<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="18" label="P" left_delta="0" mouse_opaque="true" name="pastesize"  enabled="true"
+			     tool_tip="Paste Size"  width="20" />
+			<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="18" label="p" left_delta="0" mouse_opaque="true" name="pastesizeclip"  enabled="true"
+			     tool_tip="Paste Size from Clipboard"  width="20" />
+				 
+				 
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="7"
+			     mouse_opaque="true" name="label rotation" v_pad="0" width="121">
+				Rotation (degrees)
+			</text>
+			<spinner bottom_delta="-22" decimal_digits="2" follows="left|top" height="16"
+			     increment="1" initial_val="0" label="X" label_width="10" left_delta="0"
+			     max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot X"
+			     text_enabled_color="1, 1, 1, 1" width="87" />
+			<spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
+			     increment="1" initial_val="0" label="Y" label_width="10" left_delta="0"
+			     max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Y"
+			     text_enabled_color="1, 1, 1, 1" width="87" />
+			<spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
+			     increment="1" initial_val="0" label="Z" label_width="10" left_delta="0"
+			     max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Z"
+			     text_enabled_color="1, 1, 1, 1" width="87" />
+			<button bottom_delta="35" follows="top|right" font="SansSerifSmall" halign="center"
+				 height="18" label="C" left_delta="90" mouse_opaque="true" name="copyrot"  enabled="true"
+				 tool_tip="Copy Rotation"  width="20" />
+			<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="18" label="P" left_delta="0" mouse_opaque="true" name="pasterot"  enabled="true"
+			     tool_tip="Paste Rotation"  width="20" />
+			<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="18" label="p" left_delta="0" mouse_opaque="true" name="pasterotclip"  enabled="true"
+			     tool_tip="Paste Rotation from Clipboard"  width="20" />
+							 
+							 
+				 
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="label material" v_pad="0" width="121">
+				Material
+			</text>
+			<combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
+			     left="10" max_chars="20" mouse_opaque="true" name="material" width="87">
+				<combo_item name="Stone" value="Stone">
+					Stone
+				</combo_item>
+				<combo_item name="Metal" value="Metal">
+					Metal
+				</combo_item>
+				<combo_item name="Glass" value="Glass">
+					Glass
+				</combo_item>
+				<combo_item name="Wood" value="Wood">
+					Wood
+				</combo_item>
+				<combo_item name="Flesh" value="Flesh">
+					Flesh
+				</combo_item>
+				<combo_item name="Plastic" value="Plastic">
+					Plastic
+				</combo_item>
+				<combo_item name="Rubber" value="Rubber">
+					Rubber
+				</combo_item>
+			</combo_box>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			    bottom="-20" drop_shadow_visible="true" follows="left|top"
+			    font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			    mouse_opaque="true" name="edit_object" v_pad="0" width="252">
+				Params:
+			</text>
+			<button bottom="-24" follows="top|right" font="SansSerifSmall" halign="center"
+			    height="16" label="Copy" left="178" mouse_opaque="true" name="copyparams"  enabled="true"
+			    tool_tip="Copy Parameters from Clipboard"  width="42" />
+			<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="16" label="Paste" left_delta="42" mouse_opaque="true" name="pasteparams"  enabled="true"
+     			 tool_tip="Paste Parameters from Clipboard"  width="42" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-36" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="label basetype" v_pad="0" width="141">
+				Building Block Type
+			</text>
+			<combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
+			     left="121" max_chars="20" mouse_opaque="true" name="comboBaseType"
+			     width="141">
+				<combo_item name="Box" value="Box">
+					Box
+				</combo_item>
+				<combo_item name="Cylinder" value="Cylinder">
+					Cylinder
+				</combo_item>
+				<combo_item name="Prism" value="Prism">
+					Prism
+				</combo_item>
+				<combo_item name="Sphere" value="Sphere">
+					Sphere
+				</combo_item>
+				<combo_item name="Torus" value="Torus">
+					Torus
+				</combo_item>
+				<combo_item name="Tube" value="Tube">
+					Tube
+				</combo_item>
+				<combo_item name="Ring" value="Ring">
+					Ring
+				</combo_item>
+				<combo_item name="Sculpted" value="Sculpted">
+					Sculpted
+				</combo_item>
+
+				<combo_item name="Hemicylinder" value="Hemicylinder">
+					Hemicylinder
+				</combo_item>
+
+				<combo_item name="Spiral Circle" value="Spiral Circle">
+					Spiral Circle
+				</combo_item>
+				<combo_item name="Spiral Square" value="Spiral Square">
+					Spiral Square
+				</combo_item>
+				<combo_item name="Spiral Triangle" value="Spiral Triangle">
+					Spiral Triangle
+				</combo_item>
+				<combo_item name="Spiral Semicircle" value="Spiral Semicircle">
+					Spiral Semicircle
+				</combo_item>
+
+				<combo_item name="Test Cylinder" value="Test Cylinder">
+					Test Cylinder
+				</combo_item>
+				<combo_item name="Test Box" value="Test Box">
+					Test Box
+				</combo_item>
+				<combo_item name="Test Prism" value="Test Prism">
+					Test Prism
+				</combo_item>
+				<combo_item name="Test Hemicylinder" value="Test Hemicylinder">
+					Test Hemicylinder
+				</combo_item>
+
+			</combo_box>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="text cut" v_pad="0" width="141">
+				Path Cut Begin and End
+			</text>
+			<spinner bottom_delta="-22" decimal_digits="3" follows="left|top" height="16"
+			     increment="0.025" initial_val="0" label="B" label_width="10" left="121"
+			     max_val="0.98" min_val="0" mouse_opaque="true" name="cut begin" width="68" />
+			<spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
+			     increment="0.025" initial_val="1" label="E" label_width="10" left_delta="73"
+			     max_val="1" min_val="0.02" mouse_opaque="true" name="cut end" width="68" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="text hollow" v_pad="0" width="68">
+				Hollow
+			</text>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="78"
+			     mouse_opaque="true" name="text skew" v_pad="0" width="63">
+				Skew
+			</text>
+			<spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16"
+			     increment="5" initial_val="0" left="121" max_val="95" min_val="0"
+			     mouse_opaque="true" name="Scale 1" width="68" />
+			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+			     increment="0.05" initial_val="0" left_delta="73" max_val="0.95"
+			     min_val="-0.95" mouse_opaque="true" name="Skew" width="68" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141">
+				Hollow Shape
+			</text>
+			<combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
+			     left="121" max_chars="20" mouse_opaque="true" name="hole" width="141">
+				<combo_item name="Default" value="Default">
+					Default
+				</combo_item>
+				<combo_item name="Circle" value="Circle">
+					Circle
+				</combo_item>
+				<combo_item name="Square" value="Square">
+					Square
+				</combo_item>
+				<combo_item name="Triangle" value="Triangle">
+					Triangle
+				</combo_item>
+			</combo_box>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="text twist" v_pad="0" width="141">
+				Twist Begin and End
+			</text>
+			<spinner bottom_delta="-22" decimal_digits="0" follows="left|top" height="16"
+			     increment="9" initial_val="0" label="B" label_width="10" left="121"
+			     max_val="180" min_val="-180" mouse_opaque="true" name="Twist Begin"
+			     width="68" />
+			<spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16"
+			     increment="9" initial_val="0" label="E" label_width="10" left_delta="73"
+			     max_val="180" min_val="-180" mouse_opaque="true" name="Twist End"
+			     width="68" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="scale_taper" v_pad="0" width="141">
+				Taper
+			</text>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="scale_hole" v_pad="0" width="141">
+				Hole Size
+			</text>
+			<spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
+			     increment="0.05" initial_val="0" label="X" label_width="10" left="121"
+			     max_val="1" min_val="-1" mouse_opaque="true" name="Taper Scale X"
+			     width="68" />
+			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+			     increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
+			     max_val="1" min_val="-1" mouse_opaque="true" name="Taper Scale Y"
+			     width="68" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="text topshear" v_pad="0" width="141">
+				Top Shear
+			</text>
+			<spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
+			     increment="0.05" initial_val="0" label="X" label_width="10" left="121"
+			     max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear X" width="68" />
+			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+			     increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
+			     max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear Y" width="68" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="advanced_cut" v_pad="0" width="141">
+				Profile Cut Begin and End
+			</text>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+			     mouse_opaque="true" name="advanced_dimple" v_pad="0" width="141">
+				Dimple Begin and End
+			</text>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+			     mouse_opaque="true" name="advanced_slice" v_pad="0" width="141">
+				Slice Begin and End
+			</text>
+			<spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
+			     increment="0.025" initial_val="0" label="B" label_width="10" left="121"
+			     max_val="0.95" min_val="0" mouse_opaque="true" name="Path Limit Begin"
+			     width="68" />
+			<spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
+			     increment="0.025" initial_val="1" label="E" label_width="10" left_delta="73"
+			     max_val="1" min_val="0.05" mouse_opaque="true" name="Path Limit End"
+			     width="68" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="text taper2" v_pad="0" width="141">
+				Taper
+			</text>
+			<spinner bottom_delta="-19" decimal_digits="2" follows="left|top" height="16"
+			     increment="0.01" initial_val="0" label="X" label_width="10" left="121"
+			     max_val="1" min_val="-1" mouse_opaque="true" name="Taper X" width="68" />
+			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+			     increment="0.01" initial_val="0" label="Y" label_width="10" left_delta="73"
+			     max_val="1" min_val="-1" mouse_opaque="true" name="Taper Y" width="68" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
+			     mouse_opaque="true" name="text radius delta" v_pad="0" width="78">
+				Radius
+			</text>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="73"
+			     mouse_opaque="true" name="text revolutions" v_pad="0" width="68">
+				Revolutions
+			</text>
+			<spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
+			     increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1"
+			     mouse_opaque="true" name="Radius Offset" width="68" />
+			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
+			     increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1"
+			     mouse_opaque="true" name="Revolutions" width="68" />
+			<texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
+			     default_image_name="Default" follows="left|top" height="141"
+			     label="Sculpt Texture" left="121" mouse_opaque="true"
+			     name="sculpt texture control" tool_tip="Click to choose a picture"
+			     visible="false" width="141" />
+            <check_box bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16"
+                 initial_value="false" label="Mirror" left="121" mouse_opaque="true"
+                 name="sculpt mirror control" visible="false"
+                 tool_tip="Flips sculpted prim along the X axis."
+                 width="121" />
+            <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+                 initial_value="false" label="Inside-out" left="121" mouse_opaque="true"
+                 name="sculpt invert control" visible="false"
+                 tool_tip="Inverts the sculpted prims normals, making it appear inside-out."
+                 width="121" />
+			<text align="left" bg_visible="false" border_drop_shadow_visible="false"
+			     border_visible="false" bottom_delta="-20" drop_shadow_visible="true"
+			     follows="left|top" font="SansSerifSmall" h_pad="0" height="10" left="121"
+			     mouse_opaque="true" name="label sculpt type" v_pad="0" visible="false"
+			     width="121">
+				Stitching type
+			</text>
+			<combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
+			     left="121" max_chars="20" mouse_opaque="true" name="sculpt type control"
+			     visible="false" width="141">
+				<combo_item name="None" value="None">
+					(none)
+				</combo_item>
+				<combo_item name="Sphere" value="Sphere">
+					Sphere
+				</combo_item>
+				<combo_item name="Torus" value="Torus">
+					Torus
+				</combo_item>
+				<combo_item name="Plane" value="Plane">
+					Plane
+				</combo_item>
+				<combo_item name="Cylinder" value="Cylinder">
+					Cylinder
+				</combo_item>
+      		</combo_box>
+		</panel>
+
+<!-- Features sub-tab -->
+
+		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
+		     label="Features" left="1" mouse_opaque="false" name="Features" width="270">
+		     	<string name="None">None</string>
+			<string name="Prim">Prim</string>
+			<string name="Convex Hull">Convex Hull</string>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="select_single" v_pad="0" width="252">
+				Select only one primitive to edit features.
+			</text>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="edit_object" v_pad="0" width="252">
+				Edit object features:
+			</text>
+			<check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Flexible Path" left="10" mouse_opaque="true"
+			     name="Flexible1D Checkbox Ctrl"
+			     tool_tip="Allows object to flex about the Z axis. (Client-side only)"
+			     width="121" />
+			<spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
+			     increment="1" initial_val="2" label="Softness" label_width="55" left="10"
+			     max_val="3" min_val="0" mouse_opaque="true" name="FlexNumSections"
+			     width="118" />
+			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
+			     increment="0.5" initial_val="0.3" label="Gravity" label_width="55"
+			     left="10" max_val="10" min_val="-10" mouse_opaque="true" name="FlexGravity"
+			     width="118" />
+			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
+			     increment="0.5" initial_val="2" label="Drag" label_width="55" left="10"
+			     max_val="10" min_val="0" mouse_opaque="true" name="FlexFriction"
+			     width="118" />
+			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
+			     increment="0.5" initial_val="0" label="Wind" label_width="55" left="10"
+			     max_val="10" min_val="0" mouse_opaque="true" name="FlexWind" width="118" />
+			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
+			     increment="0.5" initial_val="1" label="Tension" label_width="55" left="10"
+			     max_val="10" min_val="0" mouse_opaque="true" name="FlexTension" width="118" />
+			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
+			     increment="0.01" initial_val="0" label="Force X" label_width="55" left="10"
+			     max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceX"
+			     width="118" />
+			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
+			     increment="0.01" initial_val="0" label="Force Y" label_width="55" left="10"
+			     max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceY"
+			     width="118" />
+			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
+			     increment="0.01" initial_val="0" label="Force Z" label_width="55" left="10"
+			     max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceZ"
+			     width="118" />
+			<check_box bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Light" left="10" mouse_opaque="true"
+			     name="Light Checkbox Ctrl" tool_tip="Causes object to emit light"
+			     width="121" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-21" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
+			     mouse_opaque="true" name="label color" v_pad="0" width="58">
+				Color
+			</text>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="114"
+			     mouse_opaque="true" name="label texture" v_pad="0" width="58">
+				Texture
+			</text>
+			<color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-28"
+				left="55"
+			     can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
+			     height="48" label="" mouse_opaque="true" name="colorswatch"
+			     tool_tip="Click to open Color Picker" width="32" />
+			
+			 <texture_picker
+		            allow_no_texture="true"
+		            bottom_delta="-1"
+		            can_apply_immediately="true"
+		            default_image_name="Default"
+		            follows="left|top"
+		            height="48"
+		            label=""
+		            left_delta="124"
+		            mouse_opaque="true"
+		            name="light texture control"
+		            tool_tip="Click to choose a projection image (only has effect with deferred rendering enabled)"
+		            width="32" />
+			<spinner bottom_delta="-4" decimal_digits="3" follows="left|top" height="16"
+				left="10"
+			     increment="0.1" initial_val="0.5" label="Intensity" label_width="45"
+			     max_val="1" min_val="0" mouse_opaque="true"
+			     name="Light Intensity" 
+			     width="108" />
+			<spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
+				left_delta="114"
+			     increment="0.1" initial_val="0.5" label="FOV" label_width="55"
+			     max_val="3" min_val="0" mouse_opaque="true"
+			     name="Light FOV" 
+			     width="118" />
+			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
+				left="10"
+			     increment="0.1" initial_val="5" label="Radius" label_width="45"
+			     max_val="20" min_val="0" mouse_opaque="true"
+			     name="Light Radius" 
+			     width="108" />
+			<spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
+				left_delta="114" 
+			     increment="0.5" initial_val="0.5" label="Focus" label_width="55"
+			     max_val="20" min_val="-20" mouse_opaque="true"
+			     name="Light Focus" 
+			     width="118" />
+			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
+				left="10"
+			     increment="0.25" initial_val="1" label="Falloff" label_width="45"
+			     max_val="2" min_val="0" mouse_opaque="true"
+			     name="Light Falloff" 
+			     width="108" />
+			<spinner bottom_delta="0" 
+				decimal_digits="3" 
+				follows="left|top" 
+				height="16"
+				left_delta="114" 
+			     	ncrement="0.05" 
+				initial_val="1" 
+				label="Ambiance" 
+				label_width="55"
+			     	max_val="1" 
+			     	min_val="0" 
+			     	mouse_opaque="true"
+			     	name="Light Ambiance" 
+			     	width="118" />
+            <text
+             type="string"
+             length="1"
+             follows="left|top"
+             height="10"
+             layout="topleft"
+             name="label physicsshapetype"
+	     left_delta="13"
+             bottom="-41"
+             width="121">
+                Physics Shape Type:
+            </text>
+			<combo_box
+			   height="19"
+			   bottom_delta="-26" 
+			   layout="topleft"
+			   follows="left|top"
+			   name="Physics Shape Type Combo Ctrl"
+			   tool_tip="Choose the physics shape type"
+			   width="108"/>
+	    <spinner
+             follows="left|top"
+             height="19"
+             increment="0.1"
+             initial_value="1"
+             label="Gravity"
+             label_width="55"
+             layout="topleft"
+             min_val="-1"
+             max_val="28"
+             name="Physics Gravity"
+             top_pad="10"
+             width="118" />
+
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.1"
+             initial_value="0"
+             label="Friction"
+             label_width="55"
+             layout="topleft"
+             left_delta="0"
+             max_val="255"
+             min_val="0"
+             name="Physics Friction"
+             top_pad="4"
+	     bottom_delta="-20"
+             width="118" />
+
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.1"
+             initial_value="0"
+             label="Density"
+             label_width="55"
+             label_wrap="true"
+             layout="topleft"
+             left_delta="0"
+             max_val="22587"
+             min_val="1"
+             name="Physics Density"
+             top_pad="4"
+	     bottom_delta="-20"
+             width="118" />
+
+            <spinner
+             follows="left|top"
+             height="19"
+             increment="0.01"
+             initial_value="0"
+             label="Restitution"
+             label_width="55"
+             layout="topleft"
+             left_delta="0"
+             max_val="1"
+             min_val="0"
+             name="Physics Restitution"
+             top_pad="8"
+	     bottom_delta="-20"
+             width="118" />
+		</panel>
+
+<!-- Texture sub-tab -->
+
+		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
+		     label="Texture" left="1" mouse_opaque="false" name="Texture" width="270">
+			<texture_picker allow_no_texture="false" allow_invisible_texture="true" bottom="-90" can_apply_immediately="true"
+			     default_image_name="Default" follows="left|top" height="80" label="Texture"
+			     left="10" mouse_opaque="true" name="texture control"
+			     tool_tip="Click to choose a picture" width="64" />
+			<color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-90"
+			     can_apply_immediately="true" color="1, 1, 1, 1" follows="left|top"
+			     height="80" label="Color" left_delta="90" mouse_opaque="true"
+			     name="colorswatch" tool_tip="Click to open Color Picker" width="64" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-11" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"
+			     mouse_opaque="true" name="color trans" v_pad="0" width="80">
+				Transparency %
+			</text>
+			<spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
+			     increment="2" initial_val="0" left="180" max_val="100" min_val="0"
+			     mouse_opaque="true" name="ColorTrans" width="80" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10"
+			     left="180" mouse_opaque="true" name="glow label" v_pad="0" width="80">
+				Glow
+			</text>
+			<spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
+			     increment="0.1" initial_val="0" left="180" max_val="1"
+			     min_val="0" mouse_opaque="true" name="glow" width="80" />
+			<check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Full Bright" left="180" mouse_opaque="true"
+			     name="checkbox fullbright" width="81" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-104" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="tex gen" v_pad="0" width="90">
+				Mapping
+			</text>
+			<combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
+			     left="10" max_chars="20" mouse_opaque="true" name="combobox texgen"
+			     width="80">
+				<combo_item name="Default" value="Default">
+					Default
+				</combo_item>
+				<combo_item name="Planar" value="Planar">
+					Planar
+				</combo_item>
+			</combo_box>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-104" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="100"
+			     mouse_opaque="true" name="label shininess" v_pad="0" width="70">
+				Shininess
+			</text>
+			<combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
+			     left="100" max_chars="20" mouse_opaque="true" name="combobox shininess"
+			     width="70">
+				<combo_item name="None" value="None">
+					None
+				</combo_item>
+				<combo_item name="Low" value="Low">
+					Low
+				</combo_item>
+				<combo_item name="Medium" value="Medium">
+					Medium
+				</combo_item>
+				<combo_item name="High" value="High">
+					High
+				</combo_item>
+			</combo_box>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-104" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"
+			     mouse_opaque="true" name="label bumpiness" v_pad="0" width="80">
+				Bumpiness
+			</text>
+			<combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
+			     left="180" max_chars="20" mouse_opaque="true" name="combobox bumpiness"
+			     width="80">
+				<combo_item name="None" value="None">
+					None
+				</combo_item>
+				<combo_item name="Brightness" value="Brightness">
+					Brightness
+				</combo_item>
+				<combo_item name="Darkness" value="Darkness">
+					Darkness
+				</combo_item>
+				<combo_item name="woodgrain" value="woodgrain">
+					woodgrain
+				</combo_item>
+				<combo_item name="bark" value="bark">
+					bark
+				</combo_item>
+				<combo_item name="bricks" value="bricks">
+					bricks
+				</combo_item>
+				<combo_item name="checker" value="checker">
+					checker
+				</combo_item>
+				<combo_item name="concrete" value="concrete">
+					concrete
+				</combo_item>
+				<combo_item name="crustytile" value="crustytile">
+					crustytile
+				</combo_item>
+				<combo_item name="cutstone" value="cutstone">
+					cutstone
+				</combo_item>
+				<combo_item name="discs" value="discs">
+					discs
+				</combo_item>
+				<combo_item name="gravel" value="gravel">
+					gravel
+				</combo_item>
+				<combo_item name="petridish" value="petridish">
+					petridish
+				</combo_item>
+				<combo_item name="siding" value="siding">
+					siding
+				</combo_item>
+				<combo_item name="stonetile" value="stonetile">
+					stonetile
+				</combo_item>
+				<combo_item name="stucco" value="stucco">
+					stucco
+				</combo_item>
+				<combo_item name="suction" value="suction">
+					suction
+				</combo_item>
+				<combo_item name="weave" value="weave">
+					weave
+				</combo_item>
+			</combo_box>
+			<check_box bottom="-148" follows="left|top" font="SansSerifSmall" height="16"
+				initial_value="false" enabled="false" label="Align planar textures"
+				left="8" mouse_opaque="true" name="checkbox planar align" width="160"
+				tool_tip="Aligns textures on all selected faces to the last selected face. Requires Planar texture mapping." />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-158" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="tex scale" v_pad="0" width="160">
+				Repeats per Face
+			</text>
+			<spinner bottom="-178" decimal_digits="5" follows="left|top" height="16" increment="0.1"
+			     initial_val="0" label="Horizontal (U)" label_width="90" left="20"
+			     max_val="1000" min_val="0" mouse_opaque="true" name="TexScaleU" width="160" />
+			<check_box bottom="-179" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
+			     name="checkbox flip s" width="70" />
+			<spinner bottom="-196" decimal_digits="5" follows="left|top" height="16" increment="0.1"
+			     initial_val="0" label="Vertical (V)" label_width="90" left="20"
+			     max_val="1000" min_val="0" mouse_opaque="true" name="TexScaleV" width="160" />
+			<check_box bottom="-197" follows="left|top" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
+			     name="checkbox flip t" width="70" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-228" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="tex rotate" v_pad="0" width="102">
+				Rotation (degrees)
+			</text>
+			<spinner bottom="-234" decimal_digits="2" follows="left|top" height="16" increment="1"
+			     initial_val="0" left="112" max_val="9999" min_val="-9999"
+			     mouse_opaque="true" name="TexRot" width="68" />
+			<string name="string repeats per meter">
+				Repeats Per Meter
+			</string>
+			<string name="string repeats per face">
+				Repeats Per Face
+			</string>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-250" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="rpt" v_pad="0" width="160">
+				Repeats Per Meter
+			</text>
+			<spinner bottom="-256" decimal_digits="1" follows="left|top" height="16" increment="0.1"
+			     initial_val="1" left="112" max_val="10" min_val="0.1" mouse_opaque="true"
+			     name="rptctrl" width="68" />
+			<button bottom="-256" follows="left|top" font="SansSerifSmall" halign="center"
+			     height="20" label="Apply" label_selected="Apply" left_delta="78"
+			     mouse_opaque="true" name="button apply" scale_image="TRUE" width="75" />
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-288" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+			     mouse_opaque="true" name="tex offset" v_pad="0" width="160">
+				Offset
+			</text>
+			<spinner bottom="-308" decimal_digits="4" follows="top" height="16" increment="0.01" initial_val="0" label="Horizontal (U)" label_width="90" left="20"
+			     max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160"/>
+			<spinner bottom_delta="-18" decimal_digits="4" follows="top" height="16" increment="0.01" initial_val="0" label="Vertical (V)" label_width="90"
+			     left="20" max_val="1" min_val="-1" name="TexOffsetV"
+			     width="160"/>
+			<text bottom="-352" height="20" left="10" name="textbox autofix" v_pad="0" width="160">Align media texture
+(must load first)</text>
+			<button bottom="-360" follows="left|top" font="SansSerifSmall" halign="center"
+			     height="20" label="Align" label_selected="Align" left="112"
+			     mouse_opaque="true" name="button align" scale_image="TRUE" width="68" />
+			<text bottom="-322" drop_shadow_visible="true" follows="left|top" height="20" left="185" name="textbox params">Texture Params</text>
+			<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="20" label="Copy" left_delta="5" mouse_opaque="true" name="copytextures"  enabled="true"
+			     tool_tip="Copy Testure Params from Clipboard"  width="68" />
+	  		<button bottom_delta="-20" follows="top" height="20" label="Paste" name="pastetextures" tool_tip="Paste Texture Params from Clipboard"  width="68" />
+    	</panel>
+    	<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
+		     label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
+      		<button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20" label="New Script" label_selected="New Script" left="10" name="button new script" scale_image="TRUE" width="100"/>
+      <button bottom_delta="0" left_delta="110" width="100" height="20" follows="left|top"
+            label="Permissions..." name="button permissions" font="SansSerif" halign="center"
+            mouse_opaque="true" scale_image="TRUE" />
+			<panel bottom_delta="-330" follows="left|top" height="325"  left="10"
+			     mouse_opaque="true" name="ContentsInventory" width="252" />
+		</panel>
+	</tab_container>
+
+<!-- Land Info sub-tab -->
+
+	<panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
+	     name="land info panel" width="272">
+	<!-- Parcel Information -->
+		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+		     bottom="-40" drop_shadow_visible="true" follows="left|top"
+		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
+		     mouse_opaque="true" name="label_parcel_info" v_pad="0" width="150">
+			Parcel Information
+		</text>
+		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+		     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
+		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="48"
+		     mouse_opaque="true" name="label_area_price" v_pad="0" width="150">
+			Price: [CURRENCY][PRICE] for [AREA] sq. m.
+		</text>
+		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+		     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="48"
+		     mouse_opaque="true" name="label_area" v_pad="0" width="150">
+			Area: [AREA] sq. m.
+		</text>
+		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+		     height="20" label="About Land..." label_selected="About Land..." left="48"
+		     mouse_opaque="true" name="button about land" scale_image="TRUE" width="112" />
+		<check_box bottom_delta="-24" control_name="ShowParcelOwners" follows="left|top"
+		     tool_tip="Colour parcels according to their ownership" font="SansSerifSmall"
+		     height="16" initial_value="false" label="Show owners" left="48" 
+		     mouse_opaque="true" name="checkbox show owners" width="100" />
+			<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+			     height="18" label="?" label_selected="?" left_delta="94"
+			     mouse_opaque="true" name="button show owners help" width="18" />
+	<!-- Modify Parcel -->
+		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+		     bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
+		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
+		     mouse_opaque="true" name="label_parcel_modify" v_pad="0" width="150">
+			Modify Parcel
+		</text>
+		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+		     height="20" label="Subdivide..." label_selected="Subdivide..." left="48"
+		     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
+		     width="112" />
+		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+		     height="20" label="Join..." label_selected="Join..." left="48"
+		     mouse_opaque="true" name="button join land" scale_image="TRUE" width="112" />
+	<!-- Land Transactions -->
+		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+		     bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
+		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
+		     mouse_opaque="true" name="label_parcel_trans" v_pad="0" width="150">
+			Land Transactions
+		</text>
+		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+		     height="20" label="Buy Land..." label_selected="Buy Land..." left="48"
+		     mouse_opaque="true" name="button buy land" scale_image="TRUE" width="112" />
+		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
+		     height="20" label="Abandon Land..." label_selected="Abandon Land..."
+		     left="48" mouse_opaque="true" name="button abandon land" scale_image="TRUE"
+		     width="112" />
+	</panel>
+	<string name="status_rotate">
+		Drag colored bands to rotate object
+	</string>
+	<string name="status_scale">
+		Click and drag to stretch selected side
+	</string>
+	<string name="status_move">
+		Drag to move, shift-drag to copy
+	</string>
+	<string name="status_align">
+		Click an arrow to align objects in that direction
+	</string>
+	<string name="status_modifyland">
+		Click and hold to modify land
+	</string>
+	<string name="status_camera">
+		Click and drag to change view
+	</string>
+	<string name="status_grab">
+		Drag to move, Ctrl to lift, Ctrl-Shift to rotate
+	</string>
+	<string name="status_place">
+		Click inworld to build
+	</string>
+	<string name="status_selectland">
+		Click and drag to select land
+	</string>
+	<string name="grid_screen_text">
+		Screen
+	</string>
+	<string name="grid_local_text">
+		Local
+	</string>
+	<string name="grid_world_text">
+		World
+	</string>
+	<string name="grid_reference_text">
+		Reference
+	</string>
+	<string name="grid_attachment_text">
+		Attachment
+	</string>
+  <string name="status_selectprimequiv">
+    , Cost: [SEL_WEIGHT]
+  </string>
+  <string name="status_selectcount">
+    Primitives: [COUNT][PE_STRING]
+  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_top_objects.xml b/indra/newview/skins/default/xui/es/floater_top_objects.xml
new file mode 100644
index 000000000..6b59ee391
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_top_objects.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
+     height="400" min_height="300" min_width="580" name="top_objects"
+     title="loading..." width="580">
+	<text bottom="-50" follows="left|top" font="SansSerif" height="20" left="10"
+	     name="title_text" width="400">
+		Loading...
+	</text>
+	<scroll_list bottom_delta="-200" draw_border="true" draw_heading="true"
+	     follows="left|top|bottom|right" height="200" left="10" multi_select="true"
+	     name="objects_list" width="560">
+		<column label="Score" name="score" width="43" />
+		<column label="Name" name="name" dynamicwidth="true" />
+		<column label="Owner" name="owner" width="100" />
+		<column label="Location" name="location" width="100" />
+		<column label="Time" name="time" width="105" />
+    <column label="Mono Time" name="mono_time" width="50" />
+	  <column label="URLs" name="URLs" width="50" />
+  </scroll_list>
+	<text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
+	     left="10" name="id_text" width="100">
+		Object ID:
+	</text>
+	<line_editor bottom_delta="3" enabled="false"
+	     follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
+	     name="id_editor" width="385" />
+	<button bottom_delta="0" follows="bottom|right" height="20" label="Show Beacon"
+	     name="show_beacon_btn" right="-10" width="100" />
+	<text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
+	     left="10" name="obj_name_text" width="100">
+		Object Name:
+	</text>
+	<line_editor bottom_delta="3" enabled="true"
+	     follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
+	     name="object_name_editor" width="385" />
+	<button bottom_delta="0" follows="bottom|right" height="20" label="Filter"
+	     name="filter_object_btn" right="-10" width="100" />
+	<text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
+	     left="10" name="owner_name_text" width="100">
+		Owner Name:
+	</text>
+	<line_editor bottom_delta="3" enabled="true"
+	     follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
+	     name="owner_name_editor" width="385" />
+	<button bottom_delta="0" follows="bottom|right" height="20" label="Filter"
+	     name="filter_owner_btn" right="-10" width="100" />
+	<button bottom="35" follows="bottom|left" height="20" label="Return Selected" left="10"
+	     name="return_selected_btn" width="110" />
+	<button bottom="35" follows="bottom|left" height="20" label="Return All" left="125"
+	     name="return_all_btn" width="110" />
+  <button bottom="35" follows="bottom|left" height="20" label="Lag Warning" left="240"
+	     name="lagwarning" width="110" />
+  <button bottom="35" follows="bottom|left" height="20" label="Kick" left="355"
+	     name="kick" width="110" />
+	<button bottom="10" follows="bottom|left" height="20" label="Disable Selected"
+	     left="10" name="disable_selected_btn" width="110" />
+	<button bottom="10" follows="bottom|left" height="20" label="Disable All" left="125"
+	     name="disable_all_btn" width="110" />
+  <button bottom="10" follows="bottom|left" height="20" label="Profile" left="240"
+	     name="profile" width="110" />  
+  <button bottom="10" follows="bottom|left" height="20" label="TP to" left="355"
+	     name="tpto" width="110" />
+
+	<button bottom="35" follows="bottom|right" height="20" label="Refresh"
+	     name="refresh_btn" right="-10" width="100" />
+	<string name="top_scripts_title">
+		Top Scripts
+	</string>
+	<string name="top_scripts_text">
+		[COUNT] scripts taking a total of [TIME] ms
+	</string>
+	<string name="scripts_score_label">
+		Time
+	</string>
+    <string name="scripts_mono_time_label">
+        Mono Time
+    </string>
+    <string name="top_colliders_title">
+		Top Colliders
+	</string>
+	<string name="top_colliders_text">
+		Top [COUNT] objects experiencing many potential collisions
+	</string>
+	<string name="colliders_score_label">
+		Score
+	</string>
+    <string name="none_descriptor">
+		None found.
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_tos.xml b/indra/newview/skins/default/xui/es/floater_tos.xml
new file mode 100644
index 000000000..485cfcc27
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_tos.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="false" can_drag_on_left="false" can_minimize="false"
+     can_resize="false" height="500" min_height="100" min_width="100"
+     name="modal container" title="" width="600">
+	<button bottom="-484" enabled="false" font="SansSerif" halign="center" height="20"
+	     label="Continue" label_selected="Continue" left="484" mouse_opaque="true"
+	     name="Continue" width="100" />
+	<button bottom="-484" font="SansSerif" halign="center" height="20" label="Cancel"
+	     label_selected="Cancel" left="16" mouse_opaque="true" name="Cancel"
+	     width="100" />
+	<check_box bottom="-435" follows="top|right"
+		font="SansSerifSmall" height="16" initial_value="false" label="I Agree to the Terms of Service"
+		left="16" mouse_opaque="true" name="agree_chk" width="55" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-50" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+	     h_pad="0" halign="left" height="30" left="16" mouse_opaque="true"
+	     name="tos_heading" v_pad="0" width="552">
+		Please read the following Terms of Service carefully. To continue logging in to Second Life,
+you must accept the agreement.
+	</text>
+	<text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif"
+	     height="283" left="16" max_length="65536" mouse_opaque="true"
+	     name="tos_text" width="568"
+	     word_wrap="true">
+		TOS_TEXT
+	</text_editor>
+  <!-- Loading text says: "Loading Terms of Service..." URL encoded -->
+	<web_browser bottom="-406" embedded_items="false" follows="left|top" font="SansSerif"
+	     height="340" left="16" max_length="65536" mouse_opaque="true"
+	     name="tos_html"
+	     start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E"
+	     width="568" word_wrap="true" />
+	<string name="real_url">
+		http://secondlife.com/app/tos/
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_url_entry.xml b/indra/newview/skins/default/xui/es/floater_url_entry.xml
new file mode 100644
index 000000000..fb1f64a38
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_url_entry.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="false"
+     can_resize="false" height="87" max_height="91" min_height="87"
+     min_width="500" name="url_entry" title="" width="500">
+	<text bottom="-20" follows="top|left" height="15" left="20" name="media_label"
+	     top="-20">
+		Media URL:
+	</text>
+	<combo_box allow_text_entry="true" bottom="-35" follows="left|top|right" height="19"
+	     left="90" max_chars="255" max_length="550" name="media_entry" width="370" />
+	<button bottom="10" bottom_delta="-35" follows="top|left" height="20" label="OK"
+	     left="20" name="ok_btn" width="64" />
+	<button bottom="10" bottom_delta="0" follows="top|left" height="20" label="Cancel"
+	     left="112" name="cancel_btn" width="64" />
+	<button bottom="10" bottom_delta="0" follows="top|right" height="20" label="Clear"
+	     name="clear_btn" right="460" width="64" />
+	<text bottom_delta="2" follows="bottom|left" height="15" left="220"
+	     name="loading_label" visible="false">
+		Loading...
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_vfs.xml b/indra/newview/skins/default/xui/es/floater_vfs.xml
new file mode 100644
index 000000000..5079d4114
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_vfs.xml
@@ -0,0 +1,6 @@
+<?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="320" min_width="320" height="320" min_height="320"
+     name="floater_vfs" title="Local Assets" rect_control="FloaterVFSRect">
+	
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_vfs_explorer.xml b/indra/newview/skins/default/xui/es/floater_vfs_explorer.xml
new file mode 100644
index 000000000..933338ff6
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_vfs_explorer.xml
@@ -0,0 +1,6 @@
+<?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="320" min_width="320" height="320" min_height="320"
+     name="floater_vfs" title="VFS Explorer" rect_control="FloaterVFSRect">
+
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_license.xml b/indra/newview/skins/default/xui/es/floater_voice_license.xml
new file mode 100644
index 000000000..4596134c8
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_voice_license.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="false" can_drag_on_left="false" can_minimize="false"
+     can_resize="false" height="500" min_height="100" min_width="100"
+     name="modal container" title="" width="600">
+  <button bottom="-484" enabled="false" font="SansSerif" halign="center" height="20"
+	     label="Continue" label_selected="Continue" left="484" mouse_opaque="true"
+	     name="Continue" width="100" />
+  <button bottom="-484" font="SansSerif" halign="center" height="20" label="Cancel"
+	     label_selected="Cancel" left="16" mouse_opaque="true" name="Cancel"
+	     width="100" />
+  <check_box bottom="-435" follows="top|right"
+		 font="SansSerifSmall" height="16" initial_value="false" label="I Agree to the Terms of the Vivox Acceptable Use Policy"
+	     left="16" mouse_opaque="true" name="agree_chk" width="55" />
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-50" drop_shadow_visible="true" follows="left|top" font="SansSerif"
+	     h_pad="0" halign="left" height="30" left="16" mouse_opaque="true"
+	     name="license_heading" v_pad="0" width="552">
+Please read the following license carefully. 
+To use voice, you must accept the license agreement.
+  </text>
+  <text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif"
+	     height="283" left="16" max_length="65536" mouse_opaque="true"
+	     name="license_text" width="568"
+	     word_wrap="true">
+    LICENSE_TEXT
+  </text_editor>
+  <!-- Loading text says: "Loading Vivox Personal License Agreement..." URL encoded -->
+  <web_browser bottom="-406" embedded_items="false" follows="left|top" font="SansSerif"
+	     height="340" left="16" max_length="65536" mouse_opaque="true"
+	     name="license_html"
+		 start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//vivox.com/vivox_aup.html%22%3EVivox%20Acceptable%20Use%20Policy%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E"
+	     width="568" word_wrap="true" />
+  <string name="real_url">
+	vivox_aup.html
+  </string>
+  <string name="fallback_html">
+	vivox_aup.html
+  </string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_wizard.xml b/indra/newview/skins/default/xui/es/floater_voice_wizard.xml
new file mode 100644
index 000000000..71acd0fc8
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_voice_wizard.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="0" can_minimize="true" can_resize="false" height="300" left="0"
+     name="floater_voice_wizard" title="Voice Setup" width="420">
+	<tab_container bottom="30" hide_tabs="true" left="4" name="wizard_tabs" right="-2"
+	     tab_position="bottom" top="-20">
+		<panel bottom="0" filename="panel_voice_enable.xml" left="0" right="0" />
+		<panel bottom="0" filename="panel_voice_options.xml" left="0" right="0" />
+		<panel bottom="0" filename="panel_audio_device.xml" left="0" name="device_settings"
+		     right="0" />
+	</tab_container>
+	<panel border="false" bottom="8" height="20" left="8" mouse_opaque="true"
+	     name="content_panel" width="404">
+		<button bottom="0" height="20" label="Previous" left="55" name="back_btn" width="85" />
+		<button bottom="0" height="20" label="Next" left_delta="90" name="next_btn" width="85" />
+		<button bottom="0" height="20" label="Finish" left_delta="90" name="ok_btn" width="85" />
+		<button bottom="0" height="20" label="Cancel" left_delta="90" name="cancel_btn"
+		     width="80" />
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_water.xml b/indra/newview/skins/default/xui/es/floater_water.xml
new file mode 100644
index 000000000..9dcb96eae
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_water.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="240" left="50" min_height="200"
+     min_width="400" mouse_opaque="true" name="Water Floater"
+     rect_control="FloaterAdvancedWaterRect" title="Advanced Water Editor"
+     width="700">
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-50" drop_shadow_visible="true" follows="left|top|right"
+	     font="SansSerif" h_pad="0" halign="left" height="16"
+	     left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
+	     width="110">
+		Water Presets:
+	</text>
+	<combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18"
+	     left_delta="110" max_chars="20" mouse_opaque="true"
+	     name="WaterPresetsCombo" width="150" />
+	<button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="New" label_selected="New" left_delta="170"
+	     mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="70" />
+	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="Save" label_selected="Save" left_delta="80"
+	     mouse_opaque="true" name="WaterSavePreset" scale_image="true" width="70" />
+	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="Delete" label_selected="Delete" left_delta="80"
+	     mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="70" />
+	<tab_container bottom="-240" follows="left|top" height="180" left="0"
+	     mouse_opaque="false" name="Water Tabs" tab_position="top" width="700">
+		<panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
+		     label="Settings" left="1" mouse_opaque="false"
+		     name="Settings" width="698">
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
+				Water Fog Color
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="160" name="WaterFogColorHelp" width="18" />
+			<color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80"
+			     can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
+			     height="50" label="" left="40" mouse_opaque="true"
+			     name="WaterFogColor" tool_tip="Click to open Color Picker" width="40" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-90" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="10" mouse_opaque="true" name="WaterFogDensText" v_pad="0" width="355">
+				Fog Density Exponent
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="160" name="WaterFogDensityHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WaterFogDensity"
+			     decimal_digits="1" follows="left" height="10" increment=".1"
+			     initial_val="16" label="" left="24" max_val="10" min_val="0"
+			     mouse_opaque="true" name="WaterFogDensity" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-130" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="10" mouse_opaque="true" name="WaterUnderWaterFogModText" v_pad="0"
+			     width="355">
+				Underwater Fog Modifier
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="160" name="WaterUnderWaterFogModHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="" decimal_digits="2"
+			     follows="left" height="10" increment=".01" initial_val="16" label=""
+			     left="24" max_val="2" min_val="0" mouse_opaque="true"
+			     name="WaterUnderWaterFogMod" show_text="true" value="0.25" width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="245" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
+				Reflection Wavelet Scale
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="395" name="WaterNormalScaleHelp" width="18" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left="245" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
+				1
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
+				2
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
+				3
+			</text>
+			<slider bottom="-50" can_edit_text="false" control_name="WaterNormalScaleX"
+			     decimal_digits="1" follows="left" height="10" increment="0.1"
+			     initial_val="0.7" label="" left="259" max_val="10" min_val="0"
+			     mouse_opaque="true" name="WaterNormalScaleX" show_text="true" value="1.0"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleY"
+			     decimal_digits="1" follows="left" height="10" increment="0.1"
+			     initial_val="0.7" label="" left="259" max_val="10" min_val="0"
+			     mouse_opaque="true" name="WaterNormalScaleY" show_text="true" value="1.0"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleZ"
+			     decimal_digits="1" follows="left" height="10" increment="0.1"
+			     initial_val="0.7" label="" left="259" max_val="10" min_val="0"
+			     mouse_opaque="true" name="WaterNormalScaleZ" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-80" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
+				Fresnel Scale
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="395" name="WaterFresnelScaleHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelScale"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WaterFresnelScale" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-115" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="245" mouse_opaque="true" name="FresnelOffsetText" v_pad="0"
+			     width="355">
+				Fresnel Offset
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="395" name="WaterFresnelOffsetHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelOffset"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WaterFresnelOffset" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
+				Refract Scale Above
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="630" name="WaterScaleAboveHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleAbove"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.1" label="" left="494" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WaterScaleAbove" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-53" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="WaterScaleBelowText" v_pad="0"
+			     width="355">
+				Refract Scale Below
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="630" name="WaterScaleBelowHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleBelow"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0" label="" left="494" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WaterScaleBelow" show_text="true" value="0.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
+				Blur Multiplier
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="630" name="WaterBlurMultiplierHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WaterBlurMult"
+			     decimal_digits="3" follows="left" height="10" increment=".001"
+			     initial_val="0" label="" left="494" max_val=".16" min_val="0"
+			     mouse_opaque="true" name="WaterBlurMult" show_text="true" value="0"
+			     width="200" />
+		</panel>
+		<panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
+		     label="Image" left="1" mouse_opaque="false" name="Waves"
+		     width="698">
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
+				Big Wave Direction
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="155" name="WaterWave1Help" width="18" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left="10" mouse_opaque="true" name="WaterWave1DirXText" v_pad="0"
+			     width="10">
+				X
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="WaterWave1DirYText" v_pad="0"
+			     width="10">
+				Y
+			</text>
+			<slider bottom="-50" can_edit_text="false" control_name="WaterWave1DirX"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
+			     mouse_opaque="true" name="WaterWave1DirX" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave1DirY"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
+			     mouse_opaque="true" name="WaterWave1DirY" show_text="true" value="0.7"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-70" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="355">
+				Little Wave Direction
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="155" name="WaterWave2Help" width="18" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left="10" mouse_opaque="true" name="WaterWave2DirXText" v_pad="0"
+			     width="10">
+				X
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="WaterWave2DirYText" v_pad="0"
+			     width="10">
+				Y
+			</text>
+			<slider bottom="-100" can_edit_text="false" control_name="WaterWave2DirX"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
+			     mouse_opaque="true" name="WaterWave2DirX" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave2DirY"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
+			     mouse_opaque="true" name="WaterWave2DirY" show_text="true" value="0.7"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="240" mouse_opaque="true" name="BHText3" v_pad="0" width="355">
+				Normal Map
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="365" name="WaterNormalMapHelp" width="18" />
+			<texture_picker bottom="-165" height="143" label="" left="250" name="WaterNormalMap"
+			     width="128" />
+		</panel>
+	</tab_container>
+	<string name="WLDefaultWaterNames">
+		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml
new file mode 100644
index 000000000..0284e5527
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater border="true" bottom="372" can_close="false" can_drag_on_left="false"
+     can_minimize="false" can_resize="false" can_tear_off="true" enabled="true"
+     height="100" left="415" min_height="100" min_width="100"
+     mouse_opaque="true" name="modal container" title="" width="240">
+	<button bottom="-90" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="Save" label_selected="Save" left="20" mouse_opaque="true"
+	     name="Save" scale_image="true" width="82" />
+	<button bottom="-90" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="Cancel" label_selected="Cancel" left="138" mouse_opaque="true"
+	     name="Cancel" scale_image="true" width="82" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-26" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerif" h_pad="0" halign="left" height="16" left="20"
+	     mouse_opaque="true" name="Save item as:" v_pad="0" width="200">
+		Save item as:
+	</text>
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-50"
+	     enabled="true" follows="left|top" font="SansSerif"
+	     handle_edit_keys_directly="true" height="20" left="20" max_length="63"
+	     mouse_opaque="true" name="name ed" select_all_on_focus_received="false"
+	     select_on_focus="false" width="200">
+		New [DESC]
+	</line_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_windlight_options.xml b/indra/newview/skins/default/xui/es/floater_windlight_options.xml
new file mode 100644
index 000000000..906e7de49
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_windlight_options.xml
@@ -0,0 +1,593 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" height="220" left="50" min_height="180"
+     min_width="400" mouse_opaque="true" name="WindLight floater"
+     rect_control="FloaterAdvancedSkyRect" title="Advanced Sky Editor"
+     width="700">
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-50" drop_shadow_visible="true" follows="left|top|right"
+	     font="SansSerif" h_pad="0" halign="left" height="16"
+	     left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
+	     width="110">
+		Sky Presets:
+	</text>
+	<combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18"
+	     left_delta="110" max_chars="20" mouse_opaque="true" name="WLPresetsCombo"
+	     width="150" />
+	<button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="New" label_selected="New" left_delta="170"
+	     mouse_opaque="true" name="WLNewPreset" scale_image="true" width="70" />
+	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="Save" label_selected="Save" left_delta="80"
+	     mouse_opaque="true" name="WLSavePreset" scale_image="true" width="70" />
+	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="Delete" label_selected="Delete" left_delta="80"
+	     mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="70" />
+	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
+	     label="Day Cycle Editor" label_selected="Day Cycle Editor"
+	     left_delta="120" mouse_opaque="true" name="WLDayCycleMenuButton"
+	     scale_image="true" width="120" />
+	<tab_container bottom="-220" follows="left|top" height="160" left="0"
+	     mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700">
+		<panel border="true" bottom="-220" follows="left|top|right|bottom" height="160"
+		     label="Atmosphere" left="1" mouse_opaque="false"
+		     name="Atmosphere" width="698">
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
+				Blue Horizon
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="160" name="WLBlueHorizonHelp" width="18" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
+				R
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
+				G
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
+				B
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
+				I
+			</text>
+			<slider bottom="-50" can_edit_text="false" control_name="WLBlueHorizonR"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLBlueHorizonR" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonG"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLBlueHorizonG" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonB"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLBlueHorizonB" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonI"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLBlueHorizonI" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="10" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
+				Haze Horizon
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="160" name="WLHazeHorizonHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeHorizon"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.25" label="" left="24" max_val="1.0" min_val="0"
+			     mouse_opaque="true" name="WLHazeHorizon" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="245" mouse_opaque="true" name="BDensText2" v_pad="0" width="355">
+				Blue Density
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="395" name="WLBlueDensityHelp" width="18" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left="245" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
+				R
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
+				G
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
+				B
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10">
+				I
+			</text>
+			<slider bottom="-50" can_edit_text="false" control_name="WLBlueDensityR"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLBlueDensityR" show_text="true" value="1.0"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityG"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLBlueDensityG" show_text="true" value="1.0"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityB"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLBlueDensityB" show_text="true" value="1.0"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityI"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="1" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLBlueDensityI" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
+				Haze Density
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="395" name="WLHazeDensityHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeDensity"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="259" max_val="4" min_val="0"
+			     mouse_opaque="true" name="WLHazeDensity" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
+				Density Multiplier
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="630" name="WLDensityMultHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLDensityMult"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.1" label="" left="494" max_val="0.9" min_val="0"
+			     mouse_opaque="true" name="WLDensityMult" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-53" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="WLDistanceMultText" v_pad="0"
+			     width="355">
+				Distance Multiplier
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="630" name="WLDistanceMultHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLDistancMult"
+			     decimal_digits="1" follows="left" height="10" increment="0.1"
+			     initial_val="1.0" label="" left="494" max_val="100" min_val="0"
+			     mouse_opaque="true" name="WLDistanceMult" show_text="true" value="0.0"
+			     width="207" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
+				Max Altitude
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="630" name="WLMaxAltitudeHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLMaxAltitude"
+			     decimal_digits="0" follows="left" height="10" increment="1"
+			     initial_val="500" label="" left="494" max_val="4000" min_val="0"
+			     mouse_opaque="true" name="WLMaxAltitude" show_text="true" value="4000"
+			     width="205" />
+		</panel>
+		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
+		     label="Lighting" left="1" mouse_opaque="true"
+		     name="Lighting" width="698">
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="10" mouse_opaque="true" name="SLCText" v_pad="0" width="355">
+				Sun/Moon Color
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="160" name="WLSunlightColorHelp" width="18" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10">
+				R
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
+				G
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
+				B
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
+				I
+			</text>
+			<slider bottom="-50" can_edit_text="false" control_name="WLSunlightR"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLSunlightR" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightG"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLSunlightG" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightB"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLSunlightB" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightI"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLSunlightI" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="10" mouse_opaque="true" name="TODText" v_pad="0" width="355">
+				Sun/Moon Position
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="160" name="WLTimeOfDayHelp" width="18" />
+			<icon bottom_delta="-30" follows="left|top" height="20" image_name="icon_diurnal.tga"
+			     left="30" name="SkyDayCycle" width="148" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLSunAngle"
+			     decimal_digits="3" follows="left" height="10" increment="0.001"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLSunAngle" show_text="true" value="1.0"
+			     width="204" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="245" mouse_opaque="true" name="WLAmbientText" v_pad="0" width="355">
+				Ambient
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="395" name="WLAmbientHelp" width="18" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left="245" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
+				R
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
+				G
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
+				B
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
+				I
+			</text>
+			<slider bottom="-50" can_edit_text="false" control_name="WLAmbientR" decimal_digits="2"
+			     follows="left" height="10" increment="0.01" initial_val="0.7" label=""
+			     left="259" max_val="1" min_val="0" mouse_opaque="true" name="WLAmbientR"
+			     show_text="true" value="1.0" width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientG"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLAmbientG" show_text="true" value="1.0"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientB"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLAmbientB" show_text="true" value="1.0"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientI"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="1" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLAmbientI" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="245" mouse_opaque="true" name="WLEastAngleText" v_pad="0" width="355">
+				East Angle
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="395" name="WLEastAngleHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLEastAngle"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.0" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLEastAngle" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="SunGlowText" v_pad="0" width="355">
+				Sun Glow
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="630" name="WLSunGlowHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLGlowB"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.1" label="Focus " left="494" max_val="0.5" min_val="0"
+			     mouse_opaque="true" name="WLGlowB" show_text="true" value="1.0" width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLGlowR"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.25" label="Size    " left="494" max_val="1.99" min_val="1"
+			     mouse_opaque="true" name="WLGlowR" show_text="true" value="1.0" width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-67" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="SceneGammaText" v_pad="0" width="200">
+				Scene Gamma
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="630" name="WLSceneGammaHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLGamma"
+			     decimal_digits="2" follows="bottom" height="10" increment="0.01"
+			     initial_val="2.0" label="" left="494" max_val="10.0" min_val="0"
+			     mouse_opaque="true" name="WLGamma" show_text="true" value="2.0" width="207" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-102" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="WLStarText" v_pad="0" width="355">
+				Star Brightness
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="630" name="WLStarBrightnessHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLStarAlpha"
+			     decimal_digits="2" follows="bottom" height="10" increment="0.01"
+			     initial_val="0" label="" left="494" max_val="2" min_val="0"
+			     mouse_opaque="true" name="WLStarAlpha" show_text="true" value="0"
+			     width="200" />
+		</panel>
+		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
+		     label="Clouds" left="1" mouse_opaque="false" name="Clouds"
+		     width="698">
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="10" mouse_opaque="true" name="WLCloudColorText" v_pad="0" width="355">
+				Cloud Color
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="160" name="WLCloudColorHelp" width="18" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10">
+				R
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
+				G
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
+				B
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
+				I
+			</text>
+			<slider bottom="-50" can_edit_text="false" control_name="WLCloudColorR"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudColorR" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorG"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudColorG" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorB"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudColorB" show_text="true" value="0.7"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorI"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudColorI" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="10" mouse_opaque="true" name="WLCloudColorText2" v_pad="0"
+			     width="355">
+				Cloud XY/Density
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="160" name="WLCloudDensityHelp" width="18" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-103" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left="10" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
+				X
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
+				Y
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
+				D
+			</text>
+			<slider bottom="-117" can_edit_text="false" control_name="WLCloudX" decimal_digits="2"
+			     follows="left" height="10" increment="0.01" initial_val="0.5" label=""
+			     left="24" max_val="1" min_val="0" mouse_opaque="true" name="WLCloudX"
+			     show_text="true" value="0.5" width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudY"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.5" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudY" show_text="true" value="0.5"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDensity"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudDensity" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="245" mouse_opaque="true" name="WLCloudCoverageText" v_pad="0"
+			     width="355">
+				Cloud Coverage
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="395" name="WLCloudCoverageHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudCoverage"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.5" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudCoverage" show_text="true" value="0.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-55" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="245" mouse_opaque="true" name="WLCloudScaleText" v_pad="0"
+			     width="355">
+				Cloud Scale
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="395" name="WLCloudScaleHelp" width="18" />
+			<slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudScale"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="1.0" label="" left="259" max_val="1.0" min_val="0.01"
+			     mouse_opaque="true" name="WLCloudScale" show_text="true" value="1.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="245" mouse_opaque="true" name="WLCloudDetailText" v_pad="0"
+			     width="355">
+				Cloud Detail (XY/Density)
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="395" name="WLCloudDetailHelp" width="18" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-103" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left="245" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
+				X
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10">
+				Y
+			</text>
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
+			     left_delta="0" mouse_opaque="true" name="BHText10" v_pad="0" width="10">
+				D
+			</text>
+			<slider bottom="-117" can_edit_text="false" control_name="WLCloudDetailX"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.5" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudDetailX" show_text="true" value="0.5"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDetailY"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.5" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudDetailY" show_text="true" value="0.5"
+			     width="200" />
+			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDetailDensity"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="1.0" label="" left="259" max_val="1" min_val="0"
+			     mouse_opaque="true" name="WLCloudDetailDensity" show_text="true"
+			     value="1.0" width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="WLCloudScrollXText" v_pad="0"
+			     width="355">
+				Cloud Scroll X
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="605" name="WLCloudScrollXHelp" width="18" />
+			<check_box control_name="WLCloudLockX" follows="left" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Lock" left="625" mouse_opaque="true"
+			     name="WLCloudLockX" width="200" />
+			<slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollX"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.5" label="" left="494" max_val="10" min_val="-10"
+			     mouse_opaque="true" name="WLCloudScrollX" show_text="true" value="0.0"
+			     width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom="-60" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="480" mouse_opaque="true" name="WLCloudScrollYText" v_pad="0"
+			     width="355">
+				Cloud Scroll Y
+			</text>
+			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="605" name="WLCloudScrollYHelp" width="18" />
+			<check_box control_name="WLCloudLockY" follows="left" font="SansSerifSmall" height="16"
+			     initial_value="false" label="Lock" left="625" mouse_opaque="true"
+			     name="WLCloudLockY" width="200" />
+			<slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollY"
+			     decimal_digits="2" follows="left" height="10" increment="0.01"
+			     initial_val="0.5" label="" left="494" max_val="10" min_val="-10"
+			     mouse_opaque="true" name="WLCloudScrollY" show_text="true" value="0.0"
+			     width="200" />
+			<check_box bottom="-120" control_name="DrawClassicClouds" follows="left"
+			     font="SansSerifSmall" height="16" initial_value="false"
+			     label="Draw Classic Clouds" left="480" mouse_opaque="true"
+			     name="DrawClassicClouds" width="200" />
+			<button bottom="-102" follows="left|top" font="SansSerifSmall" height="18" label="?"
+			     left="608" name="WLClassicCloudsHelp" width="18" />
+		</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&apos;s Delight:Sheer Sensuality
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_world_map.xml b/indra/newview/skins/default/xui/es/floater_world_map.xml
new file mode 100644
index 000000000..ebbda0fc8
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/floater_world_map.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
+     height="711" min_height="520" min_width="410" name="worldmap"
+     rect_control="FloaterWorldMapRect2" title="World Map" width="1243">
+	<panel bottom="-701" follows="left|top|right|bottom" height="681"
+		 left="15" mouse_opaque="true" name="objects_mapview" width="995" />
+	<icon bottom="-50" color="1, 1, 1, 1" follows="top|right" height="16"
+	     image_name="map_avatar_16.tga" left="1013" mouse_opaque="true" name="self"
+	     width="16" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-50" drop_shadow_visible="true" follows="top|right"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
+	     mouse_opaque="true" name="you_label" v_pad="0" width="145">
+		You
+	</text>
+	<icon bottom="-50" color="1, 1, 1, 1" follows="top|right" height="16"
+	     image_name="map_home.tga" left="1083" mouse_opaque="true" name="home"
+	     width="16" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-50" drop_shadow_visible="true" follows="top|right"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
+	     mouse_opaque="true" name="home_label" v_pad="0" width="145">
+		Home
+	</text>
+	<icon bottom="-70" color="0.5, 0.25, 1, 1" follows="top|right" height="16"
+	     image_name="legend.tga" left="1013" mouse_opaque="true" name="square2"
+	     width="16" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-70" drop_shadow_visible="true" follows="top|right"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
+	     mouse_opaque="true" name="auction_label" v_pad="0" width="145">
+		Auction
+	</text>
+	<icon bottom="-70" color="1, 1, 0.25, 1" follows="top|right" height="16"
+	     image_name="legend.tga" left="1083" mouse_opaque="true" name="square"
+	     width="16" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-70" drop_shadow_visible="true" follows="top|right"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
+	     mouse_opaque="true" name="land_for_sale_label" v_pad="0" width="145">
+		Land For Sale
+	</text>
+	<button bottom="-50" follows="top|right" font="SansSerifSmall" halign="center"
+	     height="16" label="Go Home" label_selected="Go Home" left="1150"
+	     mouse_opaque="true" name="Go Home" tool_tip="Teleport to your home"
+	     width="88" />
+	<icon bottom="-92" color="0, 1, 0, 1" follows="top|right" height="8"
+		image_name="map_avatar_8.tga" left="1017" mouse_opaque="true" name="person"
+		width="8" />
+	<check_box bottom="-96" control_name="MapShowPeople" follows="top|right"
+		font="SansSerifSmall" height="16" initial_value="false" label="Resident"
+		left_delta="16" mouse_opaque="true" name="people_chk" width="110" />
+	<icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"
+		image_name="map_infohub.tga" left="1013" mouse_opaque="true" name="infohub"
+		width="16" />
+	<check_box bottom="-116" control_name="MapShowInfohubs" follows="top|right"
+		font="SansSerifSmall" height="16" initial_value="false" label="Infohub"
+		left_delta="20" mouse_opaque="true" name="infohub_chk" width="110" />
+	<icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16"
+		image_name="map_telehub.tga" left="1013" mouse_opaque="true" name="telehub"
+		width="16" />
+	<check_box bottom="-136" control_name="MapShowTelehubs" follows="top|right"
+		font="SansSerifSmall" height="16" initial_value="false" label="Telehub"
+		left_delta="20" mouse_opaque="true" name="telehubchk" width="110" />
+	<icon bottom="-156" color="1, 1, 1, 1" follows="top|right" height="16"
+	     image_name="icon_for_sale.tga" left="1013" mouse_opaque="true"
+	     name="landforsale" width="16" />
+	<check_box bottom="-156" control_name="MapShowLandForSale" follows="top|right"
+	     font="SansSerifSmall" height="16" initial_value="false" label="Land for Sale"
+	     left_delta="20" mouse_opaque="true" name="land_for_sale_chk" width="110" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-96" drop_shadow_visible="true" follows="top|right"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="1139"
+	     mouse_opaque="true" name="events_label" v_pad="0" width="145">
+		Events:
+	</text>
+	<icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"
+	     image_name="map_event.tga" left="1151" mouse_opaque="true" name="event"
+	     width="16" />
+	<check_box bottom="-116" control_name="MapShowPGEvents" follows="top|right"
+	     font="SansSerifSmall" height="16" initial_value="false" label="PG"
+	     left_delta="20" mouse_opaque="true" name="event_chk" width="55" />
+	<icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16"
+	     image_name="map_event_mature.tga" left="1151" mouse_opaque="true"
+	     name="events_mature_icon" width="16" />
+	<check_box bottom="-136" control_name="MapShowMatureEvents" follows="top|right"
+	     font="SansSerifSmall" height="16" initial_value="true" label="Mature"
+	     left_delta="20" mouse_opaque="true" name="event_mature_chk" width="55" />
+	<icon bottom="-156" color="1, 1, 1, 1" follows="top|right" height="16"
+	     image_name="map_event_adult.tga" left="1151" mouse_opaque="true"
+	     name="events_adult_icon" width="16" />
+	<check_box bottom="-156" control_name="MapShowAdultEvents" follows="top|right"
+	     font="SansSerifSmall" height="16" initial_value="false" label="Adult"
+	     left_delta="20" mouse_opaque="true" name="event_adult_chk" width="55" />
+	<icon bottom="-180" color="0.5, 0, 0, 1" follows="top|right" height="16"
+	     image_name="map_track_16.tga" left="1013" mouse_opaque="true"
+	     name="avatar_icon" width="16" />
+	<combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
+	     label="Online Friends" left_delta="20" max_chars="60" mouse_opaque="true"
+	     name="friend combo" tool_tip="Friend to Show on Map" width="202">
+		<combo_item name="none_selected" value="None">
+			Online Friends
+		</combo_item>
+	</combo_box>
+	<icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"
+	     image_name="map_track_16.tga" left="1013" mouse_opaque="true"
+	     name="landmark_icon" width="16" />
+	<combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
+	     label="Landmarks" left_delta="20" max_chars="64" mouse_opaque="true"
+	     name="landmark combo" tool_tip="Landmark to Show on Map" width="202">
+		<combo_item name="none_selected" value="None">
+			Landmarks
+		</combo_item>
+	</combo_box>
+	<icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"
+	     image_name="map_track_16.tga" left="1013" mouse_opaque="true"
+	     name="location_icon" width="16" />
+	<line_editor bottom_delta="0" follows="top|right" height="20" label="Search by Region Name"
+	     left_delta="20" name="location" select_on_focus="true"
+	     tool_tip="Type the name of a region" width="140" />
+	<button bottom_delta="0" follows="top|right" font="SansSerif" halign="center"
+	     height="20" label="Search" left_delta="145" mouse_opaque="true"
+	     name="DoSearch" tool_tip="Search for region" width="60" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-20" drop_shadow_visible="true" follows="top|right"
+	     font="SansSerif" h_pad="0" halign="left" height="16" left="1013"
+	     mouse_opaque="true" name="search_label" v_pad="0" width="222">
+		Search Results:
+	</text>
+	<scroll_list background_visible="true" bottom_delta="-326" draw_border="true"
+	     draw_stripes="false" 
+	     follows="top|right|bottom" height="320" left="1013" multi_select="false"
+	     name="search_results" width="222">
+		<column label="" name="icon" width="16" />
+		<column label="" name="sim_name" width="206" />
+	</scroll_list>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-20" drop_shadow_visible="true" follows="bottom|right"
+	     font="SansSerif" h_pad="0" halign="left" height="16" left="1013"
+	     mouse_opaque="true" name="location_label" v_pad="0" width="98">
+		Location:
+	</text>
+	<spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
+	     increment="1" initial_val="128" left="1090" max_val="255" min_val="0"
+	     mouse_opaque="true" name="spin x"
+	     tool_tip="X coordinate of location to show on map" width="48" />
+	<spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
+	     increment="1" initial_val="128" left_delta="50" max_val="255" min_val="0"
+	     mouse_opaque="true" name="spin y"
+	     tool_tip="Y coordinate of location to show on map" width="48" />
+	<spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
+	     increment="1" initial_val="0" left_delta="50" max_val="4096" min_val="0"
+	     mouse_opaque="true" name="spin z"
+	     tool_tip="Z coordinate of location to show on map" width="48" />
+	<button bottom="-625" follows="right|bottom" font="SansSerif" halign="center"
+	     height="20" label="Teleport" label_selected="Teleport" left="-230"
+	     mouse_opaque="true" name="Teleport"
+	     tool_tip="Teleport to selected location" width="90" />
+	<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
+	     height="20" label="Show Destination" label_selected="Show Destination"
+	     left_delta="100" mouse_opaque="true" name="Show Destination"
+	     tool_tip="Center map on selected location" width="125" />
+	<button bottom_delta="-24" follows="right|bottom" font="SansSerif" halign="center"
+	     height="20" label="Clear" label_selected="Clear" left="-230"
+	     mouse_opaque="true" name="Clear" tool_tip="Stop tracking" width="90" />
+	<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
+	     height="20" label="Show My Location" label_selected="Show My Location"
+	     left_delta="100" mouse_opaque="true" name="Show My Location"
+	     tool_tip="Center map on your avatar&apos;s location" width="125" />
+	<button bottom_delta="-24" enabled="false" follows="bottom|right" font="SansSerif"
+	     height="20" label="Copy SLURL to clipboard" left="-230" name="copy_slurl"
+	     tool_tip="Copies current location as SLURL to be used on the web."
+	     width="222" />
+	<slider bottom="-697" can_edit_text="false" decimal_digits="3" follows="right|bottom"
+	     height="16" increment="0.2" initial_val="48.5029" label="Zoom" left="-230"
+	     max_val="0" min_val="-8" mouse_opaque="true" name="zoom slider"
+	     show_text="false" value="48.5029" width="222" />
+</floater>
diff --git a/indra/newview/skins/default/xui/es/fonts.xml b/indra/newview/skins/default/xui/es/fonts.xml
new file mode 100644
index 000000000..78114c9de
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/fonts.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<fonts>
+
+  <font name="default" comment="default font files (global fallbacks)">
+    <file>DejaVuSansCondensed.ttf</file>
+    <os name="Windows">
+      <file>MSGOTHIC.TTC</file>
+      <file>gulim.ttc</file>
+      <file>simhei.ttf</file>
+      <file>ArialUni.ttf</file>
+    </os>
+    <os name="Mac">
+      <file>ヒラギノ角ゴ ProN W3.otf</file>
+      <file>ヒラギノ角ゴ Pro W3.otf</file>
+      <file>AppleGothic.ttf</file>
+      <file>AppleGothic.dfont</file>
+      <file>�文细黑.ttf</file>
+      <file>儷黑 Pro.ttf</file>
+      <file>Apple Symbols.ttf</file>
+    </os>
+  </font>
+
+  <font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
+    <file>DroidSans.ttf</file>
+  </font>
+
+  <font name="SansSerifBold" 
+	comment="Name of bold sans-serif font" 
+	font_style="Bold">
+	<file>DroidSans-Bold.ttf</file>
+  </font>
+
+  <font name="Monospace"
+	comment="Name of monospace font">
+    <file>DejaVuSansMono.ttf</file>
+  </font>
+
+  <font name="DejaVu"
+	comment="Name of DejaVu font">
+    <file>DejaVuSans.ttf</file>
+  </font>
+
+  <font name="DejaVu"
+	comment="Name of DejaVu font (bold)"
+	font_style="BOLD">
+    <file>DejaVuSansBold.ttf</file>
+  </font>
+
+  <font name="DejaVu"
+	comment="Name of DejaVu font (italic)"
+	font_style="ITALIC">
+    <file>DejaVuSansOblique.ttf</file>
+  </font>
+
+  <font name="DejaVu"
+	comment="Name of DejaVu font (bold italic)"
+	font_style="BOLD|ITALIC">
+    <file>DejaVuSansBoldOblique.ttf</file>
+  </font>
+
+  <font name="Helvetica"
+	comment="Name of Helvetica font">
+    <file>arial.ttf</file>
+  </font>
+
+  <font name="Helvetica"
+	comment="Name of Helvetica font (bold)"
+	font_style="BOLD">
+    <file>arialbd.ttf</file>
+  </font>
+
+  <font name="Helvetica"
+	comment="Name of Helvetica font (italic)"
+	font_style="ITALIC">
+    <file>ariali.ttf</file>
+  </font>
+
+  <font name="Helvetica"
+	comment="Name of Helvetica font (bold italic)"
+	font_style="BOLD|ITALIC">
+    <file>arialbi.ttf</file>
+  </font>
+
+  <font name="OverrideTest"
+	comment="Name of font to test overriding">
+    <file>times.ttf</file>
+  </font>
+
+  <font_size name="Monospace"
+	     comment="Size for monospaced font (points, or 1/72 of an inch)"
+	     size="9.0"
+	     />
+  <font_size name="Huge"
+	     comment="Size of huge font (points, or 1/72 of an inch)"
+	     size="14.0"
+	     />
+  <font_size name="Large"
+	     comment="Size of large font (points, or 1/72 of an inch)"
+	     size="11.0"
+	     />
+  <font_size name="Medium"
+	     comment="Size of medium font (points, or 1/72 of an inch)"
+	     size="9.5"
+	     />
+  <font_size name="Small"
+	     comment="Size of small font (points, or 1/72 of an inch)"
+	     size="8.5"
+	     />
+</fonts>
+
diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml
new file mode 100644
index 000000000..c03009e23
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_inventory.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu name="Popup">
+	  <menu_item_call name="Task Buy" label="Comprar" >
+			 <on_click filter="" function="Inventory.DoToSelected" userdata="task_buy" />
+	  </menu_item_call>
+	  <menu_item_call name="Task Open" label="Abrir" >
+			 <on_click filter="" function="Inventory.DoToSelected" userdata="task_open" />
+	  </menu_item_call>
+	  <menu_item_call name="Task Play" label="Reproducir" >
+			 <on_click filter="" function="Inventory.DoToSelected" userdata="task_play" />
+	  </menu_item_call>
+	  <menu_item_call name="Task Properties" label="Propiedades" >
+			 <on_click filter="" function="Inventory.DoToSelected" userdata="task_properties" />
+	  </menu_item_call>
+	  <menu_item_call name="Task Rename" label="Renombrar" >
+			 <on_click filter="" function="Inventory.DoToSelected" userdata="rename" />
+	  </menu_item_call>
+	  <menu_item_call name="Task Remove" label="Borrar" >
+			 <on_click filter="" function="Inventory.DoToSelected" userdata="delete" />
+	  </menu_item_call>
+	  <menu_item_call name="Empty Trash" label="Vaciar Papelera" >
+			 <on_click filter="" function="Inventory.EmptyTrash" userdata="rename" />
+	  </menu_item_call>
+	  <menu_item_call name="Empty Lost And Found" label="Vaciar Perdidos y Encontrados" >
+			 <on_click filter="" function="Inventory.EmptyLostAndFound" userdata="rename" />
+	  </menu_item_call>
+	  <menu_item_call name="New Folder" label="Carpeta nueva" >
+			 <on_click filter="" function="Inventory.DoCreate" userdata="category" />
+	  </menu_item_call>
+	  <menu_item_call name="New Script" label="Script nuevo" >
+			 <on_click filter="" function="Inventory.DoCreate" userdata="lsl" />
+	  </menu_item_call>
+	  <menu_item_call  name="New Note" label="Nota nueva" >
+			 <on_click filter="" function="Inventory.DoCreate" userdata="notecard" />
+	  </menu_item_call>
+	  <menu_item_call name="New Gesture" label="Gesto nuevo" >
+			 <on_click filter="" function="Inventory.DoCreate" userdata="gesture" />
+	  </menu_item_call>
+	  <menu name="New Clothes" label="Nuevas Ropas">
+		<menu_item_call name="New Shirt" label=" Camisa nueva" >
+			<on_click filter="" function="Inventory.DoCreate" userdata="shirt" />
+		</menu_item_call>
+		<menu_item_call name="New Pants" label="Pantalones nuevos" >
+			<on_click filter="" function="Inventory.DoCreate" userdata="pants" />
+		</menu_item_call>
+		<menu_item_call name="New Shoes" label="Zapatos nuevos" >
+			<on_click filter="" function="Inventory.DoCreate" userdata="shoes" />
+		</menu_item_call>
+		<menu_item_call name="New Socks" label=" Calzetines nuevos" >
+			<on_click filter="" function="Inventory.DoCreate" userdata="socks" />
+		</menu_item_call>
+		<menu_item_call name="New Jacket" label="Chaqueta nueva" >
+			<on_click filter="" function="Inventory.DoCreate" userdata="jacket" />
+		</menu_item_call>
+		<menu_item_call name="New Skirt" label="Falda nueva" >
+			<on_click filter="" function="Inventory.DoCreate" userdata="skirt" />
+		</menu_item_call>
+		<menu_item_call name="New Gloves" label="Guantes nuevos" >
+			<on_click filter="" function="Inventory.DoCreate" userdata="gloves" />
+		</menu_item_call>
+		<menu_item_call name="New Undershirt" label="Camiseta nueva" >
+			<on_click filter="" function="Inventory.DoCreate" userdata="undershirt" />
+		</menu_item_call>
+		<menu_item_call name="New Underpants" label="Calzoncillos nuevos" >
+			<on_click filter="" function="Inventory.DoCreate" userdata="underpants" />
+		</menu_item_call>
+		<menu_item_call name="New Tattoo" label="Tatuaje nuevo" >
+			<on_click filter="" function="Inventory.DoCreate" userdata="tattoo" />
+		</menu_item_call>
+		<menu_item_call name="New Alpha" label="Alfa nueva" >
+			<on_click filter="" function="Inventory.DoCreate" userdata="alpha" />
+		</menu_item_call>
+    <menu_item_call name="New Physics" label="Física nueva" >
+      <on_click filter="" function="Inventory.DoCreate" userdata="physics" />
+    </menu_item_call>
+	</menu>
+	<menu name="New Body Parts">
+		<menu_item_call name="New Shape" label="Shape nuevo" >
+			<on_click filter="" function="Inventory.DoCreate" userdata="shape" />
+		</menu_item_call>
+		<menu_item_call name="New Skin" label="Skin nuevo" >
+			<on_click filter="" function="Inventory.DoCreate" userdata="skin" />
+		</menu_item_call>
+		<menu_item_call name="New Hair" label="Pelo nuevo" >
+			<on_click filter="" function="Inventory.DoCreate" userdata="hair" />
+		</menu_item_call>
+		<menu_item_call name="New Eyes" label="Ojos nuevos" >
+			<on_click filter="" function="Inventory.DoCreate" userdata="eyes" />
+		</menu_item_call>
+	</menu>
+	<menu_item_call name="Landmark Open" label="Teleport" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
+	</menu_item_call>
+	<menu_item_call name="Animation Open" label="Abrir" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
+	</menu_item_call>
+	<menu_item_call name="Sound Open" label="Abrir" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
+	</menu_item_call>
+	<menu_item_call name="Find Original" label="Encontrar original" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="goto" />
+	</menu_item_call>
+	<menu_item_call name="Purge Item" label="Limpiar objeto" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="purge" />
+	</menu_item_call>
+	<menu_item_call name="Restore Item" label="Restaurar objeto" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="restore" />
+	</menu_item_call>
+	<menu name="Open With...">
+		<menu_item_call name="Hex Open" label="Editor Hexa" >
+			<on_click filter="" function="Inventory.DoToSelected" userdata="open hex" />
+		</menu_item_call>
+		<menu_item_call name="Open Text" label="Editor de Texto" >
+			<on_click filter="" function="Inventory.DoToSelected" userdata="open text" />
+		</menu_item_call>
+		<menu_item_call name="Rez" label="Rezear Objeto" >
+			<on_click filter="" function="Inventory.DoToSelected" userdata="rez" />
+		</menu_item_call>
+	</menu>
+	<menu_item_call name="Open" label="Abrir" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
+	</menu_item_call>
+	<menu_item_call name="Properties" label="Propiedades">
+		<on_click filter="" function="Inventory.DoToSelected" userdata="properties" />
+	</menu_item_call>
+	<menu_item_call name="Rename" label="Renombrar" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="rename" />
+	</menu_item_call>
+	<menu_item_call name="Copy Asset UUID" label="Copiar Asset UUID" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="copy_uuid" />
+	</menu_item_call>
+	<menu_item_call name="Reupload..." label="Resubir..." >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="reupload" />
+	</menu_item_call>
+	<menu_item_call name="Acquire Asset ID" label="Adquirir Asset ID" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="acquire_asset_id" />
+	</menu_item_call>
+	<menu_item_separator name="Copy Separator" />
+	<menu_item_call name="Copy" label="Copiar" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="copy" />
+	</menu_item_call>
+	<menu_item_call name="Paste" label="Pegar">
+		<on_click filter="" function="Inventory.DoToSelected" userdata="paste" />
+	</menu_item_call>
+	<menu_item_call name="Paste As Link" label="Pegar como Link" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="paste_link" />
+	</menu_item_call>
+	<menu_item_call name="Restore to Last Position" label="Restaurar en el mundo" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="restoreToWorld" />
+	</menu_item_call>
+	<menu_item_separator name="Paste Separator" />
+	<menu_item_call name="Remove Link" label="Borrar Link" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="delete" />
+	</menu_item_call>
+	<menu_item_call name="Delete" label="Borrar">
+		<on_click filter="" function="Inventory.DoToSelected" userdata="delete" />
+	</menu_item_call>
+	<menu_item_separator name="Folder Wearables Separator" />
+  <menu_item_call name="Wear Items" label="Vestirse objetos" >
+    <on_click filter="" function="Inventory.DoToSelected" userdata="wearitems" />
+  </menu_item_call>
+  <menu_item_call name="Add To Outfit" label="Añadirse objetos" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="addtooutfit" />
+	</menu_item_call>
+	<menu_item_call name="Replace Outfit" label="Reemplazar ropa" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="replaceoutfit" />
+	</menu_item_call>
+  <menu_item_call name="Take Off Items" label="Quitarse objetos" >
+    <on_click filter="" function="Inventory.DoToSelected" userdata="removefromoutfit" />
+  </menu_item_call>
+  <menu_item_separator name="Calling Card Separator" />
+	<menu_item_call name="Conference Chat Folder" label="Comenzar conversacion de grupo" >
+		<on_click filter="" function="Inventory.BeginIMSession" userdata="everyone" />
+	</menu_item_call>
+	<menu_item_separator name="Sound Separator" />
+	<menu_item_call name="Sound Play" label="Reproducir" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
+	</menu_item_call>
+	<menu_item_separator name="Landmark Separator" />
+	<menu_item_call name="Teleport To Landmark" label="Sobre el hito" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="about" />
+	</menu_item_call>
+	<menu_item_separator name="Animation Separator" />
+	<menu_item_call name="Animation Play" label="Reproducir en el mundo">
+		<on_click filter="" function="Inventory.DoToSelected" userdata="playworld" />
+	</menu_item_call>
+	<menu_item_call name="Animation Audition" label="Reproducir en la zona" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="playlocal" />
+	</menu_item_call>
+	<menu_item_separator name="Send Instant Message Separator" />
+	<menu_item_call name="Send Instant Message" label="Enviar IM" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="begin_im" />
+	</menu_item_call>
+	<menu_item_call name="Offer Teleport..." label="Ofrecer Teleport..." >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="lure" />
+	</menu_item_call>
+	<menu_item_call name="Conference Chat" label="Comenzar conversacion de grupo" >
+		<on_click filter="" function="Inventory.BeginIMSession" userdata="selected" />
+	</menu_item_call>
+	<menu_item_separator name="Gesture Separator" />
+	<menu_item_call name="Activate" label="Activar" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="activate" />
+	</menu_item_call>
+	<menu_item_call name="Deactivate" label="Desactivar" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="deactivate" />
+	</menu_item_call>
+	<menu_item_separator name="Attach Separator" />
+	<menu_item_call name="Object Wear" label="Vestirse" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="attach" />
+	</menu_item_call>
+	<menu_item_call name="Object Add" label="Agregar Objeto" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="wear_add" />
+	</menu_item_call>
+	<menu name="Attach To" label="Anexar a" />
+	<menu name="Attach To HUD" label="Anexar como HUD"  />
+	<menu_item_call name="Detach From Yourself" label="Desvestirse" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="detach" />
+	</menu_item_call>
+	<menu_item_call name="Wearable Edit" label="Editar" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="edit" />
+	</menu_item_call>
+	<menu_item_call name="Wearable Wear"  label="Vestirse" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="wear" />
+	</menu_item_call>
+	<menu_item_call name="Take Off" label="Dejar" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="take_off" />
+	</menu_item_call>
+	<menu_item_call name="--no options--" label="--sin opciones--"  />
+	<--menu_item_separator name="Wearable Separator" /-->
+</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_login.xml b/indra/newview/skins/default/xui/es/menu_login.xml
new file mode 100644
index 000000000..a46385b51
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_login.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
+     height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true"
+     tear_off="false" width="802">
+	<menu name="File" label="Archivo" >
+		<menu_item_call name="Quit" label="Salir" >
+			<on_click function="File.Quit" userdata="" />
+		</menu_item_call>
+	</menu>
+	<menu name="Edit" label="Editar" >
+		<menu_item_call name="Preferences..." label="Preferencias..." >
+			<on_click function="ShowFloater" userdata="preferences" />
+		</menu_item_call>
+	</menu>
+	<menu name="Help" label="Ayuda" >
+		<menu_item_call name="Second Life Help" label="Ayuda de Second Life">
+			<on_click function="ShowFloater" userdata="help f1" />
+		</menu_item_call>
+		<menu_item_call name="About Second Life..." label="Acerca de Singularity..." >
+			<on_click function="ShowFloater" userdata="about" />
+		</menu_item_call>
+	</menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/es/menu_mini_map.xml b/indra/newview/skins/default/xui/es/menu_mini_map.xml
new file mode 100644
index 000000000..5e7455754
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_mini_map.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu bottom="100" color="MenuDefaultBgColor" drop_shadow="true" height="101" left="100"
+	 mouse_opaque="false" name="popup" opaque="true" width="128">
+	<menu_item_call name="Zoom Close" label="Acercar" >
+		<on_click function="MiniMap.ZoomLevel" userdata="2" />
+	</menu_item_call>
+	<menu_item_call name="Zoom Medium" label="Normal" >
+		<on_click function="MiniMap.ZoomLevel" userdata="1" />
+	</menu_item_call>
+	<menu_item_call  name="Zoom Far" label="Alejar" >
+		<on_click function="MiniMap.ZoomLevel" userdata="0" />
+	</menu_item_call>
+	<menu_item_separator />
+	<menu_item_check name="Center on Camera" label="Centrar en Cámara">
+		<on_click function="MiniMap.Center" userdata="1" />
+		<on_check function="MiniMap.CheckCenter" userdata="1" />
+	</menu_item_check>
+	<menu_item_check name="Rotate Mini-Map" label="Rotar Mini-Mapa">
+	  <on_click function="MiniMap.Rotate" userdata="" />
+	  <on_check function="MiniMap.CheckRotate" userdata="" />
+	</menu_item_check>
+	<menu_item_separator />
+	<menu_item_call name="Stop Tracking" label="Detener Seguimiento" >
+		<on_click function="MiniMap.StopTracking" />
+		<on_enable function="MiniMap.EnableTracking" />
+	</menu_item_call>
+	<menu_item_call name="Profile" label="Perfil..." >
+		<on_click function="MiniMap.ShowProfile" />
+		<on_enable function="MiniMap.EnableProfile" />
+	</menu_item_call>
+	<menu_item_call name="Camfollow" label="Cámara..." >
+		<on_click function="MiniMap.CamFollow" />
+		<on_enable function="MiniMap.EnableProfile" />
+	</menu_item_call>
+	<menu bottom_delta="0" color="MenuDefaultBgColor" drop_shadow="true" height="175" left="0"
+	     mouse_opaque="false" name="Mark" opaque="true" tear_off="false"
+	     width="125">
+		<on_enable function="MiniMap.EnableProfile" />
+		<menu_item_call name="Red" label="Rojo" >
+			<on_click function="MiniMap.setred" />
+		</menu_item_call>
+		<menu_item_call name="Green" label="Verde" >
+			<on_click function="MiniMap.setgreen" />
+		</menu_item_call>
+		<menu_item_call name="Blue" label="Azul" >
+			<on_click function="MiniMap.setblue" />
+		</menu_item_call>
+		<menu_item_call name="Yellow" label="Amarillo">
+			<on_click function="MiniMap.setyellow" />
+		</menu_item_call>
+		<menu_item_call name="Custom" label="Personalizar...">
+			<on_click function="MiniMap.setcustom" />
+		</menu_item_call>
+  </menu>
+  <menu_item_call name="Unmark" label="Desmarcar" >
+    <on_click function="MiniMap.setunmark" />
+    <on_enable function="MiniMap.enableunmark" />
+  </menu_item_call>
+</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_pie_attachment.xml b/indra/newview/skins/default/xui/es/menu_pie_attachment.xml
new file mode 100644
index 000000000..4308b5d42
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_pie_attachment.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="Attachment Pie">
+	  <menu_item_call label="Perfil..." name="Profile...">
+			 <on_click function="ShowAgentProfile" userdata="agent" />
+	  </menu_item_call>
+	  <menu_item_call label="Soltar" name="Drop">
+			 <on_click function="Attachment.Drop" />
+			 <on_enable function="Attachment.EnableDrop" />
+	  </menu_item_call>
+	  <menu_item_call label="Tocar" name="Attachment Object Touch">
+			 <on_click function="Object.Touch" />
+			 <on_enable function="Object.EnableTouch" userdata="Touch" name="EnableTouch"/>
+	  </menu_item_call>
+	  <menu_item_call label="Pararse" name="Stand Up">
+			 <on_click function="Self.StandUp" userdata="" />
+			 <on_enable function="Self.EnableStandUp" />
+	  </menu_item_call>
+	  <menu_item_call enabled="false" label="Quitar" mouse_opaque="true" name="Detach">
+			 <on_click function="Attachment.Detach" />
+			 <on_enable function="Attachment.EnableDetach" />
+	  </menu_item_call>
+	  <pie_menu label="Herramientas &gt;" name="Tools &gt;">
+			 <menu_item_call label="S. Count" mouse_opaque="true" name="ScriptCount">
+					<on_click function="Object.ScriptCount" />
+					<on_visible function="Object.VisibleScriptCount" />
+			 </menu_item_call>
+			 <menu_item_call label="Inspeccionar" name="Object Inspect">
+					<on_click function="Object.Inspect" />
+					<on_enable function="Object.EnableInspect"/>
+			 </menu_item_call>
+			 <menu_item_call label="Data" name="Data">
+					<on_click function="Object.Data" />
+			 </menu_item_call>
+			 <menu_item_call label="Derender" name="Derender">
+					<on_click function="Object.DERENDER" />
+					<on_enable function="Object.EnableDerender" />
+			 </menu_item_call>
+	  </pie_menu>
+	  <menu_item_call label="Apariencia..." name="Appearance...">
+			 <on_click function="ShowFloater" userdata="appearance" />
+			 <on_enable function="Edit.EnableCustomizeAvatar" />
+	  </menu_item_call>
+	  <menu_item_call label="Editar..." name="Edit...">
+			 <on_click function="Object.Edit" />
+			 <on_enable function="EnableEdit" />
+	  </menu_item_call>
+</pie_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_pie_avatar.xml b/indra/newview/skins/default/xui/es/menu_pie_avatar.xml
new file mode 100644
index 000000000..b998bf896
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_pie_avatar.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="Avatar Pie">
+	<menu_item_call label="Perfil..." name="Profile...">
+		<on_click function="ShowAgentProfile" userdata="hit object" />
+	</menu_item_call>
+	<menu_item_call  label="Silenciar"  name="Avatar Mute">
+		<on_click function="Avatar.Mute" />
+		<on_enable function="Avatar.EnableMute" />
+	</menu_item_call>
+	<menu_item_call label="Ir a"  name="Go To">
+		<on_click function="GoToObject" />
+	</menu_item_call>
+  <menu_item_call label="Denunciar..." name="abuse">
+    <on_click function="Avatar.ReportAbuse" />
+  </menu_item_call>
+	<menu_item_call label="Añadir como Amigo..." name="Add Friend">
+		<on_click function="Avatar.AddFriend" />
+		<on_enable function="Avatar.EnableAddFriend" />
+	</menu_item_call>
+	<menu_item_call label="Pagar..." name="Pay...">
+		<on_click function="PayObject" />
+		<on_enable function="EnablePayObject" />
+	</menu_item_call>
+	<pie_menu label="Más &gt;" name="More &gt;">
+		<menu_item_call label="Congelar..." name="Freeze...">
+			<on_click function="Avatar.Freeze" />
+			<on_enable function="Avatar.EnableFreezeEject" />
+		</menu_item_call>
+		<menu_item_call label="Dar Tarjeta" name="Give Card">
+			<on_click function="Avatar.GiveCard" />
+		</menu_item_call>
+		<menu_item_call label="Invitar a Grupo..." name="Invite...">
+			<on_click function="Avatar.InviteToGroup" />
+		</menu_item_call>
+		<pie_menu label="Herramientas &gt;" name="Tools &gt;">
+			<menu_item_call  label="S. Count" name="ScriptCount">
+				<on_click function="Object.ScriptCount" />
+				<on_visible function="Object.VisibleScriptCount" />
+			</menu_item_call>
+			<menu_item_call label="Copiar UUID" name="CopyUUID">
+				<on_click function="Avatar.CopyUUID" />
+			</menu_item_call>
+			<menu_item_call label="ID Cliente" name="ClientID">
+				<on_click function="Avatar.ClientID" />
+			</menu_item_call>
+			<menu_item_call label="Derender" name="Derender">
+				<on_click function="Object.DERENDER" />
+			</menu_item_call>
+		</pie_menu>
+		<menu_item_call label="Expulsar..." name="Eject...">
+			<on_click function="Avatar.Eject" />
+			<on_enable function="Avatar.EnableFreezeEject" />
+		</menu_item_call>
+		<menu_item_separator />
+		<menu_item_call label="Examinar" name="Object Inspect">
+			<on_click function="Object.Inspect" />
+			<on_enable function="Object.EnableInspect" />
+		</menu_item_call>
+	</pie_menu>
+	<menu_item_call label="Enviar IM..." name="Send IM...">
+		<on_click function="Avatar.SendIM" />
+	</menu_item_call>
+</pie_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_pie_land.xml b/indra/newview/skins/default/xui/es/menu_pie_land.xml
new file mode 100644
index 000000000..28aa36644
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_pie_land.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="Land Pie">
+	<menu_item_call label="Sobre el terreno..." name="About Land...">
+		<on_click function="ShowFloater" userdata="about land" />
+	</menu_item_call>
+	<menu_item_call label="Crear" name="Create">
+		<on_click function="Land.Build" />
+		<on_enable function="EnableEdit" />
+	</menu_item_call>
+	<menu_item_call label="Ir aquí" name="Go Here">
+		<on_click function="GoToObject" />
+	</menu_item_call>
+	<menu_item_call label="Sentarse aquí" name="Sit Here">
+		<on_click function="Land.Sit" />
+	</menu_item_call>
+	<menu_item_separator />
+	<menu_item_call label="Comprar pase..." name="Land Buy Pass">
+		<on_click function="Land.BuyPass" />
+		<on_enable function="Land.EnableBuyPass" />
+	</menu_item_call>
+	<menu_item_call label="Editar terreno" name="Edit Terrain">
+		<on_click function="Land.Edit" />
+		<on_enable function="EnableEdit" />
+	</menu_item_call>
+	<menu_item_call label="Comprar Terreno..." name="Land Buy">
+		<on_click function="ShowFloater" userdata="buy land" />
+		<on_enable function="World.EnableBuyLand" />
+	</menu_item_call>
+</pie_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_pie_object.xml b/indra/newview/skins/default/xui/es/menu_pie_object.xml
new file mode 100644
index 000000000..129ba4e87
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_pie_object.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="Object Pie">
+	<menu_item_call label="Abrir" name="Open">
+		<on_click function="Object.Open" />
+		<on_enable function="Object.EnableOpen" />
+	</menu_item_call>
+	<menu_item_call label="Crear" name="Create">
+		<on_click function="Object.Build" />
+		<on_enable function="EnableEdit" />
+	</menu_item_call>
+	<menu_item_call label="Tocar" name="Object Touch">
+		<on_click function="Object.Touch" />
+		<on_enable function="Object.EnableTouch" userdata="Touch" name="EnableTouch"/>
+	</menu_item_call>
+	<menu_item_call label="Sentarse" name="Object Sit">
+		<on_click function="Object.SitOrStand" />
+		<on_enable function="Object.EnableSitOrStand" userdata="Sit Here,Stand Up" name="EnableSitOrStand"/>
+	</menu_item_call>
+	<menu_item_call label="Recoger" name="Pie Object Take">
+		<on_click function="Tools.BuyOrTake" />
+		<on_enable function="Tools.EnableBuyOrTake" userdata="Buy,Take" name="EnableBuyOrTake"/>
+	</menu_item_call>
+	<menu_item_call label="Pagar..." name="Pay...">
+		<on_click function="PayObject" />
+		<on_enable function="EnablePayObject" />
+	</menu_item_call>
+	<pie_menu label="Más &gt;" name="More &gt;">
+		<menu_item_call label="Borrar" name="Delete">
+			<on_click function="Object.Delete" />
+			<on_enable function="Object.EnableDelete" />
+		</menu_item_call>
+		<menu_item_call label="Vestirse" name="Wear">
+			<on_click function="Object.AttachToAvatar" />
+			<on_enable function="Object.EnableWear" />
+		</menu_item_call>
+		<menu_item_call label="Recoger una copia" name="Take Copy">
+			<on_click function="Tools.TakeCopy" />
+			<on_enable function="Tools.EnableTakeCopy" />
+		</menu_item_call>
+		<pie_menu label="Anexar HUD &gt;" name="Object Attach HUD" />
+		<pie_menu label="Anexar &gt;" name="Object Attach" />
+		<menu_item_call label="Regresar..." name="Return...">
+			<on_click function="Object.Return" />
+			<on_enable function="Object.EnableReturn" />
+		</menu_item_call>
+		<pie_menu label="Más &gt;" name="Rate Menu">
+			<menu_item_separator />
+			<pie_menu label="Herramientas &gt;" name="Rate Menu">
+				<menu_item_call label="Destruir" name="Destroy">
+					<on_click function="Object.Destroy" />
+					<on_enable function="Object.EnableDestroy" />
+				</menu_item_call>
+				<menu_item_call label="Explotar" name="Explode">
+					<on_click function="Object.Explode" />
+					<on_enable function="Object.EnableExplode" />
+				</menu_item_call>
+				<menu_item_call label="Medir" name="Measure">
+					<on_click function="Object.Measure" />
+				</menu_item_call>
+				<menu_item_call label="Información" name="Data">
+					<on_click function="Object.Data" />
+				</menu_item_call>
+				<menu_item_call label="S. Count" name="ScriptCount">
+					<on_click function="Object.ScriptCount" />
+					<on_visible function="Object.VisibleScriptCount" />
+				</menu_item_call>
+				<menu_item_call label="Reiniciar Scripts" name="Reset Scripts" >
+					<on_click function="Tools.SelectedScriptAction" userdata="reset" />
+					<on_enable function="EditableSelected" />
+				</menu_item_call>
+				<menu_item_call label="Exportar" name="Export">
+						<on_click function="Object.Export" />
+						<on_enable function="Object.EnableExport" />
+				</menu_item_call>				
+			</pie_menu>
+			<menu_item_call label="Silenciar" name="Object Mute">
+				<on_click function="Object.Mute" />
+				<on_enable function="Object.EnableMute" />
+			</menu_item_call>
+			<menu_item_call label="Examinar" name="Object Inspect">
+				<on_click function="Object.Inspect" />
+				<on_enable function="Object.EnableInspect" />
+			</menu_item_call>
+			<menu_item_call label="Derender" name="Derender">
+				<on_click function="Object.DERENDER" />
+			</menu_item_call>
+			<menu_item_call label="Reportar..." name="Report Abuse...">
+				<on_click function="Object.ReportAbuse" />
+				<on_enable function="Object.EnableReportAbuse" />
+			</menu_item_call>
+		</pie_menu>
+		<menu_item_call enabled="false" label="Comprar..." name="Buy...">
+			<on_click function="Object.Buy" />
+			<on_enable function="Object.EnableBuy" />
+		</menu_item_call>
+	</pie_menu>
+	<menu_item_call enabled="false" label="Editar..." name="Edit...">
+		<on_click function="Object.Edit" />
+		<on_enable function="EnableEdit" />
+	</menu_item_call>
+</pie_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_pie_self.xml b/indra/newview/skins/default/xui/es/menu_pie_self.xml
new file mode 100644
index 000000000..0d0e72dca
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_pie_self.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<pie_menu name="Self Pie">
+	<menu_item_call label="Perfil..." name="Profile...">
+		<on_click function="ShowAgentProfile" userdata="agent" />
+	</menu_item_call>
+	<menu_item_call label="Grupos..." name="Groups...">
+		<on_click function="ShowAgentGroups" userdata="agent" />
+	</menu_item_call>
+	<pie_menu label="Quitarse &gt;" name="Take Off &gt;">
+		<pie_menu  label="Ropa &gt;" name="Clothes &gt;">
+			<menu_item_call label="Camisa" name="Shirt">
+				<on_click function="Edit.TakeOff" userdata="shirt" />
+				<on_enable function="Edit.EnableTakeOff" userdata="shirt" />
+			</menu_item_call>
+			<menu_item_call label="Pantalones" name="Pants" >
+				<on_click function="Edit.TakeOff" userdata="pants" />
+				<on_enable function="Edit.EnableTakeOff" userdata="pants" />
+			</menu_item_call>
+			<menu_item_call label="Zapatos"  name="Shoes" >
+				<on_click function="Edit.TakeOff" userdata="shoes" />
+				<on_enable function="Edit.EnableTakeOff" userdata="shoes" />
+			</menu_item_call>
+			<menu_item_call blabel="Calcetines" name="Socks" >
+				<on_click function="Edit.TakeOff" userdata="socks" />
+				<on_enable function="Edit.EnableTakeOff" userdata="socks" />
+			</menu_item_call>
+			<menu_item_call label="Chaqueta" name="Jacket" >
+				<on_click function="Edit.TakeOff" userdata="jacket" />
+				<on_enable function="Edit.EnableTakeOff" userdata="jacket" />
+			</menu_item_call>
+			<menu_item_call label="Guantes" name="Gloves" >
+				<on_click function="Edit.TakeOff" userdata="gloves" />
+				<on_enable function="Edit.EnableTakeOff" userdata="gloves" />
+			</menu_item_call>
+			<pie_menu label="Más &gt;" name="More &gt;">
+				<menu_item_call label="Camiseta" name="Self Undershirt" >
+					<on_click function="Edit.TakeOff" userdata="undershirt" />
+					<on_enable function="Edit.EnableTakeOff" userdata="undershirt" />
+				</menu_item_call>
+				<menu_item_separator />
+				<menu_item_call label="Toda la ropa" name="All Clothes" >
+					<on_click function="Edit.TakeOff" userdata="all" />
+				</menu_item_call>
+				<menu_item_call label="Tatuaje" name="Self Tattoo" >
+					<on_click function="Edit.TakeOff" userdata="tattoo" />
+					<on_enable function="Edit.EnableTakeOff" userdata="tattoo" />
+				</menu_item_call>
+				<menu_item_call label="Alfa" name="Self Alpha" >
+					<on_click function="Edit.TakeOff" userdata="alpha" />
+					<on_enable function="Edit.EnableTakeOff" userdata="alpha" />
+				</menu_item_call>
+				<menu_item_call label="Calzoncillos" name="Self Underpants" >
+					<on_click function="Edit.TakeOff" userdata="underpants" />
+					<on_enable function="Edit.EnableTakeOff" userdata="underpants" />
+				</menu_item_call>
+        <menu_item_call label="Física" name="Self Physics" >
+          <on_click function="Edit.TakeOff" userdata="physics" />
+          <on_enable function="Edit.EnableTakeOff" userdata="physics" />
+        </menu_item_call>
+			</pie_menu>
+			<menu_item_call label="Falda" name="Skirt" >
+				<on_click function="Edit.TakeOff" userdata="skirt" />
+				<on_enable function="Edit.EnableTakeOff" userdata="skirt" />
+			</menu_item_call>
+		</pie_menu>
+		<pie_menu label="HUD &gt;" name="Object Detach HUD" />
+		<menu_item_separator />
+		<pie_menu enabled="true" label="Quitar &gt;" name="Object Detach" />
+		<menu_item_separator />
+		<menu_item_call label="Quitar todo" name="Detach All">
+			<on_click function="Self.RemoveAllAttachments" userdata="" />
+			<on_enable function="Self.EnableRemoveAllAttachments" />
+		</menu_item_call>
+	</pie_menu>
+  <pie_menu label="Herramientas &gt;" name="Tools &gt;">
+	  <menu_item_call label="Animaciones..." name="Anims..." >
+		  <on_click function="Avatar.Anims" />
+	  </menu_item_call>
+	  <menu_item_call label="S. Count" name="ScriptCount">
+		  <on_click function="Object.ScriptCount" />
+		  <on_visible function="Object.VisibleScriptCount" />
+	  </menu_item_call>
+    <menu_item_call label="Depurar..." name="Debug Layers">
+      <on_click function="Avatar.Debug" />
+    </menu_item_call>
+    <menu_item_call label="Copiar UUID" name="CopyUUID">
+      <on_click function="Avatar.CopyUUID" />
+    </menu_item_call>
+  </pie_menu>
+  <menu_item_separator />
+	<menu_item_call label="Gestos..." name="Gestures...">
+		<on_click function="ShowFloater" userdata="gestures" />
+	</menu_item_call>
+	<menu_item_call label="Apariencia..." name="Appearance...">
+		<on_click function="ShowFloater" userdata="appearance" />
+		<on_enable function="Edit.EnableCustomizeAvatar" />
+	</menu_item_call>
+</pie_menu>
diff --git a/indra/newview/skins/default/xui/es/menu_slurl.xml b/indra/newview/skins/default/xui/es/menu_slurl.xml
new file mode 100644
index 000000000..5ec4f662c
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_slurl.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu bottom="100" color="0, 0, 0, 1" drop_shadow="true" height="101" left="100"
+     mouse_opaque="false" name="Popup" opaque="true" width="128">
+	<menu_item_separator name="Landmark Separator" />
+	<menu_item_call label="Acerca de la URL" name="about_url" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="about" />
+	</menu_item_call>
+	<menu_item_call label="Teleportar a la URL" name="teleport_to_url" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="about" />
+	</menu_item_call>
+	<menu_item_call label="Mostrar en el Mapa" name="show_on_map" >
+		<on_click filter="" function="Inventory.DoToSelected" userdata="about" />
+	</menu_item_call>
+</menu>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
new file mode 100644
index 000000000..819b782dd
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -0,0 +1,666 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
+     height="18" left="0" mouse_opaque="true" name="Main Menu" opaque="false"
+     tear_off="false" width="802">
+	<menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
+	    height="263" label="Archivo" left="0" mouse_opaque="false" name="File"
+	    opaque="true" tear_off="true" width="243">
+    <menu_item_call label="Imágen ([UPLOADFEE])..." name="Upload Image" >
+		<on_click function="File.UploadImage" userdata="" />
+		<on_enable function="File.EnableUpload" />
+    </menu_item_call>
+    <menu_item_call label="Sonido ([UPLOADFEE])..." name="Upload Sound" >
+        <on_click function="File.UploadSound" userdata="" />
+        <on_enable function="File.EnableUpload" />
+    </menu_item_call>
+    <menu_item_call label="Animación ([UPLOADFEE])..." name="Upload Animation" >
+        <on_click function="File.UploadAnim" userdata="" />
+        <on_enable function="File.EnableUpload" />
+    </menu_item_call>
+    <menu_item_call label="Masiva ([UPLOADFEE] por archivo)..." name="Bulk Upload" >
+        <on_click function="File.UploadBulk" userdata="" />
+    </menu_item_call>
+	<menu_item_call label="Importar XML" name="Import">
+		<on_click function="Object.Import" />
+		<on_enable function="Object.EnableImport" />
+	</menu_item_call>
+	<menu_item_call label="Importar con Texturas" name="Import2">
+		<on_click function="Object.ImportUpload" />
+		<on_enable function="Object.EnableImport" />
+	</menu_item_call>
+    <menu_item_separator label="-----------" name="separator" />
+    <menu_item_call label="Definir Permisos por Defecto..." name="perm prefs" >
+        <on_click function="ShowFloater" userdata="perm prefs" />
+    </menu_item_call>
+		<menu_item_separator label="-----------" name="separator" />
+		<menu_item_call label="Cerrar Ventana" name="Close Window" >
+			<on_click function="File.CloseWindow" userdata="" />
+			<on_enable function="File.EnableCloseWindow" userdata="" />
+		</menu_item_call>
+		<menu_item_call label="Cerrar todas las Ventanas" name="Close All Windows" >
+			<on_click function="File.CloseAllWindows" userdata="" />
+			<on_enable function="File.EnableCloseAllWindows" userdata="" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator2" />
+		<menu_item_call label="Guardar Vista Previa Como..." name="Save Preview As..." >
+			<on_click function="File.SavePreview" userdata="" />
+			<on_enable function="File.EnableSaveAs" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator3" />
+		<menu_item_call label="Hacer una Foto" name="Take Snapshot" >
+			<on_click function="File.TakeSnapshot" userdata="" />
+		</menu_item_call>
+		<menu_item_call label="Guardar Foto" name="Snapshot to Disk" >
+			<on_click function="File.TakeSnapshotToDisk" userdata="" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu_item_call label="Salir" name="Quit" >
+			<on_click function="File.Quit" userdata="" />
+		</menu_item_call>
+	    <!--menu_item_call bottom="-259" enabled="true" height="19" label="Log Out" left="0" color="1 0 0 1"
+			mouse_opaque="true" name="Log Out" width="243">
+			<on_click function="File.LogOut" userdata="" />
+		</menu_item_call-->
+	</menu>
+	<menu label="Editar" name="Edit" >
+		<menu_item_call label="Deshacer" name="Undo" >
+			<on_click function="Edit.Undo" userdata="" />
+			<on_enable function="Edit.EnableUndo" />
+		</menu_item_call>
+		<menu_item_call label="Rehacer" name="Redo" >
+			<on_click function="Edit.Redo" userdata="" />
+			<on_enable function="Edit.EnableRedo" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator" />
+		<menu_item_call label="Cortar" name="Cut" >
+			<on_click function="Edit.Cut" userdata="" />
+			<on_enable function="Edit.EnableCut" />
+		</menu_item_call>
+		<menu_item_call label="Copiar" name="Copy" >
+			<on_click function="Edit.Copy" userdata="" />
+			<on_enable function="Edit.EnableCopy" />
+		</menu_item_call>
+		<menu_item_call label="Pegar" name="Paste" >
+			<on_click function="Edit.Paste" userdata="" />
+			<on_enable function="Edit.EnablePaste" />
+		</menu_item_call>
+		<menu_item_call label="Borrar" name="Delete" >
+			<on_click function="Edit.Delete" userdata="" />
+			<on_enable function="Edit.EnableDelete" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator2" />
+		<menu_item_call label="Buscar..." name="Search..." >
+			<on_click function="Edit.Search" userdata="" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator3" />
+		<menu_item_call label="Seleccionar Todo" name="Select All" >
+			<on_click function="Edit.SelectAll" userdata="" />
+			<on_enable function="Edit.EnableSelectAll" />
+		</menu_item_call>
+		<menu_item_call label="Deseleccionar" name="Deselect" >
+			<on_click function="Edit.Deselect" userdata="" />
+			<on_enable function="Edit.EnableDeselect" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator4" />
+		<menu_item_call label="Duplicar" name="Duplicate" >
+			<on_click function="Edit.Duplicate" userdata="" />
+			<on_enable function="Edit.EnableDuplicate" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator5" />
+		<menu label="Anexar Objeto" name="Attach Object" />
+		<menu label="Quitarse Objeto" name="Detach Object" />
+		<menu label="Quitarse Ropas" name="Take Off Clothing" >
+			<menu_item_call label="Camisa" name="Shirt" >
+				<on_click function="Edit.TakeOff" userdata="shirt" />
+				<on_enable function="Edit.EnableTakeOff" userdata="shirt" />
+			</menu_item_call>
+			<menu_item_call label="Pantalones" name="Pants" >
+				<on_click function="Edit.TakeOff" userdata="pants" />
+				<on_enable function="Edit.EnableTakeOff" userdata="pants" />
+			</menu_item_call>
+			<menu_item_call label="Zapatos" name="Shoes" >
+				<on_click function="Edit.TakeOff" userdata="shoes" />
+				<on_enable function="Edit.EnableTakeOff" userdata="shoes" />
+			</menu_item_call>
+			<menu_item_call label="Calcetines" name="Socks" >
+				<on_click function="Edit.TakeOff" userdata="socks" />
+				<on_enable function="Edit.EnableTakeOff" userdata="socks" />
+			</menu_item_call>
+			<menu_item_call label="Chaqueta" name="Jacket" >
+				<on_click function="Edit.TakeOff" userdata="jacket" />
+				<on_enable function="Edit.EnableTakeOff" userdata="jacket" />
+			</menu_item_call>
+			<menu_item_call label="Guantes" name="Gloves">
+				<on_click function="Edit.TakeOff" userdata="gloves" />
+				<on_enable function="Edit.EnableTakeOff" userdata="gloves" />
+			</menu_item_call>
+			<menu_item_call label="Camiseta" name="Menu Undershirt" >
+				<on_click function="Edit.TakeOff" userdata="undershirt" />
+				<on_enable function="Edit.EnableTakeOff" userdata="undershirt" />
+			</menu_item_call>
+			<menu_item_call label="Calzoncillos" name="Menu Underpants" >
+				<on_click function="Edit.TakeOff" userdata="underpants" />
+				<on_enable function="Edit.EnableTakeOff" userdata="underpants" />
+			</menu_item_call>
+			<menu_item_call label="Falda" name="Skirt" >
+				<on_click function="Edit.TakeOff" userdata="skirt" />
+				<on_enable function="Edit.EnableTakeOff" userdata="skirt" />
+			</menu_item_call>
+			<menu_item_call label="Tatuaje" name="Tattoo" >
+				<on_click function="Edit.TakeOff" userdata="tattoo" />
+				<on_enable function="Edit.EnableTakeOff" userdata="tattoo" />
+			</menu_item_call>
+            <menu_item_separator label="-----------" name="separator51" />
+			<menu_item_call label="Alfa" name="Alpha" >
+				<on_click function="Edit.TakeOff" userdata="alpha" />
+				<on_enable function="Edit.EnableTakeOff" userdata="alpha" />
+			</menu_item_call>
+            <menu_item_call label="Física" name="Physics" >
+                <on_click function="Edit.TakeOff" userdata="physics" />
+                <on_enable function="Edit.EnableTakeOff" userdata="physics" />
+            </menu_item_call>
+            <menu_item_separator label="-----------" name="separator51" />
+			<menu_item_call label="Toda la Ropa" name="All Clothes" >
+				<on_click function="Edit.TakeOff" userdata="all" />
+			</menu_item_call>
+		</menu>
+		<menu_item_separator label="-----------" name="separator6" />
+		<menu_item_call label="Gestos..." name="Gestures..." >
+			<on_click function="ShowFloater" userdata="gestures" />
+		</menu_item_call>
+		<menu_item_call label="Perfil..." name="Profile..." >
+			<on_click function="ShowAgentProfile" userdata="agent" />
+		</menu_item_call>
+		<menu_item_call label="Apariencia..." name="Appearance..." >
+			<on_click function="ShowFloater" userdata="appearance" />
+			<on_enable function="Edit.EnableCustomizeAvatar" />
+		</menu_item_call>
+		<menu_item_call label="Mostrar el Nombre..." name="Display Name..." >
+			<on_click function="ShowFloater" userdata="displayname" />
+			<on_enable function="Edit.EnableChangeDisplayname" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator7" />
+		<menu_item_check label="Amigos..." name="Friends..." >
+			<on_click function="ShowFloater" userdata="friends" />
+			<on_check function="FloaterVisible" userdata="friends" />
+		</menu_item_check>
+		<menu_item_call label="Grupos..." name="Groups..." >
+			<on_click function="ShowAgentGroups" userdata="agent" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator8" />
+		<menu_item_call label="Preferencias..." name="Preferences..." >
+			<on_click function="ShowFloater" userdata="preferences" />
+		</menu_item_call>
+	</menu>
+	<menu label="Ver"  name="View" >
+		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
+		<menu_item_call label="Vista Subjetiva" name="Mouselook" >
+			<on_click function="View.Mouselook" userdata="" />
+			<on_enable function="View.EnableMouselook" />
+		</menu_item_call>
+		<menu_item_check label="Construir" name="Build" >
+			<on_click function="View.BuildMode" userdata="" />
+			<on_check function="View.CheckBuildMode" />
+		</menu_item_check>
+		<menu_item_check label="Flycam del Joystick" name="Joystick Flycam" >
+			<on_click function="View.JoystickFlycam" userdata="" />
+			<on_check function="View.CheckJoystickFlycam" />
+			<on_enable function="View.EnableJoystickFlycam" />
+		</menu_item_check>
+		<menu_item_call label="Volver a Vista por Defecto" name="Reset View" >
+			<on_click function="View.ResetView" userdata="" />
+		</menu_item_call>
+		<menu_item_call label="Mirar al último que habló" name="Look at Last Chatter" >
+			<on_click function="View.LookAtLastChatter" userdata="" />
+			<on_enable function="View.EnableLastChatter" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator" />
+		<menu_item_check label="Barra de Herramientas" name="Toolbar" >
+			<on_click function="ShowFloater" userdata="toolbar" />
+			<on_check function="FloaterVisible" userdata="toolbar" />
+		</menu_item_check>
+		<menu_item_check label="Chat local" name="Chat History" >
+             <on_click function="ShowFloater" userdata="chat history"/>
+             <on_check function="FloaterVisible" userdata="chat history" />
+        </menu_item_check>
+		<menu_item_check label="Comunicarse" name="Instant Message" >
+			<on_click function="View.Communicate"/>
+            <on_check function="FloaterVisible" userdata="communicate" />
+        </menu_item_check>
+		<menu_item_check label="Inventario" name="Inventory" >
+			<on_click function="ShowFloater" userdata="inventory" />
+            <on_check function="FloaterVisible" userdata="inventory" />
+        </menu_item_check>
+		<menu_item_check label="Participantes Activos" name="Active Speakers" >
+			<on_click function="ShowFloater" userdata="active speakers" />
+			<on_check function="FloaterVisible" userdata="active speakers" />
+		</menu_item_check>
+		<menu_item_check label="Lista de Ignorados" name="Mute List" >
+			<on_click function="ShowFloater" userdata="mute list" />
+			<on_check function="FloaterVisible" userdata="mute list" />
+		</menu_item_check>
+		<menu_item_check label="Historial de Teleport" name="Teleport History" >
+			<on_click function="ShowFloater" userdata="teleport history" />
+			<on_check function="FloaterVisible" userdata="teleport history" />
+		</menu_item_check>
+		<menu_item_check label="Filtro de Media" name="Media Filter" >
+			<on_click function="ShowFloater" userdata="media filter" />
+			<on_check function="FloaterVisible" userdata="media filter" />
+		</menu_item_check>
+		<menu_item_separator label="-----------" name="separator2" />
+		<menu_item_check label="Controles de Cámara" name="Camera Controls" >
+			<on_click function="ShowFloater" userdata="camera controls" />
+			<on_check function="FloaterVisible" userdata="camera controls" />
+		</menu_item_check>
+		<menu_item_check label="Controles de Movimiento" name="Movement Controls">
+			<on_click function="ShowFloater" userdata="movement controls" />
+			<on_check function="FloaterVisible" userdata="movement controls" />
+		</menu_item_check>
+		<menu_item_check label="Mapa del Mundo" name="World Map" >
+			<on_click function="ShowFloater" userdata="world map" />
+			<on_check control="ShowWorldMap" />
+		</menu_item_check>
+		<menu_item_check label="MiniMapa" name="Mini-Map" >
+			<on_click function="ShowFloater" userdata="mini map" />
+			<on_check control="ShowMiniMap" />
+		</menu_item_check>
+		<menu_item_check label="Radar" name="Radar" >
+			<on_click function="View.ToggleAvatarList" userdata="radar" />
+			<on_check control="ShowRadar" />
+		</menu_item_check>
+		<menu_item_separator label="-----------" name="separator3" />
+		<menu_item_check label="Estadísticas" name="Statistics Bar" >
+			<on_click function="ShowFloater" userdata="stat bar" />
+			<on_check function="FloaterVisible" userdata="stat bar" />
+		</menu_item_check>
+		<menu_item_separator label="-----------" name="separator100" />
+		<menu_item_check label="Búsqueda en �rea" name="Area Search" >
+			<on_click function="ShowFloater" userdata="areasearch" />
+			<on_check function="FloaterVisible" userdata="areasearch" />
+		</menu_item_check>
+		<menu_item_check label="Límites de Parcelas" name="Property Lines" >
+			<on_click function="ToggleControl" userdata="ShowPropertyLines" />
+			<on_check control="ShowPropertyLines" />
+		</menu_item_check>
+		<menu_item_check label="Líneas de Prohibición" name="Banlines" >
+			<on_click function="ToggleControl" userdata="ShowBanLines" />
+			<on_check control="ShowBanLines" />
+		</menu_item_check>
+		<menu_item_check label="Propietarios del Terreno" name="Land Owners" >
+			<on_click function="ToggleControl" userdata="ShowParcelOwners" />
+			<on_check control="ShowParcelOwners" />
+		</menu_item_check>
+		<menu_item_separator label="-----------" name="separator4" />
+		<menu label="Información Adicional" name="Hover Tips" >
+			<menu_item_check label="Mostrar Información Adicional" name="Show Tips" >
+				<on_click function="View.ShowHoverTips" userdata="" />
+				<on_check function="View.CheckShowHoverTips" />
+			</menu_item_check>
+			<menu_item_separator label="-----------" name="separator" />
+			<menu_item_check label="Información Adicional del Terreno" name="Land Tips" >
+				<on_click function="ToggleControl" userdata="ShowLandHoverTip" />
+				<on_enable function="View.CheckShowHoverTips" />
+				<on_check control="ShowLandHoverTip" />
+			</menu_item_check>
+			<menu_item_check label="Consejos en Todos los Objetos" name="Tips On All Objects" >
+				<on_click function="ToggleControl" userdata="ShowAllObjectHoverTip" />
+				<on_enable function="View.CheckShowHoverTips" />
+				<on_check control="ShowAllObjectHoverTip" />
+			</menu_item_check>
+		</menu>
+		<menu_item_check label="Realzar Transparencias" name="Highlight Transparent" >
+			<on_click function="View.HighlightTransparent" userdata="" />
+			<on_check function="View.CheckHighlightTransparent" />
+		</menu_item_check>
+		<menu_item_check name="beacons" label="Balizas" >
+		    <on_click function="ShowFloater" userdata="beacons" />
+			<on_check function="FloaterVisible" userdata="beacons" />
+		</menu_item_check>
+    <menu_item_check label="Ocultar Partículas" name="Hide Particles" >
+        <on_click function="View.ToggleRenderType" userdata="hideparticles" />
+        <on_check function="View.CheckRenderType" userdata="hideparticles" />
+    </menu_item_check>
+    <menu_item_check label="Mostrar los HUD en uso" name="Show HUD Attachments" >
+			<on_click function="View.ShowHUDAttachments" userdata="" />
+			<on_check function="View.CheckHUDAttachments" />
+		</menu_item_check>
+		<menu_item_separator label="-----------" name="separator5" />
+		<menu_item_call label="Acercar Zoom" name="Zoom In" >
+			<on_click function="View.ZoomIn" userdata="" />
+		</menu_item_call>
+		<menu_item_call label="Zoom Predeterminado" name="Zoom Default" >
+			<on_click function="View.ZoomDefault" userdata="" />
+		</menu_item_call>
+		<menu_item_call label="Alejar Zoom" name="Zoom Out" >
+			<on_click function="View.ZoomOut" userdata="" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator6" />
+		<menu_item_call label="Pantalla Completa" name="Toggle Fullscreen" >
+			<on_click function="View.Fullscreen" userdata="" />
+		</menu_item_call>
+		<menu_item_call label="Interfaz en tamaño Predeterminado" name="Set UI Size to Default" >
+			<on_click function="View.DefaultUISize" userdata="" />
+		</menu_item_call>
+	</menu>
+	<menu label="Mundo" name="World" >
+		<menu_item_call label="Chat" name="Chat" >
+			<on_click function="World.Chat" userdata="" />
+		</menu_item_call>
+		<menu_item_check label="Correr Siempre" name="Always Run" >
+			<on_click function="World.AlwaysRun" userdata="" />
+			<on_check function="World.CheckAlwaysRun" userdata="" />
+		</menu_item_check>
+		<menu_item_call label="Sentarse en el piso" name="Sit on Ground" >
+			<on_click function="World.SitOnGround" userdata="" />
+			<on_enable function="World.EnableSitOnGround" userdata="" />
+		</menu_item_call>
+		<menu_item_check label="Volar" name="Fly" >
+			<on_click function="World.Fly" userdata="" />
+			<on_enable function="World.EnableFly" />
+			<on_check control="FlyBtnState" />
+		</menu_item_check>
+		<menu_item_separator label="-----------" name="separator" />
+		<menu_item_call label="Crear un Hito Aquí" name="Create Landmark Here" >
+			<on_click function="World.CreateLandmark" userdata="" />
+			<on_enable function="World.EnableCreateLandmark" userdata="" />
+		</menu_item_call>
+		<menu_item_call label="Fijar Base Aquí" name="Set Home to Here" >
+			<on_click function="World.SetHomeLocation" userdata="" />
+			<on_enable function="World.EnableSetHomeLocation" userdata="" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator2" />
+		<menu_item_call label="Teleport a Base" name="Teleport Home" >
+			<on_click function="World.TeleportHome" userdata="" />
+			<on_enable function="World.EnableTeleportHome" userdata="" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator3" />
+    	<menu_item_call label="Falso Estado Ausente" name="Fake Away Status" >
+      		<on_click function="World.FakeAway" userdata="" />
+    	</menu_item_call>
+		<menu_item_call label="Pasar a Estado Ausente" name="Set Away" >
+			<on_click function="World.SetAway" userdata="" />
+		</menu_item_call>
+		<menu_item_call label="Pasar a Estado Ocupado" name="Set Busy" >
+			<on_click function="World.SetBusy" userdata="" />
+		</menu_item_call>
+		<menu_item_call label="Detener las animaciones del Avatar" name="Stop Animating My Avatar" >
+			<on_click function="Tools.StopAllAnimations" userdata="" />
+		</menu_item_call>
+		<menu_item_call label="Liberar Teclas" name="Release Keys" >
+			<on_click function="Tools.ReleaseKeys" userdata="" />
+			<on_enable function="Tools.EnableReleaseKeys" userdata="" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator4" />
+		<menu_item_call label="Historial de la Cuenta..." name="Account History..." >
+			<on_click function="PromptShowURL" name="AccountHistory_url"
+			     userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" />
+		</menu_item_call>
+		<menu_item_call label="Administrar mi Cuenta..." name="Manage My Account..." >
+			<on_click function="PromptShowURL" name="ManageMyAccount_url"
+			     userdata="WebLaunchJoinNow,http://secondlife.com/account/" />
+		</menu_item_call>
+		<menu_item_call label="Comprar [CURRENCY]..." name="Buy and Sell L$..." >
+			<on_click function="ShowFloater" userdata="buy currency" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator5" />
+		<menu_item_call label="Mi Terreno..." name="My Land..." >
+			<on_click function="ShowFloater" userdata="my land" />
+		</menu_item_call>
+		<menu_item_call label="Acerca del Terreno..." name="About Land..." >
+			<on_click function="ShowFloater" userdata="about land" />
+		</menu_item_call>
+		<menu_item_call label="Comprar Terreno..." name="Buy Land..." >
+			<on_click function="ShowFloater" userdata="buy land" />
+			<on_enable function="World.EnableBuyLand" />
+		</menu_item_call>
+		<menu_item_call label="Región/Estado..." name="Region/Estate..." >
+			<on_click function="ShowFloater" userdata="about region" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator6" />
+		<menu label="Configuración del Entorno" name="Environment Settings" >
+			<menu_item_call label="Amanecer" name="Sunrise" >
+				<on_click function="World.EnvSettings" userdata="sunrise" />
+			</menu_item_call>
+			<menu_item_call label="Mediodía" name="Noon" >
+				<on_click function="World.EnvSettings" userdata="noon" />
+			</menu_item_call>
+			<menu_item_call label="Atardecer" name="Sunset" >
+				<on_click function="World.EnvSettings" userdata="sunset" />
+			</menu_item_call>
+			<menu_item_call label="Medianoche" name="Midnight" >
+				<on_click function="World.EnvSettings" userdata="midnight" />
+			</menu_item_call>
+			<menu_item_call label="Volver a los valores de la Región" name="Revert to Region Default" >
+				<on_click function="World.EnvSettings" userdata="default" />
+			</menu_item_call>
+			<menu_item_separator label="-----------" name="separator" />
+      <menu_item_call label="Editor del Entorno" name="Environment Editor" >
+        <on_click function="World.EnvSettings" userdata="editor" />
+      </menu_item_call>
+      <menu_item_call label="Editor del Ciclo Diario" name="Day Cycle Editor" >
+        <on_click function="World.DayCycle" userdata="editor" />
+      </menu_item_call>
+	  <menu_item_call label="Efectos de Post-Procesado" name="Post-Processing Effects" >
+			 <on_click function="World.PostProcess" userdata="editor" />
+     </menu_item_call>
+		</menu>
+	</menu>
+	<menu label="Herramientas" left="0" name="Tools" >
+		<menu label="Seleccionar Herramienta" name="Select Tool" >
+			<menu_item_call label="Foco" name="Focus" >
+				<on_click function="Tools.SelectTool" userdata="focus" />
+			</menu_item_call>
+			<menu_item_call label="Mover" name="Move" >
+				<on_click function="Tools.SelectTool" userdata="move" />
+			</menu_item_call>
+			<menu_item_call label="Editar" name="Edit" >
+				<on_click function="Tools.SelectTool" userdata="edit" />
+			</menu_item_call>
+			<menu_item_call label="Crear" name="Create" >
+				<on_click function="Tools.SelectTool" userdata="create" />
+			</menu_item_call>
+			<menu_item_call label="Terreno" name="Land" >
+				<on_click function="Tools.SelectTool" userdata="land" />
+			</menu_item_call>
+		</menu>
+		<menu_item_separator label="-----------" name="separator" />
+		<menu_item_check label="Seleccionar sólo mis Objetos" name="Select Only My Objects" >
+			<on_click function="Tools.SelectOnlyMyObjects" userdata="agents" />
+			<on_check control="SelectOwnedOnly" />
+		</menu_item_check>
+		<menu_item_check label="Seleccionar sólo Objetos movibles" name="Select Only Movable Objects" >
+			<on_click function="Tools.SelectOnlyMovableObjects" userdata="movable" />
+			<on_check control="SelectMovableOnly" />
+		</menu_item_check>
+		<menu_item_check label="Seleccionar marcando los alrededores" name="Select By Surrounding" >
+			<on_click function="Tools.SelectBySurrounding" userdata="" />
+			<on_check control="RectangleSelectInclusive" />
+		</menu_item_check>
+		<menu_item_check label="Mostrar Esquema de Selección" name="Show Selection Outlines" >
+			<on_click function="Tools.ShowSelectionHighlights" userdata="" />
+			<on_check control="RenderHighlightSelections" />
+		</menu_item_check>
+		<menu_item_check label="Mostrar objetos seleccionados ocultos" name="Show Hidden Selection" >
+			<on_click function="Tools.ShowHiddenSelection" userdata="" />
+			<on_check control="RenderHiddenSelections" />
+		</menu_item_check>
+		<menu_item_check label="Mostrar radio de luz de la selección" name="Show Light Radius for Selection" >
+			<on_click function="Tools.ShowSelectionLightRadius" userdata="" />
+			<on_check control="RenderLightRadius" />
+		</menu_item_check>
+		<menu_item_check label="Mostrar rayo indicador" name="Show Selection Beam" >
+			<on_click function="ToggleControl" userdata="ShowSelectionBeam" />
+			<on_check control="ShowSelectionBeam" />
+		</menu_item_check>
+		<menu_item_separator label="-----------" name="separator2" />
+		<menu_item_check label="Ajustar a la cuadrícula" name="Snap to Grid" >
+			<on_click function="ToggleControl" userdata="SnapEnabled" />
+			<on_check control="SnapEnabled" />
+			<on_enable function="Tools.EnableToolNotPie" />
+		</menu_item_check>
+		<menu_item_call label="Ajustar Objetos a los Ejes XY de la cuadrícula" name="Snap Object XY to Grid" >
+			<on_click function="Tools.SnapObjectXY" userdata="" />
+			<on_enable function="Tools.EnableToolNotPie" />
+		</menu_item_call>
+		<menu_item_call label="Usar Seleccionado como cuadrícula" name="Use Selection for Grid" >
+			<on_click function="Tools.UseSelectionForGrid" userdata="" />
+			<on_enable function="SomethingSelected" />
+		</menu_item_call>
+		<menu_item_call label="Opciones de la Cuadrícula..." name="Grid Options..." >
+			<on_click function="ShowFloater" userdata="grid options" />
+			<on_enable function="Tools.EnableToolNotPie" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator3" />
+		<menu_item_check label="Editar partes enlazadas" name="Edit Linked Parts" >
+			<on_click function="ToggleControl" userdata="EditLinkedParts" />
+			<on_click function="Tools.EditLinkedParts" userdata="" />
+			<on_check control="EditLinkedParts" />
+			<on_enable function="Tools.EnableToolNotPie" />
+		</menu_item_check>
+		<menu label="Seleccionar partes enlazadas" name="Select Linked Parts" >
+			<menu_item_call label="Seleccionar parte siguiente" name="Select Next Part" >
+				<on_click function="Tools.SelectNextPart" userdata="next" />
+				<on_enable function="Tools.EnableSelectNextPart" />
+			</menu_item_call>
+			<menu_item_call label="Seleccionar Parte  Anterior" name="Select Previous Part" >
+				<on_click function="Tools.SelectNextPart" userdata="previous" />
+				<on_enable function="Tools.EnableSelectNextPart" />
+			</menu_item_call>
+			<menu_item_call label="Incluir Parte Siguiente" name="Include Next Part" >
+				<on_click function="Tools.SelectNextPart" userdata="includenext" />
+				<on_enable function="Tools.EnableSelectNextPart" />
+			</menu_item_call>
+			<menu_item_call label="Incluir Parte Anterior" name="Include Previous Part" >
+				<on_click function="Tools.SelectNextPart" userdata="includeprevious" />
+				<on_enable function="Tools.EnableSelectNextPart" />
+			</menu_item_call>
+		</menu>
+		<menu_item_call label="Enlazar" name="Link" >
+			<on_click function="Tools.Link" userdata="" />
+			<on_enable function="Tools.EnableLink" />
+		</menu_item_call>
+		<menu_item_call label="Desenlazar" name="Unlink" >
+			<on_click function="Tools.Unlink" userdata="" />
+			<on_enable function="Tools.EnableUnlink" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator4" />
+		<menu_item_call label="Foco en la Selección" name="Focus on Selection" >
+			<on_click function="Tools.LookAtSelection" userdata="focus" />
+			<on_enable function="Tools.SomethingSelectedNoHUD" />
+		</menu_item_call>
+		<menu_item_call label="Zoom en lo Seleccionado" name="Zoom to Selection" >
+			<on_click function="Tools.LookAtSelection" userdata="zoom" />
+			<on_enable function="Tools.SomethingSelectedNoHUD" />
+		</menu_item_call>
+		<menu_item_call label="Comprar Objeto" name="Menu Object Take" >
+			<on_click function="Tools.BuyOrTake" userdata="" />
+			<on_enable function="Tools.EnableBuyOrTake" userdata="Buy,Take" name="EnableBuyOrTake"/>
+		</menu_item_call>
+		<menu_item_call label="Agarrar una Copia" name="Take Copy" >
+			<on_click function="Tools.TakeCopy" userdata="" />
+			<on_enable function="Tools.EnableTakeCopy" />
+		</menu_item_call>
+		<menu_item_call label="Devolver Objeto" name="Return..." >
+			<on_click function="Object.Return" userdata="" />
+			<on_enable function="Object.EnableReturn" />
+		</menu_item_call>
+		<menu_item_call label="Devolver el Objeto al Contenido de Objetos" name="Save Object Back to Object Contents" >
+			<on_click function="Tools.SaveToObjectInventory" userdata="" />
+			<on_enable function="Tools.EnableSaveToObjectInventory" />
+		</menu_item_call>
+		<menu_item_call label="Administrador - Borrar" name="Admin Delete" >
+			<on_click function="Tools.AdminDelete" userdata="" />
+			<on_enable function="Tools.EnableAdminDelete" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator6" />
+		<menu_item_call label="Mostrar ventana de avisos/errores de Script " name="Show Script Warning/Error Window" >
+			<on_click function="ShowFloater" userdata="script errors" />
+		</menu_item_call>
+		<menu label="Recompilar Scripts de la Selección" name="Recompile Scripts in Selection" >
+		     <menu_item_call label="Mono" name="Mono" >
+			     <on_click function="Tools.SelectedScriptAction" userdata="compile mono" />
+			     <on_enable function="EditableSelectedMono" />
+		     </menu_item_call>
+		     <menu_item_call label="LSL" name="LSL" >
+			     <on_click function="Tools.SelectedScriptAction" userdata="compile lsl" />
+			     <on_enable function="EditableSelected" />
+		     </menu_item_call>
+		</menu>
+		<menu_item_call label="Reiniciar Scripts en la Selección" name="Reset Scripts in Selection" >
+			<on_click function="Tools.SelectedScriptAction" userdata="reset" />
+			<on_enable function="EditableSelected" />
+		</menu_item_call>
+		<menu_item_call label="Definir Ejecución de Scripts en la Selección" name="Set Scripts to Running in Selection" >
+			<on_click function="Tools.SelectedScriptAction" userdata="start" />
+			<on_enable function="EditableSelected" />
+		</menu_item_call>
+		<menu_item_call label="Definir la no ejecución de Scripts en la Selección" name="Set Scripts to Not Running in Selection" >
+			<on_click function="Tools.SelectedScriptAction" userdata="stop" />
+			<on_enable function="EditableSelected" />
+		</menu_item_call>
+    <menu_item_call label="Borrar Scripts en la Selección" name="Remove Scripts in Selection" >
+      <on_click function="Tools.ScriptDelete" />
+      <on_enable function="Tools.EnableScriptDelete" />
+    </menu_item_call>
+	</menu>
+	<menu label="Ayuda" left="227" name="Help" >
+		<menu_item_call label="Ayuda de Second Life" name="Second Life Help" >
+			<on_click function="ShowFloater" userdata="help f1" />
+		</menu_item_call>
+		<menu_item_call label="Tutorial" name="Tutorial" >
+			<on_click function="ShowFloater" userdata="help tutorial" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator" />
+		<menu_item_call label="Blog Oficial de Linden Lab..." name="Official Linden Blog..." >
+			<on_click function="PromptShowURL" name="OfficialLindenBlog_url"
+			     userdata="WebLaunchSupportWiki,http://blog.secondlife.com/" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator2" />
+		<menu_item_call label="Portal de Scripting..." name="Scripting Portal..." >
+			<on_click function="PromptShowURL" name="ScriptingPortal_url"
+			     userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator3" />
+		<menu_item_call label="Denunciar Abuso..." name="Report Abuse..." >
+			<on_click function="ShowFloater" userdata="complaint reporter" />
+		</menu_item_call>
+		<menu_item_call label="Choques, Empujones y Golpes..." name="Bumps, Pushes &amp;amp; Hits..." >
+			<on_click function="ShowFloater" userdata="mean events" />
+		</menu_item_call>
+		<menu_item_call label="Medidor de Lag" name="Lag Meter">
+			<on_click function="ShowFloater" userdata="lag meter" />
+		</menu_item_call>
+		<menu_item_separator label="-----------" name="separator7" />
+		<menu label="Informe de Fallos" name="Bug Reporting" >
+			<menu_item_call label="Seguimiento de Problemas Público..." name="Public Issue Tracker..." >
+				<on_click function="PromptShowURL" name="PublicIssueTracker_url"
+				     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
+			</menu_item_call>
+			<menu_item_call label="Ayuda del Seguimiento de Problemas Público..." name="Publc Issue Tracker Help..." >
+				<on_click function="PromptShowURL" name="PublicIssueTrackerHelp_url"
+				     userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
+			</menu_item_call>
+			<menu_item_separator label="-----------" name="separator7" />
+			<menu_item_call label="Informe de Fallos 101..." 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="Problemas de Seguridad..." name="Security Issues..." >
+				<on_click function="PromptShowURL" name="SecurityIssues_url"
+				     userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
+			</menu_item_call>
+			<menu_item_call label="Wiki de QA..." name="QA Wiki..." >
+				<on_click function="PromptShowURL" name="QAWiki_url"
+				     userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
+			</menu_item_call>
+			<menu_item_separator label="-----------" name="separator9" />
+			<menu_item_call label="Informar un Fallo..." name="Report Bug..." >
+				<on_click function="PromptShowURL" name="ReportBug_url"
+				     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
+			</menu_item_call>
+		</menu>
+		<menu_item_call label="Acerca de Singularity..." name="About Second Life..." >
+			<on_click function="ShowFloater" userdata="about" />
+		</menu_item_call>
+	</menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/es/mime_types_linux.xml b/indra/newview/skins/default/xui/es/mime_types_linux.xml
new file mode 100644
index 000000000..e95b371d0
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/mime_types_linux.xml
@@ -0,0 +1,478 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+	<defaultlabel>
+		(Unknown)
+	</defaultlabel>
+	<defaultwidget>
+		none
+	</defaultwidget>
+	<defaultimpl>
+		media_plugin_webkit
+	</defaultimpl>
+	<widgetset name="web">
+		<label name="web_label">
+			Web Content
+		</label>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<default_type>
+			text/html
+		</default_type>
+		<tooltip name="web_tooltip">
+			This location has Web content
+		</tooltip>
+		<playtip name="web_playtip">
+			Show Web content
+		</playtip>
+		<allow_resize>
+			true
+		</allow_resize>
+		<allow_looping>
+			false
+		</allow_looping>
+	</widgetset>
+	<widgetset name="movie">
+		<label name="movie_label">
+			Movie
+		</label>
+		<default_type>
+			video/*
+		</default_type>
+		<icon>
+			icn_media_movie.tga
+		</icon>
+		<tooltip name="movie_tooltip">
+			There is a movie to play here
+		</tooltip>
+		<playtip name="movie_playtip">
+			Play movie
+		</playtip>
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			true
+		</allow_looping>
+	</widgetset>
+	<widgetset name="image">
+		<label name="image_label">
+			Image
+		</label>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<default_type>
+			image/*
+		</default_type>
+		<tooltip name="image_tooltip">
+			There is an image at this location
+		</tooltip>
+		<playtip name="image_playtip">
+			View this location&apos;s image
+		</playtip>
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			false
+		</allow_looping>
+	</widgetset>
+	<widgetset name="audio">
+		<label name="audio_label">
+			Audio
+		</label>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<default_type>
+			audio/*
+		</default_type>
+		<tooltip name="audio_tooltip">
+			There is audio at this location
+		</tooltip>
+		<playtip name="audio_playtip">
+			Play this location&apos;s audio
+		</playtip>
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			true
+		</allow_looping>
+	</widgetset>
+	<scheme name="rtsp">
+		<label name="rtsp_label">
+			Real Time Streaming
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
+	</scheme>
+	<mimetype name="blank">
+		<label name="blank_label">
+			- None -
+		</label>
+		<widgettype>
+			none
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="none/none">
+		<label name="none/none_label">
+			- None -
+		</label>
+		<widgettype>
+			none
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="audio/*">
+		<label name="audio2_label">
+			Audio
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
+	</mimetype>
+	<mimetype name="video/*">
+		<label name="video2_label">
+			Video
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
+	</mimetype>
+	<mimetype name="image/*">
+		<label name="image2_label">
+			Image
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
+		<label name="vnd.secondlife.qt.legacy_label">
+			Movie (QuickTime)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
+	</mimetype>
+	<mimetype name="application/javascript">
+		<label name="application/javascript_label">
+			Javascript
+		</label>
+		<widgettype>
+			web
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="application/ogg">
+		<label name="application/ogg_label">
+			Ogg Audio/Video
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
+	</mimetype>
+	<mimetype name="application/pdf">
+		<label name="application/pdf_label">
+			PDF Document
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="application/postscript">
+		<label name="application/postscript_label">
+			Postscript Document
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="application/rtf">
+		<label name="application/rtf_label">
+			Rich Text (RTF)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="application/smil">
+		<label name="application/smil_label">
+			Synchronized Multimedia Integration Language (SMIL)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="application/xhtml+xml">
+		<label name="application/xhtml+xml_label">
+			Web Page (XHTML)
+		</label>
+		<widgettype>
+			web
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="application/x-director">
+		<label name="application/x-director_label">
+			Macromedia Director
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="audio/mid">
+		<label name="audio/mid_label">
+			Audio (MIDI)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
+	</mimetype>
+	<mimetype name="audio/mpeg">
+		<label name="audio/mpeg_label">
+			Audio (MP3)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
+	</mimetype>
+	<mimetype name="audio/x-aiff">
+		<label name="audio/x-aiff_label">
+			Audio (AIFF)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
+	</mimetype>
+	<mimetype name="audio/x-wav">
+		<label name="audio/x-wav_label">
+			Audio (WAV)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/bmp">
+		<label name="image/bmp_label">
+			Image (BMP)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/gif">
+		<label name="image/gif_label">
+			Image (GIF)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/jpeg">
+		<label name="image/jpeg_label">
+			Image (JPEG)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/png">
+		<label name="image/png_label">
+			Image (PNG)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="image/svg+xml">
+		<label name="image/svg+xml_label">
+			Image (SVG)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/tiff">
+		<label name="image/tiff_label">
+			Image (TIFF)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="text/html">
+		<label name="text/html_label">
+			Web Page
+		</label>
+		<widgettype>
+			web
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="text/plain">
+		<label name="text/plain_label">
+			Text
+		</label>
+		<widgettype>
+			text
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="text/xml">
+		<label name="text/xml_label">
+			XML
+		</label>
+		<widgettype>
+			text
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="video/mpeg">
+		<label name="video/mpeg_label">
+			Movie (MPEG)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
+	</mimetype>
+	<mimetype name="video/mp4">
+		<label name="video/mp4_label">
+			Movie (MP4)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="video/quicktime">
+		<label name="video/quicktime_label">
+			Movie (QuickTime)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
+	</mimetype>
+	<mimetype name="video/x-ms-asf">
+		<label name="video/x-ms-asf_label">
+			Movie (Windows Media ASF)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
+	</mimetype>
+	<mimetype name="video/x-ms-wmv">
+		<label name="video/x-ms-wmv_label">
+			Movie (Windows Media WMV)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="video/x-msvideo">
+		<label name="video/x-msvideo_label">
+			Movie (AVI)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_gstreamer
+		</impl>
+	</mimetype>
+</mimetypes>
diff --git a/indra/newview/skins/default/xui/es/mime_types_mac.xml b/indra/newview/skins/default/xui/es/mime_types_mac.xml
new file mode 100644
index 000000000..7931e55c0
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/mime_types_mac.xml
@@ -0,0 +1,478 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+	<defaultlabel>
+		(Unknown)
+	</defaultlabel>
+	<defaultwidget>
+		none
+	</defaultwidget>
+	<defaultimpl>
+		media_plugin_webkit
+	</defaultimpl>
+	<widgetset name="web">
+		<label name="web_label">
+			Web Content
+		</label>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<default_type>
+			text/html
+		</default_type>
+		<tooltip name="web_tooltip">
+			This location has Web content
+		</tooltip>
+		<playtip name="web_playtip">
+			Show Web content
+		</playtip>
+		<allow_resize>
+			true
+		</allow_resize>
+		<allow_looping>
+			false
+		</allow_looping>
+	</widgetset>
+	<widgetset name="movie">
+		<label name="movie_label">
+			Movie
+		</label>
+		<default_type>
+			video/*
+		</default_type>
+		<icon>
+			icn_media_movie.tga
+		</icon>
+		<tooltip name="movie_tooltip">
+			There is a movie to play here
+		</tooltip>
+		<playtip name="movie_playtip">
+			Play movie
+		</playtip>
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			true
+		</allow_looping>
+	</widgetset>
+	<widgetset name="image">
+		<label name="image_label">
+			Image
+		</label>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<default_type>
+			image/*
+		</default_type>
+		<tooltip name="image_tooltip">
+			There is an image at this location
+		</tooltip>
+		<playtip name="image_playtip">
+			View this location&apos;s image
+		</playtip>
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			false
+		</allow_looping>
+	</widgetset>
+	<widgetset name="audio">
+		<label name="audio_label">
+			Audio
+		</label>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<default_type>
+			audio/*
+		</default_type>
+		<tooltip name="audio_tooltip">
+			There is audio at this location
+		</tooltip>
+		<playtip name="audio_playtip">
+			Play this location&apos;s audio
+		</playtip>
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			true
+		</allow_looping>
+	</widgetset>
+	<scheme name="rtsp">
+		<label name="rtsp_label">
+			Real Time Streaming
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</scheme>
+	<mimetype name="blank">
+		<label name="blank_label">
+			- None -
+		</label>
+		<widgettype>
+			none
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="none/none">
+		<label name="none/none_label">
+			- None -
+		</label>
+		<widgettype>
+			none
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="audio/*">
+		<label name="audio2_label">
+			Audio
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="video/*">
+		<label name="video2_label">
+			Video
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="image/*">
+		<label name="image2_label">
+			Image
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+        <impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
+		<label name="vnd.secondlife.qt.legacy_label">
+			Movie (QuickTime)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="application/javascript">
+		<label name="application/javascript_label">
+			Javascript
+		</label>
+		<widgettype>
+			web
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="application/ogg">
+		<label name="application/ogg_label">
+			Ogg Audio/Video
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="application/pdf">
+		<label name="application/pdf_label">
+			PDF Document
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="application/postscript">
+		<label name="application/postscript_label">
+			Postscript Document
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="application/rtf">
+		<label name="application/rtf_label">
+			Rich Text (RTF)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="application/smil">
+		<label name="application/smil_label">
+			Synchronized Multimedia Integration Language (SMIL)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="application/xhtml+xml">
+		<label name="application/xhtml+xml_label">
+			Web Page (XHTML)
+		</label>
+		<widgettype>
+			web
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="application/x-director">
+		<label name="application/x-director_label">
+			Macromedia Director
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="audio/mid">
+		<label name="audio/mid_label">
+			Audio (MIDI)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="audio/mpeg">
+		<label name="audio/mpeg_label">
+			Audio (MP3)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="audio/x-aiff">
+		<label name="audio/x-aiff_label">
+			Audio (AIFF)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="audio/x-wav">
+		<label name="audio/x-wav_label">
+			Audio (WAV)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/bmp">
+		<label name="image/bmp_label">
+			Image (BMP)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/gif">
+		<label name="image/gif_label">
+			Image (GIF)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/jpeg">
+		<label name="image/jpeg_label">
+			Image (JPEG)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/png">
+		<label name="image/png_label">
+			Image (PNG)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="image/svg+xml">
+		<label name="image/svg+xml_label">
+			Image (SVG)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/tiff">
+		<label name="image/tiff_label">
+			Image (TIFF)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="text/html">
+		<label name="text/html_label">
+			Web Page
+		</label>
+		<widgettype>
+			web
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="text/plain">
+		<label name="text/plain_label">
+			Text
+		</label>
+		<widgettype>
+			text
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="text/xml">
+		<label name="text/xml_label">
+			XML
+		</label>
+		<widgettype>
+			text
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="video/mpeg">
+		<label name="video/mpeg_label">
+			Movie (MPEG)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="video/mp4">
+		<label name="video/mp4_label">
+			Movie (MP4)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="video/quicktime">
+		<label name="video/quicktime_label">
+			Movie (QuickTime)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="video/x-ms-asf">
+		<label name="video/x-ms-asf_label">
+			Movie (Windows Media ASF)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="video/x-ms-wmv">
+		<label name="video/x-ms-wmv_label">
+			Movie (Windows Media WMV)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="video/x-msvideo">
+		<label name="video/x-msvideo_label">
+			Movie (AVI)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+</mimetypes>
diff --git a/indra/newview/skins/default/xui/es/mime_types_windows.xml b/indra/newview/skins/default/xui/es/mime_types_windows.xml
new file mode 100644
index 000000000..61067da06
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/mime_types_windows.xml
@@ -0,0 +1,478 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<mimetypes name="default">
+	<defaultlabel>
+		(Unknown)
+	</defaultlabel>
+	<defaultwidget>
+		none
+	</defaultwidget>
+	<defaultimpl>
+		media_plugin_webkit
+	</defaultimpl>
+	<widgetset name="web">
+		<label name="web_label">
+			Web Content
+		</label>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<default_type>
+			text/html
+		</default_type>
+		<tooltip name="web_tooltip">
+			This location has Web content
+		</tooltip>
+		<playtip name="web_playtip">
+			Show Web content
+		</playtip>
+		<allow_resize>
+			true
+		</allow_resize>
+		<allow_looping>
+			false
+		</allow_looping>
+	</widgetset>
+	<widgetset name="movie">
+		<label name="movie_label">
+			Movie
+		</label>
+		<default_type>
+			video/*
+		</default_type>
+		<icon>
+			icn_media_movie.tga
+		</icon>
+		<tooltip name="movie_tooltip">
+			There is a movie to play here
+		</tooltip>
+		<playtip name="movie_playtip">
+			Play movie
+		</playtip>
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			true
+		</allow_looping>
+	</widgetset>
+	<widgetset name="image">
+		<label name="image_label">
+			Image
+		</label>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<default_type>
+			image/*
+		</default_type>
+		<tooltip name="image_tooltip">
+			There is an image at this location
+		</tooltip>
+		<playtip name="image_playtip">
+			View this location&apos;s image
+		</playtip>
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			false
+		</allow_looping>
+	</widgetset>
+	<widgetset name="audio">
+		<label name="audio_label">
+			Audio
+		</label>
+		<icon>
+			icn_media_web.tga
+		</icon>
+		<default_type>
+			audio/*
+		</default_type>
+		<tooltip name="audio_tooltip">
+			There is audio at this location
+		</tooltip>
+		<playtip name="audio_playtip">
+			Play this location&apos;s audio
+		</playtip>
+		<allow_resize>
+			false
+		</allow_resize>
+		<allow_looping>
+			true
+		</allow_looping>
+	</widgetset>
+	<scheme name="rtsp">
+		<label name="rtsp_label">
+			Real Time Streaming
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</scheme>
+	<mimetype name="blank">
+		<label name="blank_label">
+			- None -
+		</label>
+		<widgettype>
+			none
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="none/none">
+		<label name="none/none_label">
+			- None -
+		</label>
+		<widgettype>
+			none
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="audio/*">
+		<label name="audio2_label">
+			Audio
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="video/*">
+		<label name="video2_label">
+			Video
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="image/*">
+		<label name="image2_label">
+			Image
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
+		<label name="vnd.secondlife.qt.legacy_label">
+			Movie (QuickTime)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+      media_plugin_quicktime
+    </impl>
+	</mimetype>
+	<mimetype name="application/javascript">
+		<label name="application/javascript_label">
+			Javascript
+		</label>
+		<widgettype>
+			web
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="application/ogg">
+		<label name="application/ogg_label">
+			Ogg Audio/Video
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="application/pdf">
+		<label name="application/pdf_label">
+			PDF Document
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="application/postscript">
+		<label name="application/postscript_label">
+			Postscript Document
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="application/rtf">
+		<label name="application/rtf_label">
+			Rich Text (RTF)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="application/smil">
+		<label name="application/smil_label">
+		    Synchronized Multimedia Integration Language (SMIL)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="application/xhtml+xml">
+		<label name="application/xhtml+xml_label">
+			Web Page (XHTML)
+		</label>
+		<widgettype>
+			web
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="application/x-director">
+		<label name="application/x-director_label">
+			Macromedia Director
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="audio/mid">
+		<label name="audio/mid_label">
+			Audio (MIDI)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="audio/mpeg">
+		<label name="audio/mpeg_label">
+			Audio (MP3)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="audio/x-aiff">
+		<label name="audio/x-aiff_label">
+			Audio (AIFF)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype name="audio/x-wav">
+		<label name="audio/x-wav_label">
+			Audio (WAV)
+		</label>
+		<widgettype>
+			audio
+		</widgettype>
+		<impl>
+			media_plugin_quicktime
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/bmp">
+		<label name="image/bmp_label">
+			Image (BMP)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/gif">
+		<label name="image/gif_label">
+			Image (GIF)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/jpeg">
+		<label name="image/jpeg_label">
+			Image (JPEG)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/png">
+		<label name="image/png_label">
+			Image (PNG)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="image/svg+xml">
+		<label name="image/svg+xml_label">
+			Image (SVG)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="image/tiff">
+		<label name="image/tiff_label">
+			Image (TIFF)
+		</label>
+		<widgettype>
+			image
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="text/html">
+		<label name="text/html_label">
+			Web Page
+		</label>
+		<widgettype>
+			web
+		</widgettype>
+		<impl>
+      media_plugin_webkit
+    </impl>
+	</mimetype>
+	<mimetype menu="1" name="text/plain">
+		<label name="text/plain_label">
+			Text
+		</label>
+		<widgettype>
+			text
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype name="text/xml">
+		<label name="text/xml_label">
+			XML
+		</label>
+		<widgettype>
+			text
+		</widgettype>
+		<impl>
+			media_plugin_webkit
+		</impl>
+	</mimetype>
+	<mimetype menu="1" name="video/mpeg">
+		<label name="video/mpeg_label">
+			Movie (MPEG)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+      media_plugin_quicktime
+    </impl>
+	</mimetype>
+	<mimetype name="video/mp4">
+		<label name="video/mp4_label">
+			Movie (MP4)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+      media_plugin_quicktime
+    </impl>
+	</mimetype>
+	<mimetype menu="1" name="video/quicktime">
+		<label name="video/quicktime_label">
+			Movie (QuickTime)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+      media_plugin_quicktime
+    </impl>
+	</mimetype>
+	<mimetype name="video/x-ms-asf">
+		<label name="video/x-ms-asf_label">
+			Movie (Windows Media ASF)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+      media_plugin_quicktime
+    </impl>
+	</mimetype>
+	<mimetype name="video/x-ms-wmv">
+		<label name="video/x-ms-wmv_label">
+			Movie (Windows Media WMV)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+      media_plugin_quicktime
+    </impl>
+	</mimetype>
+	<mimetype menu="1" name="video/x-msvideo">
+		<label name="video/x-msvideo_label">
+			Movie (AVI)
+		</label>
+		<widgettype>
+			movie
+		</widgettype>
+		<impl>
+      media_plugin_quicktime
+    </impl>
+	</mimetype>
+</mimetypes>
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
new file mode 100644
index 000000000..afe01bfd4
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -0,0 +1,7288 @@
+<?xml version="1.0" ?><notifications>
+  
+  <global name="skipnexttime">
+
+		Don&apos;t show me this again
+  </global>
+
+  <global name="alwayschoose">
+
+		Always choose this option
+  </global>
+
+  <template name="okbutton">
+    <form>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="$yestext"/>
+    </form>
+  </template>
+
+  <template name="okignore">
+    <form>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="$yestext"/>
+      <ignore text="$ignoretext"/>
+    </form>
+  </template>
+
+  <template name="okcancelbuttons">
+    <form>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="$yestext"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="$notext"/>
+    </form>
+  </template>
+
+  <template name="okcancelbuttonscanceldefault">
+    <form>
+      <button
+       index="0"
+       name="OK"
+       text="$yestext"/>
+      <button
+       default="true"
+       index="1"
+       name="Cancel"
+       text="$notext"/>
+    </form>
+  </template>
+
+  <template name="okcancelbuttonscanceldefault">
+    <form>
+      <button
+       index="0"
+       name="OK"
+       text="$yestext"/>
+      <button
+       default="true"
+       index="1"
+       name="Cancel"
+       text="$notext"/>
+    </form>
+  </template>
+
+  <template name="okcancelignore">
+    <form>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="$yestext"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="$notext"/>
+      <ignore text="$ignoretext"/>
+    </form>
+  </template>
+
+  <template name="okhelpbuttons">
+    <form>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="$yestext"/>
+      <button
+       index="1"
+       name="Help"
+       text="$helptext"/>
+    </form>
+  </template>
+
+  <template name="yesnocancelbuttons">
+    <form>
+      <button
+       default="true"
+       index="0"
+       name="Yes"
+       text="$yestext"/>
+      <button
+       index="1"
+       name="No"
+       text="$notext"/>
+      <button
+       index="2"
+       name="Cancel"
+       text="$canceltext"/>
+    </form>
+  </template>
+
+  <notification
+   icon="alert.tga"
+   name="MediaAlert"
+   type="alert">
+The owner of this parcel has requested the following [TYPE] URL to be loaded by your viewer:
+
+[URL]
+
+You may choose to allow or deny the corresponding domain or in-world scripted object server:
+
+[DOMAIN]
+
+"Allow" and "Deny" apply only for this session, while "Blacklist" and "Whitelist" apply forever.
+   <form name="form">
+    <button
+	 index="0"
+	 name="Allow"
+	 text="Allow"/>
+	<button
+	 index="1"
+	 name="Deny"
+	 text="Deny"/>
+	<button
+	 index="2"
+	 name="Blacklist"
+	 text="Blacklist"/>
+	<button
+	 index="3"
+	 name="Whitelist"
+	 text="Whitelist"/>
+   </form>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="MediaListed"
+   type="alert">
+Media/audio URLs for [DOMAIN] now [LISTED]
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="MediaBlocked"
+   type="notifytip">
+Media/audio URL blocked for [DOMAIN]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MediaFiltersCleared"
+   type="alertmodal">
+The media filters have been cleared
+  </notification>
+
+  <notification
+   functor="GenericAcknowledge"
+   icon="alertmodal.tga"
+   name="MissingAlert"
+   label="Unknown Alert Message"
+   type="alertmodal">
+Your version of [APP_NAME] does not know how to display the alert message it just received.
+
+Error details: The alert called &apos;[_NAME]&apos; was not found in notifications.xml.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FloaterNotFound"
+   type="alertmodal">
+Floater error: Could not find the following controls:
+
+[CONTROLS]
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TutorialNotFound"
+   type="alertmodal">
+No tutorial is currently available.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GenericAlert"
+   type="alertmodal">
+[MESSAGE]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GenericAlertYesCancel"
+   type="alertmodal">
+[MESSAGE]
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GenericAlertYesNoCancel"
+   type="alertmodal">
+[MESSAGE]
+    <usetemplate
+     name="yesnocancelbuttons"
+     notext="No"
+     yestext="Yes"
+     canceltext="Cancel"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BadInstallation"
+   type="alertmodal">
+An error occurred while updating [APP_NAME]. Please download the latest version from the official download site.
+    <usetemplate
+     name="okbutton"
+     yestext="Ok"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LoginFailedNoNetwork"
+   type="alertmodal">
+Could not connect to the [SECOND_LIFE_GRID]. 
+&apos;[DIAGNOSTIC]&apos;
+Make sure your Internet connection is working properly.
+	<usetemplate
+     name="okbutton"
+     yestext="Ok"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MessageTemplateNotFound"
+   type="alertmodal">
+Message Template [PATH] not found.
+	<usetemplate
+     name="okbutton"
+     yestext="Ok"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WearableSave"
+   type="alertmodal">
+Save changes to current clothing/body part?
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="Don&apos;t Save"
+     yestext="Save"/>
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+     name="ConfirmNoCopyToOutbox"
+     type="alertmodal">
+You don't have permission to copy one or more of these items to the Merchant Outbox.  You can move them or leave them behind.
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Don't move item(s)"
+     yestext="Move item(s)"/>
+  </notification>
+
+  <notification
+   icon="OutboxStatus_Success"
+   name="OutboxFolderCreated"
+   type="outbox">
+    <unique/>
+A new folder has been created for each item you have transferred into the top level of your Merchant Outbox.
+
+    <usetemplate
+     ignoretext="A new folder was created in the Merchant Outbox"
+     name="okignore"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="OutboxStatus_Success"
+   name="OutboxImportComplete"
+   type="outbox">
+Success
+
+All folders were successfully sent to the Marketplace.
+
+        <usetemplate
+         ignoretext="All folders sent to the Marketplace"
+         name="okignore"
+         yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="OutboxStatus_Warning"
+   name="OutboxImportHadErrors"
+   type="outbox">
+Some folders did not transfer
+
+Errors occurred when some folders were sent to the Marketplace.  Those folders are still in your Merchant Outbox.
+
+See the [[MARKETPLACE_IMPORTS_URL] error log] for more information.
+
+        <usetemplate
+         name="okbutton"
+         yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="OutboxStatus_Error"
+   name="OutboxImportFailed"
+   type="outbox">
+Transfer failed
+
+No folders were sent to the Marketplace because of a system or network error.  Try again later.
+
+        <usetemplate
+         name="okbutton"
+         yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="OutboxStatus_Error"
+   name="OutboxInitFailed"
+   type="outbox">
+Marketplace initialization failed
+
+Initialization with the Marketplace failed because of a system or network error.  Try again later.
+
+        <usetemplate
+         name="okbutton"
+         yestext="OK"/>
+  </notification>
+    
+
+    <notification
+   icon="alertmodal.tga"
+   name="CompileQueueSaveText"
+   type="alertmodal">
+There was a problem uploading the text for a script due to the following reason: [REASON]. Please try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CompileQueueSaveBytecode"
+   type="alertmodal">
+There was a problem uploading the compiled script due to the following reason: [REASON]. Please try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WriteAnimationFail"
+   type="alertmodal">
+There was a problem writing animation data.  Please try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UploadAuctionSnapshotFail"
+   type="alertmodal">
+There was a problem uploading the auction snapshot due to the following reason: [REASON]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToViewContentsMoreThanOne"
+   type="alertmodal">
+Unable to view the contents of more than one item at a time.
+Please select only one object and try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SaveClothingBodyChanges"
+   type="alertmodal">
+Save all changes to clothing/body parts?
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="Don&apos;t Save"
+     yestext="Save All"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GrantModifyRights"
+   type="alertmodal">
+Granting modify rights to another resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission.
+Do you want to grant modify rights for [NAME]?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GrantModifyRightsMultiple"
+   type="alertmodal">
+Granting modify rights to another resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission.
+Do you want to grant modify rights for the selected Residents?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RevokeModifyRights"
+   type="alertmodal">
+Do you want to revoke modify rights for [NAME]?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RevokeModifyRightsMultiple"
+   type="alertmodal">
+Do you want to revoke modify rights for the selected Residents?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToCreateGroup"
+   type="alertmodal">
+Unable to create group.
+[MESSAGE]
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PanelGroupApply"
+   type="alertmodal">
+[NEEDS_APPLY_MESSAGE]
+[WANT_APPLY_MESSAGE]
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="Ignore Changes"
+     yestext="Apply Changes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MustSpecifyGroupNoticeSubject"
+   type="alertmodal">
+You must specify a subject to send a group notice.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AddGroupOwnerWarning"
+   type="alertmodal">
+You are about to add group members to the role of [ROLE_NAME].
+Members cannot be removed from that role.
+The members must resign from the role themselves.
+Are you sure you want to continue?
+    <usetemplate
+     ignoretext="When adding group members to the owner role"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AssignDangerousActionWarning"
+   type="alertmodal">
+You are about to add the Ability &apos;[ACTION_NAME]&apos; to the Role &apos;[ROLE_NAME]&apos;.
+
+ *WARNING*
+ Any Member in a Role with this Ability can assign themselves -- and any other 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.
+
+Add this Ability to &apos;[ROLE_NAME]&apos;?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AssignDangerousAbilityWarning"
+   type="alertmodal">
+You are about to add the Ability &apos;[ACTION_NAME]&apos; to the Role &apos;[ROLE_NAME]&apos;.
+
+ *WARNING*
+ Any Member in a Role with this Ability can assign themselves -- and any other member -- all Abilities, elevating themselves to near-Owner power.
+
+Add this Ability to &apos;[ROLE_NAME]&apos;?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClickPublishHelpLand"
+   type="alertmodal">
+Selecting the &quot;Publish in Search&quot;
+Checking this box will show:
+- this parcel in search results
+- this parcel&apos;s public objects
+- this parcel in web search
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClickSoundHelpLand"
+   type="alertmodal">Media and Music can only be experienced within the parcel. Sound and Voice options can be restricted to the parcel or will be heard by residents outside the parcel depending on their maturity Rating. Go to Knowledge Base to learn more about how to set these options?
+    <url option="0" name="url">
+	https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=5046
+    </url>
+    <usetemplate
+     name="okcancelbuttons"
+     yestext="Go to Knowledge Base"
+	 notext="Close" />
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClickSearchHelpAll"
+   type="alertmodal">
+Search results are organized based on the tab you are in, your maturity Rating, the category chosen, and other factors. For more details, please see the Knowledge Base.
+    <url option="0" name="url">
+	https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=4722
+    </url>
+    <usetemplate
+     name="okcancelbuttons"
+     yestext="Go to Knowledge Base"
+	 notext="Close" />
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClickPublishHelpLandDisabled"
+   type="alertmodal">
+You can&apos;t make this parcel show in search because it is located in a region that forbids this.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClickPublishHelpAvatar"
+   type="alertmodal">
+Selecting &quot;Show in Search&quot; will show:
+- my profile in search results
+- a link to my profile in public group pages
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClickPartnerHelpAvatar"
+   type="alertmodal">
+You can propose to another Resident or dissolve an existing partnership through the [SECOND_LIFE] website.
+
+Go to the [SECOND_LIFE] web site for more information on partnering?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Go to Page"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClickUploadHelpPermissions"
+   type="alertmodal">
+Your default permissions may not work in older regions.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClickWebProfileHelpAvatar"
+   type="alertmodal">
+If this Resident has set a web profile URL then you can:
+ * Click &apos;Load&apos; to see the page in this Web tab.
+ * Click Load &gt; &apos;In external browser&apos; to view the page in your default web browser.
+ * Click Load &gt; &apos;Home URL&apos; to return to this Resident&apos;s web profile if you&apos;ve navigated away.
+
+When viewing your own profile, you can enter any URL as your web profile and click OK to set it.
+Other residents can visit the URL you set when they look at your profile.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="JoinGroupCanAfford"
+   type="alertmodal">
+Joining this group costs [CURRENCY][COST].
+Do you wish to proceed?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Join"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="JoinGroupCannotAfford"
+   type="alertmodal">
+Joining this group costs [CURRENCY][COST].
+You do not have enough [CURRENCY] to join this group.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandBuyPass"
+   type="alertmodal">
+For [CURRENCY][COST] you can enter this land (&apos;[PARCEL_NAME]&apos;) for [TIME] hours.  Buy a pass?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SalePriceRestriction"
+   type="alertmodal">
+Sale price must be set to more than [CURRENCY]0 if selling to anyone.
+Please select an individual to sell to if selling for [CURRENCY]0.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmLandSaleChange"
+   priority="high"
+   type="alertmodal">
+The selected [LAND_SIZE] m² land is being set for sale.
+Your selling price will be [CURRENCY][SALE_PRICE] and will be authorized for sale to [NAME].
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmLandSaleToAnyoneChange"
+   type="alertmodal">
+ATTENTION: Clicking &apos;sell to anyone&apos; makes your land available to the entire [SECOND_LIFE] community, even those not in this region.
+
+The selected [LAND_SIZE] m² land is being set for sale.
+Your selling price will be [CURRENCY][SALE_PRICE] and will be authorized for sale to [NAME].
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ReturnObjectsDeededToGroup"
+   type="alertmodal">
+Are you sure you want to return all objects shared with the group &apos;[NAME]&apos; on this parcel of land back to their previous owner&apos;s inventory?
+
+*WARNING* This will delete the non-transferable objects deeded to the group!
+
+Objects: [N]
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ReturnObjectsOwnedByUser"
+   type="alertmodal">
+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?
+
+Objects: [N]
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+ icon="alert.tga"
+ name="ClickBuildConstants"
+ type="alert">
+The following constants are accepted in this tab:
+
+PX  --  X-axis position
+PY  --  Y-axis position
+PZ  --  Z-axis position
+SX  --  X-axis size
+SY  --  Y-axis size
+SZ  --  Z-axis size
+RX  --  X-axis rotation
+RY  --  Y-axis rotation
+RZ  --  Z-axis rotation
+CB  --  Path cut begin
+CE  --  Path cut end
+HLW  --  Hollow size
+SKW  --  Skew
+PB  --  Slice/Dimple/Profile cut begin
+PE  --  Slice/Dimple/Profile cut end
+TB  --  Twist begin
+TE  --  Twist end
+SHX  --  X-axis top shear
+SHY  --  Y-axis top shear
+HLX  --  X-axis hole size
+HLY  --  Y-axis hole size
+TPX  --  X-axis taper
+TPY  --  Y-axis taper
+ROF  --  Radius offset
+REV  --  Revolutions
+
+PI  --  pi
+TWO_PI  --  2pi
+PI_BY_TWO  --  pi/2
+SQRT2  --  Square root of 2
+DEG_TO_RAD  --  DEG_TO_RAD conversion (pi/180)
+RAD_TO_DEG  --  RAD_TO_DEG conversion (180/pi)
+GRAVITY  --  -9.8
+
+*  --  Multiplication
+\  --  Division
++  --  Addition
+-  --  Subtraction
+
+For information about this feature, click "More Info".
+  <url option="1" name="url">
+    http://imprudenceviewer.org/wiki/Build_Math_Expressions
+  </url>
+  <usetemplate
+   name="okhelpbuttons"
+   yestext="OK"
+   helptext="More Info"/>
+</notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="ReturnObjectsOwnedBySelf"
+   type="alertmodal">
+Are you sure you want to return all objects owned by you on this parcel of land back to your inventory?
+
+Objects: [N]
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ReturnObjectsNotOwnedBySelf"
+   type="alertmodal">
+Are you sure you want to return all objects NOT owned by you 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.
+
+*WARNING* This will delete the non-transferable objects deeded to the group!
+
+Objects: [N]
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ReturnObjectsNotOwnedByUser"
+   type="alertmodal">
+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.
+
+*WARNING* This will delete the non-transferable objects deeded to the group!
+
+Objects: [N]
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ReturnAllTopObjects"
+   type="alertmodal">
+Are you sure you want to return all listed objects back to their owner&apos;s inventory?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DisableAllTopObjects"
+   type="alertmodal">
+Are you sure you want to disable all objects in this region?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ReturnObjectsNotOwnedByGroup"
+   type="alertmodal">
+Return the objects on this parcel of land that are NOT shared with the group [NAME] back to their owners?
+
+Objects: [N]
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToDisableOutsideScripts"
+   type="alertmodal">
+Can not disable scripts.
+This entire region is damage enabled.
+Scripts must be allowed to run for weapons to work.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MustBeInParcel"
+   type="alertmodal">
+You must be standing inside the land parcel to set its Landing Point.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PromptRecipientEmail"
+   type="alertmodal">
+Please enter a valid email address for the recipient(s).
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PromptSelfEmail"
+   type="alertmodal">
+Please enter your email address.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PromptMissingSubjMsg"
+   type="alertmodal">
+Email snapshot with the default subject or message?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ErrorProcessingSnapshot"
+   type="alertmodal">
+Error processing snapshot data
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ErrorEncodingSnapshot"
+   type="alertmodal">
+Error encoding snapshot.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ErrorUploadingPostcard"
+   type="alertmodal">
+There was a problem sending a snapshot due to the following reason: [REASON]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ErrorUploadingReportScreenshot"
+   type="alertmodal">
+There was a problem uploading a report screenshot due to the following reason: [REASON]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MustAgreeToLogIn"
+   type="alertmodal">
+You must agree to the Terms of Service to continue logging into [SECOND_LIFE].
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CouldNotPutOnOutfit"
+   type="alertmodal">
+Could not put on outfit.
+The outfit folder contains no clothing, body parts, or attachments.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotWearTrash"
+   type="alertmodal">
+You can not wear clothes or body parts that are in the trash
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MaxAttachmentsOnOutfit"
+   type="alertmodal">
+Could not attach object.
+Exceeds the attachments limit of [MAX_ATTACHMENTS] objects. Please detach another object first.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotWearInfoNotComplete"
+   type="alertmodal">
+You can not wear that item because it has not yet loaded. Please try again in a minute.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MustHaveAccountToLogIn"
+   type="alertmodal">
+Oops! Something was left blank.
+You need to enter the Username name of your avatar.
+
+You need an account to enter [SECOND_LIFE]. Would you like to create one now?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Try again"
+     yestext="Create a new account"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MustHaveAccountToLogInNoLinks"
+   type="alertmodal">
+You need to enter the First and Last name, or Username of your avatar.
+
+You need an account to enter the [SECOND_LIFE_GRID].
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AddClassified"
+   type="alertmodal">
+Classified ads appear in the &apos;Classified&apos; section of the Search directory and on www.secondlife.com for one week.
+Fill out your ad, then click &apos;Publish...&apos; to add it to the directory.
+You&apos;ll be asked for a price to pay when clicking Publish.
+Paying more makes your ad appear higher in the list, and also appear higher when people search for keywords.
+    <usetemplate
+     ignoretext="When adding a new Classified"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DeleteClassified"
+   type="alertmodal">
+Delete classified &apos;[NAME]&apos;?
+There is no reimbursement for fees paid.
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClassifiedSave"
+   type="alertmodal">
+Save changes to classified [NAME]?
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="Don&apos;t Save"
+     yestext="Save"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DeleteAvatarPick"
+   type="alertmodal">
+Delete pick [PICK]?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PromptGoToEventsPage"
+   type="alertmodal">
+Go to the [SECOND_LIFE] events web page?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SelectProposalToView"
+   type="alertmodal">
+Please select a proposal to view.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SelectHistoryItemToView"
+   type="alertmodal">
+Please select a history item to view.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ResetShowNextTimeDialogs"
+   type="alertmodal">
+Would you like to re-enable all these popups, which you previously indicated &apos;Don&apos;t show me again&apos;?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SkipShowNextTimeDialogs"
+   type="alertmodal">
+Would you like to disable all popups which can be skipped?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="CacheWillClear"
+   type="notify">
+    Cache will be cleared after you restart [APP_NAME].
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="CacheWillBeMoved"
+   type="notify">
+    Cache will be moved after you restart [APP_NAME].
+    Note: This will clear the cache.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="ChangeConnectionPort"
+   type="notify">
+Port settings take effect after you restart [APP_NAME].
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="ProxyNeedRestart"
+   type="notify">
+    Socks proxy settings will take effect after you restart [APP_NAME].
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_CONNECT_OK"
+   type="alertmodal">
+Connection to Socks5 proxy [PROXY] was successful.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_NOT_PERMITTED"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" refused the connection, not allowed by rule set
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_CONNECT_ERROR"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" refused the connection, could not open TCP channel
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_NOT_ACCEPTABLE"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" refused the selected authentication system
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_AUTH_FAIL"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" reported your credentials are invalid
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_UDP_FWD_NOT_GRANTED"
+   type="alertmodal">
+The Socks5 proxy "[PROXY]" refused the UDP associate request
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SOCKS_HOST_CONNECT_FAILED"
+   type="alertmodal">
+Could not connect to Socks5 proxy server "[PROXY]"
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="ChangeSkin"
+   type="notfy">
+    The new skin will appear after you restart [APP_NAME].
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GoToAuctionPage"
+   type="alertmodal">
+Go to the [SECOND_LIFE] web page to see auction details or make a bid?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SaveChanges"
+   type="alertmodal">
+Save Changes?
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="Don&apos;t Save"
+     yestext="Save"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GestureSaveFailedTooManySteps"
+   type="alertmodal">
+Gesture save failed.
+This gesture has too many steps.
+Try removing some steps, then save again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GestureSaveFailedTryAgain"
+   type="alertmodal">
+Gesture save failed.  Please try again in a minute.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GestureSaveFailedObjectNotFound"
+   type="alertmodal">
+Could not save gesture because the object or the associated object inventory could not be found.
+The object may be out of range or may have been deleted.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GestureSaveFailedReason"
+   type="alertmodal">
+There was a problem saving a gesture due to the following reason: [REASON].  Please try resaving the gesture later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SaveNotecardFailObjectNotFound"
+   type="alertmodal">
+Could not save notecard because the object or the associated object inventory could not be found.
+The object may be out of range or may have been deleted.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SaveNotecardFailReason"
+   type="alertmodal">
+There was a problem saving a notecard due to the following reason: [REASON].  Please try re-saving the notecard later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ScriptCannotUndo"
+   type="alertmodal">
+Could not undo all changes in your version of the script.
+Would you like to load the server&apos;s last saved version?
+(**Warning** This operation cannot be undone.)
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SaveScriptFailReason"
+   type="alertmodal">
+There was a problem saving a script due to the following reason: [REASON].  Please try re-saving the script later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SaveScriptFailObjectNotFound"
+   type="alertmodal">
+Could not save the script because the object it is in could not be found.
+The object may be out of range or may have been deleted.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SaveBytecodeFailReason"
+   type="alertmodal">
+There was a problem saving a compiled script due to the following reason: [REASON].  Please try re-saving the script later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CouldNotStartStopScript"
+   type="alertmodal">
+Could not start or stop the script because the object it is on could not be found.
+The object may be out of range or may have been deleted.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotDownloadFile"
+   type="alertmodal">
+Unable to download file
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotWriteFile"
+   type="alertmodal">
+Unable to write file [[FILE]]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnsupportedHardware"
+   type="alertmodal">
+Warning: Your system does not meet [APP_NAME] minimum system requirements. If you continue using [APP_NAME], you may experience poor performance. [GRID_OWNER] cannot provide technical support for unsupported system configurations.
+
+    MINSPECS
+    Do you wish to visit [_URL] for more information?
+    <url option="0" name="url">
+
+			http://www.secondlife.com/corporate/sysreqs.php
+    </url>
+    <usetemplate
+     ignoretext="When detecting unsupported hardware"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnknownGPU"
+   type="alertmodal">
+Your system contains a graphics card that is unknown to us at this time.
+This is often the case with new hardware we haven&apos;t had a chance to test.  [APP_NAME] will most likely run properly, but you may need to adjust your graphics settings to something more appropriate.
+(Edit menu &gt; Preferences &gt; Graphics).
+    <form name="form">
+      <ignore name="ignore"
+       text="When detecting an unknown graphics card"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DisplaySettingsNoShaders"
+   type="alertmodal">
+    [APP_NAME] crashed while initializing graphics drivers.
+    Graphics Quality will be set to low to avoid some common driver errors.
+    This will disable some graphics features.
+    We recommend updating your graphics card drivers.
+    Graphics Quality can be raised in Preferences &gt; Graphics.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RegionNoTerraforming"
+   type="alertmodal">
+The region [REGION] does not allow terraforming.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotCopyWarning"
+   type="alertmodal">
+You do not have permission to copy the following items:
+[ITEMS]
+and will lose it from your inventory if you give it away. Do you really want to offer these items?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotGiveItem"
+   type="alertmodal">
+Unable to give inventory item.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TransactionCancelled"
+   type="alertmodal">
+Transaction cancelled.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TooManyItems"
+   type="alertmodal">
+Cannot give more than 42 items in a single inventory transfer.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoItems"
+   type="alertmodal">
+You do not have permission to transfer the selected items.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotCopyCountItems"
+   type="alertmodal">
+You do not have permission to copy [COUNT] of the selected items. You will lose these items from your inventory.
+Do you really want to give these items?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotGiveCategory"
+   type="alertmodal">
+You do not have permission to transfer the selected folder.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FreezeAvatar"
+   type="alertmodal">
+Freeze this avatar?
+He or she will temporarily be unable to move, chat, or interact with the world.
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="Unfreeze"
+     yestext="Freeze"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FreezeAvatarFullname"
+   type="alertmodal">
+Freeze [AVATAR_NAME]?
+He or she will temporarily be unable to move, chat, or interact with the world.
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="Unfreeze"
+     yestext="Freeze"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="EjectAvatarFullname"
+   type="alertmodal">
+Eject [AVATAR_NAME] from your land?
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="Eject and Ban"
+     yestext="Eject"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="EjectAvatarNoBan"
+   type="alertmodal">
+Eject this avatar from your land?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Eject"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="EjectAvatarFullnameNoBan"
+   type="alertmodal">
+Eject [AVATAR_NAME] from your land?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Eject"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AcquireErrorTooManyObjects"
+   type="alertmodal">
+ACQUIRE ERROR: Too many objects selected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AcquireErrorObjectSpan"
+   type="alertmodal">
+ACQUIRE ERROR: Objects span more than one region.
+Please move all objects to be acquired onto the same region.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PromptGoToCurrencyPage"
+   type="alertmodal">
+[EXTRA]
+
+Go to [URL] for information on purchasing currency?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToLinkObjects"
+   type="alertmodal">
+Unable to link these [COUNT] objects.
+You can link a maximum of [MAX] objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotLinkIncompleteSet"
+   type="alertmodal">
+You can only link complete sets of objects, and must select more than one object.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotLinkModify"
+   type="alertmodal">
+Unable to link because you don&apos;t have modify permission on all the objects.
+
+Please make sure none are locked, and that you own all of them.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotLinkDifferentOwners"
+   type="alertmodal">
+Unable to link because not all of the objects have the same owner.
+
+Please make sure you own all of the selected objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoFileExtension"
+   type="alertmodal">
+No file extension for the file: &apos;[FILE]&apos;
+
+Please make sure the file has a correct file extension.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidFileExtension"
+   type="alertmodal">
+Invalid file extension [EXTENSION]
+Expected [VALIDS]
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotUploadSoundFile"
+   type="alertmodal">
+Couldn&apos;t open uploaded sound file for reading:
+[FILE]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SoundFileNotRIFF"
+   type="alertmodal">
+File does not appear to be a RIFF WAVE file:
+[FILE]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SoundFileNotPCM"
+   type="alertmodal">
+File does not appear to be a PCM WAVE audio file:
+[FILE]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SoundFileInvalidChannelCount"
+   type="alertmodal">
+File has invalid number of channels (must be mono or stereo):
+[FILE]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SoundFileInvalidSampleRate"
+   type="alertmodal">
+File does not appear to be a supported sample rate (must be 44.1k):
+[FILE]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SoundFileInvalidWordSize"
+   type="alertmodal">
+File does not appear to be a supported word size (must be 8 or 16 bit):
+[FILE]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SoundFileInvalidHeader"
+   type="alertmodal">
+Could not find &apos;data&apos; chunk in WAV header:
+[FILE]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SoundFileInvalidChunkSize"
+   type="alertmodal">
+Wrong chunk size in WAV file:
+[FILE]
+  </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="SoundFileInvalidTooLong"
+   type="alertmodal">
+Audio file is too long (10 second maximum):
+[FILE]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ProblemWithFile"
+   type="alertmodal">
+Problem with file [FILE]:
+
+[ERROR]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotOpenTemporarySoundFile"
+   type="alertmodal">
+Couldn&apos;t open temporary compressed sound file for writing: [FILE]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnknownVorbisEncodeFailure"
+   type="alertmodal">
+Unknown Vorbis encode failure on: [FILE]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotEncodeFile"
+   type="alertmodal">
+Unable to encode file: [FILE]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CorruptResourceFile"
+   type="alertmodal">
+Corrupt resource file: [FILE]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnknownResourceFileVersion"
+   type="alertmodal">
+Unknown resource file version in file: [FILE]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToCreateOutputFile"
+   type="alertmodal">
+Unable to create output file: [FILE]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DoNotSupportBulkAnimationUpload"
+   type="alertmodal">
+We do not currently support bulk upload of animation files.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotUploadReason"
+   type="alertmodal">
+Unable to upload [FILE] due to the following reason: [REASON]
+Please try again later.
+  </notification>
+
+   <notification
+    icon="alertmodal.tga"
+    name="UploadCostConfirmation"
+    type="alertmodal">
+This upload will cost L$[PRICE], do you wish to continue with the upload?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Upload"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotCreateLandmarkNotOwner"
+   type="alertmodal">
+You cannot create a landmark here because the owner of the land doesn&apos;t allow it.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotRecompileSelectObjectsNoScripts"
+   type="alertmodal">
+Not able to perform &apos;recompilation&apos;.
+Select an object with a script.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotRecompileSelectObjectsNoPermission"
+   type="alertmodal">
+Not able to perform &apos;recompilation&apos;.
+
+Select objects with scripts that you have permission to modify.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotResetSelectObjectsNoScripts"
+   type="alertmodal">
+Not able to perform &apos;reset&apos;.
+
+Select objects with scripts.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotResetSelectObjectsNoPermission"
+   type="alertmodal">
+Not able to perform &apos;reset&apos;.
+
+Select objects with scripts that you have permission to modify.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotSetRunningSelectObjectsNoScripts"
+   type="alertmodal">
+Not able to set any scripts to &apos;running&apos;.
+
+Select objects with scripts.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotSetRunningNotSelectObjectsNoScripts"
+   type="alertmodal">
+Unable to set any scripts to &apos;not running&apos;.
+
+Select objects with scripts.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NoFrontmostFloater"
+   type="alertmodal">
+No frontmost floater to save.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SeachFilteredOnShortWords"
+   type="alertmodal">
+Your search query was modified and the words that were too short were removed.
+
+Searched for: [FINALQUERY]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SeachFilteredOnShortWordsEmpty"
+   type="alertmodal">
+Your search terms were too short so no search was performed.
+  </notification>
+
+  <!-- Generic Teleport failure modes - strings will be inserted from
+       teleport_strings.xml if available. -->
+  <notification
+   icon="alertmodal.tga"
+   name="CouldNotTeleportReason"
+   type="alertmodal">
+Could not teleport.
+[REASON]
+  </notification>
+
+  <!-- Teleport failure modes not delivered via the generic mechanism
+       above (for example, delivered as an AlertMessage on
+       region-crossing :( ) - these paths should really be merged
+       in the future. -->
+  <notification
+   icon="alertmodal.tga"
+   name="invalid_tport"
+   type="alertmodal">
+Problem encountered processing your teleport request. You may need to log back in before you can teleport. If you continue to get this message, please check the Tech Support FAQ at:
+www.secondlife.com/support
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="invalid_region_handoff"
+   type="alertmodal">
+Problem encountered processing your region crossing. You may need to log back in before you can cross regions. If you continue to get this message, please check the Tech Support FAQ at:
+www.secondlife.com/support
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="blocked_tport"
+   type="alertmodal">
+Sorry, teleport is currently blocked. Try again in a moment.  If you still cannot teleport, please log out and log back in to resolve the problem.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="nolandmark_tport"
+   type="alertmodal">
+Sorry, but system was unable to locate landmark destination.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="timeout_tport"
+   type="alertmodal">
+Sorry, but system was unable to complete the teleport connection.  Try again in a moment.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="noaccess_tport"
+   type="alertmodal">
+Sorry, you do not have access to that teleport destination.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="missing_attach_tport"
+   type="alertmodal">
+Your attachments have not arrived yet. Try waiting for a few more seconds or log out and back in again before attempting to teleport.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="too_many_uploads_tport"
+   type="alertmodal">
+The asset queue in this region is currently clogged so your teleport request will not be able to succeed in a timely manner. Please try again in a few minutes or go to a less busy area.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="expired_tport"
+   type="alertmodal">
+Sorry, but the system was unable to complete your teleport request in a timely fashion. Please try again in a few minutes.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="expired_region_handoff"
+   type="alertmodal">
+Sorry, but the system was unable to complete your region crossing in a timely fashion. Please try again in a few minutes.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="no_host"
+   type="alertmodal">
+Unable to find teleport destination. The destination may be temporarily unavailable or no longer exists. Please try again in a few minutes.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="no_inventory_host"
+   type="alertmodal">
+The inventory system is currently unavailable.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotSetLandOwnerNothingSelected"
+   type="alertmodal">
+Unable to set land owner:
+No parcel selected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotSetLandOwnerMultipleRegions"
+   type="alertmodal">
+Unable to force land ownership because selection spans multiple regions. Please select a smaller area and try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ForceOwnerAuctionWarning"
+   type="alertmodal">
+This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some residents unhappy if bidding has begun. Force ownership?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotContentifyNothingSelected"
+   type="alertmodal">
+Unable to contentify:
+No parcel selected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotContentifyNoRegion"
+   type="alertmodal">
+Unable to contentify:
+No region selected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotReleaseLandNothingSelected"
+   type="alertmodal">
+Unable to abandon land:
+No parcel selected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotReleaseLandNoRegion"
+   type="alertmodal">
+Unable to abandon land:
+Cannot find region.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotBuyLandNothingSelected"
+   type="alertmodal">
+Unable to buy land:
+No parcel selected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotBuyLandNoRegion"
+   type="alertmodal">
+Unable to buy land:
+Cannot find the region this land is in.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotCloseFloaterBuyLand"
+   type="alertmodal">
+You cannot close the Buy Land window until [APP_NAME] estimates the price of this transaction.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotDeedLandNothingSelected"
+   type="alertmodal">
+Unable to deed land:
+No parcel selected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotDeedLandNoGroup"
+   type="alertmodal">
+Unable to deed land:
+No Group selected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotDeedLandNoRegion"
+   type="alertmodal">
+Unable to deed land:
+Cannot find the region this land is in.
+Please use Help -&gt; Bug Reporting -&gt; Report Bug to report this.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotDeedLandMultipleSelected"
+   type="alertmodal">
+Unable to deed land:
+Multiple parcels selected.
+
+Try selecting a single parcel.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="DeedToGroupFail"
+   type="notifytip">
+    Deed to group failed.
+    <tag>group</tag>
+    <tag>fail</tag>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ParcelCanPlayMedia"
+   type="alertmodal">
+This location can play streaming media.
+Streaming media requires a fast Internet connection.
+
+Play streaming media when available?
+(You can change this option later under Preferences &gt; Audio &amp; Video.)
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Disable"
+     yestext="Play Media"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotDeedLandWaitingForServer"
+   type="alertmodal">
+Unable to deed land:
+Waiting for server to report ownership.
+
+Please try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotDeedLandNoTransfer"
+   type="alertmodal">
+Unable to deed land:
+The region [REGION] does not allow transfer of land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotReleaseLandWatingForServer"
+   type="alertmodal">
+Unable to abandon land:
+Waiting for server to update parcel information.
+
+Try again in a few seconds.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotReleaseLandSelected"
+   type="alertmodal">
+Unable to abandon land:
+You do not own all the parcels selected.
+
+Please select a single parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotReleaseLandDontOwn"
+   type="alertmodal">
+Unable to abandon land:
+You don&apos;t have permission to release this parcel.
+Parcels you own appear in green.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotReleaseLandRegionNotFound"
+   type="alertmodal">
+Unable to abandon land:
+Cannot find the region this land is in.
+
+Please use Help -&gt; Bug Reporting -&gt; Report Bug to report this.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotReleaseLandNoTransfer"
+   type="alertmodal">
+Unable to abandon land:
+The region [REGION] does not allow transfer of land.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotReleaseLandPartialSelection"
+   type="alertmodal">
+Unable to abandon land:
+You must select an entire parcel to release it.
+
+Select an entire parcel, or divide your parcel first.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ReleaseLandWarning"
+   type="alertmodal">
+You are about to release [AREA] m² of land.
+Releasing this parcel will remove it from your land holdings, but will not grant any [CURRENCY].
+
+Release this land?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotDivideLandNothingSelected"
+   type="alertmodal">
+Unable to divide land:
+
+No parcels selected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotDivideLandPartialSelection"
+   type="alertmodal">
+Unable to divide land:
+
+You have an entire parcel selected.
+Try selecting a part of the parcel.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandDivideWarning"
+   type="alertmodal">
+Dividing this land will split this parcel into two and each parcel can have its own settings. Some settings will be reset to defaults after the operation.
+
+Divide land?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotDivideLandNoRegion"
+   type="alertmodal">
+Unable to divide land:
+Cannot find the region this land is in.
+
+Please use Help -&gt; Bug Reporting -&gt; Report Bug to report this.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotJoinLandNoRegion"
+   type="alertmodal">
+Unable to join land:
+Cannot find the region this land is in.
+
+Please use Help -&gt; Bug Reporting -&gt; Report Bug to report this.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotJoinLandNothingSelected"
+   type="alertmodal">
+Unable to join land:
+No parcels selected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotJoinLandEntireParcelSelected"
+   type="alertmodal">
+Unable to join land:
+You only have one parcel selected.
+
+Select land across both parcels.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotJoinLandSelection"
+   type="alertmodal">
+Unable to join land:
+You must select more than one parcel.
+
+Select land across both parcels.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="JoinLandWarning"
+   type="alertmodal">
+Joining this land will create one large parcel out of all parcels intersecting the selected rectangle.
+You will need to reset the name and options of the new parcel.
+
+Join land?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ShowOwnersHelp"
+   type="alertmodal">
+Show owners:
+Color parcels to show the owner type.
+
+Green = Your land
+Aqua = Your Group&apos;s land
+Red = Owned by others
+Yellow = For sale
+Purple = For auction
+Grey = Public
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmNotecardSave"
+   type="alertmodal">
+This notecard needs to be saved before the item can be copied or viewed. Save notecard?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmItemCopy"
+   type="alertmodal">
+Copy this item to your inventory?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Copy"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ResolutionSwitchFail"
+   type="alertmodal">
+Failed to switch resolution to [RESX] by [RESY]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ErrorUndefinedGrasses"
+   type="alertmodal">
+Error: Undefined grasses: [SPECIES]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ErrorUndefinedTrees"
+   type="alertmodal">
+Error: Undefined trees: [SPECIES]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotSaveWearableOutOfSpace"
+   type="alertmodal">
+Unable to save &apos;[NAME]&apos; to wearable file.  You will need to free up some space on your computer and save the wearable again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotSaveToAssetStore"
+   type="alertmodal">
+Unable to save [NAME] to central asset store.
+This is usually a temporary failure. Please customize and save the wearable again in a few minutes.
+
+If this problem persists, please click on the &apos;Help -&gt; Bug Reporting &gt; Report Bug&apos; pull down menu
+and provide details about your network setup.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="YouHaveBeenLoggedOut"
+   type="alertmodal">
+You have been logged out of [SECOND_LIFE]:
+            [MESSAGE]
+You can still look at existing IM and chat by clicking &apos;View IM &amp; Chat&apos;. Otherwise, click &apos;Quit&apos; to exit [APP_NAME] immediately.
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Quit"
+     yestext="View IM &amp; Chat"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="OnlyOfficerCanBuyLand"
+   type="alertmodal">
+Unable to buy land for the group:
+You do not have permission to buy land for your active group.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Add Friend"
+   name="AddFriend"
+   type="alertmodal">
+Friends can give permissions to track each other on the map and receive online status updates.
+
+Offer friendship to [NAME]?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Add Friend"
+   name="AddFriendWithMessage"
+   type="alertmodal">
+Friends can give permissions to track each other on the map and receive online status updates.
+
+Offer friendship to [NAME]?
+    <form name="form">
+      <input name="message" type="text">
+Would you be my friend?
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="Offer"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RemoveFromFriends"
+   type="alertmodal">
+Do you want to remove [NAME] from your Friends List?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RemoveMultipleFromFriends"
+   type="alertmodal">
+Do you want to remove multiple friends from your Friends list?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GodDeleteAllScriptedPublicObjectsByUser"
+   type="alertmodal">
+Are you sure you want to delete all scripted objects owned by
+** [AVATAR_NAME] **
+on all others land in this sim?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GodDeleteAllScriptedObjectsByUser"
+   type="alertmodal">
+Are you sure you want to DELETE ALL scripted objects owned by
+** [AVATAR_NAME] **
+on ALL LAND in this sim?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GodDeleteAllObjectsByUser"
+   type="alertmodal">
+Are you sure you want to DELETE ALL objects (scripted or not) owned by
+** [AVATAR_NAME] **
+on ALL LAND in this sim?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BlankClassifiedName"
+   type="alertmodal">
+You must specify a name for your classified.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MinClassifiedPrice"
+   type="alertmodal">
+Price to pay for listing must be at least [CURRENCY][MIN_PRICE].
+
+Please enter a higher price.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmItemDeleteHasLinks"
+   type="alertmodal">
+At least one of the items you has link items that point to it.  If you delete this item, its links will permanently stop working.  It is strongly advised to delete the links first.
+
+Are you sure you want to delete these items?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmObjectDeleteLock"
+   type="alertmodal">
+At least one of the items you have selected is locked.
+
+Are you sure you want to delete these items?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmObjectDeleteNoCopy"
+   type="alertmodal">
+At least one of the items you have selected is not copyable.
+
+Are you sure you want to delete these items?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmObjectDeleteNoOwn"
+   type="alertmodal">
+You do not own least one of the items you have selected.
+
+Are you sure you want to delete these items?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmObjectDeleteLockNoCopy"
+   type="alertmodal">
+At least one object is locked.
+At least one object is not copyable.
+
+Are you sure you want to delete these items?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmObjectDeleteLockNoOwn"
+   type="alertmodal">
+At least one object is locked.
+You do not own least one object.
+
+Are you sure you want to delete these items?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmObjectDeleteNoCopyNoOwn"
+   type="alertmodal">
+At least one object is not copyable.
+You do not own least one object.
+
+Are you sure you want to delete these items?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmObjectDeleteLockNoCopyNoOwn"
+   type="alertmodal">
+At least one object is locked.
+At least one object is not copyable.
+You do not own least one object.
+
+Are you sure you want to delete these items?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmObjectTakeLock"
+   type="alertmodal">
+At least one object is locked.
+
+Are you sure you want to take these items?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmObjectTakeNoOwn"
+   type="alertmodal">
+You do not own all of the objects you are taking.
+If you continue, next owner permissions will be applied and possibly restrict your ability to modify or copy them.
+
+Are you sure you want to take these items?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmObjectTakeLockNoOwn"
+   type="alertmodal">
+At least one object is locked.
+You do not own all of the objects you are taking.
+If you continue, next owner permissions will be applied and possibly restrict your ability to modify or copy them.
+However, you can take the current selection.
+
+Are you sure you want to take these items?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantBuyLandAcrossMultipleRegions"
+   type="alertmodal">
+Unable to buy land because selection spans multiple regions.
+
+Please select a smaller area and try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DeedLandToGroup"
+   type="alertmodal">
+By deeding this parcel, the group will be required to have and maintain sufficient land use credits.
+The purchase price of the land is not refunded to the owner. If a deeded parcel is sold, the sale price will be divided evenly among group members.
+
+Deed this [AREA] m² of land to the group &apos;[GROUP_NAME]&apos;?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DeedLandToGroupWithContribution"
+   type="alertmodal">
+By deeding this parcel, the group will be required to have and maintain sufficient land use credits.
+The deed will include a simultaneous land contribution to the group from &apos;[NAME]&apos;.
+The purchase price of the land is not refunded to the owner. If a deeded parcel is sold, the sale price will be divided evenly among group members.
+
+Deed this [AREA] m² of land to the group &apos;[GROUP_NAME]&apos;?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DisplaySetToSafe"
+   type="alertmodal">
+Display settings have been set to safe levels because you have specified the -safe option.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DisplaySetToRecommended"
+   type="alertmodal">
+Display settings have been set to recommended levels based on your system configuration.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ErrorMessage"
+   type="alertmodal">
+[ERROR_MESSAGE]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AvatarMoved"
+   type="alertmodal">
+Your [TYPE] location is not currently available. [HELP]
+You have been moved into a nearby region.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClothingLoading"
+   type="alertmodal">
+Your clothing is still downloading.
+You can use [SECOND_LIFE] normally and other people will see you correctly.
+    <form name="form">
+      <ignore name="ignore"
+       text="When clothing is taking a long time to download"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FirstRun"
+   type="alertmodal">
+
+[APP_NAME] installation is complete.
+
+If this is your first time using [SECOND_LIFE], you will need to create an account before you can log on.
+Return to www.secondlife.com to create a new account?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Continue"
+     yestext="New Account..."/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LoginPacketNeverReceived"
+   type="alertmodal">
+We&apos;re having trouble connecting. There may be a problem with your internet connection or the [SECOND_LIFE_GRID].
+
+You can either check your internet connection and try again in a few minutes, click Help to connect to our support site, or click Teleport to attempt to teleport home.
+    <form name="form">
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Help"
+       text="Help"/>
+      <button
+       index="2"
+       name="Teleport"
+       text="Teleport"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WelcomeChooseSex"
+   type="alertmodal">
+Your character will appear in a moment.
+
+Use arrow keys to walk.
+Press the F1 key at any time for help or to learn more about [SECOND_LIFE].
+Please choose the male or female avatar. You can change your mind later.
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Female"
+     yestext="Male"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NotEnoughCurrency"
+   type="alertmodal">
+[NAME] [CURRENCY] [PRICE] You don&apos;t have enough [CURRENCY] to do that.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GrantedModifyRights"
+   type="alertmodal">
+You have been granted the privilege to modify [NAME]&apos;s objects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RevokedModifyRights"
+   type="alertmodal">
+Your privilege to modify [NAME]&apos;s objects has been revoked
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FlushMapVisibilityCaches"
+   type="alertmodal">
+This will flush the map caches on this region.
+This is really only useful for debugging.
+(In production, wait 5 minutes, then everyone&apos;s map will update after they relog.)
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyOneObjectOnly"
+   type="alertmodal">
+Unable to buy more than one object at a time.  Please select only one object and try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="OnlyCopyContentsOfSingleItem"
+   type="alertmodal">
+Unable to copy the contents of more than one item at a time.
+Please select only one object and try again.
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="KickUsersFromRegion"
+   type="alertmodal">
+Teleport all Residents in this region home?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="EstateObjectReturn"
+   type="alertmodal">
+Are you sure you want to return objects owned by [USER_NAME]?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidTerrainBitDepth"
+   type="alertmodal">
+Couldn&apos;t set region textures:
+Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH].
+
+Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image then click &quot;Apply&quot; again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="InvalidTerrainSize"
+   type="alertmodal">
+Couldn&apos;t set region textures:
+Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y].
+
+Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image then click &quot;Apply&quot; again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RawUploadStarted"
+   type="alertmodal">
+Upload started. It may take up to two minutes, depending on your connection speed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmBakeTerrain"
+   type="alertmodal">
+Do you really want to bake the current terrain, make it the center for terrain raise/lower limits and the default for the &apos;Revert&apos; tool?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MaxAllowedAgentOnRegion"
+   type="alertmodal">
+You can only have [MAX_AGENTS] Allowed Residents.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MaxBannedAgentsOnRegion"
+   type="alertmodal">
+You can only have [MAX_BANNED] Banned Residents.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MaxAgentOnRegionBatch"
+   type="alertmodal">
+Failure while attempting to add [NUM_ADDED] agents:
+Exceeds the [MAX_AGENTS] [LIST_TYPE] limit by [NUM_EXCESS].
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MaxAllowedGroupsOnRegion"
+   type="alertmodal">
+You can only have [MAX_GROUPS] Allowed Groups.
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Bake"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MaxManagersOnRegion"
+   type="alertmodal">
+You can only have [MAX_MANAGER] Estate Managers.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="OwnerCanNotBeDenied"
+   type="alertmodal">
+Can&apos;t add estate owner to estate &apos;Banned Resident&apos; list.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CanNotChangeAppearanceUntilLoaded"
+   type="alertmodal">
+Can&apos;t change appearance until clothing and shape are loaded.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClassifiedMustBeAlphanumeric"
+   type="alertmodal">
+The name of your classified must start with a letter from A to Z or a number.  No punctuation is allowed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CantSetBuyObject"
+   type="alertmodal">
+Can&apos;t set Buy Object, because the object is not for sale.
+Please set the object for sale and try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FinishedRawDownload"
+   type="alertmodal">
+Finished download of raw terrain file to:
+[DOWNLOAD_PATH].
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DownloadWindowsMandatory"
+   type="alertmodal">
+A new version of [APP_NAME] is available.
+[MESSAGE]
+You must download this update to use [APP_NAME].
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Quit"
+     yestext="Download"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DownloadWindows"
+   type="alertmodal">
+An updated version of [APP_NAME] is available.
+[MESSAGE]
+This update is not required, but we suggest you install it to improve performance and stability.
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Continue"
+     yestext="Download"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DownloadWindowsReleaseForDownload"
+   type="alertmodal">
+An updated version of [APP_NAME] is available.
+[MESSAGE]
+This update is not required, but we suggest you install it to improve performance and stability.
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Continue"
+     yestext="Download"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DownloadMacMandatory"
+   type="alertmodal">
+A new version of [APP_NAME] is available.
+[MESSAGE]
+You must download this update to use [APP_NAME].
+
+Download to your Applications folder?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Quit"
+     yestext="Download"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DownloadMac"
+   type="alertmodal">
+An updated version of [APP_NAME] is available.
+[MESSAGE]
+This update is not required, but we suggest you install it to improve performance and stability.
+
+Download to your Applications folder?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Continue"
+     yestext="Download"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DownloadMacReleaseForDownload"
+   type="alertmodal">
+An updated version of [APP_NAME] is available.
+[MESSAGE]
+This update is not required, but we suggest you install it to improve performance and stability.
+
+Download to your Applications folder?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Continue"
+     yestext="Download"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="DeedObjectToGroup"
+   type="alertmodal">
+Deeding this object will cause the group to:
+* Receive [CURRENCY] paid into the object
+    <usetemplate
+     ignoretext="When deeding objects to groups"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="Deed"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WebLaunchExternalTarget"
+   type="alertmodal">
+Open your system Web browser to view this content?
+    <usetemplate
+     ignoretext="When opening your system browser to view a Web page"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WebLaunchJoinNow"
+   type="alertmodal">
+Go to www.secondlife.com to manage your account?
+    <usetemplate
+     ignoretext="When launching web browser to manage your account"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WebLaunchBugReport101"
+   type="alertmodal">
+Visit the [SECOND_LIFE] Wiki and learn how to report bugs correctly.
+    <usetemplate
+     ignoretext="When launching web browser to view the Bug Reporting 101 Wiki"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WebLaunchSecurityIssues"
+   type="alertmodal">
+Visit the [SECOND_LIFE] Wiki for details of how to report a security issue.
+    <usetemplate
+     ignoretext="When launching web browser to view Security Issues Wiki"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WebLaunchQAWiki"
+   type="alertmodal">
+Visit the [SECOND_LIFE] QA Wiki.
+    <usetemplate
+     ignoretext="When launching web browser to view the QA Wiki"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WebLaunchPublicIssue"
+   type="alertmodal">
+Visit the [SECOND_LIFE] Public Issue Tracker, where you can report bugs and other issues.
+    <usetemplate
+     ignoretext="When launching web browser to view the Public Issue Tracker"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="Go to page"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WebLaunchSinguIssue"
+   type="alertmodal">
+Visit the Singularity Issue Tracker, to report bugs and issues with Singularity Viewer.
+    <usetemplate
+     ignoretext="When launching web browser to view Singularity Issue Tracker"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="Go to page"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WebLaunchPublicIssueHelp"
+   type="alertmodal">
+Visit the [SECOND_LIFE] Wiki for info on how to use the Public Issue Tracker.
+    <usetemplate
+     ignoretext="When launching web browser to view Public Issue Tracker Wiki"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="Go to page"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WebLaunchSupportWiki"
+   type="alertmodal">
+Go to the Official [GRID_OWNER] Blog, for the latest news and information.
+    <usetemplate
+     ignoretext="When launching web browser to view the blog"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WebLaunchLSLGuide"
+   type="alertmodal">
+Go to the Scripting Guide for scripting help?
+    <usetemplate
+     ignoretext="When launching web browser to view the Scripting Guide"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WebLaunchLSLWiki"
+   type="alertmodal">
+Go to the LSL Portal for scripting help?
+    <usetemplate
+     ignoretext="When launching web browser to view the LSL Portal"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="Go to page"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ReturnToOwner"
+   type="alertmodal">
+Are you sure you want to return the selected objects to their owners? Transferable deeded objects will be returned to their previous owners.
+
+*WARNING* No-transfer deeded objects will be deleted!
+    <usetemplate
+     ignoretext="When returning objects to their owners"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="GroupLeaveConfirmMember"
+   type="alert">
+You are currently a member of the group [GROUP].
+Leave Group?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="ConfirmKick"
+   type="alert">
+Do you REALLY want to kick all users off the grid?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Kick All Users"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MuteLinden"
+   type="alertmodal">
+Sorry, you cannot mute an employee of [GRID_OWNER].
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CannotStartAuctionAlreadyForSale"
+   type="alertmodal">
+You cannot start an auction on a parcel which is already set for sale.  Disable the land sale if you are sure you want to start an auction.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Mute object by name failed"
+   name="MuteByNameFailed"
+   type="alertmodal">
+You already have muted this name.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="RemoveItemWarn"
+   type="alert">
+Though permitted, deleting contents may damage the object. Do you want to delete that item?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="CantOfferCallingCard"
+   type="alert">
+Cannot offer a calling card at this time. Please try again in a moment.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="CantOfferFriendship"
+   type="alert">
+Cannot offer friendship at this time. Please try again in a moment.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="BusyModeSet"
+   type="alert">
+Busy mode set.
+Chat and instant messages will be hidden. Instant messages will get your Busy mode response. All teleportation offers will be declined. All inventory offers will go to your Trash.
+    <usetemplate
+     ignoretext="When setting busy mode"
+     name="okignore"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="JoinedTooManyGroupsMember"
+   type="alert">
+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;Groups...&apos; option from the &apos;Edit&apos; menu.
+[NAME] has invited you to join a group as a member.
+[INVITE]
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Decline"
+     yestext="Join"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="KickUser"
+   type="alert">
+Kick this user with what message?
+    <form name="form">
+      <input name="message" type="text">
+An administrator has logged you off.
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="KickAllUsers"
+   type="alert">
+Kick everyone currently on the grid with what message?
+    <form name="form">
+      <input name="message" type="text">
+An administrator has logged you off.
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="FreezeUser"
+   type="alert">
+Freeze this user with what message?
+    <form name="form">
+      <input name="message" type="text">
+You have been frozen. You cannot move or chat. An administrator will contact you via instant message (IM).
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="UnFreezeUser"
+   type="alert">
+Unfreeze this user with what message?
+    <form name="form">
+      <input name="message" type="text">
+You are no longer frozen.
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="OfferTeleport"
+   type="alertmodal">
+Offer a teleport to your location with the following message?
+    <form name="form">
+      <input name="message" type="text">
+Join me in [REGION]
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="OfferTeleportFromGod"
+   type="alertmodal">
+God summon user to your location?
+    <form name="form">
+      <input name="message" type="text">
+Join me in [REGION]
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="TeleportFromLandmark"
+   type="alertmodal">
+Are you sure you want to teleport?
+    <usetemplate
+     ignoretext="When teleporting from a landmark in inventory"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="Teleport"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Message everyone in your Estate"
+   name="MessageEstate"
+   type="alert">
+Type a short announcement which will be sent to everyone currently in your estate.
+    <form name="form">
+      <input name="message" type="text"/>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Change Linden Estate"
+   name="ChangeLindenEstate"
+   type="alert">
+You are about to change a Governance-owned estate (mainland, teen grid, orientation, etc.).
+
+This is EXTREMELY DANGEROUS because it can fundamentally affect the user experience.  On the mainland, it will change thousands of regions and make the spaceserver hiccup.
+
+Proceed?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Change Linden Estate Access"
+   name="ChangeLindenAccess"
+   type="alert">
+You are about to change the access list for a Governance-owned estate (mainland, teen grid, orientation, etc.).
+
+This is DANGEROUS and should only be done to invoke the hack allowing objects/[CURRENCY] to be transfered in/out of a grid.
+It will change thousands of regions and make the spaceserver hiccup.
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateAllowedAgentAdd"
+   type="alert">
+Add to allowed list for this estate only or for [ALL_ESTATES]?
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateAllowedAgentRemove"
+   type="alert">
+Remove from allowed list for this estate only or for [ALL_ESTATES]?
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateAllowedGroupAdd"
+   type="alert">
+Add to group allowed list for this estate only or for [ALL_ESTATES]?
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateAllowedGroupRemove"
+   type="alert">
+Remove from group allowed list for this estate only or [ALL_ESTATES]?
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateBannedAgentAdd"
+   type="alert">
+Deny access for this estate only or for [ALL_ESTATES]?
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateBannedAgentRemove"
+   type="alert">
+Remove this Resident from the ban list for  access for this estate only or for [ALL_ESTATES]?
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateManagerAdd"
+   type="alert">
+Add estate manager for this estate only or for [ALL_ESTATES]?
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Select estate"
+   name="EstateManagerRemove"
+   type="alert">
+Remove estate manager for this estate only or for [ALL_ESTATES]?
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="All Estates"
+     yestext="This Estate"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Confirm Kick"
+   name="EstateKickUser"
+   type="alert">
+Kick [EVIL_USER] from this estate?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="EstateChangeCovenant"
+   type="alertmodal">
+Are you sure you want to change the Estate Covenant?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RegionEntryAccessBlocked"
+   type="alertmodal">
+You are not allowed in that Region due to your maturity Rating. This may be a result of a lack of information validating your age.
+
+Please verify you have the latest Viewer installed, and go to the Knowledge Base for details on accessing areas with this maturity rating.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RegionEntryAccessBlocked_KB"
+   type="alertmodal">
+You are not allowed in that region due to your maturity Rating.
+
+Go to the Knowledge Base for more information about maturity Ratings?
+    <url option="0" name="url">
+		https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+    </url>
+    <usetemplate
+     name="okcancelignore"
+     yestext="Go to Knowledge Base"
+	 notext="Close"
+	 ignoretext="When Region entry is blocked due to maturity Rating"/>
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="RegionEntryAccessBlocked_Notify"
+   type="notifytip">
+You are not allowed in that region due to your maturity Rating.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="RegionEntryAccessBlocked_Change"
+   type="alertmodal">
+You are not allowed in that Region due to your maturity Rating preference.
+
+You can click &apos;Change Preference&apos; to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Edit &gt; Preferences... &gt; General.
+	 <form name="form">
+      <button
+       index="0"
+       name="OK"
+       text="Change Preference"/>
+      <button
+       default="true"
+       index="1"
+       name="Cancel"
+       text="Close"/>
+       <ignore name="ignore" text="When Region entry is blocked due to maturity Rating preference"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandClaimAccessBlocked"
+   type="alertmodal">
+You cannot claim this land due to your maturity Rating. This may be a result of a lack of information validating your age.
+
+Please verify you have the latest Viewer installed, and go to the Knowledge Base for details on accessing areas with this maturity rating.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandClaimAccessBlocked_KB"
+   type="alertmodal">
+You cannot claim this land due to your maturity Rating.
+
+Go to the Knowledge Base for more information about maturity Ratings?
+    <url option="0" name="url">
+		https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+    </url>
+    <usetemplate
+     name="okcancelignore"
+     yestext="Go to Knowledge Base"
+	 notext="Close"
+	 ignoretext="When claiming land is blocked due to maturity Rating"/>
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="LandClaimAccessBlocked_Notify"
+   type="notifytip">
+You cannot claim this land due to your maturity Rating.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandClaimAccessBlocked_Change"
+   type="alertmodal">
+You cannot claim this land due to your maturity Rating preference.
+
+You can click &apos;Change Preference&apos; to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Edit &gt; Preferences... &gt; General.
+    <usetemplate
+     name="okcancelignore"
+     yestext="Change Preference"
+	 notext="Close"
+	 ignoretext="When claiming land is blocked due to maturity Rating preference"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandBuyAccessBlocked"
+   type="alertmodal">
+You cannot buy this land due to your maturity Rating. This may be a result of a lack of information validating your age.
+
+Please verify you have the latest Viewer installed, and go to the Knowledge Base for details on accessing areas with this maturity rating.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandBuyAccessBlocked_KB"
+   type="alertmodal">
+You cannot buy this land due to your maturity Rating.
+
+Go to the Knowledge Base for more information about maturity Ratings?
+    <url option="0" name="url">
+		https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+    </url>
+    <usetemplate
+     name="okcancelignore"
+     yestext="Go to Knowledge Base"
+	 notext="Close"
+	 ignoretext="When a Land purchase is blocked due to maturity Rating"/>
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="LandBuyAccessBlocked_Notify"
+   type="notifytip">
+You cannot buy this land due to your maturity Rating.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="LandBuyAccessBlocked_Change"
+   type="alertmodal">
+You cannot buy this land due to your maturity Rating preference.
+
+You can click &apos;Change Preference&apos; to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Edit &gt; Preferences... &gt; General.
+    <usetemplate
+     name="okcancelignore"
+     yestext="Change Preference"
+	 notext="Close"
+	 ignoretext="When a Land purchase is blocked due to maturity Rating preference"/>
+  </notification>
+
+	<notification
+	  icon="alertmodal.tga"
+	  name="TooManyPrimsSelected"
+	  type="alertmodal">
+		"There are too many prims selected.  Please select [MAX_PRIM_COUNT] or fewer prims and try again"
+		<usetemplate
+		 name="okbutton"
+		 yestext="OK"/>
+	</notification>
+
+	<notification
+   icon="alertmodal.tga"
+   name="ProblemImportingEstateCovenant"
+   type="alertmodal">
+Problem importing estate covenant.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ProblemAddingEstateManager"
+   type="alertmodal">
+Problems adding a new estate manager.  One or more estates may have a full manager list.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ProblemAddingEstateGeneric"
+   type="alertmodal">
+Problems adding to this estate list.  One or more estates may have a full list.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="UnableToLoadNotecardAsset"
+   type="alertmodal">
+Unable to load notecard&apos;s asset at this time.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NotAllowedToViewNotecard"
+   type="alertmodal">
+Insufficient permissions to view notecard associated with asset ID requested.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MissingNotecardAssetID"
+   type="alertmodal">
+Asset ID for notecard is missing from database.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="PublishClassified"
+   type="alert">
+Remember: Classified ad fees are non-refundable.
+
+Publish this classified now for [CURRENCY][AMOUNT]?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetClassifiedMature"
+   type="alertmodal">
+Does this classified contain Mature content?
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetGroupMature"
+   type="alertmodal">
+Does this group contain Mature content?
+    <usetemplate
+     canceltext="Cancel"
+     name="yesnocancelbuttons"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Confirm restart"
+   name="ConfirmRestart"
+   type="alert">
+Do you really want to restart this region?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Message everyone in this region"
+   name="MessageRegion"
+   type="alert">
+Type a short announcement which will be sent to everyone in this region.
+    <form name="form">
+      <input name="message" type="text"/>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Block Terraform"
+   name="HelpRegionBlockTerraform"
+   type="alertmodal">
+If this box is checked, land owners will not be able to terraform their land regardless of the per-parcel &apos;Edit Terrain&apos; setting.
+
+Default: off
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Block Fly"
+   name="HelpRegionBlockFly"
+   type="alertmodal">
+If this box is checked, people will not be able to fly in this region regardless of the per-parcel &apos;Fly&apos; setting.
+
+Default: off
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Bulk Change Content Permissions"
+   name="HelpBulkPermission"
+   type="alertmodal">
+The Bulk Permissions tool helps you to quickly change the permissions on multiple items in the contents of the selected object(s).  However, please note that you are only setting permissions on the items in the Contents of the selected objects -- not permissions on the container object(s) themselves.  
+
+Also note, the permissions are not applied to the nested contents of any of the contained items.  Your request only operates on items exactly one level deep.
+
+You can selectively choose which types of items to modify by using the checklist under &apos;Content Types&apos; here. Snapshots are included when you select Textures.
+
+* This tool will only succeed at changing permissions on items you are allowed to change.
+* You cannot grant any Next owner permissions which you do not already have.
+* The Next owner permissions are merely requests. If any item cannot take all of the new permissions, none of its permissions will change.
+
+When you are ready to change the permissions in bulk, click &apos;Apply&apos; and wait for the results to display.
+
+If you close the Bulk Permissions window while permissions are being changed, it will halt the operation.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Allow Damage"
+   name="HelpRegionAllowDamage"
+   type="alertmodal">
+If this box is checked, the health system across all parcels regardless of individual parcel settings. If this box is left unchecked, individual parcel owners will still be able to activate the health system on their parcels.
+
+Default: off
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Agent Limit"
+   name="HelpRegionAgentLimit"
+   type="alertmodal">
+Sets the maximum number of avatars allowed in this region.
+Performance may vary depending on the number avatars present.
+
+Default: 40
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Object Bonus"
+   name="HelpRegionObjectBonus"
+   type="alertmodal">
+The Object Bonus is a multiplier for primitives allowed on any given parcel. The range allowed is 1 to 10. Set at &apos;1&apos;, each 512m² parcel is allowed 117 objects. Set at &apos;2&apos;, each 512m² parcel is allowed 234, or twice as many, and so on. The max number of objects allowed per region remains 15,000 no matter what the Object Bonus is. Once set, be aware that lowering the Object Bonus may cause objects to be returned or deleted.
+
+Default: 1.0
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Maturity"
+   name="HelpRegionMaturity"
+   type="alertmodal">
+Sets the maturity Rating of the Region, as shown in the menu bar at the top of any Resident&apos;s viewer, and in tooltips on the World Map when the cursor hovers over this Region. This setting also affects access to this Region and search results. Other Residents may only enter Regions or view search results with the same maturity Ratings they have chosen in their preferences.
+
+It may take some time for this change to be reflected on the map.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Restrict Pushing"
+   name="HelpRegionRestrictPushObject"
+   type="alertmodal">
+This checkbox sets the full region to restricted push permissions.
+When enabled, Residents may only be pushed by themselves or by the parcel&apos;s owner.
+(Push refers to the llPushObject() LSL function.)
+
+Default: Off
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Parcel Join/Subdivide"
+   name="HelpParcelChanges"
+   type="alertmodal">
+This checkbox sets whether or not parcels not owned by the estate owner can be joined or subdivided.
+If this option is unchecked:
+ * Only estate owners or managers can join or subdivide parcels.
+ * They may only join or subdivide parcels belonging to the owner, or to a group where they have the appropriate group powers.
+If this option is checked:
+ * All parcel owners can join or subdivide the parcels they own.
+ * For group owned parcels, those with appropriate group powers may join or subdivide parcels.
+
+Default: Checked
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Do Not Show In Search"
+   name="HelpRegionSearch"
+   type="alertmodal">
+Checking this box will block parcel owners from listing their parcels in search.
+
+Default: Off
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Changed Region Maturity"
+   name="RegionMaturityChange"
+   type="alertmodal">
+The maturity rating for this region has been updated.
+It may take some time for the change to be reflected on the map.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Land Resale"
+   name="HelpRegionLandResell"
+   type="alertmodal">
+Estate owners and managers can sell any land owned by the estate owner.
+If this option is left unchecked, buyers cannot resell their land in this region.
+If this option is checked, buyers can resell their land in this region.
+
+Default: Disallow
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Disable Scripts"
+   name="HelpRegionDisableScripts"
+   type="alertmodal">
+When sim performance is poor, a script may be to blame. Open the Statistics Bar (Ctrl-Shift-1). Look at the Simulator Physics FPS.
+If it is lower than 45,  open the Time panel located at the bottom of the Stats Bar. If Script Time reads 25 ms or higher, click the Get Top Scripts button. You will be given the name and location of scripts that may be causing poor performance.
+
+Checking the Disable Scripts box and then pressing the Apply button will temporarily disable all scripts in this region. You may need to do this in order to travel to the location of a noted &apos;top script&apos;. Once you have arrived at the location, investigate the script to determine if it is causing the problem. You may want to contact the owner of the script or delete or return the object.
+Uncheck the Disable Script box and then Apply to reactivate the scripts in the region.
+
+Default: off
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Disable Collisions"
+   name="HelpRegionDisableCollisions"
+   type="alertmodal">
+When sim performance is poor, physical objects may be to blame.
+Open the Statistics Bar (Ctrl-Shift-1). Look at the Simulator Physics FPS.  If it is lower than 45, open the Time panel located at the bottom of the Stats Bar. If Sim Time (Physics) reads 20 ms or higher, click the Get Top Colliders button.
+You will be given the name and location of physical objects that may be causing poor performance.
+
+Checking the Disable Collisions box and then pressing the Apply button will temporarily disable object-object collisions. You may need to do this in order to travel to the location of a noted &apos;top collider&apos;. Once you have arrived at the location, investigate the object - is it constantly colliding with other objects? You may want to contact the owner of the object or delete or return the object.
+Uncheck the Disable Collisions box and then Apply to reactivate collisions in the region.
+
+Default: off
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Disable Physics"
+   name="HelpRegionDisablePhysics"
+   type="alertmodal">
+Disable Physics is similar to Disable Collisions, except all physics simulation is disabled.  This means that not only will objects stop colliding, but avatars will be unable to move.
+
+This should only be used when Disable Collisions does not give back enough performance to the region to investigate a physics problem or Top Collider.
+
+Be sure to re-enable physics when you are done, or avatars will continue to be unable to move.
+
+Default: off
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Top Colliders"
+   name="HelpRegionTopColliders"
+   type="alertmodal">
+Show a list of objects experiencing the greatest number of potential object-object collisions.  These objects can slow performance.  Select View &gt; Statistics Bar and look under Simulator &gt; Time &gt; Sim Time (Physics) to see if more than 20 ms is being spent in physics.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Top Scripts"
+   name="HelpRegionTopScripts"
+   type="alertmodal">
+Show a list of objects spending the most time running LSL scripts.  These objects can slow performance.
+Select View &gt; Statistics Bar and look under Simulator &gt; Time &gt; Script Time to see if more than 25 ms is being spent in scripts.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Restart Region"
+   name="HelpRegionRestart"
+   type="alertmodal">
+Restart the server process running this region after a two minute warning.  All Residents in the region will be disconnected.  The region will save its data, and should come back up within 90 seconds.
+
+Restarting the region will not fix most performance problems, and should usually be used only when directed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Water Height"
+   name="HelpRegionWaterHeight"
+   type="alertmodal">
+This is the height in meters where water appears. If this setting is anything other than 20 and you have water that is adjacent to the edge of world or &apos;void&apos; water, there will be a visible gap.
+
+Default: 20
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Terrain Raise"
+   name="HelpRegionTerrainRaise"
+   type="alertmodal">
+This is the distance in meters that parcel owners can raise their terrain above the &apos;baked&apos; terrain default height.
+
+Default: 4
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Terrain Lower"
+   name="HelpRegionTerrainLower"
+   type="alertmodal">
+This is the distance in meters that parcel owners can lower their terrain below the &apos;baked&apos; terrain default height.
+
+Default: -4
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Upload RAW Terrain"
+   name="HelpRegionUploadRaw"
+   type="alertmodal">
+This button uploads a .RAW file to the region you are in.
+The file must have the correct dimensions (RGB, 256x256) and 13 channels.  The best way to create a terrain file is to download the existing RAW file.  A good first step is to modify the red channel (land height), and upload it.
+
+The upload can take up to 45 seconds. Note that uploading a terrain file *will not* move the objects that are on the land, only the terrain itself and the permissions associated with the parcels.  This can result in objects going underground.
+
+For more information on editing region height fields, consult F1 Help.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Download RAW Terrain"
+   name="HelpRegionDownloadRaw"
+   type="alertmodal">
+This button downloads a file containing the height field data, parcel dimensions, parcel for sale status and some parcel permissions for this region. When opening the file in a program such as Photoshop you must specify the document&apos;s dimensions which are: RGB, 256x256 with 13 channels. This terrain file cannot be opened in any other way.
+
+For more information on editing region height fields, consult F1 help.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Use Estate Sun"
+   name="HelpRegionUseEstateSun"
+   type="alertmodal">
+This checkbox makes the sun position in this region the same as the sun position in the rest of the estate.
+
+Default: on
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Fixed Sun"
+   name="HelpRegionFixedSun"
+   type="alertmodal">
+This checkbox sets the sun position to the position in the Phase slider and stops the sun from moving.
+
+Default: off
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Bake Terrain"
+   name="HelpRegionBakeTerrain"
+   type="alertmodal">
+This button saves the current shape of the terrain as the new default for the region. Once baked, the land can revert to the saved shape whenever you or others use the Edit Terrain &apos;Revert&apos; option. The baked terrain is also the middle point for the terrain raise and lower limits.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Estate Managers"
+   name="HelpEstateEstateManager"
+   type="alertmodal">
+An estate manager is a Resident to whom you have delegated control of region and estate settings.  An estate manager can change any setting in these panels, except for uploading, downloading, and baking terrain.  In particular, they can allow or ban Residents from your estate.
+
+Estate managers can only be added or removed by the owner of the estate, not by each other.  Please only choose Residents you trust as estate managers, as you will be ultimately responsible for their actions.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Use Global Time"
+   name="HelpEstateUseGlobalTime"
+   type="alertmodal">
+This checkbox makes the sun in your estate follow the same position as on the Governance-owned &apos;mainland&apos; estates.
+
+Default: on
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Fixed Sun"
+   name="HelpEstateFixedSun"
+   type="alertmodal">
+This checkbox sets the sun position to the position in the Phase slider and stops the sun from moving.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Public Access"
+   name="HelpEstateExternallyVisible"
+   type="alertmodal">
+This checkbox sets whether Residents who are on other estates can enter this estate without being on an access list.
+
+Default: on
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Allow Direct Teleport"
+   name="HelpEstateAllowDirectTeleport"
+   type="alertmodal">
+When checked, allows Residents to directly teleport to any point in your estate.  When unchecked, Residents teleport to the nearest telehub.
+
+Default: off
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Allow Access"
+   name="HelpEstateAllowResident"
+   type="alertmodal">
+Access to this estate will be limited to Residents listed here and any groups below.  This setting is only available when Public Access is unchecked.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Allow Group Access"
+   name="HelpEstateAllowGroup"
+   type="alertmodal">
+Access to this estate will be limited to groups listed here and any Residents above.  This setting is only available when Public Access is unchecked.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Abuse Email Address"
+   name="HelpEstateAbuseEmailAddress"
+   type="alertmodal">
+Setting this to a valid email address will cause abuse reports on this estate to be sent to that address.
+Setting it blank will cause abuse reports to be sent only to [SECOND_LIFE].
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Deny Access"
+   name="HelpEstateBanResident"
+   type="alertmodal">
+Residents on this list are denied access to your estate, regardless of any other settings.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Allow Voice Chat"
+   name="HelpEstateVoiceChat"
+   type="alertmodal">
+Parcels in this estate are allowed to have their own voice channels in which residents may hear and talk with others nearby.
+
+Default: off
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Voice Version Mismatch"
+   name="VoiceVersionMismatch"
+   type="alertmodal">
+This version of [APP_NAME] is not compatible with the Voice Chat feature in this region. Please upgrate to the latest version.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Estate Covenant"
+   name="HelpEstateCovenant"
+   type="alertmodal">
+Setting an estate covenant enables you to sell parcels within that estate. If a covenant is not set, you cannot sell the land. The notecard for your covenant can be empty if you do not wish to apply any rules or advise buyers of anything in relation to the land before they buy it.
+
+A covenant can be used to communicate rules, guidelines, cultural information or simply your own expectations to the prospective buyer. This can include zoning, building regulations, payment options or any other information you feel it is important for the new owner to have seen and to have agreed to before they purchase.
+
+The buyer must agree to the covenant by ticking the check box before they will be able to finish the purchase. Estate covenants are always visible in the About Land dialog for any parcels that have one set.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Can&apos;t Buy Objects"
+   name="BuyObjectOneOwner"
+   type="alertmodal">
+Cannot buy objects from different owners at the same time.
+Please select only one object and try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Can&apos;t Buy Contents"
+   name="BuyContentsOneOnly"
+   type="alertmodal">
+Unable to buy the contents of more than one object at a time.
+Please select only one object and try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Can&apos;t Buy Contents"
+   name="BuyContentsOneOwner"
+   type="alertmodal">
+Cannot buy objects from different owners at the same time.
+Please select only one object and try again.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyOriginal"
+   type="alertmodal">
+Buy original object from [OWNER] for [CURRENCY][PRICE]?
+You will become the owner of this object.
+You will be able to:
+ Modify: [MODIFYPERM]
+ Copy: [COPYPERM]
+ Resell or Give Away: [RESELLPERM]
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyOriginalNoOwner"
+   type="alertmodal">
+Buy original object for [CURRENCY][PRICE]?
+You will become the owner of this object.
+You will be able to:
+ Modify: [MODIFYPERM]
+ Copy: [COPYPERM]
+ Resell or Give Away: [RESELLPERM]
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyCopy"
+   type="alertmodal">
+Buy a copy from [OWNER] for [CURRENCY][PRICE]?
+The object will be copied to your inventory.
+You will be able to:
+ Modify: [MODIFYPERM]
+ Copy: [COPYPERM]
+ Resell or Give Away: [RESELLPERM]
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyCopyNoOwner"
+   type="alertmodal">
+Buy a copy for [CURRENCY][PRICE]?
+The object will be copied to your inventory.
+You will be able to:
+ Modify: [MODIFYPERM]
+ Copy: [COPYPERM]
+ Resell or Give Away: [RESELLPERM]
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyContents"
+   type="alertmodal">
+Buy contents from [OWNER] for [CURRENCY][PRICE]?
+They will be copied to your inventory.
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="BuyContentsNoOwner"
+   type="alertmodal">
+Buy contents for [CURRENCY][PRICE]?
+They will be copied to your inventory.
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmPurchase"
+   type="alertmodal">
+This transaction will:
+[ACTION]
+
+Are you sure you want to proceed with this purchase?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmPurchasePassword"
+   type="password">
+This transaction will:
+[ACTION]
+
+Are you sure you want to proceed with this purchase?
+Please re-enter your password and click OK.
+    <form name="form">
+      <input
+       name="message"
+       type="password"/>
+      <button
+       default="true"
+       index="0"
+       name="ConfirmPurchase"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="SetPickLocation"
+   type="alert">
+Note:
+You have updated the location of this pick but the other details will retain their original values.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MoveInventoryFromObject"
+   type="alertmodal">
+You have selected &apos;no copy&apos; inventory items.
+These items will be moved to your inventory, not copied.
+
+Move the inventory item(s)?
+    <usetemplate
+     ignoretext="When moving no-copy inventory from objects"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MoveInventoryFromScriptedObject"
+   type="alertmodal">
+You have selected &apos;no copy&apos; inventory items.  These items will be moved to your inventory, not copied.
+Because this object is scripted, moving these items to your inventory may cause the script to malfunction.
+
+Move the inventory item(s)?
+    <usetemplate
+     ignoretext="When moving no-copy inventory from scripted objects"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="ClickActionNotPayable"
+   type="alert">
+Warning: The Pay Object click action has been set, but it will only work if a script is added with a money() event.
+    <form name="form">
+      <ignore name="ignore"
+       text="When Setting &apos;Pay&apos; on objects without money() events"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PaymentBlockedButtonMismatch"
+   type="alertmodal">
+Payment stopped: the price paid does not match any of the pay buttons set for this object.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="OpenObjectCannotCopy"
+   type="alertmodal">
+There are no items in this object that you are allowed to copy.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WebLaunchAccountHistory"
+   type="alertmodal">
+Go to the [SECOND_LIFE] web site to see your account history?
+    <usetemplate
+     ignoretext="When loading account history web page"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="Go to page"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ClickOpenF1Help"
+   type="alertmodal">
+Visit the [SECOND_LIFE] Support Web site?
+    <usetemplate
+     ignoretext="When visiting the [SECOND_LIFE] Support Website."
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="Go"/>
+  </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="NoSupportUrl"
+   type="alertmodal">
+This grid has no link for support.
+  </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmQuit"
+   type="alertmodal">
+Are you sure you want to quit?
+    <usetemplate
+     ignoretext="When Quitting [APP_NAME]."
+     name="okcancelignore"
+     notext="Continue"
+     yestext="Quit"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpReportAbuseEmailLL"
+   type="alertmodal">
+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 can view the incident resolution on the Incident Report at:
+
+http://secondlife.com/support/incidentreport.php
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpReportAbuseEmailEO"
+   type="alertmodal">
+IMPORTANT: This report will go to the owner of the region you are currently in and not to [GRID_OWNER].
+
+As a service to residents and visitors, the owner of the region you are in has elected to receive and resolve all reports originating in this region. [GRID_OWNER] will not investigate reports you file from this location.
+
+The region owner will resolve reports based on the local rules of this region as outlined in the estate Covenant.
+(View covenants by going to the World menu and selecting About Land.)
+
+The resolution of this report applies only to this Region; Residents access to other areas of the [SECOND_LIFE_GRID] will not be affected by the outcome of this report. Only [GRID_OWNER] can restrict access to the entirety of the [SECOND_LIFE_GRID].
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpReportBug"
+   type="alertmodal">
+Use this tool to *only* report technical features that do not perform as described or expected, please provide as much detail as possible.
+You may reply to the auto-response email to add more details to your report.
+
+All bug reports are investigated and assessed. No email response will be sent.
+
+If you are having a technical difficulty, please contact Support at:
+
+http://secondlife.com/community/support.php
+
+Note: Incomplete reports will not be investigated
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpReportAbuseSelectCategory"
+   type="alertmodal">
+Please select a category for this abuse report.
+Selecting a category helps us file and process abuse reports.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpReportBugSelectCategory"
+   type="alertmodal">
+Please select a category for this bug.
+Selecting a category helps us file and process bug reports.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpReportAbuseAbuserNameEmpty"
+   type="alertmodal">
+Please enter the name of the abuser.
+Entering an accurate value helps us file and process abuse reports.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpReportAbuseAbuserLocationEmpty"
+   type="alertmodal">
+Please enter the location where the abuse took place.
+Entering an accurate value helps us file and process abuse reports.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpReportAbuseSummaryEmpty"
+   type="alertmodal">
+Please enter a summary of the abuse that took place.
+Entering an accurate summary helps us file and process abuse reports.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpReportBugSummaryEmpty"
+   type="alertmodal">
+Please enter a summary of the bug.
+Entering an accurate summary helps us file and process bug reports.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpReportAbuseDetailsEmpty"
+   type="alertmodal">
+Please enter a detailed description of the abuse that took place.
+Be as specific as you can, including names and the details of the incident you are reporting.
+Entering an accurate description helps us file and process abuse reports.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpReportBugDetailsEmpty"
+   type="alertmodal">
+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.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpReportAbuseContainsCopyright"
+   type="alertmodal">
+    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.
+
+    (2) The DMCA or Content Removal Process. To request removal of content from [SECOND_LIFE], you MUST submit a valid notification of infringement as provided in our DMCA Policy.
+
+    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 &apos;CopyBot or Permissions Exploit&apos;.
+
+Thank you,
+
+[GRID_OWNER]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FailedRequirementsCheck"
+   type="alertmodal">
+The following required components are missing from [FLOATER]:
+[COMPONENTS]
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Replace Existing Attachment"
+   name="ReplaceAttachment"
+   type="alert">
+There is already an object attached to this point on your body.
+Do you want to replace it with the selected object?
+    <form name="form">
+      <ignore name="ignore"
+       save_option="true"
+       text="When replacing existing attachments"/>
+      <button
+       default="true"
+       ignore="Replace Automatically"
+       index="0"
+       name="Yes"
+       text="OK"/>
+      <button
+       ignore="Never Replace"
+       index="1"
+       name="No"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   label="Busy Mode Warning"
+   name="BusyModePay"
+   type="alert">
+You are in Busy Mode, which means you will not receive any items offered in exchange for this payment.
+
+Would you like to leave Busy Mode before completing this transaction?
+    <form name="form">
+      <ignore name="ignore"
+       save_option="true"
+       text="When paying a person or object in busy mode"/>
+      <button
+       default="true"
+       ignore="Always leave Busy Mode"
+       index="0"
+       name="Yes"
+       text="OK"/>
+      <button
+       ignore="Never leave Busy Mode"
+       index="1"
+       name="No"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmDeleteProtectedCategory"
+   type="alertmodal">
+The folder &apos;[FOLDERNAME]&apos; is a system folder. Deleting system folders can cause instability.  Are you sure you want to delete it?
+    <usetemplate
+     ignoretext="Confirm before I delete a system folder"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmEmptyTrash"
+   type="alertmodal">
+Are you sure you want to permanently remove the contents of your Trash folder?
+    <usetemplate
+     ignoretext="When emptying your inventory trash folder"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmClearBrowserCache"
+   type="alertmodal">
+Are you sure you want to clear your browser cache?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmClearCookies"
+   type="alertmodal">
+Are you sure you want to clear your cookies?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmClearMediaUrlList"
+   type="alertmodal">
+Are you sure you want to clear your list of saved URLs?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ConfirmEmptyLostAndFound"
+   type="alertmodal">
+Are you sure you want to permanently remove the contents of your Lost And Found folder?
+    <usetemplate
+     ignoretext="When emptying your inventory Lost And Found folder"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="CopySLURL"
+   type="alertmodal">
+The following SLURL has been copied to your clipboard:
+ [SLURL]
+
+Put it in a web page to give others easy access to this location or try it out yourself by pasting it into the address bar of your web browser.
+    <form name="form">
+      <ignore name="ignore"
+       text="When copying a SLURL to your clipboard"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GraphicsPreferencesHelp"
+   type="alertmodal">
+This panel controls window size and resolution and the quality of the client&apos;s graphics.  The Preferences &gt; Graphics interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. You may also customize your graphics settings by checking the Custom checkbox and manipulating the following settings:
+
+Shaders: Enable or disable various types of pixel shaders.
+
+Reflection Detail: Sets the types of objects that water can reflect.
+
+Avatar Rendering: Sets options that affect how the client renders avatars.
+
+Draw Distance: Affects how far out from your viewpoint objects will be rendered in the scene.
+
+Max Particle Count: Sets the maximum number of particles you are able to see on your screen at once.
+
+Post Process Quality: Sets the resolution with which Glow is rendered.
+
+Mesh Detail: Sets the amount of detail or number of triangles used in rendering certain objects. A higher value takes longer to render, but makes these objects appear with more detail.
+
+Lighting Detail: Selects what types of lights you would like to render.
+
+Terrain Detail: Sets the amount of detail you would like to see for the terrain texture.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WLSavePresetAlert"
+   type="alertmodal">
+Do you wish to overwrite the saved preset?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WLDeletePresetAlert"
+   type="alertmodal">
+Do you wish to delete [SKY]?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WLNoEditDefault"
+   type="alertmodal">
+You cannot edit or delete a default preset.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WLMissingSky"
+   type="alertmodal">
+This day cycle file references a missing sky file: [SKY].
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PPSaveEffectAlert"
+   type="alertmodal">
+PostProcess Effect exists. Do you still wish overwrite it?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpEditSky"
+   type="alertmodal">
+Edit the WindLight sliders to create and save a set of skies.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpEditDayCycle"
+   type="alertmodal">
+Set which skies to turn to throughout the day.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="EnvSettingsHelpButton"
+   type="alertmodal">
+These settings adjust the way the environment looks locally on your computer.  Your graphics card needs to support atmospheric shaders in order to have access to all of the settings.
+
+Adjust the &quot;Time of Day&quot; slider to change the day&apos;s phase locally on the viewer.
+
+Adjust the &quot;Cloud Cover&quot; slider to control how much the clouds cover the sky.
+
+Pick a color in the &quot;Water Color&quot; color picker to change the color of the water.
+
+Adjust the &quot;Water Fog&quot; slider to control how dense the fog is underwater.
+
+Click &quot;Use Estate Time&quot; to reset the time of day to the region&apos;s current time of day and remain linked to it.
+
+Click &quot;Advanced Sky&quot; to bring up an editor with more advanced settings for the sky.
+
+Click &quot;Advanced Water&quot; to bring up an editor with more advanced settings for the water.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpDayCycle"
+   type="alertmodal">
+The Day Cycle Editor gives you control over the sky during [SECOND_LIFE]&apos;s day/night cycle. This is the cycle that is used by the Basic Environment Editor&apos;s Time of Day slider.
+
+The Day Cycle Editor works by setting keyframes. These are nodes (represented by the gray blips on the time graph) that have Sky Presets associated with them. As the Time of Day progresses, the WindLight sky &quot;animates&quot; as it interpolates between these keyframes.
+
+The yellow arrow above the timeline represents your current view, based on Time of Day. Click and drag it to see how your day will animate. You may add or delete keyframes by pressing the Add Key and Delete Key buttons to the right of the timeline.
+
+You can set the time position of a keyframe by either dragging it along the timeline, or by setting its value manually in the Key Frame Settings frame. Within the Key Frame Settings frame, you&apos;ll be able to associate the keyframe with its respective WindLight preset.
+
+Length of Cycle dictates the overall duration of a &quot;day&quot;. Setting this to a low value (for instance, 2 min.) will mean your entire 24-hour timeline will animate in only two real minutes! Once you are satisfied with your timeline and keyframe cycle, use the Play and Stop buttons to preview the results. Remember- you can also move the yellow time-indicator arrow above the timeline to see the cycle animate interactively. Using the Use Estate Time button will synchronize your day length and time of day with the Estate&apos;s day cycle.
+
+Once you are pleased with your Day Cycle, you can save and load it with the Save Test Day and Load Test Day buttons. Note that, for now, we only allow one Day Cycle.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpBlueHorizon"
+   type="alertmodal">
+Use the Red/Green/Blue (RGB) sliders to adjust the color of the sky. You can use the Intensity (I) slider to move all three RGB sliders in unison.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpHazeHorizon"
+   type="alertmodal">
+Haze Horizon is one of the most useful parameters for adjusting overall light exposure in the scene.  It is effective for simulating many exposure settings, such as white-outs from the sun and darker, closed-iris settings.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpBlueDensity"
+   type="alertmodal">
+Blue Density affects the overall color saturation of the sky and fog. If you move the Intensity (I) slider to the right, colors will become brighter and more vibrant. If you move it all the way to the left, the colors will become duller, eventually fading to black and white. If you want to fine-tune the sky&apos;s color balance, you can control individual elements of saturation by using the Red/Green/Blue (RGB) sliders.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpHazeDensity"
+   type="alertmodal">
+Haze Density controls the level of dull, gray haze in the atmosphere.  It is effective for simulating scenes with high levels of smoke and man-made pollutants.  It is also effective for simulating fog and mist.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpDensityMult"
+   type="alertmodal">
+The Density Multiplier can be used to affect the overall atmospheric density. At lower settings, it creates a feeling of &quot;thin air&quot;, and at higher settings, it creates a very heavy, smoggy effect.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpDistanceMult"
+   type="alertmodal">
+Adjusts WindLight&apos;s perceived distance.  A value of zero effectively turns off WindLight&apos;s influence on terrain and objects.  Values greater than 1 simulate greater distances for thicker atmospheric effects.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpMaxAltitude"
+   type="alertmodal">
+Max Altitude adjusts the altitude calculations WindLight performs when computing its atmospheric lighting.  At later times of day, it is useful for adjusting how &quot;deep&quot; the sunset appears.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpSunlightColor"
+   type="alertmodal">
+Adjusts the color and intensity of the direct light in the scene.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpSunAmbient"
+   type="alertmodal">
+Adjusts the color and intensity of ambient atmospheric light in the scene.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpSunGlow"
+   type="alertmodal">
+The Size slider controls the size of the sun.
+The Focus slider controls how blurred the sun is over the sky.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpSceneGamma"
+   type="alertmodal">
+Adjust the screen&apos;s distribution of light and dark.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpStarBrightness"
+   type="alertmodal">
+Adjusts the brightness of the stars in the sky.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpTimeOfDay"
+   type="alertmodal">
+Controls the location of the sun in the sky.
+Similar to elevation.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpEastAngle"
+   type="alertmodal">
+Controls the location of the sun in the sky.
+Similar to azimuth.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpCloudColor"
+   type="alertmodal">
+Edits the color of the clouds.  It is generally recommended to keep it whitish, but hey, have fun if you want.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpCloudDetail"
+   type="alertmodal">
+Controls the detail image layered on top of the main cloud image.  X and Y control its position.  D (Density) controls how puffy or fractured the clouds appear.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpCloudDensity"
+   type="alertmodal">
+Allows you to control the position of the clouds with the X and Y sliders and how dense they are with the the D slider.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpCloudCoverage"
+   type="alertmodal">
+Controls how much the clouds cover the sky.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpCloudScale"
+   type="alertmodal">
+Controls the scaling of the cloud image on the sky dome.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpCloudScrollX"
+   type="alertmodal">
+Controls the speed of the clouds as they move in the X direction.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpCloudScrollY"
+   type="alertmodal">
+Controls the speed of the clouds as they move in the Y direction.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpClassicClouds"
+   type="alertmodal">
+Check this box to enable rendering of older classic clouds in addition to WindLight&apos;s clouds.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpWaterFogColor"
+   type="alertmodal">
+Chooses the color of the underwater fog.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpWaterFogDensity"
+   type="alertmodal">
+Controls how dense the water fog is and how far you can see underwater.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpUnderWaterFogMod"
+   type="alertmodal">
+Modifies the effect of the Fog Density Exponent to control how far you can see when your avatar is underwater.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpWaterGlow"
+   type="alertmodal">
+Controls how much the surface of the water glows.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpWaterNormalScale"
+   type="alertmodal">
+Controls the scaling of the three wavelets that make up the water.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpWaterFresnelScale"
+   type="alertmodal">
+Controls how much light is reflected at different angles.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpWaterFresnelOffset"
+   type="alertmodal">
+Controls how much light intensity is reflected.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpWaterScaleAbove"
+   type="alertmodal">
+Controls how much light is refracted from looking above the surface of the water.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpWaterScaleBelow"
+   type="alertmodal">
+Controls how much light is refracted from looking from below the surface of the water.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpWaterBlurMultiplier"
+   type="alertmodal">
+Controls how waves and reflections are mixed.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpWaterNormalMap"
+   type="alertmodal">
+Controls what normal map is layered across the water to determine reflections/refractions.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpWaterWave1"
+   type="alertmodal">
+Controls where and how fast the large scaled version of the normal map moves in the X and Y direction.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpWaterWave2"
+   type="alertmodal">
+Controls where and how fast the the small scaled version of the normal map moves in the X and Y direction.
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="NewSkyPreset"
+   type="alert">
+    Give me a name for the new sky.
+    <form name="form">
+      <input name="message" type="text">
+        New Preset
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ExistsSkyPresetAlert"
+   type="alertmodal">
+    Preset already exists!
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="NewDaycyclePreset"
+   type="alert">
+    Set a name for the new day cycle.
+    <form name="form">
+      <input name="message" type="text">
+        New Day
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ExistsDaycylePresetAlert"
+   type="alertmodal">
+    Preset already exists!
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="NewWaterPreset"
+   type="alert">
+Give me a name for the new water preset.
+    <form name="form">
+      <input name="message" type="text">
+New Preset
+      </input>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="OK"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ExistsWaterPresetAlert"
+   type="alertmodal">
+Preset already exists!
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="WaterNoEditDefault"
+   type="alertmodal">
+You cannot edit or delete a default preset.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ChatterBoxSessionStartError"
+   type="alertmodal">
+Unable to start a new chat session with [RECIPIENT].
+[REASON]
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ChatterBoxSessionEventError"
+   type="alertmodal">
+[EVENT]
+[REASON]
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ForceCloseChatterBoxSession"
+   type="alertmodal">
+Your chat session with [NAME] must close.
+[REASON]
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="Cannot_Purchase_an_Attachment"
+   type="alertmodal">
+Items may not be purchased while they are part of an attachment.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="About Requests for the Debit Permission"
+   name="DebitPermissionDetails"
+   type="alertmodal">
+Granting this request gives a script ongoing permission to take in-world money ([CURRENCY]) from your account. To revoke this permission, the object owner must delete the object or reset the scripts in the object.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AutoWearNewClothing"
+   type="alertmodal">
+Would you like to automatically wear the clothing item you create?
+    <usetemplate
+     ignoretext="Automatically wear new clothing"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="NotAgeVerified"
+   type="alertmodal">
+You need to be age-verified in order to access this parcel.
+Would you like to visit the [SECOND_LIFE] website to verify your age?
+
+[_URL]
+    <url option="0" name="url">
+
+			https://secondlife.com/account/verification.php
+    </url>
+    <usetemplate
+     ignoretext="Warn about lack of age verification"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="Cannot enter parcel: no payment info on file"
+   type="alertmodal">
+This parcel requires that you have payment information on file before you can access it.
+Would you like to visit the [SECOND_LIFE] website to set this up?
+
+[_URL]
+    <url option="0" name="url">
+
+			https://secondlife.com/account/
+    </url>
+    <usetemplate
+     ignoretext="Warn about lack of payment info"
+     name="okcancelignore"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MissingString"
+   type="alertmodal">
+The string [STRING_NAME] is missing from strings.xml
+  </notification>
+  
+  <notification
+   icon="alertmodal.tga"
+   name="GridsNoNick"
+   type="alertmodal">
+Cannot save new grid information.
+You need to specify a unique grid nickname.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GridsNoLoginUri"
+   type="alertmodal">
+Cannot save new grid '[NAME]'.
+You need to specify a login URI.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GridExists"
+   type="alertmodal">
+Cannot save new grid '[NAME]'.
+A grid with the same nickname already exists.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GridInfoNoLoginUri"
+   type="alertmodal">
+A login URI is required to retrieve the grid info.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="GridInfoError"
+   type="alertmodal">
+Cannot retrieve grid info from server.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="HelpRenderCompat"
+   type="alertmodal">
+Builds with extended hollow or extended hole size do not render properly on other viewers. Please keep this option checked, if you want your builds looking properly in other viewers.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ExportFailed"
+   type="alertmodal">
+Bad permissions for the exported object. Export aborted.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="ExportPartial"
+   type="alertmodal">
+Object exported. Some textures could not be saved due to: [REASON]
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="ExportSuccessful"
+   type="notifytip">
+Export successful.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="SystemMessageTip"
+   type="notifytip">
+[MESSAGE]
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="Cancelled"
+   type="notifytip">
+Cancelled
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="CancelledSit"
+   type="notifytip">
+Cancelled Sit
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="CancelledAttach"
+   type="notifytip">
+Cancelled Attach
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="ReplacedMissingWearable"
+   type="notifytip">
+Replaced missing clothing/body part with default.
+  </notification>
+
+  <notification
+   icon="groupnotify"
+   name="GroupNotice"
+   type="groupnotify">
+Topic: [SUBJECT], Message: [MESSAGE]
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="FriendOnline"
+   type="notifytip">
+[NAME] is Online
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="FriendOffline"
+   type="notifytip">
+[NAME] is Offline
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="AddSelfFriend"
+   type="notifytip">
+You cannot add yourself as a friend.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="UploadingAuctionSnapshot"
+   type="notifytip">
+Uploading in-world and web site snapshots...
+(Takes about 5 minutes.)
+  </notification>
+
+<notification
+   icon="notify.tga"
+   name="UploadPayment"
+   type="notify">
+You paid [CURRENCY][AMOUNT] to upload.
+</notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="UploadWebSnapshotDone"
+   type="notifytip">
+Web site snapshot upload done.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="UploadSnapshotDone"
+   type="notifytip">
+In-world snapshot upload done
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="TerrainDownloaded"
+   type="notifytip">
+Terrain.raw downloaded
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="GestureMissing"
+   type="notifytip">
+Gesture [NAME] is missing from database.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="UnableToLoadGesture"
+   type="notifytip">
+Unable to load gesture [NAME].
+Please try again.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="LandmarkMissing"
+   type="notifytip">
+Landmark is missing from database.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="UnableToLoadLandmark"
+   type="notifytip">
+Unable to load landmark.  Please try again.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="CapsKeyOn"
+   type="notifytip">
+Your Caps Lock key is on.
+As this will affect the password you type in, you will probably want to turn it off.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="NotecardMissing"
+   type="notifytip">
+Notecard is missing from database.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="NotecardNoPermissions"
+   type="notifytip">
+Insufficient permissions to view notecard.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="RezItemNoPermissions"
+   type="notifytip">
+Insufficient permissions to rez object.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="UnableToLoadNotecard"
+   type="notifytip">
+Unable to load notecard.
+Please try again.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="ScriptMissing"
+   type="notifytip">
+Script is missing from database.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="ScriptNoPermissions"
+   type="notifytip">
+Insufficient permissions to view script.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="UnableToLoadScript"
+   type="notifytip">
+Unable to load script.  Please try again.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="IncompleteInventory"
+   type="notifytip">
+The complete contents you are offering are not yet locally available. Please try offering those items again in a minute.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="IncompleteInventoryItem"
+   type="notifytip">
+The item you are accessing is not yet locally available. Please try again in a minute.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="CannotModifyProtectedCategories"
+   type="notifytip">
+You cannot modify protected categories.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="CannotRemoveProtectedCategories"
+   type="notifytip">
+You cannot remove protected categories.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="OfferedCard"
+   type="notifytip">
+You have offered a calling card to [NAME]
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="UnableToBuyWhileDownloading"
+   type="notifytip">
+Unable to buy while downloading object data.
+Please try again.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="UnableToLinkWhileDownloading"
+   type="notifytip">
+Unable to link while downloading object data.
+Please try again.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="CannotBuyObjectsFromDifferentOwners"
+   type="notifytip">
+Cannot buy objects from different owners at the same time.
+Please select a single object.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="ObjectNotForSale"
+   type="notifytip">
+Object does not appear to be for sale.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="EnteringGodMode"
+   type="notifytip">
+Entering god mode, level [LEVEL]
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="LeavingGodMode"
+   type="notifytip">
+Leaving god mode, level [LEVEL]
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="CopyFailed"
+   type="notifytip">
+Copy failed because you lack copy permission
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="InventoryAccepted"
+   type="notifytip">
+[NAME] accepted your inventory offer.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="InventoryDeclined"
+   type="notifytip">
+[NAME] declined your inventory offer.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="ObjectMessage"
+   type="notifytip">
+[NAME]: [MESSAGE]
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="CallingCardAccepted"
+   type="notifytip">
+Your calling card was accepted.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="CallingCardDeclined"
+   type="notifytip">
+Your calling card was declined.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="TeleportToLandmark"
+   type="notifytip">
+Now that you have reached the mainland, you can teleport to locations like &apos;[NAME]&apos; by clicking on the Inventory button on the bottom right of your screen, and then select the Landmarks folder.
+Double click on the landmark and click on Teleport to travel there.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="TeleportToPerson"
+   type="notifytip">
+Now that you have reached the mainland, you can contact residents like &apos;[NAME]&apos; by clicking on the Inventory button on the bottom right of your screen, and then select the Calling Cards folder.
+Double click on the card, click on Instant Message, and type a message.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="CantSelectLandFromMultipleRegions"
+   type="notifytip">
+Can&apos;t select land across server boundaries.
+Try selecting a smaller piece of land.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="SearchWordBanned"
+   type="notifytip">
+Some terms in your search query were excluded due to content restrictions as clarified in the Community Standards.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="NoContentToSearch"
+   type="notifytip">
+Please select at least one type of content to search (PG, Mature, or Adult).
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="GroupVote"
+   type="notify">
+[NAME] has proposed to vote on:
+[MESSAGE]
+    <form name="form">
+      <button
+       index="0"
+       name="VoteNow"
+       text="Vote Now"/>
+      <button
+       index="1"
+       name="Later"
+       text="Later"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="SystemMessage"
+   type="notify">
+[MESSAGE]
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="EventNotification"
+   type="notify">
+Event Notification:
+
+[NAME]
+[DATE]
+    <form name="form">
+      <button
+       index="0"
+       name="Teleport"
+       text="Teleport"/>
+      <button
+       index="1"
+       name="Description"
+       text="Description"/>
+      <button
+       index="2"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="TransferObjectsHighlighted"
+   type="notify">
+All objects on this parcel that will transfer to the purchaser of this parcel are now highlighted.
+
+* Trees and grasses that will transfer are not highlighted.
+    <form name="form">
+      <button
+       index="0"
+       name="Done"
+       text="Done"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="DeactivatedGesturesTrigger"
+   type="notify">
+Deactivated gestures with same trigger:
+[NAMES]
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="NoQuickTime"
+   type="notify">
+Apple&apos;s QuickTime software does not appear to be installed on your system.
+If you want to view streaming media on parcels that support it you should go to the QuickTime site (http://www.apple.com/quicktime) and install the QuickTime Player.
+  </notification>
+  <notification
+   icon="notify.tga"
+   name="NoPlugin"
+   type="notify">
+    No Media Plugin was found to handle the "[MIME_TYPE]" mime type.  Media of this type will be unavailable.
+  </notification>
+  <notification
+   icon="alertmodal.tga"
+   name="MediaPluginFailed"
+   type="alertmodal">
+    The following Media Plugin has failed:
+    [PLUGIN]
+
+Please re-install the plugin or contact the vendor if you continue to experience problems.
+    <form name="form">
+      <ignore name="ignore"
+       text="When a Media Plugin fails"/>
+    </form>
+  </notification>
+  <notification
+   icon="notify.tga"
+   name="OwnedObjectsReturned"
+   type="notify">
+The objects you own on the selected parcel of land have been returned back to your inventory.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="OtherObjectsReturned"
+   type="notify">
+The objects on the selected parcel of land that is owned by [NAME] have been returned to his or her inventory.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="OtherObjectsReturned2"
+   type="notify">
+The objects on the selected parcel of land owned by the resident &apos;[NAME]&apos; have been returned to their owner.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="GroupObjectsReturned"
+   type="notify">
+The objects on the selected parcel of land shared with the group [GROUPNAME] have been returned back to their owner&apos;s inventory.
+Transferable deeded objects have been returned to their previous owners.
+Non-transferable objects that are deeded to the group have been deleted.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="UnOwnedObjectsReturned"
+   type="notify">
+The objects on the selected parcel that are NOT owned by you have been returned to their owners.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="NotSafe"
+   type="notify">
+This land has damage enabled (&apos;not safe&apos;).
+You can be hurt here. If you die, you will be teleported to your home location.
+    <unique/>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="NoFly"
+   type="notify">
+This land has flying disabled (&apos;no fly&apos;).
+You cannot fly here.
+    <unique/>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="PushRestricted"
+   type="notify">
+This land is &apos;No Pushing&apos;.
+You cannot push others here unless you own the land.
+    <unique/>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="NoVoice"
+   type="notify">
+This land has voice disabled.
+    <unique/>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="NoBuild"
+   type="notify">
+This land has building disabled (&apos;no build&apos;).
+You cannot create objects here.
+    <unique/>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="ScriptsStopped"
+   type="notify">
+An administrator has temporarily stopped scripts in this region.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="ScriptsNotRunning"
+   type="notify">
+This region is not running any scripts.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="NoOutsideScripts"
+   type="notify">
+This land has outside scripts disabled (&apos;no outside scripts&apos;).
+No scripts will run except those belonging to the land owner.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="ClaimPublicLand"
+   type="notify">
+Can only claim public land in region you&apos;re in.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="RegionTPAccessBlocked"
+   type="notify">
+You aren&apos;t allowed in that Region due to your maturity Rating. You may need to validate your age and/or install the latest Viewer.
+
+Please go to the Knowledge Base for details on accessing areas with this maturity Rating.  
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="URBannedFromRegion"
+	type="notify">
+You are banned from the region.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="NoTeenGridAccess"
+	type="notify">
+Your account cannot connect to this teen grid region.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="NoHelpIslandTP"
+	type="notify">
+You cannot teleport back to Help Island.
+Go to &apos;Help Island Public&apos; to repeat the tutorial.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="ImproperPaymentStatus"
+	type="notify">
+You do not have proper payment status to enter this region.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="MustGetAgeRegion"
+	type="notify">
+You must be age-verified to enter this region.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="MustGetAgeParcel"
+	type="notify">
+You must be age-verified to enter this parcel.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="NoDestRegion"
+	type="notify">
+No destination region found.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="NotAllowedInDest"
+	type="notify">
+You are not allowed into the destination.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="RegionParcelBan"
+	type="notify">
+Cannot region cross into banned parcel. Try another way.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="TelehubRedirect"
+	type="notify">
+You have been redirected to a telehub.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="CouldntTPCloser"
+	type="notify">
+Could not teleport closer to destination.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="TPCancelled"
+	type="notify">
+	Teleport cancelled.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="FullRegionTryAgain"
+	type="notify">
+The region you are attempting to enter is currently full.
+Please try again in a few moments.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="GeneralFailure"
+	type="notify">
+General failure.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="RoutedWrongRegion"
+	type="notify">
+Routed to wrong region. Please try again.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="NoValidAgentID"
+	type="notify">
+No valid agent id.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="NoValidSession"
+	type="notify">
+No valid session id.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="NoValidCircuit"
+	type="notify">
+No valid circuit code.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="NoValidTimestamp"
+	type="notify">
+No valid timestamp.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="NoPendingConnection"
+	type="notify">
+Unable to create pending connection.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="InternalUsherError"
+	type="notify">
+Internal error attempting to connect agent usher.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="NoGoodTPDestination"
+	type="notify">
+Unable to find a good teleport destination in this region.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="InternalErrorRegionResolver"
+	type="notify">
+Internal error attempting to activate region resolver.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="NoValidLanding"
+	type="notify">
+A valid landing point could not be found.
+  </notification>
+
+  <notification
+	icon="notify.tga"
+	name="NoValidParcel"
+	type="notify">
+No valid parcel could be found.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="ObjectGiveItem"
+   type="notify">
+An object named [OBJECTFROMNAME] owned by [NAME] has given you a [OBJECTTYPE] named [OBJECTNAME].
+    <form name="form">
+      <button
+       index="0"
+       name="Keep"
+       text="Keep"/>
+      <button
+       index="1"
+       name="Discard"
+       text="Discard"/>
+      <button
+       index="2"
+       name="Mute"
+       text="Mute"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="ObjectGiveItemUnknownUser"
+   type="notify">
+An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJECTTYPE] named [OBJECTNAME].
+    <form name="form">
+      <button
+       index="0"
+       name="Keep"
+       text="Keep"/>
+      <button
+       index="1"
+       name="Discard"
+       text="Discard"/>
+      <button
+       index="2"
+       name="Mute"
+       text="Mute"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="UserGiveItem"
+   type="notify">
+[NAME] has given you a [OBJECTTYPE] named &apos;[OBJECTNAME]&apos;.
+    <form name="form">
+      <button
+       index="0"
+       name="Keep"
+       text="Keep"/>
+      <button
+       index="1"
+       name="Discard"
+       text="Discard"/>
+      <button
+       index="2"
+       name="Mute"
+       text="Mute"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="GodMessage"
+   type="notify">
+[NAME]
+[MESSAGE]
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="JoinGroup"
+   type="notify">
+[MESSAGE]
+    <form name="form">
+      <button
+       index="0"
+       name="Join"
+       text="Join"/>
+      <button
+       index="1"
+       name="Decline"
+       text="Decline"/>
+      <button
+       index="2"
+       name="Info"
+       text="Info"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="TeleportOffered"
+   type="notify">
+[NAME] has offered to teleport you to his or her location:
+
+[MESSAGE]
+    <form name="form">
+      <button
+       index="0"
+       name="Teleport"
+       text="Teleport"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="GotoURL"
+   type="notify">
+[MESSAGE]
+[URL]
+    <form name="form">
+      <button
+       index="0"
+       name="Later"
+       text="Later"/>
+      <button
+       index="1"
+       name="GoNow..."
+       text="Go Now..."/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="OfferFriendship"
+   type="notify">
+[NAME] is offering friendship.
+
+[MESSAGE]
+
+(By default, you will be able to see each other&apos;s online status.)
+    <form name="form">
+      <button
+       index="0"
+       name="Accept"
+       text="Accept"/>
+      <button
+       index="1"
+       name="Decline"
+       text="Decline"/>
+      <button
+       index="2"
+       name="Ignore"
+       text="Ignore"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="OfferFriendshipNoMessage"
+   type="notify">
+[NAME] is offering friendship.
+
+(By default, you will be able to see each other&apos;s online status.)
+    <form name="form">
+      <button
+       index="0"
+       name="Accept"
+       text="Accept"/>
+      <button
+       index="1"
+       name="Decline"
+       text="Decline"/>
+      <button
+       index="2"
+       name="Ignore"
+       text="Ignore"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FriendshipAccepted"
+   type="notify">
+[NAME] accepted your friendship offer.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FriendshipDeclined"
+   type="notify">
+[NAME] declined your friendship offer.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FriendshipDissolved"
+   type="alertmodal">
+[NAME] dissolved friendship.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="OfferCallingCard"
+   type="notify">
+[NAME] is offering their calling card.
+This will add a bookmark in your inventory so you can quickly IM this resident.
+    <form name="form">
+      <button
+       index="0"
+       name="Accept"
+       text="Accept"/>
+      <button
+       index="1"
+       name="Decline"
+       text="Decline"/>
+      <button
+       index="2"
+       name="Ignore"
+       text="Ignore"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="RegionRestartMinutes"
+   priority="high"
+   sound="UISndAlert"
+   type="notify">
+Region is restarting in [MINUTES] minutes.
+If you remain in this region you will be logged out.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="RegionRestartSeconds"
+   priority="high"
+   sound="UISndAlert"
+   type="notify">
+Region is restarting in [SECONDS] seconds.
+If you remain in this region you will be logged out.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="LoadWebPage"
+   type="notify">
+Load web page [URL]?
+
+[MESSAGE]
+
+From object: [OBJECTNAME], owner: [NAME]?
+    <form name="form">
+      <button
+       index="0"
+       name="Gotopage"
+       text="Go to page"/>
+      <button
+       index="1"
+       name="Cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FailedToFindWearableUnnamed"
+   type="notify">
+Failed to find [TYPE] in database.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FailedToFindWearable"
+   type="notify">
+Failed to find [TYPE] named [DESC] in database.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="InvalidWearable"
+   type="notify">
+    The item you are trying to wear uses a feature that your viewer can&apos;t read. Please consider using the latest [APP_NAME].
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="ScriptQuestion"
+   type="notify">
+&apos;[OBJECTNAME]&apos;, an object owned by &apos;[NAME]&apos;, would like to:
+
+[QUESTIONS]
+Is this OK?
+    <form name="form">
+      <button
+       index="0"
+       name="Yes"
+       text="Yes"/>
+      <button
+       index="1"
+       name="No"
+       text="No"/>
+      <button
+       index="2"
+       name="Mute"
+       text="Mute"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="ScriptQuestionCaution"
+   priority="high"
+   type="notify">
+&apos;[OBJECTNAME]&apos;, an object owned by &apos;[NAME]&apos;, would like to:
+
+[QUESTIONS]
+If you do not trust this object and its creator, you should deny the request. For additional information, click the Details button.
+
+Grant this request?
+    <form name="form">
+      <button
+       index="0"
+       name="Grant"
+       text="Grant"/>
+      <button
+       default="true"
+       index="1"
+       name="Deny"
+       text="Deny"/>
+      <button
+       index="2"
+       name="Details"
+       text="Details..."/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="ScriptDialog"
+   type="notify">
+[NAME]&apos;s &apos;[TITLE]&apos; (ch[CHANNEL])
+[MESSAGE]
+    <form name="form">
+      <button
+       index="-1"
+       name="Ignore"
+       text="Ignore"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="ScriptDialogGroup"
+   type="notify">
+[GROUPNAME]&apos;s &apos;[TITLE]&apos;
+[MESSAGE]
+    <form name="form">
+      <button
+       index="-1"
+       name="Ignore"
+       text="Ignore"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="ScriptTextBoxDialog"
+   type="notify">
+    [NAME]&apos;s &apos;[TITLE]&apos;
+    [MESSAGE]
+    <form name="form">
+      <input name="message">
+      </input>
+      <button
+       index="-1"
+       name="Ignore"
+       text="Ignore"/>
+      <button
+       index="0"
+       name="Send"
+       text="Send"/>
+    </form>
+  </notification>
+  
+
+  <notification
+   icon="notify.tga"
+   name="FirstBalanceIncrease"
+   type="notify">
+You just received [CURRENCY][AMOUNT].
+Objects and other users may give you [CURRENCY].
+Your balance is shown in the upper-right corner of the screen.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FirstBalanceDecrease"
+   type="notify">
+You just paid [CURRENCY][AMOUNT].
+Your balance is shown in the upper-right corner of the screen.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FirstSit"
+   type="notify">
+You are sitting.
+Use the arrow keys (or AWSD) to change the view.
+Click the &apos;Stand Up&apos; button to get up.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FirstMap"
+   type="notify">
+Click and drag to scroll the map.
+Double-click to teleport.
+Use the controls on the right to find things and display different backgrounds.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FirstBuild"
+   type="notify">
+You can build new objects in some areas of [SECOND_LIFE].
+Use the tools in the upper left to build, and try holding down Ctrl or Alt to rapidly switch tools.
+Press Esc to stop building.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FirstLeftClickNoHit"
+   type="notify">
+Left-clicking interacts with special objects.
+If the mouse pointer changes to a hand, you can interact with the object.
+Right-click always shows a menu of things you can do.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FirstTeleport"
+   type="notify">
+This region doesn&apos;t allow point-to-point teleports, so you&apos;ve been transported to the nearest telehub.
+Your destination is marked with a tall beacon.
+Follow the red arrow to the beacon, or click the arrow to dismiss the beacon.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FirstOverrideKeys"
+   type="notify">
+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.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FirstAppearance"
+   type="notify">
+You are editing your appearance.
+To rotate and zoom view, use the arrow keys.
+When you are finished, press &apos;Save All&apos; to save your look and exit.
+You can edit your appearance as often as you like.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FirstInventory"
+   type="notify">
+This is your inventory, which contains objects, notecards, clothing, and other things you own.
+* To wear an object or outfit folder, drag it onto yourself.
+* To bring an object into the world, drag it onto the ground.
+* To read a notecard, double-click it.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FirstSandbox"
+   type="notify">
+This is a sandbox region.
+Objects you build here may be deleted after you leave the area, Sandboxes clean on a regular basis, please refer to the information at the top of the screen next to the region name.
+
+Sandbox regions are uncommon, and are marked with signs.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FirstFlexible"
+   type="notify">
+This object is flexible.
+Flexible objects may not be physical and must be phantom until the flexible checkbox is unchecked.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FirstDebugMenus"
+   type="notify">
+You have enabled the Advanced menu.
+This menu contains features useful for developers debugging [APP_NAME].
+To toggle this menu on Windows press Ctrl-Alt-D. On Mac press Cmd-Opt-Shift-D.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FirstSculptedPrim"
+   type="notify">
+You are editing a sculpted prim.
+Sculpted prims require a special texture to specify their shape.
+You can find example sculpted textures in the inventory library.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FirstMedia"
+   type="notify">
+You have begun playing media.  Media can set to play automatically in the preferences window under Audio / Video. Note that this can be a security risk for media sites you do not trust.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FirstRLVDetach"
+   type="notify">
+One of your attachments was made nondetachable using Restrained Life.
+Please note that this also disables the &apos;Wear&apos; option on all prim attachments in your inventory unless they are properly named.
+
+For more information search for &apos;Restrained Life&apos; on the SL wiki.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FirstRLVFartouch"
+   type="notify">
+You have been fartouch restricted: you will be unable to touch objects farther than 1.5m from your avatar until the restriction is lifted.
+
+Tip: if an object is out of range the mouse cursor will not change as you hover over it and you'll hear an error sound if you try to right-click it.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="FirstRLVGiveToRLV"
+   type="alertmodal">
+Folders starting with &apos;#RLV/~&apos; can automatically be placed under your #RLV shared folder after you accept the inventory offer.
+
+Please note that - if enabled - the accepted inventory items will instantly be available to scripts and will have full use of the RLV API which may cause unexpected or undesirable situations.
+
+Do you want to enable this feature?
+    <usetemplate
+     name="okcancelbuttonscanceldefault"
+     notext="No"
+     yestext="Yes"/>
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="MaxListSelectMessage"
+   type="notifytip">
+You may only select up to [MAX_SELECT] items from this list.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="VoiceInviteP2P"
+   type="notify">
+[NAME] is inviting you to a Voice Chat call.
+Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this caller.
+    <unique>
+      <context key="NAME"/>
+    </unique>
+    <form name="form">
+      <button
+       index="0"
+       name="Accept"
+       text="Accept"/>
+      <button
+       index="1"
+       name="Decline"
+       text="Decline"/>
+      <button
+       index="2"
+       name="Mute"
+       text="Mute"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="AutoUnmuteByIM"
+   type="notify">
+[NAME] was sent an instant message and has been automatically unmuted.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="AutoUnmuteByMoney"
+   type="notify">
+[NAME] was given money and has been automatically unmuted.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="AutoUnmuteByInventory"
+   type="notify">
+[NAME] was offered inventory and has been automatically unmuted.
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="VoiceInviteGroup"
+   type="notify">
+[NAME] has joined a Voice Chat call with the group [GROUP].
+Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this caller.
+    <unique>
+      <context key="NAME"/>
+      <context key="GROUP"/>
+    </unique>
+    <form name="form">
+      <button
+       index="0"
+       name="Accept"
+       text="Accept"/>
+      <button
+       index="1"
+       name="Decline"
+       text="Decline"/>
+      <button
+       index="2"
+       name="Mute"
+       text="Mute"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="VoiceInviteAdHoc"
+   type="notify">
+[NAME] has joined a Voice Chat call with a conference chat...
+Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this user.
+    <unique>
+      <context key="NAME"/>
+    </unique>
+    <form name="form">
+      <button
+       index="0"
+       name="Accept"
+       text="Accept"/>
+      <button
+       index="1"
+       name="Decline"
+       text="Decline"/>
+      <button
+       index="2"
+       name="Mute"
+       text="Mute"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="InviteAdHoc"
+   type="notify">
+[NAME] is inviting you to a conference chat.
+Click Accept to join the chat or Decline to decline the invitation. Click Mute to mute this user.
+    <unique>
+      <context key="NAME"/>
+    </unique>
+    <form name="form">
+      <button
+       index="0"
+       name="Accept"
+       text="Accept"/>
+      <button
+       index="1"
+       name="Decline"
+       text="Decline"/>
+      <button
+       index="2"
+       name="Mute"
+       text="Mute"/>
+    </form>
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="VoiceChannelFull"
+   type="notifytip">
+The voice call you are trying to join, [VOICE_CHANNEL_NAME], has reached maximum capacity. Please try again later.
+    <unique>
+      <context key="VOICE_CHANNEL_NAME"/>
+    </unique>
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="ProximalVoiceChannelFull"
+   type="notifytip">
+We&apos;re sorry.  This area has reached maximum capacity for voice conversations.  Please try to use voice in another area.
+    <unique/>
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="VoiceChannelDisconnected"
+   type="notifytip">
+You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnected to spatial voice chat.
+    <unique>
+      <context key="VOICE_CHANNEL_NAME"/>
+    </unique>
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="VoiceChannelDisconnectedP2P"
+   type="notifytip">
+[VOICE_CHANNEL_NAME] has ended the call.  You will now be reconnected to spatial voice chat.
+    <unique>
+      <context key="VOICE_CHANNEL_NAME"/>
+    </unique>
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="P2PCallDeclined"
+   type="notifytip">
+[VOICE_CHANNEL_NAME] has declined your call.  You will now be reconnected to spatial voice chat.
+    <unique>
+      <context key="VOICE_CHANNEL_NAME"/>
+    </unique>
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="P2PCallNoAnswer"
+   type="notifytip">
+[VOICE_CHANNEL_NAME] is not available to take your call.  You will now be reconnected to spatial voice chat.
+    <unique>
+      <context key="VOICE_CHANNEL_NAME"/>
+    </unique>
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="VoiceChannelJoinFailed"
+   type="notifytip">
+Failed to connect to [VOICE_CHANNEL_NAME], please try again later.  You will now be reconnected to spatial voice chat.
+    <unique>
+      <context key="VOICE_CHANNEL_NAME"/>
+    </unique>
+  </notification>
+
+  <notification
+   duration="10"
+   icon="notifytip.tga"
+   name="VoiceLoginRetry"
+   type="notifytip">
+We are creating a voice channel for you. This may take up to one minute.
+    <unique/>
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="Cannot enter parcel: not a group member"
+   type="notifytip">
+Cannot enter parcel, you are not a member of the appropriate group.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="Cannot enter parcel: banned"
+   type="notifytip">
+Cannot enter parcel, you have been banned.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="Cannot enter parcel: not on access list"
+   type="notifytip">
+Cannot enter parcel, you are not on the access list.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="VoiceNotAllowed"
+   type="notifytip">
+You do not have permission to connect to voice chat for [VOICE_CHANNEL_NAME].
+    <unique>
+      <context key="VOICE_CHANNEL_NAME"/>
+    </unique>
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="VoiceCallGenericError"
+   type="notifytip">
+An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_NAME].  Please try again later.
+    <unique>
+      <context key="VOICE_CHANNEL_NAME"/>
+    </unique>
+  </notification>
+
+  <notification
+   duration="10"
+   icon="notifytip.tga"
+   name="ServerVersionChanged"
+   priority="high"
+   type="notifytip">
+The region you have entered is running a different simulator version. Click this message for details.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="UnableToOpenCommandURL"
+   priority="high"
+   type="notifytip">
+The URL you clicked cannot be opened from this web browser.
+  </notification>
+
+  <notification
+    name="RegionCapabilityRequestError"
+    icon="alert.tga"
+    type="alert">
+    Could not get region capability &apos;[CAPABILITY]&apos;.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="AvatarRezNotification"
+   type="notifytip">
+( [EXISTENCE] seconds alive )
+Avatar '[NAME]' declouded after [TIME] seconds.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="AvatarRezSelfBakedDoneNotification"
+   type="notifytip">
+( [EXISTENCE] seconds alive )
+You finished baking your outfit after [TIME] seconds.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="AvatarRezSelfBakedUpdateNotification"
+   type="notifytip">
+( [EXISTENCE] seconds alive )
+You sent out an update of your appearance after [TIME] seconds.
+[STATUS]
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="AvatarRezCloudNotification"
+   type="notifytip">
+( [EXISTENCE] seconds alive )
+Avatar '[NAME]' became cloud.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="AvatarRezArrivedNotification"
+   type="notifytip">
+( [EXISTENCE] seconds alive )
+Avatar '[NAME]' appeared.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="AvatarRezLeftCloudNotification"
+   type="notifytip">
+( [EXISTENCE] seconds alive )
+Avatar '[NAME]' left after [TIME] seconds as cloud.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="AvatarRezEnteredAppearanceNotification"
+   type="notifytip">
+( [EXISTENCE] seconds alive )
+Avatar '[NAME]' entered appearance mode.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="AvatarRezLeftAppearanceNotification"
+   type="notifytip">
+( [EXISTENCE] seconds alive )
+Avatar '[NAME]' left appearance mode.
+  </notification>
+  <notification
+   icon="notifytip.tga"
+   name="AvatarRezLeftNotification"
+   type="notifytip">
+( [EXISTENCE] seconds alive )
+Avatar '[NAME]' left as fully loaded.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="AvatarRezSelfBakedTextureUploadNotification"
+   type="notifytip">
+( [EXISTENCE] seconds alive )
+You uploaded a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds.
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="AvatarRezSelfBakedTextureUpdateNotification"
+   type="notifytip">
+( [EXISTENCE] seconds alive )
+You locally updated a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds.
+  </notification>
+
+  <global name="UnsupportedCPU">
+- Your CPU speed does not meet the minimum requirements.
+  </global>
+
+  <global name="UnsupportedGLRequirements">
+    You do not appear to have the proper hardware requirements for [APP_NAME]. The viewer requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
+  </global>
+
+  <global name="UnsupportedCPUSSE2">
+    You do not appear to have the proper hardware requirements for [APP_NAME]. The viewer requires a CPU that supports SSE2
+  </global>
+  
+  <global name="UnsupportedCPUSSE">
+    You do not appear to have the proper hardware requirements for [APP_NAME]. The viewer requires a CPU that supports SSE
+  </global>
+  
+  <global name="UnsupportedCPUAmount">
+796
+  </global>
+
+  <global name="UnsupportedRAMAmount">
+510
+  </global>
+
+  <global name="UnsupportedGPU">
+- Your graphics card does not meet the minimum requirements.
+  </global>
+
+  <global name="UnsupportedRAM">
+- Your system memory does not meet the minimum requirements.
+  </global>
+
+  <global name="PermYes">
+Yes
+  </global>
+
+  <global name="PermNo">
+No
+  </global>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameSuccess"
+   type="alert">
+    Hi [DISPLAY_NAME]!
+
+    Just like in real life, it takes a while for everyone to learn about a new name.  Please allow several days for [http://wiki.secondlife.com/wiki/Setting_your_display_name your name to update] in objects, scripts, search, etc.
+  </notification>
+
+  <notification
+ icon="alertmodal.tga"
+ name="SetDisplayNameBlocked"
+ type="alert">
+    Sorry, you cannot change your display name. If you feel this is in error, please contact support.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameFailedLength"
+   type="alertmodal">
+    Sorry, that name is too long.  Display names can have a maximum of [LENGTH] characters.
+
+    Please try a shorter name.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameFailedGeneric"
+   type="alertmodal">
+    Sorry, we could not set your display name.  Please try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameMismatch"
+   type="alertmodal">
+    The display names you entered do not match. Please re-enter.
+  </notification>
+
+  <!-- *NOTE: This should never happen -->
+  <notification
+   icon="alertmodal.tga"
+   name="AgentDisplayNameUpdateThresholdExceeded"
+   type="alertmodal">
+    Sorry, you have to wait longer before you can change your display name.
+
+    See http://wiki.secondlife.com/wiki/Setting_your_display_name
+
+    Please try again later.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AgentDisplayNameSetBlocked"
+   type="alertmodal">
+    Sorry, we could not set your requested name because it contains a banned word.
+
+    Please try a different name.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+ name="AgentDisplayNameSetInvalidUnicode"
+ type="alertmodal">
+    The display name you wish to set contains invalid characters.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+ name="AgentDisplayNameSetOnlyPunctuation"
+ type="alertmodal">
+    Your display name must contain letters other than punctuation.
+  </notification>
+
+  <notification
+ icon="notifytip.tga"
+ name="DisplayNameUpdate"
+ type="notifytip">
+    [OLD_NAME] ([SLID]) is now known as [NEW_NAME].
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="FirstAO"
+   type="notify">
+    For instructions, make a new template in the AO. Use the toolbar to toggle the AO on/off.
+  </notification>
+
+  <notification icon="notifytip.tga" name="BlockedCards" type="notifytip">Blocked calling cards from [NAME] ([SOURCE])</notification>
+  <notification icon="notifytip.tga" name="BlockedDialogs" type="notifytip">Blocking all dialogs from [NAME]'s objects. (Origin: [SOURCE])</notification>
+  <notification icon="notifytip.tga" name="BlockedGeneralAvatar" type="notifytip">Blocked spam from avatar [NAME] ([SOURCE])</notification>
+  <notification icon="notifytip.tga" name="BlockedGeneralObjects" type="notifytip">Blocked spam from objects owned by [OWNER] ([SOURCE])</notification>
+  <notification icon="notifytip.tga" name="BlockedChatterAvatar" type="notifytip">Blocked chat-spam from avatar [NAME] ([SOURCE])</notification>
+  <notification icon="notifytip.tga" name="BlockedChatterObjects" type="notifytip">Blocked chat-spam from objects owned by [OWNER] ([SOURCE])</notification>
+
+  <notification
+ icon="notify.tga"
+ name="FirstPhysicsWearable"
+ priority="high"
+ type="notify">
+By wearing a Physics Wearable certain server behavior will be enabled that many older viewers are incompatable with. On such viewers you may display incorrectly (often as 'Ruth').
+
+If you wish to keep compatability with old viewers then you must not wear a Physics Wearable during your session. If you have already worn one during this session remove it and reconnect.
+
+Click 'Wear' to attach the Physics Wearable, or click 'Cancel' if you wish to maintain compatability with legacy clients.
+    <unique/>
+    <form name="form">
+    <button
+     index="0"
+     name="Wear"
+     text="Wear"/>
+    <button
+     index="1"
+     name="Cancel"
+     text="Cancel"/>
+  </form>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="SGIncompleteAppearance"
+   type="alert">
+Sending incomplete appearance. You may appear to others as a cloud.
+
+Your shape, skin, hair or eyes might be defect.
+	<usetemplate
+	 name="okbutton"
+	 yestext="OK"/>
+  </notification>
+
+  <notification
+  icon="alertmodal.tga"
+  label="All settings reset"
+  name="ResetSettingsComplete"
+  type="alertmodal">
+    Settings have been reset. You should relog to ensure this takes full effect.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Reset all settings"
+   name="ResetSystemSettingsPrompt"
+   type="alertmodal">
+    Resetting all settings may be helpful if you are experiencing problems; however, you will need to redo any changes you have made to the default configuration.
+
+    Would you like to reset system settings?
+    <form>
+      <button
+       index="0"
+       name="all"
+       text="OK"/>
+      <button
+       default="true"
+       index="3"
+       name="cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+
+  <notification
+    icon="alertmodal.tga"
+    label="Reset all settings"
+    name="ResetAllSettingsPrompt"
+    type="alertmodal">
+    Resetting all settings may be helpful if you are experiencing problems; however, you will need to redo any changes you have made to the default configuration.
+
+    Which settings would you like to reset?
+    <form>
+      <button
+       index="0"
+       name="all"
+       text="ALL"/>
+      <button
+       index="1"
+       name="system"
+       text="System"/>
+      <button
+       index="2"
+       name="user"
+       text="User"/>
+      <button
+       default="true"
+       index="3"
+       name="cancel"
+       text="Cancel"/>
+    </form>
+  </notification>
+
+
+</notifications>
+
diff --git a/indra/newview/skins/default/xui/es/notify.xml b/indra/newview/skins/default/xui/es/notify.xml
new file mode 100644
index 000000000..969117f31
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/notify.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<notifications>
+</notifications>
+<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/panel_ao_remote.xml b/indra/newview/skins/default/xui/es/panel_ao_remote.xml
new file mode 100644
index 000000000..3af6d04a6
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_ao_remote.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="ao_remote">
+	  <panel name="panel_bg_tab"/>
+	  <panel name="panel_ao_controls"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_ao_remote_controls.xml b/indra/newview/skins/default/xui/es/panel_ao_remote_controls.xml
new file mode 100644
index 000000000..1699da26d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_ao_remote_controls.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="ao_controls">
+	  <button label="AO Off" label_selected="AO On" name="ao_btn" tool_tip="Pulsa aquí para activar/desactivar el AO" />
+	  <button label="" name="popup_btn" tool_tip="Pulsa aquí para más opciones" />
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_ao_remote_expanded.xml b/indra/newview/skins/default/xui/es/panel_ao_remote_expanded.xml
new file mode 100644
index 000000000..e96946101
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_ao_remote_expanded.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="ao_remote">
+	  <panel name="panel_bg_tab"/>
+	  <button label="AO Sits Off" label_selected="AO Sits On" name="ao_sit_btn"/>
+	  <panel name="panel_ao_controls"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_audio.xml b/indra/newview/skins/default/xui/es/panel_audio.xml
new file mode 100644
index 000000000..27f4b7c96
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_audio.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Audio y  Video" name="Media panel">
+	  <slider label="Maestro" name="System Volume"/>
+	  <button label="" name="mute_audio"/> 
+	  <slider label="Música" name="Music Volume"/>
+	  <button label="" name="mute_music"/>
+	  <slider label="Media" name="Media Volume"/>
+	  <button label="" name="mute_media"/>
+	  <slider label="Voz" name="Voice Volume"/>
+	  <button label="" name="mute_voice"/>
+	  <slider label="Sonidos" name="SFX Volume"/>
+	  <button label="" name="mute_sfx"/>
+	  <slider label="Ambiente" name="Wind Volume"/>
+	  <button label="" name="mute_wind"/>
+	  <slider label="UI" name="UI Volume"/>
+	  <button label="" name="mute_ui"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_audio_device.xml b/indra/newview/skins/default/xui/es/panel_audio_device.xml
new file mode 100644
index 000000000..42dc2079a
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_audio_device.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="device_settings">
+	  <text name="Audio Devices">
+			 Dispositivos de Audio
+	  </text>
+	  <text name="Input device (microphone):">
+			 Dispostitivo de Entrada (micrófono):
+	  </text>
+	  <combo_box name="voice_input_device"/>
+	  <text name="Output device (speakers):">
+			 Dospositiv o de Salida (parlantes):
+	  </text>
+	  <combo_box name="voice_output_device"/>
+	  <text name="Input level:">
+			 Nivel de Entrada
+	  </text>
+	  <text_editor name="voice_intro_text1">
+			 Ajusta el control deslizante para variar el volumen en que te escucharán los otros residentes. Para probar el nivel de entrada, simplemente habla en tu micrófono.
+	  </text_editor>
+	  <volume_slider name="mic_volume_slider" tool_tip="Cambia el volumen usando este control deslizante" />
+	  <text name="wait_text">
+			 Espera por favor
+	  </text>
+	  <string name="default_text">
+			 Por defecto
+	  </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_avatar.xml b/indra/newview/skins/default/xui/es/panel_avatar.xml
new file mode 100644
index 000000000..8808d6620
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_avatar.xml
@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="Panel Avatar">
+	  <tab_container name="tab">
+			 <panel label="2º Vida" name="2nd Life">
+					<string name="CaptionTextAcctInfo">
+						  [ACCTTYPE]
+[PAYMENTINFO]
+[AGEVERIFICATION]
+					</string>
+					<string name="AcctTypeResident">
+						  Residente
+					</string>
+					<string name="AcctTypeTrial">
+						  Prueba
+					</string>
+					<string name="AcctTypeCharterMember">
+						  Miembro Fundador
+					</string>
+					<string name="AcctTypeEmployee">
+						  Empleado de Linden Lab
+					</string>
+					<string name="PaymentInfoUsed">
+						  Información de Pago utilizada
+					</string>
+					<string name="PaymentInfoOnFile">
+						  Información de Pago en Archivo
+					</string>
+					<string name="NoPaymentInfoOnFile">
+						  Sin Información de Pago
+					</string>
+					<string name="AgeVerified">
+						  Edad Verificada
+					</string>
+					<string name="NotAgeVerified">
+						  Edad No Verificada
+					</string>
+					<text name="Key:">
+						  Key:
+					</text>
+					<name_editor name="avatar_key"/>
+					<button label="Copiar" tool_tip="Copyiar key al portapapeles" name="copy_key"/>
+					<text name="Name:" >
+						  Nombre:
+					</text>
+					<name_editor name="name"/>
+					<line_editor name="dnname" />
+					<text name="online_yes">
+						  En Línea
+					</text>
+					<text name="label">
+						  Nacido:
+					</text>
+					<line_editor name="born"/>
+					<text name="label2">
+						  Cuenta:
+					</text>
+					<view_border name="acct_border"/>
+					<text name="acct"/>
+					<text name="partner_label" tool_tip="Compañera/o en Second Life. Para más información ver www.secondlife.com/partner">
+						  Compañera/o:
+					</text>
+					<button label="i" label_selected="i" name="partner_info" tool_tip="Pulsa para abrir el Perfil del Compañero/a" left_delta="75"/>
+					<button label="?" label_selected="?" name="partner_help"/>
+					<line_editor name="partner_edit" tool_tip="Comapañera/o en Second Life partner. Para más información ver www.secondlife.com/partner">
+						  [NAME]
+					</line_editor>
+					<text name="Photo:">
+						  Foto:
+					</text>
+					<texture_picker label="" name="img" tool_tip="Pulsa aquí para seleccionar una foto" />
+					<button label="" name="bigimg"/>
+					<text name="Groups:">
+						  Grupos:
+					</text>
+					<scroll_list name="groups"/>
+					<text name="About:">
+						  Sobre mi:
+					</text>
+					<text name="(500 chars)">
+						  (500 caracts)	
+					</text>
+					<text_editor name="about" />
+					<text name="Give item:">
+						  Dar un Item:
+					</text>
+					<view_border name="drop_target_rect"/>
+					<view_border name="drop_target_rect_vis"/>
+					<text name="Give inventory" tool_tip="Arrastra hasta aquí items de tu inventario para dárselos a este usuario">
+						  Arrastra hastsa aquí un ítem del inventario.
+					</text>
+					<check_box label="Mostrar en la Búsqueda" name="allow_publish" tool_tip="Publicar información del Perfil en la búsqueda."/>
+					<button label="?" label_selected="?" name="?"/>
+					<button label="Localizar en el Mapa" label_selected="Localizar en el Mapa" name="Find on Map" left="10" width="135"/>
+					<button label="Ofrecer Teleporte" label_selected="Ofrecer Teleporte" name="Offer Teleport..." left_delta="143" width="120"/>
+					<button label="Añadir como Amigo" label_selected="Añadir como Amigo" name="Add Friend..." left_delta="129" />
+					<button label="Pagar..." label_selected="Pagar..." name="Pay..." left="10"/>
+					<button label="Mensaje Instantáneo" label_selected="Mensaje Instantáneo" name="Instant Message..." tool_tip="Mensaje Instantáneo (IM)" left_delta="78"/>
+					<button label="Ignorar" label_selected="Ignorar" name="Mute" left_delta="148"/>
+					<button label="Invitar al Grupo" label_selected="Invitar al Grupo" name="GroupInvite_Button" left_delta="68" width="110"/>
+			 </panel>
+			 <!-- Panel Perfil Web -->
+			 <panel label="Web" name="WebProfile" width="400"> 
+					<line_editor name="url_edit"/>
+					<flyout_button label="Cargar" label_selected="Cargar" name="load" tool_tip="Cargar este perfil con el navegador incorporado" >
+						  <flyout_button_item value="open" name="open_item">En navegador externo</flyout_button_item>
+						  <flyout_button_item value="home" name="home_item">Inicio</flyout_button_item>
+					</flyout_button>
+					<button label="?" label_selected="?" name="web_profile_help" />
+					<check_box label="Cargar Pefil Web Automáticamente" tool_tip="Carga Automáticamente todos los perfiles web."/>
+					<web_browser name="profile_html" start_url="" />
+					<text name="status_text" />
+			 </panel>
+			 <!-- Panel Intereses -->
+			 <panel label="Intereses" name="Interests">
+					<text name="I Want To:">
+						  Quiero:
+					</text>
+					<check_box label="Construir" name="chk0"/>
+					<check_box label="Explorar" name="chk1"/>
+					<check_box label="Conocer Gente" name="chk2"/>
+					<check_box label="Ser Contratado" name="chk6"/>
+					<check_box label="Estar en un Grupo" name="chk3"/>
+					<check_box label="Comprar" name="chk4" />
+					<check_box label="Vender" name="chk5"/>
+					<check_box label="Contratar" name="chk7"/>
+					<line_editor name="want_to_edit" />
+					<text name="Skills:">
+						  Habilidades:
+					</text>
+					<check_box label="Texturas" name="schk0"/>
+					<check_box label="Arquitectura" name="schk1"/>
+					<check_box label="Programar Eventos" name="schk2"/>					
+					<check_box label="Modelaje" name="schk3"/>					
+					<check_box label="Programación" name="schk4"/>
+					<check_box label="Caracterizar Personajes" name="schk5"/>
+					<line_editor name="skills_edit"/>
+					<text name="Languages:">
+						  Idiomas:	
+					</text>
+					<line_editor name="languages_edit"/>
+			 </panel>
+			 <!-- Panel Destacados -->
+			 <panel label="Destacados" name="Picks">
+					<text name="Tell everyone about your favorite places in Second Life.">
+						  Muestra a los demás tus lugares favoritos en Second Life.
+					</text>
+					<button label="Nuevo..." label_selected="Nuevo..." name="New..."/>
+					<button label="Borrar..." label_selected="Borrar..." name="Delete..."/>
+					<!-- <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
+						  label="Import..." label_selected="Import..." left_delta="74"
+						  mouse_opaque="true" name="Import..." width="70" />
+						  <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
+						  label="Export..." label_selected="Export..." left_delta="74"
+						  mouse_opaque="true" name="Export..." width="70" />-->
+					<tab_container name="picks tab" />
+					<text name="loading_text">
+						  Cargando...
+					</text>
+			 </panel>
+			 <!-- Panel Clasificados -->
+			 <panel label="Clasificados" name="Classified">
+					<text name="Place an ad in Second Life&apos;s classified listings.">
+						  Pon tu anuncio en los Clasificados de Second Life.
+					</text>
+					<button label="Nuevo..." label_selected="Nuevo..." name="New..."/>
+					<button label="Borrar..." label_selected="Borrar..." name="Delete..."/>
+					<tab_container name="classified tab"/>
+					<text name="loading_text">
+						  Cargando...
+					</text>
+			 </panel>
+			 <!-- Panel Primera Vida -->
+			 <panel label="1º Vida" name="1st Life">
+					<text name="Photo:">
+						  Foto:
+					</text>
+					<texture_picker label="" name="img" tool_tip="Pulsa aquí para elegir una foto" />
+					<button label="" name="flbigimg"/>
+					<text name="Info:">
+						  Información:
+					</text>
+					<text name="(250 chars)">
+						  (250 characts)
+					</text>
+					<text_editor name="about"/>
+			 </panel>
+			 <!-- Panel Mis Notas -->
+			 <panel label="Mis Notas" name="My Notes">
+					<string name="Loading">
+						  Cargando...
+					</string>
+					<text name="label">
+						  Usa este espacio para escribir tus notas acerca de esta persona. Lleva un
+seguimiento del progreso de sus empresas, comparte proyectos, etc. Sólo tu
+puedes ver estas notas. Ni esta persona ni ninguna otra pueden verlas.					
+					</text>
+					<text_editor name="notes edit"  />
+			 </panel>
+	  </tab_container>
+	  <!-- Botones Generales del Panel -->
+	  <button label="OK" label_selected="OK" name="OK"/>
+	  <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	  <button label="Expulsar" label_selected="Expulsar" name="Kick"/>
+	  <button label="Congelar" label_selected="Congelar" name="Freeze" tool_tip="Detener el movimiento y el chat de este residente" />
+	  <button label="Descongelar" label_selected="Descongelar" name="Unfreeze" tool_tip="Descongelar al residente"/>
+	  <button label="CSR" label_selected="CSR" name="csr_btn" tool_tip="Abrir la herramienta de servicio al cliente para este residente" />
+	  <string name="ShowOnMapNonFriend">
+			 Ver la posición en el mapa. Desactivado porque no está entre tus amigos.
+	  </string>
+	  <string name="ShowOnMapFriendOffline">
+			 Ver la posición en el mapa. Desactivado porque no está en línea.
+	  </string>
+	  <string name="ShowOnMapFriendOnline">
+			 Ver la posición en el mapa.
+	  </string>
+	  <string name="TeleportGod">
+			 Obligarlo a Teleportarse a tu posición.
+	  </string>
+	  <string name="TeleportPrelude">
+			 Ofrecerle teleporte a tu posición.
+Desactivado hasta que salgas de la Isla de Orientación
+	  </string>
+	  <string name="TeleportNormal">
+			 Ofrecerle teleporte a tu posición.
+	  </string>
+	  <string name="Loading">
+			 Cargando...
+	  </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_avatar_classified.xml b/indra/newview/skins/default/xui/es/panel_avatar_classified.xml
new file mode 100644
index 000000000..4c88840aa
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_avatar_classified.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="Classified" title="Clasificados">
+	  <line_editor name="given_name_editor" tool_tip="El nombre debe comenzar con letras o números, sin signos de puntuación" />
+	  <line_editor name="location_editor" tool_tip="Fija la ubicación para este clasificado en tu actual posición."/>
+	  <button label="Fijar Ubicación" name="set_location_btn"/>
+	  <button label="Teleportar" 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" value="Select">
+					Fijar Clasificación -
+			 </combo_item>
+			 <combo_item name="mature" value="Mature">
+					Contenido Mature
+			 </combo_item>
+			 <combo_item name="pg" value="PG">
+					Contenido PG
+			 </combo_item>
+	  </combo_box>
+	  <text name="classified_info_text" tool_tip="Cuanto mas decidas pagar por este aviso, más arriba en la lista aparecerá">
+			 Aviso colocado: Aún no publicado
+	  </text>
+	  <text name="click_through_text" tool_tip="Total de clicks en cada botón desde que el aviso fue colocado">
+			 Clicks:
+	  </text>
+	  <button label="Publicar..." name="classified_update_btn"/>
+	  <check_box label="Renovar Automáticamente todas las semanas" name="auto_renew_check"/>
+	  <string name="ad_placed_paid">
+			 Aviso Colocado: [DATE], Pagados [CURRENCY][AMT] por listar.
+	  </string>
+	  <string name="update_txt">
+			 Actualizar
+	  </string>
+	  <string name="publish_txt">
+			 Publicar...
+	  </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_avatar_pick.xml b/indra/newview/skins/default/xui/es/panel_avatar_pick.xml
new file mode 100644
index 000000000..fbe6c3b04
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_avatar_pick.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="Pick" title="Destacados">
+	  <button label="Fijar Ubicación" name="set_location_btn"/>
+	  <button label="Teleportar" name="pick_teleport_btn"/>
+	  <button label="Mostrar en el Mapa" name="pick_map_btn"/>
+	  <text name="sort_order_text">
+			 Ordenar:
+	  </text>
+	  <check_box label="Activado" name="enabled_check"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_bars.xml b/indra/newview/skins/default/xui/es/panel_bars.xml
new file mode 100644
index 000000000..b13ff1391
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_bars.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="bottom_panel">
+	  <panel name="status"/>
+	  <layout_stack name="bar_stack">
+			 <layout_panel name="spacer"/>
+			 <layout_panel name="overlay"/>
+			 <layout_panel name="toolbar"/>
+	  </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_bg_tab.xml b/indra/newview/skins/default/xui/es/panel_bg_tab.xml
new file mode 100644
index 000000000..0bc463965
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_bg_tab.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="bg_tab">
+	  <icon image_name="toolbar_tab.tga"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_bg_toolbar.xml b/indra/newview/skins/default/xui/es/panel_bg_toolbar.xml
new file mode 100644
index 000000000..543899f3c
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_bg_toolbar.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="bg_toolbar">
+	  <icon image_name="toolbar_bg.tga"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_chat_bar.xml b/indra/newview/skins/default/xui/es/panel_chat_bar.xml
new file mode 100644
index 000000000..37e3b8681
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_chat_bar.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="chat_bar">
+	  <button label="Chat Local" name="History" tool_tip="Pulsa aquí para ver el historial" />
+	  <line_editor label="Pulsa aqui para entrar en el chat." name="Chat Editor" tool_tip="Presiona Enter para hablar, Mayus-Enter para susurrar o Ctrl-Enter para gritar" />
+	  <flyout_button label="Decir" name="Say" tool_tip="(Enter)">
+			 <flyout_button_item value="shout" name="shout_item">
+					Gritar
+			 </flyout_button_item>
+			 <flyout_button_item value="say" name="say_item">
+					Decir
+			 </flyout_button_item>
+			 <flyout_button_item value="whisper" name="whisper_item">
+					Susurar
+			 </flyout_button_item>
+	  </flyout_button>
+	  <combo_box label="Gestos" name="Gesture">
+	  </combo_box>
+	  <string name="gesture_label">
+			 Gestos
+	  </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_classified.xml b/indra/newview/skins/default/xui/es/panel_classified.xml
new file mode 100644
index 000000000..bafc3938c
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_classified.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="Classified" title="Clasificados">
+	  <line_editor name="given_name_editor" tool_tip="El nombre debe comenzar con una letra o número, sin signos de puntación" />
+	  <line_editor name="location_editor"  tool_tip="Fija la ubicación para este clasificado en tu actual posición."/>
+	  <button label="Fijar" name="set_location_btn"/>
+	  <button label="Teleportar" name="classified_teleport_btn"/>
+	  <button label="Mostrar en el Mapa" name="classified_map_btn"/>
+	  <button label="Perfil" name="classified_profile_btn"/>
+	  <combo_box name="classified_mature_check">
+			 <combo_item name="select_mature" value="Select">
+					- Seleccionar Calificación -
+			 </combo_item>
+			 <combo_item name="mature" value="Mature">
+					Contenido Mature
+			 </combo_item>
+			 <combo_item name="pg" value="PG">
+					Contenido PG
+			 </combo_item>
+	  </combo_box>
+	  <combo_box label="" name="classified_category_combo"/>
+	  <button label="Actualizar" name="classified_update_btn"/>
+	  <string name="ad_placed_paid">
+			 Aviso Colocado: [DATE], Pagado [CURRENCY][AMT] Por listado.
+	  </string>
+	  <string name="update_txt">
+			 Actualziar
+	  </string>
+	  <string name="publish_txt">
+			 Publicado...
+	  </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_event.xml b/indra/newview/skins/default/xui/es/panel_event.xml
new file mode 100644
index 000000000..c0e24574b
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_event.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="Event" title="Eventos">
+	  <text name="event_name_label">
+			 Nombre:
+	  </text>
+	  <text name="event_name">
+			 (ninguno)
+	  </text>
+	  <text name="event_category_label">
+			 Tipo:
+	  </text>
+	  <text name="event_category">
+			 (ninguno)
+	  </text>
+	  <text name="event_mature_label">
+			 Contenido Mature:
+	  </text>
+	  <text name="event_mature_yes">
+			 Si
+	  </text>
+	  <text name="event_mature_no">
+			 No
+	  </text>
+	  <text name="event_date_label">
+			 Fecha:
+	  </text>
+	  <text name="event_date">
+			 (ninguna)
+	  </text>
+	  <text name="event_duration_label">
+			 Duración del Evento:
+	  </text>
+	  <text name="event_duration">
+			 (ninguna)
+	  </text>
+	  <text name="event_runby_label">
+			 Auspiciado por:
+	  </text>
+	  <text name="event_runby">
+			 (nadie)
+	  </text>
+	  <text name="event_location_label">
+			 Ubicación:
+	  </text>
+	  <text name="event_location">
+			 (ninguna)
+	  </text>
+	  <text name="event_cover_label">
+			 Cuota de participación:
+	  </text>
+	  <text name="event_cover">
+			 (ninguna)
+	  </text>
+	  <text name="event_desc_label">
+			 Descripción:
+	  </text>
+	  <button label="Teleportar" name="teleport_btn"/>
+	  <button label="Mostrar en el Mapa" name="map_btn"/>
+	  <button label="Notificar" name="notify_btn"/>
+	  <button label="Crear Evento..." name="create_event_btn"/>
+	  <string name="none">
+			 ninguna
+	  </string>
+	  <string name="notify">
+			 Notificar
+	  </string>
+	  <string name="dont_notify">
+			 No notificar
+	  </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_friends.xml b/indra/newview/skins/default/xui/es/panel_friends.xml
new file mode 100644
index 000000000..12b5f03b0
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_friends.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="friends">
+	  <string name="Multiple">
+			 Varios Amigos...
+	  </string>
+	  <scroll_list name="friend_list" tool_tip="Para seleccionar a varios amigos, manten pulsado Ctrl o Mays. mientras les vas pulsando">
+			 <column tool_tip="Estado En Línea"/>
+			 <column label="Nombre" name="friend_name" tool_tip="Nombre"/>
+			 <column name="icon_visible_online" tool_tip="Tu amigo puede ver cuándo estás conectado"/>
+			 <column name="icon_visible_map" tool_tip="Tu amigo puede localizarte en el mapa"/>
+			 <column name="icon_edit_mine" tool_tip="Tu amigo puede editar, borrar o tomar tus objetos"/>
+			 <column name="icon_visible_online_theirs" tool_tip="Puedes ver cuando tus amigos están conectados (Actualizable al inicio de sesión)"/>
+			 <column name="icon_visible_map_theirs" tool_tip="Puedes localizarlos en el mapa"/>
+			 <column name="icon_edit_theirs" tool_tip="Puedes editar los objetos de este amigo"/>
+			 <column name="friend_last_update_generation"/>
+	  </scroll_list>
+	  <search_editor name="buddy_search_lineedit" label="Buscar Contactos" tool_tip="Nombre del amigo que estás buscando"/>
+	  <button label="0" name="expand_collapse_btn" tool_tip="Ampliar/Contraer información extra"/>
+	  <button label="MI/Llamada" name="im_btn" tool_tip="Abrir sesión de Mensajes Instantáneos"/>
+	  <button label="Perfil" name="profile_btn" tool_tip="Mostrar foto, grupos e información adicional"/>
+	  <button label="Teleportar..." name="offer_teleport_btn" tool_tip="Ofrecer Teleporte a tu ubicación a este amigo" />
+	  <button label="Pagar..." name="pay_btn" tool_tip="Dar dinero ([CURRENCY]) a este amigo"/>
+	  <button label="Quitar..." name="remove_btn" tool_tip="Quitar a este residente de tu lista de amigos"/>
+	  <button label="Agregar..." name="add_btn" tool_tip="Ofrecer amistad a este residente"/>
+	  <text name="friends">
+			 En Línea:
+	  </text>
+	  <text name="f_num">
+			 0000
+	  </text>
+	  <text name="sel">
+			 Seleccionados:
+	  </text>
+	  <text name="s_num">
+			 0000
+	  </text>		 
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group.xml b/indra/newview/skins/default/xui/es/panel_group.xml
new file mode 100644
index 000000000..48fbc8d36
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_group.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="GroupInfo" title="Información del Grupo">
+	  <string name="default_needs_apply_text">
+			 Hay cambios sin aplicar en esta pestaña.
+	  </string>
+	  <string name="want_apply_text">
+			 ¿Deseas aplicar estos cambios?
+	  </string>
+	  <tab_container name="group_tab_container">
+			 <panel name="general_tab" />
+			 <panel name="roles_tab" />
+			 <panel name="notices_tab" />
+			 <panel name="voting_tab" />
+			 <panel name="land_money_tab" />
+	  </tab_container>
+	  <button label="Aplicar" label_selected="Aplicar" name="btn_apply"/>
+	  <button label="Cancelar" label_selected="Cancelar" name="btn_cancel"/>
+	  <button label="OK" label_selected="OK" name="btn_ok"/>
+	  <button label="Actualizar" label_selected="Actualizar" name="btn_refresh"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_finder.xml b/indra/newview/skins/default/xui/es/panel_group_finder.xml
new file mode 100644
index 000000000..62655bd1a
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_group_finder.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="GroupInfoFinder" title="Buscar Infor de Grupo">
+	  <text name="default_needs_apply_text">
+			 Hay cambios sin aplicar en esta pestaña.
+	  </text>
+	  <text name="want_apply_text">
+			 ¿Deseas aplicar estos cambios?
+	  </text>
+	  <tab_container name="group_tab_container">
+			 <panel name="general_tab" />
+			 <panel name="roles_tab" />
+			 <panel name="notices_tab" />
+			 <panel name="voting_tab" />
+			 <panel name="land_money_tab" />
+	  </tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_general.xml b/indra/newview/skins/default/xui/es/panel_group_general.xml
new file mode 100644
index 000000000..8f532d1b8
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_group_general.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="General" name="general_tab">
+	  <string name="help_text">
+			 La pestaña General contiene información global de este grupo,
+la lista de propietarios y miembros visibles,
+las preferencias generales del grupo, y las opciones de los miembros.
+
+Coloca el cursor sobre las opciones para más información.	  
+	  </string>
+	  <string name="group_info_unchanged">
+			 La información general del grupo ha cambiado.
+	  </string>
+	  <button label="?" label_selected="?" name="help_button"/>
+	  <line_editor label="Escribe aquí el nombre de tu nuevo grupo" name="group_name_editor"/>
+	  <text name="group_name">
+			 Escribe aquí el nombre de tu nuevo grupo
+	  </text>
+	  <text name="prepend_founded_by">
+			 Creado por
+	  </text>
+	  <text name="founder_name">
+			 (esperando)
+	  </text>
+	  <text name="group_key_text">
+			 Key del Grupo:
+	  </text>
+     <name_editor name="group_key"/>
+	  <text name="group_charter_label">
+			 Carta del Grupo
+	  </text>
+	  <texture_picker label="Emblema del Grupo" name="insignia" tool_tip="Pulsa aquí para elegir una imagen"/>
+	  <text_editor name="charter">
+			 Carta del Grupo
+	  </text_editor>
+	  <button label="Entrar ([CURRENCY]0)" label_selected="Entrar ([CURRENCY]0)" name="join_button"/>
+	  <button label="Ver en Detalle" label_selected="Ver en Detalle" name="info_button"/>
+	  <text name="text_owners_and_visible_members">
+			 Propietarios y Miembros Visibles
+	  </text>
+	  <text name="text_owners_are_shown_in_bold">
+			 (Los Propietarios aparecen en Negrita)
+	  </text>
+	  <name_list name="visible_members">
+			 <column label="Nombre del Miembro" name="name"/>
+			 <column label="Título" name="title"/>
+			 <column label="Última Conexión" name="online"/>
+	  </name_list>
+	  <text name="text_group_preferences">
+			 Preferencias del Grupo
+	  </text>
+	  <panel name="preferences_container">
+			 <check_box label="Mostrar en la Búsqueda" name="show_in_group_list" tool_tip="Permitir que la gente vea este grupo en los resultados de la búsqueda" />
+			 <check_box label="Inscripción Libre" name="open_enrollement" tool_tip="Definir si se admiten al grupo nuevos miembros sin que sea necesario invitarlos" />
+			 <check_box label="Cuota de Inscripción: [CURRENCY]" name="check_enrollment_fee" tool_tip="Define si se requiere una cuota para entrar al grupo" />
+			 <spinner name="spin_enrollment_fee" tool_tip="Cuando está marcado &apos;Cuota de inscripción&apos;, los miembros nuevos deben pagar esta cuota para entrar al grupo" />
+			 <text name="content_rating">
+					Calificación de Contenido
+			 </text>
+			 <combo_box name="group_mature_check"  tool_tip="Establece si la información de tu grupo es de Contenido Mature">
+					<combo_item name="select_mature" value="Select">
+						  -	 Seleccionar Calificación -
+					</combo_item>
+					<combo_item name="mature">
+						  Contenido Mature
+					</combo_item>
+					<combo_item name="pg">
+						  Contenido PG
+					</combo_item>
+			 </combo_box>
+			 <check_box label="Recibir Avisos del Grupo" name="receive_notices" tool_tip="Define si quieres recibir avisos de este grupo. Desmarca esta opción si el grupo te envía spam."/>
+			 <check_box label="Unirse al Chat del Grupo" name="receive_chat" tool_tip="Define si quieres participar del chat en el grupo. Desmarca esta opción si el grupo te envía spam"/>
+			 <check_box label="Listar Grupo en mi Perfil" name="list_groups_in_profile" tool_tip="Define si quieres que este grupo sea listado en tu Perfil"/>
+			 <text name="active_title_label">
+					Mi Título activo
+			 </text>
+			 <combo_box name="active_title" tool_tip="Define el título del grupo que mostrará tu avatar cuando el grupo esté activo"/>
+	  </panel>
+	  <string name="incomplete_member_data_str">
+			 Recuperando datos de los miembros
+	  </string>
+	  <string name="confirm_group_create_str">
+					Crear este grupo cuesta [GROUPCREATEFEE]. 
+¿Estás plena, absoluta, y TOTALMENTE seguro de que quieres gastarse [GROUPCREATEFEE] para crear este grupo?
+Quedas avisado de que si, en un plazo de 48 horas, no entra nadie al grupo, éste será disuelto, y el nombre no se podrá usar en el futuro.	  
+	  </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_invite.xml b/indra/newview/skins/default/xui/es/panel_group_invite.xml
new file mode 100644
index 000000000..c8c921958
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_group_invite.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Invitar a un Miembro" name="invite_panel">
+	  <text name="help_text">
+			 Puedes seleccionar a varios residentes
+para invitarles a tu grupo. Para
+empezar, pulsa &apos;Abrir el selector de
+residentes&apos;.	
+	  </text>
+	  <button label="Abrir el Selector de Residentes" name="add_button" tool_tip=""/>
+	  <name_list name="invitee_list" tool_tip="Para seleccionar a varios residentes, mantén pulsada la tecla Ctrl y pulsa sus nombres" />
+	  <button label="Eliminar de la lista a los seleccionados" name="remove_button" tool_tip="Elimina los residentes seleccionados de la lista de invitaciones" />
+	  <text name="role_text">
+			 Elegir qué rol asignarles:
+	  </text>
+	  <combo_box name="role_name" tool_tip="Elige de la lista de roles cuál asignar a los miembros."/>
+	  <button label="Enviar Invitacioens" name="ok_button"/>
+	  <button label="Cancelar" name="cancel_button"/>
+	  <string name="confirm_invite_owner_str">
+			 ¿Estás seguro de que quieres invitar a un nuevo propietario/s? ¡Esta acción es permanente!
+	  </string>
+	  <string name="loading">
+			 (cargando...)
+	  </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
new file mode 100644
index 000000000..8109f10fa
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Terreno y L$" name="land_money_tab" >
+	  <string name="help_text">
+			 Se listan las parcelas propiedad del grupo, detallando las contribuciones. Aparece una advertencia si el Terreno total en uso es menor que o igual a la Contribución total. Las pestañas &apos;Planificación&apos;, &apos;Detalles&apos; y &apos;Ventas&apos; aportan información sobre las finanzas del grupo	  
+	  </string>
+	  <button label="?" name="help_button"/>
+	  <string name="cant_view_group_land_text">
+			 No tienes permiso para ver qué terreno posee el grupo.
+	  </string>
+	  <string name="cant_view_group_accounting_text">
+			 No tienes permiso para ver la información de la cuenta del grupo.
+	  </string>
+	  <string name="loading_txt">
+			 Cargando...
+	  </string>
+	  <text name="group_land_heading">
+			 Terreno propiedad del grupo
+	  </text>
+	  <scroll_list name="group_parcel_list">
+			 <column label="Parcela" name="name"/>
+			 <column label="Región" name="location"/>
+			 <column label="Tipo" name="type"/>
+			 <column label="Superficie" name="area"/>
+			 <column label="" name="hidden"/>
+	  </scroll_list>
+	  <button label="Mostrar en el Mapa" label_selected="Mostrar en el Mapa" name="map_button"/>
+	  <text name="total_contributed_land_label">
+			 Contribución Total:
+	  </text>
+	  <text name="total_contributed_land_value">
+			 [AREA] m²
+	  </text>
+	  <text name="total_land_in_use_label">
+			 Terreno total en uso:
+	  </text>
+	  <text name="total_land_in_use_value" >
+			 [AREA] m²
+	  </text>
+	  <text name="land_available_label">
+			 Terreno disponible:
+	  </text>
+	  <text name="land_available_value">
+			 [AREA] m²
+	  </text>
+	  <text name="your_contribution_label">
+			 Tu Contribución:
+	  </text>
+	  <string name="land_contrib_error">
+			 No se ha podido defininir tu contribución de terreno.
+	  </string>
+	  <text name="your_contribution_max_value">
+			 m² ([AMOUNT] máx)
+	  </text>
+	  <text name="group_over_limit_text">
+			 Los miembros del grupo deben contribuir con más créditos de terreno
+para mantener el terreno en uso.	  
+	  </text>
+	  <text name="group_money_heading">
+			 [CURRENCY] del Grupo
+	  </text>
+	  <tab_container name="group_money_tab_container">
+			 <panel label="Planificación" name="group_money_planning_tab">
+					<text_editor name="group_money_planning_text">
+						  Calculando...
+					</text_editor>
+					</panel>
+			 <panel label="Detalles" name="group_money_details_tab">
+					<text_editor name="group_money_details_text">
+						  Calculando...
+					</text_editor>
+					<button label="&lt; Antes" label_selected="&lt; Antes" name="earlier_details_button" tool_tip="Retroceder en el Tiempo" />
+					<button label="Después &gt;" label_selected="Después &gt;" name="later_details_button" tool_tip="Avanzar en el Tiempo" />
+			 </panel>
+			 <panel label="Ventas" name="group_money_sales_tab">
+					<text_editor name="group_money_sales_text">
+						  Calculando...
+					</text_editor>
+					<button label="&lt; Antes" label_selected="&lt; Antes" name="earlier_sales_button" tool_tip="Retroceder en el Tiempo" />
+					<button label="Después &gt;" label_selected="Después &gt;" name="later_sales_button" tool_tip="Avanzar en el Tiempo" />
+			 </panel>
+	  </tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_notices.xml b/indra/newview/skins/default/xui/es/panel_group_notices.xml
new file mode 100644
index 000000000..a5ff100bc
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_group_notices.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Avisos" name="notices_tab">
+	  <string name="help_text">
+			 Los avisos son una forma rápida de comunicación dentro 
+de un grupo, difundiendo un mensaje y, si se quiere, añadiéndole 
+un ítem. Los avisos sólo los reciben los miembros del grupo cuyo 
+rol tiene adjudicada tal habilidad. Puedes desactivar los avisos 
+en la pestaña General.	  
+	  </string>
+	  <string name="no_notices_text">
+			 No hay avisos anteriores.
+	  </string>
+	  <button label="?" label_selected="?" name="help_button"/>
+	  <text name="lbl">
+			 Archivo de Avisos del Grupo
+	  </text>
+	  <text name="lbl2">
+			 Los avisos se mantienen durante 14 días. Pulsa en la lista de abajo el que 
+quieras ver. Pulsa el botón &apos;Actualizar&apos; para comprobar si se han 
+recibido nuevos avisos. Las listas de avisos tienen un límite de 200 avisos por día.	  
+	  </text>
+	  <scroll_list name="notice_list">
+			 <column label="" name="icon" width="16" />
+			 <column label="Asunto" name="subject"/>
+			 <column label="De" name="from"/>
+			 <column label="Fecha" name="date"/>
+			 <column name="sort"/>
+	  </scroll_list>
+	  <text name="notice_list_none_found">
+			 No se han encontrado.
+	  </text>
+	  <button label="Crear Aviso Nuevo" label_selected="Crear Aviso Nuevo" name="create_new_notice"/>
+	  <button label="Actualizar" label_selected="Actualizar la Lista" name="refresh_notices"/>
+	  <panel label="Crear Aviso Nuevo" name="panel_create_new_notice">
+			 <text name="lbl">
+					Crear un aviso
+			 </text>
+			 <text name="lbl2">
+			 Para enviar un aviso, debes escribir un asunto. Puedes añadir un
+ítem al aviso arrastrándolo desde tu inventario a este panel. 
+Los ítems anexados deben ser copiables y transferibles,
+y no se puede enviar una carpeta.			 
+			 </text>
+			 <text name="lbl3">
+					Asunto:
+			 </text>
+			 <text name="lbl4">
+					Mensaje:
+			 </text>
+			 <text name="lbl5">
+					Anexar:
+			 </text>
+			 <button label="Eliminar lo Anexado" label_selected="Eliminar lo Anexado" name="remove_attachment"/>
+			 <button label="Enviar el Aviso" label_selected="Enviar el Aviso" name="send_notice"/>
+			 <panel name="drop_target2"/>
+			 <panel name="drop_target" tool_tip="Para enviar un ítem con el aviso, arrástralo desde tu inventario hasta el cuadro del mensaje. Para poder enviar ese objeto con el aviso, debes tener permiso para copiarlo y transferirlo."/>
+	  </panel>
+	  <panel label="Ver Avisos Anteriores" name="panel_view_past_notice">
+			 <text name="lbl">
+					Avisos Archivados
+			 </text>
+			 <text name="lbl2">
+					Pulsa el botón &apos;Crear Aviso Nuevo&apos; para enviar uno nuevo.
+			 </text>
+			 <text name="lbl3">
+					Asunto:
+			 </text>
+			 <text name="lbl4">
+					Mensaje:
+			 </text>
+			 <button label="Abrir lo Anexado" label_selected="Abrir lo Anexado" name="open_attachment"/>
+	  </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_roles.xml b/indra/newview/skins/default/xui/es/panel_group_roles.xml
new file mode 100644
index 000000000..66230e19b
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_group_roles.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Miembros y Roles" name="roles_tab">
+	  <string name="default_needs_apply_text">
+			 En cambios sin aplicar en esta pestaña.
+	  </string>
+	  <string name="want_apply_text">
+			 ¿Deseas aplicar estos cambios?
+	  </string>
+	  <button label="?" left="391" name="help_button"/>
+	  <panel name="members_header">
+			 <text name="static">
+					Miembros y Roles
+			 </text>
+			 <text name="static2">
+					Los miembros del grupo tienen asignados roles con distintas capacidades.
+Estas configuraciones son fácilmente personalizables, para facilitar una 
+mayor flexibilidad y organización.			 
+			 </text>
+	  </panel>
+	  <panel name="roles_header">
+			 <text name="static">
+					Roles
+			 </text>
+			 <text name="role_properties_modifiable">
+					Elige un rol de los de abajo. Puedes modificar su nombre, su
+descripción, y la etiqueta de los miembros.			 
+			 </text>
+			 <text name="role_properties_not_modifiable">
+					Elige un rol de los de abajo para ver sus propiedades, miembros, y qué
+capacidades tiene asignadas.			 
+			 </text>
+			 <text name="role_actions_modifiable">
+					También puede asignar capacidades al rol.
+			 </text>
+			 <text name="role_actions_not_modifiable">
+					Puedes ver, pero no modificar, las capacidades asignadas.
+			 </text>
+	  </panel>
+	  <panel name="actions_header">
+			 <text name="static">
+					Capacidades
+			 </text>
+			 <text name="static2">
+					Puedes ver una descripción de la capacidad, y qué miembros y roles pueden
+realizarla.		
+			 </text>
+	  </panel>
+	  <tab_container name="roles_tab_container">
+			 <panel label="Miembros" name="members_sub_tab" tool_tip="Miembros">
+					<button label="Buscar" name="search_button"/>
+					<button label="Mostrar Todos" name="show_all_button"/>
+					<name_list name="member_list">
+						  <column label="Nombre" name="name"/>
+						  <column label="Cuotas Donadas" name="donated"/>
+						  <column label="Última Conexión" name="online"/>
+					</name_list>
+					<button label="Invitar a un Nuevo Miembro..." name="member_invite"/>
+					<button label="Expulsar del Grupo" name="member_eject"/>
+					<string name="help_text">
+						  Puedea añadir o quitar los roles asignados a los miembros.
+Selecciona varios nombres manteniendo pulsada la tecla Ctrl y pulsando en cada uno de ellos.
+					</string>
+			 </panel>
+			 <panel label="Roles" name="roles_sub_tab" width="398">
+					<button label="Buscar" name="search_button"/>
+					<button label="Mostrar Todos" name="show_all_button"/>
+					<scroll_list name="role_list">
+						  <column label="Nombre del Rol" name="name"/>
+						  <column label="Título" name="title"/>
+						  <column label="Miembros" name="members"/>
+					</scroll_list>
+					<button label="Crear Nuevo Rol ..." name="role_create"/>
+					<button label="Eliminar Rol" name="role_delete"/>
+					<string name="help_text">
+						  Los roles tienen una etiqueta y una serie de capacidades permitidas que los miembros pueden desarrollar. Los miembros pueden tener más de un rol. Un grupo puede tener hasta 10 roles, incluyendo el de Todos y el de Propietarios.					
+					</string>
+					<string name="cant_delete_role">
+						  Los roles de &apos;Todos&apos; y &apos;Propietarios&apos; son especiales, y no pueden eliminarse.					
+					</string>
+			 </panel>
+			 <panel label="Capacidades" name="actions_sub_tab">
+					<button label="Buscar" name="search_button"/>
+					<button label="Mostrar Todas" name="show_all_button"/>
+					<scroll_list name="action_list" tool_tip="Selecciona una capacidad para verla más en detalle.">
+						  <column label="" name="icon" />
+						  <column label="" name="action"/>
+					</scroll_list>
+					<string name="help_text">
+						  Las capacidades permiten a los miembros que tienen ese rol el hacer 
+tareas específicas dentro de este grupo. Hay una gran variedad de capacidades.					
+					</string>
+			 </panel>
+	  </tab_container>
+	  <panel name="members_footer" >
+			 <text name="static">
+					Roles Asignados
+			 </text>
+			 <text name="static2">
+					Capacidades Permitidas
+			 </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="Para más detalles de cada capacidad permitida, ve a la pestaña Capacidades">
+					<column label="" name="icon"/>
+					<column label="" name="action"/>
+			 </scroll_list>
+	  </panel>
+	  <panel name="roles_footer">
+			 <text name="static">
+					Nombre
+			 </text>
+			 <text name="static2">
+					Descripción
+			 </text>
+			 <line_editor name="role_name">
+					Empleados
+			 </line_editor>
+			 <text name="static3">
+					Título
+			 </text>
+			 <line_editor name="role_title">
+					(esperando)
+			 </line_editor>
+			 <text_editor name="role_description">
+					(esperando)
+			 </text_editor>
+			 <text name="static4">
+					Miembros Asignados
+			 </text>
+			 <text name="static5" tool_tip=" Lista de las capacidades que puede desarrollar el rol seleccionado actualmente.">
+					Capacidades Asignadas
+			 </text>
+			 <check_box label="Los Miembros son visibles" name="role_visible_in_list" tool_tip="Establece si los miembros de este rol pueden ser vistos en la pestaña General por personas ajenas al grupo" />
+			 <scroll_list name="role_allowed_actions" tool_tip="Para más detalles de cada capacidad permitida, ve a la pestaña Capacidades.">
+					<column label="" name="icon"/>
+					<column label="" name="checkbox"/>
+					<column label="" name="action"/>
+			 </scroll_list>
+	  </panel>
+	  <panel name="actions_footer">
+			 <text name="static">
+					Descripción
+			 </text>
+			 <text_editor name="action_description">
+					Esta capacidad es la de &apos;Expulsar miembros de este grupo&apos;. Sólo un propietario puede expulsar a otro.			 
+			 </text_editor>
+			 <text name="static2">
+					Roles con la capacidad
+			 </text>
+			 <text name="static3">
+					Miembros con la capacidad
+			 </text>
+	  </panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_voting.xml b/indra/newview/skins/default/xui/es/panel_group_voting.xml
new file mode 100644
index 000000000..1452b7e8e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_group_voting.xml
@@ -0,0 +1,214 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Propuestas" name="voting_tab">
+	  <string name="help_text">
+			 Las propuestas de grupo pueden utilizarse para saber 
+qué  quiere hacer un grupo, o cómo piensa acerca de algo. 
+Si tienes los permisos necesarios, puedesr crear propuestas, 
+votar en las que estén abiertas, y ver las antiguas.	  
+	  </string>
+	  <panel name="open_proposals_container"/>
+	  <panel name="voting_history_container"/>
+			 <button label="?" name="help_button"/>
+			 <text name="proposal_header">
+					Abrir las Propuestas de Grupo
+			 </text>
+			 <text name="proposal_instructions">
+					Pulsa dos veces la propuesta en la que quieres votar, o pulsa
+Hacer una propuesta para crear una nueva.
+			 </text>
+			 <text name="proposal_lbl">
+					Descripción de la Propuesta
+			 </text>
+			 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+	     mouse_opaque="false" name="proposal_voting_lbl" v_pad="0" visible="true"
+	     width="396">
+		Proposal                                                         Voting Ends                    Voted?
+	</text>
+	<scroll_list bottom_delta="-121" column_padding="5" column_widths="200,120,40"
+	     draw_border="true" height="120" left="11" mouse_opaque="true"
+	     multi_select="false" name="proposals" width="396" />
+	<button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"
+	     height="20" label="Create Proposal" label_selected="Create Proposal"
+	     left_delta="-0" mouse_opaque="true" name="btn_proposal" width="160" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="20" label="View Proposal" label_selected="View Proposal" left="247"
+	     mouse_opaque="true" name="btn_view_proposal_item" width="160" />
+	<text_editor background_visible="true" bg_visible="false" border_drop_shadow_visible="false"
+	     border_visible="false" bottom="300" drop_shadow_visible="false"
+	     embedded_items="false" follows="left|top" font="SansSerif" height="90"
+	     is_unicode="false" left="11" max_length="254" mouse_opaque="true"
+	     name="proposal_text" width="289" word_wrap="true" spell_check="true" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="20" label="View List" label_selected="View List" left="304"
+	     mouse_opaque="true" name="btn_view_proposal_list" width="101" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="right" height="20" left="8"
+	     mouse_opaque="false" name="quorum_lbl" v_pad="0" width="65">
+		Quorum:
+	</text>
+	<spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="20"
+	     increment="1" initial_val="0" left="78" max_val="138" min_val="1"
+	     mouse_opaque="true" name="quorum" text_disabled_color="orange"
+	     tool_tip="# of total voting members needed for election results to be binding."
+	     width="54" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-0" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="60"
+	     mouse_opaque="false" name="quorum_text" v_pad="0" width="300">
+		out of [MEMBERS] members must vote.
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="right" height="20" left="8"
+	     mouse_opaque="false" name="duration_lbl" v_pad="0" width="65">
+		Duration:
+	</text>
+	<spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="20"
+	     increment="1" initial_val="7" left_delta="70" max_val="30" min_val="1"
+	     mouse_opaque="true" name="duration"
+	     tool_tip="# of days the election will last." width="45" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="52"
+	     mouse_opaque="false" name="duration_text" v_pad="0" width="300">
+		days
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="right" height="20" left="210"
+	     mouse_opaque="false" name="majority_lbl" v_pad="0" visible="false"
+	     width="65" />
+	<radio_group bottom_delta="72" draw_border="false" follows="left|top" height="60" left="300"
+	     mouse_opaque="true" name="majority"
+	     text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
+	     tool_tip="Majority of total votes needed to win." width="107">
+		Simple Majority
+		2/3 Majority
+		Unanimous
+	</radio_group>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-72" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
+	     mouse_opaque="false" name="start_lbl" v_pad="0" width="70">
+		Voting Start:
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="75"
+	     mouse_opaque="false" name="start_date" v_pad="0" width="200" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
+	     mouse_opaque="false" name="end_lbl" v_pad="0" width="70">
+		Voting Ends:
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="75"
+	     mouse_opaque="false" name="end_date" v_pad="0" width="200" />
+	<button bottom="-218" follows="left|top" font="SansSerif" halign="center" height="20"
+	     label="Submit Proposal" label_selected="Submit Proposal" left="200"
+	     mouse_opaque="true" name="btn_submit" width="120" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="20" label="Cancel" label_selected="Cancel" left_delta="128"
+	     mouse_opaque="true" name="btn_cancel" width="75" />
+	<button bottom="-218" follows="top" font="SansSerif" halign="center" height="20"
+	     label="Yes" label_selected="Yes" left="200" mouse_opaque="true"
+	     name="btn_yes" width="63" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="20" label="No" label_selected="No" left_delta="70"
+	     mouse_opaque="true" name="btn_no" width="63" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="20" label="Abstain" label_selected="Abstain" left_delta="70"
+	     mouse_opaque="true" name="btn_abstain" width="63" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-240" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifBig" h_pad="0" halign="left" height="10" left="12"
+	     mouse_opaque="false" name="txt" v_pad="0" width="363">
+		Group Voting History
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-28" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+	     mouse_opaque="false" name="instructions" v_pad="0" width="400">
+		Double Click on a Past Vote or select one and click View Item to view results.
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-296" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+	     mouse_opaque="false" name="history_list_lbl" text_wrap="true" v_pad="0"
+	     width="396">
+		Past Vote                                                         Voting Ended
+	</text>
+	<scroll_list background_visible="true" bottom_delta="-132" column_padding="5"
+	     column_widths="220,120" draw_border="true" follows="left|top" height="126"
+	     left="10" mouse_opaque="true" multi_select="false" name="history_list"
+	     width="396" />
+	<button bottom_delta="-25" follows="top" font="SansSerif" halign="center" height="20"
+	     label="View Item" label_selected="View Item" left="287" mouse_opaque="true"
+	     name="btn_view_history_item" width="120" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="157" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="right" height="10" left="10"
+	     mouse_opaque="false" name="vote_text_lbl" v_pad="0" width="70">
+		Vote Results:
+	</text>
+	<text_editor bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-132" drop_shadow_visible="false" embedded_items="false"
+	     follows="left|top" font="SansSerif" h_pad="0" height="126"
+	     hide_scrollbar="true" is_unicode="false" left="10" max_length="1024"
+	     mouse_opaque="true" name="vote_text"
+	     text_wrap="true" v_pad="0"
+	     width="396" word_wrap="false" />
+	<button bottom_delta="-25" follows="top" font="SansSerif" halign="center" height="20"
+	     label="View List" label_selected="View List" left="287" mouse_opaque="true"
+	     name="btn_view_history_list" width="120" />
+	<string name="proposals_header_view_txt">
+		Open Group Proposals
+	</string>
+	<string name="proposals_header_view_inst">
+		Double Click on the proposal you would like to vote on or press
+Create Proposal to create a new proposal.
+	</string>
+	<string name="proposals_header_create_txt">
+		Create Proposal
+	</string>
+	<string name="proposals_header_create_inst">
+		Type the Proposal Description for the new proposal. You can change the
+Quorum, Duration and Majority required to pass the proposal.
+	</string>
+	<string name="proposals_header_vote_txt">
+		Proposal Vote
+	</string>
+	<string name="proposals_header_vote_inst">
+		Press the Yes or No button to vote on the proposal,
+or choose to Abstain voting on this proposal.
+	</string>
+	<string name="proposals_header_voted_inst">
+		You have voted: [VOTE]
+	</string>
+	<string name="empty_proposal_txt">
+		The proposal you are trying to create is empty.  Please fill out the proposal before creating it.
+	</string>
+	<string name="proposals_submit_yes_txt">
+		Submitting Yes to proposal...
+	</string>
+	<string name="proposals_submit_no_txt">
+		Submitting No to proposal...
+	</string>
+	<string name="proposals_submit_abstain_txt">
+		Submitting Abstain to proposal...
+	</string>
+	<string name="proposals_submit_new_txt">
+		Submitting new proposal...
+	</string>
+	<string name="vote_recorded">
+		Your vote was received.
+	</string>
+	<string name="vote_previously_recorded">
+		You have previously voted.  You are only allowed to vote once during an election.
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_groups.xml b/indra/newview/skins/default/xui/es/panel_groups.xml
new file mode 100644
index 000000000..f4acca0af
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_groups.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-371" height="300" left="280" mouse_opaque="true"
+     name="groups" width="350">
+	<scroll_list background_visible="true" bottom="45" column_padding="0" draw_border="true"
+	     draw_heading="true" draw_stripes="true" enabled="true"
+	     follows="left|top|right|bottom" left="10" mouse_opaque="true"
+	     multi_select="false" name="group list" tab_stop="true" top="-10"
+	     width="240">
+		<column dynamicwidth="true" label="Name" name="name" tool_tip="Name" />
+    <!--<column label="Active" name="is_active_group"
+		    tool_tip="Group is set as active" width="40" />-->
+    <column image_overlay="ff_visible_online.tga" name="is_listed_group"
+		    tool_tip="Group is visible in profile." width="20" />
+    <column image_overlay="icn_chat_overlay.tga" name="is_chattable_group"
+		    tool_tip="Receive group chat" width="20" />
+    <column image_overlay="smicon_warn.tga" name="is_notice_group"
+        tool_tip="Receive group notices" width="20" />
+	</scroll_list>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="22" drop_shadow_visible="true" enabled="true" follows="left|bottom"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+	     mouse_opaque="false" name="groupdesc" v_pad="0" width="248">
+		Your currently active group is displayed in italics.
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="5" drop_shadow_visible="true" enabled="true" follows="left|bottom"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+	     mouse_opaque="false" name="groupcount" v_pad="0" width="248">
+		You belong to [COUNT] groups (of [MAX] maximum).
+	</text>
+	<pad bottom="-7" height="0" left="-90" width="1" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="IM/Call" left_delta="0" name="IM"
+	     tool_tip="Open Instant Message session" width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Info" name="Info" width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Activate" name="Activate" width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Leave" name="Leave" width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Create..." name="Create" width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Search..." name="Search..." width="80" />
+  	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Invite..." name="Invite..." width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Titles..." name="Titles..." width="80" />
+  <string name="none">
+		none
+  </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_hud.xml b/indra/newview/skins/default/xui/es/panel_hud.xml
new file mode 100644
index 000000000..95f828996
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_hud.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="false" auto_resize="true" background_visible="false" bottom="50"
+     follows="left|right|top|bottom" height="728" left="0" mouse_opaque="false"
+     name="hud" user_resize="false" width="1024" />
diff --git a/indra/newview/skins/default/xui/es/panel_land_covenant.xml b/indra/newview/skins/default/xui/es/panel_land_covenant.xml
new file mode 100644
index 000000000..e9f8f3af0
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_land_covenant.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="0" follows="top|left" height="220" left="0"
+     name="Covenant" title="Covenant" width="480">
+	<text bottom_delta="-5" follows="left|top"
+	     font="SansSerifSmall" height="20" left="180" name="covenant_timestamp_text"
+	     width="250" />
+	<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
+	     left="10" name="region_name_lbl" width="100">
+		Region:
+	</text>
+	<text bottom_delta="0" follows="left|top"
+	     font="SansSerifSmall" height="20" left="120" name="region_name_text"
+	     width="150">
+		(unknown)
+	</text>
+	<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
+	     left="10" name="estate_name_lbl" width="100">
+		Estate:
+	</text>
+	<text bottom_delta="0" follows="left|top"
+	     font="SansSerifSmall" height="20" left="120" name="estate_name_text"
+	     width="150">
+		(unknown)
+	</text>
+	<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
+	     left="10" name="estate_owner_lbl" width="100">
+		Estate Owner:
+	</text>
+	<text bottom_delta="0" follows="left|top"
+	     font="SansSerifSmall" height="20" left="120" name="estate_owner_text"
+	     width="150">
+		(unknown)
+	</text>
+	<text bottom_delta="-20" follows="left|top"
+	     font="SansSerif" height="20" left="60" name="resellable_clause"
+	     width="300">
+		Purchased land in this region may or may not be resold.
+	</text>
+	<text bottom_delta="-20" follows="left|top"
+	     font="SansSerif" height="20" left="60" name="changeable_clause"
+	     width="375">
+		Purchased land in this region may or may not be joined or subdivided.
+	</text>
+	<text_editor bottom_delta="-200" enabled="false"
+	     follows="left|top" font="SansSerifSmall" height="200" left="15"
+	     max_length="65535" name="covenant_editor" 
+	     width="425" word_wrap="true" />
+	<string name="can_resell">
+		Purchased land in this region may be resold.
+	</string>
+	<string name="can_not_resell">
+		Purchased land in this region may not be resold.
+	</string>
+	<string name="can_change">
+		Purchased land in this region may be joined or subdivided.
+	</string>
+	<string name="can_not_change">
+		Purchased land in this region may not be joined or subdivided.
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml
new file mode 100644
index 000000000..c63e1d1dc
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_login.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="panel_login">
+	  <web_browser name="login_html" />
+	  <string name="real_url">
+			 http://secondlife.com/app/login/
+	  </string>
+	  <string name="forgot_password_url">
+			 http://secondlife.com/account/request.php
+	  </string>
+	  <text name="name_label">
+			 Nombre o Usuario:
+	  </text>
+	  <combo_box name="name_combo" />
+	  <text name="password_text">
+			 Contraseña:	
+	  </text>
+	  <line_editor name="password_edit"/>
+	  <check_box label="Recordar Nombre" name="remember_name_check"/>
+	  <check_box label="Recordar Contraseña" name="remember_check" width="138" />
+	  <text name="grids_combo_text">
+			 Grid:
+	  </text>
+	  <combo_box name="grids_combo" width="120" />
+	  <button name="grids_btn" label="Administrar Grid"/>		 
+	  <text name="start_location_text" v_pad="0" width="120">
+			 Posición Inicial:
+	  </text>
+	  <combo_box name="regionuri_edit"/>
+	  <combo_box name="start_location_combo" width="155">
+			 <combo_item name="MyHome" value="My Home">
+					Mi Base
+			 </combo_item>
+			 <combo_item name="MyLastLocation" value="My Last Location">
+					Mi Última Ubicación
+			 </combo_item>
+			 <combo_item name="Typeregionname" value="&lt;Type region name&gt;">
+					&lt;Escribe el Nombre de la Región&gt;
+			 </combo_item>
+	  </combo_box>
+	  <button label="Iniciar Sesión" label_selected="Iniciar Sesión" name="connect_btn" width="100" />
+	  <text name="create_new_account_text" width="200">
+			 Registrate para obtener una Cuenta
+	  </text>
+	  <text name="forgot_password_text" width="200">
+			 ¿Olvidaste tu Nombre o tu Contraseña?
+	  </text>
+	  <text name="channel_text">
+			 [CHANNEL] [VERSION]
+	  </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_master_volume.xml b/indra/newview/skins/default/xui/es/panel_master_volume.xml
new file mode 100644
index 000000000..27bace7ea
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_master_volume.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="-34"
+     name="master_volume">
+	<button bottom="-22" height="22" label=""
+	     left="2" name="volume" toggle="true"
+	     tool_tip="Master Volume Control, click for volume settings" width="28" />
+	<volume_slider bottom="-20" control_name="AudioLevelMaster" height="17" increment="0.05"
+	     initial_val="0.5" left_delta="22" max_val="1" min_val="0"
+	     mouse_opaque="true" name="volume_slider"
+	     tool_tip="Change the volume using this slider" width="50" />
+	<button bottom="-20" control_name="MuteAudio" height="20"
+	     image_selected="icn_speaker-muted_dark.tga"
+	     image_unselected="icn_speaker_dark.tga" label="" left_delta="52"
+	     name="mute_master" toggle="true" width="25" />
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_media_controls.xml b/indra/newview/skins/default/xui/es/panel_media_controls.xml
new file mode 100644
index 000000000..a8ecfcab8
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_media_controls.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="1"
+     enabled="true" follows="right|bottom" height="20" left="0"
+     name="media_controls" width="262">
+	<icon bottom="-22" enabled="true" follows="left|top" height="22"
+	     image_name="icn_label_music.tga" label="" left_delta="2" mouse_opaque="true"
+	     name="music_icon" scale_image="true" tool_tip="Play/pause streaming music"
+	     width="20" />
+	<button bottom="-21" enabled="true" follows="left|top" height="20"
+          image_overlay="icn_play.tga"
+          image_unselected="flyout_btn_left.tga"
+             image_selected="flyout_btn_left_selected.tga"
+             image_disabled="flyout_btn_left_disabled.tga"
+	      label="" left_delta="20"
+	     mouse_opaque="true" name="music_play" scale_image="true" toggle="false"
+	     tool_tip="Play/pause streaming music" width="20" />
+  <button bottom="-21" enabled="false" follows="left|top" height="20"
+	     image_overlay="icn_pause.tga"
+             image_unselected="flyout_btn_left.tga"
+             image_selected="flyout_btn_left_selected.tga"
+             image_disabled="flyout_btn_left_disabled.tga"
+	     label="" left_delta="0"
+	     mouse_opaque="true" name="music_pause" scale_image="true" toggle="false"
+	     tool_tip="Pause streaming music" width="20" />
+  <button bottom="-21" enabled="true" follows="left|top" height="20"
+	     image_overlay="icn_stop.tga"
+             image_unselected="flyout_btn_right.tga"
+             image_selected="flyout_btn_right_selected.tga"
+             image_disabled="flyout_btn_right_disabled.tga"
+	     label="" left_delta="20"
+	     mouse_opaque="true" name="music_stop" scale_image="true" toggle="false"
+	     tool_tip="Stop streaming music" width="20" />
+  <icon bottom="-22" enabled="true" follows="left|top" height="22"
+	     image_name="icn_label_media.tga"
+             label="" left_delta="23" mouse_opaque="true"
+	     name="media_icon" scale_image="true" tool_tip="Play/pause streaming music"
+	     width="20" />
+  <button bottom="-21" enabled="true" follows="left|top" height="20"
+	     image_overlay="icn_play.tga"
+             image_unselected="flyout_btn_left.tga"
+             image_selected="flyout_btn_left_selected.tga"
+             image_disabled="flyout_btn_left_disabled.tga"
+	     label="" left_delta="21"
+	     mouse_opaque="true" name="media_play" scale_image="true" toggle="false"
+	     tool_tip="Play/pause streaming music" width="20" />
+  <button bottom="-21" enabled="false" follows="left|top" height="20"
+	     image_overlay="icn_pause.tga"
+                          image_unselected="flyout_btn_left.tga"
+             image_selected="flyout_btn_left_selected.tga"
+             image_disabled="flyout_btn_left_disabled.tga"
+	     label="" left_delta="0"
+	     mouse_opaque="true" name="media_pause" scale_image="true" toggle="false"
+	     tool_tip="Pause streaming media" width="20" />
+	<button bottom="-21" enabled="true" follows="left|top" height="20"
+	     image_overlay="icn_stop.tga"
+                          image_unselected="flyout_btn_right.tga"
+             image_selected="flyout_btn_right_selected.tga"
+             image_disabled="flyout_btn_right_disabled.tga"
+	     label="" left_delta="20"
+	     mouse_opaque="true" name="media_stop" scale_image="true" toggle="false"
+	     tool_tip="Stop streaming media" width="20" />
+	<volume_slider bottom="-23" control_name="AudioLevelMaster" height="22" increment="0.05"
+	     initial_val="0.5" left_delta="15" max_val="1" min_val="0"
+	     mouse_opaque="true" name="volume_slider" tool_tip="Master Volume"
+	     width="56" />
+	<button bottom="-19" control_name="MuteAudio" height="20"
+	     image_selected="icn_speaker-muted_dark.tga"
+	     image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
+	     name="mute_master" toggle="true" tool_tip="Master Mute" width="24" />
+	<button bottom="-22" control_name="ShowVolumeSettingsPopup" height="22" label=""
+	     left_delta="19" name="expand" scale_image="true" toggle="true"
+	     tool_tip="Adjust individual volume levels" width="22" />
+        
+	<string name="play_label">
+		Play
+	</string>
+	<string name="stop_label">
+		Stop
+	</string>
+	<string name="pause_label">
+		Pause
+	</string>
+	<string name="default_tooltip_label">
+		No Media Specified
+	</string>
+	<string name="media_hidden_label">
+		(URL hidden by parcel owner)
+	</string>
+	<string name="media_icon_tooltip_web">
+		This location displays content from the World Wide Web. Click the Play button to display Web content.
+	</string>
+	<string name="media_icon_tooltip_movie">
+		This location displays Video content. Click the Play button to play the video.
+	</string>
+	<string name="media_play_tooltip">
+		Display Web content at this location.
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_media_hud.xml b/indra/newview/skins/default/xui/es/panel_media_hud.xml
new file mode 100644
index 000000000..1c0781a5b
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_media_hud.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="false" follows="" height="160" visible="false" mouse_opaque="false"  
+     label="" name="MediaHUD" width="208" background_visible="false" background_opaque="false" bg_alpha_color="1 1 1 0.0">
+<panel name="media_region" left="20" right="-20" bottom="35" top="-20" follows="left|right|top|bottom" visible="true" background_opaque="false"
+       mouse_opaque="false"/>
+	<!--icon name="bg_image" image_name="media_panel_hoverrectangle.png" visible="true" left="10" bottom="32" right="-10" top="-10" follows="left|right|top|bottom"/-->
+	<layout_stack orientation="horizontal" left="0" bottom="0" follows="left|right|bottom" visible="true" width="208" height="32">
+		<layout_panel user_resize="false"/>
+		<layout_panel user_resize="false" auto_resize="false" width="210" min_width="208">
+			<panel name="media_focused_controls" width="208" left="0" height="32" bottom="0" visible="true">
+				<icon name="media_panel_transportcontrols_bg" image_name="media_panel_bg.png" visible="true" height="32" width="99" scale_image="true" bottom="0"/>
+				<button name="back" label="" left="4" width="20" bottom="6" height="22" image_unselected="media_btn_back.png" 
+					image_selected="media_btn_back.png" scale_image="true"/>
+				<icon name="media_panel_divider-1" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="20" 
+					scale_image="false" bottom="5"/>
+				<button name="fwd" label="" left_delta="3"  width="17" bottom_delta="0" height="22" image_unselected="media_btn_forward.png" 
+					image_selected="media_btn_forward.png" scale_image="true"/>
+				<icon name="media_panel_divider-2" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="17" 
+					scale_image="false" bottom="5"/>
+				<button name="home" label="" left_delta="3"  width="22" bottom_delta="0" height="22" image_unselected="media_btn_home.png" 
+					image_selected="media_btn_home.png" scale_image="true"/>
+        <button name="media_stop" label="" left_delta="0"  width="22" bottom_delta="0" height="22" image_unselected="button_anim_stop.tga"
+					image_selected="button_anim_stop.tga" scale_image="true"/>
+        <icon name="media_panel_divider-3" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="22" 
+					scale_image="false" bottom="5"/>
+				<button name="reload" label="" left_delta="3"  width="22" bottom_delta="0" height="22" image_unselected="media_btn_reload.png" 
+					image_selected="media_btn_reload.png" scale_image="true"/>
+				<button name="stop" label="" left_delta="0"  width="22" bottom_delta="0" height="22" image_unselected="media_btn_stoploading.png" 
+					image_selected="media_btn_stoploading.png" scale_image="true" visible="false"/>
+        <button name="play" label="" left_delta="0"  width="22" bottom_delta="0" height="22" image_unselected="button_anim_play.tga"
+					image_selected="button_anim_play.tga" scale_image="true" visible="false"/>
+        <button name="pause" label="" left_delta="0"  width="22" bottom_delta="0" height="22" image_unselected="button_anim_pause.tga"
+					image_selected="button_anim_pause.tga" scale_image="true" visible="false"/>
+        <icon name="media_panel_scrollbg" image_name="media_panel_scrollbg.png" visible="true" height="32" width="32" 
+					scale_image="false" bottom="0" left="97"/>
+				<button name="scrollup" label="" left="109" width="8" bottom="20" height="8" image_unselected="media_btn_scrollup.png" 
+					image_selected="media_btn_scrollup.png" scale_image="false"/>
+				<button name="scrollleft" label="" left="100" width="8" bottom="12" height="8" image_unselected="media_btn_scrollleft.png" 
+					image_selected="media_btn_scrollleft.png" scale_image="false"/>
+				<button name="scrollright" label="" left="117" width="8" bottom="12" height="8" image_unselected="media_btn_scrollright.png" 
+					image_selected="media_btn_scrollright.png" scale_image="false"/>
+				<button name="scrolldown" label="" left="109" width="8" bottom="4" height="8" image_unselected="media_btn_scrolldown.png" 
+					image_selected="media_btn_scrolldown.png" scale_image="false"/>
+				<icon name="media_panel_metacontrols_bg" image_name="media_panel_bg.png" visible="true" height="32" width="81" 
+					scale_image="true" bottom="0" left="127"/>
+				<button name="zoom_frame" label="" left_delta="4" width="22" bottom="5" height="22" image_unselected="media_btn_optimalzoom.png" 
+					image_selected="media_btn_optimalzoom.png" scale_image="true"/>
+				<icon name="media_panel_divider-4" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="22" 
+					scale_image="false" bottom="5"/>
+				<button name="new_window" label="" left_delta="3" width="24" bottom_delta="1" height="22" image_unselected="media_btn_newwindow.png" 
+					image_selected="media_btn_newwindow.png" scale_image="true"/>
+				<icon name="media_panel_divider-5" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="24" 
+					scale_image="false" bottom="5"/>
+				<button name="close" label="" left_delta="3" width="21" bottom_delta="1" height="22" image_unselected="media_btn_done.png" 
+					image_selected="media_btn_done.png" scale_image="true"/>
+			</panel>
+			<panel name="media_hover_controls" width="57" left="74" height="32" bottom="0" visible="false">
+				<icon name="media_panel_metacontrols_bg-hover" image_name="media_panel_bg.png" visible="true" height="32" width="57" scale_image="true" bottom="0" left="0"/>
+				<button name="zoom_frame_hover" label="" left_delta="4" width="22" bottom="5" height="22" image_unselected="media_btn_optimalzoom.png" image_selected="media_btn_optimalzoom.png" 
+					scale_image="true"/>
+				<icon name="media_panel_divider" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="22" scale_image="false" bottom="5"/>
+				<button name="new_window_hover" label="" left_delta="3" width="24" bottom_delta="1" height="22" image_unselected="media_btn_newwindow.png" image_selected="media_btn_newwindow.png" 
+					scale_image="true"/>
+			</panel>
+    </layout_panel>
+		<layout_panel user_resize="false"/>
+	</layout_stack> 
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_media_remote.xml b/indra/newview/skins/default/xui/es/panel_media_remote.xml
new file mode 100644
index 000000000..86c977d06
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_media_remote.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="0"
+     enabled="true" follows="right|bottom" height="20" left="0"
+     name="media_remote" use_bounding_rect="true" width="220">
+	<panel bottom="1" filename="panel_bg_tab.xml" height="22" left="0" width="220" />
+	<panel bottom="3" filename="panel_media_controls.xml" height="20" left="0" width="220" />
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_media_remote_expanded.xml b/indra/newview/skins/default/xui/es/panel_media_remote_expanded.xml
new file mode 100644
index 000000000..726653614
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_media_remote_expanded.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="1"
+     follows="right|bottom" height="185" left="0" name="media_remote"
+     use_bounding_rect="true" width="220">
+	<panel bottom="0" filename="panel_bg_tab.xml" height="187" left="0" width="220" />
+	<panel border="false" bottom="22" filename="panel_audio.xml" height="160"
+	     label="Audio &amp; Video" name="Volume Panel" width="220" />
+	<panel bottom_delta="-10" filename="panel_media_controls.xml" left="0" />
+        	<string name="play_label">
+		Play
+	</string>
+	<string name="stop_label">
+		Stop
+	</string>
+	<string name="pause_label">
+		Pause
+	</string>
+	<string name="default_tooltip_label">
+		No Media Specified
+	</string>
+	<string name="media_hidden_label">
+		(URL hidden by parcel owner)
+	</string>
+	<string name="media_icon_tooltip_web">
+		This location displays content from the World Wide Web. Click the Play button to display Web content.
+	</string>
+	<string name="media_icon_tooltip_movie">
+		This location displays Video content. Click the Play button to play the video.
+	</string>
+	<string name="media_play_tooltip">
+		Display Web content at this location.
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_mini_map.xml b/indra/newview/skins/default/xui/es/panel_mini_map.xml
new file mode 100644
index 000000000..b5428190c
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_mini_map.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel background_opaque="false" background_visible="true" bg_alpha_color="NetMapBackgroundColor"
+	 border="false" follows="left|top|right|bottom" height="216" label="Mini Map"
+	 mouse_opaque="false" name="mini_mapview" width="196">
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+		 bottom="-40" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
+		 halign="left" height="10" left="80" mouse_opaque="false" name="n_label"
+		 text_color="1, 1, 1, 0.7" v_pad="0" width="10">
+		N
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+		 bottom="-80" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
+		 halign="left" height="10" left="120" mouse_opaque="false" name="e_label"
+		 text_color="1, 1, 1, 0.7" v_pad="0" width="10">
+		E
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+		 bottom="-120" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
+		 halign="left" height="10" left="80" mouse_opaque="false" name="s_label"
+		 text_color="1, 1, 1, 0.7" v_pad="0" width="10">
+		S
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+		 bottom="-80" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
+		 halign="left" height="10" left="40" mouse_opaque="false" name="w_label"
+		 text_color="1, 1, 1, 0.7" v_pad="0" width="11">
+		W
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+		 bottom="-60" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
+		 halign="left" height="10" left="100" mouse_opaque="false" name="ne_label"
+		 text_color="1, 1, 1, 0.7" v_pad="0" width="20">
+		NE
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+		 bottom="-100" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
+		 halign="left" height="10" left="100" mouse_opaque="false" name="se_label"
+		 text_color="1, 1, 1, 0.7" v_pad="0" width="20">
+		SE
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+		 bottom="-100" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
+		 halign="left" height="10" left="60" mouse_opaque="false" name="sw_label"
+		 text_color="1, 1, 1, 0.7" v_pad="0" width="21">
+		SW
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+		 bottom="-60" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
+		 halign="left" height="1-" left="60" mouse_opaque="false" name="nw_label"
+		 text_color="1, 1, 1, 0.7" v_pad="0" width="21">
+		NW
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_notifications_channel.xml b/indra/newview/skins/default/xui/es/panel_notifications_channel.xml
new file mode 100644
index 000000000..4e2339287
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_notifications_channel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="notifications_panel" width="100" height="100" user_resize="true" >
+  <layout_stack name="stack1" left="0" bottom="2" width="100" height="78" follows="left|right|top|bottom" orientation="horizontal" >
+    <scroll_list user_resize="true"  draw_heading="true" left="0" bottom="0" width="100" height="78" follows="left|right|top|bottom" name="notifications_list" sort_column="2" sort_ascending="false">
+      <column label="Name" name="name" width="100" user_resize="true"/>
+      <column label="Content" name="content" width="150" user_resize="true" dynamicwidth="true"/>
+      <column label="Date" name="date" width="150" user_resize="true"/>
+    </scroll_list>
+    <scroll_list user_resize="true"  draw_heading="true" left="0" bottom="0" width="100" height="78" follows="left|right|top|bottom" name="notification_rejects_list" sort_column="2" sort_ascending="false">
+      <column label="Name" name="name" width="100" user_resize="true"/>
+      <column label="Content" name="content" width="150" user_resize="true" dynamicwidth="true"/>
+      <column label="Date" name="date" width="150" user_resize="true"/>
+    </scroll_list>
+  </layout_stack>
+  <button name="header" label="" image="rounded_square.tga" left="0" bottom="-20" width="100" height="20" follows="left|right|top" toggle="true"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_overlaybar.xml b/indra/newview/skins/default/xui/es/panel_overlaybar.xml
new file mode 100644
index 000000000..090a164d8
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_overlaybar.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel follows="left|right|bottom|top" height="200" left="-1" mouse_opaque="false"
+     name="overlay" use_bounding_rect="true" width="728">
+	<layout_stack bottom="0" follows="left|right|bottom" height="200" left="0"
+	     mouse_opaque="false" name="overlay_layout_panel" orientation="horizontal"
+	     right="-1" use_bounding_rect="true">
+		<layout_panel auto_resize="true" bottom="0" left="0" min_width="420" mouse_opaque="false"
+		     use_bounding_rect="true" user_resize="false" width="420" name="main_panel">
+			<layout_stack bottom="0" follows="left|right|bottom|top" height="50" left="0"
+			     mouse_opaque="false" name="chatbar_and_buttons" orientation="vertical"
+			     right="420" use_bounding_rect="true">
+				<layout_panel auto_resize="true" bottom="0" follows="left|bottom|right|top" height="0"
+				     left="0" min_height="20" min_width="100" mouse_opaque="false"
+				     name="padding" use_bounding_rect="true" user_resize="false" width="420" />
+				<layout_panel auto_resize="false" bottom="0" follows="left|bottom|right|top" height="20"
+				     left="0" min_height="20" min_width="100" mouse_opaque="false"
+				     name="state_buttons" use_bounding_rect="true" user_resize="false"
+				     width="420">
+					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
+					     label="New IM" label_selected="New IM" left="0"
+					     name="New IM" scale_image="true"
+					     tool_tip="You have an instant message pending. Click to show IMs."
+					     width="102" />
+					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
+					     label="Set Not Busy" label_selected="Set Not Busy" left="114"
+					     name="Set Not Busy" scale_image="true"
+					     tool_tip="Chat and IM is hidden for you. Click here to set yourself not busy."
+					     width="102" />
+					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
+					     label="Flycam" label_selected="Flycam" left="229" name="Flycam" scale_image="true"
+					     tool_tip="Your camera is under joystick control, click here to release it."
+					     width="102" />
+					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
+					     label="Mouselook" label_selected="Mouselook" left="343" name="Mouselook"
+					     scale_image="true"
+					     tool_tip="Use mouse to steer your view. If you have a gun, clicking will shoot."
+					     width="102" />
+					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
+					     label="Stand Up" label_selected="Stand Up" left="457" name="Stand Up"
+					     scale_image="true" tool_tip="Click here to stand up." width="102" />
+          <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
+					     label="Cancel TP" label_selected="Cancel TP" left="571" name="Cancel TP"
+					     scale_image="true" tool_tip="Click here to cancel the current teleport process." width="102" />
+        </layout_panel>
+				<layout_panel auto_resize="false" background_visible="false" border="false" bottom="0"
+				     filename="panel_chat_bar.xml" follows="left|right|bottom" left="0"
+				     min_height="24" mouse_opaque="false" name="chat_bar"
+				     use_bounding_rect="true" width="395" />
+			</layout_stack>
+		</layout_panel>
+		<layout_panel auto_resize="false" bottom="0" left="0" min_width="96" mouse_opaque="false"
+			name="ao_remote_container" use_bounding_rect="true" user_resize="false"
+			width="100">
+			<panel background_visible="false" border="false" bottom="0" name="ao_remote" />
+		</layout_panel>
+		<layout_panel auto_resize="false" bottom="0" left="0" min_width="220" mouse_opaque="false"
+		     name="media_remote_container" use_bounding_rect="true" user_resize="false"
+		     width="220">
+			<panel background_visible="false" border="false" bottom="0" name="media_remote" />
+		</layout_panel>
+		<layout_panel auto_resize="false" bottom="0" left="0" min_width="130" mouse_opaque="false"
+		     name="voice_remote_container" use_bounding_rect="true" user_resize="false"
+		     width="128">
+			<panel background_visible="false" border="false" bottom="0" name="voice_remote" />
+		</layout_panel>
+		<layout_panel auto_resize="false" bottom="0" mouse_opaque="false"
+		     name="AdvSettings_container" use_bounding_rect="true" user_resize="false" min_width="30" >
+			<panel background_visible="false" border="false" bottom="0" name="Adv_Settings" />
+		</layout_panel>
+		<layout_panel auto_resize="false" bottom="0" mouse_opaque="false"
+		     name="AdvSettings_container_exp" use_bounding_rect="true" user_resize="false" min_width="200" >
+			<panel background_visible="false" border="false" bottom="0" name="Adv_Settings" />
+		</layout_panel>
+	</layout_stack>
+  <string name="unread_count_string_plural">
+    New IMs
+  </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_place.xml b/indra/newview/skins/default/xui/es/panel_place.xml
new file mode 100644
index 000000000..f3ccd14ce
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_place.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="false" bottom="20" can_close="true" can_minimize="true"
+     can_resize="false" follows="bottom|left" height="400" left="330"
+     name="Place" title="Place" width="450">
+	<texture_picker bottom="95" follows="left|top" height="300" left="20" name="snapshot_ctrl"
+	     width="400" />
+	<text bottom_delta="-10" follows="left|top" font="SansSerif" height="20" left="20" name="name_label">
+		Name:
+	</text>
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
+	     name="name_editor" width="361" />
+	<text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20" name="description_label">
+		Description:
+	</text>
+	<text_editor bottom_delta="-68" enabled="false" follows="left|top"
+	     font="SansSerif" height="70" left="20" max_length="1023" name="desc_editor"
+	     width="400" word_wrap="true" spell_check="true" />
+	<text bottom_delta="-25" follows="left|top" font="SansSerif" height="20" left="20" name="information_label">
+		Information:
+	</text>
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
+	     name="info_editor" width="328" />
+	<text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20" name="location_label">
+		Location:
+	</text>
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
+	     name="location_editor" width="342" />
+	<button bottom_delta="-20" follows="left|top" height="20" label="Teleport" left="20"
+	     name="teleport_btn" width="100" />
+	<button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="130"
+	     name="map_btn" width="100" />
+	<button bottom_delta="0" follows="left|top" height="20" label="Bids..." left="275"
+	     name="auction_btn" width="80" />
+	<string name="traffic_text">
+		Traffic: [TRAFFIC]
+	</string>
+	<string name="area_text">
+		Area: [AREA] m². 
+	</string>
+	<string name="forsale_text">
+		For Sale for [CURRENCY][PRICE]
+	</string>
+	<string name="auction_text">
+		Auction ID [ID].
+	</string>
+	<string name="server_update_text">
+		Place information not available without server update.
+	</string>
+	<string name="server_error_text">
+		Information about this location is unavailable at this time, please try again later.
+	</string>
+	<string name="server_forbidden_text">
+		Information about this location is unavailable due to access restrictions.  Please check your permissions with the parcel owner.
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_place_small.xml b/indra/newview/skins/default/xui/es/panel_place_small.xml
new file mode 100644
index 000000000..989077272
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_place_small.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="false" bottom="20" can_close="true" can_minimize="true"
+     can_resize="false" follows="bottom|left" height="400" left="380"
+     name="Place" title="Place" width="450">
+	<texture_picker bottom="-274" follows="left|top" height="270" left="20" name="snapshot_ctrl"
+	     width="360" />
+	<text bottom_delta="-12" follows="left|top" font="SansSerif" height="20" left="20" name="name_label">
+		Name:
+	</text>
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
+	     name="name_editor" width="320" />
+	<text bottom_delta="-24" follows="left|top" font="SansSerif" height="20" left="20" name="description_label">
+		Description:
+	</text>
+	<text_editor bg_readonly_color="clear" bottom_delta="-68" enabled="false" follows="left|top"
+	     font="SansSerif" height="70" left="20" max_length="1023" name="desc_editor"
+	     width="360" word_wrap="true" spell_check="true" />
+	<text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20" name="information_label">
+		Information:
+	</text>
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
+	     name="info_editor" width="328" />
+	<text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20" name="land_type_label">
+		Land Type:
+	</text>
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
+	     name="land_type_display" width="342" />
+	<text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20" name="location_label">
+		Location:
+	</text>
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
+	     name="location_editor" width="342" />
+	<button bottom_delta="-25" follows="left|top" height="20" label="Teleport" left="20"
+	     name="teleport_btn" width="100" />
+	<button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="130"
+	     name="map_btn" width="100" />
+	<button bottom_delta="0" follows="left|top" height="20" label="Bids..." left="275"
+	     name="auction_btn" width="80" />
+	<string name="traffic_text">
+		Traffic: [TRAFFIC]
+	</string>
+	<string name="area_text">
+		Area: [AREA] m². 
+	</string>
+	<string name="forsale_text">
+		For Sale for [CURRENCY][PRICE]
+	</string>
+	<string name="auction_text">
+		Auction ID [ID].
+	</string>
+	<string name="server_update_text">
+		Place information not available without server update.
+	</string>
+	<string name="server_error_text">
+		Information about this location is unavailable at this time, please try again later.
+	</string>
+	<string name="server_forbidden_text">
+		Information about this location is unavailable due to access restrictions.  Please check your permissions with the parcel owner.
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_ascent_chat.xml
new file mode 100644
index 000000000..8b565a950
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_chat.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Chat Avanzado" name="ascsys">
+	  <tab_container label="Chat Avanzado" name="Ascent Chat">
+			 <panel label="Chat/MI" name="Chat/IM">
+					<text name="objects_link_text_box">
+						  MIs:
+					</text>
+					<check_box label="Usar Pestañas de MI Verticales (Requiere reiniciar)" name="use_vertical_ims_check"/>
+					<check_box label="Anunciar Mensajes Instantáneos Entrantes" tool_tip="Abre una ventana de MI cuando alguien comienza a escribirte un MI. Esto te permite conocer cuando alguien te abre un MI antes de enviartelo." name="quickstart_im_check"/>
+					<check_box label="No enviar '[nombre] está escribiendo...'  en MIs" tool_tip="Tu contacto de MI no verá '______ está escribiendo...' cuando le respondes." name="hide_typing_check"/>
+					<check_box label="Mostrar nombre del grupo en el chat" tool_tip="El nombre del grupo también será mostrado si el MI es de un chat de grupo." name="append_group_name_check"/>
+					<!-- Left/Right Column split  
+					<view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"	left="235" name="CmdDivisor" width="0"/>
+					-->
+					<text name="objects_link_text_box2">
+						  Chat:
+					</text>
+					<check_box label="Ejecutar sonido de escritura en chat local" tool_tip="Silencia el sonido de escritura, haciendo que determinadas cosas sean mas tranquilas, como las actuaciones en vivo." name="play_typing_sound_check"/>
+					<check_box label="No Mostrar/registrar notificaciones en chat" name="hide_notifications_in_chat_check"/>
+					<check_box label="Permitir Método MU pose." tool_tip="Permite el uso de  /me y :  para enviar emotes." name="allow_mu_pose_check"/>
+					<check_box label="Cerrar Automáticamente comentarios OOC." tool_tip="Agregar automáticamente al final '))' en cualquier mensaje que comience con '((', o viseversa." name="close_ooc_check"/>
+					<text name="objects_link_text_box3">
+						  Mostrar en el historial de chat links de chat de objetos para:
+					</text>
+					<radio_group tool_tip="Habilitar link para mostrar al propietario de un objeto de chat." name="objects_link">
+						  <radio_item name="no_object">
+								 Ningún Objeto
+						  </radio_item>
+						  <radio_item name="others_objects">
+								 Objetos de Otros
+						  </radio_item>
+						  <radio_item name="anyones_objects">
+								 Objetos de Cualquiera
+						  </radio_item>
+					</radio_group>
+					<text name="time_format_text_box">
+						  Formato de Hora:
+					</text>
+					<combo_box tool_tip="Muestras las horas o bien en formato 12-23 o 12PM-11PM." name="time_format_combobox">
+						  <combo_item name="24hours">
+								 Reloj de 24-horas
+						  </combo_item>
+						  <combo_item name="12hours">
+								 Reloj de 12-horas
+						  </combo_item>
+					</combo_box>
+					<check_box label="Agregar segundos en la hora del chat/IMs" name="seconds_in_chat_and_ims_check"/>
+					<text name="date_format_text_box">
+						  Formato de Fecha:
+					</text>
+					<combo_box name="date_format_combobox">
+						  <combo_item name="year_first">
+								 YYYY-MM-DD
+						  </combo_item>
+						  <combo_item name="day_first">
+								 DD/MM/YYYY
+						  </combo_item>
+						  <combo_item name="month_first">
+								 MM/DD/YYYY
+						  </combo_item>
+					</combo_box>
+					<!-- Auto-responder -->
+					<check_box label="Habilitar Respuesta Automática" name="AscentInstantMessageResponseAnyone" tool_tip=" Envia un mensaje pre-grabado de tu elección cuando alguien te abre un IM. (Escribe tu mensaje en el área de texto  de la Ventana Texto de Respuesta."/>
+					<check_box label="Responder a no amigos" name="AscentInstantMessageResponseFriends" tool_tip="Envia un mensaje pre-grabado de tu elección cuando alguien te abre un IM. (Escribe tu mensaje en el área de texto  de la Ventana Texto de Respuesta."/>
+					<check_box label="Responder a quienes tienes ignorados" name="AscentInstantMessageResponseMuted" tool_tip="Envia un mensaje pre-grabado de tu elección cuando alguien te abre un IM. (Escribe tu mensaje en el área de texto  de la Ventana Texto de Respuesta."/>
+					<check_box label="Enviar apenas comienzan a escribir" name="AscentInstantMessageShowOnTyping"/>
+					<check_box label="No mostrar MIs contestados automáticamente" name="AscentInstantMessageShowResponded"/>
+					<check_box label="Responder a todos los mensajes" name="AscentInstantMessageResponseRepeat"/>
+					<check_box label="Enviar un item junto con la respuesta" name="AscentInstantMessageResponseItem" tool_tip="Puedes incluir un item de tu inventario para enviar junto con tu respuesta automática, arrástrandolo desde tu inventario al cuadro inferior"/>
+					<text name="text_box1">
+						  Texto de Respuesta:
+					</text>
+					<text name="text_box2">
+#f nombre de usuario, #l apellido del usuario,
+#t para fecha y hora, #r para tu SLURL,
+#i tu tiempo inactivo. (p.e. "5 mins")
+					</text>
+			 </panel>
+
+			 <panel label="Spam" name="Spam">
+					<check_box label="Habilitar bloqueo de spam en chat" tool_tip="Habilita el bloqueo automático de spam en el chat" name="AscChatSpamBlock" control_name="SGBlockChatSpam"/>
+					<spinner label="Mensajes" tool_tip="Número de items de spam por tiempo. (Por Defecto: 10)" name="AscChatSpamCount"/>
+					<spinner label="Tiempo" name="AscChatSpamTime" tool_tip="Tiempo para evaluar el spam, en segundos. (Por defecto: 1.0)"/>
+					<text name="">
+						  segundos
+					</text>
+					<check_box label="Habilitar bloqueo de spam en Diálogos" tool_tip="Habilita el bloqueo automático del spam en ventanas de diálogo" name="AscDialogSpamBlock"/>
+					<check_box label="Habilitar bloqueo de Spam en Tarjetas de Llamada" tool_tip="Habilita el bloqueo automático del spam en Tarjetas de Llamada" name="AscCardSpamBlock"/>
+					<spinner label="Cantidad" name="AscSpamCount" tool_tip="Esta configuración se aplica tanto al Spam en ventanas de Diálogo como en Tarjetas de Llamada (Por Defecto: 4)"/>
+					<spinner label="Tiempo" name="AscSpamTime" tool_tip="Esta configuración se aplica tanto al Spam en ventanas de Diálogo como en Tarjetas de Llamada (Por Defecto: 1.0)"/>
+					<text name="">
+						  segundos
+					</text>
+			 </panel>
+
+			 <panel label="Opciones de Texto" name="TextOptions">
+					<check_box label="Mostrar en rojo palabras mal escritas" name="SpellDisplay"/>
+					<text name="EmSpell_txt1">
+						  Idioma actual (dicxionario):
+					</text>
+					<combo_box name="SpellBase"/>
+					<text name="EmSpell_txt3">
+						  Idiomas descagarados (diccionarios):
+					</text>
+					<combo_box name="EmSpell_Avail"/>
+					<button label="Instalar" name="EmSpell_Add" tool_tip=""/>
+					<button label="Descargar Más..." name="EmSpell_GetMore" tool_tip="Obtener más diccionarios disponibles en línea"/>
+					<text name="EmSpell_txt2">
+						  Idiomas Personalizados Adicionales (diccionarios):
+					</text>
+					<combo_box name="EmSpell_Installed" tool_tip=""/>
+					<button label="Quitar" name="EmSpell_Remove" tool_tip=""/>
+					<button label="Editar Diccionario Personalizado" name="EmSpell_EditCustom"/>
+					<text name="EmSpell_txt4">
+Para usar el corrector ortográfico, botón derecho sobre la palabra
+errónea (en rojo u otro color) y selecciona reemplazarla
+					</text>
+
+					<check_box label="Resaltar Mensajes que contengan los términos" name="KeywordsOn"/>
+					<text name="keyword_txt1">
+						  (separados por comas)
+					</text>
+					<text name="EmKeyw">
+						  Se encuentre en:
+					</text>
+					<check_box label="Flotante de Chat Local" name="KeywordsInChat"/>
+					<check_box label="Flotante de Mensajes Instantáneos" name="KeywordsInIM"/>
+					<check_box label="Resaltar el Mensaje en este color:" name="KeywordsChangeColor"/>
+					<color_swatch name="KeywordsColor" tool_tip="Pulsa para abrir el selector de Colores"/>
+					<check_box label="Ejecutar este sonido de alerta: (UUID)" name="KeywordsPlaySound"/>
+			 </panel>
+
+	  </tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
new file mode 100644
index 000000000..0b4387f74
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Sistema" name="ascsys">
+	  <tab_container label="Sistema Singularity" name="Ascent System">
+			 <panel label="General" name="User Interface">
+					<check_box label="Habilitar Teleport con doble click" tool_tip="Haciendo doble click en un objeto o persona te transportará hacia su ubicación." name="double_click_teleport_check"/>
+					<check_box label="Reiniciar la Cámara luego de Teleportar" tool_tip="Centra la cámara detrás tuyo luego de un teleport." name="center_after_teleport_check"/>
+					<check_box label="Desplazar destino TP a mitad de la altura del agente" tool_tip="Intenta apuntar el TP de modo que tus pies se apoyen en la tierra del punto al que estás apuntando." name="offset_teleport_check"/>
+					<check_box label="Vista Previa de Animaciones en el avatar en vez del maniquí antes de usar" tool_tip="La ventana de subida de Animaciones ejecutará las animaciones en tu avatar cuando ejecutes la vista previa." name="preview_anim_in_world_check"/>
+					<check_box label="Guardar los Scripts en el inventario como Mono en vez de LSL2" tool_tip="Los Scripts serán compilados automáticamente en Mono al guardarlos - Normalmente es sólo posible cuando están dentro de un objeto." name="save_scripts_as_mono_check"/>
+					<check_box label="Siempre rezear objetos con el grupo del terreno, cuando esté disponible" tool_tip="Rezear objetos con el mismo grupo del terreno sin importar tu grupo activo en el momento." name="always_rez_in_group_check"/>
+					<check_box label="Mostrar siempre el botón Construir como habilitado" tool_tip="Te habilita a utilizar el menu Construir sin tener que complicarte. No significa que puedas construir donde no esté permitido." name="always_build_check"/>
+					<check_box label="Permitir siempre volar" tool_tip="Te permite volar en lugares donde no está permitido. Utilizalo bajo tu responsabilidad, que puedas no significa que debas." name="always_fly_check"/>
+					<check_box label="Deshabilitar la Distancia Mínima de la Cámara" tool_tip="Permite a la cámara acercarse a los objetos." name="disable_camera_zoom_check"/>
+					<check_box label="Habilitar la funcionalidad Super Usuario" tool_tip="Agrega funciones consideradas demasiado peligrosas para un uso normal. Estas características pueden causar estragos, o hacer daño si son mal utilizadas - Principalmente para ti o tus pertenencias. Si estás seguro, activa la casilla de verificación a continuación." name="power_user_check"/>
+					<check_box label="Confirmar funcionalidad Super Usuario" tool_tip="Confirmar la activación de Super Usuario. Activalo bajo tu propio riesgo, y utiliza cualquier característica habilitada en forma responsable. Los desarrolladores de Singularity no reemplazarán nada que hayas arruinado. Te recomendamos hacer una copia de seguridad de todo aquello que será víctima de dichos poderes. A diferencia del resto de los items a marcar, debes hacer click en Aplicar o en OK después de activar esta función." name="power_user_confirm_check"/>
+					<check_box label="Activar Sistema Ascent de Inventario (Requiere Reinicio)" tool_tip="Crea una nueva carpeta en el inventario para almacenar archivos de configuración y assets no permanentes." name="system_folder_check"/>
+					<check_box label="Colocar las Subidas Temporales en la carpeta de asset del sistema." tool_tip="Coloca las subidas temporales en la carpeta de Assets, la cual está separada de las subidas actuales, haciendo que sean más fáciles de encontrar." name="temp_in_system_check"/>
+					<check_box label="Descargar automáticamente el inventario en segundo plano al de iniciar sesión" tool_tip="El inventario será precargado cuando inicies sesión, de esta manera no tienes que esperar que cargue cuando hagas una búsqueda por primera vez." name="fetch_inventory_on_login_check"/>
+					<check_box label="Activar Efectos del Viento" name="enable_wind"/>
+					<check_box label="Activar Nubes" name="enable_clouds"/>
+					<check_box label="Activar Nubes Clásicas" name="enable_classic_clouds"/>
+					<check_box label="Activar rezeado rápido vía distancia de dibujo paso a paso" name="speed_rez_check" tool_tip="Cuando está activo, esto incrementará progresivamente la distancia de dibujo, lo que permite que los objetos mas cercanos aparezcan primero."/>
+					<spinner label="Frecuencia de Distancia de Dibujo:" name="speed_rez_interval" />
+					<text name="speed_rez_seconds">
+						  segundos
+					</text>
+			 </panel>
+
+			 <panel label="Línea de Comandos" name="Command Line">
+					<check_box label="Activar uso de la barra de chat como línea de comandos" name="chat_cmd_toggle"/>
+					<text name="cmd_line_text_2">
+						  Teleportar en el sim (uso: cmd x y z)
+					</text>
+					<text name="cmd_line_text_3">
+						  Teleportar a la superficie (uso: cmd)
+					</text>
+					<text name="cmd_line_text_4">
+						  Teleportar a la altura (uso: cmd z)
+					</text>
+					<text name="cmd_line_text_5">
+						  Teleportar a Base (uso: cmd)
+					</text>
+					<text name="cmd_line_text_6">
+						  Rezear una Plataforma (uso: cmd 0 - 30)
+					</text>
+					<slider name="AscentPlatformSize" label="Ancho Predet.:" tool_tip="Tamaño que tendrá la plataforma"/>
+					<text name="cmd_line_text_8">
+						  Calc. expresiones (uso: cmd 2 + 2)
+					</text>
+					<text name="cmd_line_text_15">
+						  Limpiar historial de chat (uso: cmd)
+					</text>
+					<line_editor tool_tip="Limpia el Historial de chat para evitar el lag por efecto de los spammers de chat." name="AscentCmdLineClearChat"/>
+					<!-- Column Split -->
+					<text name="cmd_line_text_9">
+						  Cambiar Distancia de Dibujo (uso: cmd metros)
+					</text>
+					<text name="cmd_line_text_10">
+						  Teleportar a posición de la cámara (uso: cmd)
+					</text>
+					<text name="cmd_line_text_11">
+						  Nombre de avatar de su UUID (uso: cmd key)
+					</text>
+					<text name="cmd_line_text_12">
+						  Ofrecer Teleport a otro Avatar (uso: cmd key)
+					</text>
+					<text name="cmd_line_text_7">
+						  Teleportar a Sim x (uso: cmd Nombre del Sim)
+					</text>
+					<check_box label="Usar misma posición entre Sims" name="map_to_keep_pos"/>
+					<text name="cmd_line_text_13">
+						  Teleportar hasta avatar (uso: cmd nombre)
+					</text>
+					<line_editor tool_tip="La sintaxis de este comando permite nombres parciales y no es sensible a mayúsculas/minúsculas. Para obtener mejores resultados, úsalo con el radar abierto." name="AscentCmdLineTP2"/>
+					<text name="cmd_line_text_14">
+						  Cambiar falso estado Aussente (uso: cmd)
+					</text>
+			 </panel>
+
+			 <panel label="Seguridad" name="Security">
+					<check_box label="Transmitir efectos del Visor (No incluye rayos)" name="broadcast_viewer_effects"/>
+					<check_box label="Desactivar Apuntar a... y Rayos" tool_tip="No apunta hacia ni muestra tus rayos de edición cuando seleccionas un objeto." name="disable_point_at_and_beams_check"/>
+					<check_box label="No mirar hacia los Objetos (anula ShowLookAt)" tool_tip="Apaga la tansmisión de los giros de cabeza y rayos lookat propios." name="private_look_at_check"/>
+					<check_box label="Mostrar las balizas LookAt de los demás" tool_tip="Te muestra hacia donde miran los demas." name="show_look_at_check"/>
+					<check_box label="Captura silenciosa a Disco" tool_tip="Anula el sonido de la cámara y el alerta a los demás cuando realizas una captura al disco de tu PC" name="quiet_snapshots_check"/>
+					<check_box label="Al pararse, revoca el permiso de los objetos en los cuales estuvo sentado tu avatar" tool_tip="Los objetos retienen, generalmente, el permiso para tomar control y ejecutar animaciones hasta que se reinician u otro usuario le cede permisos. Activando esta opción te aseguras que los permisos serán revocados inmediatamente." name="revoke_perms_on_stand_up_check"/>
+					<check_box label="Desactivar click del ratón para sentarse en los objetos" tool_tip="Algunas herramientas de griefer se basan en forzarte o engañarte para que hagas click en un objeto el cual te hará sentar, dándole automáticamente al objeto permisos para ejecutar una animación entre de otras cosas. Esta opción desactivará la función llSitTarget - Esto significa que deberás seleccionar la opción 'Sentarse' en las bolas de animación o muebles." name="disable_click_sit_check"/>
+					<check_box label="Mostrar cambios del Total de Scripts en Ejecución:" name="totalscriptjumps" tool_tip="Muestra los cambios en la cuenta total de scritps en tu región, dependiendo del umbral que selecciones a la derecha."/>
+					<spinner left_delta="350" name="ScriptJumpCount" tool_tip="Umbral para el mensaje de salto de scripts [Predeterminado: 100]"/>
+			 </panel>
+
+			 <panel label="Construcción" name="Building">
+					<text name="text_box6">
+						  Punto de Pivote
+					</text>
+					<spinner label="Pos. X" name="X pos"/>
+					<spinner label="Pos. Y" name="Y pos"/>
+					<spinner label="Pos. Z" name="Z pos"/>
+					<check_box label="Los valores son en porcentaje" tool_tip="Los ajuste predeterminados se expresan en porcentajes y cada eje se ajusta en 50" name="EmPivotPercToggle"/>
+					<check_box label="Activar resaltado de prims seleccionados" name="EmBuildPrefsRenderHighlight_toggle" />
+					<check_box label="Mostrar Ejes en la posición del Prim Base" tool_tip="El comportamiento por defecto es mostrar el eje en el centro del conjunto de prims. Si está activado, el eje se muestra en la prim raíz del conjunto de enlaces." name="EmBuildPrefsActualRoot_toggle"/>
+					<text name="text_box7">
+						  Permitir sig. propietario:
+					</text>
+					<check_box label="Permiso de Copia" tool_tip="El próximo propietario puede realizar copias de las creaciones" name="next_owner_copy"/>
+					<check_box label="Permiso de Modific." tool_tip="El próximo propietario puede editar y modificar las creaciones" name="next_owner_modify"/>
+					<check_box label="Permiso de Transf." tool_tip="Next owner can give(or sell) creations" name="next_owner_transfer" control_name="NextOwnerTransfer"/>
+					<texture_picker label="     Textura" name="texture control" tool_tip="Pulsa para seleccionar una textura"/>
+					<check_box label="Fantasma" name="EmPhantomToggle"/>
+					<check_box label="Físico" name="EmPhysicalToggle"/>
+					<check_box label="Temporal" name="EmTemporaryToggle"/>
+					<combo_box name="material">
+						  <combo_item name="Stone">
+								 Piedra
+						  </combo_item>
+						  <combo_item name="Metal">
+								 Metal
+						  </combo_item>
+						  <combo_item name="Glass">
+								 Vidrio
+						  </combo_item>
+						  <combo_item name="Wood">
+								 Madera
+						  </combo_item>
+						  <combo_item name="Flesh">
+								 Carne
+						  </combo_item>
+						  <combo_item name="Plastic">
+								 Plástico
+						  </combo_item>
+						  <combo_item name="Rubber">
+								 Caucho
+						  </combo_item>
+					</combo_box>
+					<color_swatch label="      Color" name="colorswatch" tool_tip="Pulsa para abrir el selector de color"/>
+					<spinner label="Alfa" name="alpha" />
+					<spinner label="Brillo" name="glow"/>
+					<check_box label="Brillo Total" name="EmFBToggle"/>
+					<text follows="top">
+						  Brillar
+					</text>
+					<combo_box label="Brillo" name="combobox shininess" tool_tip="Fijar la intensidad de brillo para el objeto">
+						  <combo_item name="None">
+								 Ninguno
+						  </combo_item>
+						  <combo_item name="Low">
+								 Bajo
+						  </combo_item>
+						  <combo_item name="Medium">
+								 Medio
+						  </combo_item>
+						  <combo_item name="High">
+								 Alto
+						  </combo_item>
+					</combo_box>
+					<check_box name="EmeraldBuildPrefsEmbedItem" label="Colocar un item dentro del nuevo objeto"/>
+					<check_box name="EmeraldBuildPrefsEmbedItem" label="Colocar un item dentro del nuevo objeto"/>
+					<text name="Give inventory">
+						  Soltar aquí item de Invent.
+					</text>
+					<text name="build_item_add_disp_rect_txt">
+						  Fijado Actualmente:
+ITEM
+					</text>
+					<spinner label="Tam.X" name="X size"/>
+					<spinner label="Tam. Y" name="Y size"/>
+					<spinner label="Tam.Z" name="Z size"/>					
+			 </panel>
+	  </tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
new file mode 100644
index 000000000..b4152c996
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Vanity" name="ascvan">
+	  <tab_container label="Singularity Vanity" name="Ascent Vanity">
+			 <panel label="Principal  (General)" name="General">
+					<check_box label="Cuando se aplicable, guardar Ajustes Vaninty por cuenta." tool_tip="Guarda ajustes individuales por cuenta, permitiendo una mas fácil personalización de Alts." name="use_account_settings_check"/>
+					<check_box label="Ocultar pantalla de progreso de Telerport" tool_tip="Activado, el visor ocultará la pantalla de progreso de Teleportación, pemitiendo leer MIs.." name="disable_tp_screen_check"/>
+					<check_box label="Reproducir sonidos de teleport cuando al cambiar de sim" tool_tip="El Visor reproducirá el sonido de trnasportación al hacer un teleport." name="tp_sound_check"/>
+					<check_box label="Ocultar la pantalla de inicio/cierre de sesión" tool_tip="Marcadao, el visor ocultará la pantalla de progreso de inicio/cierre de sesión." name="disable_logout_screen_check"/>
+					<check_box label="Desactivar animaciones de chat, susurro y gritos" tool_tip="Quiar las animaciones de tu avatar. El efecto es visible para todos" name="disable_chat_animation"/>
+			 </panel>
+			 <panel label="Tags/Colores" name="TagsColors">
+					<!-- Client tag options -->
+					<check_box label="Usar Tag de Visor:" left="10" tool_tip="Activándolo mostrará el tag de tu visor, en forma local, sobre tu nombre de avatar." name="show_my_tag_check"/>
+					<combo_box tool_tip="Tag del Visor ( Y colores subsecuentes) a transmitir. Sobreescribir en forma local por Tag/Colores personalizados." name="tag_spoofing_combobox">
+						  <combo_item name="Singularity" >
+								 Singularity
+						  </combo_item>
+					</combo_box>
+					<check_box label="Mostrarte tag de cliente" tool_tip="Elige el color que verás del tag de tu visor." name="show_self_tag_check"/>
+					<check_box label="Mostrarte color del tag de cliente" tool_tip="Activándolo,  ajustará el nombre de avatar en el color de tu cliente o en el color personalizado." name="show_self_tag_color_check"/>
+					<check_box label="Ver tags de amigos como (Amigo)" tool_tip="Activándolo cambia el tag de cliente de tus amigos a (Amigo)." name="show_friend_tag_check"/>
+					<!-- End of Left Side -->
+					<check_box label="Usar color y etiqueta personalizadas (Sólo local)" tool_tip="Activándolo te permitirá ajustar tu tag de nombre para mostrar con tu tag de cliente y color  personalizados. Esto sólo funciona para ti mismo." name="customize_own_tag_check"/>
+					<text bottom_delta="-17" left_delta="25" follows="top" height="10" name="custom_tag_label_text">
+						  Etiqueta:
+					</text>
+					<line_editor left_delta="45" name="custom_tag_label_box" tool_tip="Texto personalizado que usarás para reemplazar el tag de tu visor (Sólo Local)"/>
+					<text name="custom_tag_color_text">
+						  Color:
+					</text>
+					<color_swatch name="custom_tag_color_swatch" tool_tip="Color personalizado que usarás para reemplazar el color del tag de tu visor (Sólo Local)"/>
+					<check_box label="Mostrar Tag de Visor de los demás" tool_tip="Activándolo mostrará el nombre de Tag de visor sobre los nombres de avatar de otros usuarios." name="show_other_tag_check"/>
+					<check_box label="Mostrar color de Tag de visor de los demás" tool_tip="Activándolo fijará el color del tag del visor de los demás a su propio color." name="show_client_tag_color_check"/>
+					<check_box label="Mostrar tiempo inactivo" tool_tip="Activándolo mostrará la cantidad de tiempo que el avatar está inactivo." name="show_idle_time_check"/>
+					<check_box label="Chequear automáticamente actualizaciones de clientes" tool_tip="Activándolo permite a Singularity descargar nuevas definiciones de clientes cuando sea necesario." name="update_tags_check"/>
+					<button name="update_clientdefs" label="Actualización Manual" height="18" left_delta="310" width="150"/>
+					<!-- End of Client Tag settings -->
+					<text name="effects_color_textbox">
+						  Color para Mis Efectos:
+					</text>
+					<color_swatch label="Efectos" name="effect_color_swatch"/>
+					<check_box label="Utilizar Color de Tipo de usuario (Amigo, Linden, etc.)" left="10" tool_tip="Activándolo mostrará con el color definido abajo a la gente que cumple con determinado criterio de tipo de usuario (Lindens, Propietarios de Estado, amigo, usuarios bloquedos)." name="use_status_check"/>
+					<text name="friends_color_textbox">
+						  Color Para:
+(Radar, Tag, Minimap)</text>
+					<color_swatch label="Amigos" name="friend_color_swatch" tool_tip="Color para los amigos"/>
+					<color_swatch label="Estado" name="estate_owner_color_swatch" tool_tip="Color para Administrador de Regiones"/>
+					<color_swatch label="Lindens" name="linden_color_swatch" tool_tip="Color para empleados de Linden Lab"/>
+					<color_swatch label="Ignorados" name="muted_color_swatch" tool_tip="Color para usuarios ignorados o bloqueados"/>
+			 </panel>
+			 <panel label="Fiísica de Avatar" name="Body Dynamics">
+					<check_box label="Activar física avanzada de los senos del avatar" name="EmBreastsToggle" tool_tip="Deberás seleccionar Aplicar para activar o desactivar estos controles"/>
+					<slider name="EmeraldBoobMass" label="Masa del Seno:"/>
+					<slider name="EmeraldBoobHardness" label="Rebote de Seno:" />
+					<slider name="EmeraldBoobVelMax" label="Vel.Máx. Senos:" />
+					<slider name="EmeraldBoobFriction" label="Fricción de Senos:"/>
+					<slider name="EmeraldBoobVelMin" label="Vel.Mín.Senos:"/>
+					<text name="av_mod_textbox">
+						  Modificar Desplazamientos del Avatar
+					</text>
+					<spinner label="Modificador X" name="X Modifier" tool_tip="Utiliza esto para manipular, en grados, el delimitador del avatar. Puede ser utilizado para distorsionar las órbitas, o para elevar o aumentar los senos sin alterar el cuerpo del avatar." width="133" label_width="70"/>
+					<spinner label="Modificador Y" name="Y Modifier" tool_tip="Utiliza esto para manipular, en grados, el delimitador del avatar. Puede ser utilizado para distorsionar las órbitas, o para elevar o aumentar los senos sin alterar el cuerpo del avatar." width="133" label_width="70"/>
+					<spinner label="Modificador Z" name="Z Modifier" tool_tip="Utiliza esto para manipular, en grados, el delimitador del avatar. Puede ser utilizado para distorsionar las órbitas, o para elevar o aumentar los senos sin alterar el cuerpo del avatar." width="133" label_width="70"/>
+			 </panel>
+	  </tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_audio.xml b/indra/newview/skins/default/xui/es/panel_preferences_audio.xml
new file mode 100644
index 000000000..5f594fc71
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_audio.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Audio y Video" name="Media panel">
+	  <text name="muting_text">
+			 Volumen:
+	  </text>
+	  <text name="streaming_prefs_text">
+			 Preferencias de Streaming:
+	  </text>
+	  <text name="audio_prefs_text">
+			 Preferencias de Audio:
+	  </text>
+	  <panel label="Volumen" name="Volume Panel"/>
+			 <check_box label="Reproducir Música cuando esté disponible (usa más ancho de banda)" name="streaming_music"/>
+			 <check_box label="Reproducir Media cuando esté disponible (usa más ancho de banda)" name="streaming_video"/>
+			 <check_box label="Reproducir Media Automáticamente" name="auto_streaming_video"/>
+			 <check_box label="Solicitar Permiso (Activar Filtro de Media)" name="streaming_video"/>
+			 <check_box label="Silenciar audio al minimizar la ventana" name="mute_when_minimized"/>
+			 <slider label="Efecto Doppler" name="Doppler Effect"/>
+			 <slider label="Factor de Atenuación" name="Rolloff Factor"/>
+			 <spinner label="Informar transacción de [CURRENCY] desde:" name="currency_change_threshold" label_width="170" width="234"/>
+			 <spinner label="Informar Estado de vida desde:" name="Health Change Threshold" label_width="170" width="234"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
new file mode 100644
index 000000000..5c8d05248
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Chat de Texto" name="chat">
+	  <text name="text_box">
+			 Tamaño Fuente de Chat:
+	  </text>
+	  <radio_group name="chat_font_size">
+			 <radio_item name="radio">
+					Pequeño
+			 </radio_item>
+			 <radio_item name="radio2">
+					Medio
+			 </radio_item>
+			 <radio_item name="radio3">
+					Grande
+			 </radio_item>
+	  </radio_group>
+	  <text name="text_box2">
+			 Color de Chat:
+	  </text>
+	  <color_swatch label="Tu" name="user"/>
+	  <color_swatch label="Otros" name="agent"/>
+	  <color_swatch label="MI" left_delta="54" name="im" width="44"/>
+	  <color_swatch label="Sistema" name="system"/>
+	  <color_swatch label="Errores" name="script_error"/>
+	  <color_swatch label="Objetos" name="objects"/>
+	  <color_swatch label="Propietario" name="owner"/>
+	  <color_swatch label="Burbuja" name="background"/>
+	  <color_swatch label="URLs" name="links"/>
+	
+	  <text name="text_box3">
+			 Consola de Chat:
+	  </text>
+	  <spinner label="Desvanecer Chat tras" name="fade_chat_time" label_width="107" width="160"/>
+	  <text name="text_box4"  left="312" >
+			 (segundos)
+	  </text>
+	  <spinner left="370" name="max_chat_count"/>
+	  <text left="435" name="text_box5">
+			 (# líneas)
+	  </text>
+	  <slider label="Opacidad" name="console_opacity"/>
+	  <check_box label="Usar Ancho completo de pantalla (Requeire reinicio)" name="chat_full_width_check"/>
+	  <text name="text_box6" >
+			 Opciones de Chat:
+	  </text>
+	  <check_box label="Cerrar barra de chat al presionar Intro" name="close_chat_on_return_check"/>
+	  <check_box label="Las teclas de cursor siempre mueven al avatar al chatear" name="arrow_keys_move_avatar_check"/>
+	  <check_box label="Mostrar horario en el chat local" name="show_timestamps_check"/>
+	  <check_box label="Mostrar errores de scripts y avisos como chat regular" name="script_errors_as_chat"/>
+	  <check_box label="Ejecutar animación de escribir al chatear" name="play_typing_animation"/>
+	  <text name="text_box7">
+			 Burbuja de Chat:
+	  </text>
+	  <check_box label="Mostrar Burbuja de chat" name="bubble_text_chat"/>
+	  <slider label="Opacidad" name="bubble_chat_opacity"/>
+<!--
+	<text bottom="-410" height="10" left="12" name="text_translate_chat">Translate Chat:</text>
+	<check_box bottom="-417" control_name="TranslateChat" height="16" initial_value="false" label="Use machine translation while chatting (powered by Google)" left="148" name="translate_chat"/>
+	<text bottom="-432" height="10" left="149" name="text_translate_chat">Translate into this language:</text>	
+		<combo_box allow_text_entry="true" bottom="-438" follows="top" height="16" left_delta="183" max_chars="135" name="translate_language_combobox" width="146">
+		<combo_item name="System Default Language" value="default">System Default</combo_item>
+		<combo_item name="English" value="en">English</combo_item>
+		<!- 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 name="Danish" value="da">Dansk (Danish)</combo_item>
+		<combo_item name="Deutsch(German)" value="de">Deutsch (German)</combo_item>
+		<combo_item name="Spanish" value="es">Español (Spanish)</combo_item>
+		<combo_item name="French" value="fr">Français (French)</combo_item>
+		<combo_item name="Italian" value="it">Italiano (Italian)</combo_item>
+		<combo_item name="Hungarian" value="hu">Magyar (Hungarian)</combo_item>
+		<combo_item name="Dutch" value="nl">Nederlands (Dutch)</combo_item>
+		<combo_item name="Polish" value="pl">Polski (Polish)</combo_item>
+		<combo_item name="Portugese" value="pt">Portugués (Portuguese)</combo_item>
+ 		<combo_item name="Russian" value="ru">Ру��кий (Russian)</combo_item>
+		<combo_item name="Turkish" value="tr">Türkçe (Turkish)</combo_item>
+ 		<combo_item name="Ukrainian" value="uk">Україн�ька (Ukrainian)</combo_item>
+		<combo_item name="Chinese" value="zh">中文 (简体) (Chinese)</combo_item>
+		<combo_item name="(Japanese)" value="ja">日本語 (Japanese)</combo_item>
+		<combo_item name="(Korean)" value="ko">한국어 (Korean)</combo_item>
+	</combo_box>-->
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
new file mode 100644
index 000000000..748165b7f
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="General" name="general_panel">
+	  <radio_group name="default_start_location">
+			 <radio_item name="MyHome" tool_tip="Iniciar sesión de forma predeterminada en Mi Base.">
+					Mi Base
+			 </radio_item>
+			 <radio_item name="MyLastLocation" tool_tip="Iniciar sesión de forma predeterminada en mi última ubicación.">
+					Mi Última Ubicación
+			 </radio_item>
+	  </radio_group>
+	  <check_box label="Mostrar Ubicación Inicial en Inicio de Sesión" name="show_location_checkbox"/>
+	  <combo_box name="fade_out_combobox">
+			 <combo_item name="Never">
+					Nunca
+			 </combo_item>
+			 <combo_item name="Show Temporarily" >
+					Mostrar Temporalmente
+			 </combo_item>
+			 <combo_item name="Always">
+					Siempre
+			 </combo_item>
+	  </combo_box>
+	  <combo_box name="namesystem_combobox">
+			 <combo_item name="Old Names">
+					Nombres Antiguos
+			 </combo_item>
+			 <combo_item name="Display Names (with Username)">
+					Nombres Mostrados (y Usuario)
+			 </combo_item>
+			 <combo_item name="Display Names only">
+					Solamente Nombres Mostrados
+			  </combo_item>
+	  </combo_box>
+	  <check_box label="Nombres de Avatar en pequeño" name="small_avatar_names_checkbox"/>
+	  <check_box label="Ocultar mi Nombre en mi Pantalla" name="show_my_name_checkbox"/>
+	  <text name="group_titles_textbox">
+			 Títulos de Grupo:
+	  </text>
+	  <check_box label="Ocultar todos los Títulos de Grupo" name="show_all_title_checkbox"/>
+	  <check_box label="Ocultar mi Título de Grupo" name="show_my_title_checkbox"/>
+	  <text name="UI Size:">
+			 Tamaño Interface:
+	  </text>
+	  <check_box label="Resolución independiente del tamaño" name="ui_auto_scale"/>
+	  <spinner label="Ausente tras:" name="afk_timeout_spinner"/>
+	  <check_box label="Avisar cuando gasto o recibo dinero" name="notify_money_change_checkbox"/>
+	  <text name="maturity_desired_label">Rating:</text>
+	  <text name="maturity_desired_prompt">
+			 Quiero acceder a contenido 
+	  </text>
+	  <combo_box name="maturity_desired_combobox">
+			 <combo_item name="Desired_Adult">
+					PG, Mature y Adulto
+			 </combo_item>
+			 <combo_item name="Desired_Mature">
+					PG y Mature
+			 </combo_item>
+			 <combo_item name="Desired_PG">
+					Sólo PG
+			 </combo_item>
+	  </combo_box>
+	  <text name="maturity_desired_textbox">
+			 Sólo PG
+	  </text>
+	  <text name="start_location_textbox">
+			 Ubicación Inicial:
+	  </text>
+	  <text name="show_names_textbox">
+			 Mostrar Nombres:
+	  </text>
+	  <text name="seconds_textbox">
+			 segundos
+	  </text>
+	  <text name="crash_report_textbox">
+			 Reportes de fallos:</text>
+	  <text name="language_textbox">
+			 Idioma:
+	  </text>
+	  <text name="language_textbox2">
+			 (Requiere reiniciar para aplicar)
+          *Usar UI en Inglés</text>
+	  <combo_box name="language_combobox">
+			 <combo_item name="System Default Language">
+					Predeterminado del Sistema
+			 </combo_item>
+			 <combo_item name="English">
+					Inglés
+			 </combo_item>		
+			 <!-- 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 name="French">
+					Français(Francés)
+			 </combo_item>
+			 <combo_item name="Spanish">
+					Español(Spanish)
+			 </combo_item>						  
+			 <!-- Also, with the above advice in mind, keep completed UI translations above this line.-->
+			 <combo_item name="Danish">
+					Dansk(Danés)*
+			 </combo_item>
+			 <combo_item name="Deutsch(German)">
+					Deutsch(Alemán)*
+			 </combo_item>
+			 <combo_item name="Italian">
+					Italiano(Italiano)*
+			 </combo_item>
+			 <combo_item name="Hungarian">
+					Magyar(Húngaro)*
+			 </combo_item>
+			 <combo_item name="Dutch">
+					Nederlands(Holandés)*
+			 </combo_item>
+			 <combo_item name="Polish">
+					Polski(Polaco)*
+			 </combo_item>
+			 <combo_item name="Portugese">
+					Portugués(Portugués)*
+			 </combo_item>
+			 <combo_item name="Russian">
+					Ру��кий(Ruso)*
+			 </combo_item>
+			 <combo_item name="Turkish">
+					Türkçe(Turco)*
+			 </combo_item>
+			 <combo_item name="Ukrainian">
+					Україн�ька(Ucraniano)*
+			 </combo_item>
+			 <combo_item name="Chinese">
+					中文(简体)(Chino)*
+			 </combo_item>
+			 <combo_item name="(Japanese)">
+					日本語(Japones)*
+			 </combo_item>
+			 <combo_item name="(Korean)">
+					한국어(Coreano)*
+			 </combo_item>
+	  </combo_box>
+	  <string name="region_name_prompt">
+			 &lt;Escribe el nombre de la región&gt;
+	  </string>
+	  <combo_box name="crash_behavior_combobox">
+			 <combo_item name="Askbeforesending">
+					Preguntar antes de enviar
+			 </combo_item>
+			 <combo_item name="Alwayssend">
+					Enviar Siempre
+			 </combo_item>
+			 <combo_item name="Neversend">
+					Nunca Enviar
+			 </combo_item>
+	  </combo_box>
+	  <check_box label="Compartir idioma con los objetos" name="language_is_public" tool_tip="Esta opción le permite a los objetos conocer tu idioma seleccionado."/>
+	  <button label="Reiniciar Configuración" name="clear_settings"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
new file mode 100644
index 000000000..268aaf3be
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Gráficos" name="Display panel">
+	  <button label="?" name="GraphicsPreferencesHelpButton"/>
+	  <check_box label="Ejecutar el Visor en Ventana" name="windowed mode" tool_tip="Si setá desmarcado, el visor se ejecutará a pantalla completa cuando inicies sesión."/>
+	  <text name="WindowSizeLabel">
+			 Tamaño de Ventana:
+	  </text>
+	  <combo_box name="windowsize combo">
+			 <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_item name="1280x720">
+					1280x720 (HDV720)
+			 </combo_item>
+			 <combo_item name="1440x1080">
+					1440x1080 (HDV1080)
+			 </combo_item>
+			 <combo_item name="1920x1080">
+					1920x1080 (HD1080)
+			 </combo_item>
+	  </combo_box>
+	  <text name="DisplayResLabel">
+			 Resolución de Pantalla:
+	  </text>
+	  <combo_box name="fullscreen combo" left="130" />
+	  <text name="AspectRatioLabel1">
+			 Proporción:
+	  </text>
+	  <combo_box name="aspect_ratio" tool_tip="Ancho / Alto" left="130" >
+			 <combo_item name="4:3(StandardCRT)">
+					4:3 (CRT Estándar)
+			 </combo_item>
+			 <combo_item name="5:4(1280x1024LCD)">
+					5:4 (1280x1024 LCD)
+			 </combo_item>
+			 <combo_item name="8:5(Widescreen)">
+					16:10 (PC Pantalla ancha)
+			 </combo_item>
+			 <combo_item name="16:9(Widescreen)">
+					16:9 (TV Pantalla ancha)
+			 </combo_item>
+	  </combo_box>
+	  <check_box label="Detectar proporción automáticamente" name="aspect_auto_detect" left="280"/>
+	  <text name="QualityText">
+			 Calidad y Rendimiento:
+	  </text>
+	  <text name="FasterText"  left="130">
+			 Rápido
+	  </text>
+	  <text name="ShadersPrefText">
+			 Bajo
+	  </text>
+	  <text name="ShadersPrefText2">
+			 Medio
+	  </text>
+	  <text name="ShadersPrefText3">
+			 Alto
+	  </text>
+	  <text name="ShadersPrefText4">
+			 Ultra
+	  </text>
+	  <text name="QualityText2">
+			 Alta Calidad
+	  </text>
+	  <!-- Are these icons really necessary? 
+	<icon bottom="-89" height="14" image_name="rounded_square.tga" left="173" name="LowDivet" width="2"/>
+	<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="MidDivet" width="2"/>
+	<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="HighDivet" width="2"/>
+	<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="UltraDivet" width="2"/>
+-->
+	  <check_box label="Personalizar" name="CustomSettings"/>
+	  <text name="ShadersText">
+			 Sombreado:
+	  </text>
+	  <check_box label="Relieve y Brillos" name="BumpShiny"/>
+	  <check_box label="Luces Locales" name="LightingDetailRadio"/>
+	  <check_box label="Sombreado Básico" name="BasicShaders" tool_tip="Desactivar esta opción puede prevenir fallos con algunas tarjetas gráficas."/>
+	  <check_box label="Sombreado Atmosférico" name="WindLightUseAtmosShaders"/>
+	  <check_box label="Iluminación y Sombras" tool_tip="Sombreado Diferido" name="RenderDeferred"/>
+	  <check_box label="Oclusión Ambiental" name="UseSSAO"/>
+	  <check_box label="Profundidad de Campo" name="RenderDepthOfField"/>
+	  <text name="ShadowDetailText">
+			 Sombras:
+	  </text>
+	  <combo_box label="Detalle de Sombras" name="ShadowDetailCombo">
+			 <combo_item name="0">
+					Desactivado
+			 </combo_item>
+			 <combo_item name="1">
+					Sol/Luna
+			 </combo_item>
+			 <combo_item name="2">
+					Sol/Luna + Proyectores
+			 </combo_item>
+	  </combo_box>
+	  <text name="ReflectionDetailText">
+			 Reflejos en el Agua:
+	  </text>
+	  <combo_box label="Detalle de los Reflejos" name="ReflectionDetailCombo">
+			 <combo_item name="0">
+					Mínimos
+			 </combo_item>
+			 <combo_item name="1">
+					Terreno y �rboles
+			 </combo_item>
+			 <combo_item name="2">
+					Objetos Estáticos
+			 </combo_item>
+			 <combo_item name="3">
+					Avatares y Objetos
+			 </combo_item>
+			 <combo_item name="4">
+					Todo
+			 </combo_item>
+	  </combo_box>
+	  <slider label="  Física de Avatar:" name="AvatarPhysicsDetail" width="165"/>
+	  <text name="AvatarPhysicsDetailText">
+			 Apagada
+	  </text>
+	  <!--text bottom="-131" height="12" left="464" name="DrawDistanceMeterText1">m</text-->
+	  <text name="DrawDistanceMeterText2">
+			 m
+	  </text>
+	  <slider label="Distancia de Dibujo:" name="DrawDistance"/>
+	  <slider label="Máximo de Partículas:" name="MaxParticleCount"/>
+	  <slider label="Máx No Simulados" name="AvatarMaxVisible"/>
+	  <slider label="PostProcesado:" name="RenderPostProcess"/>
+	  <text name="MeshDetailText">
+			 Nivel de Detalles:
+	  </text>
+	  <slider label="  Objetos:" name="ObjectMeshDetail" />
+	  <slider label="  Prims Flexibles:" name="FlexibleMeshDetail"/>
+	  <slider label="  �rboles:" name="TreeMeshDetail"/>
+	  <slider label="  Avatares:" name="AvatarMeshDetail"/>
+	  <slider label="  Terreno:" name="TerrainMeshDetail"/>
+	  <slider label="  Cielo:" name="SkyMeshDetail"/>
+	  <text name="PostProcessText">
+			 Bajo
+	  </text>
+	  <text name="ObjectMeshDetailText">
+			 Bajo
+	  </text>
+	  <text name="FlexibleMeshDetailText">
+			 Bajo
+	  </text>
+	  <text name="TreeMeshDetailText">
+			 Bajo
+	  </text>
+	  <text name="AvatarMeshDetailText">
+			 Bajo
+	  </text>
+	  <text name="TerrainMeshDetailText">
+			 Bajo
+	  </text>
+	  <text name="SkyMeshDetailText">
+			 Bajo
+	  </text>
+	  <text name="AvatarRenderingText">
+			 Renderizado del Avatar:
+	  </text>
+	  <check_box label="Avatares Simulados" name="AvatarImpostors"/>
+	  <check_box label="Renderizado por Hardware" name="AvatarVertexProgram"/>
+	  <check_box label="Ropas de Avatar" name="AvatarCloth"/>
+	  <text name="TerrainDetailText">
+			 Detalle del Terreno:
+	  </text>
+	  <radio_group name="TerrainDetailRadio">
+			 <radio_item name="0">
+					Bajo
+			 </radio_item>
+			 <radio_item name="2">
+					Alto
+			 </radio_item>
+	  </radio_group>
+	  <button label="Reiniciar" name="Defaults"/>
+	  <!--button bottom="-440" height="20" label="Advanced" left="230" name="CustomSettingsButton" scale_image="true" width="120" toggle="true" control_name="RenderCustomSettings"/-->
+	  <button label="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/indra/newview/skins/default/xui/es/panel_preferences_grids.xml b/indra/newview/skins/default/xui/es/panel_preferences_grids.xml
new file mode 100644
index 000000000..42770d881
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_grids.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Grids" name="Grids panel">
+	  <!-- Grid Selector -->
+	  <text name="grid_selector_label" >
+			 Elegir un grid:
+	  </text>
+	  <button label="Predeterminado" name="btn_default"/>
+	  <text name="default_grid">
+			 ([DEFAULT])
+	  </text>
+	  <!-- Buttons -->
+	  <button label="Quitar" name="btn_delete" />
+	  <button label="Añadir" name="btn_add"/>
+	  <button label="Copiar" name="btn_copy"/>
+	  <!-- Advanced -->
+	  <button label="Avanzado" name="btn_advanced"/>
+	  <!-- Login URI -->
+	  <text name="loginuri_label">
+			 URL de Inicio:
+	  </text>
+	  <!--<button label="Get Grid Info" label_selected="Get Grid Info" enabled="true" name="btn_gridinfo"
+		height="18" width="100" left="120" bottom_delta="-22"
+		halign="center"
+		follows="left|top" scale_image="true"
+	    font="SansSerifSmall" mouse_opaque="true" />-->
+	  <!-- Platform -->
+	  <text name="platform_label">
+			 Plataforma:
+	  </text>
+	  <!-- Grid Name -->
+	  <text name="gridname_label">
+			 Nombre del Grid:
+	  </text>
+ 
+	  <!-- Grid Message -->
+	  <text name="gridmessage_label">
+			 Información del Grid:
+	  </text>
+  
+	  <!-- Advanced settings -->
+  
+	  <!-- Grid Splash Page -->
+	  <text name="loginpage_label">
+			 Página de Bienvenida:
+	  </text>
+	  <!-- Helper URI -->
+	  <text name="helperuri_label">
+			 URL de Ayuda:
+	  </text>
+	  <!-- Web Site -->
+	  <text name="website_label">
+			 Sitio Web:
+	  </text>
+	  <!-- Support URL -->
+	  <text name="support_label">
+			 URL de Soporte:
+	  </text>
+	  <!-- Account URL -->
+	  <text name="register_label">
+			 URL de Usuario:
+	  </text>
+	  <!-- Password URL -->
+	  <text name="password_label">
+			 URL Contraseña:
+	  </text>
+	  <!-- Search URL -->
+	  <text name="search_label">
+			 URL de Búsqueda:
+	  </text>
+	  <!-- Rendering Compatibility -->
+	  <check_box label="Compatibilidad de Renderizado" name="render_compat"/>
+	  <button label="?" name="btn_help_render_compat" left_delta="200" />
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_im.xml b/indra/newview/skins/default/xui/es/panel_preferences_im.xml
new file mode 100644
index 000000000..6d5023bf5
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_im.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Comunicación" name="im">
+	  <text name="text_box">
+			 Mi Estado en Línea:
+	  </text>
+	  <check_box label="Sólo mis amigos y mis grupos pueden ver cuando estoy en línea" name="online_visibility"/>
+	  <text name="text_box2">
+			 Opciones de MI:
+	  </text>
+	  <string name="log_in_to_change">
+			 Iniciar sesión para cambiar
+	  </string>
+	  <check_box label="Enviar MI al Email ([EMAIL])" name="send_im_to_email"/>
+	  <check_box label="Incluir MI en la consola de Chat" name="include_im_in_chat_console"/>
+	  <check_box label="Mostrar horario en los IMI" name="show_timestamps_check"/>
+	  <check_box label="Mostrar notificaciones cuando los amigos inician/terminan sesión" name="friends_online_notify_checkbox"/>
+	  <text name="text_box3">
+			 Respuesta en Modo Ocupado:
+	  </text>
+	  <text name="text_box4">
+			 Opciones de Registro:
+	  </text>
+	  <check_box label="Guardar Registro de MI en mi computador" name="log_instant_messages" />
+	  <check_box label="Mostrar horario en el registro de MI" name="log_instant_messages_timestamp"/>
+	  <check_box label="Mostrar final de la última conversación en MI" name="log_show_history"/>
+	  <check_box label="Guardar Registro del chat local en mi computador" name="log_chat"/>
+	  <check_box label="Mostrar horario en el registro del chat local" name="log_chat_timestamp"/>
+	  <check_box label="Mostrar MI recibidos en el registro de chat local" name="log_chat_IM"/>
+	  <check_box label="Incluir fecha con horario" name="log_date_timestamp"/>
+	  <check_box label="Agregar fecha al nombre de archivo de registro" name="logfile_name_datestamp"/>
+	  <button label="Cambiar Ruta" label_selected="Cambiar Ruta" name="log_path_button"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_input.xml b/indra/newview/skins/default/xui/es/panel_preferences_input.xml
new file mode 100644
index 000000000..317bfe63e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_input.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Disp. y Cámara" name="Input panel">
+	  <text name=" Mouselook Options:">
+			 Vista Subjetiva:
+	  </text>
+	  <text name=" Mouse Sensitivity:">
+			 Sensibilidad del Ratón:
+	  </text>
+	  <check_box label="Invertir el Ratón" name="invert_mouse"/>
+	  <check_box label="Mostrar Avatar en Vista Subjetiva" name="first_person_avatar_visible"/>
+	  <text name=" Auto Fly Options:">
+			 Opciones de Vuelo:</text>
+	  <check_box label="Despegar/Aterrizar al pulsar RePág/AvPág" name="automatic_fly"/>
+	  <text left="10" name=" Camera Options:">
+			 Opciones de Cámara:
+	  </text>
+	  <text name="camera_fov_label">
+			 �ngula de vista de la Cámara:
+	  </text>
+	  <slider left="336" name="camera_fov"/>
+	  <text name="Camera Follow Distance:" width="198">
+			 Distancia de seguimiento de la Cámara:
+	  </text>
+	  <slider left="336" name="camera_offset_scale"/>
+	  <check_box label="Reorientar la cámara el editar" name="edit_camera_movement" tool_tip="Posicionar la Cámara automáticamente al entrar y salir del modo de Edición"/>
+	  <check_box label="Reorientar la cámara el editar la apariencia" name="appearance_camera_movement" tool_tip="Posicionar la Cámara automáticamente mientras se esté en modo edición del avatar"/>
+	  <check_box label="Levantar el avatar al reiniciar la cámara" name="unsit_on_camera_reset" tool_tip="Levanta al avatar automárticamente cuando presiones la tecla ESC y la cámara cambie a modo de vista en tercera persona"/>
+	  <button label="Configuración Joystick" name="joystick_setup_button"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_network.xml b/indra/newview/skins/default/xui/es/panel_preferences_network.xml
new file mode 100644
index 000000000..f55f93dc0
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_network.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Red" name="network">
+	  <text name="text_box">
+			 Ancho de banda Máximo:
+	  </text>
+	  <text name="text_box2">
+			 kbps (kilobits por segundo)
+	  </text>
+	  <text name="cache_size_label_l">
+			 Tamaño de Caché de Disco (MB):
+	  </text>
+	  <text name="text_box5">
+			 MB
+	  </text>
+	  <button label="Borrar Caché" name="clear_cache"/>
+	  <text name="cache_location_label">
+			 Ubicación de Caché en Disco:
+	  </text>
+	  <button label="Establecer" label_selected="Establecer" name="set_cache"/>
+	  <button label="Reiniciar" label_selected="Reiniciar" name="reset_cache"/>
+	  <check_box label="Puerto de Conexión Personalizado" name="connection_port_enabled"/>
+	  <spinner label="Puerto Número:" name="connection_port"/>
+	  <text name="socks5_auth_label">
+			 Proxy Http:
+	  </text>
+	  <radio_group name="socks5_http_proxy_type">	  
+			 <radio_item name="None" tool_tip="Sin Proxy Http">
+					Ninguno
+			 </radio_item>
+			 <radio_item name="Socks" tool_tip="Utilizar Socks para el Proxy Http">
+					Socks
+			 </radio_item>
+			 <radio_item name="Web" tool_tip="Utilizar web proxy para el Proxy Http">
+					Web
+			 </radio_item>
+	  </radio_group>
+	  <check_box label="Activar Proxy SOCKS 5" name="socks5_proxy_enabled"/>
+	  <text name="socks5_host_label">
+			 Host Socks 5:
+	  </text>
+	  <line_editor name="socks5_proxy_host" tool_tip="Nombre dirección IP del Proxy SOCKS5 que quieres utilizar"/>
+	  <spinner label="Puerto Número:" name="socks5_proxy_port"/>
+	  <text name="socks5_auth_label2">
+			 Autenticación Socks5:
+	  </text>
+	  <radio_group name="socks5_auth">
+			 <radio_item name="None" tool_tip="Sin Autenticación">
+					Ninguna
+			 </radio_item>
+			 <radio_item name="UserPass" tool_tip="Usuario / Contraseña de autenticación">
+					Usuario / Contraseña
+			 </radio_item>
+	  </radio_group>
+	  <text name="socks5_username_label">
+			 Usuario:
+	  </text>
+	  <line_editor name="socks5_proxy_username" tool_tip="Usuario para el Proxy Socks5"/>
+	  <text name="socks5_password_label">
+			 Contraseña:
+	  </text>
+	  <line_editor name="socks5_proxy_password" tool_tip="Contraseña para el Proxy Socks5"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_popups.xml b/indra/newview/skins/default/xui/es/panel_preferences_popups.xml
new file mode 100644
index 000000000..e493daf7e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_popups.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Vent. Emergentes" name="popups" title="Ventanas Emergentes">
+	  <text name="dont_show_label">
+			 No Mostrar las siguientes Ventanas Emergentes:
+	  </text>
+	  <button label="Activar esta Ventana Emergente" name="enable_popup" width="210"/>
+	  <button label="Activar todas las Ventanas Emergentes..." name="reset_dialogs_btn" tool_tip="Activa todas las ventanas emergentes y las notificaciones de primera vez." left="230" width="250"/>
+	  <text name="show_label" >
+			 Mostrar las siguientes Ventanas Emergentes:
+	  </text>
+	  <button label="Desactivar Avisos de Primera Vez..." name="skip_frst_btn" tool_tip="Desactiva todos los avisos de primera vez." width="215"/>
+	  <button label="Desactivar todas las Ventanas Emergentes..." name="skip_dialogs_btn" tool_tip="Desactiva todas las ventanas emergentes y las notificaciones de primera vez." left="235" width="255"/>
+	  <text name="text_box2">
+			 Ofertas de Notas, texturas e Hitos:
+	  </text>
+	  <check_box label="Aceptar Automáticamente" name="accept_new_inventory"/>
+	  <check_box label="Ver Automáticamente despues de aceptar" name="show_new_inventory"/>
+	  <check_box label="Mostrar automáticamente nuevos objetos aceptados en el inventario" name="show_in_inventory"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_skins.xml b/indra/newview/skins/default/xui/es/panel_preferences_skins.xml
new file mode 100644
index 000000000..6c12cd2da
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_skins.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Pieles" name="Skins panel">
+	  <text name="Skin_txt1">
+			 Piel Seleccionada
+	  </text>
+	  <combo_box name="custom_skin_combo" />
+	  <text name="Skin_txt2">
+			 Autor Principal
+	  </text>
+	  <text name="custom_skin_author">
+			 Autor de la Piel
+	  </text>
+	  <text name="Skin_txt3">
+			 Autores Adicionales
+	  </text>
+	  <text name="custom_skin_ad_authors">
+			 Autores Adicionales de la Piel
+	  </text>
+	  <text name="Skin_txt4">
+			 Carpeta de la Piel
+	  </text>
+	  <text name="custom_skin_folder">
+			 Carpeta de la Piel
+	  </text>
+	  <button label="" name="custom_skin_preview" tool_tip="Vista Previa de la Piel"/>
+	  <text name="Skin_txt5">
+			 Información Adicional
+	  </text>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_voice.xml b/indra/newview/skins/default/xui/es/panel_preferences_voice.xml
new file mode 100644
index 000000000..382abd065
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_voice.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Chat de Voz" name="chat">
+	  <text name="voice_unavailable">
+			 El Chat de Voz no está Disponible
+	  </text>
+	  <check_box bottom_delta="0" follows="top" height="16" initial_value="false" label="Enable voice chat" left="8" name="enable_voice_check"/>
+	  <radio_group bottom_delta="-46" draw_border="false" follows="top" height="40" left_delta="20" name="ear_location" width="364">
+			 <radio_item name="0">
+					Oir el chat desde la posición de la cámara.
+			 </radio_item>
+			 <radio_item name="1">
+					Oir el chat desde la posición del avatar.
+			 </radio_item>
+	  </radio_group>
+	  <text name="push_to_talk_heading">
+			 Apretar para Hablar
+	  </text>
+	  <text name="voice_chat_description">
+El modo Apretar para Hablar controla cuándo tu voz se transmite. En el modo 'un toque', 
+pulsa y suelta el botón Apretar para Hablar para activar y desactivar su micrófono. Si no se está 
+en el modo 'un toque', el micrófono está activo sólo cuando se mantiene pulsado el botón.
+	  </text>
+	  <check_box label="Usar Apretar para Hablar en el modo 'Un Toque'" name="push_to_talk_toggle_check"/>
+	  <text name="push_to_talk_label">
+			 Botón Apretar para Hablar:
+	  </text>
+	  <button label="Definir Tecla" name="set_voice_hotkey_button" width="115"/>
+	  <button label="Botón medio del Ratón" left_delta="120" name="set_voice_middlemouse_button" width="160"/>
+	  <text name="lip_sync_heading" width="445">
+			 Activar animación de Labios
+	  </text>
+	  <check_box label="Activar Animación de Labios" left_delta="20" name="enable_lip_sync_check"/>
+	  <text name="privacy_heading">
+			 Opciones de Privacidad
+	  </text>
+	  <check_box label="Aceptar llamadas sólo de mis contactos" left_delta="20" name="voice_call_friends_only_check"/>
+	  <check_box label="Apagar el micrófono al terminar la llamada por MI" name="auto_disengage_mic_check"/>
+	  <button label="Configuración de Dispositivos" left="28" mouse_opaque="true" name="device_settings_btn" width="155"/>
+	  <text name="device_settings_text">NOTA: Ejecutar esta configuración te desconectará temporalmente del chat de voz, 
+y los cambios se aplicarán inmediatamente..</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_web.xml b/indra/newview/skins/default/xui/es/panel_preferences_web.xml
new file mode 100644
index 000000000..9cfd489d1
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_preferences_web.xml
@@ -0,0 +1,28 @@
+<?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="Usar el navegador predeterminado del sistema parar abrir la ayuda, páginas web, etc. No se recomienda si el visor se está ejecutando a Pantalla completa.">
+					Usar navegador externo (Firefox, Safari, Opera, Internet Explorer)
+			 </radio_item>
+			 <radio_item name="internal" tool_tip="Usar el navegador incorporado para abrir la ayuda, páginas web, etc. El navegador se abrirá en una nueva ventana dentro de Singularity.">
+					Usar navegador incorporado
+			 </radio_item>
+	  </radio_group>
+	  <text name="cache_size_label_l">
+			 Caché del Navegador:
+	  </text>
+	  <button label="Borrar Ahora" name="clear_cache" width="95"/>
+	  <text name="cookie_label">
+			 Cookies:
+	  </text>
+	  <check_box label="Aceptar la cookies de los sitios" name="cookies_enabled"/>
+	  <text name="proxy_label">
+			 Proxy Web:
+	  </text>
+	  <check_box label="Activar Proxy Web" name="web_proxy_enabled"/>
+	  <text name="proxy_text_label">
+			 Dirección:
+	  </text>
+	  <line_editor name="web_proxy_editor" tool_tip="Nombre o dirección IP del proxy que deseas utilizar"/>
+	  <spinner label="Puerto Número:" name="web_proxy_port"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_progress.xml b/indra/newview/skins/default/xui/es/panel_progress.xml
new file mode 100644
index 000000000..da8ae77d5
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_progress.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bottom="0" follows="left|bottom|right|top" height="768" left="0" name="login_progress_panel" width="1024" visible="true">
+  <layout_stack name="stack1" orientation="horizontal" left="0" bottom="0" width="1024" height="768" follows="left|right|top|bottom">
+    <layout_panel name="panel1" user_resize="false" min_width="10" width="150"/>
+    <layout_panel name="panel2" user_resize="false" min_width="640" width="640" height="768">
+      <layout_stack name="stack2" orientation="vertical" left="0" bottom="0" height="768" width="640" follows="left|right|top|bottom">
+        <layout_panel name="panel3" min_height="10" height="200" width="640"/>
+        <layout_panel name="panel4" min_height="250" height="250" width="640" auto_resize="false">
+          <icon image_name="rounded_square.tga" color="LoginProgressBoxCenterColor" left="0" bottom="0" width="640" height="250" follows="left|right|bottom|top"/>
+          <text name="title_text" halign="center" font="SansSerif" left="0" bottom="-70" width="640" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/>
+          <text name="progress_text" halign="center" font="SansSerif" left="0" bottom="-95" width="640" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/>
+          <progress_bar name="login_progress_bar" color="255,255,255,245" height="16" bottom="135" left="45" right="-45" follows="left|right|top" />
+          <text name="message_text" halign="center" line_spacing="8" font="SansSerif" left="20" bottom="5" width="600" height="100" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top|bottom"/>
+        </layout_panel>
+        <layout_panel name="panel5" min_width="10" height="200" width="640"/>
+      </layout_stack>
+    </layout_panel>
+    <layout_panel name="panel6" user_resize="false" min_width="10" width="150"/>
+  </layout_stack>
+  <button name="cancel_btn" left="-86" bottom="16" width="70" height="22" follows="right|bottom"/>
+</panel>
+
diff --git a/indra/newview/skins/default/xui/es/panel_region_covenant.xml b/indra/newview/skins/default/xui/es/panel_region_covenant.xml
new file mode 100644
index 000000000..9bbdbd303
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_region_covenant.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="0" follows="top|left" height="320" label="Covenant"
+     left="0" name="Covenant" width="480">
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerif" h_pad="0" halign="left" height="20" left="5"
+	     mouse_opaque="false" name="estate_section_lbl" v_pad="0" width="100">
+		Estate:
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-45" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
+	     mouse_opaque="false" name="estate_name_lbl" v_pad="0" width="100">
+		Name:
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-45" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
+	     mouse_opaque="false" name="estate_name_text" v_pad="0" width="150">
+		mainland
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-65" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
+	     mouse_opaque="false" name="estate_owner_lbl" v_pad="0" width="100">
+		Owner:
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-65" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
+	     mouse_opaque="false" name="estate_owner_text" v_pad="0" width="150">
+		(none)
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-85" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
+	     mouse_opaque="false" name="estate_cov_lbl" v_pad="0" width="100">
+		Covenant:
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-85" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
+	     mouse_opaque="false" name="covenant_timestamp_text" v_pad="0" width="300">
+		Last Modified Wed Dec 31 16:00:00 1969
+	</text>
+	<button bottom="-82" follows="right|top" font="SansSerifSmall" height="18" label="?"
+	     name="covenant_help" right="462" width="18" />
+	<text_editor type="string" length="1" bottom="-279" embedded_items="false" enabled="false"
+	     follows="left|top" font="SansSerifSmall" height="194"
+	     left="120" max_length="65535" mouse_opaque="true" name="covenant_editor"
+	     width="340" word_wrap="true" spell_check="true">
+		There is no Covenant provided for this Estate.
+	</text_editor>
+	<button bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="18"
+	     label="Reset" name="reset_covenant" right="460" width="90" />
+	<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left="120"
+	     name="covenant_help_text" width="460">
+		Changes to the covenant will show on all parcels in the estate.
+	</text>
+	<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
+	     left_delta="0" name="covenant_instructions" width="465">
+		Drag and drop a notecard to change the Covenant for this Estate.
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerif" h_pad="0" halign="left" height="20" left="5"
+	     mouse_opaque="false" name="region_section_lbl" v_pad="0" width="100">
+		Region:
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
+	     mouse_opaque="false" name="region_name_lbl" v_pad="0" width="100">
+		Name:
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
+	     mouse_opaque="false" name="region_name_text" v_pad="0" width="150">
+		leyla
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
+	     mouse_opaque="false" name="region_landtype_lbl" v_pad="0" width="100">
+		Type:
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
+	     mouse_opaque="false" name="region_landtype_text" v_pad="0" width="150">
+		Mainland / Homestead
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
+	     mouse_opaque="false" name="region_maturity_lbl" v_pad="0" width="100">
+		Rating:
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
+	     mouse_opaque="false" name="region_maturity_text" v_pad="0" width="150">
+		Adult
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
+	     mouse_opaque="false" name="resellable_lbl" v_pad="0" width="100">
+		Resale:
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
+	     mouse_opaque="false" name="resellable_clause" v_pad="0" width="330">
+		Land in this region may not be resold.
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
+	     mouse_opaque="false" name="changeable_lbl" v_pad="0" width="100">
+		Subdivide:
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-10" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="30" left="120"
+	     mouse_opaque="false" name="changeable_clause" v_pad="0" width="330">
+		Land in this region may not be joined/subdivided.
+	</text>
+	<string name="can_resell">
+		Purchased land in this region may be resold.
+	</string>
+	<string name="can_not_resell">
+		Purchased land in this region may not be resold.
+	</string>
+	<string name="can_change">
+		Purchased land in this region may be joined or subdivided.
+	</string>
+	<string name="can_not_change">
+		Purchased land in this region may not be joined or subdivided.
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_debug.xml b/indra/newview/skins/default/xui/es/panel_region_debug.xml
new file mode 100644
index 000000000..c0dfdbf3e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_region_debug.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="0" follows="top|left" height="320" label="Debug" left="0"
+     name="Debug" width="480">
+	<text bottom="-30" follows="left|top" font="SansSerif" height="20" left="10"
+	     name="region_text_lbl" width="100">
+		Region:
+	</text>
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
+	     name="region_text" width="400">
+		unknown
+	</text>
+	<check_box bottom_delta="-20" follows="left|top" height="20" label="Disable Scripts"
+	     left="10" name="disable_scripts_check"
+	     tool_tip="Disable all scripts in this region" width="80" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="160" name="disable_scripts_help" width="18" />
+	<check_box bottom_delta="-20" follows="left|top" height="20" label="Disable Collisions"
+	     left="10" name="disable_collisions_check"
+	     tool_tip="Disable non-avatar collisions in this region" width="80" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="160" name="disable_collisions_help" width="18" />
+	<check_box bottom_delta="-20" follows="left|top" height="20" label="Disable Physics"
+	     left="10" name="disable_physics_check"
+	     tool_tip="Disable all physics in this region" width="80" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="160" name="disable_physics_help" width="18" />
+	<button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
+	     left="60" name="apply_btn" width="100" />
+	<text bottom_delta="-50" follows="left|top" height="20" left="10" width="90" name="objret_text_lbl">
+	  Object Return
+	</text>
+	<text bottom_delta="-25" follows="left|top" height="20" left="30" width="60" name="resident_text_lbl">
+	  Resident:
+	</text>
+	<line_editor bottom_delta="2" follows="left|top" height="20" left="90" 
+		 border_style="line" border_thickness="1" enabled="false" max_length="254" mouse_opaque="false"
+	     name="target_avatar_name" width="180">
+	  (none)
+    </line_editor>
+	<button bottom_delta="0" follows="left|top" height="20" label="Choose..."
+	     left="280" name="choose_avatar_btn" width="80" />
+	<text bottom_delta="-25" follows="left|top" height="20" left="30" width="60" name="options_text_lbl">
+	  Options:
+	</text>
+    <check_box bottom_delta="0" follows="left|top" height="20" label="Return only those objects with scripts"
+         left="90" name="return_scripts"
+         tool_tip="Return only objects which have scripts." width="80" />
+    <check_box bottom_delta="-20" follows="left|top" height="20" label="Return only those objects on someone else's land"
+         left="90" name="return_other_land"
+         tool_tip="Return only objects which are on land belonging to someone else" width="80" />
+    <check_box bottom_delta="-20" follows="left|top" height="20" label="Return objects in every region of this estate"
+         left="90" name="return_estate_wide"
+         tool_tip="Return objects in all of the regions that make up this estate" width="80" />
+	<button bottom_delta="-25" follows="left|top" height="20"
+	     label="Return"
+	     left="30" name="return_btn" width="80" />
+	<button bottom_delta="-50" follows="left|top" height="20" label="Get Top Colliders..."
+	     left="10" name="top_colliders_btn"
+	     tool_tip="List of objects experiencing the most potential collisions"
+	     width="150" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="170" name="top_colliders_help" width="18" />
+	<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" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="170" name="top_scripts_help" width="18" />
+  <button bottom_delta="-50" follows="left|top" height="20" label="Restart Region"
+	     left="10" name="restart_btn"
+	     tool_tip="Give x second countdown and restart region" width="130" />
+  <spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16"
+             increment="1" initial_val="120" left_delta="135" max_val="3600" min_val="15"
+             mouse_opaque="true" name="rcount" label="Seconds:" label_width="50" width="105" />
+  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="255" name="restart_help" width="18" />
+  <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/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml
new file mode 100644
index 000000000..84ce9d050
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="0" follows="top|left" height="320" label="Estate"
+     left="0" name="Estate" width="480">
+	<text bottom="-46" follows="left|top" font="SansSerifSmall" height="32" left="10"
+	     name="estate_help_text" width="300">
+		Changes to settings on this tab will affect all
+regions in the estate.
+	</text>
+	<text bottom_delta="-22" follows="left|top" font="SansSerif" height="20" left="10"
+	     name="estate_text" width="80">
+		Estate:
+	</text>
+	<text bottom_delta="-16" follows="left|top"
+	     font="SansSerif" height="20" left_delta="0" name="estate_name"
+	     width="150">
+		(unknown)
+	</text>
+	<text bottom_delta="-22" follows="left|top" font="SansSerif" height="20" left="10"
+	     name="owner_text" width="80">
+		Owner:
+	</text>
+	<text bottom_delta="-16" follows="left|top"
+	     font="SansSerif" height="20" left_delta="0" name="estate_owner"
+	     width="150">
+		(unknown)
+	</text>
+	<view_border bevel_style="in" border="true" border_thickness="1" bottom_delta="-295"
+	     follows="top|left" height="290" left="6" width="250" />
+	<check_box bottom_delta="265" follows="left|top" height="20" label="Use Global Time"
+	     left="12" name="use_global_time_check" width="200" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="use_global_time_help" right="250" width="18" />
+	<check_box bottom_delta="-20" follows="left|top" height="20" label="Fixed Sun" left="12"
+	     name="fixed_sun_check" width="100" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="fixed_sun_help" right="250" width="18" />
+	<icon bottom_delta="-25" follows="left|top" height="20"
+	     image_name="icon_day_cycle.tga" left="47" name="daycycle" width="165" />
+	<slider bottom_delta="-25" follows="left|top" height="20" increment="0.001"
+	     label="Phase" left="12" max_val="30" min_val="6" name="sun_hour_slider"
+	     show_text="false" width="200" />
+	<check_box bottom_delta="-26" follows="left|top" height="20" label="Allow Public Access"
+	     left="12" name="externally_visible_check" width="200" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="externally_visible_help" right="250" width="18" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-18" drop_shadow_visible="true" enabled="true"
+	     follows="top|left" font="SansSerifSmall" h_pad="0" halign="left"
+	     height="16" left="32" mouse_opaque="true" name="Only Allow" v_pad="0"
+	     width="278">
+		Restrict Access To:
+	</text>
+	<check_box bottom_delta="-18" enabled="true" follows="top|left" font="SansSerifSmall"
+	     height="16" initial_value="false"
+	     label="Residents with payment info on file" left_delta="0"
+	     mouse_opaque="true" name="limit_payment" radio_style="false"
+	     tool_tip="Ban unidentified residents." width="278" />
+	<check_box bottom_delta="-18" enabled="true" follows="top|left" font="SansSerifSmall"
+	     height="16" initial_value="false" label="Age-verified adults"
+	     left_delta="0" mouse_opaque="true" name="limit_age_verified"
+	     radio_style="false"
+	     tool_tip="Ban residents who have not verified their age. See support.secondlife.com for more information."
+	     width="278" />
+	<check_box bottom_delta="-22" follows="left|top" height="20" label="Allow Voice Chat"
+	     left="12" name="voice_chat_check" width="200" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="voice_chat_help" right="250" width="18" />
+	<check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Direct Teleport"
+	     left="12" name="allow_direct_teleport" width="80" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="allow_direct_teleport_help" right="250" width="18" />
+	<text bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="20"
+	     left="10" name="abuse_email_text" width="180">
+		Abuse email address:
+	</text>
+	<line_editor bottom_delta="-16" follows="top|left" height="19" left="15" max_length="254"
+	     name="abuse_email_address" width="205" />
+	<string name="email_unsupported">Feature unsupported</string>
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="abuse_email_address_help" right="250" width="18" />
+	<button bottom_delta="-26" enabled="false" follows="left|top" height="20" label="Apply"
+	     name="apply_btn" right="250" width="90" />
+	<button bottom="-468" enabled="true" follows="left|top" height="20"
+	     label="Kick User from Estate..." left="8" name="kick_user_from_estate_btn"
+	     width="250" />
+	<button bottom_delta="23" follows="left|top" height="20"
+	     label="Send Message To Estate..." left="8" name="message_estate_btn"
+	     width="250" />
+	<text bottom="-34" follows="left|top" height="20" name="estate_manager_label"
+	     right="470" width="200">
+		Estate Managers:
+	</text>
+	<button bottom_delta="3" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="estate_manager_help" right="470" width="18" />
+	<view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
+	     height="60" right="470" width="200" />
+	<name_list bottom_delta="0" follows="left|top" height="60" left_delta="0" multi_select="true"
+	     name="estate_manager_name_list" width="200" />
+	<button bottom_delta="-26" enabled="true" follows="left|top" height="20"
+	     label="Remove..." name="remove_estate_manager_btn" right="470" width="90" />
+	<button bottom_delta="0" enabled="true" follows="left|top" height="20" label="Add..."
+	     left="270" name="add_estate_manager_btn" width="90" />
+	<text bottom_delta="-34" follows="left|top" height="20" left_delta="0"
+	     name="allow_resident_label" width="200">
+		Allowed Residents:
+	</text>
+	<button bottom_delta="3" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="allow_resident_help" right="470" width="18" />
+	<view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
+	     height="60" right="470" width="200" />
+	<name_list bottom_delta="0" follows="left|top" height="60" left_delta="0" multi_select="true"
+	     name="allowed_avatar_name_list" width="200" />
+	<button bottom_delta="-26" enabled="true" follows="left|top" height="20"
+	     label="Remove..." name="remove_allowed_avatar_btn" right="470" width="90" />
+	<button bottom_delta="0" enabled="true" follows="left|top" height="20" label="Add..."
+	     left="270" name="add_allowed_avatar_btn" width="90" />
+	<text bottom_delta="-34" follows="left|top" height="20" left_delta="0"
+	     name="allow_group_label" width="200">
+		Allowed Groups:
+	</text>
+	<button bottom_delta="3" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="allow_group_help" right="470" width="18" />
+	<view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
+	     height="60" right="470" width="200" />
+	<name_list bottom_delta="0" follows="left|top" height="60" left_delta="0" multi_select="true"
+	     name="allowed_group_name_list" width="200" />
+	<button bottom_delta="-26" enabled="true" follows="left|top" height="20"
+	     label="Remove..." name="remove_allowed_group_btn" right="470" width="90" />
+	<button bottom_delta="0" enabled="true" follows="left|top" height="20" label="Add..."
+	     left="270" name="add_allowed_group_btn" width="90" />
+	<text bottom_delta="-34" follows="left|top" height="20" left_delta="0"
+	     name="ban_resident_label" width="200">
+		Banned Residents:
+	</text>
+	<button bottom_delta="3" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     name="ban_resident_help" right="470" width="18" />
+	<view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
+	     height="60" right="470" width="200" />
+	<name_list bottom_delta="0" follows="left|top" height="60" left_delta="0" multi_select="true" 
+	     name="banned_avatar_name_list" width="200" />
+	<button bottom_delta="-26" enabled="true" follows="left|top" height="20"
+	     label="Remove..." name="remove_banned_avatar_btn" right="470" width="90" />
+	<button bottom_delta="0" enabled="true" follows="left|top" height="20" label="Add..."
+	     left="270" name="add_banned_avatar_btn" width="90" />
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml
new file mode 100644
index 000000000..6302428c8
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_region_general.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="0" follows="top|left" height="320" label="Region"
+     left="0" name="General" width="480">
+	<text bottom="-30" follows="left|top" font="SansSerif" height="20" left="10"
+	     name="region_text_lbl" width="100">
+		Region:
+	</text>
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
+	     name="region_text" width="400">
+		unknown
+	</text>
+	<text bottom="-50" follows="left|top" font="SansSerif" height="20" left="10"
+	     name="version_channel_text_lbl" width="100">
+		Version: 
+	</text>
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
+	     name="version_channel_text" width="200">
+		unknown
+	</text>
+	<text bottom="-70" follows="left|top" font="SansSerif" height="20" left="10"
+	     name="region_type_lbl" width="100">
+		Type: 
+	</text>
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
+	     name="region_type" width="200">
+		unknown
+	</text>
+	<check_box bottom_delta="-20" follows="left|top" height="20" label="Block Terraform"
+	     left="10" name="block_terraform_check" width="80" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="205" name="terraform_help" width="18" />
+	<check_box bottom_delta="-20" follows="left|top" height="20" label="Block Fly" left="10"
+	     name="block_fly_check" width="80" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="205" name="fly_help" width="18" />
+	<check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Damage"
+	     left="10" name="allow_damage_check" width="80" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="205" name="damage_help" width="18" />
+	<check_box bottom_delta="-20" follows="left|top" height="20" label="Restrict Pushing"
+	     left="10" name="restrict_pushobject" width="80" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="205" name="restrict_pushobject_help" width="18" />
+	<check_box bottom_delta="-30" follows="left|top" height="20" label="Allow Land Resell"
+	     left="10" name="allow_land_resell_check" width="80" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="205" name="land_resell_help" width="18" />
+	<check_box bottom_delta="-20" follows="left|top" height="20"
+	     label="Allow Land Join/Divide" left="10" name="allow_parcel_changes_check"
+	     width="80" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="205" name="parcel_changes_help" width="18" />
+	<check_box bottom_delta="-20" follows="left|top" height="20"
+	     label="Block Land Show in Search" left="10"
+	     name="block_parcel_search_check"
+	     tool_tip="Let people see this region and its parcels in search results"
+	     width="80" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="205" name="parcel_search_help" width="18" />
+	<spinner bottom_delta="-40" follows="left|top" height="20" increment="1"
+	     label="Agent Limit" label_width="97" left="10" max_val="100" min_val="1"
+	     name="agent_limit_spin" width="170" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="205" name="agent_limit_help" width="18" />
+	<spinner bottom_delta="-20" follows="left|top" height="20" increment="0.5"
+	     label="Object Bonus" label_width="97" left="10" max_val="10" min_val="1"
+	     name="object_bonus_spin" width="170" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="205" name="object_bonus_help" width="18" />
+	<text bottom_delta="-30" follows="left|top" height="20" label="Maturity" left="10"
+	     name="access_text" width="100">
+		Rating:
+	</text>
+	<combo_box bottom_delta="0" follows="left|top" height="20" label="Mature" left="110"
+	     name="access_combo" width="85">
+		<combo_item name="Adult" value="42">
+			Adult
+		</combo_item>
+		<combo_item name="Mature" value="21">
+			Mature
+		</combo_item>
+		<combo_item name="PG" value="13">
+			PG
+		</combo_item>
+	</combo_box>
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="205" name="access_help" width="18" />
+	<button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
+	     left="108" name="apply_btn" width="100" />
+	<button bottom_delta="-60" follows="left|top" height="20"
+	     label="Teleport Home One User..." left="10" name="kick_btn" width="250" />
+	<button bottom_delta="-23" follows="left|top" height="20"
+	     label="Teleport Home All Users..." left="10" name="kick_all_btn" width="250" />
+	<button bottom_delta="-40" follows="left|top" height="20"
+	     label="Send Message To Region..." left="10" name="im_btn" width="200" />
+	<button bottom="-90" follows="left|top" height="20" label="Manage Telehub..."
+	     left="250" name="manage_telehub_btn" width="150" />
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_terrain.xml b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
new file mode 100644
index 000000000..e93e87cd6
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="0" follows="top|left" height="320" label="Terrain"
+     left="0" name="Terrain" width="480">
+	<text bottom="-30" follows="left|top" font="SansSerif" height="20" left="10"
+	     name="region_text_lbl" width="100">
+		Region:
+	</text>
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
+	     name="region_text" width="400">
+		unknown
+	</text>
+	<spinner bottom_delta="-30" follows="left|top" height="20" increment=".1"
+	     label="Water Height" label_width="120" left="15" max_val="100" min_val="0"
+	     name="water_height_spin" width="180" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="200" name="water_height_help" width="18" />
+	<spinner bottom_delta="-20" follows="left|top" height="20" increment=".2"
+	     label="Terrain Raise Limit" label_width="120" left="15" max_val="100"
+	     min_val="0" name="terrain_raise_spin" width="180" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="200" name="terrain_raise_help" width="18" />
+	<spinner bottom_delta="-20" follows="left|top" height="20" increment=".2"
+	     label="Terrain Lower Limit" label_width="120" left="15" max_val="0"
+	     min_val="-100" name="terrain_lower_spin" width="180" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="200" name="terrain_lower_help" width="18" />
+	<check_box bottom="-55" follows="left|top" height="20" label="Use Estate Sun" left="250"
+	     name="use_estate_sun_check" width="100" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="420" name="use_estate_sun_help" width="18" />
+	<check_box bottom_delta="-20" follows="left|top" height="20" label="Fixed Sun" left="250"
+	     name="fixed_sun_check" width="100" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="420" name="fixed_sun_help" width="18" />
+	<icon bottom_delta="-25" follows="left|top" height="20"
+	     image_name="icon_day_cycle.tga" left="285" name="daycycle" width="165" />
+	<slider bottom_delta="-25" follows="left|top" height="20" increment="0.001"
+	     label="Phase" left="250" max_val="30" min_val="6" name="sun_hour_slider"
+	     show_text="false" width="200" />
+	<button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
+	     left="350" name="apply_btn" width="90" />
+	<view_border bevel_style="none" border_thickness="1" bottom_delta="-5" follows="top|left"
+	     height="130" left="8" width="460" />
+	<button bottom_delta="-80" follows="left|top" height="20"
+	     label="Download RAW terrain..." left="10" name="download_raw_btn"
+	     tool_tip="Available only to estate owners, not managers" width="170" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="190" name="download_raw_help" width="18" />
+	<button bottom_delta="-23" follows="left|top" height="20" label="Upload RAW terrain..."
+	     left="10" name="upload_raw_btn"
+	     tool_tip="Available only to estate owners, not managers" width="170" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="190" name="upload_raw_help" width="18" />
+	<button bottom_delta="-40" follows="left|top" height="20" label="Bake Terrain"
+	     left="10" name="bake_terrain_btn"
+	     tool_tip="Set current terrain as mid-point for raise/lower limits"
+	     width="100" />
+	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
+	     left="120" name="bake_terrain_help" width="18" />
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_texture.xml b/indra/newview/skins/default/xui/es/panel_region_texture.xml
new file mode 100644
index 000000000..9b9a58b06
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_region_texture.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="0" follows="top|left" height="320"
+     label="Ground Textures" left="0" name="Textures" width="480">
+	<text bottom="-30" follows="left|top" font="SansSerif" height="20" left="10"
+	     name="region_text_lbl" width="100">
+		Region:
+	</text>
+	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
+	     name="region_text" width="400">
+		unknown
+	</text>
+	<text bottom_delta="-26" follows="left|top" height="20" left="10"
+	     name="detail_texture_text" width="300">
+		Terrain Textures (requires 512x512, 24 bit .tga files)
+	</text>
+	<texture_picker bottom_delta="-100" follows="left|top" height="100" left="10"
+	     name="texture_detail_0" width="100" />
+	<texture_picker bottom_delta="0" follows="left|top" height="100" left="120"
+	     name="texture_detail_1" width="100" />
+	<texture_picker bottom_delta="0" follows="left|top" height="100" left="230"
+	     name="texture_detail_2" width="100" />
+	<texture_picker bottom_delta="0" follows="left|top" height="100" left="340"
+	     name="texture_detail_3" width="100" />
+	<text bottom_delta="-10" follows="left|top" height="20" left="10"
+	     name="height_text_lbl" width="65">
+		1 (Low)
+	</text>
+	<text bottom_delta="0" follows="left|top" height="20" left="120"
+	     name="height_text_lbl2" width="100">
+		2
+	</text>
+	<text bottom_delta="0" follows="left|top" height="20" left="230"
+	     name="height_text_lbl3" width="100">
+		3
+	</text>
+	<text bottom_delta="0" follows="left|top" height="20" left="340"
+	     name="height_text_lbl4" width="100">
+		4 (High)
+	</text>
+	<text bottom_delta="-40" follows="left|top" height="20" left="10"
+	     name="height_text_lbl5" width="300">
+		Texture Elevation Ranges
+	</text>
+	<text bottom_delta="-15" follows="left|top" height="20" left="51"
+	     name="height_text_lbl6" width="100">
+		Southwest
+	</text>
+	<text bottom_delta="0" follows="left|top" height="20" left="161"
+	     name="height_text_lbl7" width="100">
+		Northwest
+	</text>
+	<text bottom_delta="0" follows="left|top" height="20" left="271"
+	     name="height_text_lbl8" width="100">
+		Southeast
+	</text>
+	<text bottom_delta="0" follows="left|top" height="20" left="381"
+	     name="height_text_lbl9" width="100">
+		Northeast
+	</text>
+	<spinner bottom_delta="-20" follows="left|top" height="20" increment="0.5" label="Low"
+	     label_width="37" left="10" max_val="500" min_val="-500"
+	     name="height_start_spin_0" width="100" />
+	<spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="Low"
+	     label_width="37" left="120" max_val="500" min_val="-500"
+	     name="height_start_spin_1" width="100" />
+	<spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="Low"
+	     label_width="37" left="230" max_val="500" min_val="-500"
+	     name="height_start_spin_2" width="100" />
+	<spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="Low"
+	     label_width="37" left="340" max_val="500" min_val="-500"
+	     name="height_start_spin_3" width="100" />
+	<spinner bottom_delta="-20" follows="left|top" height="20" increment="0.5" label="High"
+	     label_width="37" left="10" max_val="500" min_val="-500"
+	     name="height_range_spin_0" width="100" />
+	<spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="High"
+	     label_width="37" left="120" max_val="500" min_val="-500"
+	     name="height_range_spin_1" width="100" />
+	<spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="High"
+	     label_width="37" left="230" max_val="500" min_val="-500"
+	     name="height_range_spin_2" width="100" />
+	<spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="High"
+	     label_width="37" left="340" max_val="500" min_val="-500"
+	     name="height_range_spin_3" width="100" />
+	<text bottom_delta="-40" follows="left|top" height="20" left="25"
+	     name="height_text_lbl10" width="480">
+		These values represent the blend range for the textures above.
+	</text>
+	<text bottom_delta="-16" follows="left|top" height="20" left="25"
+	     name="height_text_lbl11" width="450">
+		Measured in meters, the LOW value is the MAXIMUM height of Texture #1,
+	</text>
+	<text bottom_delta="-16" follows="left|top" height="20" left="25"
+	     name="height_text_lbl12" width="480">
+		and the HIGH value is the MINIMUM height of Texture #4.
+	</text>
+	<button bottom="10" enabled="false" follows="left|bottom" height="20" label="Apply"
+	     left="350" name="apply_btn" width="100" />
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_scrolling_param.xml b/indra/newview/skins/default/xui/es/panel_scrolling_param.xml
new file mode 100644
index 000000000..b4281a229
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_scrolling_param.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bottom="0" enabled="true" height="152" left="0" mouse_opaque="true"
+     name="LLScrollingPanelParam" width="270">
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-132" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
+	     mouse_opaque="true" name="min param text" v_pad="0" width="128" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-132" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="138"
+	     mouse_opaque="true" name="max param text" v_pad="0" width="128" />
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-27" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="8"
+	     mouse_opaque="true" name="Loading..." v_pad="0" width="128">
+		Loading...
+	</text>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-27" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="142"
+	     mouse_opaque="true" name="Loading...2" v_pad="0" width="128">
+		Loading...
+	</text>
+	<button bottom="-132" enabled="false" font="SansSerif" halign="center" height="132"
+	     image_disabled="square_btn_32x128.tga"
+	     image_disabled_selected="square_btn_selected_32x128.tga"
+	     image_selected="square_btn_selected_32x128.tga"
+	     image_unselected="square_btn_32x128.tga" label="" label_selected=""
+	     left="2" mouse_opaque="true" name="less" scale_image="true"
+	     tab_stop="false" width="132" />
+	<button bottom="-132" enabled="false" font="SansSerif" halign="center" height="132"
+	     image_disabled="square_btn_32x128.tga"
+	     image_disabled_selected="square_btn_selected_32x128.tga"
+	     image_selected="square_btn_selected_32x128.tga"
+	     image_unselected="square_btn_32x128.tga" label="" label_selected=""
+	     left="136" mouse_opaque="true" name="more" scale_image="true"
+	     tab_stop="false" width="132" />
+	<slider bottom="-150" can_edit_text="true" decimal_digits="0" enabled="false"
+	     height="16" increment="1" initial_val="0" label="[DESC]" label_width="100"
+	     left="6" max_val="100" min_val="0" mouse_opaque="true" name="param slider"
+	     show_text="true" value="0" width="258" />
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_speaker_controls.xml b/indra/newview/skins/default/xui/es/panel_speaker_controls.xml
new file mode 100644
index 000000000..9ea1d591f
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_speaker_controls.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bevel_style="in" border="false" bottom="0" follows="left|bottom|right" height="120" left="0" name="active_speakers_panel" width="140">
+	<string name="moderator_label">(Moderator)</string>
+	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="123" left="0" orientation="vertical" tab_group="1" width="140" name="panels">
+		<layout_panel auto_resize="false" bottom="0" can_resize="false" height="25" left="0" min_height="25" name="moderation_mode_panel" top_delta="0" user_resize="false" visible="false" width="140">
+			<combo_box bottom="0" follows="left|top|right|bottom" height="20" left="5" name="moderation_mode" width="130">
+				<combo_item name="OpenVoice" value="unmoderated">Voices on by default</combo_item>
+				<combo_item name="ModeratedVoice" value="moderated">Voices off by default</combo_item>
+			</combo_box>
+		</layout_panel>
+		<layout_panel auto_resize="true" bottom="0" can_resize="false" height="120" min_height="100" name="moderate_chat_panel" top_delta="0" user_resize="false" visible="true" width="140">
+			<scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true" draw_stripes="false" follows="left|top|bottom|right" left="0" multi_select="false" name="speakers_list" right="140" search_column="1" sort_column="2" top="120">
+				<column name="icon_speaking_status" sort="speaking_status" width="20"/>
+				<column dynamicwidth="true" label="Name" name="speaker_name"/>
+				<column label="" name="speaking_status" width="0"/>
+			</scroll_list>
+			<panel border="false" bottom="0" can_resize="false" follows="left|bottom|right" height="77" left="0" name="speaker_controls" width="140">
+				<button bottom="-28" enabled="false" follows="left|top" height="20" image_overlay="icon_avatar_offline.tga" label="" left="4" name="profile_btn" right="34" scale_image="true"/>
+				<text bottom_delta="9" follows="left|top|right" left_delta="34" name="resident_name" valign="center" width="140">Rumplstiltskin Califragilistic</text>
+				<volume_slider bottom_delta="-29" follows="left|top" height="15" increment="0.05" initial_val="0.5" left="0" max_val="1.0" min_val="0.0" name="speaker_volume" width="110"/>
+				<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" left_delta="110" name="mute_btn" tool_tip="Mute voice for this resident" width="25"/>
+				<check_box bottom_delta="-25" enabled="false" follows="left|top" height="25" label="Mute Text" left="3" name="mute_text_btn"/>
+			</panel>
+		</layout_panel>
+		<layout_panel auto_resize="false" bottom="0" can_resize="false" height="60" left="0" name="moderator_controls" top_delta="0" user_resize="false" visible="false" width="140">
+			<text bottom="-20" follows="left|right|top|bottom" height="20" left="5" name="moderator_controls_label" right="-5">Moderator Controls:</text>
+			<check_box bottom_delta="-16" follows="left|right|top|bottom" height="20" name="moderator_allow_voice">Allow voice chat</check_box>
+			<check_box bottom_delta="-20" follows="left|right|top|bottom" height="20" name="moderator_allow_text">Allow text chat</check_box>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml
new file mode 100644
index 000000000..a67e6e48e
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="status">
+	  <text name="ParcelNameText" tool_tip="Nombre de la parcela en la que estás. Pulsa aquí para ver Acerca del Terreno.">
+			 El nombre de la parcela va aquí
+	  </text>
+	  <text name="BalanceText" tool_tip="Saldo de tu cuenta">
+			 Cargando...
+	  </text>
+	  <button name="buycurrency" tool_tip="Comprar dinero"/>
+	  <text type="string" name="TimeText" tool_tip="Hora actual (Del Pacífico)">
+			 24:00
+	  </text>
+	  <string name="StatBarDaysOfWeek">
+			 Domingo:Lunes:Martes:Miércoles:Viernes:Sábado
+	  </string>
+	  <string name="StatBarMonthsOfYear">
+			 Enero:Febrero:Marzo:Abril:Mayo:Junio:Julio:Agosto:Setiembre:Octubre:Noviembre:Diciembre
+	  </string>
+	  <button label="" label_selected="" name="scriptout" tool_tip="Aviso de Errores de Scripts" />
+	  <button label="" label_selected="" name="health" tool_tip="Salud"/>
+	  <text type="string" name="HealthText" tool_tip="Salud">
+			 100%
+	  </text>
+	  <button label="" label_selected="" name="no_fly" tool_tip="Prohibido volar"/>
+	  <button label="" label_selected="" name="no_build" tool_tip="Prohibido Construir/Rezear"/>
+	  <button label="" label_selected="" name="no_scripts" tool_tip="Prohibido ejecutar Scripts" />
+	  <button label="" label_selected="" name="restrictpush" tool_tip="Sin Empujones" />
+	  <button label="" label_selected="" name="status_no_voice" tool_tip="Chat de Voz No Disponible"/>
+	  <button label="" label_selected="" name="buyland" tool_tip="Comprar esta parcela" />
+
+	  <!-- Totally unsexy button hack to get a sexy bevel for sexy search bevel -brent -->
+	  <button label="" name="menubar_search_bevel_bg"/>
+	  <line_editor label="Buscar" name="search_editor" tool_tip="Buscar en Second Life"/>
+	  <button label="" label_selected="" name="search_btn" tool_tip="Buscar en Second Life"/>
+	  <text type="string" name="stat_btn"/>
+	  <string name="packet_loss_tooltip">
+			 Paquetes Perdidos
+	  </string>
+	  <string name="bandwidth_tooltip">
+			 Ancho de Banda
+	  </string>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_toolbar.xml b/indra/newview/skins/default/xui/es/panel_toolbar.xml
new file mode 100644
index 000000000..66abd855c
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_toolbar.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="toolbar">    
+	  <string name="Redock Windows">
+			 Reacoplar Ventana
+	  </string>
+	  <panel filename="panel_bg_toolbar.xml"/>
+	  <layout_stack name="toolbar_stack" >
+			 <button label="" name="chat_btn" tool_tip="Mostrar Barra de Chat. (Intro)"/>
+			 <flyout_button label="Comunicación" name="communicate_btn" tool_tip="Comunícate con tus amigos o grupos.(Ctrl-T)" />
+			 <button label="Radar" name="radar_list_btn" tool_tip="Ver lista de avatares cercanos.(Ctrl-Shift-A)"/>
+			 <button label="Volar" label_selected="Stop Flying" name="fly_btn" tool_tip="Despegar(F o Inicio). Usa E/C o AvPáa/RePág para ascender o descender"/>
+			 <button label="Capturar" name="snapshot_btn" tool_tip="Guardar una captura de pantalla al disco o al inventario.(Ctrl-Shift-S para abrir el flotante, Ctrl-`(~) toma la captura sin el flotante)"/>
+			 <button label="Buscar" name="directory_btn" tool_tip="Buscar lugares, eventos, personas, y más.(Ctrl-F)"/>
+			 <button label="Construir" name="build_btn" tool_tip="Crear nuevos objetos. (B)"/>
+			 <button label="Mapa" name="map_btn" tool_tip="Mapa del Mundo. (Ctrl-M)"/>
+			 <button label="MiniMapa" name="radar_btn" tool_tip="Mapa del área a tu alrededor. (Ctrl-Shift-M)"/>
+			 <button label="Inventario" name="inventory_btn" tool_tip="Tus items. (Ctrl-I)"/>
+	  </layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_top_pick.xml b/indra/newview/skins/default/xui/es/panel_top_pick.xml
new file mode 100644
index 000000000..73f1accb5
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_top_pick.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="false" bottom="20" follows="bottom|left" height="470" left="330"
+     name="Pick" title="Pick" width="450">
+	<texture_picker bottom="-315" follows="left|top" height="300" left="20" name="snapshot_ctrl"
+	     width="400" />
+	<line_editor bottom_delta="-8" enabled="false" follows="left|top"
+	     font="SansSerif" height="20" left="20" name="given_name_editor"
+	     width="400" />
+	<text_editor enabled="false" follows="left|top" font="SansSerif"
+	     height="90" left="20" max_length="1023" name="desc_editor"
+	     width="400" word_wrap="true" spell_check="true" />
+	<line_editor enabled="false" follows="left|top" font="SansSerif"
+	     height="20" left="20" name="location_editor" 
+	     width="400" />
+	<button bottom_delta="0" follows="left|top" height="20" label="Set" left="380"
+	     name="set_location_btn" width="60" />
+	<button bottom_delta="-30" follows="left|top" height="20" label="Teleport" left="20"
+	     name="pick_teleport_btn" width="80" />
+	<button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="105"
+	     name="pick_map_btn" width="100" />
+	<text bottom_delta="0" follows="left|top" height="20" left="290"
+	     name="sort_order_text" width="30">
+		Sort:
+	</text>
+	<line_editor bottom_delta="5" follows="left|top" height="16" left="320"
+	     name="sort_order_editor" width="25" />
+	<check_box bottom_delta="0" follows="left|top" height="20" label="Enabled" left="360"
+	     name="enabled_check" width="80" />
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_voice_controls.xml b/indra/newview/skins/default/xui/es/panel_voice_controls.xml
new file mode 100644
index 000000000..1d558c3c3
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_voice_controls.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="2"
+     enabled="true" follows="right|bottom" height="20" left="0"
+     mouse_opaque="true" name="voice_controls" width="128">
+	<button bottom="-22" height="22" image_overlay="active_speakers.tga" label="" left="2"
+	     name="speakers_btn"
+	     tool_tip="Show list of residents using voice chat around you" width="38" />
+	<button bottom="-22" height="22" pad_left="16" label="Talk" left_delta="40" name="push_to_talk"
+	     tab_stop="false" tool_tip="Hold the button to talk" width="60" />
+	<button bottom="-19" height="16" image_selected="ptt_lock_on.tga"
+	     image_unselected="ptt_lock_off.tga" label="" left_delta="4" name="ptt_lock"
+	     scale_image="false" toggle="true"
+	     tool_tip="Click lock to switch to talk mode" width="16" />
+	<icon bottom="-19" height="16" image_name="icn_voice_ptt-off.tga" left_delta="42"
+	     name="voice_volume" width="16" />
+	<button bottom="-22" control_name="ShowVoiceChannelPopup" height="22" label=""
+	     left_delta="16" name="show_channel" scale_image="true" toggle="true"
+	     tool_tip="Click to show current voice channel" width="22" />
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_voice_enable.xml b/indra/newview/skins/default/xui/es/panel_voice_enable.xml
new file mode 100644
index 000000000..98325311b
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_voice_enable.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="false" bottom="4" enabled="true" height="240" left="8"
+     mouse_opaque="true" name="content_panel" width="404">
+	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false"
+	     enabled="false" font="SansSerifSmall" height="85" hide_border="true"
+	     hide_scrollbar="true" left_delta="0" max_length="65535" mouse_opaque="true"
+	     name="voice_intro_text1" tab_stop="false" width="400" word_wrap="true">
+		Welcome to Second Life Voice Chat! Voice Chat enables you to speak with other Residents. This wizard will guide you through the steps necessary to set up Voice Chat. Using Voice Chat requires audio speakers and, if you wish to speak with others, a microphone or stereo headset with microphone.
+	</text_editor>
+	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false"
+	     enabled="false" font="SansSerifSmall" height="50" hide_border="true"
+	     hide_scrollbar="true" left_delta="0" max_length="65535" mouse_opaque="true"
+	     name="voice_intro_text2" tab_stop="false" width="400" word_wrap="true">
+		Voice Chat is enabled by default. Do you wish to continue using Voice Chat?
+	</text_editor>
+	<radio_group bottom_delta="-30" draw_border="false" enabled="true" follows="left|top"
+	     height="40" left="10" mouse_opaque="true" name="voice_enable" width="364">
+		<radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="1" width="315">
+			Yes, continue using Voice Chat.
+		</radio_item>
+		<radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="0" width="315">
+			No, disable Voice Chat.
+		</radio_item>
+	</radio_group>
+	<text_editor length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-50"
+	     embedded_items="false" enabled="false" font="SansSerifSmall" height="40"
+	     hide_border="true" hide_scrollbar="true" left="0" max_length="65535"
+	     name="voice_intro_text3" tab_stop="false" width="400" word_wrap="true">
+		You can enable Voice Chat at any time by going to the Voice Chat tab in Preferences.
+	</text_editor>
+	<text_editor length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="0"
+	     embedded_items="false" enabled="false" font="SansSerifSmall" height="40"
+	     hide_border="true" hide_scrollbar="true" left="0" max_length="65535"
+	     name="voice_intro_text4" tab_stop="false" width="400" word_wrap="true">
+		Click the Next button to configure Voice Chat preferences or click Finish to continue using Singularity Viewer.
+	</text_editor>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_voice_options.xml b/indra/newview/skins/default/xui/es/panel_voice_options.xml
new file mode 100644
index 000000000..4c6edfd60
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_voice_options.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="false" bottom="36" height="240" left="8" name="content_panel"
+     width="404">
+	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false"
+	     enabled="false" font="SansSerifSmall" height="30" hide_border="true"
+	     hide_scrollbar="true" left_delta="0" max_length="65535"
+	     name="voice_intro_text1" tab_stop="false" width="414" word_wrap="true">
+		Use the options below to configure your Voice Chat experience.
+	</text_editor>
+	<radio_group bottom_delta="-40" draw_border="false" follows="left|top" height="40" left="10"
+	     name="ear_location" width="364">
+		<radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315">
+			Hear Voice Chat from camera position.
+		</radio_item>
+		<radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="1" width="315">
+			Hear Voice Chat from avatar position.
+		</radio_item>
+	</radio_group>
+	<check_box bottom_delta="-20" control_name="VoiceCallsFriendsOnly" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="false"
+	     label="Only allow Friends to initiate Voice Calls with me" left="20"
+	     left_delta="2" name="friends_only_check" width="200" />
+	<check_box bottom_delta="-20" control_name="PushToTalkToggle" follows="left|top"
+	     font="SansSerifSmall" height="16" initial_value="false"
+	     label="Use Push-to-Talk in toggle mode" left_delta="0"
+	     name="push_to_talk_toggle_check" width="200" />
+	<text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20"
+	     embedded_items="false" follows="left|top" font="SansSerifSmall" height="16"
+	     hide_border="true" hide_scrollbar="true" left_delta="4" max_length="65535"
+	     name="push_to_talk_label" width="445" word_wrap="true">
+		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"
+	     follows="top|left" font="SansSerifSmall" halign="right" height="19"
+	     left_delta="0" max_length="254" name="modifier_combo" width="280" />
+	<button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"
+	     height="20" label="Set Key" left_delta="0" name="set_voice_hotkey_button"
+	     width="115" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="20" label="Middle Mouse Button" left_delta="120"
+	     name="set_voice_middlemouse_button" width="160" />
+</panel>
diff --git a/indra/newview/skins/default/xui/es/panel_voice_remote.xml b/indra/newview/skins/default/xui/es/panel_voice_remote.xml
new file mode 100644
index 000000000..c98b86bf2
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_voice_remote.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bg_visible="false" border="false" border_visible="false" bottom="0"
+     enabled="true" follows="right|bottom" height="20" left="0"
+     mouse_opaque="true" name="voice_remote" use_bounding_rect="true"
+     width="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/indra/newview/skins/default/xui/es/panel_voice_remote_expanded.xml b/indra/newview/skins/default/xui/es/panel_voice_remote_expanded.xml
new file mode 100644
index 000000000..08d7a2812
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/panel_voice_remote_expanded.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<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" 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"
+	     image_disabled_selected="icn_rounded-text-field.tga"
+	     image_hover_selected="icn_rounded-text-field.tga"
+	     image_hover_unselected="icn_rounded-text-field.tga"
+	     image_selected="icn_rounded-text-field.tga"
+	     image_unselected="icn_rounded-text-field.tga" label="" left_delta="23"
+	     name="voice_channel_bg" scale_image="true" width="102" />
+	<icon bottom="-18" height="16" image_name="icn_voice-localchat.tga" label=""
+	     left_delta="4" mouse_opaque="false" name="voice_channel_icon" width="16" />
+	<text bottom="-19" font="SansSerifSmall" height="16" label="" left_delta="18"
+	     mouse_opaque="false" name="channel_label" text_color="0 0 0" width="65" />
+	<panel bottom="13" filename="panel_voice_controls.xml" left="1" />
+</panel>
diff --git a/indra/newview/skins/default/xui/es/rlva_strings.xml b/indra/newview/skins/default/xui/es/rlva_strings.xml
new file mode 100644
index 000000000..8beadd514
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/rlva_strings.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<rlva_strings>
+
+  <strings>
+    <!-- Primarily used when @showloc restricted -->
+    <string name="hidden_generic">(Hidden)</string>
+    <string name="hidden_parcel">(Hidden parcel)</string>
+    <string name="hidden_region">(Hidden region)</string>
+
+    <!-- Received/sent IMs will be replaced by the matching string when @recvim/sendim restricted -->
+    <string name="blocked_recvim">*** IM blocked by your viewer</string>
+    <string name="blocked_sendim">*** IM blocked by sender's viewer</string>
+
+    <!-- Shown as notifications -->
+    <string name="blocked_generic">Unable to perform action due to RLV restrictions</string>
+    <string name="blocked_permattach">Attempt to attach '[OBJECT]' was denied due to RLV restrictions</string>
+    <string name="blocked_startim">Unable to start IM session with [RECIPIENT] due to RLV restrictions</string>
+    <string name="blocked_startconf">Unable to start conference with [RECIPIENT] due to RLV restrictions</string>
+    <string name="blocked_teleport">Unable to initiate teleport due to RLV restrictions</string>
+    <string name="blocked_viewxxx">Unable to open [TYPE] due to RLV restrictions</string>
+
+    <!-- Sent as "Busy" messages to the remote party -->
+    <string name="blocked_recvim_remote">
+      The Resident you messaged is prevented from reading your instant messages at the moment, please try again later.
+    </string>
+    <string name="blocked_tplure_remote">
+      The Resident you invited is prevented from accepting teleport offers. Please try again later.
+    </string>
+
+    <!-- Shown in local chat when dropping inventory onto a nearby agent (moved to strings.xml since it needs to be accesible by LLTrans) -->
+    <!--
+    <string name="inventory_item_offered_rlv">
+      Inventory item offered to [NAME]
+    </string>
+    -->
+  </strings>
+
+  <!-- Generic names used to replace resident names when @shownames restricted -->
+  <anonyms>
+    <anonym>A resident</anonym>
+    <anonym>This resident</anonym>
+    <anonym>That resident</anonym>
+    <anonym>An individual</anonym>
+    <anonym>This individual</anonym>
+    <anonym>That individual</anonym>
+    <anonym>A person</anonym>
+    <anonym>This person</anonym>
+    <anonym>That person</anonym>
+    <anonym>A stranger</anonym>
+    <anonym>This stranger</anonym>
+    <anonym>That stranger</anonym>
+    <anonym>A being</anonym>
+    <anonym>This being</anonym>
+    <anonym>That being</anonym>
+    <anonym>An agent</anonym>
+    <anonym>This agent</anonym>
+    <anonym>That agent</anonym>
+    <anonym>A soul</anonym>
+    <anonym>This soul</anonym>
+    <anonym>That soul</anonym>
+    <anonym>Somebody</anonym>
+    <anonym>Some people</anonym>
+    <anonym>Someone</anonym>
+    <anonym>Mysterious one</anonym>
+    <anonym>An unknown being</anonym>
+    <anonym>Unidentified one</anonym>
+    <anonym>An unknown person</anonym>
+  </anonyms>
+
+  <behaviour-notifications>
+    <!-- 
+    <notification behaviour="defaultwear" type="add">Text goes here</notification>
+    <notification behaviour="defaultwear" type="rem">Text goes here</notification>
+    -->
+  </behaviour-notifications>
+
+</rlva_strings>
diff --git a/indra/newview/skins/default/xui/es/role_actions.xml b/indra/newview/skins/default/xui/es/role_actions.xml
new file mode 100644
index 000000000..cfd2e16c3
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/role_actions.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<role_actions>
+	  <action_set description="Estas capacidades incluyen poderes para añadir o quitar miembros del grupo, y para pemitir que se sumen nuevos miembros sin necesidad de invitación." name="Membership">
+			 <action description="Invitar Personas al Grupo" longdescription="Invitar personas al grupo usando el botón &apos;Invitar a un nuevo miembro&apos; en Miembros y Roles &gt; subpestaña Miembros." name="member invite" value="1" />
+			 <action description="Expulsar a miembros del grupo usando el botón &apos;Expulsar del grupo&apos; en Miembros y Roles &gt; subpestaña Miembros. Un propietario puede expulsar a cualquiera, excepto a otro propietario. Si no eres un propietario, un miembro del grupo puede expulsarte sólo si tiene concedida esta capacidad específica. Para quitar capacidades a los miembros, debes tener la de &apos;Quitar capacidades a miembros&apos;." name="member eject" value="2" />
+			 <action description="Activar/desactivar &apos;Inscripción libre&apos; y cambiar &apos;Cuota de inscripción&apos;" longdescription="Activar/desactivar &apos;Inscripción libre&apos; para permitir o no que se unan sin invitación nuevos miembros, y cambiar la &apos;Cuota de inscripción&apos; en la sección Preferencias del grupo de la pestaña General." name="member options" value="3" />
+	  </action_set>
+	  <action_set description="Estas habilidades incluyen el poder añadir, quitar y cambiar roles, asignarlos a  miembros, y darles capacidades" name="Roles"> 
+			 <action description="Crear nuevos roles" longdescription="Crear nuevos roles en Miembros y Roles &gt; pestaña Roles &gt; botón Crear un rol nuevo." name="role create" value="4" />
+			 <action description="Borrar Roles" longdescription="Borrar roles en Miembros y Roles &gt; pestaña Roles &gt; botón Eliminar el rol." name="role delete" value="5" />
+			 <action description="Cambiar nombres de roles, títulos, descripciones y si los integrantes de lo roles son visibles."
+		     longdescription="Cambiar nombres de roles, títulos, descripciones y si los integrantes de lo roles son visibles. Esto se hace al pié de la pestaña Miembros y Roles &gt; subpestaña Roles luego de seleccionar un rol." name="role properties" value="6" />
+			 <action description="Designar miembros para el rol de Asignador" longdescription="Designar miembros para un rol en la sección Roles asignados de la pestaña Miembros y Roles &gt; subpestaña Miembros. Un miembro con este poder sólo puede asignar a otros el rol que él posee." name="role assign member limited" value="7" />
+			 <action description="Designar miembros para cualquier Rol" longdescription="Designar miembros para cualquier rol en la sección Roles asignados de la pestaña Miembros y Roles &gt; subpestaña Miembros. *AVISO* Todos los miembros con esta capacidad podrán asignarse a sí mismos (y a otros miembros) roles con mayores poderes de los que actualmente tienen. Potencialmente, podrían elevarse hasta poderes cercanos a los del propietario. Asegúrate de lo que estás haciendo antes de otorgar esta capacidad." name="role assign member" value="8" />
+			 <action description="Quitar miembros de los roles"
+		     longdescription="Quitar miembros de roles en la sección Capacidades asignadas de Miembros y Roles &gt; subpestaña Roles. No se pueden quitar a los Propietarios."
+		     name="role remove member" value="9" />
+		<action description="Assign and Remove Abilities in Roles"
+		     longdescription="Assign and Remove Abilities in Roles in the Allowed Abilities section of the Members &amp; Roles tab &gt; Roles sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--all Abilities, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability."
+		     name="role change actions" value="10" />
+	</action_set>
+	<action_set
+	     description="These Abilities include powers to modify this group&apos;s identity, such as changing public visibility, charter, and insignia."
+	     name="Group Identity">
+		<action
+		     description="Change Charter, Insignia, and &apos;Show in search&apos;"
+		     longdescription="Change Charter, Insignia, and &apos;Show in search&apos;. This is done in the General tab."
+		     name="group change identity" value="11" />
+	</action_set>
+	<action_set
+	     description="These Abilities include powers to deed, modify, and sell land in this group&apos;s land holdings. To get to the About Land window, right-click the ground and select &apos;About Land...&apos;, or click the parcel info in the menu bar."
+	     name="Parcel Management">
+		<action description="Deed land and buy land for group"
+		     longdescription="Deed land and buy land for group. This is done in About Land &gt; General tab."
+		     name="land deed" value="12" />
+		<action description="Abandon land to Governor Linden"
+		     longdescription="Abandon land to Governor Linden. *WARNING* Any Member in a Role with this Ability can abandon group-owned land in About Land &gt; General tab, reverting it to Linden ownership without a sale! Be sure you know what you&apos;re doing before assigning this Ability."
+		     name="land release" value="13" />
+		<action description="Set land for sale info"
+		     longdescription="Set land for sale info. *WARNING* Any Member in a Role with this Ability can sell group-owned land in About Land &gt; General tab as they wish! Be sure you know what you&apos;re doing before assigning this Ability."
+		     name="land set sale info" value="14" />
+		<action description="Subdivide and join parcels"
+		     longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide...&apos;. To join, select two or more contiguous parcels and click &apos;Join...&apos;. "
+		     name="land divide join" value="15" />
+	</action_set>
+	<action_set
+	     description="These Abilities include powers to change the parcel name and publish settings, Find directory visibility, and landing point &amp; TP routing options."
+	     name="Parcel Identity">
+		<action description="Toggle &apos;Show in Find Places&apos; and set category"
+		     longdescription="Toggle &apos;Show in Find Places&apos; and setting a parcel&apos;s category in About Land &gt; Options tab."
+		     name="land find places" value="17" />
+		<action
+		     description="Change parcel name, description, and &apos;Show in search&apos; settings"
+		     longdescription="Change parcel name, description, and &apos;Show in search&apos; settings. This is done in About Land &gt; Options tab."
+		     name="land change identity" value="18" />
+		<action description="Set landing point and set teleport routing"
+		     longdescription="On a group-owned parcel, Members in a Role with this Ability can set a landing point to specify where incoming teleports arrive, and also set teleport routing for further control. This is done in About Land &gt; Options tab."
+		     name="land set landing point" value="19" />
+	</action_set>
+	<action_set
+	     description="These Abilities include powers which affect parcel options, such as &apos;Create Objects&apos;, &apos;Edit Terrain&apos;, and music &amp; media settings."
+	     name="Parcel Settings">
+		<action description="Change music &amp; media settings"
+		     longdescription="Change streaming music and movie settings in About Land &gt; Media tab."
+		     name="land change media" value="20" />
+		<action description="Toggle &apos;Edit Terrain&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."
+		     name="land edit" value="21" />
+		<action description="Toggle various About Land &gt; Options settings"
+		     longdescription="Toggle &apos;Safe (no damage)&apos;, &apos;Fly&apos;, and allow other Residents to: &apos;Create Objects&apos;, &apos;Edit Terrain&apos;, &apos;Create Landmarks&apos;, and &apos;Run Scripts&apos; on group-owned land in About Land &gt; Options tab."
+		     name="land options" value="22" />
+	</action_set>
+	<action_set
+	     description="These Abilities include powers which allow Members to bypass restrictions on group-owned parcels."
+	     name="Parcel Powers">
+		<action description="Always allow &apos;Edit Terrain&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."
+		     name="land allow edit land" value="23" />
+		<action description="Always allow &apos;Fly&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."
+		     name="land allow fly" value="24" />
+		<action description="Always allow &apos;Create Objects&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."
+		     name="land allow create" value="25" />
+		<action description="Always allow &apos;Create Landmark&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."
+		     name="land allow landmark" value="26" />
+		<action description="Allow &apos;Set Home to Here&apos; on group land"
+		     longdescription="Members in a Role with this Ability can use World menu &gt; Set Home to Here on a parcel deeded to this group."
+		     name="land allow set home" value="28" />
+		<action description="Allow &apos;Event Hosting&apos; on group land"
+		     longdescription="Members in a Role with this Ability can select group owned parcels as venus when hosting an event."
+		     name="land allow host event" value="41" />			 
+	</action_set>
+	<action_set
+	     description="These Abilities include powers to allow or restrict access to group-owned parcels, including freezing and ejecting Residents."
+	     name="Parcel Access">
+		<action description="Manage parcel Access lists"
+		     longdescription="Manage parcel Access lists in About Land &gt; Access tab."
+		     name="land manage allowed" value="29" />
+		<action description="Manage parcel Ban lists"
+		     longdescription="Manage parcel Ban lists in About Land &gt; Ban tab."
+		     name="land manage banned" value="30" />
+		<action description="Change parcel &apos;Sell passes...&apos; settings"
+		     longdescription="Change parcel &apos;Sell passes...&apos; settings in About Land &gt; Access tab."
+		     name="land manage passes" value="31" />
+		<action description="Eject and freeze Residents on parcels"
+		     longdescription="Members in a Role with this Ability can handle an unwelcome Resident on a group-owned parcel by right-clicking them, More &gt;, and selecting &apos;Eject...&apos; or &apos;Freeze...&apos;."
+		     name="land admin" value="32" />
+	</action_set>
+	<action_set
+	     description="These Abilities include powers to allow members to return objects and place and move Linden plants. This is useful for Members to clean up litter and do landscaping, but it should also be used with care, because there&apos;s no undo for returning objects."
+	     name="Parcel Content">
+		<action description="Return objects owned by group"
+		     longdescription="Return objects on group-owned parcels that are owned by the group in About Land &gt; Objects tab."
+		     name="land return group owned" value="48" />
+		<action description="Return objects set to group"
+		     longdescription="Return objects on group-owned parcels that are set to the group in About Land &gt; Objects tab."
+		     name="land return group set" value="33" />
+		<action description="Return non-group objects"
+		     longdescription="Return objects on group-owned parcels that are non-group in About Land &gt; Objects tab."
+		     name="land return non group" value="34" />
+		<action description="Landscaping using Linden plants"
+		     longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory&apos;s Library &gt; Objects folder or they can be created via the Build button."
+		     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. "
+	     name="Object Management">
+		<action description="Deed objects to group"
+		     longdescription="Deed objects to group in the Edit Tools &gt; General Tab."
+		     name="object deed" value="36" />
+		<action description="Manipulate (move, copy, modify) group-owned objects"
+		     longdescription="Manipulate (move, copy, modify) group-owned objects in the Edit Tools &gt; General Tab."
+		     name="object manipulate" value="38" />
+		<action description="Set group-owned objects for sale"
+		     longdescription="Set group-owned objects for sale in the Edit Tools &gt; General tab."
+		     name="object set sale" value="39" />
+	</action_set>
+	<action_set
+	     description="These Abilities include powers which require Members to pay group liabilities and receive group dividends, and restrict access to group account history."
+	     name="Accounting">
+		<action description="Pay group liabilities and receive group dividends"
+		     longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "
+		     name="accounting accountable" value="40" />
+	</action_set>
+	<action_set
+	     description="These Abilities include powers to allow Members to send, receive, and view group Notices."
+	     name="Notices">
+		<action description="Send Notices"
+		     longdescription="Members in a Role with this Ability can send Notices in Group Information &gt; Notices tab."
+		     name="notices send" value="42" />
+		<action description="Receive Notices and view past Notices"
+		     longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group Information &gt; Notices tab."
+		     name="notices receive" value="43" />
+	</action_set>
+	<action_set
+	     description="These Abilities include powers to allow Members to set up Proposals, vote on Proposals, and view voting history."
+	     name="Proposals">
+		<action description="Create Proposals"
+		     longdescription="Members in a Role with this Ability can create proposals to be voted on in Group Information &gt; Proposals tab."
+		     name="proposal start" value="44" />
+		<action description="Vote on Proposals"
+		     longdescription="Members in a Role with this Ability can vote on proposals in Group Information &gt; Proposals tab."
+		     name="proposal vote" value="45" />
+	</action_set>
+	<action_set
+	     description="These Abilities include powers to allow or restrict access to group chat sessions and group voice chat." 
+	     name="Chat">
+		<action description="Join Group Chat"
+		     longdescription="Members in a Role with this Ability can join group chat sessions, for text and voice."
+		     name="join group chat" value="16" />
+		<action description="Join Group Voice Chat"
+		     longdescription="Members in a Role with this Ability can join group voice chat sessions.  NOTE: The Join Group Chat ability is required to access the voice chat session."
+		     name="join voice chat" value="27" />	
+		<action description="Moderate Group Chat"
+		     longdescription="Members in a Role with this Ability can control access and participation in group voice and text chat sessions."
+		     name="moderate group chat" value="37" />
+	</action_set>
+</role_actions>
diff --git a/indra/newview/skins/default/xui/es/sh_floater_media_ticker.xml b/indra/newview/skins/default/xui/es/sh_floater_media_ticker.xml
new file mode 100644
index 000000000..3191e0dbb
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/sh_floater_media_ticker.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="mediaticker" title="">
+	  <text name="artist_label">
+			 Artista:
+	  </text>
+	  <text name="title_label">
+			 Título:
+	  </text>
+	
+	  <string name="paused">
+			 (Sin Reproducir)
+	  </string>
+	  <string name="loading">
+			 (Cargando...)
+	  </string>		
+</floater>
diff --git a/indra/newview/skins/default/xui/es/sh_floater_media_ticker_visualizer.xml b/indra/newview/skins/default/xui/es/sh_floater_media_ticker_visualizer.xml
new file mode 100644
index 000000000..4ccc48771
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/sh_floater_media_ticker_visualizer.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="mediaticker" title="" >
+	  <text name="artist_label">
+			 Artista:
+	  </text>
+	  <text name="title_label">
+			 Título:
+	  </text>
+	
+	  <string name="paused">
+			 (Sin Reproducir)
+	  </string>
+	  <string name="loading">
+			 (Cargando...)
+	  </string>		
+</floater>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
new file mode 100644
index 000000000..23daaf448
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -0,0 +1,2672 @@
+<?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'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="CURRENCY">L$</string>
+			 <string name="GRID_OWNER">Linden Lab</string>
+
+			 <string name="hippo_label_free">free</string>
+			 <string name="hippo_label_week">week</string>
+			 <string name="TeleportOfferMaturity">
+					[NAME] te ofrece un TP a [DESTINATION]
+			 </string>
+			 <string name="TeleportLureMaturity">
+					[NAME]'s teleport lure is to [DESTINATION]
+			 </string>
+			 <string name="AvatarIdle">
+					Inactivo por [MINUTES]min
+			 </string>
+
+			 <!-- Default Args - these arguments will be replaced in all strings -->
+			 <string name="SECOND_LIFE">Second Life</string>
+			 <string name="APP_NAME">Singularity Viewer</string>
+			 <string name="CAPITALIZED_APP_NAME">SINGULARITY VIEWER</string>
+			 <string name="SECOND_LIFE_GRID">Grid Second Life</string>
+			 <string name="SUPPORT_SITE">Portal de Soporte de Second Life</string>
+
+			 <!-- starting up -->
+			 <string name="StartupDetectingHardware">Detectando hardware...</string>
+			 <string name="StartupLoading">Cargando [APP_NAME]...</string>
+			 <string name="StartupClearingCache">Limpiadno caché...</string>
+			 <string name="StartupInitializingTextureCache">Inicializando Caché de Testuras...</string>
+			 <string name="StartupInitializingVFS">Inicializando VFS...</string>
+			 <string name="StartupRequireDriverUpdate">¡Ha fallado la inicialización gráfica. Por favor, actualiza los controladores gráficos!</string>
+
+			 <!--  progress -->
+			 <string name="ProgressRestoring">Restaurando...</string>
+			 <string name="ProgressChangingResolution">Cmabiando la Ressolución...</string>
+			 <!-- Login -->
+			 <string name="LoginInProgress">Iniciando sesión. [APP_NAME] puede aparecer congelado.  Espera por favor.</string>
+			 <string name="LoginInProgressNoFrozen">Iniciando sesión...</string>
+			 <string name="LoginAuthenticating">Autenticando</string>
+			 <string name="LoginMaintenance">Realizando mantenimiento de cuentas...</string>
+			 <string name="LoginAttempt">Ha fallado el inicio de sesión previo. Iniciando sesión, intento [NUMBER]</string>
+			 <string name="LoginPrecaching">Cargando el Mundo...</string>
+			 <string name="LoginInitializingBrowser">iniciando navegador web incorporado...</string>
+			 <string name="LoginInitializingMultimedia">Inicializando multimedia...</string>
+			 <string name="LoginInitializingFonts">Cargando fuentes...</string>
+			 <string name="LoginVerifyingCache">Verificando archivos de caché (puede demorar entre 60-90 segundos)...</string>
+			 <string name="LoginProcessingResponse">Procesando Respuesta...</string>
+			 <string name="LoginInitializingWorld">Inicializando el Mundo...</string>
+			 <string name="LoginDecodingImages">Decodificando Imágenes...</string>
+			 <string name="LoginInitializingQuicktime">Inicializando QuickTime...</string>
+			 <string name="LoginQuicktimeNotFound">No se ha encontrado QuickTime - incapaz de iniciarlo.</string>
+			 <string name="LoginQuicktimeOK">QuickTime ha sido inicializado satisfactoriamente.</string>
+			 <string name="LoginRequestSeedCapGrant">Solicitando capacidades de la Región...</string>
+			 <string name="LoginRetrySeedCapGrant">Solicitando capacidades de la Región, intento [NUMBER]...</string>
+			 <string name="LoginWaitingForRegionHandshake">Esperando saludo de la Región...</string>
+			 <string name="LoginConnectingToRegion">Conectando a la región...</string>
+			 <string name="LoginDownloadingClothing">Descargando ropas...</string>
+
+			 <string name="LoginFailed">Inicio de sesión fallido.</string>
+			 <string name="Quit">Salir</string>
+
+			 <!-- Disconnection -->
+			 <string name="AgentLostConnection">Esta región está experimentando problemas.  Revisa por favor tu conexión a Internet.</string>
+			 <string name="SavingSettings">Guardando tus configuraciones...</string>
+			 <string name="LoggingOut">Cerrando sesión...</string>
+			 <string name="ShuttingDown">Cerrando...</string>
+			 <string name="YouHaveBeenDisconnected">Has sido desconectado de la región donde te encontrabas.</string>
+			 <string name="SentToInvalidRegion">Se te ha enviado a una región no válida.</string>
+
+			 <!-- Tooltip, llhoverview.cpp -->
+			 <string name="TooltipPerson">Persona</string><!-- Object under mouse pointer is an avatar -->
+			 <string name="TooltipNoName">(sin nombre)</string> <!-- No name on an object -->
+			 <string name="TooltipOwner">Propietario:</string> <!-- Owner name follows -->
+			 <string name="TooltipPublic">Público</string> <!-- Public permissions on an object -->
+			 <string name="TooltipIsGroup">(Grupo)</string> <!-- The name before this text is that of a group -->
+			 <string name="TooltipFlagScript">Script</string>
+			 <string name="TooltipFlagPhysics">Físico</string>
+			 <string name="TooltipFlagTouch">Tocar</string>
+			 <string name="TooltipFlagL$">[CURRENCY]</string>
+			 <string name="TooltipFlagDropInventory">Soltar Inventario</string>
+			 <string name="TooltipFlagPhantom">Fantasma</string>
+			 <string name="TooltipFlagTemporary">Temporario</string>
+			 <string name="TooltipFlagRightClickMenu">(Botón derecho para menú)</string>
+			 <string name="TooltipFreeToCopy">Libre para copiar</string>
+			 <string name="TooltipForSaleL$">En venta: [CURRENCY][AMOUNT]</string> <!-- L$ version -->
+			 <string name="TooltipForSaleMsg">En venta: [MESSAGE]</string> <!-- Message (RetrievingData) -->
+			 <string name="TooltipFlagGroupBuild">Construir Grupo</string>
+			 <string name="TooltipFlagNoBuild">No Construir</string>
+			 <string name="TooltipFlagNoEdit">Construir Grupo</string>
+			 <string name="TooltipFlagNotSafe">No seguro</string><!-- damage area -->
+			 <string name="TooltipFlagNoFly">No volar</string>
+			 <string name="TooltipFlagGroupScripts">Scripts de Grupo</string>
+			 <string name="TooltipFlagNoScripts">Sin Scripts</string>
+			 <string name="TooltipLand">Terreno:</string>
+			 <string name="TooltipMustSingleDrop">Sólo un único item puede ser arrastrado aquí</string>
+
+			 <string name="TooltipOutboxDragToWorld">No puedes rezear item en tu Merchant Outbox</string>
+			 <string name="TooltipOutboxNoTransfer">Uno o más de estos objetos no pueden ser vendidos o transferidos.</string>
+			 <string name="TooltipOutboxNotInInventory">Tu Merchant Outbox solo puede aceptar items de tu inventario</string>
+			 <string name="TooltipOutboxWorn">No puedes colocar items que tienes vestidos en tu Merchant Outbox</string>
+			 <string name="TooltipOutboxCallingCard">No puedes colocar Tarjetas de LLamada en tu Merchant OutBox</string>
+			 <string name="TooltipOutboxFolderLevels">La profundidad de carpetas anidades es superior a 3</string>
+			 <string name="TooltipOutboxTooManyFolders">El recuento de subcarpetas en el nivel superior supera las 20</string>
+			 <string name="TooltipOutboxTooManyObjects">El recuento de items en la carpeta de nivel superior supera los 200</string>
+	
+			 <string name="TooltipDragOntoOwnChild">No puedes mover una carpeta a su carpeta secundaria</string>
+			 <string name="TooltipDragOntoSelf">No puedes mover una carpeta en si misma</string>
+
+			 <!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. -->
+			 <string name="RetrievingData">Recuperando...</string>
+
+			 <string name="ReleaseNotes">Notas de Lanzamiento</string>
+
+			 <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
+			 <string name="LoadingData">Cargando...</string>
+
+
+			 <!-- namecache -->
+			 <!-- Avatar name: text shown for LLUUID::null -->
+			 <string name="AvatarNameNobody">(nadie)</string>
+
+			 <!-- Avatar name: text shown while fetching name -->
+			 <string name="AvatarNameWaiting">(esperando)</string>
+
+			 <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. -->
+			 <string name="AvatarNameHippos">(hippos)</string>
+
+			 <!-- Group name: text shown for LLUUID::null -->
+			 <string name="GroupNameNone">(ninguno)</string>
+
+			 <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
+			 <string name="AssetErrorNone">Sin errores</string>
+			 <string name="AssetErrorRequestFailed">Petición de Asset: fallida</string>
+			 <string name="AssetErrorNonexistentFile">Petición de Asset: archivo inexistente</string>
+			 <string name="AssetErrorNotInDatabase">Petición de Asset: activo no hallado en la base de datos</string>
+			 <string name="AssetErrorEOF">Fin de archivo</string>
+			 <string name="AssetErrorCannotOpenFile">No se puede abrir el archivo</string>
+			 <string name="AssetErrorFileNotFound">Archivo no encontrado</string>
+			 <string name="AssetErrorTCPTimeout">Tiempo de espera en transferencia de archivo agotado</string>
+			 <string name="AssetErrorCircuitGone">El circuito se ha ido</string>
+			 <string name="AssetErrorPriceMismatch">El Visor y el Servidor no coinciden con el precio</string>
+			 <string name="AssetErrorUnknownStatus">Estado desconocido</string>
+
+			 <!-- llvoavatar. Displayed in the avatar's chat bubble -->
+			 <string name="AvatarEditingAppearance">(Editando Apariencia)</string>
+			 <string name="AvatarAway">Ausente</string>
+			 <string name="AvatarBusy">Ocupado</string>
+			 <string name="AvatarMuted">Bloqueado</string>
+
+			 <!-- animations -->
+			 <string name="anim_express_afraid">Miedo</string>
+			 <string name="anim_express_anger">Enfado</string>
+			 <string name="anim_away">Ausente</string>
+			 <string name="anim_backflip">alto mortal atrás</string>
+			 <string name="anim_express_laugh">Carcajada</string>
+			 <string name="anim_express_toothsmile">Gran sonrisa</string>
+			 <string name="anim_blowkiss">Mandar un beso</string>
+			 <string name="anim_express_bored">Aburrimiento</string>
+			 <string name="anim_bow">Reverencia</string>
+			 <string name="anim_clap">Aplauso</string>
+			 <string name="anim_courtbow">Reverencia floreada</string>
+			 <string name="anim_express_cry">Llanto</string>
+			 <string name="anim_dance1">Baile 1</string>
+			 <string name="anim_dance2">Baile 2</string>
+			 <string name="anim_dance3">Baile 3</string>
+			 <string name="anim_dance4">Baile 4</string>
+			 <string name="anim_dance5">Baile 5</string>
+			 <string name="anim_dance6">Baile 6</string>
+			 <string name="anim_dance7">Baile 7</string>
+			 <string name="anim_dance8">Baile 8</string>
+			 <string name="anim_express_disdain">Desdén</string>
+			 <string name="anim_drink">Beber</string>
+			 <string name="anim_express_embarrased">Avergonzado</string>
+			 <string name="anim_angry_fingerwag">Negar con el dedo</string>
+			 <string name="anim_fist_pump">Gesto de Victoria</string>
+			 <string name="anim_yoga_float">Yoga flotando</string>
+			 <string name="anim_express_frown">Fruncir el ceño</string>
+			 <string name="anim_impatient">Impaciente</string>
+			 <string name="anim_jumpforjoy">Salto de alegría</string>
+			 <string name="anim_kissmybutt">Bésame el culo</string>
+			 <string name="anim_express_kiss">Besar</string>
+			 <string name="anim_laugh_short">Reír</string>
+			 <string name="anim_musclebeach">Sacar músculo</string>
+			 <string name="anim_no_unhappy">No (con enfado)</string>
+			 <string name="anim_no_head">No</string>
+			 <string name="anim_nyanya">Ña-Ña-Ña</string>
+			 <string name="anim_punch_onetwo">Puñetazo uno-dos</string>
+			 <string name="anim_express_open_mouth">Abrir la boca</string>
+			 <string name="anim_peace">Paz</string>
+			 <string name="anim_point_you">Señalar a otro/a</string>
+			 <string name="anim_point_me">Señalarse</string>
+			 <string name="anim_punch_l">Puñetazo izquierdo</string>
+			 <string name="anim_punch_r">Puñetazo derecho</string>
+			 <string name="anim_rps_countdown">PPT cuenta</string>
+			 <string name="anim_rps_paper">PPT papel</string>
+			 <string name="anim_rps_rock">PPT piedra</string>
+			 <string name="anim_rps_scissors">PPT tijera</string>
+			 <string name="anim_express_repulsed">Rechazo</string>
+			 <string name="anim_kick_roundhouse_r">Patada circular</string>
+			 <string name="anim_express_sad">Triste</string>
+			 <string name="anim_salute">Saludo militar</string>
+			 <string name="anim_shout">Gritar</string>
+			 <string name="anim_express_shrug">Encogerse de hombros</string>
+			 <string name="anim_express_smile">Sonreír</string>
+			 <string name="anim_smoke_idle">Fumar: en la mano</string>
+			 <string name="anim_smoke_inhale">Fumar: Inhalar</string>
+			 <string name="anim_smoke_throw_down">Fumar: tirar el cigarro</string>
+			 <string name="anim_express_surprise">Sorpresa</string>
+			 <string name="anim_sword_strike_r">Estocada</string>
+			 <string name="anim_angry_tantrum">Berrinche</string>
+			 <string name="anim_express_tongue_out">Sacar la lengua</string>
+			 <string name="anim_hello">Agitar la mano</string>
+			 <string name="anim_whisper">Susurrar</string>
+			 <string name="anim_whistle">Silbar</string>
+			 <string name="anim_express_wink">Guiño</string>
+			 <string name="anim_wink_hollywood">Guiño (Hollywood)</string>
+			 <string name="anim_express_worry">Preocuparse</string>
+			 <string name="anim_yes_happy">Sí (contento)</string>
+			 <string name="anim_yes_head">Si</string>
+
+			 <string name="texture_loading">Cargando...</string>
+			 <string name="worldmap_offline">Desconectado</string>
+
+			 <!-- animations uploading status codes -->
+			 <string name="Ok">OK</string>
+			 <!-- Chat -->
+			 <string name="whisper">Susurros:</string>
+			 <string name="shout">Gritos:</string>
+
+			 <!-- Sim Access labels -->
+			 <string name="SIM_ACCESS_PG">PG</string>
+			 <string name="SIM_ACCESS_MATURE">Mature</string>
+			 <string name="SIM_ACCESS_ADULT">Adulto</string>
+			 <string name="SIM_ACCESS_DOWN">Desconectado</string>
+			 <string name="SIM_ACCESS_MIN">Desconocido</string>
+
+			 <!-- For use when we do not have land type back from the server -->
+			 <string name="land_type_unknown">(Desconocido)</string>
+
+			 <!-- Covenant info -->
+			 <string name="covenant_never_modified">Última Modificación: (nunca)</string>
+			 <string name="covenant_modified">Última Modificación: </string>
+
+			 <!-- File load/save dialogs -->
+			 <string name="all_files">Todos los Archivos</string>
+			 <string name="sound_files">Sonidos</string>
+			 <string name="animation_files">Animaciones</string>
+			 <string name="image_files">Imágenes</string>
+			 <string name="save_file_verb">Guardar</string>
+			 <string name="load_file_verb">Cargar</string>
+			 <string name="targa_image_files">Imágenes Targa</string>
+			 <string name="bitmap_image_files">Imágenes de Mapa de Bits</string>
+			 <string name="avi_movie_file">Película AVI</string>
+			 <string name="xaf_animation_file">Animación XAF</string>
+			 <string name="xml_file">Archivo XML</string>
+			 <string name="raw_file">Archivo RAW</string>
+			 <string name="compressed_image_files">Imágenes Comprimidas</string>
+			 <string name="load_files">Cargar Archivos</string>
+			 <string name="choose_the_directory">Seleccionar Directorio</string>
+
+ 
+			 <!-- LSL Usage Hover Tips -->
+			 <string name="LSLTipSleepTime">
+					Pausa el script por [SLEEP_TIME] segundos.
+			 </string>
+
+			 <string name="LSLTipText_llSin">
+					float llSin(float theta)
+Devuelve el seno de theta (theta en radianes)
+			 </string>
+			 <string name="LSLTipText_llCos">
+					float llCos(float theta)
+Devuelve el coseno de theta (theta en radianes)
+			 </string>
+			 <string name="LSLTipText_llTan">
+					float llTan(float theta)
+Returns the tangent of theta (theta in radians)
+  </string>
+  <string name="LSLTipText_llAtan2">
+float llAtan2(float y, float x)
+Returns the arctangent2 of y, x
+  </string>
+  <string name="LSLTipText_llSqrt">
+float llSqrt(float val)
+Returns the square root of val, or returns 0 and triggers a Math Error for imaginary results
+  </string>
+  <string name="LSLTipText_llPow">
+float llPow(float base, float exponent)
+Returns the base raised to the power exponent, or returns 0 and triggers Math Error for imaginary results
+  </string>
+  <string name="LSLTipText_llAbs">
+integer llAbs(integer val)
+Returns the positive version of val
+  </string>
+  <string name="LSLTipText_llFabs">
+float llFabs(float val)
+Returns the positive version of val
+  </string>
+  <string name="LSLTipText_llFrand">
+float llFrand(float mag)
+Returns a pseudo random number in the range [0,mag) or (mag,0]
+  </string>
+  <string name="LSLTipText_llFloor">
+integer llFloor(float val)
+Returns largest integer value &lt;= val
+  </string>
+  <string name="LSLTipText_llCeil">
+integer llCeil(float val)
+Returns smallest integer value &gt;= val
+  </string>
+  <string name="LSLTipText_llRound">
+integer llRound(float val)
+Returns val rounded to the nearest integer
+  </string>
+  <string name="LSLTipText_llVecMag">
+float llVecMag(vector v)
+Returns the magnitude of v
+  </string>
+  <string name="LSLTipText_llVecNorm">
+vector llVecNorm(vector v)
+Returns the v normalized
+  </string>
+  <string name="LSLTipText_llVecDist">
+float llVecDist(vector v1, vector v2)
+Returns the 3D distance between v1 and v2
+  </string>
+  <string name="LSLTipText_llRot2Euler">
+vector llRot2Euler(rotation q)
+Returns the Euler representation (roll, pitch, yaw) of q
+  </string>
+  <string name="LSLTipText_llEuler2Rot">
+rotation llEuler2Rot(vector v)
+Returns the rotation representation of Euler Angles v
+  </string>
+  <string name="LSLTipText_llAxes2Rot">
+rotation llAxes2Rot(vector fwd, vector left, vector up)
+Returns the rotation defined by the coordinate axes
+  </string>
+  <string name="LSLTipText_llRot2Fwd">
+vector llRot2Fwd(rotation q)
+Returns the forward vector defined by q
+  </string>
+  <string name="LSLTipText_llRot2Left">
+vector llRot2Left(rotation q)
+Returns the left vector defined by q
+  </string>
+  <string name="LSLTipText_llRot2Up">
+vector llRot2Up(rotation q)
+Returns the up vector defined by q
+  </string>
+  <string name="LSLTipText_llRotBetween">
+rotation llRotBetween(vector v1, vector v2)
+Returns the rotation to rotate v1 to v2
+  </string>
+  <string name="LSLTipText_llWhisper">
+llWhisper(integer channel, string msg)
+Whispers the text of msg on channel
+  </string>
+  <string name="LSLTipText_llSay">
+llSay(integer channel, string msg)
+Says the text of msg on channel
+  </string>
+  <string name="LSLTipText_llShout">
+llShout(integer channel, string msg)
+Shouts the text of msg on channel
+  </string>
+  <string name="LSLTipText_llListen">
+integer llListen(integer channel, string name, key id, string msg)
+Sets a callback for msg on channel from name and id (name, id, and/or msg can be empty) and returns an identifier that can be used to deactivate or remove the listen
+  </string>
+  <string name="LSLTipText_llListenControl">
+llListenControl(integer number, integer active)
+Makes a listen event callback active or inactive
+  </string>
+  <string name="LSLTipText_llListenRemove">
+llListenRemove(integer number)
+Removes listen event callback number
+  </string>
+  <string name="LSLTipText_llSensor">
+llSensor(string name, key id, integer type, float range, float arc)
+Performs a single scan for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0)
+  </string>
+  <string name="LSLTipText_llSensorRepeat">
+llSensorRepeat(string name, key id, integer type, float range, float arc, float rate)
+Sets a callback for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0) and repeats every rate seconds
+  </string>
+  <string name="LSLTipText_llSensorRemove">
+llSensorRemove()
+Removes the sensor setup by llSensorRepeat
+  </string>
+  <string name="LSLTipText_llDetectedName">
+string llDetectedName(integer number)
+Returns the name of detected object number (returns empty string if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedKey">
+key llDetectedKey(integer number)
+Returns the key of detected object number (returns empty key if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedOwner">
+key llDetectedOwner(integer number)
+Returns the key of detected object&apos;s owner (returns empty key if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedType">
+integer llDetectedType(integer number)
+Returns the type (AGENT, ACTIVE, PASSIVE, SCRIPTED) of detected object (returns 0 if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedPos">
+vector llDetectedPos(integer number)
+Returns the position of detected object number (returns &lt;0,0,0&gt; if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedVel">
+vector llDetectedVel(integer number)
+Returns the velocity of detected object number (returns &lt;0,0,0&gt; if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedGrab">
+vector llDetectedGrab(integer number)
+Returns the grab offset of the user touching object (returns &lt;0,0,0&gt; if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedRot">
+rotation llDetectedRot(integer number)
+Returns the rotation of detected object number (returns &lt;0,0,0,1&gt; if number is not a valid sensed object)
+  </string>
+  <string name="LSLTipText_llDetectedGroup">
+integer llDetectedGroup(integer number)
+Returns TRUE if detected object is part of same group as owner
+  </string>
+  <string name="LSLTipText_llDetectedLinkNumber">
+integer llDetectedLinkNumber(integer number)
+Returns the link position of the triggered event for touches and collisions only
+  </string>
+  <string name="LSLTipText_llDie">
+llDie()
+Deletes the object
+  </string>
+  <string name="LSLTipText_llGround">
+float llGround(vector offset)
+Returns the ground height below the object position + offset
+  </string>
+  <string name="LSLTipText_llCloud">
+float llCloud(vector offset)
+Returns the cloud density at the object position + offset
+  </string>
+  <string name="LSLTipText_llWind">
+vector llWind(vector offset)
+Returns the wind velocity at the object position + offset
+  </string>
+  <string name="LSLTipText_llSetStatus">
+llSetStatus(integer status, integer value)
+Sets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value
+  </string>
+  <string name="LSLTipText_llGetStatus">
+integer llGetStatus(integer status)
+Returns value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z)
+  </string>
+  <string name="LSLTipText_llSetScale">
+llSetScale(vector scale)
+Sets the scale of the prim
+  </string>
+  <string name="LSLTipText_llGetScale">
+vector llGetScale()
+Returns the scale of the prim
+  </string>
+  <string name="LSLTipText_llSetColor">
+llSetColor(vector color, integer face)
+Sets the color on face of the prim
+  </string>
+  <string name="LSLTipText_llGetAlpha">
+float llGetAlpha(integer face)
+Returns the alpha of face
+  </string>
+  <string name="LSLTipText_llSetAlpha">
+llSetAlpha(float alpha, integer face)
+Sets the alpha on face
+  </string>
+  <string name="LSLTipText_llGetColor">
+vector llGetColor(integer face)
+Returns the color on face
+  </string>
+  <string name="LSLTipText_llSetTexture">
+llSetTexture(string texture, integer face)
+Sets the texture of face or ALL_SIDES
+  </string>
+  <string name="LSLTipText_llScaleTexture">
+llScaleTexture(float u, float v, integer face)
+Sets the texture u &amp; v scales for the chosen face or ALL_SIDES
+  </string>
+  <string name="LSLTipText_llOffsetTexture">
+llOffsetTexture(float u, float v, integer face)
+Sets the texture u &amp; v offsets for the chosen face or ALL_SIDES
+  </string>
+  <string name="LSLTipText_llRotateTexture">
+llRotateTexture(float rotation, integer face)
+Sets the texture rotation for the chosen face
+  </string>
+  <string name="LSLTipText_llGetTexture">
+string llGetTexture(integer face)
+Returns a string that is the texture on face (the inventory name if it is a texture in the prim&apos;s inventory, otherwise the key)
+  </string>
+  <string name="LSLTipText_llSetPos">
+llSetPos(vector pos)
+Moves the object or prim towards pos without using physics (if the script isn&apos;t physical)
+  </string>
+  <string name="LSLTipText_llGetPos">
+vector llGetPos()
+Returns the position of the task in region coordinates
+  </string>
+  <string name="LSLTipText_llGetLocalPos">
+vector llGetLocalPos()
+Returns the position relative to the root
+  </string>
+  <string name="LSLTipText_llSetRot">
+llSetRot(rotation rot)
+Sets the rotation
+  </string>
+  <string name="LSLTipText_llGetRot">
+rotation llGetRot()
+Returns the rotation relative to the region&apos;s axes
+  </string>
+  <string name="LSLTipText_llGetLocalRot">
+rotation llGetLocalRot()
+Returns the rotation local to the root
+  </string>
+  <string name="LSLTipText_llSetForce">
+llSetForce(vector force, integer local)
+Applies force to the object (if the script is physical), in local coords if local == TRUE
+  </string>
+  <string name="LSLTipText_llGetForce">
+vector llGetForce()
+Returns the force (if the script is physical)
+  </string>
+  <string name="LSLTipText_llTarget">
+integer llTarget(vector position, float range)
+Sets positions within range of position as a target and return an ID for the target
+  </string>
+  <string name="LSLTipText_llTargetRemove">
+llTargetRemove(integer number)
+Removes positional target number registered with llTarget
+  </string>
+  <string name="LSLTipText_llRotTarget">
+integer llRotTarget(rotation rot, float error)
+Set rotations with error of rot as a rotational target and return an ID for the rotational target
+  </string>
+  <string name="LSLTipText_llRotTargetRemove">
+llRotTargetRemove(integer number)
+Removes rotational target number registered with llRotTarget
+  </string>
+  <string name="LSLTipText_llMoveToTarget">
+llMoveToTarget(vector target, float tau)
+Critically damps to target in tau seconds (if the script is physical)
+  </string>
+  <string name="LSLTipText_llStopMoveToTarget">
+llStopMoveToTarget()
+Stops critically damped motion
+  </string>
+  <string name="LSLTipText_llApplyImpulse">
+llApplyImpulse(vector force, integer local)
+Applies impulse to object (if the script is physical), in local coords if local == TRUE
+  </string>
+  <string name="LSLTipText_llApplyRotationalImpulse">
+llApplyRotationalImpulse(vector force, integer local)
+Applies rotational impulse to object (if the script is physical), in local coords if local == TRUE
+  </string>
+  <string name="LSLTipText_llSetTorque">
+llSetTorque(vector torque, integer local)
+Sets the torque of object (if the script is physical), in local coords if local == TRUE
+  </string>
+  <string name="LSLTipText_llGetTorque">
+vector llGetTorque()
+Returns the torque (if the script is physical)
+  </string>
+  <string name="LSLTipText_llSetForceAndTorque">
+llSetForceAndTorque(vector force, vector torque, integer local)
+Sets the force and torque of object (if the script is physical), in local coords if local == TRUE
+  </string>
+  <string name="LSLTipText_llGetVel">
+vector llGetVel()
+Returns the velocity of the object
+  </string>
+  <string name="LSLTipText_llGetAccel">
+vector llGetAccel()
+Returns the acceleration of the object relative to the region&apos;s axes
+  </string>
+  <string name="LSLTipText_llGetOmega">
+vector llGetOmega()
+Returns the rotation velocity in radians per second
+  </string>
+  <string name="LSLTipText_llGetTimeOfDay">
+float llGetTimeOfDay()
+Returns the time in seconds since [SECOND_LIFE] server midnight or since region up-time, whichever is smaller
+  </string>
+  <string name="LSLTipText_llGetWallclock">
+float llGetWallclock()
+Returns the time in seconds since midnight California Pacific time (PST/PDT)
+  </string>
+  <string name="LSLTipText_llGetTime">
+float llGetTime()
+Returns the time in seconds since the last region reset, script reset, or call to either llResetTime or llGetAndResetTime
+  </string>
+  <string name="LSLTipText_llResetTime">
+llResetTime()
+Sets the script timer to zero
+  </string>
+  <string name="LSLTipText_llGetAndResetTime">
+float llGetAndResetTime()
+Returns the script time in seconds and then resets the script timer to zero
+  </string>
+  <string name="LSLTipText_llSound">
+llSound(string sound, float volume, integer queue, integer loop)
+Plays sound at volume and whether it should loop or not
+  </string>
+  <string name="LSLTipText_llPlaySound">
+llPlaySound(string sound, float volume)
+Plays attached sound once at volume (0.0 - 1.0)
+  </string>
+  <string name="LSLTipText_llLoopSound">
+llLoopSound(string sound, float volume)
+Plays attached sound looping indefinitely at volume (0.0 - 1.0)
+  </string>
+  <string name="LSLTipText_llLoopSoundMaster">
+llLoopSoundMaster(string sound, float volume)
+Plays attached sound looping at volume (0.0 - 1.0), declares it a sync master
+  </string>
+  <string name="LSLTipText_llLoopSoundSlave">
+llLoopSoundSlave(string sound, float volume)
+Plays attached sound looping at volume (0.0 - 1.0), synced to most audible sync master
+  </string>
+  <string name="LSLTipText_llPlaySoundSlave">
+llPlaySoundSlave(string sound, float volume)
+Plays attached sound once at volume (0.0 - 1.0), synced to next loop of most audible sync master
+  </string>
+  <string name="LSLTipText_llTriggerSound">
+llTriggerSound(string sound, float volume)
+Plays sound at volume (0.0 - 1.0), centered at but not attached to object
+  </string>
+  <string name="LSLTipText_llStopSound">
+llStopSound()
+Stops currently attached sound
+  </string>
+  <string name="LSLTipText_llPreloadSound">
+llPreloadSound(string sound)
+Preloads a sound on viewers within range
+  </string>
+  <string name="LSLTipText_llGetSubString">
+string llGetSubString(string src, integer start, integer end)
+Returns the indicated substring
+  </string>
+  <string name="LSLTipText_llDeleteSubString">
+string llDeleteSubString(string src, integer start, integer end)
+Removes the indicated substring and returns the result
+  </string>
+  <string name="LSLTipText_llInsertString">
+string llInsertString(string dst, integer position, string src)
+Returns a destination string dst with the string src inserted starting at position pos
+  </string>
+  <string name="LSLTipText_llToUpper">
+string llToUpper(string src)
+Returns a string that is src with all upper-case characters
+  </string>
+  <string name="LSLTipText_llToLower">
+string llToLower(string src)
+Returns a string that is src with all lower-case characters
+  </string>
+  <string name="LSLTipText_llGiveMoney">
+llGiveMoney(key destination, integer amount)
+Transfers amount of [CURRENCY] from script owner to destination
+  </string>
+  <string name="LSLTipText_llMakeExplosion">
+llMakeExplosion(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
+Makes a round explosion of particles
+  </string>
+  <string name="LSLTipText_llMakeFountain">
+llMakeFountain(integer particles, float scale, float vel, float lifetime, float arc, integer bounce, string texture, vector offset, float bounce_offset)
+Makes a fountain of particles
+  </string>
+  <string name="LSLTipText_llMakeSmoke">
+llMakeSmoke(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
+Makes smoke like particles
+  </string>
+  <string name="LSLTipText_llMakeFire">
+llMakeFire(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
+Makes fire like particles
+  </string>
+  <string name="LSLTipText_llRezObject">
+llRezObject(string inventory, vector pos, vector vel, rotation rot, integer param)
+Instantiates owner&apos;s inventory object at pos with velocity vel and rotation rot with start parameter param
+  </string>
+  <string name="LSLTipText_llLookAt">
+llLookAt(vector target, float strength, float damping)
+Causes object to point its up axis (positive z) towards target, while keeping its forward axis (positive x) below the horizon
+  </string>
+  <string name="LSLTipText_llStopLookAt">
+llStopLookAt()
+Stops causing object to point at a target
+  </string>
+  <string name="LSLTipText_llSetTimerEvent">
+llSetTimerEvent(float sec)
+Causes the timer event to be triggered a maximum of once every sec seconds
+  </string>
+  <string name="LSLTipText_llSleep">
+llSleep(float sec)
+Puts the script to sleep for sec seconds
+  </string>
+  <string name="LSLTipText_llGetMass">
+float llGetMass()
+Returns the mass of object that the script is attached to
+  </string>
+  <string name="LSLTipText_llCollisionFilter">
+llCollisionFilter(string name, key id, integer accept)
+Sets the collision filter, exclusively or inclusively. If accept == TRUE, only accept collisions with objects name and id (either is optional), otherwise with objects not name or id
+  </string>
+  <string name="LSLTipText_llTakeControls">
+llTakeControls(integer controls, integer accept, integer pass_on)
+Allows for intercepting keyboard and mouse clicks from the agent the script has permissions for
+  </string>
+  <string name="LSLTipText_llReleaseControls">
+llReleaseControls()
+Stops taking inputs that were taken with llTakeControls
+  </string>
+  <string name="LSLTipText_llAttachToAvatar">
+llAttachToAvatar(integer attach_point)
+Attaches the object to the avatar who has granted permission to the script
+  </string>
+  <string name="LSLTipText_llDetachFromAvatar">
+llDetachFromAvatar()
+Detaches object from avatar
+  </string>
+  <string name="LSLTipText_llTakeCamera">
+llTakeCamera(key avatar)
+Moves avatar&apos;s viewpoint to task
+  </string>
+  <string name="LSLTipText_llReleaseCamera">
+llReleaseCamera(key avatar)
+Returns camera to agent avatar
+  </string>
+  <string name="LSLTipText_llGetOwner">
+key llGetOwner()
+Returns the object owner&apos;s UUID
+  </string>
+  <string name="LSLTipText_llInstantMessage">
+llInstantMessage(key user, string message)
+Sends the specified string as an Instant Message to the user
+  </string>
+  <string name="LSLTipText_llEmail">
+llEmail(string address, string subject, string message)
+Sends an email to address with the subject and message
+  </string>
+  <string name="LSLTipText_llGetNextEmail">
+llGetNextEmail(string address, string subject)
+Gets the next waiting email that comes from address, with specified subject
+  </string>
+  <string name="LSLTipText_llGetKey">
+key llGetKey()
+Returns the key of the prim the script is attached to
+  </string>
+  <string name="LSLTipText_llSetBuoyancy">
+llSetBuoyancy(float buoyancy)
+Sets the buoyancy of the task or object (0 is disabled, &lt; 1.0 sinks, 1.0 floats, &gt; 1.0 rises)
+  </string>
+  <string name="LSLTipText_llSetHoverHeight">
+llSetHoverHeight(float height, integer water, float tau)
+Critically damps to a height above the ground (or water) in tau seconds
+  </string>
+  <string name="LSLTipText_llStopHover">
+llStopHover()
+Stops hovering to a height
+  </string>
+  <string name="LSLTipText_llMinEventDelay">
+llMinEventDelay(float delay)
+Sets the minimum time between events being handled
+  </string>
+  <string name="LSLTipText_llSoundPreload">
+llSoundPreload(string sound)
+Preloads a sound on viewers within range
+  </string>
+  <string name="LSLTipText_llRotLookAt">
+llRotLookAt(rotation target, float strength, float damping)
+Causes object to point its forward axis towards target
+  </string>
+  <string name="LSLTipText_llStringLength">
+integer llStringLength(string str)
+Returns the length of string
+  </string>
+  <string name="LSLTipText_llStartAnimation">
+llStartAnimation(string anim)
+Starts animation anim for agent that granted PERMISSION_TRIGGER_ANIMATION if the permission has not been revoked
+  </string>
+  <string name="LSLTipText_llStopAnimation">
+llStopAnimation(string anim)
+Stops animation anim for agent that granted permission
+  </string>
+  <string name="LSLTipText_llPointAt">
+llPointAt(vector pos)
+Makes agent that owns object point at pos
+  </string>
+  <string name="LSLTipText_llStopPointAt">
+llStopPointAt()
+Stops pointing agent that owns object
+  </string>
+  <string name="LSLTipText_llTargetOmega">
+llTargetOmega(vector axis, float spinrate, float gain)
+Rotates the object around axis at spinrate with strength gain
+  </string>
+  <string name="LSLTipText_llGetStartParameter">
+integer llGetStartParameter()
+Returns an integer that is the script start/rez parameter
+  </string>
+  <string name="LSLTipText_llGodLikeRezObject">
+llGodLikeRezObject(key inventory, vector pos)
+Rezzes directly off of UUID if owner is in God Mode
+  </string>
+  <string name="LSLTipText_llRequestPermissions">
+llRequestPermissions(key agent, integer perm)
+Asks the agent for permission to run certain classes of functions
+  </string>
+  <string name="LSLTipText_llGetPermissionsKey">
+key llGetPermissionsKey()
+Returns the key of the avatar that last granted permissions to the script
+  </string>
+  <string name="LSLTipText_llGetPermissions">
+integer llGetPermissions()
+Returns an integer bitfield with the permissions that have been granted
+  </string>
+  <string name="LSLTipText_llGetLinkNumber">
+integer llGetLinkNumber()
+Returns the link number of the prim containing the script (0 means not linked, 1 the prim is the root, 2 the prim is the first child, etc)
+  </string>
+  <string name="LSLTipText_llSetLinkColor">
+llSetLinkColor(integer linknumber, vector color, integer face)
+Sets face to color if a task exists in the link chain at linknumber
+  </string>
+  <string name="LSLTipText_llCreateLink">
+llCreateLink(key target, integer parent)
+Attempts to link the script&apos;s object with the target (requires that PERMISSION_CHANGE_LINKS be granted). If parent == TRUE, then the script&apos;s object becomes the root
+  </string>
+  <string name="LSLTipText_llBreakLink">
+llBreakLink(integer linknum)
+Delinks the prim with the given link number in a linked object set (requires that PERMISSION_CHANGE_LINKS be granted)
+  </string>
+  <string name="LSLTipText_llBreakAllLinks">
+llBreakAllLinks()
+Delinks all prims in the link set (requires that PERMISSION_CHANGE_LINKS be granted)
+  </string>
+  <string name="LSLTipText_llGetLinkKey">
+key llGetLinkKey(integer linknumber)
+Returns the key of the linked prim linknumber
+  </string>
+  <string name="LSLTipText_llGetLinkName">
+string llGetLinkName(integer linknumber)
+Returns the name of linknumber in a link set
+  </string>
+  <string name="LSLTipText_llGetInventoryNumber">
+integer llGetInventoryNumber(integer type)
+Returns the number of items of a given type (INVENTORY_* flag) in the prim&apos;s inventory
+  </string>
+  <string name="LSLTipText_llGetInventoryName">
+string llGetInventoryName(integer type, integer number)
+Returns the name of the inventory item number of a given type
+  </string>
+  <string name="LSLTipText_llSetScriptState">
+llSetScriptState(string name, integer run)
+Sets the running state of the specified script
+  </string>
+  <string name="LSLTipText_llGetEnergy">
+float llGetEnergy()
+Returns how much energy is in the object as a percentage of maximum
+  </string>
+  <string name="LSLTipText_llGiveInventory">
+llGiveInventory(key destination, string inventory)
+Gives inventory to destination
+  </string>
+  <string name="LSLTipText_llRemoveInventory">
+llRemoveInventory(string item)
+Removes the named inventory item
+  </string>
+  <string name="LSLTipText_llSetText">
+llSetText(string text, vector color, float alpha)
+Displays text that hovers over the prim with specific color and translucency specified with alpha
+  </string>
+  <string name="LSLTipText_llWater">
+float llWater(vector offset)
+Returns the water height below the object position + offset
+  </string>
+  <string name="LSLTipText_llPassTouches">
+llPassTouches(integer pass)
+If pass == TRUE, touches are passed from children on to parents
+  </string>
+  <string name="LSLTipText_llRequestAgentData">
+key llRequestAgentData(key id, integer data)
+Requests data about agent id. When data is available the dataserver event will be raised.
+  </string>
+  <string name="LSLTipText_llRequestInventoryData">
+key llRequestInventoryData(string name)
+Requests data from object&apos;s inventory object. When data is available the dataserver event will be raised.
+  </string>
+  <string name="LSLTipText_llSetDamage">
+llSetDamage(float damage)
+Sets the amount of damage that will be done when this object hits an avatar.
+  </string>
+  <string name="LSLTipText_llTeleportAgentHome">
+llTeleportAgentHome(key id)
+Teleports avatar on the owner&apos;s land to their home location without any warning
+  </string>
+  <string name="LSLTipText_llModifyLand">
+llModifyLand(integer action, integer brush)
+Modifies land using the specified action on the specified brush size of land
+  </string>
+  <string name="LSLTipText_llCollisionSound">
+llCollisionSound(string impact_sound, float impact_volume)
+Suppresses default collision sounds, replaces default impact sounds with impact_sound at the volume impact_volume
+  </string>
+  <string name="LSLTipText_llCollisionSprite">
+llCollisionSprite(string impact_sprite)
+Suppresses default collision sprites, replaces default impact sprite with impact_sprite (use an empty string to just suppress)
+  </string>
+  <string name="LSLTipText_llGetAnimation">
+string llGetAnimation(key id)
+Returns the name of the currently playing locomotion animation for avatar id
+  </string>
+  <string name="LSLTipText_llResetScript">
+llResetScript()
+Resets the script
+  </string>
+  <string name="LSLTipText_llMessageLinked">
+llMessageLinked(integer linknum, integer num, string str, key id)
+Allows scripts in the same object to communicate. Triggers a link_message event with the same parameters num, str, and id in all scripts in the prim(s) described by linknum.
+  </string>
+  <string name="LSLTipText_llPushObject">
+llPushObject(key id, vector impulse, vector ang_impulse, integer local)
+Applies impulse and ang_impulse to object id
+  </string>
+  <string name="LSLTipText_llPassCollisions">
+llPassCollisions(integer pass)
+If pass == TRUE, collisions are passed from children on to parents (default is FALSE)
+  </string>
+  <string name="LSLTipText_llGetScriptName">
+string llGetScriptName()
+Returns the name of the script that this function is used in
+  </string>
+  <string name="LSLTipText_llGetNumberOfSides">
+integer llGetNumberOfSides()
+Returns the number of faces (or sides) of the prim
+  </string>
+  <string name="LSLTipText_llAxisAngle2Rot">
+rotation llAxisAngle2Rot(vector axis, float angle)
+Returns the rotation that is a generated angle about axis
+  </string>
+  <string name="LSLTipText_llRot2Axis">
+vector llRot2Axis(rotation rot)
+Returns the rotation axis represented by rot
+  </string>
+  <string name="LSLTipText_llRot2Angle">
+float llRot2Angle(rotation rot)
+Returns the rotation angle represented by rot
+  </string>
+  <string name="LSLTipText_llAcos">
+float llAcos(float val)
+Returns the arccosine in radians of val
+  </string>
+  <string name="LSLTipText_llAsin">
+float llAsin(float val)
+Returns the arcsine in radians of val
+  </string>
+  <string name="LSLTipText_llAngleBetween">
+float llAngleBetween(rotation a, rotation b)
+Returns angle between rotation a and b
+  </string>
+  <string name="LSLTipText_llGetInventoryKey">
+key llGetInventoryKey(string name)
+Returns the key that is the UUID of the inventory name
+  </string>
+  <string name="LSLTipText_llAllowInventoryDrop">
+llAllowInventoryDrop(integer add)
+If add == TRUE, users without modify permissions can still drop inventory items onto a prim
+  </string>
+  <string name="LSLTipText_llGetSunDirection">
+vector llGetSunDirection()
+Returns a normalized vector of the direction of the sun in the region
+  </string>
+  <string name="LSLTipText_llGetTextureOffset">
+vector llGetTextureOffset(integer face)
+Returns the texture offset of face in the x and y components of a vector
+  </string>
+  <string name="LSLTipText_llGetTextureScale">
+vector llGetTextureScale(integer side)
+Returns the texture scale of side in the x and y components of a vector
+  </string>
+  <string name="LSLTipText_llGetTextureRot">
+float llGetTextureRot(integer side)
+Returns the texture rotation of side
+  </string>
+  <string name="LSLTipText_llSubStringIndex">
+integer llSubStringIndex(string source, string pattern)
+Returns an integer that is the index in source where pattern first appears.
+(Returns -1 if not found)
+  </string>
+  <string name="LSLTipText_llGetOwnerKey">
+key llGetOwnerKey(key id)
+Returns the owner of object id
+  </string>
+  <string name="LSLTipText_llGetCenterOfMass">
+vector llGetCenterOfMass()
+Returns the prim&apos;s center of mass (unless called from the root prim, where it returns the object&apos;s center of mass)
+  </string>
+  <string name="LSLTipText_llListSort">
+list llListSort(list src, integer stride, integer ascending)
+Sorts the list into blocks of stride, in ascending order if ascending == TRUE.
+The sort order is affected by type.
+  </string>
+  <string name="LSLTipText_llGetListLength">
+integer llGetListLength(list src)
+Returns the number of elements in the list
+  </string>
+  <string name="LSLTipText_llList2Integer">
+integer llList2Integer(list src, integer index)
+Copies the integer at index in the list
+  </string>
+  <string name="LSLTipText_llList2Float">
+float llList2Float(list src, integer index)
+Copies the float at index in the list
+  </string>
+  <string name="LSLTipText_llList2String">
+string llList2String(list src, integer index)
+Copies the string at index in the list
+  </string>
+  <string name="LSLTipText_llList2Key">
+key llList2Key(list src, integer index)
+Copies the key at index in the list
+  </string>
+  <string name="LSLTipText_llList2Vector">
+vector llList2Vector(list src, integer index)
+Copies the vector at index in the list
+  </string>
+  <string name="LSLTipText_llList2Rot">
+rotation llList2Rot(list src, integer index)
+Copies the rotation at index in the list
+  </string>
+  <string name="LSLTipText_llList2List">
+list llList2List(list src, integer start, integer end)
+Copies the slice of the list from start to end
+  </string>
+  <string name="LSLTipText_llDeleteSubList">
+list llDeleteSubList(list src, integer start, integer end)
+Removes the slice from start to end and returns the remainder of the list
+  </string>
+  <string name="LSLTipText_llGetListEntryType">
+integer llGetListEntryType(list src, integer index)
+Returns the type of the index entry in the list
+(TYPE_INTEGER, TYPE_FLOAT, TYPE_STRING, TYPE_KEY, TYPE_VECTOR, TYPE_ROTATION, or TYPE_INVALID if index is off list)
+  </string>
+  <string name="LSLTipText_llList2CSV">
+string llList2CSV(list src)
+Creates a string of comma separated values from list
+  </string>
+  <string name="LSLTipText_llCSV2List">
+list llCSV2List(string src)
+Creates a list from a string of comma separated values
+  </string>
+  <string name="LSLTipText_llListRandomize">
+list llListRandomize(list src, integer stride)
+Returns a randomized list of blocks of size stride
+  </string>
+  <string name="LSLTipText_llList2ListStrided">
+list llList2ListStrided(list src, integer start, integer end, integer stride)
+Copies the strided slice of the list from start to end
+  </string>
+  <string name="LSLTipText_llGetRegionCorner">
+vector llGetRegionCorner()
+Returns a vector in meters that is the global location of the south-west corner of the region which the object is in
+  </string>
+  <string name="LSLTipText_llListInsertList">
+list llListInsertList(list dest, list src, integer start)
+Returns a list that contains all the elements from dest but with the elements from src inserted at position start
+  </string>
+  <string name="LSLTipText_llListFindList">
+integer llListFindList(list src, list test)
+Returns the index of the first instance of test in src.
+(Returns -1 if not found)
+  </string>
+  <string name="LSLTipText_llGetObjectName">
+string llGetObjectName()
+Returns the name of the prim which the script is attached to
+  </string>
+  <string name="LSLTipText_llSetObjectName">
+llSetObjectName(string name)
+Sets the prim&apos;s name to the name parameter
+  </string>
+  <string name="LSLTipText_llGetDate">
+string llGetDate()
+Returns the current date in the UTC time zone in the format YYYY-MM-DD
+  </string>
+  <string name="LSLTipText_llEdgeOfWorld">
+integer llEdgeOfWorld(vector pos, vector dir)
+Checks to see whether the border hit by dir from pos is the edge of the world (has no neighboring region)
+  </string>
+  <string name="LSLTipText_llGetAgentInfo">
+integer llGetAgentInfo(key id)
+Returns an integer bitfield containing the agent information about id.
+Returns AGENT_FLYING, AGENT_ATTACHMENTS, AGENT_SCRIPTED, AGENT_SITTING, AGENT_ON_OBJECT, AGENT_MOUSELOOK, AGENT_AWAY, AGENT_BUSY, AGENT_TYPING, AGENT_CROUCHING, AGENT_ALWAYS_RUN, AGENT_WALKING and/or AGENT_IN_AIR.
+  </string>
+  <string name="LSLTipText_llAdjustSoundVolume">
+llAdjustSoundVolume(float volume)
+Adjusts volume of attached sound (0.0 - 1.0)
+  </string>
+  <string name="LSLTipText_llSetSoundQueueing">
+llSetSoundQueueing(integer queue)
+Sets whether attached sounds wait for the current sound to finish (If queue == TRUE then queuing is enabled, if FALSE queuing is disabled [default])
+  </string>
+  <string name="LSLTipText_llSetSoundRadius">
+llSetSoundRadius(float radius)
+Establishes a hard cut-off radius for audibility of scripted sounds (both attached and triggered)
+  </string>
+  <string name="LSLTipText_llKey2Name">
+string llKey2Name(key id)
+Returns the name of the prim or avatar specified by id.
+(The id must be a valid rezzed prim or avatar key in the current simulator, otherwise an empty string is returned.)
+  </string>
+  <string name="LSLTipText_llSetTextureAnim">
+llSetTextureAnim(integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate)
+Animates the texture on the specified face/faces
+  </string>
+  <string name="LSLTipText_llTriggerSoundLimited">
+llTriggerSoundLimited(string sound, float volume, vector top_north_east, vector bottom_south_west)
+Plays sound at volume (0.0 - 1.0), centered at but not attached to object, limited to the box defined by vectors top_north_east and bottom_south_west
+  </string>
+  <string name="LSLTipText_llEjectFromLand">
+llEjectFromLand(key avatar)
+Ejects avatar from the parcel
+  </string>
+  <string name="LSLTipText_llParseString2List">
+list llParseString2List(string src, list separators, list spacers)
+Breaks src into a list, discarding separators, keeping spacers
+(separators and spacers must be lists of strings, maximum of 8 each)
+  </string>
+  <string name="LSLTipText_llOverMyLand">
+integer llOverMyLand(key id)
+Returns TRUE if id is over land owned by the script owner, otherwise FALSE
+  </string>
+  <string name="LSLTipText_llGetLandOwnerAt">
+key llGetLandOwnerAt(vector pos)
+Returns the key of the land owner, returns NULL_KEY if public
+  </string>
+  <string name="LSLTipText_llGetNotecardLine">
+key llGetNotecardLine(string name, integer line)
+Returns line line of notecard name via the dataserver event
+  </string>
+  <string name="LSLTipText_llGetAgentSize">
+vector llGetAgentSize(key id)
+If the avatar is in the same region, returns the size of the bounding box of the requested avatar by id, otherwise returns ZERO_VECTOR
+  </string>
+  <string name="LSLTipText_llSameGroup">
+integer llSameGroup(key id)
+Returns TRUE if avatar id is in the same region and has the same active group, otherwise FALSE
+  </string>
+  <string name="LSLTipText_llUnSit">
+key llUnSit(key id)
+If avatar identified by id is sitting on the object the script is attached to or is over land owned by the object&apos;s owner, the avatar is forced to stand up
+  </string>
+  <string name="LSLTipText_llGroundSlope">
+vector llGroundSlope(vector offset)
+Returns the ground slope below the object position + offset
+  </string>
+  <string name="LSLTipText_llGroundNormal">
+vector llGroundNormal(vector offset)
+Returns the ground normal below the object position + offset
+  </string>
+  <string name="LSLTipText_llGroundContour">
+vector llGroundCountour(vector offset)
+Returns the ground contour direction below the object position + offset
+  </string>
+  <string name="LSLTipText_llGetAttached">
+integer llGetAttached()
+Returns the object&apos;s attachment point, or 0 if not attached
+  </string>
+  <string name="LSLTipText_llGetFreeMemory">
+integer llGetFreeMemory()
+Returns the number of free bytes of memory the script can use
+  </string>
+  <string name="LSLTipText_llGetRegionName">
+string llGetRegionName()
+Returns the current region name
+  </string>
+  <string name="LSLTipText_llGetRegionTimeDilation">
+float llGetRegionTimeDilation()
+Returns the current time dilation as a float between 0.0 (full dilation) and 1.0 (no dilation)
+  </string>
+  <string name="LSLTipText_llGetRegionFPS">
+float llGetRegionFPS()
+Returns the mean region frames per second
+  </string>
+  <string name="LSLTipText_llParticleSystem">
+llParticleSystem(list rules)
+Creates a particle system based on rules.  An empty list removes the particle system.
+List format is [ rule1, data1, rule2, data2 . . . rulen, datan ]
+  </string>
+  <string name="LSLTipText_llGroundRepel">
+llGroundRepel(float height, integer water, float tau)
+Critically damps to height if within height*0.5 of level (either above ground level, or above the higher of land and water if water == TRUE)
+  </string>
+  <string name="LSLTipText_llGiveInventoryList">
+llGiveInventoryList(key target, string folder, list inventory)
+Gives inventory items to target, creating a new folder to put them in
+  </string>
+  <string name="LSLTipText_llSetVehicleType">
+llSetVehicleType(integer type)
+Sets the vehicle to one of the default types
+  </string>
+  <string name="LSLTipText_llSetVehicleFloatParam">
+llSetVehicleFloatParam(integer param, float value)
+Sets the specified vehicle float parameter
+  </string>
+  <string name="LSLTipText_llSetVehicleVectorParam">
+llSetVehicleVectorParam(integer param, vector vec)
+Sets the specified vehicle vector parameter
+  </string>
+  <string name="LSLTipText_llSetVehicleRotationParam">
+llSetVehicleVectorParam(integer param, rotation rot)
+Sets the specified vehicle rotation parameter
+  </string>
+  <string name="LSLTipText_llSetVehicleFlags">
+llSetVehicleFlags(integer flags)
+Sets the enabled bits in &apos;flags&apos;
+  </string>
+  <string name="LSLTipText_llRemoveVehicleFlags">
+llRemoveVehicleFlags(integer flags)
+Removes the enabled bits in &apos;flags&apos;
+  </string>
+  <string name="LSLTipText_llSitTarget">
+llSitTarget(vector offset, rotation rot)
+Sets the sit location for the prim.  If offset == &lt;0,0,0&gt; then the sit target is removed.
+  </string>
+  <string name="LSLTipText_llAvatarOnSitTarget">
+key llAvatarOnSitTarget()
+If an avatar is seated on the sit target, returns the avatar&apos;s key, otherwise NULL_KEY
+  </string>
+  <string name="LSLTipText_llAddToLandPassList">
+llAddToLandPassList(key avatar, float hours)
+Adds avatar to the land pass list for hours, or indefinitely if hours is 0
+  </string>
+  <string name="LSLTipText_llSetTouchText">
+llSetTouchText(string text)
+Displays text rather than the default &apos;Touch&apos; in the pie menu
+  </string>
+  <string name="LSLTipText_llSetSitText">
+llSetSitText(string text)
+Displays text rather than the default &apos;Sit Here&apos; in the pie menu
+  </string>
+  <string name="LSLTipText_llSetCameraEyeOffset">
+llSetCameraEyeOffset(vector offset)
+Sets the camera eye offset for avatars that sit on the object
+  </string>
+  <string name="LSLTipText_llSetCameraAtOffset">
+llSetCameraAtOffset(vector offset)
+Sets the point the camera is looking at to offset for avatars that sit on the object
+  </string>
+  <string name="LSLTipText_llDumpList2String">
+string llDumpList2String(list src, string separator)
+Returns the list in a single string, using separator between the entries
+  </string>
+  <string name="LSLTipText_llScriptDanger">
+integer llScriptDanger(vector pos)
+Returns TRUE if pos is over public land, sandbox land, land that doesn&apos;t allow everyone to edit and build, or land that doesn&apos;t allow outside scripts
+  </string>
+  <string name="LSLTipText_llDialog">
+llDialog(key avatar, string message, list buttons, integer chat_channel
+Shows a dialog box on the avatar&apos;s screen with a message and up to 12 buttons.
+If a button is pressed, the avatar says the text of the button label on chat_channel.
+  </string>
+  <string name="LSLTipText_llVolumeDetect">
+llVolumeDetect(integer detect)
+If detect = TRUE, object works much like Phantom, but triggers collision_start and collision_end events when other objects start and stop interpenetrating.
+Must be applied to the root prim.
+  </string>
+  <string name="LSLTipText_llResetOtherScript">
+llResetOtherScript(string name)
+Resets script name
+  </string>
+  <string name="LSLTipText_llGetScriptState">
+integer llGetScriptState(string name)
+Returns TRUE if the script name is running
+  </string>
+  <string name="LSLTipText_llRemoteLoadScript">
+DEPRECATED!  Please use llRemoteLoadScriptPin instead.
+  </string>
+  <string name="LSLTipText_llSetRemoteScriptAccessPin">
+llSetRemoteScriptAccessPin(integer pin)
+If pin is set to a non-zero number, allows a prim to have scripts remotely loaded via llRemoteLoadScriptPin when it passes in the correct pin. Otherwise, llRemoteLoadScriptPin is ignored.
+  </string>
+  <string name="LSLTipText_llRemoteLoadScriptPin">
+llRemoteLoadScriptPin(key target, string name, integer pin, integer running, integer start_param)
+Copies script name onto target, if the owner of this scripted object can modify target and is in the same region, and the matching pin is used.
+If running == TRUE, starts the script with start_param
+  </string>
+  <string name="LSLTipText_llOpenRemoteDataChannel">
+llOpenRemoteDataChannel()
+Creates a channel to listen for XML-RPC calls, and will trigger a remote_data event with channel id once it is available
+  </string>
+  <string name="LSLTipText_llSendRemoteData">
+key llSendRemoteData(key channel, string dest, integer idata, string sdata)
+Sends an XML-RPC request to dest through channel with payload of channel (in a string), integer idata and string sdata.
+Returns a key that is the message_id for the resulting remote_data events.
+  </string>
+  <string name="LSLTipText_llRemoteDataReply">
+llRemoteDataReply(key channel, key message_id, string sdata, integer idata)
+Sends an XML-RPC reply to message_id on channel with payload of string sdata and integer idata
+  </string>
+  <string name="LSLTipText_llCloseRemoteDataChannel">
+llCloseRemoteDataChannel(key channel)
+Closes XML-RPC channel
+  </string>
+  <string name="LSLTipText_llMD5String">
+string llMD5String(string src, integer nonce)
+Returns a string of 32 hex characters that is a RSA Data Security, Inc. MD5 Message-Digest Algorithm of src with nonce
+  </string>
+  <string name="LSLTipText_llSetPrimitiveParams">
+llSetPrimitiveParams(list rules)
+Sets the prim&apos;s parameters according to rules
+  </string>
+  <string name="LSLTipText_llStringToBase64">
+string llStringToBase64(string str)
+Converts a string to the Base64 representation of the string
+  </string>
+  <string name="LSLTipText_llBase64ToString">
+string llBase64ToString(string str)
+Converts a Base64 string to a conventional string.
+If the conversion creates any unprintable characters, they are converted to spaces.
+  </string>
+  <string name="LSLTipText_llXorBase64Strings">
+string llXorBase64Strings(string s1, string s2)
+DEPRECATED!  Please use llXorBase64StringsCorrect instead.
+Incorrectly performs an exclusive or on two Base64 strings and returns a Base64 string.  s2 repeats if it is shorter than s1.  Retained for backwards compatability.
+  </string>
+  <string name="LSLTipText_llRemoteDataSetRegion">
+llRemoteDataSetRegion()
+DEPRECATED!  Please use llOpenRemoteDataChannel instead.
+If an object using remote data channels changes regions, you must call this function to reregister the remote data channels. This call is not needed if the prim does not change regions.
+  </string>
+  <string name="LSLTipText_llLog10">
+float llLog10(float val)
+Returns the base 10 logarithm of val.  Returns zero if val &lt;= 0.
+  </string>
+  <string name="LSLTipText_llLog">
+float llLog(float val)
+Returns the natural logarithm of val.  Returns zero if val &lt;= 0.
+  </string>
+  <string name="LSLTipText_llGetAnimationList">
+list llGetAnimationList(key id)
+Returns a list of keys of playing animations for avatar described by id
+  </string>
+  <string name="LSLTipText_llSetParcelMusicURL">
+llSetParcelMusicURL(string url)
+Sets the streaming audio URL for the parcel which the object is on
+  </string>
+  <string name="LSLTipText_llGetRootPosition">
+vector llGetRootPosition()
+Returns the position (in region coordinates) of the root prim of the object which the script is attached to
+  </string>
+  <string name="LSLTipText_llGetRootRotation">
+rotation llGetRootRotation()
+Returns the rotation (relative to the region) of the root prim of the object which the script is attached to
+  </string>
+  <string name="LSLTipText_llGetObjectDesc">
+string llGetObjectDesc()
+Returns the description of the prim the script is attached to
+  </string>
+  <string name="LSLTipText_llSetObjectDesc">
+llSetObjectDesc(string name)
+Sets the prim&apos;s description
+  </string>
+  <string name="LSLTipText_llGetCreator">
+key llGetCreator()
+Returns a key for the creator of the prim
+  </string>
+  <string name="LSLTipText_llGetTimestamp">
+string llGetTimestamp()
+Returns the timestamp in the UTC time zone in the format: YYYY-MM-DDThh:mm:ss.ff..fZ
+  </string>
+  <string name="LSLTipText_llSetLinkAlpha">
+llSetLinkAlpha(integer linknumber, float alpha, integer face)
+If a prim exists in the link chain at linknumber, sets face to alpha
+  </string>
+  <string name="LSLTipText_llGetNumberOfPrims">
+integer llGetNumberOfPrims()
+Returns the number of prims in a link set the script is attached to
+  </string>
+  <string name="LSLTipText_llGetNumberOfNotecardLines">
+key llGetNumberOfNotecardLines(string name)
+Returns number of lines in notecard name via the dataserver event (cast return value to integer)
+  </string>
+  <string name="LSLTipText_llGetBoundingBox">
+list llGetBoundingBox(key object)
+Returns the bounding box around the object (including any linked prims) relative to its root prim, in a list in the format [ (vector) min_corner, (vector) max_corner ]
+  </string>
+  <string name="LSLTipText_llGetGeometricCenter">
+vector llGetGeometricCenter()
+Returns the geometric center of the linked set the script is attached to.
+  </string>
+  <string name="LSLTipText_llGetPrimitiveParams">
+list llGetPrimitiveParams(list params)
+Returns the primitive parameters specified in the params list.
+  </string>
+  <string name="LSLTipText_llIntegerToBase64">
+string llIntegerToBase64(integer number)
+Returns a string that is a Base64 big endian encode of number
+  </string>
+  <string name="LSLTipText_llBase64ToInteger">
+integer llBase64ToInteger(string str)
+Returns an integer that is the str Base64 decoded as a big endian integer
+  </string>
+  <string name="LSLTipText_llGetGMTclock">
+float llGetGMTclock()
+Returns the time in seconds since midnight GMT
+  </string>
+  <string name="LSLTipText_llGetSimulatorHostname">
+string llGetSimulatorHostname()
+Returns the hostname of the machine which the script is running on (same as string in viewer Help dialog)
+  </string>
+  <string name="LSLTipText_llSetLocalRot">
+llSetLocalRot(rotation rot)
+Sets the rotation of a child prim relative to the root prim
+  </string>
+  <string name="LSLTipText_llParseStringKeepNulls">
+list llParseStringKeepNulls(string src, list separators, list spacers)
+Breaks src into a list, discarding separators, keeping spacers, keeping any null values generated.
+(separators and spacers must be lists of strings, maximum of 8 each)
+  </string>
+  <string name="LSLTipText_llRezAtRoot">
+llRezAtRoot(string inventory, vector pos, vector vel, rotation rot, integer param)
+Instantiates owner&apos;s inventory object rotated to rot with its root at pos, moving at vel, using param as the start parameter
+  </string>
+  <string name="LSLTipText_llGetObjectPermMask">
+integer llGetObjectPermMask(integer mask)
+Returns the requested permission mask for the root object the task is attached to
+  </string>
+  <string name="LSLTipText_llSetObjectPermMask">
+llSetObjectPermMask(integer mask, integer value)
+Sets the given permission mask to the new value on the root object the task is attached to (requires God Mode)
+  </string>
+  <string name="LSLTipText_llGetInventoryPermMask">
+integer llGetInventoryPermMask(string item, integer mask)
+Returns the requested permission mask for the inventory item
+  </string>
+  <string name="LSLTipText_llSetInventoryPermMask">
+llSetInventoryPermMask(string item, integer mask, integer value)
+Sets the given permission mask to the new value on the inventory item (requires God Mode)
+  </string>
+  <string name="LSLTipText_llGetInventoryCreator">
+key llGetInventoryCreator(string item)
+Returns a key for the creator of the inventory item
+  </string>
+  <string name="LSLTipText_llOwnerSay">
+llOwnerSay(string msg)
+Says msg to owner only.  (Owner must be in the same region.)
+  </string>
+  <string name="LSLTipText_llRequestSimulatorData">
+key llRequestSimulatorData(string simulator, integer data)
+Requests data about simulator.  When data is available the dataserver event will be raised.
+  </string>
+  <string name="LSLTipText_llForceMouselook">
+llForceMouselook(integer mouselook)
+If mouselook is TRUE, any avatar that sits upon the prim will be forced into mouselook mode
+  </string>
+  <string name="LSLTipText_llGetObjectMass">
+float llGetObjectMass(key id)
+Returns the mass of the avatar or object in the region
+  </string>
+  <string name="LSLTipText_llListReplaceList">
+list llListReplaceList(list dest, list src, integer start, integer end)
+Returns a list that is dest with start through end removed and src inserted at start
+  </string>
+  <string name="LSLTipText_llLoadURL">
+llLoadURL(key avatar, string message, string url)
+Shows a dialog to avatar offering to load the web page at url with a message.
+If user clicks yes, launches the page in their web browser.
+  </string>
+  <string name="LSLTipText_llParcelMediaCommandList">
+llParcelMediaCommandList(list command)
+Sends a list of commands, some with arguments, to a parcel to control the playback of movies and other media
+  </string>
+  <string name="LSLTipText_llParcelMediaQuery">
+list llParcelMediaQuery(list query)
+Returns a list containing results of the sent query
+  </string>
+  <string name="LSLTipText_llModPow">
+integer llModPow(integer a, integer b, integer c)
+Returns a raised to the b power, mod c. ( (a**b)%c )
+b is capped at 0xFFFF (16 bits).
+  </string>
+  <string name="LSLTipText_llGetInventoryType">
+integer llGetInventoryType(string name)
+Returns the type of the inventory item name
+  </string>
+  <string name="LSLTipText_llSetPayPrice">
+llSetPayPrice(integer price, list quick_pay_buttons)
+Sets the default amount on the dialog that appears when someone chooses to pay this prim
+  </string>
+  <string name="LSLTipText_llGetCameraPos">
+vector llGetCameraPos()
+Returns the current camera position for the agent the task has permissions for
+  </string>
+  <string name="LSLTipText_llGetCameraRot">
+rotation llGetCameraRot()
+Returns the current camera orientation for the agent the task has permissions for
+  </string>
+  <string name="LSLTipText_llSetPrimURL">
+llSetPrimURL(string url)
+Updates the URL for the web page shown on the sides of the object
+  </string>
+  <string name="LSLTipText_llRefreshPrimURL">
+llRefreshPrimURL()
+Reloads the web page shown on the sides of the object
+  </string>
+  <string name="LSLTipText_llEscapeURL">
+string llEscapeURL(string url)
+Returns an escaped/encoded version of url, replacing spaces with %20 etc.
+  </string>
+  <string name="LSLTipText_llUnescapeURL">
+string llUnescapeURL(string url)
+Returns an unescaped/ unencoded version of url, replacing %20 with spaces etc.
+  </string>
+  <string name="LSLTipText_llMapDestination">
+llMapDestination(string simname, vector pos, vector look_at)
+Opens the World Map centered on the region simname with pos highlighted. (NOTE: look_at currently does nothing.)
+Only works for scripts attached to avatar, or during touch events.
+  </string>
+  <string name="LSLTipText_llAddToLandBanList">
+llAddToLandBanList(key avatar, float hours)
+Adds avatar to the land ban list for hours, or indefinitely if hours is 0
+  </string>
+  <string name="LSLTipText_llRemoveFromLandPassList">
+llRemoveFromLandPassList(key avatar)
+Removes avatar from the land pass list
+  </string>
+  <string name="LSLTipText_llRemoveFromLandBanList">
+llRemoveFromLandBanList(key avatar)
+Removes avatar from the land ban list
+  </string>
+  <string name="LSLTipText_llSetCameraParams">
+llSetCameraParams(list rules)
+Sets multiple camera parameters at once.
+List format is [ rule1, data1, rule2, data2 . . . rulen, datan ]
+  </string>
+  <string name="LSLTipText_llClearCameraParams">
+llClearCameraParams()
+Resets all camera parameters to default values and turns off scripted camera control
+  </string>
+  <string name="LSLTipText_llListStatistics">
+float llListStatistics(integer operation, list src)
+Performs statistical aggregate functions on list src using LIST_STAT_* operations
+  </string>
+  <string name="LSLTipText_llGetUnixTime">
+integer llGetUnixTime()
+Returns the number of seconds elapsed since 00:00 hours, Jan 1, 1970 UTC from the system clock
+  </string>
+  <string name="LSLTipText_llGetParcelFlags">
+integer llGetParcelFlags(vector pos)
+Returns a mask of the parcel flags (PARCEL_FLAG_*) for the parcel that includes the point pos
+  </string>
+  <string name="LSLTipText_llGetRegionFlags">
+integer llGetRegionFlags()
+Returns the region flags (REGION_FLAG_*) for the region the object is in
+  </string>
+  <string name="LSLTipText_llXorBase64StringsCorrect">
+string llXorBase64StringsCorrect(string s1, string s2)
+Correctly performs an exclusive or on two Base64 strings and returns a Base64 string.
+s2 repeats if it is shorter than s1.
+  </string>
+  <string name="LSLTipText_llHTTPRequest">
+llHTTPRequest(string url, list parameters, string body)
+Sends an HTTP request to the specified url with the body of the request and parameters
+  </string>
+  <string name="LSLTipText_llResetLandBanList">
+llResetLandBanList()
+Removes all residents from the land ban list
+  </string>
+  <string name="LSLTipText_llResetLandPassList">
+llResetLandPassList()
+Removes all residents from the land access/pass list
+  </string>
+  <string name="LSLTipText_llGetObjectPrimCount">
+integer llGetObjectPrimCount(key object_id)
+Returns the total number of prims for an object in the region
+  </string>
+  <string name="LSLTipText_llGetParcelPrimOwners">
+list llGetParcelPrimOwners(vector pos)
+Returns a list of all residents who own objects on the parcel at pos and with individual prim counts.
+Requires owner-like permissions for the parcel.
+  </string>
+  <string name="LSLTipText_llGetParcelPrimCount">
+integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide)
+Returns the number of prims on the parcel at pos of the given category.
+Categories: PARCEL_COUNT_TOTAL, _OWNER, _GROUP, _OTHER, _SELECTED, _TEMP
+  </string>
+  <string name="LSLTipText_llGetParcelMaxPrims">
+integer llGetParcelMaxPrims(vector pos, integer sim_wide)
+Returns the maximum number of prims allowed on the parcel at pos
+  </string>
+  <string name="LSLTipText_llGetParcelDetails">
+list llGetParcelDetails(vector pos, list params)
+Returns the parcel details specified in params for the parcel at pos.
+Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA
+  </string>
+  <string name="LSLTipText_llSetLinkPrimitiveParams">
+llSetLinkPrimitiveParams(integer linknumber, list rules)
+Sets primitive parameters for linknumber based on rules
+  </string>
+  <string name="LSLTipText_llSetLinkTexture">
+llSetLinkTexture(integer linknumber, string texture, integer face)
+Sets the texture of face for a task that exists in the link chain at linknumber
+  </string>
+  <string name="LSLTipText_llStringTrim">
+string llStringTrim(string src, integer trim_type)
+Trims the leading and/or trailing white spaces from a string.
+trim_type can be STRING_TRIM, STRING_TRIM_HEAD or STRING_TRIM_TAIL.
+  </string>
+  <string name="LSLTipText_llRegionSay">
+llRegionSay(integer channel, string msg)
+Broadcasts msg on channel (not 0) that can be heard anywhere in the region by a script listening on channel
+  </string>
+  <string name="LSLTipText_llGetObjectDetails">
+list llGetObjectDetails(key id, list params)
+Returns the object details specified in params for the object with key id.
+Params are OBJECT_NAME, _DESC, _POS, _ROT, _VELOCITY, _OWNER, _GROUP, _CREATOR
+  </string>
+  <string name="LSLTipText_llSetClickAction">
+llSetClickAction(integer action)
+Sets the action performed when a prim is clicked upon
+  </string>
+  <string name="LSLTipText_llGetRegionAgentCount">
+integer llGetRegionAgentCount()
+Returns the number of avatars in the region
+  </string>
+  <string name="LSLTipText_llTextBox">
+llTextBox(key avatar, string message, integer chat_channel
+Shows a dialog box on the avatar&apos;s screen with the message.
+It contains a text box for input, and if entered that text is chatted on chat_channel.
+  </string>
+  <string name="LSLTipText_llGetAgentLanguage">
+string llGetAgentLanguage(key avatar)
+Returns the language code of the preferred interface language of the avatar
+  </string>
+  <string name="LSLTipText_llDetectedTouchUV">
+vector llDetectedTouchUV(integer index)
+Returns the u and v coordinates in the first two components of a vector, for the texture coordinates where the prim was touched in a triggered touch event
+  </string>
+  <string name="LSLTipText_llDetectedTouchFace">
+integer llDetectedTouchFace(integer index)
+Returns the index of the face where the avatar clicked in a triggered touch event
+  </string>
+  <string name="LSLTipText_llDetectedTouchPos">
+vector llDetectedTouchPos(integer index)
+Returns the position where the object was touched in a triggered touch event
+  </string>
+  <string name="LSLTipText_llDetectedTouchNormal">
+vector llDetectedTouchNormal(integer index)
+Returns the surface normal for a triggered touch event
+  </string>
+  <string name="LSLTipText_llDetectedTouchBinormal">
+vector llDetectedTouchBinormal(integer index)
+Returns the surface binormal for a triggered touch event
+  </string>
+  <string name="LSLTipText_llDetectedTouchST">
+vector llDetectedTouchST(integer index)
+Returns the s and t coordinates in the first two components of a vector, for the surface coordinates where the prim was touched in a triggered touch event
+  </string>
+  <string name="LSLTipText_llSHA1String">
+string llSHA1String(string src)
+Returns a string of 40 hex characters that is the SHA1 security Hash of src
+  </string>
+  <string name="LSLTipText_llGetFreeURLs">
+integer llGetFreeURLs()
+Returns the number of available URLs for the current script
+  </string>
+  <string name="LSLTipText_llRequestURL">
+key llRequestURL()
+Requests one HTTP:// url for use by this object.
+An http_request event is triggered with the results.
+  </string>
+  <string name="LSLTipText_llRequestSecureURL">
+key llRequestSecureURL()
+Requests one HTTPS:// (SSL) url for use by this object.
+An http_request event is triggered with the results.
+  </string>
+  <string name="LSLTipText_llReleaseURL">
+llReleaseURL(string url)
+Releases the specified URL, it will no longer be usable
+  </string>
+  <string name="LSLTipText_llHTTPResponse">
+llHTTPResponse(key request_id, integer status, string body)
+Responds to request_id with status and body
+  </string>
+  <string name="LSLTipText_llGetHTTPHeader">
+string llGetHTTPHeader(key request_id, string header)
+Returns the value for header for request_id
+  </string>
+  <string name="LSLTipText_llSetPrimMediaParams">
+integer llSetPrimMediaParams(integer face, list params)
+Returns an integer that is a STATUS_* flag which details the success/failure of the operation(s).
+  </string>
+  <string name="LSLTipText_llGetPrimMediaParams">
+    list llGetPrimMediaParams(integer face, list params)
+Returns the media params for a particular face on an object, given the desired list of names, in the order requested.
+(Returns an empty list if no media exists on the face.)
+  </string>
+  <string name="LSLTipText_llClearPrimMedia">
+integer llClearPrimMedia(integer face)
+Returns an integer that is a STATUS_* flag which details the success/failure of the operation.
+  </string>
+  <string name="LSLTipText_llSetLinkPrimitiveParamsFast">
+llSetLinkPrimitiveParamsFast(integer linknumber, list rules)
+Set primitive parameters for linknumber based on rules with no built-in script sleep.
+  </string>
+  <string name="LSLTipText_llGetLinkPrimitiveParams">
+list llGetLinkPrimitiveParams(integer linknumber,list rules)
+Get primitive parameters for linknumber based on rules.
+  </string>
+  <string name="LSLTipText_llLinkParticleSystem">
+list llLinkParticleSystem(integer linknumber, list rules)
+Creates a particle system based on rules.  Empty list removes particle system from object.
+List format is [ rule1, data1, rule2, data2 . . . rulen, datan ].
+  </string>
+  <string name="LSLTipText_llSetLinkTextureAnim">
+llSetLinkTextureAnim(integer link, integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate)
+Animate the texture on the specified face/faces of the specified prim/prims by setting the texture scale and offset.
+  </string>
+  <string name="LSLTipText_llGetLinkNumberOfSides">
+integer llGetLinkNumberOfSides(integer link)
+Returns the number of sides of the specified linked prim.
+  </string>
+  <string name="LSLTipText_llGetUsername">
+string llGetUsername(key id)
+Returns the single-word username of an avatar, if the avatar is in the current region, otherwise the empty string.
+  </string>
+  <string name="LSLTipText_llRequestUsername">
+key llRequestUsername(key id)
+Requests single-word username of an avatar.  When data is available the dataserver event will be raised.
+  </string>
+  <string name="LSLTipText_llGetDisplayName">
+string llGetDisplayName(key id)
+Returns the name of an avatar, if the avatar is in the current simulator, and the name has been cached, otherwise the same as llGetUsername. Use llRequestDisplayName if you absolutely must have the display name.
+  </string>
+  <string name="LSLTipText_llRequestDisplayName">
+key llRequestDisplayName(key id)
+Requests name of an avatar.  When data is available the dataserver event will be raised.
+  </string>
+  <string name="LSLTipText_llRegionSayTo">
+llRegionSayTo(key target, integer channel, string msg)
+Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region
+  </string>
+  <string name="LSLTipText_llGetEnv">
+string llGetEnv(string name)
+Returns a string with the requested data about the region
+  </string>
+
+
+  <string name="LSLTipText_llCastRay">
+list llCastRay( Vector start, Vector end, list options )
+Returns a list consisting of the following three values for each hit: UUID, Link number, Hit position.
+  </string>
+  <string name="LSLTipText_llGetSPMaxMemory">
+integer llGetSPMaxMemory( )
+Returns the integer of the most bytes used while llScriptProfiler was last active.
+  </string>
+  <string name="LSLTipText_llGetUsedMemory">
+integer llGetUsedMemory( )
+Returns the integer of the number of bytes of memory currently in use by the script.
+  </string>
+  <string name="LSLTipText_llGodLikeRezObject">
+llGodLikeRezObject( key inventory, vector pos )
+Rez directly off of UUID if owner has god-bit set.
+(Requires god mode)
+  </string>
+  <string name="LSLTipText_llScriptProfiler">
+llScriptProfiler( integer flags )
+Enables or disables the scripts profiling state.
+  </string>
+  <string name="LSLTipText_llSetInventoryPermMask">
+llSetInventoryPermMask( string item, integer mask, integer value )
+Sets the given permission mask to the new value on the inventory item.
+(Requires god mode)
+  </string>
+  <string name="LSLTipText_llSetObjectPermMask">
+llSetObjectPermMask( integer mask, integer value )
+Sets the given permission mask to the new value on the root object the task is attached to.
+(Requires god mode)
+  </string>
+  <string name="LSLTipText_llSetMemoryLimit">
+integer llSetMemoryLimit( integer limit )
+Request ''limit'' bytes to be reserved for this script.
+  </string>
+  <string name="LSLTipText_llSetLinkMedia">
+integer llSetLinkMedia( integer link, integer face, list params )
+Set the media params for a particular face on the linked prim(s) without a delay.
+  </string>
+  <string name="LSLTipText_llGetLinkMedia">
+list llGetLinkMedia( integer link, integer face, list params )
+Returns a list with the media params for a particular face on a linked prim, given the desired list of named params.
+  </string>
+  <string name="LSLTipText_llClearLinkMedia">
+integer llClearLinkMedia( integer link, integer face )
+Clears the media and all params from the given face on the linked prim(s).
+  </string>
+  <string name="LSLTipText_llSetLinkCamera">
+llSetLinkCamera( integer link, vector eye, vector at )
+Sets the camera eye offset, and the offset that the camera is looking at, for avatars that sit on the linked prim.
+  </string>
+  <string name="LSLTipText_llSetContentType">
+llSetContentType( key request_id, integer content_type )
+Set the Internet media type of an LSL HTTP server response.
+  </string>
+  <string name="LSLTipText_llLinkSitTarget">
+llLinkSitTarget( integer link, vector offset, rotation rot );
+Set the sit location for the linked prim(s). The sit location is relative to the prim's position and rotation.
+  </string>
+  <string name="LSLTipText_llAvatarOnLinkSitTarget">
+key llAvatarOnLinkSitTarget( integer link )
+Returns a key that is the UUID of the user seated on the prim.
+  </string>
+
+
+<!-- No info on these functions yet....
+  <string name="LSLTipText_llSetVelocity">
+  </string>
+  <string name="LSLTipText_llSetRotationalVelocity">
+  </string>
+-->
+  <!-- Avatar busy/away mode -->
+	<string name="AvatarSetNotAway">Not Away</string>
+	<string name="AvatarSetAway">Away</string>
+	<string name="AvatarSetNotBusy">Not Busy</string>
+	<string name="AvatarSetBusy">Busy</string>
+
+
+
+	<string name="ok">OK</string>
+	<!-- mouselook -->
+	<string name="LeaveMouselook">Press ESC to return to World View</string>
+	<!-- use value="" because they have preceding spaces -->
+	<string name="no_transfer" value=" (no transfer)" />
+	<string name="no_modify"   value=" (no modify)" />
+	<string name="no_copy"     value=" (no copy)" />
+	<string name="temporary"   value=" (temporary)" />
+	<string name="worn"        value=" (worn)" />
+	<string name="locked" value=" (locked)" />
+	<string name="link"        value=" (link)" />
+	<string name="broken_link" value=" (broken_link)" />
+	<string name="LoadingContents">Loading contents...</string>
+	<string name="NoContents">No contents</string>
+	<string name="WornOnAttachmentPoint" value=" (worn on [ATTACHMENT_POINT])" />
+	<string name="LockedOnAttachmentPoint" value=" (locked to [ATTACHMENT_POINT])" />
+	<string name="ActiveGesture" value="[GESLABEL] (active)"/>
+	<!-- Gestures labels -->
+    <!-- use value="" because they have preceding spaces -->
+    <string name="Chat Message"  value=" Chat : " />
+    <string name="Sound"         value=" Sound : " />
+	<string name="Wait"          value=" --- Wait : " />
+	<string name="AnimFlagStop"  value=" Stop Animation :    " />
+	<string name="AnimFlagStart" value=" Start Animation :   " />
+	<string name="Wave"          value=" Wave " />
+	<string name="GestureActionNone" value="None" />
+	<string name="HelloAvatar"   value=" Hello, avatar! " />
+	<string name="ViewAllGestures"  value="  View All &gt;&gt;" />
+	<string name="GetMoreGestures"  value="  Get More &gt;&gt;" />
+	<string name="Stone">Stone</string>
+	<string name="Metal">Metal</string>
+	<string name="Glass">Glass</string>
+	<string name="Wood">Wood</string>
+	<string name="Flesh">Flesh</string>
+	<string name="Plastic">Plastic</string>
+	<string name="Rubber">Rubber</string>
+	<string name="Light">Light</string>
+	<string name="Unknown">(Unknown)</string>
+	<!-- Environment settings -->
+	<string name="Local">Local</string>
+	<string name="LocalSettings">Local Settings</string>
+	<string name="Region">Region</string>
+	<string name="RegionSettings">Region Settings</string>
+	<!-- menu accelerators -->
+	<string name="accel-mac-control">Ctrl-</string>
+	<string name="accel-mac-command">Cmd-</string>
+	<string name="accel-mac-option">Opt-</string>
+	<string name="accel-mac-shift">Shift-</string>
+	<string name="accel-win-control">Ctrl-</string>
+	<string name="accel-win-alt">Alt-</string>
+	<string name="accel-win-shift">Shift-</string>
+	<!-- OSMessageBox messages -->
+	<string name="MBCmdLineError">
+		An error was found parsing the command line.
+Please see: http://wiki.secondlife.com/wiki/Client_parameters
+Error:
+	</string>
+	<string name="MBCmdLineUsg">[APP_NAME] Command line usage:</string>
+	<string name="MBUnableToAccessFile">
+		[APP_NAME] is unable to access a file that it needs.
+
+This can be because you somehow have multiple copies running, or your system incorrectly thinks a file is open.
+If this message persists, restart your computer and try again.
+If it continues to persist, you may need to completely uninstall [APP_NAME] and reinstall it.
+	</string>
+	<string name="MBRequiresAltiVec"> [APP_NAME] requires a processor with AltiVec (G4 or later).</string>
+	<string name="MBAlreadyRunning">
+		[APP_NAME] is already running.
+Check your task bar for a minimized copy of the program.
+If this message persists, restart your computer.
+	</string>
+	<string name="MBFrozenCrashed">
+		[APP_NAME] appears to have frozen or crashed on the previous run.
+Would you like to send a crash report?
+	</string>
+	<string name="MBAlert">Notification</string>
+	<string name="MBNoDirectX">
+		[APP_NAME] is unable to detect DirectX 9.0b or greater.
+[APP_NAME] uses DirectX to detect hardware and/or outdated drivers that can cause stability problems, poor performance and crashes.  While you can run [APP_NAME] without it, we highly recommend running with DirectX 9.0b.
+
+Do you wish to continue?
+	</string>
+	<string name="MBWarning">Warning</string>
+	<string name="MBRegClassFailed">RegisterClass failed</string>
+	<string name="MBError">Error</string>
+	<string name="MBFullScreenErr">
+		Unable to run fullscreen at [WIDTH] x [HEIGHT].
+Running in window.
+	</string>
+	<string name="MBDestroyWinFailed">Shutdown Error while destroying window (DestroyWindow() failed)</string>
+	<string name="MBShutdownErr">Shutdown Error</string>
+	<string name="MBDevContextErr">Can't make GL device context</string>
+	<string name="MBPixelFmtErr">Can't find suitable pixel format</string>
+	<string name="MBPixelFmtDescErr">Can't get pixel format description</string>
+	<string name="MBTrueColorWindow">
+		[APP_NAME] requires True Color (32-bit) to run.
+Please go to your computer's display settings and set the color mode to 32-bit.
+	</string>
+	<string name="MBAlpha">
+		[APP_NAME] is unable to run because it can't get an 8 bit alpha channel.  Usually this is due to video card driver issues.
+Please make sure you have the latest video card drivers installed.
+Also be sure your monitor is set to True Color (32-bit) in Control Panels &gt; Display &gt; Settings.
+If you continue to receive this message, contact the [SUPPORT_SITE].
+	</string>
+	<string name="MBPixelFmtSetErr">Can't set pixel format</string>
+	<string name="MBGLContextErr">Can't create GL rendering context</string>
+	<string name="MBGLContextActErr">Can't activate GL rendering context</string>
+	<string name="MBVideoDrvErr">
+		[APP_NAME] is unable to run because your video card drivers did not install properly, are out of date, or are for unsupported hardware. Please make sure you have the latest video card drivers and even if you do have the latest, try reinstalling them.
+
+If you continue to receive this message, contact the [SUPPORT_SITE].
+	</string>
+	
+  <string name="group_role_everyone">Everyone</string>
+  <string name="group_role_officers">Officers</string>
+  <string name="group_role_owners">Owners</string>	
+  <string name="group_member_status_online">Online</string>
+  
+  <string name="Chat">Chat</string>
+
+  <string name="DefaultMimeType">none/none</string>
+
+ <!-- External editor status codes -->
+ <string name="ExternalEditorNotSet">Select an editor using the ExternalEditor setting.</string>
+ <string name="ExternalEditorNotFound">Cannot find the external editor you specified.
+Try enclosing path to the editor with double quotes.
+(e.g. "/path to my/editor" "%s")</string>
+ <string name="ExternalEditorCommandParseError">Error parsing the external editor command.</string>
+ <string name="ExternalEditorFailedToRun">External editor failed to run.</string>
+
+<!-- Addition of OSSL commands for use in OpenSimulator based regions, including Aurora -->
+  <string name="LSLTipText_osSetRegionWaterHeight">
+osSetRegionWaterHeight(float height)
+Adjusts water height on region.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetRegionSunSettings">
+osSetRegionSunSettings(integer useEstateSun, integer sunFixed, float sunHour)
+Changes the estate sun settings, then triggers a sun update
+'sunFixed' TRUE to keep the sun stationary, FALSE to use global time
+'sunHour' The sun hour that is desired, 0...24, 0 is sunrise.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetEstateSunSettings">
+osSetEstateSunSettings(integer sunFixed, float sunHour)
+sunFixed = TRUE or FALSE, sunHour = 00.00 to 24.00.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetCurrentSunHour">
+float osGetCurrentSunHour()
+Returns float value of current sun hour 0...24 0 is sunrise.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSunGetParam">
+*DEPRECATED* Use osGetSunParam instead.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSunSetParam">
+*DEPRECATED* Use osSetSunParam instead.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osWindActiveModelPluginName">
+string osWindActiveModelPluginName()
+Returns the current working wind module installed
+These are SimpleRandomWind or ConfigurableWind.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osParcelJoin">
+osParcelJoin(vector pos1, vector pos2))
+Joins parcels @ X,Y coordinates.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osParcelSubdivide">
+osParcelSubdivide(vector pos1, vector pos2))
+Subdivides parcels @ X,Y coordinates.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osParcelSetDetails">
+*DEPRECATED* Use osSetParcelDetails instead.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osWindParamSet">
+*DEPRECATED* Use osSetWindParam instead.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osWindParamGet">
+*DEPRECATED* Use osGetWindParam instead.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osList2Double">
+double osList2Double(list src, integer index)
+Returns double-precision value from src at index.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetDynamicTextureURL">
+osSetDynamicTextureURL(key dynamicID, string contentType, string url, string extraParams, integer timer )
+Renders a web texture on the prim containing the script, and returns the UUID of the newly created texture.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetDynamicTextureData">
+osSetDynamicTextureData(key dynamicID, string contentType, string data, string extraParams, integer timer)
+Writes text and vector graphics onto a prim face.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetDynamicTextureURLBlend">
+osSetDynamicTextureURLBlend(key dynamicID, string contentType, string url, string extraParams, integer timer, integer alpha)
+Allows for two dynamic textures to blend on the prim containing this script.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetDynamicTextureDataBlend">
+osSetDynamicTextureDataBlend(key dynamicID, string contentType, string data, string extraParams, integer timer, integer alpha)
+Allows for two dynamic textures to blend on the prim containing this script.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetDynamicTextureURLBlendFace">
+osSetDynamicTextureURLBlendFace(key dynamicID, string contentType, string url, string extraParams, integer blend, integer disp, integer timer, integer alpha, integer face)
+Loads a web texture on a prim.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetDynamicTextureDataBlendFace">
+osSetDynamicTextureDataBlendFace(key dynamicID, string contentType, string data, string extraParams, integer blend, integer disp, integer timer, integer alpha, integer face)
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osTerrainGetHeight">
+*DEPRECATED* Use osGetTerrainHeight instead.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osTerrainSetHeight">
+*DEPRECATED* Use osSetTerrainHeight instead.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osTerrainFlush">
+osTerrainFlush()
+Updates terrain data. Call this after you are done using osTerrainSetHeight.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osRegionRestart">
+integer osRegionRestart(float seconds)
+Restart the current region in the specified number of seconds from now.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osRegionNotice">
+osRegionNotice(string msg)
+Broadcasts a notification message to all agents on the current region.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osConsoleCommand">
+osConsoleCommand(string command)
+Issues commands directly to the OpenSim server console.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetParcelMediaURL">
+osSetParcelMediaURL(string url)
+Sets parcel media URL.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetParcelSIPAddress">
+osSetParcelSIPAddress(string SIPAddress)
+Sets parcel SIP Address for Voice.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetPrimFloatOnWater">
+osSetPrimFloatOnWater(integer floatYN)
+Make physical prims float at the water level, TRUE or FALSE.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osTeleportAgent">
+osTeleportAgent(key agent, integer regionX, integer regionY, vector position, vector lookat)
+  or
+osTeleportAgent(key agent, string regionName, vector position, vector lookat)
+  or
+osTeleportAgent(key agent, vector position, vector lookat)
+Teleports the specified agent to a specified location in the region, the grid, or the hypergrid. See documentation for details.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetAgentIP">
+string osGetAgentIP(key agent)
+Returns the Avatars IP Address
+Allows in-world tools be used to coordinate out of world network services that need access to client IP addresses.
+Should *ONLY* be used by Region Server Owner.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetAgents">
+list osGetAgents()
+Returns a list of all avatars in the region in which the script is running.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osAvatarPlayAnimation">
+osAvatarPlayAnimation(key UUID, string animation)
+Triggers animations contained within the same prim as the script. Does not need the target avatar's permission.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osAvatarStopAnimation">
+osAvatarStopAnimation(key UUID, string animation)
+Stops specified animation on the specified avatar.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osMovePen">
+osMovePen(string drawList, integer x, integer y)
+Moves the pen's location to the coordinates specified by the x and y parameters, without drawing anything.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osDrawLine">
+osDrawLine(string drawList, integer startX, integer startY, integer endX, integer endY)
+osDrawLine(string drawList, integer endX, integer endY)
+Draws a line on a dynamic texture.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osDrawText">
+osDrawText(string drawList, string text)
+Renders text on a dynamic texture.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osDrawEllipse">
+osDrawEllipse(string drawList, integer width, integer height)
+Draws an ellipse on a dynamic texture.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osDrawRectangle">
+osDrawRectangle(string drawList, integer width, integer height)
+Draws a rectangle on a dynamic texture.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osDrawFilledRectangle">
+osDrawFilledRectangle(string drawList, integer width, integer height)
+Draws a rectangle on a dynamic texture, and fills it with the current pen color.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osDrawPolygon">
+string osDrawPolygon (string drawList, list x, list y)
+Draws a polygon on a dynamic texture.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osDrawFilledPolygon">
+string osDrawFilledPolygon (string drawList, list x, list y)
+Draws a polygon on a dynamic texture, and fills it with the current pen color.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetFontSize">
+osSetFontSize(string drawList, integer fontSize)
+Sets the font size to be used in osDrawText.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetFontName">
+osSetFontName(string drawList, string fontName)
+Sets current font to be used by osDrawText.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetPenSize">
+osSetPenSize(string drawList, integer penSize)
+Sets the pen size (line thickness) that is to be used when drawing dynamic textures.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetPenCap">
+osSetPenCap(string drawList, string direction, string type)
+Apply a shape on the end of a line. This allows using arrow, diamond, round and flat caps.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetPenColour">
+*DEPRECATED* Use osSetPenColor instead
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osDrawImage">
+osDrawImage(string drawList, integer width, integer height, string imageUrl)
+Retrieves an image specified by the imageUrl parameter and draws it at the specified height and width.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetDrawStringSize">
+vector osGetDrawStringSize(string contentType, string text, string fontName, integer fontSize)
+Returns a vector containing the horizontal and vertical dimensions in pixels of the specified text
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetStateEvents">
+osSetStateEvents(integer events)
+Used in the past as a workaround for a bug with Opensim, which has long since been fixed.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetScriptEngineName">
+string osGetScriptEngineName()
+Returns the name of the script engine which is currently enabled on the server.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetSimulatorVersion">
+string osGetSimulatorVersion()
+Returns OpenSim server version information as a string.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osParseJSON">
+string osParseJSON(string JSON)
+Returns a hashtable containing the structured JSON contents.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osMessageObject">
+osMessageObject(key UUID, string message)
+Sends a string to the object identified by UUID.
+The receiving object requires a dataserver(key queryid, string data) in a contained script(s).
+The queryid passed will be the id of the calling object.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osMakeNotecard">
+osMakeNotecard(string notecardName, list contents)
+Write a Notecard contained in Prim with contents of list.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetNotecardLine">
+string osGetNotecardLine(string name, integer line)
+Reads the requested notecard line and return its data as a string.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetNotecard">
+string osGetNotecard(string name)
+Reads the entire notecard and return its data as a string.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetNumberOfNotecardLines">
+integer osGetNumberOfNotecardLines(string name)
+Returns total number of lines in a notecard.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osAvatarName2Key">
+key osAvatarName2Key(string firstname, string lastname)
+Returns the avatar's UUID from their firstname, lastname.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osKey2Name">
+string osKey2Name(key UUID)
+Returns avatar name from their UUID key.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetGridNick">
+string osGetGridNick()
+Returns the grid's nickname.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetGridName">
+string osGetGridName()
+Returns the grid's name.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetGridLoginURI">
+string osGetGridLoginURI()
+Returns the grid's LoginURI.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osFormatString">
+string osFormatString(string str, list strings)
+Return the string with parameters substituted into it (format comes from .NET String.Format class)
+Parameters are specified positionally.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osMatchString">
+list osMatchString(string src, string pattern, integer start)
+Return a list of matches for the pattern and its components inside the source string.
+The pattern is a regular expression. Each match in the result is the string that matched and its position in the source.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osLoadedCreationDate">
+string osLoadedCreationDate()
+Returns Creation Date from meta data of OAR.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osLoadedCreationTime">
+string osLoadedCreationTime()
+Returns Creation Time from meta data of OAR.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osLoadedCreationID">
+string osLoadedCreationID()
+Returns creation ID from meta data of OAR. Can not be used to identify a machine.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetLinkPrimitiveParams">
+list osGetLinkPrimitiveParams(integer linknumber, list rules)
+Returns the primitive parameters for the linkset prims specified by linknumber. If using linkset constants (e.g. LINK_SET, LINK_ALL_CHILDREN, etc), the requested parameters of each relevant prim are concatenated to the end of the list. Otherwise, usage is identical to llGetPrimitiveParams().
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osNpcCreate">
+key osNpcCreate(string firstname, string lastname, vector position, key UUID)
+Creates an NPC (Non Player Character) clone named firstname lastname at position from an already existing avatar specified by UUID.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osNpcMoveTo">
+osNpcMoveTo(key npc, vector position)
+Moves an NPC to a location within the region.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osNpcSay">
+osNpcSay(key npc, string message)
+Makes an NPC say something.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osNpcRemove">
+osNpcRemove(key npc)
+Removes an NPC.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetMapTexture">
+key osGetMapTexture()
+Returns the map texture UUID.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetRegionMapTexture">
+key osGetRegionMapTexture(string regionName)
+Returns the map texture UUID for the regionName requested.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetRegionStats">
+list osGetRegionStats()
+Returns a list of float values representing a number of region statistics (21 of the values shown in the statistics bar of LL-based clients).
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetSimulatorMemory">
+integer osGetSimulatorMemory()
+Returns the current amount of RAM used by the current OpenSim instance.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osKickAvatar">
+osKickAvatar(string FirstName, string LastName, string alert)
+Kicks avatar from region with an alert message.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetSpeed">
+osSetSpeed(key UUID, float SpeedModifier)
+Multiplies the normal running, walking, and flying speed of the specified avatar.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osCauseDamage">
+osCauseDamage(key UUID, float damage)
+Causes damage to specified avatar.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osCauseHealing">
+osCauseHealing(key UUID, float healing)
+Causes healing to specified avatar.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetPrimitiveParams">
+list osGetPrimitiveParams(key prim, list rules)
+Gets the parameters of the primitive, specified by key.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetPrimitiveParams">
+osSetPrimitiveParams(key prim, list rules)
+Sets primitive Params.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetProjectionParams">
+osSetProjectionParams(key prim. integer projection, key texture, float fov, float focus, float amb)
+Set projection paramaters for light sources.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osUnixTimeToTimestamp">
+string osUnixTimeToTimestamp(integer unixtime)
+Converts unixtime to an llGetTimeStamp() formated string.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetPenColor">
+osSetPenColor(string drawList, string color)
+Sets the pen color that is to be used when drawing dynamic textures.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetSunParam">
+float osGetSunParam(string param)
+Returns current float values for param, where param = day_length, year_length, day_night_offset, update_interval.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetSunParam">
+osSetSunParam(string param, float value)
+Sets region's sun parameters, where param = day_length, year_length, day_night_offset, update_interval.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetParcelDetails">
+osSetParcelDetails(vector pos, list rules)
+Set parcel details.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetTerrainHeight">
+float osGetTerrainHeight(integer x, integer y)
+Returns current terrain height at the given coordinates.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetTerrainHeight">
+osSetTerrainHeight(integer x, integer y, float val)
+Sets terrain height at the given coordinates. Use osTerrainFlush() afterwards.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetAvatarList">
+list osGetAvatarList()
+Returns a strided list of the UUID, position, and name of each avatar in the region, except the owner.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osTeleportOwner">
+osTeleportOwner(integer regionX, integer regionY, vector position, vector lookat)
+  or
+osTeleportOwner(string regionName, vector position, vector lookat)
+  or
+osTeleportOwner(vector position, vector lookat)
+Teleports the owner of the object that holds the script to a specified location in the region, the grid, or the hypergrid. See documentation for details.
+(OpenSim only.)
+  </string>
+
+  <!-- LightShare functions -->
+  <string name="LSLTipText_cmSetWindlightScene">
+integer cmSetWindlightScene(list rules)
+Set the current WindLight scene. Estate managers and owners only.
+(Reguires LightShare)
+  </string>
+  <string name="LSLTipText_cmSetWindlightSceneTargeted">
+integer cmSetWindlightSceneTargeted(list rules, key target)
+Set the current WindLight scene directed at a specific avatar. Estate managers and owners only.
+(Reguires LightShare)
+  </string>
+  <string name="LSLTipText_cmGetWindlightScene">
+list cmGetWindlightScene(list rules)
+Get the current WindLight settings.
+(Reguires LightShare)
+  </string>
+  <!-- LightShare functions - alternate versions -->
+  <!-- don't ask me why they renamed 'em, but we need to include both versions - -  MC -->
+  <string name="LSLTipText_lsSetWindlightScene">
+integer lsSetWindlightScene(list rules)
+Set the current WindLight scene. Estate managers and owners only.
+(Reguires LightShare)
+  </string>
+  <string name="LSLTipText_lsSetWindlightSceneTargeted">
+integer lsSetWindlightSceneTargeted(list rules, key target)
+Set the current WindLight scene directed at a specific avatar. Estate managers and owners only.
+(Reguires LightShare)
+  </string>
+  <string name="LSLTipText_lsGetWindlightScene">
+list lsGetWindlightScene(list rules)
+Get the current WindLight settings.
+(Reguires LightShare)
+  </string>
+
+  <!-- New OSSL Functions as of 8-10-2011 -->
+  <string name="LSLTipText_osNpcSaveAppearance">
+key osNpcSaveAppearance(key npc, string notecardName)
+Saves the NPC's appearance to a notecard.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osNpcLoadAppearance">
+osNpcLoadAppearance(key npc, string notecardName)
+Loads the NPC's appearance from a notecard with appearance data.
+Notecards can also be loaded by UUID.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osNpcMoveToTarget">
+osNpcMoveToTarget(key npc, vector position, integer options)
+Moves the NPC to a target at a given vector, using options to walk or to fly there.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osOwnerSaveAppearance">
+key osOwnerSaveAppearance(string notecardName)
+Saves the owner's appearance to a notecard inside the prim that holds the script.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osNpcGetRot">
+rotation osNpcGetRot(key npc)
+Retrieves the rotation of an NPC
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osNpcSetRot">
+osNpcSetRot(key npc, rotation rot)
+Sets an NPC's rotation.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osAgentSaveAppearance">
+key osOwnerSaveAppearance(key avatarId, string notecardName)
+Saves an avatar's appearance to a notecard inside the prim that holds the script.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osNpcGetPos">
+vector osNpcGetPos(key npc)
+Retrieves the vector of an NPC's position within a region.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osNpcStopMoveToTarget">
+osNpcStopMoveToTarget(key npc)
+Makes an NPC stop moving to a target.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetWindParam">
+float osGetWindParam(string plugin, string param)
+Gets the value of param property for plugin module.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetWindParam">
+osSetWindParam(string plugin, string param, float value)
+Sets value of param property for plugin module.
+(OpenSim only.)
+  </string>
+  <string name="Unnamed">(Unnamed)</string>
+  <string name="LSLTipText_llGetMassMKS">
+float llGetMassMKS()
+Returns a float that is the mass (in
+Kilograms) of the object that the
+script is attached to.
+  </string>
+  <string name="LSLTipText_llGetMemoryLimit">
+integer llGetMemoryLimit()
+Get the maximum memory a script can use.
+  </string>
+  <string name="LSLTipText_llGetParcelMusicURL">
+string llGetParcelMusicURL()
+Returns a string containing the parcel streaming audio URL.
+The object owner must also be the land owner.
+  </string>
+  <string name="LSLTipText_llGetPhysicsMaterial">
+list llGetPhysicsMaterial()
+Used to get the physical characteristics of an object.
+Returns a list in the form [ float gravity_multiplier, float restitution, float friction, float density ]
+  </string>
+  <string name="LSLTipText_llManageEstateAccess">
+integer llManageEstateAccess(integer action, key avatar)
+Used to add or remove agents from the estate's agent access or ban lists or groups from the estate's group access list.
+  </string>
+  <string name="LSLTipText_llSetAngularVelocity">
+llSetAngularVelocity(vector force, integer local)
+Applies rotational velocity to object.
+  </string>
+  <string name="LSLTipText_llSetKeyframedMotion">
+llSetKeyframedMotion(list keyframes, list options)
+Specify a list of times, positions, and orientations to be followed by an object. The object will be  smoothly moved between keyframes by the simulator.
+  </string>
+  <string name="LSLTipText_llSetPhysicsMaterial">
+llSetPhysicsMaterial(integer material, float gravity,
+float restitution, float friction, float density)
+Used for setting the physical characteristics of an object.
+  </string>
+  <string name="LSLTipText_llSetRegionPos">
+integer llSetRegionPos(vector position)
+Tries to move the entire object so that the root prim is within 0.1m of position
+  </string>
+  <string name="LSLTipText_llSetVelocity">
+llSetVelocity(vector force, integer local)
+Applies velocity to an object
+  </string>
+  <string name="LSLTipText_llTransferLindenDollars">
+key llTransferLindenDollars(key destination, integer amount)
+Transfer amount of L$ money from script owner to destination avatar.
+  </string>
+
+<!-- Pathfinder functions. Current state: alpha -->
+  <string name="LSLTipText_llCreateCharacter">
+llCreateCharacter(list options)
+Creates a pathfinding entity, known as a "character" from the object containing the script.
+  </string>
+  <string name="LSLTipText_llDeleteCharacter">
+llDeleteCharacter()
+Convert the current linkset back to a standard object, removing all pathfinding properties.
+  </string>
+  <string name="LSLTipText_llEvade">
+llEvade(key target, list options)
+Characters will try to hide from their pursuers if there is a good hiding spot along their fleeing path.
+  </string>
+  <string name="LSLTipText_llExecCharacterCmd">
+llExecCharacterCmd(integer command, list options)
+Send a command to the pathing system.
+  </string>
+  <string name="LSLTipText_llGetClosestNavPoint">
+list llGetClosestNavPoint(vector point, list options)
+Finds the closest navpoint and returns a list with a single vector if succesful. Returns empty list when no navpoints found.
+  </string>
+  <string name="LSLTipText_llFleeFrom">
+llFleeFrom(vector source, float distance, list options)
+Tells an object to keep away from a defined position in the region or adjacent regions.
+  </string>
+  <string name="LSLTipText_llNavigateTo">
+llNavigateTo(vector pos, list options)
+Tells an object to travel to a defined position in the region or adjacent regions.
+  </string>
+  <string name="LSLTipText_llPatrolPoints">
+llPatrolPoints(list patrolPoints, list options)
+Sets the object patrolling between the points specified in patrolPoints.
+  </string>
+  <string name="LSLTipText_llPursue">
+llPursue(key target, list options)
+Causes the object to pursue a target.
+  </string>
+  <string name="LSLTipText_llUpdateCharacter">
+llUpdateCharacter(list options)
+Updates settings for a character.
+  </string>
+  <string name="LSLTipText_llWanderWithin">
+llWanderWithin(vector origin, float dist, list options)
+Sets a character to wander about a central spot within a specified radius.
+  </string>
+  <string name="LSLTipText_osIsNpc">
+integer osIsNpc(key npc)
+Returns TRUE if the given key is an NPC, false otherwise.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osNpcGetOwner">
+key osNpcGetOwner(key npc)
+Return the owner key of the given NPC. If the NPC is unowned or the input key does not belong to an NPC then it returns NULL_KEY.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetGridCustom">
+string osGetGridCustom(string key)
+Reads configuration strings from the [GridInfo] setion in OpenSim.ini.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osGetGridHomeURI">
+string osGetGridHomeURI()
+Returns the hypergrid URI of the grid where the user logged in.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osNpcPlayAnimation">
+osNpcPlayAnimation(key npc, string animation)
+Get an NPC to play an animation. The animation can either be a key or the name of an animation in the same object as the script.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osNpcSit">
+osNpcSit(key npc, key target, integer options)
+Sit an NPC on a prim target. No options have been implemented yet, so always input 0.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osNpcStand">
+osNpcStand(key npc)
+Make an NPC stand up.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osNpcStopAnimation">
+osNpcStopAnimation(key npc, string animation)
+Get an NPC to stop playing an animation. The animation can either be a key or the name of an animation in the same inventory as the script.
+(OpenSim only.)
+  </string>
+  <string name="LSLTipText_osSetRot">
+osSetRot(key target, quaternion rotation)
+Rotates an object or avatar.
+(OpenSim only.)
+  </string>
+</strings>
diff --git a/indra/newview/skins/default/xui/es/teleport_strings.xml b/indra/newview/skins/default/xui/es/teleport_strings.xml
new file mode 100644
index 000000000..5ac701b36
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/teleport_strings.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<teleport_messages>
+  <message_set name="errors">
+    <message name="invalid_tport">
+      Ha habido un problema al procesar tu petición de teleporte. Debes volver a iniciar sesión para poder teleportarte. Si te sigue apareciendo este mensaje, revisa, por favor, las preguntas frecuentes en el Soporte técnico:
+www.secondlife.com/support
+    </message>
+    <message name="invalid_region_handoff">
+      Ha habido un problema al procesar tu paso a otra región. Debes volver a iniciar sesión para poder pasar de región a región. Si te sigue apareciendo este mensaje, revisa, por favor, las preguntas frecuentes en el Soporte técnico:
+www.secondlife.com/support      
+    </message>
+    <message name="blocked_tport">
+      Lo sentimos, en estos momentos los teleportes están bloqueados. Vuelve a intentarlo en un momento. Si sigues sin poder teleportarte, desconéctate y vuelve a iniciar sesión para solucionar el problema.      
+    </message>
+    <message name="nolandmark_tport">
+      Lo sentimos, pero el sistema no ha podido localizar el destino de este hito.      
+    </message>
+    <message name="timeout_tport">
+      Lo sentimos, pero el sistema no ha podido completar el teleporte.
+Vuelve a intentarlo en un momento.
+ 	</message>
+    <message name="noaccess_tport">
+      Lo sentimos, pero no tienes acceso al destino de este teleporte.    
+ 	</message>
+ 	<message name="missing_attach_tport">
+      Aún no han llegado tus objetos anexados. Espera unos segundos más o desconéctate y vuelve a iniciar sesión antes de teleportarte.
+		</message>
+		<message name="too_many_uploads_tport">
+			The asset queue in this region is currently clogged so your teleport
+request will not be able to succeed in a timely manner. Please try again
+in a few minutes or go to a less busy area.
+		</message>
+		<message name="expired_tport">
+			Sorry, but the system was unable to complete your teleport request
+in a timely fashion. Please try again in a few minutes.
+		</message>
+		<message name="expired_region_handoff">
+			Sorry, but the system was unable to complete your region crossing
+in a timely fashion. Please try again in a few minutes.
+		</message>
+		<message name="no_host">
+			Unable to find teleport destination. The destination may be
+temporarily unavailable or no longer exists. Please try again
+in a few minutes.
+		</message>
+		<message name="no_inventory_host">
+			The inventory system is currently unavailable.
+		</message>
+	</message_set>
+	<message_set name="progress">
+		<message name="sending_dest">
+			Sending to destination.
+		</message>
+		<message name="redirecting">
+			Redirecting to different location.
+		</message>
+		<message name="relaying">
+			Relaying to destination.
+		</message>
+		<message name="sending_home">
+			Sending home location request.
+		</message>
+		<message name="sending_landmark">
+			Sending landmark location request.
+		</message>
+		<message name="completing">
+			Completing teleport.
+		</message>
+		<message name="resolving">
+			Resolving destination.
+		</message>
+		<message name="contacting">
+			Contacting new region.
+		</message>
+		<message name="arriving">
+			Arriving...
+		</message>
+		<message name="requesting">
+			Requesting Teleport...
+		</message>
+	</message_set>
+</teleport_messages>
diff --git a/indra/newview/skins/default/xui/es/ui_strings.xml b/indra/newview/skins/default/xui/es/ui_strings.xml
new file mode 100644
index 000000000..3a02ab388
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/ui_strings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!-- This file contains strings that used to be hardcoded in the UI source.
+     It is only for those strings which don't belong in a floater and don't
+     belong to SL-specific dialogs.
+     For example, the menu accelerators cmd, opt, shift, etc -->
+<strings>
+	
+    <!-- menu accelerators -->
+	<string name="accel-mac-control">Ctrl-</string>
+	<string name="accel-mac-command">Cmd-</string>
+	<string name="accel-mac-option">Opt-</string>
+	<string name="accel-mac-shift">Mayus-</string>
+	<string name="accel-win-control">Ctrl-</string>
+	<string name="accel-win-alt">Alt-</string>
+	<string name="accel-win-shift">Mayus-</string>
+
+</strings>
diff --git a/indra/newview/skins/default/xui/es/wlfPanel_AdvSettings.xml b/indra/newview/skins/default/xui/es/wlfPanel_AdvSettings.xml
new file mode 100644
index 000000000..188102724
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/wlfPanel_AdvSettings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="Adv_Settings">
+	<panel filename="panel_bg_tab.xml"/>
+	<button label="" name="expand" tool_tip="Mostrar el Panel de Configuraciones rápidas"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/wlfPanel_AdvSettings_expanded.xml b/indra/newview/skins/default/xui/es/wlfPanel_AdvSettings_expanded.xml
new file mode 100644
index 000000000..381bd0f97
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/wlfPanel_AdvSettings_expanded.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="Adv_Settings">
+  <panel filename="panel_bg_tab.xml"/>
+    <slider control_name="RenderFarClip" label="Distancia de Dibujo:" name="DrawDistance" tool_tip="Cambiar la distancia máxima de dibujo"/>
+    <slider control_name="ThrottleBandwidthKBPS" label="Ancho de Banda:" name="max_bandwidth" tool_tip="Definir el ancho de banda de tu conexión en kbps (kilobits por segundos)"/>
+    <slider control_name="RenderMaxPartCount" label="Partículas:" name="MaxParticleCount" tool_tip="Cantidad de Partículas a Renderizar"/>
+    <slider control_name="RenderAvatarMaxVisible" label="Max Avs:" name="RenderAvatarMaxVisible" tool_tip="Cuantos avatares se renderizarán en forma completa. Disminuyendo este valor incrementará los FPS en lugares saturados. Requiere que Avatar Impostors esté activado. [Por Defecto 35]"/>
+    <slider control_name="RenderVolumeLODFactor" label="Detalle de Obj.:" name="Object Detail" tool_tip="Controla el nivel de detalle de los prims (multiplicar por el área de pantalla utilizado para calcular el nivel de detalle[0.5 to 2.0 es un valor  estable])"/>
+    <button name="EnvAdvancedSkyButton" label="" tool_tip="Cielo Avanzado"/>
+    <combo_box name="WLSkyPresetsCombo" tool_tip="WindLight preestablecidos para el cielo."/>
+    <button label="&lt;" name="WLprev"/>
+    <button label="&gt;" name="WLnext"/>
+    <button name="EnvAdvancedWaterButton" label="" tool_tip="Agua Avanzado"/>
+    <combo_box name="WLWaterPresetsCombo" tool_tip="WindLight preestablecido para el Agua."/>
+    <button label="&lt;" name="WWprev"/>
+    <button label="&gt;" name="WWnext"/>
+    <check_box label="Entorno de la Región" control_name="UseEnvironmentFromRegion" name="use_estate_wl" tool_tip="Usar la configuración de entorno de la región/parcela cuando esté disponible."/>
+  <check_box label="¿Siempre?" control_name="UseEnvironmentFromRegionAlways" name="Always" tool_tip="Usar siempre la configuración de la región/parcela, cuando exista, en forma automática."/>
+    <icon image_name="icon_day_cycle.tga"/>
+    <slider control_name="EnvTimeSlider" label=""name="EnvTimeSlider"/>
+    <button label="" name="expand" tool_tip="Ocultar el Panel de Configuraciones""/>
+</panel>
diff --git a/indra/newview/skins/default/xui/es/xui_version.xml b/indra/newview/skins/default/xui/es/xui_version.xml
new file mode 100644
index 000000000..0e777751d
--- /dev/null
+++ b/indra/newview/skins/default/xui/es/xui_version.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xui_version>
+	1.0
+</xui_version>

From 0316b7ff9a0fba8fc8287000b7e33651e05d9dce Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Sat, 14 Jul 2012 04:10:09 -0400
Subject: [PATCH 018/199] OSX libwork

Started on osx libwork will need darwin builder to test
---
 indra/cmake/APR.cmake      |   4 +-
 indra/cmake/Boost.cmake    |   8 +--
 indra/cmake/Hunspell.cmake |   2 +-
 install.xml                | 108 +++++++++++++++++++------------------
 scripts/repackage.sh       |   2 +-
 5 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 5c434f4bf..4acdc6426 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -33,8 +33,8 @@ else (STANDALONE)
       optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libapr-1.0.dylib
       )
     set(APRUTIL_LIBRARIES 
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.0.dylib
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.0.dylib
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libaprutil-1.dylib
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libaprutil-1.dylib
       )
     set(APRICONV_LIBRARIES iconv)
   else (WINDOWS)
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 6babb05fd..8a3620b47 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -40,10 +40,10 @@ else (STANDALONE)
           debug libboost_regex-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION})
 	
   elseif (DARWIN)
-    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
-    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
-    set(BOOST_REGEX_LIBRARY boost_regex-mt)
-    set(BOOST_SYSTEM_LIBRARY boost_system-mt)  
+    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem)
+    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options)
+    set(BOOST_REGEX_LIBRARY boost_regex)
+    set(BOOST_SYSTEM_LIBRARY boost_system)  
   elseif (LINUX)
     set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
diff --git a/indra/cmake/Hunspell.cmake b/indra/cmake/Hunspell.cmake
index 365df6783..363f061b5 100644
--- a/indra/cmake/Hunspell.cmake
+++ b/indra/cmake/Hunspell.cmake
@@ -6,7 +6,7 @@ if (STANDALONE)
 else (STANDALONE)
     use_prebuilt_binary(hunspell)
 	
-	set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/hunspell)
+	set(HUNSPELL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/hunspell)
 
 	if (LINUX OR DARWIN)
 	    set(HUNSPELL_LIBRARY hunspell-1.3)
diff --git a/install.xml b/install.xml
index 9e42136ab..285544e0f 100644
--- a/install.xml
+++ b/install.xml
@@ -36,6 +36,13 @@
         <string>GLOD</string>
         <key>packages</key>
         <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>ae21b0ea01ebf778bd08dcc0d4f94039</string>
+            <key>url</key>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/glod-1.0pre4-darwin-20110610.tar.bz2</uri>
+          </map>
           <key>linux</key>
           <map>
             <key>md5sum</key>
@@ -80,9 +87,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>2486db13c5ed9340855da3c1c48772af</string>
+            <string>a2794fbeeb03f530a6b7a0879c544f32</string>
             <key>url</key>
-            <uri>https://github.com/downloads/LightDrake/SingularityViewer/apr_suite-1.4.2-darwin-20110217.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/apr_suite-1.4.5-darwin-20120618.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -120,9 +127,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>ad736bc1558c37ca6648bc7e72047faa</string>
+            <string>e4c0aa075086ec2f6b62c9498b381d63</string>
             <key>url</key>
-            <uri>https://github.com/downloads/Shyotl/SingularityViewer/ares-1.7.1-darwin-20100606.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/ares-1.7.1-darwin-20110217.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -160,9 +167,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>2cad51575b429be4fdadb5d63da1c739</string>
+            <string>e859007376f28d699bfea420e44d02e3</string>
             <key>url</key>
-            <uri>https://github.com/downloads/siana/SingularityViewer/boost-1.45.0-darwin-20110604.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/boost-1.45.0-darwin-20110304.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -190,6 +197,13 @@
         <string>scea</string>
         <key>packages</key>
         <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>d1af5f9ae7740566a184b9af40af36da</string>
+            <key>url</key>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/colladadom-2.2-darwin-20110420.tar.bz2</uri>
+          </map>
           <key>linux</key>
           <map>
             <key>md5sum</key>
@@ -219,9 +233,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>525f6b18ea5af8fbd691c2ac1769056c</string>
+            <string>3f2763221bd366242865414112678570</string>
             <key>url</key>
-            <uri>https://github.com/downloads/Shyotl/SingularityViewer/curl-7.20.1-darwin-20100606.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/curl-7.21.1-darwin-20110316.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -345,9 +359,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>c457a0a041ac4946265889a503d26c3d</string>
+            <string>4dc2d4b3890b981f284f5da8f810dc93</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-darwin-20090805.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/expat-2.0.1-darwin-20110218.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -419,9 +433,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>2849e9dd6f26294371a27197972fd1cf</string>
+            <string>8acd5ccfa8134833a98401b11394930d</string>
             <key>url</key>
-            <uri>https://github.com/downloads/siana/SingularityViewer/freetype-2.4.4-darwin-20111010.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/freetype-2.4.4-darwin-20110307.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -505,9 +519,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>84f792a860691d0fad6d1de6eeb31baa</string>
+            <string>f7aa89ac04607d52b11d5ca46b5e75e6</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.36-darwin-20090623a.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/glui-2.36-darwin-20110309.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -598,9 +612,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>9b970abfc9df40ad6d183a4b1f732fb2</string>
+            <string>6d103995df9f1e97d06ecc20704c30f6</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/hunspell-1.2-darwin.tar.gz</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/libhunspell-1.3.2-darwin-20120616.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -638,9 +652,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>8d38d74c481e9aab4518c8f2a7d52800</string>
+            <string>ebad9348d0cbf1d768de727c1d6e1822</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-darwin-20080812.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/jpeglib-8c-darwin-20110228.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -678,9 +692,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>4c6b949778099a63550898f00f3e6a5e</string>
+            <string>70e7a004114983a68d701a83c5d4315c</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jsoncpp-svn-r69-darwin-20090923.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/jsoncpp-0.5.0-darwin-20110131.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -718,9 +732,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>82659b48831cbf58bf04b86602939e0b</string>
+            <string>80506ac813e36a51a5beadf3d08b2b81</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-darwin-20090304.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/libpng-1.5.1-darwin-20110222.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -795,9 +809,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>c983326e0fbe1b77ffc9e006a4c9bee2</string>
+            <string>9bedf2f283e899652a5e7ac6ea3d6a08</string>
             <key>url</key>
-            <uri>https://github.com/downloads/siana/SingularityViewer/llqtwebkit-4.7.1-darwin-20110317.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/llqtwebkit-4.7.1-darwin-20120228.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -854,9 +868,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>17999c47e17f2dd9e12a22372ce8ff14</string>
+            <string>0cd7114c04ba7ac0a824f9f4cead4b39</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ndofdev-darwin-20080812.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/libndofdev-0.1-darwin-20110308.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -894,9 +908,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>5a154313bc30eacd8cfa1acd852ecd3e</string>
+            <string>600c6e3776f9c91068aef43c76eca501</string>
             <key>url</key>
-            <uri>https://github.com/downloads/siana/SingularityViewer/ogg_vorbis-1.2.2-1.3.2-darwin-20110616.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/ogg_vorbis-1.2.2-1.3.2-darwin-20110510.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -930,9 +944,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>a7b49e0f3eedbd5de117a3524c414b3a</string>
+            <string>095e8a20cd0c74e2121ca81fdf389d25</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-darwin-20080812.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/openssl-1.0.0g-darwin-20120207.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -1000,6 +1014,13 @@
         <string>bsd</string>
         <key>packages</key>
         <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>fca72d132adfe24a7a057ad21b9915eb</string>
+            <key>url</key>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/pcre-7.6-darwin-20110504.tar.bz2</uri>
+          </map>
           <key>linux</key>
           <map>
             <key>md5sum</key>
@@ -1047,25 +1068,6 @@
           </map>
         </map>
       </map>
-      <key>unistd</key>
-      <map>
-        <key>copyright</key>
-        <string>(c) 2008 Linden Lab.</string>
-        <key>description</key>
-        <string>Placeholder file to make flex happy on windows.</string>
-        <key>license</key>
-        <string>linden</string>
-        <key>packages</key>
-        <map>
-          <key>windows</key>
-          <map>
-            <key>md5sum</key>
-            <string>6353aff33d7d03b22055aec76f53a866</string>
-            <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/unistd-windows-20080611.tar.bz2</uri>
-          </map>
-        </map>
-      </map>
       <key>vivox</key>
       <map>
         <key>copyright</key>
@@ -1117,9 +1119,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>2d3a918c88d756422c1a8139ebe15f56</string>
+            <string>0d99f62811a2ae181ccb56536134ba7c</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-darwin-20080812.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/xmlrpc_epi-0.54.1-darwin-20110307.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -1157,9 +1159,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>58ef62004b508b234039f6a313d852eb</string>
+            <string>7daee7ada1bcc90fa367775f04e9950a</string>
             <key>url</key>
-            <uri>https://github.com/downloads/LightDrake/SingularityViewer/zlib-1.2.5-darwin-20110211.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/zlib-1.2.5-darwin-20110211.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
diff --git a/scripts/repackage.sh b/scripts/repackage.sh
index ee07ecd95..9018a7cb7 100755
--- a/scripts/repackage.sh
+++ b/scripts/repackage.sh
@@ -29,7 +29,7 @@ case "$1" in
 		;;
 	--mac|--osx|--darwin|-x|mac|osx|darwin)
 		MODE=osx
-		LIBPATH="libraries/universal-darwin/lib_release"
+		LIBPATH="libraries/universal-darwin/lib/release"
 		LIBDPATH="libraries/universal-darwin/lib/debug"
 		INCPATH="libraries/universal-darwin/include"
 		;;

From 340f8f1f170e0b100ca823fc6acc0dfcf5ce9078 Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Sat, 14 Jul 2012 05:02:44 -0400
Subject: [PATCH 019/199] MORE WINDLIGHTS!

---
 .../days/%5BTarnix%5D%20UltraBright.xml       |  20 +++
 .../windlight/days/Realistic%20Daycycle.xml   |  36 +++++
 .../%5BTarnix%5D%20Dramatic%20Fog%202.xml     | 141 ++++++++++++++++++
 .../skies/%5BTarnix%5D%20Dramatic%20Fog.xml   | 141 ++++++++++++++++++
 .../skies/%5BTarnix%5D%20End%2Dof%2Dworld.xml | 141 ++++++++++++++++++
 .../%5BTarnix%5D%20Mystical%20Forest.xml      | 141 ++++++++++++++++++
 .../skies/%5BTarnix%5D%20Rainy%20Forest.xml   | 141 ++++++++++++++++++
 .../%5BTarnix%5D%20Rusted%20Perception.xml    | 141 ++++++++++++++++++
 .../windlight/skies/%5BTarnix%5D%20Shine.xml  | 141 ++++++++++++++++++
 .../skies/%5BTarnix%5D%20Smooth%20spot.xml    | 141 ++++++++++++++++++
 .../%5BTarnix%5D%20Ultrabright%20Day.xml      | 141 ++++++++++++++++++
 .../%5BTarnix%5D%20Ultrabright%20Morning.xml  | 141 ++++++++++++++++++
 .../%5BTarnix%5D%20Ultrabright%20Night.xml    | 141 ++++++++++++++++++
 .../windlight/skies/Realistic%203AM.xml       | 141 ++++++++++++++++++
 .../windlight/skies/Realistic%206AM.xml       | 141 ++++++++++++++++++
 .../windlight/skies/Realistic%206PM.xml       | 141 ++++++++++++++++++
 .../windlight/skies/Realistic%209PM.xml       | 141 ++++++++++++++++++
 .../windlight/skies/Realistic%20Night.xml     | 141 ++++++++++++++++++
 .../windlight/skies/Realistic.xml             | 141 ++++++++++++++++++
 .../water/%5BML%5D%20Caribbean%20Water.xml    |  43 ++++++
 .../windlight/water/Realistic.xml             |  43 ++++++
 21 files changed, 2539 insertions(+)
 create mode 100644 indra/newview/app_settings/windlight/days/%5BTarnix%5D%20UltraBright.xml
 create mode 100644 indra/newview/app_settings/windlight/days/Realistic%20Daycycle.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Dramatic%20Fog%202.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Dramatic%20Fog.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20End%2Dof%2Dworld.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Mystical%20Forest.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Rainy%20Forest.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Rusted%20Perception.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Shine.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Smooth%20spot.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Day.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Morning.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Night.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/Realistic%203AM.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/Realistic%206AM.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/Realistic%206PM.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/Realistic%209PM.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/Realistic%20Night.xml
 create mode 100644 indra/newview/app_settings/windlight/skies/Realistic.xml
 create mode 100644 indra/newview/app_settings/windlight/water/%5BML%5D%20Caribbean%20Water.xml
 create mode 100644 indra/newview/app_settings/windlight/water/Realistic.xml

diff --git a/indra/newview/app_settings/windlight/days/%5BTarnix%5D%20UltraBright.xml b/indra/newview/app_settings/windlight/days/%5BTarnix%5D%20UltraBright.xml
new file mode 100644
index 000000000..20a528235
--- /dev/null
+++ b/indra/newview/app_settings/windlight/days/%5BTarnix%5D%20UltraBright.xml
@@ -0,0 +1,20 @@
+<llsd>
+    <array>
+        <array>
+            <real>0.24652767181396484</real>
+            <string>[Tarnix] Ultrabright Night</string>
+        </array>
+        <array>
+            <real>0.24999989569187164</real>
+            <string>[Tarnix] Ultrabright Morning</string>
+        </array>
+        <array>
+            <real>0.49652755260467529</real>
+            <string>[Tarnix] Ultrabright Day</string>
+        </array>
+        <array>
+            <real>0.90277743339538574</real>
+            <string>[Tarnix] Ultrabright Night</string>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/days/Realistic%20Daycycle.xml b/indra/newview/app_settings/windlight/days/Realistic%20Daycycle.xml
new file mode 100644
index 000000000..6e7de2f0a
--- /dev/null
+++ b/indra/newview/app_settings/windlight/days/Realistic%20Daycycle.xml
@@ -0,0 +1,36 @@
+<llsd>
+    <array>
+        <array>
+            <real>0</real>
+            <string>Realistic Night</string>
+        </array>
+        <array>
+            <real>0.12499994784593582</real>
+            <string>Realistic 3AM</string>
+        </array>
+        <array>
+            <real>0.24652767181396484</real>
+            <string>Realistic 6AM</string>
+        </array>
+        <array>
+            <real>0.37499985098838806</real>
+            <string>A-9AM</string>
+        </array>
+        <array>
+            <real>0.49999979138374329</real>
+            <string>Realistic</string>
+        </array>
+        <array>
+            <real>0.62499970197677612</real>
+            <string>A-3PM</string>
+        </array>
+        <array>
+            <real>0.74999970197677612</real>
+            <string>Realistic 6PM</string>
+        </array>
+        <array>
+            <real>0.87499958276748657</real>
+            <string>Realistic 9PM</string>
+        </array>
+    </array>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Dramatic%20Fog%202.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Dramatic%20Fog%202.xml
new file mode 100644
index 000000000..68af1523e
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Dramatic%20Fog%202.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.0462114512920379638671875</real>
+            <real>0.05376493558287620544433594</real>
+            <real>0.0709760487079620361328125</real>
+            <real>0.02365868352353572845458984</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.1467447141720501502248908</real>
+            <real>0.4041820112504588280444295</real>
+            <real>0.8083723277382617311559443</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.2301578534514239215980069</real>
+            <real>0.3007703710769140670322486</real>
+            <real>0.3251373821004301944981307</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.2784517256901799520107943</real>
+            <real>0.2784517256901799520107943</real>
+            <real>0.2784517256901799520107943</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164306640625</real>
+            <real>0.526096999645233154296875</real>
+            <real>0.9492304265646138716761016</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164306640625</real>
+            <real>0.526096999645233154296875</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.3682807419706036755613354</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.69985902430791213646444</real>
+            <real>10.50173369741952456024592</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.269999980926513671875</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0004900000058114528656005859</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>12.90000057220458984375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>2.45044231414794921875</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.87999999523162841796875</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.799999237060546875</real>
+            <real>0.001000000047497451305389404</real>
+            <real>-1.19999992847442626953125</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>3.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.199999988079071044921875</real>
+            <real>0.1991560012102127075195312</real>
+            <real>0.1991560012102127075195312</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.529998958110809326171875</real>
+            <real>0.555569469928741455078125</real>
+            <real>-0.640658795833587646484375</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1333</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0.589999973773956298828125</real>
+    <key>sun_angle</key>
+        <real>0.5890476703643798828125</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.397439671540726457976689</real>
+            <real>1.479949096350015480538787</real>
+            <real>2.570202271922596537478967</real>
+            <real>0.9015665961795940042122766</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Dramatic%20Fog.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Dramatic%20Fog.xml
new file mode 100644
index 000000000..558092242
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Dramatic%20Fog.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.01848458126187324523925781</real>
+            <real>0.02150597609579563140869141</real>
+            <real>0.02839041873812675476074219</real>
+            <real>0.009463473223149776458740234</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.1467447141720501502248908</real>
+            <real>0.4041820112504588280444295</real>
+            <real>0.8083723277382617311559443</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.2301578534514239215980069</real>
+            <real>0.3007703710769140670322486</real>
+            <real>0.3251373821004301944981307</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.2784517256901799520107943</real>
+            <real>0.2784517256901799520107943</real>
+            <real>0.2784517256901799520107943</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164306640625</real>
+            <real>0.526096999645233154296875</real>
+            <real>0.9492304265646138716761016</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164306640625</real>
+            <real>0.526096999645233154296875</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.3682807419706036755613354</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.69985902430791213646444</real>
+            <real>10.50173369741952456024592</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.269999980926513671875</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0004900000058114528656005859</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>12.90000057220458984375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>2.19911479949951171875</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.09000003337860107421875</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>4.867557667375535856990609</real>
+            <real>0.001000000047497451305389404</real>
+            <real>-0.4737372158712260805657479</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>3.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.199999988079071044921875</real>
+            <real>0.1991560012102127075195312</real>
+            <real>0.1991560012102127075195312</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.6726734638214111328125</real>
+            <real>0.555569469928741455078125</real>
+            <real>-0.4887258112430572509765625</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1333</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0.589999973773956298828125</real>
+    <key>sun_angle</key>
+        <real>0.5890476703643798828125</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.397439671540726457976689</real>
+            <real>1.479949096350015480538787</real>
+            <real>2.570202271922596537478967</real>
+            <real>0.9015665961795940042122766</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20End%2Dof%2Dworld.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20End%2Dof%2Dworld.xml
new file mode 100644
index 000000000..2b2645a41
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20End%2Dof%2Dworld.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.22705078125</real>
+            <real>0.0897216796875</real>
+            <real>0.00732421875</real>
+            <real>0.07568359375</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.171875</real>
+            <real>0.171875</real>
+            <real>0.171875</real>
+            <real>0.0859375</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0.31999999284744263</real>
+            <real>0.31999999284744263</real>
+            <real>0.15999999642372131</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.50999999046325684</real>
+            <real>0.50999999046325684</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.079999998211860657</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.25999999046325684</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00060999998822808266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>46.900001525878906</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>5.1522121429443359</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>12.799999237060547</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.99999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.8899999856948853</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.86294835805892944</real>
+            <real>0.30070748925209045</real>
+            <real>-0.40607285499572754</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>427</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>21</integer>
+    <key>star_brightness</key>
+        <real>0.81000000238418579</real>
+    <key>sun_angle</key>
+        <real>2.836158275604248</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.08233642578125</real>
+            <real>1.07391357421875</real>
+            <real>1.07391357421875</real>
+            <real>0.36077880859375</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Mystical%20Forest.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Mystical%20Forest.xml
new file mode 100644
index 000000000..39a0395b9
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Mystical%20Forest.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.50390625</real>
+            <real>0.50390625</real>
+            <real>0.50390625</real>
+            <real>0.16796875</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.97999995946884155</real>
+            <real>0.97999995946884155</real>
+            <real>0.97999995946884155</real>
+            <real>0.48999997973442078</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.47999998927116394</real>
+            <real>0.53999996185302734</real>
+            <real>0.45999997854232788</real>
+            <real>0.53999996185302734</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.50999999046325684</real>
+            <real>0.50999999046325684</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.079999998211860657</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.25999999046325684</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00013000000035390258</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>24.30000114440918</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.958406925201416</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.6899999380111694</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>15.59999942779541</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.59999996423721313</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.2699999809265137</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.29358875751495361</real>
+            <real>0.91531205177307129</real>
+            <real>0.27569809556007385</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>483</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>21</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.9853105545043945</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.3799998760223389</real>
+            <real>1.3799998760223389</real>
+            <real>1.3799998760223389</real>
+            <real>0.45999997854232788</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Rainy%20Forest.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Rainy%20Forest.xml
new file mode 100644
index 000000000..9f5d6be1d
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Rainy%20Forest.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.0099999997764825821</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0.0099999997764825821</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.68000000715255737</real>
+            <real>0.49999505281448364</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.070000000298023224</real>
+            <real>0.85394656658172607</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.53962135314941406</real>
+            <real>0.53962135314941406</real>
+            <real>0.53962135314941406</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.69569224119186401</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.10999999195337296</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.3765256404876709</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0004099999787285924</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>12.800000190734863</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>2.1991147994995117</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.0199999809265137</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5.3999996185302734</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.39999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2.9500000476837158</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.45999997854232788</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.68231838941574097</real>
+            <real>0.53729885816574097</real>
+            <real>-0.49573326110839844</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1352.0999755859375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>10</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.56723111867904663</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.77999997138977051</real>
+            <real>1.2300000190734863</real>
+            <real>1.2300000190734863</real>
+            <real>0.40999999642372131</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Rusted%20Perception.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Rusted%20Perception.xml
new file mode 100644
index 000000000..bacfab520
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Rusted%20Perception.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0</real>
+            <real>0.05468752607703208923339844</real>
+            <real>0.109375</real>
+            <real>0.0546875</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>2</real>
+            <real>2</real>
+            <real>2</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.5396213531494140625</real>
+            <real>0.5396213531494140625</real>
+            <real>0.5396213531494140625</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.695692241191864013671875</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.1099999919533729553222656</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498046875</real>
+            <real>10.0109996795654296875</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.3765256404876708984375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0004099999787285923957824707</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>12.80000019073486328125</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>5.026547908782958984375</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.819999992847442626953125</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>17.799999237060546875</real>
+            <real>0.001000000047497451305389404</real>
+            <real>-0.4999999701976776123046875</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2.9500000476837158203125</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.459999978542327880859375</real>
+            <real>0.1991560012102127075195312</real>
+            <real>0.1991560012102127075195312</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.79077517986297607421875</real>
+            <real>0.555569469928741455078125</real>
+            <real>0.2569381296634674072265625</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1352.0999755859375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>10</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.5890476703643798828125</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.8857421875</real>
+            <real>1.8592071533203125</real>
+            <real>0.8642578125</real>
+            <real>0.9619140625</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Shine.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Shine.xml
new file mode 100644
index 000000000..e053815be
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Shine.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.21194984018802643</real>
+            <real>0.25700280070304871</real>
+            <real>0.25999999046325684</real>
+            <real>0.25999999046325684</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.10031381994485855</real>
+            <real>0.2849995493888855</real>
+            <real>0.56999999284744263</real>
+            <real>0.56999999284744263</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.15806557238101959</real>
+            <real>0.31211116909980774</real>
+            <real>0.52999997138977051</real>
+            <real>0.52999997138977051</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0.72737622261047363</real>
+            <real>0.73626559972763062</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.89999997615814209</real>
+            <real>0.93999999761581421</real>
+            <real>0.74000000953674316</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.11999999731779099</real>
+            <real>0.20999999344348907</real>
+            <real>0.029999999329447746</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.25999999046325684</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>9.993240904292179</real>
+            <real>10.010000228881836</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00013000000035390258</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>10.100000381469727</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.8955750465393066</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.4699999094009399</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>11.200000762939453</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.64999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.35999998450279236</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.11999999731779099</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.66304093599319458</real>
+            <real>0.24868990480899811</real>
+            <real>-0.70606660842895508</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>789</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>0.18999999761581421</real>
+    <key>sun_angle</key>
+        <real>0.25132742524147034</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.25</real>
+            <real>1.2599999904632568</real>
+            <real>0.59999996423721313</real>
+            <real>2.25</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Smooth%20spot.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Smooth%20spot.xml
new file mode 100644
index 000000000..77db3cf7e
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Smooth%20spot.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.36328125</real>
+            <real>0.321533203125</real>
+            <real>0.22265625</real>
+            <real>0.12109375</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.97999995946884155</real>
+            <real>0.97999995946884155</real>
+            <real>0.97999995946884155</real>
+            <real>0.48999997973442078</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.31999999284744263</real>
+            <real>0.31999999284744263</real>
+            <real>0.31999999284744263</real>
+            <real>0.15999999642372131</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.50999999046325684</real>
+            <real>0.50999999046325684</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.079999998211860657</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.25999999046325684</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00031000000308267772</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>6.8000001907348633</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>4.2725663185119629</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.33000001311302185</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.8899999856948853</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.46939900517463684</real>
+            <real>0.85491263866424561</real>
+            <real>0.22088223695755005</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>752</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>21</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>2.1162102222442627</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.4300000667572021</real>
+            <real>2.0399999618530273</real>
+            <real>1.8600000143051147</real>
+            <real>2.4300000667572021</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Day.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Day.xml
new file mode 100644
index 000000000..0f1b712b7
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Day.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.5859375</real>
+            <real>0.5859375</real>
+            <real>0.5859375</real>
+            <real>0.1953125</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.2447581589221954345703125</real>
+            <real>0.4487232863903045654296875</real>
+            <real>0.7599999904632568359375</real>
+            <real>0.37999999523162841796875</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.6136362552642822265625</real>
+            <real>0.6136362552642822265625</real>
+            <real>0.8549020290374755859375</real>
+            <real>0.42745101451873779296875</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.4099999964237213134765625</real>
+            <real>0.4099999964237213134765625</real>
+            <real>0.4099999964237213134765625</real>
+            <real>0.4099999964237213134765625</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164306640625</real>
+            <real>0.526096999645233154296875</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164306640625</real>
+            <real>0.526096999645233154296875</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.4199999868869781494140625</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.19999980926513671875</real>
+            <real>10.0109996795654296875</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.269999980926513671875</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>9.999999747378751635551453e-05</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.4000000059604644775390625</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.1415927410125732421875</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.769999980926513671875</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.001000000047497451305389404</real>
+            <real>-1.10000002384185791015625</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.88999998569488525390625</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.1599999964237213134765625</real>
+            <real>0.1991560012102127075195312</real>
+            <real>0.1991560012102127075195312</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>1.003947020460603523073218e-13</real>
+            <real>1</real>
+            <real>-1.148381556959066074341536e-06</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1493</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.57079517841339111328125</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.1299998760223388671875</real>
+            <real>1.8660809993743896484375</real>
+            <real>1.490999698638916015625</real>
+            <real>0.709999978542327880859375</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Morning.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Morning.xml
new file mode 100644
index 000000000..aebeff534
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Morning.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.24475815892219543</real>
+            <real>0.44872328639030457</real>
+            <real>0.75999999046325684</real>
+            <real>0.37999999523162842</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.49548381567001343</real>
+            <real>0.49548381567001343</real>
+            <real>0.63999998569488525</real>
+            <real>0.31999999284744263</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1</real>
+            <real>0.96999996900558472</real>
+            <real>0.08999999612569809</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.40999996662139893</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.359999656677246</real>
+            <real>10.340000152587891</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.2800000011920929</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>9.9999997473787516e-006</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.1000000238418579</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-1.1000000238418579</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>3.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.15999999642372131</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0</real>
+            <real>1</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>667</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>1.1299999952316284</real>
+    <key>sun_angle</key>
+        <real>6.2395515441894531</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.6986236572265625</real>
+            <real>1.1374046802520752</real>
+            <real>0.4810638427734375</real>
+            <real>0.5662078857421875</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Night.xml b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Night.xml
new file mode 100644
index 000000000..cd8ead3e8
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/%5BTarnix%5D%20Ultrabright%20Night.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.3486154782113272121435443</real>
+            <real>0.449369331229434954000368</real>
+            <real>0.603132514577153000523424</real>
+            <real>0.6937349534321981536777457</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.3662028399132433720275515</real>
+            <real>0.3662028399731497851909978</real>
+            <real>0.4375903419326376275755308</real>
+            <real>0.6640963995887574355947436</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.3169694886788358978435554</real>
+            <real>0.3169694886788358978435554</real>
+            <real>0.3169694886788358978435554</real>
+            <real>0.7085542303539185127192468</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164306640625</real>
+            <real>0.526096999645233154296875</real>
+            <real>0.9392771101574294290159628</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164306640625</real>
+            <real>0.526096999645233154296875</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.4199999868869781494140625</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.35150370716937828774462</real>
+            <real>10.01099989455784466940713</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.269999980926513671875</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0002012048324333540389764752</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.1975903555777060727205452</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.00100000003430226265706271</real>
+            <real>-0.4799999904774563952436495</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2.463735011225950621849279</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.07903613876588544417955973</real>
+            <real>0.199156002811505972172057</real>
+            <real>0.199156002811505972172057</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.59130990505218505859375</real>
+            <real>-0.8064444065093994140625</real>
+            <real>1</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1196.065065097033084384748</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>2</real>
+    <key>sun_angle</key>
+        <real>5.6505031585693359375</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.08699999749660491943359375</real>
+            <real>0.118706881999969482421875</real>
+            <real>0.2129999846220016479492188</real>
+            <real>0.07099999487400054931640625</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/Realistic%203AM.xml b/indra/newview/app_settings/windlight/skies/Realistic%203AM.xml
new file mode 100644
index 000000000..6426f907d
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Realistic%203AM.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.22259476780891418</real>
+            <real>0.26450252532958984</real>
+            <real>0.35999998450279236</real>
+            <real>0.11999999731779099</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.23999616268583132</real>
+            <real>0.239999227803052</real>
+            <real>0.24000028550619668</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615400241566114</real>
+            <real>0.22615400241566114</real>
+            <real>0.22615400241566114</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.88000000953681223</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.499400354105791</real>
+            <real>10.011000104419489</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0003000046529240592</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>7</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5.0000000000023022</real>
+            <real>0.0010000000214220922</real>
+            <real>-0.47999999165507345</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>4.6348559691012062e-006</real>
+            <real>0.19915600437461423</real>
+            <real>0.19915600437461423</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>1</real>
+            <real>2.3722609512333293e-006</real>
+            <real>1</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>906.19008370909478</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>1.9999420642852783</real>
+    <key>sun_angle</key>
+        <real>4.7123866081237793</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.11344550549983978</real>
+            <real>0.11571422964334488</real>
+            <real>0.21467949450016022</real>
+            <real>0.071559831500053406</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/Realistic%206AM.xml b/indra/newview/app_settings/windlight/skies/Realistic%206AM.xml
new file mode 100644
index 000000000..86e799464
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Realistic%206AM.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.80999994277954102</real>
+            <real>0.46289783716201782</real>
+            <real>0.62999993562698364</real>
+            <real>0.26999998092651367</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.30247950553894043</real>
+            <real>0.83312696218490601</real>
+            <real>1.6662704944610596</real>
+            <real>0.83313524723052979</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.20673196017742157</real>
+            <real>0.40988314151763916</real>
+            <real>0.47999998927116394</real>
+            <real>0.47999998927116394</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22616604226328718</real>
+            <real>0.22616604226328718</real>
+            <real>0.22616604226328718</real>
+            <real>0.99997219085526012</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.88000025272481253</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013883861</real>
+            <real>10.010999679576344</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00056000001495704055</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>4.6000003814697266</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.94999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.66999995708465576</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.15999999642372131</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.094108223915100098</real>
+            <real>0.99556195735931396</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>877</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.094247691333293915</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.8055419921875</real>
+            <real>2.5958919525146484</real>
+            <real>2.3507080078125</real>
+            <real>0.9351806640625</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/Realistic%206PM.xml b/indra/newview/app_settings/windlight/skies/Realistic%206PM.xml
new file mode 100644
index 000000000..c74da5417
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Realistic%206PM.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.58785861730575562</real>
+            <real>0.46682888269424438</real>
+            <real>0.46682891249656677</real>
+            <real>0.1959528774023056</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.18964982032775879</real>
+            <real>0.52235734462738037</real>
+            <real>1.0447251796722412</real>
+            <real>0.52236258983612061</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.11289128661155701</real>
+            <real>0.22382725775241852</real>
+            <real>0.26210871338844299</real>
+            <real>0.1310543566942215</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.87999999523162842</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00052999996114522219</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>1.8000006675720215</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.29999998211860657</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2.1150000095367432</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.17600001394748688</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.23768773674964905</real>
+            <real>-0.97134160995483398</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>767</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>2.9016079902648926</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.9921875</real>
+            <real>1.9921875</real>
+            <real>1.9921875</real>
+            <real>0.6640625</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/Realistic%209PM.xml b/indra/newview/app_settings/windlight/skies/Realistic%209PM.xml
new file mode 100644
index 000000000..64405d95a
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Realistic%209PM.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.20404692765200849</real>
+            <real>0.24246276689169122</real>
+            <real>0.33000383615406292</real>
+            <real>0.1100123608103587</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.070311017334461212</real>
+            <real>0.070312172174453735</real>
+            <real>0.070313982665538788</real>
+            <real>0.035156991332769394</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.23999616268583132</real>
+            <real>0.239999227803052</real>
+            <real>0.24000028550619668</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615400241566114</real>
+            <real>0.22615400241566114</real>
+            <real>0.22615400241566114</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.88000000953681223</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.499400354105791</real>
+            <real>10.011000104419489</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00023999999393709004</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>4.2000002861022949</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5.0000000000023022</real>
+            <real>0.0010000000214220922</real>
+            <real>-0.47999999165507345</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>0.70710688829421997</real>
+            <real>0.70710664987564087</real>
+            <real>1</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1534</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>1.9999420642852783</real>
+    <key>sun_angle</key>
+        <real>3.9269909858703613</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.16206490993499756</real>
+            <real>0.16530600190162659</real>
+            <real>0.30668509006500244</real>
+            <real>0.10222836583852768</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/Realistic%20Night.xml b/indra/newview/app_settings/windlight/skies/Realistic%20Night.xml
new file mode 100644
index 000000000..1fdc5b04c
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Realistic%20Night.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.080595135688781738</real>
+            <real>0.095768749713897705</real>
+            <real>0.13034236431121826</real>
+            <real>0.043447453528642654</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.1181640625</real>
+            <real>0.14753724634647369</real>
+            <real>0.2255859375</real>
+            <real>0.11279296875</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.1328125</real>
+            <real>0.1328125</real>
+            <real>0.1328125</real>
+            <real>0.1328125</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.88000000953711155</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940035411295</real>
+            <real>10.011000104431371</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>5.999999848427251e-005</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>75.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.44999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.34999999403953552</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0</real>
+            <real>1</real>
+            <real>3.0028815672267228e-005</real>
+            <real>1</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>438</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>26</integer>
+    <key>star_brightness</key>
+        <real>2</real>
+    <key>sun_angle</key>
+        <real>4.7123589515686035</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.092010498046875</real>
+            <real>0.11404039710760117</real>
+            <real>0.142364501953125</real>
+            <real>0.047454833984375</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/skies/Realistic.xml b/indra/newview/app_settings/windlight/skies/Realistic.xml
new file mode 100644
index 000000000..99a1b4667
--- /dev/null
+++ b/indra/newview/app_settings/windlight/skies/Realistic.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.9140625</real>
+            <real>0.9140625</real>
+            <real>0.9140625</real>
+            <real>0.3046875</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>1.3854242563247681</real>
+            <real>1.5503612756729126</real>
+            <real>1.8020757436752319</real>
+            <real>0.90103787183761597</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.174346923828125</real>
+            <real>0.20045472681522369</real>
+            <real>0.278778076171875</real>
+            <real>0.1393890380859375</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.236663818359375</real>
+            <real>0.26210832595825195</real>
+            <real>0.278961181640625</real>
+            <real>0.278961181640625</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0.52999997138977051</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.48999997973442078</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.47999998927116394</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.069999694824219</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.25</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00017999998817685992</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>3</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5.5999994277954102</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.49999997019767761</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.42999997735023499</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.68000000715255737</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.91269159317016602</real>
+            <real>-0.40864911675453186</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1342</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.9917697906494141</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.210693359375</real>
+            <real>1.2674446105957031</real>
+            <real>1.461181640625</real>
+            <real>0.487060546875</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/water/%5BML%5D%20Caribbean%20Water.xml b/indra/newview/app_settings/windlight/water/%5BML%5D%20Caribbean%20Water.xml
new file mode 100644
index 000000000..574727d37
--- /dev/null
+++ b/indra/newview/app_settings/windlight/water/%5BML%5D%20Caribbean%20Water.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.05800000205636024475097656</real>
+    <key>fresnelOffset</key>
+        <real>0.4299999773502349853515625</real>
+    <key>fresnelScale</key>
+        <real>0.1400000005960464477539062</real>
+    <key>normScale</key>
+        <array>
+            <real>2.2000000476837158203125</real>
+            <real>1.10000002384185791015625</real>
+            <real>0.800000011920928955078125</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.03999999910593032836914062</real>
+    <key>scaleBelow</key>
+        <real>0.329999983310699462890625</real>
+    <key>underWaterFogMod</key>
+        <real>0</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.234375</real>
+            <real>1.00000011920928955078125</real>
+            <real>0.999999940395355224609375</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>12.9960384368896484375</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>-0.2000000476837158203125</real>
+            <real>-0.2400000095367431640625</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>-0.190000057220458984375</real>
+            <real>0</real>
+        </array>
+    </map>
+</llsd>
diff --git a/indra/newview/app_settings/windlight/water/Realistic.xml b/indra/newview/app_settings/windlight/water/Realistic.xml
new file mode 100644
index 000000000..f821e77a6
--- /dev/null
+++ b/indra/newview/app_settings/windlight/water/Realistic.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.026000000536441803</real>
+    <key>fresnelOffset</key>
+        <real>0.38999998569488525</real>
+    <key>fresnelScale</key>
+        <real>0.059999998658895493</real>
+    <key>normScale</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>7c88a167-157c-6b31-34ae-e0041360e54e</uuid>
+    <key>scaleAbove</key>
+        <real>0</real>
+    <key>scaleBelow</key>
+        <real>0.17999999225139618</real>
+    <key>underWaterFogMod</key>
+        <real>0.41999998688697815</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.0745849609375</real>
+            <real>0.10957146435976028</real>
+            <real>0.1285400390625</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>19.698312759399414</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>-0.16000008583068848</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.48999977111816406</real>
+            <real>-0.38000011444091797</real>
+        </array>
+    </map>
+</llsd>

From 07e1f0e8023aa12665a3538c3842fe1b37eb67b4 Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Sat, 14 Jul 2012 05:04:10 -0400
Subject: [PATCH 020/199] Added a terrain texture scale changer thing! Need
 someone to add UI bits though >.<

---
 indra/newview/featuretable.txt       | 5 +++++
 indra/newview/featuretable_linux.txt | 6 ++++++
 indra/newview/featuretable_mac.txt   | 5 +++++
 indra/newview/llviewercontrol.cpp    | 8 ++++++++
 4 files changed, 24 insertions(+)

diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 1ebe49cf6..815923a3c 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -42,6 +42,7 @@ RenderObjectBump			1	1
 RenderLocalLights			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	12.0
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
@@ -86,6 +87,7 @@ RenderObjectBump			1	0
 RenderLocalLights			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
+RenderTerrainScale			1	12.0
 RenderTerrainLODFactor		1	1
 RenderTransparentWater		1	0
 RenderTreeLODFactor			1	0
@@ -117,6 +119,7 @@ RenderObjectBump			1	1
 RenderLocalLights			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	9.0
 RenderTerrainLODFactor		1	1.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
@@ -149,6 +152,7 @@ RenderObjectBump			1	1
 RenderLocalLights			1	1
 RenderReflectionDetail		1	2
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	6.0
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
@@ -179,6 +183,7 @@ RenderObjectBump			1	1
 RenderLocalLights			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	5.0
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index 98381248f..8002ea3e4 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -42,6 +42,7 @@ RenderMaxPartCount			1	8192
 RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	12.0
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
@@ -83,6 +84,7 @@ RenderMaxPartCount			1	512
 RenderObjectBump			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
+RenderTerrainScale			1	12.0
 RenderTerrainLODFactor		1	1
 RenderTransparentWater		1	0
 RenderTreeLODFactor			1	0
@@ -114,6 +116,7 @@ RenderMaxPartCount			1	2048
 RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	9.0
 RenderTerrainLODFactor		1	1.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
@@ -144,6 +147,7 @@ RenderLocalLights			1	1
 RenderMaxPartCount			1	4096
 RenderObjectBump			1	1
 RenderReflectionDetail		1	2
+RenderTerrainScale			1	6.0
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
@@ -177,6 +181,7 @@ RenderMaxPartCount			1	8192
 RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	5.0
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
@@ -266,6 +271,7 @@ RenderAvatarVP				0	0
 RenderObjectBump			0	0
 RenderMaxPartCount			1	1024
 RenderTerrainDetail 		1	0
+RenderTerrainScale			1	12.0
 RenderUseImpostors			0	0
 RenderVBOEnable				1	0
 RenderReflectionDetail		0	0
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index be9ca1f12..55fe571bf 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -42,6 +42,7 @@ RenderMaxPartCount			1	8192
 RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	12.0
 RenderTerrainLODFactor			1	2.0
 RenderTransparentWater			1	1
 RenderTreeLODFactor			1	1.0
@@ -86,6 +87,7 @@ RenderMaxPartCount			1	512
 RenderObjectBump			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
+RenderTerrainScale			1	12.0
 RenderTerrainLODFactor		1	1
 RenderTransparentWater		1	0
 RenderTreeLODFactor			1	0
@@ -117,6 +119,7 @@ RenderMaxPartCount			1	2048
 RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	9.0
 RenderTerrainLODFactor		1	1.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
@@ -149,6 +152,7 @@ RenderMaxPartCount			1	4096
 RenderObjectBump			1	1
 RenderReflectionDetail		1	2
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	6.0
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
@@ -181,6 +185,7 @@ RenderMaxPartCount			1	8192
 RenderObjectBump			1	1
 RenderReflectionDetail		1	4
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	5.0
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	1.0
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 6440652ef..755e97e1c 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -122,6 +122,13 @@ static bool handleTerrainDetailChanged(const LLSD& newvalue)
 	return true;
 }
 
+static bool handleTerrainScaleChanged(const LLSD& inputvalue)
+{
+	LLSD newvalue = 1.f / inputvalue.asReal();
+	LLDrawPoolTerrain::sDetailScale = newvalue.asReal();
+	return true;
+}
+
 bool handleStateMachineMaxTimeChanged(const LLSD& newvalue)
 {
 	AIStateMachine::updateSettings();
@@ -621,6 +628,7 @@ void settings_setup_listeners()
 	gSavedSettings.getControl("FirstPersonAvatarVisible")->getSignal()->connect(boost::bind(&handleRenderAvatarMouselookChanged, _2));
 	gSavedSettings.getControl("RenderFarClip")->getSignal()->connect(boost::bind(&handleRenderFarClipChanged, _2));
 	gSavedSettings.getControl("RenderTerrainDetail")->getSignal()->connect(boost::bind(&handleTerrainDetailChanged, _2));
+	gSavedSettings.getControl("RenderTerrainScale")->getSignal()->connect(boost::bind(&handleTerrainScaleChanged, _2));
 	gSavedSettings.getControl("OctreeStaticObjectSizeFactor")->getSignal()->connect(boost::bind(&handleRepartition, _2));
 	gSavedSettings.getControl("OctreeDistanceFactor")->getSignal()->connect(boost::bind(&handleRepartition, _2));
 	gSavedSettings.getControl("OctreeMaxNodeCapacity")->getSignal()->connect(boost::bind(&handleRepartition, _2));

From 5080746fa0c976c22368fe55befe5a22912cd2c6 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sat, 14 Jul 2012 15:54:36 -0400
Subject: [PATCH 021/199] Prevent build preferences from altering objects we've
 duplicated.  Offer an off switch for build prefs.

Added LiruEnableBuildPrefs, for turning off, when users do not want to use their default build parameters for a few prims, but don't wish to reset them permanently.
    This should perhaps end up on the build floater somewhere... but for now, debug only.
Note some of this fix for duplication may be overly cautious, but better safe than sorry.
Added a check for physical default in during creation, so that building at great distances adheres a bit more to build preferences.
Added IsCOA into the build settings, since I'd forgotten, previously.
---
 .../app_settings/settings_ascent_coa.xml      | 41 +++++++++++++++++++
 indra/newview/llmanip.cpp                     | 16 +++++---
 indra/newview/lltoolplacer.cpp                | 35 +++++++++-------
 3 files changed, 73 insertions(+), 19 deletions(-)

diff --git a/indra/newview/app_settings/settings_ascent_coa.xml b/indra/newview/app_settings/settings_ascent_coa.xml
index 9c94281c4..b76f74109 100644
--- a/indra/newview/app_settings/settings_ascent_coa.xml
+++ b/indra/newview/app_settings/settings_ascent_coa.xml
@@ -214,6 +214,8 @@
           <string>F32</string>
           <key>Value</key>
           <real>0.5</real>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>BuildPrefs_Ysize</key>
         <map>
@@ -225,6 +227,8 @@
           <string>F32</string>
           <key>Value</key>
           <real>0.5</real>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>BuildPrefs_Zsize</key>
         <map>
@@ -236,6 +240,8 @@
           <string>F32</string>
           <key>Value</key>
           <real>0.5</real>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_Phantom</key>
         <map>
@@ -247,6 +253,8 @@
           <string>Boolean</string>
           <key>Value</key>
           <integer>0</integer>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_Temporary</key>
         <map>
@@ -258,6 +266,8 @@
           <string>Boolean</string>
           <key>Value</key>
           <integer>0</integer>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_Physical</key>
         <map>
@@ -269,6 +279,8 @@
           <string>Boolean</string>
           <key>Value</key>
           <integer>0</integer>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_EmbedItem</key>
         <map>
@@ -280,6 +292,8 @@
           <string>Boolean</string>
           <key>Value</key>
           <integer>0</integer>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>BuildPrefs_Material</key>
         <map>
@@ -291,6 +305,8 @@
           <string>String</string>
           <key>Value</key>
           <string>Wood</string>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_Color</key>
         <map>
@@ -307,6 +323,8 @@
             <real>1.0</real>
             <real>1.0</real>
           </array>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_Texture</key>
         <map>
@@ -318,6 +336,8 @@
           <string>String</string>
           <key>Value</key>
           <string>89556747-24cb-43ed-920b-47caed15465f</string>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_Alpha</key>
         <map>
@@ -329,6 +349,8 @@
           <string>F32</string>
           <key>Value</key>
           <real>0.0</real>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_Glow</key>
         <map>
@@ -340,6 +362,8 @@
           <string>F32</string>
           <key>Value</key>
           <real>0.0</real>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_FullBright</key>
         <map>
@@ -351,6 +375,8 @@
           <string>Boolean</string>
           <key>Value</key>
           <integer>0</integer>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
         <key>EmeraldBuildPrefs_Shiny</key>
         <map>
@@ -362,6 +388,21 @@
           <string>String</string>
           <key>Value</key>
           <string>None</string>
+          <key>IsCOA</key>
+          <integer>1</integer>
+        </map>
+        <key>LiruEnableBuildPrefs</key>
+        <map>
+          <key>Comment</key>
+          <string>When false, disables all defaults set in the building preferences panel, without resetting them.</string>
+          <key>Persist</key>
+          <integer>1</integer>
+          <key>Type</key>
+          <string>Boolean</string>
+          <key>Value</key>
+          <string>1</string>
+          <key>IsCOA</key>
+          <integer>1</integer>
         </map>
 	</map>
 </llsd>
diff --git a/indra/newview/llmanip.cpp b/indra/newview/llmanip.cpp
index b5f17f2af..3ffb93f69 100644
--- a/indra/newview/llmanip.cpp
+++ b/indra/newview/llmanip.cpp
@@ -355,11 +355,17 @@ LLVector3 LLManip::getPivotPoint()
 {
 	static LLCachedControl<bool> actual_root("AscentBuildPrefs_ActualRoot");
 	static LLCachedControl<bool> pivot_as_percent("AscentBuildPrefs_PivotIsPercent");
-	static LLCachedControl<F32> pivot_x("AscentBuildPrefs_PivotX");
-	static LLCachedControl<F32> pivot_y("AscentBuildPrefs_PivotY");
-	static LLCachedControl<F32> pivot_z("AscentBuildPrefs_PivotZ");
-	LLVector3 offset(pivot_x,pivot_y,pivot_z);
-
+	LLVector3 offset(50,50,50);
+	//Are we are using the defaults?
+	if(gSavedSettings.getBOOL("LiruEnableBuildPrefs"))
+	{
+		static LLCachedControl<F32> pivot_x("AscentBuildPrefs_PivotX");
+		static LLCachedControl<F32> pivot_y("AscentBuildPrefs_PivotY");
+		static LLCachedControl<F32> pivot_z("AscentBuildPrefs_PivotZ");
+		offset = LLVector3(pivot_x,pivot_y,pivot_z);
+	}
+	else
+		pivot_as_percent = true;
 	if (mObjectSelection->getFirstRootObject(TRUE) && (mObjectSelection->getObjectCount() == 1 || actual_root) && mObjectSelection->getSelectType() != SELECT_TYPE_HUD)
 	{
 		if(pivot_as_percent)
diff --git a/indra/newview/lltoolplacer.cpp b/indra/newview/lltoolplacer.cpp
index f9b5e4541..063b28f1e 100644
--- a/indra/newview/lltoolplacer.cpp
+++ b/indra/newview/lltoolplacer.cpp
@@ -223,19 +223,25 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
 
 	// Set params for new object based on its PCode.
 	LLQuaternion	rotation;
-	LLVector3		scale = LLVector3(
-		gSavedSettings.getF32("BuildPrefs_Xsize"),
-		gSavedSettings.getF32("BuildPrefs_Ysize"),
-		gSavedSettings.getF32("BuildPrefs_Zsize"));
+	LLVector3		scale = DEFAULT_OBJECT_SCALE;
 
 	U8				material = LL_MCODE_WOOD;
-	if(gSavedSettings.getString("BuildPrefs_Material")== "Stone") material = LL_MCODE_STONE;
-	else if(gSavedSettings.getString("BuildPrefs_Material")== "Metal") material = LL_MCODE_METAL;
-	//if(gSavedSettings.getString("BuildPrefs_Material")== "Wood") material = LL_MCODE_WOOD; redundant
-	else if(gSavedSettings.getString("BuildPrefs_Material")== "Flesh") material = LL_MCODE_FLESH;
-	else if(gSavedSettings.getString("BuildPrefs_Material")== "Rubber") material = LL_MCODE_RUBBER;
-	else if(gSavedSettings.getString("BuildPrefs_Material")== "Plastic") material = LL_MCODE_PLASTIC;
-
+	static LLCachedControl<bool> enable_BP("LiruEnableBuildPrefs", true);
+	static LLCachedControl<bool> duplicate("CreateToolCopySelection", true);
+	//If we are using the defaults, and we aren't duplicating
+	if(enable_BP && !duplicate)
+	{
+		scale = LLVector3(
+			gSavedSettings.getF32("BuildPrefs_Xsize"),
+			gSavedSettings.getF32("BuildPrefs_Ysize"),
+			gSavedSettings.getF32("BuildPrefs_Zsize"));
+		if(gSavedSettings.getString("BuildPrefs_Material")== "Stone") material = LL_MCODE_STONE;
+		else if(gSavedSettings.getString("BuildPrefs_Material")== "Metal") material = LL_MCODE_METAL;
+		//if(gSavedSettings.getString("BuildPrefs_Material")== "Wood") material = LL_MCODE_WOOD; redundant
+		else if(gSavedSettings.getString("BuildPrefs_Material")== "Flesh") material = LL_MCODE_FLESH;
+		else if(gSavedSettings.getString("BuildPrefs_Material")== "Rubber") material = LL_MCODE_RUBBER;
+		else if(gSavedSettings.getString("BuildPrefs_Material")== "Plastic") material = LL_MCODE_PLASTIC;
+	}
 	BOOL			create_selected = FALSE;
 	LLVolumeParams	volume_params;
 	
@@ -292,7 +298,7 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
 	gMessageSystem->addU8Fast(_PREHASH_Material,	material);
 
 	U32 flags = 0;		// not selected
-	if (use_physics)
+	if (use_physics || (enable_BP && !duplicate && gSavedSettings.getBOOL("EmeraldBuildPrefs_Physical")))
 	{
 		flags |= FLAGS_USE_PHYSICS;
 	}
@@ -477,8 +483,9 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics )
 	
 	// Pack in name value pairs
 	gMessageSystem->sendReliable(regionp->getHost());
-	//Actually call expectRez so that importtracker can do its thing
-	gImportTracker.expectRez();
+	//If we are using the defaults, and we aren't duplicating
+	if(enable_BP && !duplicate)	//then, actually call expectRez so that importtracker can do its thing, which sadly only works close up.
+		gImportTracker.expectRez();
 	// Spawns a message, so must be after above send
 	if (create_selected)
 	{

From 92dc20850d8ed3de5fcf2ec9eaaf7f5db3267abe Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sat, 14 Jul 2012 20:45:59 -0400
Subject: [PATCH 022/199] Added Terrain Scale ComboBox to graphics preferences
 panel.

Fixed up feature tables to use correct names, and to use the 7 for high TerrainScale.
---
 indra/newview/featuretable.txt                |  2 +-
 indra/newview/featuretable_linux.txt          |  4 ++--
 indra/newview/featuretable_mac.txt            |  4 ++--
 indra/newview/llpaneldisplay.cpp              | 21 +++++++++++++++++--
 indra/newview/llpaneldisplay.h                |  5 ++++-
 .../xui/en-us/panel_preferences_graphics1.xml |  9 +++++++-
 6 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 815923a3c..995506eab 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -152,7 +152,7 @@ RenderObjectBump			1	1
 RenderLocalLights			1	1
 RenderReflectionDetail		1	2
 RenderTerrainDetail			1	1
-RenderTerrainScale			1	6.0
+RenderTerrainScale			1	7.0
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
diff --git a/indra/newview/featuretable_linux.txt b/indra/newview/featuretable_linux.txt
index 8002ea3e4..bc464b0fd 100644
--- a/indra/newview/featuretable_linux.txt
+++ b/indra/newview/featuretable_linux.txt
@@ -147,8 +147,8 @@ RenderLocalLights			1	1
 RenderMaxPartCount			1	4096
 RenderObjectBump			1	1
 RenderReflectionDetail		1	2
-RenderTerrainScale			1	6.0
 RenderTerrainDetail			1	1
+RenderTerrainScale			1	7.0
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
@@ -160,7 +160,7 @@ WLSkyDetail					1	48
 RenderDeferred				1	0
 RenderDeferredSSAO			1	0
 RenderShadowDetail			1	0
-RenderFastAlpha				1	0
+RenderFSAASamples			1	0
 RenderUseFBO				1	0
 
 
diff --git a/indra/newview/featuretable_mac.txt b/indra/newview/featuretable_mac.txt
index 55fe571bf..16e50377e 100644
--- a/indra/newview/featuretable_mac.txt
+++ b/indra/newview/featuretable_mac.txt
@@ -63,7 +63,7 @@ RenderDeferred				1	1
 RenderDeferredSSAO			1	1
 RenderShadowDetail			1	2
 WatchdogDisabled				1	1
-RenderUseStreamVBO			1	1
+ShyotlRenderUseStreamVBO			1	1
 RenderFSAASamples			1	16
 RenderMaxTextureIndex		1	16
 RenderUseFBO				1	0
@@ -152,7 +152,7 @@ RenderMaxPartCount			1	4096
 RenderObjectBump			1	1
 RenderReflectionDetail		1	2
 RenderTerrainDetail			1	1
-RenderTerrainScale			1	6.0
+RenderTerrainScale			1	7.0
 RenderTerrainLODFactor		1	2.0
 RenderTransparentWater		1	1
 RenderTreeLODFactor			1	0.5
diff --git a/indra/newview/llpaneldisplay.cpp b/indra/newview/llpaneldisplay.cpp
index aaf304236..fdb1a0035 100644
--- a/indra/newview/llpaneldisplay.cpp
+++ b/indra/newview/llpaneldisplay.cpp
@@ -250,6 +250,10 @@ BOOL LLPanelDisplay::postBuild()
 	mCtrlShadowDetail->setCommitCallback(&LLPanelDisplay::onVertexShaderEnable);
 	mCtrlShadowDetail->setCallbackUserData(this);
 
+	//----------------------------------------------------------------------------
+	// Terrain Scale
+	mCtrlTerrainScale = getChild<LLComboBox>("TerrainScaleCombo");
+
 	//----------------------------------------------------------------------------
 	// Enable Avatar Shaders
 	mCtrlAvatarVP = getChild<LLCheckBoxCtrl>("AvatarVertexProgram");
@@ -350,6 +354,7 @@ BOOL LLPanelDisplay::postBuild()
 	mLightingText = getChild<LLTextBox>("LightingDetailText");
 	mMeshDetailText = getChild<LLTextBox>("MeshDetailText");
 	mShadowDetailText = getChild<LLTextBox>("ShadowDetailText");
+	mTerrainScaleText = getChild<LLTextBox>("TerrainScaleText");
 
 	refresh();
 
@@ -417,10 +422,10 @@ void LLPanelDisplay::refresh()
 	mDeferred = gSavedSettings.getBOOL("RenderDeferred");
 	mDeferredDoF = gSavedSettings.getBOOL("RenderDepthOfField");
 
-	// reflection radio
+	// combo boxes
 	mReflectionDetail = gSavedSettings.getS32("RenderReflectionDetail");
-
 	mShadowDetail = gSavedSettings.getS32("RenderShadowDetail");
+	mTerrainScale = gSavedSettings.getF32("RenderTerrainScale");
 
 	// avatar settings
 	mAvatarImpostors = gSavedSettings.getBOOL("RenderUseImpostors");
@@ -606,6 +611,13 @@ void LLPanelDisplay::disableUnavailableSettings()
 		mCtrlReflectionDetail->setValue(FALSE);
 	}
 
+	// disabled terrain scale
+	if(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderTerrainScale"))
+	{
+		mCtrlTerrainScale->setEnabled(false);
+		mCtrlTerrainScale->setValue(false);
+	}
+
 	// disabled av
 	if(!LLFeatureManager::getInstance()->isFeatureAvailable("RenderAvatarVP"))
 	{
@@ -678,10 +690,12 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
 
 	llassert(mRadioTerrainDetail != NULL);
 	llassert(mCtrlReflectionDetail != NULL);
+	llassert(mCtrlTerrainScale != NULL);
 
 	llassert(mMeshDetailText != NULL);
 	llassert(mShaderText != NULL);
 	llassert(mReflectionText != NULL);
+	llassert(mTerrainScaleText != NULL);
 	llassert(mAvatarText != NULL);
 	llassert(mLightingText != NULL);
 	llassert(mTerrainText != NULL);
@@ -728,6 +742,7 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
 
 	mRadioTerrainDetail->setVisible(!isHidden);
 	mCtrlReflectionDetail->setVisible(!isHidden);
+	mCtrlTerrainScale->setVisible(!isHidden);
 
 	mCtrlDeferred->setVisible(!isHidden);
 	mCtrlDeferredDoF->setVisible(!isHidden);
@@ -742,6 +757,7 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
 	mDrawDistanceMeterText1->setVisible(!isHidden);
 	mDrawDistanceMeterText2->setVisible(!isHidden);
 	mShadowDetailText->setVisible(!isHidden);
+	mTerrainScaleText->setVisible(!isHidden);
 
 	// hide one meter text if we're making things visible
 	if(!isHidden)
@@ -771,6 +787,7 @@ void LLPanelDisplay::cancel()
 
 	gSavedSettings.setS32("RenderReflectionDetail", mReflectionDetail);
 	gSavedSettings.setS32("RenderShadowDetail", mShadowDetail);
+	gSavedSettings.setF32("RenderTerrainScale", mTerrainScale);
 
 	gSavedSettings.setBOOL("RenderUseImpostors", mAvatarImpostors);
 	gSavedSettings.setS32("RenderAvatarMaxVisible", mNonImpostors);
diff --git a/indra/newview/llpaneldisplay.h b/indra/newview/llpaneldisplay.h
index 9b601d7d1..a2cbc3549 100644
--- a/indra/newview/llpaneldisplay.h
+++ b/indra/newview/llpaneldisplay.h
@@ -84,7 +84,6 @@ protected:
 	LLComboBox		*mCtrlFullScreen;               // Fullscreen resolution
 	LLCheckBoxCtrl	*mCtrlAutoDetectAspect;			// automatically detect aspect ratio
 	LLComboBox		*mCtrlAspectRatio;				// user provided aspect ratio
-	LLComboBox		*mCtrlReflectionDetail;
 
 	LLCheckBoxCtrl	*mCtrlWindowed;					// windowed mode
 	LLComboBox      *mCtrlWindowSize;               // window size for windowed mode
@@ -114,7 +113,9 @@ protected:
 	LLCheckBoxCtrl	*mCtrlShaderEnable;
 	LLCheckBoxCtrl	*mCtrlDeferred;
 	LLCheckBoxCtrl	*mCtrlDeferredDoF;
+	LLComboBox		*mCtrlReflectionDetail;
 	LLComboBox		*mCtrlShadowDetail;
+	LLComboBox		*mCtrlTerrainScale;
 	LLCheckBoxCtrl	*mCtrlAvatarImpostors;
 	LLCheckBoxCtrl	*mCtrlAvatarCloth;
 	LLCheckBoxCtrl	*mCtrlLightingDetail2;
@@ -144,6 +145,7 @@ protected:
 	LLTextBox		*mSkyFactorText;
 	LLTextBox		*mPostProcessText;
 	LLTextBox		*mShadowDetailText;
+	LLTextBox		*mTerrainScaleText;
 
 	BOOL mFSAutoDetectAspect;
 	F32 mAspectRatio;
@@ -162,6 +164,7 @@ protected:
 
 	S32 mReflectionDetail;
 	S32 mShadowDetail;
+	F32 mTerrainScale;
 
 	BOOL mAvatarImpostors;
 	S32 mNonImpostors;
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 4be19eadc..9e66ad8b7 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -46,7 +46,14 @@
 	<check_box bottom_delta="-17" control_name="RenderDeferred" initial_value="true" label="Lighting and Shadows" tool_tip="Deferred Shading" left_delta="0" name="RenderDeferred"/>
     <check_box bottom_delta="-17" control_name="RenderDeferredSSAO" height="16" initial_value="true" label="Ambient Occlusion" left_delta="0" name="UseSSAO"/>
 	<check_box bottom_delta="-17" control_name="RenderDepthOfField"	initial_value="true" label="Depth of Field" left_delta="0" name="RenderDepthOfField"/>
-  <text bottom_delta="-60" height="12" left="15" name="ShadowDetailText">Shadows:</text>
+  <text bottom_delta="-20" height="12" left="15" name="TerrainScaleText">Terrain Scale:</text>
+  <combo_box bottom_delta="-22" control_name="RenderTerrainScale" label="Terrain Scale" left_delta="-2" name="TerrainScaleCombo" width="160" height="16">
+    <combo_item name="Low" value="12">Low</combo_item>
+    <combo_item name="Medium" value="9">Medium</combo_item>
+	<combo_item name="High" value="7">High</combo_item>
+    <combo_item name="Ultra" value="5">Ultra</combo_item>
+  </combo_box>
+  <text bottom_delta="-20" height="12" left="15" name="ShadowDetailText">Shadows:</text>
   <combo_box bottom_delta="-22" control_name="RenderShadowDetail" label="Shadow Detail" left_delta="-2" name="ShadowDetailCombo" width="160" height="16">
 	  <combo_item name="0" value="0">Disabled</combo_item>
 	  <combo_item name="1" value="1">Sun/Moon</combo_item>

From 0243c61ea10bf515e238e9ed869d7fe9d1770997 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 15 Jul 2012 15:23:53 -0400
Subject: [PATCH 023/199] Spanish Translation is complete, add it to the
 completed combo_box area, and keep to alphabetical order.

---
 .../skins/default/xui/en-us/panel_preferences_general.xml | 2 +-
 .../skins/default/xui/es/panel_preferences_general.xml    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
index fefaa6330..4784afe21 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -44,11 +44,11 @@
 		<combo_item name="System Default Language" value="default">System Default</combo_item>
 		<combo_item name="English" value="en-us">English</combo_item>		
 		<!-- 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 name="Spanish" value="es">Español(Spanish)</combo_item>
 		<combo_item name="French" value="fr">Français(French)</combo_item>
 		<!-- Also, with the above advice in mind, keep completed UI translations above this line.-->
 		<combo_item name="Danish" value="da">Dansk(Danish)*</combo_item>
 		<combo_item name="Deutsch(German)" value="de">Deutsch(German)*</combo_item>
-		<combo_item name="Spanish" value="es">Español(Spanish)*</combo_item>
 		<combo_item name="Italian" value="it">Italiano(Italian)*</combo_item>
 		<combo_item name="Hungarian" value="hu">Magyar(Hungarian)*</combo_item>
 		<combo_item name="Dutch" value="nl">Nederlands(Dutch)*</combo_item>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index 748165b7f..ec345f37b 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -84,15 +84,15 @@
 					Predeterminado del Sistema
 			 </combo_item>
 			 <combo_item name="English">
-					Inglés
+					English(Inglés)
 			 </combo_item>		
 			 <!-- 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 name="Spanish">
+					Español
+			 </combo_item>
 			 <combo_item name="French">
 					Français(Francés)
 			 </combo_item>
-			 <combo_item name="Spanish">
-					Español(Spanish)
-			 </combo_item>						  
 			 <!-- Also, with the above advice in mind, keep completed UI translations above this line.-->
 			 <combo_item name="Danish">
 					Dansk(Danés)*

From 10fe67f4a6f167d2f3a3f56551a56da3f8c5b5aa Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sun, 15 Jul 2012 16:41:31 -0500
Subject: [PATCH 024/199] FBO tweaks. Release multisample fbo in
 LLPipeline::releaseScreenBuffers, and fixed LLRenderBuffer::mInternalFormat
 falling out of sync with LLRenderBuffer::mTex.

---
 indra/llrender/llrendertarget.cpp | 1 +
 indra/newview/pipeline.cpp        | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp
index 6ea20e977..ceb865ad1 100644
--- a/indra/llrender/llrendertarget.cpp
+++ b/indra/llrender/llrendertarget.cpp
@@ -793,6 +793,7 @@ bool LLMultisampleBuffer::addColorAttachment(U32 color_fmt)
 	}
 
 	mTex.push_back(tex);
+	mInternalFormat.push_back(color_fmt);
 	return true;
 }
 
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index bd2424294..f71adc331 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -693,6 +693,7 @@ bool LLPipeline::allocateScreenBuffer(U32 resX, U32 resY, U32 samples)
 	}
 
 	mSampleBuffer.release();
+	mScreen.release();
 
 	if (LLPipeline::sRenderDeferred)
 	{
@@ -906,6 +907,8 @@ void LLPipeline::releaseScreenBuffers()
 	{
 		mShadow[i].release();
 	}
+
+	mSampleBuffer.release();
 }
 
 

From ccb914ea83c3ad6eaac5902317d8ce6d34384a4f Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Sun, 15 Jul 2012 17:45:50 -0400
Subject: [PATCH 025/199] General cleanup of OSX support - not done Updated
 with new cursors from LL Corrected mispackaged OSX Libs Corrected mouse
 flicker on menus

Signed-off-by: Drake Arconis <lightdrake@gmail.com>
---
 indra/cmake/00-Common.cmake                   |  25 +-
 indra/cmake/JPEG.cmake                        |   4 +-
 indra/cmake/JsonCpp.cmake                     |   2 +-
 indra/cmake/Linking.cmake                     |   6 +-
 indra/cmake/OpenSSL.cmake                     |   6 +-
 indra/cmake/Variables.cmake                   |  47 ++--
 indra/llrender/llgl.cpp                       |   2 +-
 indra/llrender/llgl.h                         |   1 +
 indra/llrender/llglheaders.h                  |   7 +-
 indra/llrender/llshadermgr.cpp                |   5 +-
 indra/llwindow/llmousehandler.h               |   3 +
 indra/llwindow/llwindow.cpp                   |   3 +-
 indra/llwindow/llwindow.h                     |   5 +-
 indra/llwindow/llwindowcallbacks.h            |   1 -
 indra/llwindow/llwindowheadless.h             |   2 +-
 indra/llwindow/llwindowmacosx-objc.mm         |   7 +
 indra/llwindow/llwindowmacosx.cpp             | 242 +++++++++---------
 indra/llwindow/llwindowmacosx.h               |   2 +-
 indra/llwindow/llwindowmesaheadless.h         |   2 +-
 indra/llwindow/llwindowsdl.cpp                |  55 ++--
 indra/llwindow/llwindowsdl.h                  |   4 +-
 indra/llwindow/llwindowwin32.cpp              |  36 ++-
 indra/llwindow/llwindowwin32.h                |   2 +-
 indra/newview/CMakeLists.txt                  |  43 ++--
 .../newview/cursors_mac/UI_CURSOR_TOOLBUY.tif | Bin 14776 -> 59044 bytes
 .../cursors_mac/UI_CURSOR_TOOLOPEN.tif        | Bin 15144 -> 58560 bytes
 .../newview/cursors_mac/UI_CURSOR_TOOLSIT.tif | Bin 15176 -> 58464 bytes
 indra/newview/res/toolbuy.cur                 | Bin 2238 -> 4286 bytes
 indra/newview/res/toolopen.cur                | Bin 2238 -> 4286 bytes
 indra/newview/res/toolsit.cur                 | Bin 2238 -> 4286 bytes
 indra/newview/viewer_manifest.py              |  16 +-
 indra/plugins/webkit/CMakeLists.txt           |   4 +-
 indra/test_apps/llplugintest/CMakeLists.txt   |   4 +-
 install.xml                                   |  16 +-
 34 files changed, 296 insertions(+), 256 deletions(-)

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index d7a2ec8c9..9006b2247 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -269,14 +269,23 @@ if (DARWIN)
   add_definitions(-DLL_DARWIN=1 -D_XOPEN_SOURCE)
   set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch")
-  # NOTE: it's critical that the optimization flag is put in front.
-  # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
-  set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
-  set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
+  if(${CMAKE_C_COMPILER} MATCHES "gcc*")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mlong-branch")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mlong-branch")
+    # NOTE: it's critical that the optimization flag is put in front.
+    # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -msse3 -mtune=generic -mfpmath=sse ${GCC_EXTRA_OPTIMIZATIONS}")
+  elseif(${CMAKE_C_COMPILER} MATCHES "clang*")
+    # NOTE: it's critical that the optimization flag is put in front.
+    # NOTE: it's critical to have both CXX_FLAGS and C_FLAGS covered.
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -msse3")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -msse3")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3 -msse3")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -O3 -msse3")
+  endif()
 endif (DARWIN)
 
 
diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake
index f3e5753a6..5c55aedbb 100644
--- a/indra/cmake/JPEG.cmake
+++ b/indra/cmake/JPEG.cmake
@@ -13,8 +13,8 @@ else (STANDALONE)
     set(JPEG_LIBRARIES jpeg)
   elseif (DARWIN)
     set(JPEG_LIBRARIES
-      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/liblljpeg.a
-      debug ${ARCH_PREBUILT_DIRS_DEBUG}/liblljpeg.a
+      optimized ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a
+      debug ${ARCH_PREBUILT_DIRS_DEBUG}/libjpeg.a
       )
   elseif (WINDOWS)
     set(JPEG_LIBRARIES jpeglib)
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index 856034955..241db3570 100644
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -14,7 +14,7 @@ else (STANDALONE)
       debug json_vc${MSVC_SUFFIX}d
       optimized json_vc${MSVC_SUFFIX})
   elseif (DARWIN)
-    set(JSONCPP_LIBRARIES json_mac-universal-gcc_libmt)
+    set(JSONCPP_LIBRARIES json_linux-gcc-4.0.1_libmt)
   elseif (LINUX)
     set(JSONCPP_LIBRARIES jsoncpp)
   endif (WINDOWS)
diff --git a/indra/cmake/Linking.cmake b/indra/cmake/Linking.cmake
index 70d005d33..4b34ff47d 100644
--- a/indra/cmake/Linking.cmake
+++ b/indra/cmake/Linking.cmake
@@ -10,9 +10,9 @@ if (NOT STANDALONE)
     set(ARCH_PREBUILT_DIRS_RELEASE ${ARCH_PREBUILT_DIRS})
     set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS})
   elseif (DARWIN)
-    set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib_release)
-    set(ARCH_PREBUILT_DIRS ${ARCH_PREBUILT_DIRS_RELEASE})
-    set(ARCH_PREBUILT_DIRS_DEBUG ${ARCH_PREBUILT_DIRS_RELEASE})
+    set(ARCH_PREBUILT_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib)
+    set(ARCH_PREBUILT_DIRS_RELEASE ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/release)
+    set(ARCH_PREBUILT_DIRS_DEBUG ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/lib/debug)
   endif (WINDOWS)
 endif (NOT STANDALONE)
 
diff --git a/indra/cmake/OpenSSL.cmake b/indra/cmake/OpenSSL.cmake
index 81584c09e..60cd40c8b 100644
--- a/indra/cmake/OpenSSL.cmake
+++ b/indra/cmake/OpenSSL.cmake
@@ -16,8 +16,6 @@ else (STANDALONE)
   set(OPENSSL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
 endif (STANDALONE)
 
-if (LINUX)
+if (LINUX OR DARWIN)
   set(CRYPTO_LIBRARIES crypto)
-elseif (DARWIN)
-  set(CRYPTO_LIBRARIES llcrypto)
-endif (LINUX)
+endif (LINUX OR DARWIN)
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake
index 964c9d684..c6035597f 100644
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -76,37 +76,36 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(DARWIN 1)
 
-  #SDK Compiler and Deployment targets for XCode
-  if (${XCODE_VERSION} VERSION_LESS 4.0.0)
-    set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
-    set(CMAKE_XCODE_ATTIBUTE_GCC_VERSION "4.2")
-  else (${XCODE_VERSION} VERSION_LESS 4.0.0)
+  if(${CMAKE_GENERATOR} MATCHES Xcode) 
+    #SDK Compiler and Deployment targets for XCode
+    if (${XCODE_VERSION} VERSION_LESS 4.0.0)
+      set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
+      set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5)
+      set(CMAKE_XCODE_ATTIBUTE_GCC_VERSION "4.2")
+    else (${XCODE_VERSION} VERSION_LESS 4.0.0)
+      set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk)
+      set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
+      set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
+    endif (${XCODE_VERSION} VERSION_LESS 4.0.0)
+  else()
     set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.6.sdk)
+    set(CMAKE_OSX_DEPLOYMENT_TARGET 10.6)
     set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
-  endif (${XCODE_VERSION} VERSION_LESS 4.0.0)
+  endif(${CMAKE_GENERATOR} MATCHES Xcode)
 
-  set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5)
+  ## We currently support only 32-bit i386 builds, so use these:
+  set(CMAKE_OSX_ARCHITECTURES i386)
+  set(ARCH i386)
+  set(WORD_SIZE 32)
 
-  # NOTE: To attempt an i386/PPC Universal build, add this on the configure line:
-  # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc'
-  # Build only for i386 by default, system default on MacOSX 10.6 is x86_64
-  if (NOT CMAKE_OSX_ARCHITECTURES)
-    set(CMAKE_OSX_ARCHITECTURES i386)
-  endif (NOT CMAKE_OSX_ARCHITECTURES)
-
-  if (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
-    set(ARCH universal)
-  else (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
-    if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
-      set(ARCH ppc)
-    else (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
-      set(ARCH i386)
-    endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "ppc")
-  endif (CMAKE_OSX_ARCHITECTURES MATCHES "i386" AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc")
+  ## But if you want to compile for mixed 32/64 bit, try these:
+  # set(CMAKE_OSX_ARCHITECTURES i386;x86_64)
+  # set(ARCH universal)
+  # set(WORD_SIZE 64)
 
+  ## Finally, set up the build output directories
   set(LL_ARCH ${ARCH}_darwin)
   set(LL_ARCH_DIR universal-darwin)
-  set(WORD_SIZE 32)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 
 
diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 92d095b80..4603fba08 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -956,7 +956,7 @@ void LLGLManager::initExtensions()
 	mHasFramebufferMultisample = mHasFramebufferObject && ExtensionExists("GL_EXT_framebuffer_multisample", gGLHExts.mSysExts);
 	
 	mHasMipMapGeneration = mHasFramebufferObject || mGLVersion >= 1.4f;
-		
+
 	mHasDrawBuffers = ExtensionExists("GL_ARB_draw_buffers", gGLHExts.mSysExts);
 	mHasBlendFuncSeparate = ExtensionExists("GL_EXT_blend_func_separate", gGLHExts.mSysExts);
 	mHasTextureRectangle = ExtensionExists("GL_ARB_texture_rectangle", gGLHExts.mSysExts);
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
index 06f6155c9..cd2aec306 100644
--- a/indra/llrender/llgl.h
+++ b/indra/llrender/llgl.h
@@ -521,4 +521,5 @@ extern BOOL gGLActive;
 #ifndef GL_DEPTH24_STENCIL8
 #define GL_DEPTH24_STENCIL8 GL_DEPTH24_STENCIL8_EXT
 #endif 
+
 #endif // LL_LLGL_H
diff --git a/indra/llrender/llglheaders.h b/indra/llrender/llglheaders.h
index 9e3d9b96f..c5823044d 100644
--- a/indra/llrender/llglheaders.h
+++ b/indra/llrender/llglheaders.h
@@ -278,7 +278,7 @@ extern PFNGLGENERATEMIPMAPEXTPROC glGenerateMipmapEXT;
 # include "GL/glh_extensions.h"
 # undef __APPLE__
 
-#elif LL_LINUX 
+#elif LL_LINUX
 //----------------------------------------------------------------------------
 // Linux, MESA headers, but not necessarily assuming MESA runtime.
 // quotes so we get libraries/.../GL/ version
@@ -783,6 +783,7 @@ extern PFNGLDEBUGMESSAGECONTROLARBPROC glDebugMessageControlARB;
 extern PFNGLDEBUGMESSAGEINSERTARBPROC glDebugMessageInsertARB;
 extern PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
 extern PFNGLGETDEBUGMESSAGELOGARBPROC glGetDebugMessageLogARB;
+
 #elif LL_DARWIN
 //----------------------------------------------------------------------------
 // LL_DARWIN
@@ -825,6 +826,7 @@ extern void glGenerateMipmapEXT(GLenum target) AVAILABLE_MAC_OS_X_VERSION_10_4_A
 #define glGenerateMipmap glGenerateMipmapEXT
 #define GL_MAX_SAMPLES	0x8D57
 #endif
+
 // GL_ARB_draw_buffers
 extern void glDrawBuffersARB(GLsizei n, const GLenum* bufs) AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
 
@@ -997,7 +999,7 @@ extern void glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
 }
 #endif
 
-#include <AGL/gl.h>
+#include <OpenGL/gl.h>
 
 #endif // LL_MESA / LL_WINDOWS / LL_DARWIN
 
@@ -1029,4 +1031,5 @@ extern void glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
 #define GL_TEXTURE_FREE_MEMORY_ATI                 0x87FC
 #define GL_RENDERBUFFER_FREE_MEMORY_ATI            0x87FD
 #endif
+
 #endif // LL_LLGLHEADERS_H
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index 0c17fbfb5..ade7480d2 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -231,7 +231,6 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)
 	
 	if (features->hasLighting)
 	{
-	
 		if (features->hasWaterFog)
 		{
 			if (features->disableTextureIndex)
@@ -308,7 +307,7 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)
 				}
 				shader->mFeatures.mIndexedTextureChannels = llmax(LLGLSLShader::sIndexedTextureChannels-1, 1);
 			}
-		}		
+		}
 	}
 	
 	// NOTE order of shader object attaching is VERY IMPORTANT!!!
@@ -571,7 +570,7 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 		return 0;
 	}
 
-		//we can't have any lines longer than 1024 characters 
+	//we can't have any lines longer than 1024 characters 
 	//or any shaders longer than 4096 lines... deal - DaveP
 	GLcharARB buff[1024];
 	GLcharARB* text[4096];
diff --git a/indra/llwindow/llmousehandler.h b/indra/llwindow/llmousehandler.h
index 7bd0f2eeb..2163b54e5 100644
--- a/indra/llwindow/llmousehandler.h
+++ b/indra/llwindow/llmousehandler.h
@@ -45,17 +45,20 @@ class LLMouseHandler
 public:
 	LLMouseHandler() {}
 	virtual ~LLMouseHandler() {}
+
 	typedef enum {
 		SHOW_NEVER,
 		SHOW_IF_NOT_BLOCKED,
 		SHOW_ALWAYS,
 	} EShowToolTip;
+
 	typedef enum {
 		CLICK_LEFT,
 		CLICK_MIDDLE,
 		CLICK_RIGHT,
 		CLICK_DOUBLELEFT
 	} EClickType;
+
 	virtual BOOL	handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType clicktype, BOOL down);
 	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask) = 0;
 	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask) = 0;
diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp
index 615247893..f3e28cd26 100644
--- a/indra/llwindow/llwindow.cpp
+++ b/indra/llwindow/llwindow.cpp
@@ -113,6 +113,7 @@ LLWindow::LLWindow(LLWindowCallbacks* callbacks, BOOL fullscreen, U32 flags)
 	  mSupportedResolutions(NULL),
 	  mNumSupportedResolutions(0),
 	  mCurrentCursor(UI_CURSOR_ARROW),
+	  mNextCursor(UI_CURSOR_ARROW),
 	  mCursorHidden(FALSE),
 	  mBusyCount(0),
 	  mIsMouseClipping(FALSE),
@@ -125,7 +126,6 @@ LLWindow::LLWindow(LLWindowCallbacks* callbacks, BOOL fullscreen, U32 flags)
 
 LLWindow::~LLWindow()
 {
-
 }
 
 //virtual
@@ -139,6 +139,7 @@ BOOL LLWindow::canDelete()
 {
 	return TRUE;
 }
+
 // virtual
 void LLWindow::incBusyCount()
 {
diff --git a/indra/llwindow/llwindow.h b/indra/llwindow/llwindow.h
index 99d052521..82e9e190a 100644
--- a/indra/llwindow/llwindow.h
+++ b/indra/llwindow/llwindow.h
@@ -104,12 +104,14 @@ public:
 	virtual S32 getBusyCount() const;
 
 	// Sets cursor, may set to arrow+hourglass
-	virtual void setCursor(ECursorType cursor) = 0;
+	virtual void setCursor(ECursorType cursor) { mNextCursor = cursor; };
 	virtual ECursorType getCursor() const;
+	virtual void updateCursor() = 0;
 
 	virtual void captureMouse() = 0;
 	virtual void releaseMouse() = 0;
 	virtual void setMouseClipping( BOOL b ) = 0;
+
 	virtual BOOL isClipboardTextAvailable() = 0;
 	virtual BOOL pasteTextFromClipboard(LLWString &dst) = 0;
 	virtual BOOL copyTextToClipboard(const LLWString &src) = 0;
@@ -196,6 +198,7 @@ protected:
 	LLWindowResolution* mSupportedResolutions;
 	S32			mNumSupportedResolutions;
 	ECursorType	mCurrentCursor;
+	ECursorType	mNextCursor;
 	BOOL		mCursorHidden;
 	S32			mBusyCount;	// how deep is the "cursor busy" stack?
 	BOOL		mIsMouseClipping;  // Is this window currently clipping the mouse
diff --git a/indra/llwindow/llwindowcallbacks.h b/indra/llwindow/llwindowcallbacks.h
index 804d4f7d8..7da595970 100644
--- a/indra/llwindow/llwindowcallbacks.h
+++ b/indra/llwindow/llwindowcallbacks.h
@@ -91,5 +91,4 @@ public:
 };
 
 
-
 #endif
diff --git a/indra/llwindow/llwindowheadless.h b/indra/llwindow/llwindowheadless.h
index 59fc2ec65..b73c349f9 100644
--- a/indra/llwindow/llwindowheadless.h
+++ b/indra/llwindow/llwindowheadless.h
@@ -61,7 +61,7 @@ public:
 	/*virtual*/ void showCursorFromMouseMove() {};
 	/*virtual*/ void hideCursorUntilMouseMove() {};
 	/*virtual*/ BOOL isCursorHidden() {return FALSE;};
-	/*virtual*/ void setCursor(ECursorType cursor) {};
+	/*virtual*/ void updateCursor() {};
 	//virtual ECursorType getCursor() { return mCurrentCursor; };
 	/*virtual*/ void captureMouse() {};
 	/*virtual*/ void releaseMouse() {};
diff --git a/indra/llwindow/llwindowmacosx-objc.mm b/indra/llwindow/llwindowmacosx-objc.mm
index da01c2afe..4ce225ca3 100644
--- a/indra/llwindow/llwindowmacosx-objc.mm
+++ b/indra/llwindow/llwindowmacosx-objc.mm
@@ -50,6 +50,11 @@ void setupCocoa()
 	{
 		NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 		
+		// The following prevents the Cocoa command line parser from trying to open 'unknown' arguements as documents.
+		// ie. running './secondlife -set Language fr' would cause a pop-up saying can't open document 'fr' 
+		// when init'ing the Cocoa App window.		
+		[[NSUserDefaults standardUserDefaults] setObject:@"NO" forKey:@"NSTreatUnknownArgumentsAsOpen"];
+		
 		// This is a bit of voodoo taken from the Apple sample code "CarbonCocoa_PictureCursor":
 		//   http://developer.apple.com/samplecode/CarbonCocoa_PictureCursor/index.html
 		
@@ -60,6 +65,8 @@ void setupCocoa()
 		[[[NSWindow alloc] init] release];
 
 		[pool release];
+		
+		inited = true;
 	}
 }
 
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp
index 06d7f237e..08a4fab67 100644
--- a/indra/llwindow/llwindowmacosx.cpp
+++ b/indra/llwindow/llwindowmacosx.cpp
@@ -226,10 +226,10 @@ LLWindowMacOSX::LLWindowMacOSX(LLWindowCallbacks* callbacks,
 	// Route them to a dummy callback structure until the end of constructor.
 	LLWindowCallbacks null_callbacks;
 	mCallbacks = &null_callbacks;
-	
+
 	// Voodoo for calling cocoa from carbon (see llwindowmacosx-objc.mm).
 	setupCocoa();
-	
+
 	// Initialize the keyboard
 	gKeyboard = new LLKeyboardMacOSX();
 	gKeyboard->setCallbacks(callbacks);
@@ -260,10 +260,10 @@ LLWindowMacOSX::LLWindowMacOSX(LLWindowCallbacks* callbacks,
 	mRawKeyEvent = NULL;
 	mFSAASamples = fsaa_samples;
 	mForceRebuild = FALSE;
-	
+
 	// For reasons that aren't clear to me, LLTimers seem to be created in the "started" state.
 	// Since the started state of this one is used to track whether the NMRec has been installed, it wants to start out in the "stopped" state.
-	mBounceTimer.stop();	
+	mBounceTimer.stop();
 
 	// Get the original aspect ratio of the main device.
 	mOriginalAspectRatio = (double)CGDisplayPixelsWide(mDisplay) / (double)CGDisplayPixelsHigh(mDisplay);
@@ -276,7 +276,7 @@ LLWindowMacOSX::LLWindowMacOSX(LLWindowCallbacks* callbacks,
 	mMoveEventCampartorUPP = NewEventComparatorUPP(staticMoveEventComparator);
 	mGlobalHandlerRef = NULL;
 	mWindowHandlerRef = NULL;
-	
+
 	mDragOverrideCursor = -1;
 
 	// We're not clipping yet
@@ -451,7 +451,7 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
 			mFullscreenBits    = -1;
 			mFullscreenRefresh = -1;
 
-			std::string error= llformat("Unable to run fullscreen at %d x %d.\nRunning in window.", width, height);	
+			std::string error= llformat("Unable to run fullscreen at %d x %d.\nRunning in window.", width, height);
 			OSMessageBox(error, "Error", OSMB_OK);
 		}
 	}
@@ -484,7 +484,6 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
 			true,
 			(long)this);
 
-
 		if (!mWindow)
 		{
 			setupFailure("Window creation error", "Error", OSMB_OK);
@@ -500,7 +499,7 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
 		InstallStandardEventHandler(GetWindowEventTarget(mWindow));
 		InstallWindowEventHandler(mWindow, mEventHandlerUPP, GetEventTypeCount (WindowHandlerEventList), WindowHandlerEventList, (void*)this, &mWindowHandlerRef); // add event handler
 #if LL_OS_DRAGDROP_ENABLED
-		InstallTrackingHandler( dragTrackingHandler, mWindow, (void*)this );		
+		InstallTrackingHandler( dragTrackingHandler, mWindow, (void*)this );
 		InstallReceiveHandler( dragReceiveHandler, mWindow, (void*)this );
 #endif // LL_OS_DRAGDROP_ENABLED
 	}
@@ -581,16 +580,16 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
 					AGL_NO_RECOVERY,
 					AGL_DOUBLEBUFFER,
 					AGL_CLOSEST_POLICY,
-						AGL_ACCELERATED,
-						AGL_SAMPLE_BUFFERS_ARB, mFSAASamples > 0 ? 1 : 0,
-						AGL_SAMPLES_ARB, mFSAASamples,
-						AGL_RED_SIZE, 8,
-						AGL_GREEN_SIZE, 8,
-						AGL_BLUE_SIZE, 8,
-						AGL_ALPHA_SIZE, 8,
-						AGL_DEPTH_SIZE, 24,
-						AGL_STENCIL_SIZE, 8,
-						AGL_NONE
+					AGL_ACCELERATED,
+					AGL_SAMPLE_BUFFERS_ARB, mFSAASamples > 0 ? 1 : 0,
+					AGL_SAMPLES_ARB, mFSAASamples,
+					AGL_RED_SIZE, 8,
+					AGL_GREEN_SIZE, 8,
+					AGL_BLUE_SIZE, 8,
+					AGL_ALPHA_SIZE, 8,
+					AGL_DEPTH_SIZE, 24,
+					AGL_STENCIL_SIZE, 8,
+					AGL_NONE
 				};
 
 				LL_DEBUGS("Window") << "createContext: creating windowed pixelformat" << LL_ENDL;
@@ -797,7 +796,7 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
 		LL_DEBUGS("GLinit") << "Keeping vertical sync" << LL_ENDL;
 		frames_per_swap = 1;
 	}
-	aglSetInteger(mContext, AGL_SWAP_INTERVAL, &frames_per_swap);  
+	aglSetInteger(mContext, AGL_SWAP_INTERVAL, &frames_per_swap);
 
 	//enable multi-threaded OpenGL
 	if (sUseMultGL)
@@ -810,7 +809,7 @@ BOOL LLWindowMacOSX::createContext(int x, int y, int width, int height, int bits
 		if (cgl_err != kCGLNoError )
 		{
 			LL_DEBUGS("GLInit") << "Multi-threaded OpenGL not available." << LL_ENDL;
-		}    
+		}
 		else
 		{
 			LL_DEBUGS("GLInit") << "Multi-threaded OpenGL enabled." << LL_ENDL;
@@ -1042,6 +1041,7 @@ void LLWindowMacOSX::hide()
 	HideWindow(mWindow);
 }
 
+//virtual
 void LLWindowMacOSX::minimize()
 {
 	setMouseClipping(FALSE);
@@ -1049,6 +1049,7 @@ void LLWindowMacOSX::minimize()
 	CollapseWindow(mWindow, true);
 }
 
+//virtual
 void LLWindowMacOSX::restore()
 {
 	show();
@@ -1114,7 +1115,7 @@ BOOL LLWindowMacOSX::maximize()
 	{
 		ZoomWindow(mWindow, inContent, true);
 	}
-	
+
 	return mMaximized;
 }
 
@@ -1169,6 +1170,8 @@ void LLWindowMacOSX::gatherInput()
 
 		}
 	}
+	
+	updateCursor();
 }
 
 BOOL LLWindowMacOSX::getPosition(LLCoordScreen *position)
@@ -1437,11 +1440,11 @@ static void fixOrigin(void)
 	GrafPtr port;
 	Rect portrect;
 
-	::GetPort(&port);	
+	::GetPort(&port);
 	::GetPortBounds(port, &portrect);
 	if((portrect.left != 0) || (portrect.top != 0))
 	{
-		// Mozilla sometimes changes our port origin.  Fuckers.
+		// Mozilla sometimes changes our port origin.
 		::SetOrigin(0,0);
 	}
 }
@@ -1451,17 +1454,17 @@ BOOL LLWindowMacOSX::getCursorPosition(LLCoordWindow *position)
 	Point cursor_point;
 	LLCoordScreen screen_pos;
 	GrafPtr save;
-	
+
 	if(mWindow == NULL)
 		return FALSE;
-		
+
 	::GetPort(&save);
 	::SetPort(GetWindowPort(mWindow));
 	fixOrigin();
 
 	// gets the mouse location in local coordinates
 	::GetMouse(&cursor_point);
-	
+
 //	lldebugs << "getCursorPosition(): cursor is at " << cursor_point.h << ", " << cursor_point.v << "  port origin: " << portrect.left << ", " << portrect.top << llendl;
 
 	::SetPort(save);
@@ -1526,7 +1529,7 @@ F32 LLWindowMacOSX::getNativeAspectRatio()
 	{
 		// The constructor for this class grabs the aspect ratio of the monitor before doing any resolution
 		// switching, and stashes it in mOriginalAspectRatio.  Here, we just return it.
-	
+
 		if (mOverrideAspectRatio > 0.f)
 		{
 			return mOverrideAspectRatio;
@@ -2001,7 +2004,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 					if (mPreeditor
 						&& (result = GetEventParameter(event, kEventParamTextInputSendFixLen,
 										typeLongInteger, &param_type, sizeof(fix_len), NULL, &fix_len)) == noErr
-						&& typeLongInteger == param_type 
+						&& typeLongInteger == param_type
 						&& (result = GetEventParameter(event, kEventParamTextInputSendText,
 										typeUnicodeText, &param_type, 0, &text_len, NULL)) == noErr
 						&& typeUnicodeText == param_type)
@@ -2021,7 +2024,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 							mPreeditor->markAsPreedit(location, length);
 						}
 						mPreeditor->resetPreedit();
-						
+
 						// Receive the text from input method.
 						U16 *const text = new U16[text_len / sizeof(U16)];
 						GetEventParameter(event, kEventParamTextInputSendText, typeUnicodeText, NULL, text_len, NULL, text);
@@ -2060,11 +2063,11 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 							GetEventParameter(event, kEventParamTextInputSendHiliteRng, typeTextRangeArray,
 									NULL, text_range_array_size, NULL, text_range_array);
 
-							// WARNING: We assume ranges are in ascending order, 
+							// WARNING: We assume ranges are in ascending order,
 							// although the condition is undocumented.  It seems
 							// OK to assume this.  I also assumed
 							// the ranges are contiguous in previous versions, but I
-							// have heard a rumore that older versions os ATOK may 
+							// have heard a rumore that older versions os ATOK may
 							// return ranges with some _gap_.  I don't know whether
 							// it is true, but I'm preparing my code for the case.
 
@@ -2128,15 +2131,16 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 					}
 				}
 				break;
-				
+
 			case kEventTextInputUnicodeForKeyEvent:
 				{
 					UInt32 modifiers = 0;
 
+
 					// First, process the raw event.
 					{
 						EventRef rawEvent = NULL;
-						
+
 						// Get the original event and extract the modifier keys, so we can ignore command-key events.
 						if (GetEventParameter(event, kEventParamTextInputSendKeyboardEvent, typeEventRef, NULL, sizeof(rawEvent), NULL, &rawEvent) == noErr)
 						{
@@ -2145,7 +2149,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 
 							// and call this function recursively to handle the raw key event.
 							eventHandler (myHandler, rawEvent);
-							
+
 							// save the raw event until we're done processing the unicode input as well.
 							mRawKeyEvent = rawEvent;
 						}
@@ -2176,7 +2180,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 						else
 						{
 							MASK mask = LLWindowMacOSX::modifiersToMask(modifiers);
-							
+
 							llassert( actualType == typeUnicodeText );
 
 							// The result is a UTF16 buffer.  Pass the characters in turn to handleUnicodeChar.
@@ -2202,7 +2206,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 					result = err;
 				}
 				break;
-				
+
 			case kEventTextInputOffsetToPos:
 				{
 					EventParamType param_type;
@@ -2215,7 +2219,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 						S32 preedit, preedit_length;
 						mPreeditor->getPreeditRange(&preedit, &preedit_length);
 						const LLWString & text = mPreeditor->getPreeditString();
-						 
+
 						LLCoordGL caret_coord;
 						LLRect preedit_bounds;
 						if (0 <= offset
@@ -2229,10 +2233,10 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 							qd_point.h = caret_base_coord_screen.mX;
 							qd_point.v = caret_base_coord_screen.mY;
 							SetEventParameter(event, kEventParamTextInputReplyPoint, typeQDPoint, sizeof(qd_point), &qd_point);
-							
+
 							short line_height = (short) preedit_bounds.getHeight();
 							SetEventParameter(event, kEventParamTextInputReplyLineHeight, typeShortInteger, sizeof(line_height), &line_height);
-							
+
 							result = noErr;
 						}
 						else
@@ -2285,7 +2289,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 			case kEventRawKeyRepeat:
 				if (gDebugWindowProc)
 				{
-					printf("key down, key code = 0x%08x, char code = 0x%02x (%c), modifiers = 0x%08x\n", 
+					printf("key down, key code = 0x%08x, char code = 0x%02x (%c), modifiers = 0x%08x\n",
 							(unsigned int)keyCode, charCode, (char)charCode, (unsigned int)modifiers);
 					fflush(stdout);
 				}
@@ -2296,7 +2300,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 			case kEventRawKeyUp:
 				if (gDebugWindowProc)
 				{
-					printf("key up,   key code = 0x%08x, char code = 0x%02x (%c), modifiers = 0x%08x\n", 
+					printf("key up,   key code = 0x%08x, char code = 0x%02x (%c), modifiers = 0x%08x\n",
 							(unsigned int)keyCode, charCode, (char)charCode, (unsigned int)modifiers);
 					fflush(stdout);
 				}
@@ -2354,7 +2358,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 				}
 
 				// When the state of the 'Fn' key (the one that changes some of the mappings on a powerbook/macbook keyboard
-				// to an embedded keypad) changes, it may subsequently cause a key up event to be lost, which may lead to 
+				// to an embedded keypad) changes, it may subsequently cause a key up event to be lost, which may lead to
 				// a movement key getting "stuck" down.  This is bad.
 				// This is an OS bug -- even the GetKeys() API doesn't tell you the key has been released.
 				// This workaround causes all held-down keys to be reset whenever the state of the Fn key changes.  This isn't
@@ -2364,14 +2368,14 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 					if (gDebugWindowProc) printf("Fn key state change event\n");
 					gKeyboard->resetKeys();
 				}
-				
+
 				if (gDebugWindowProc) fflush(stdout);
 
 				mLastModifiers = modifiers;
 				result = eventNotHandledErr;
 				break;
 			}
-			
+
 			mRawKeyEvent = NULL;
 		}
 		break;
@@ -2466,7 +2470,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 					case kEventMouseButtonSecondary:
 						mCallbacks->handleRightMouseDown(this, outCoords, mask);
 						break;
-					
+
 					case kEventMouseButtonTertiary:
 						mCallbacks->handleMiddleMouseDown(this, outCoords, mask);
 						break;
@@ -2528,7 +2532,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 
 	case kEventClassWindow:
 		switch(evtKind)
-		{		
+		{
 		case kEventWindowActivated:
 			if (mTSMDocument)
 			{
@@ -2543,7 +2547,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 			}
 			mCallbacks->handleFocusLost(this);
 			break;
-			
+
 		case kEventWindowBoundsChanging:
 			{
 				// This is where we would constrain move/resize to a particular screen
@@ -2553,7 +2557,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 
 				GetEventParameter(event, kEventParamCurrentBounds, typeQDRectangle, NULL, sizeof(Rect), NULL, &currentBounds);
 				GetEventParameter(event, kEventParamPreviousBounds, typeQDRectangle, NULL, sizeof(Rect), NULL, &previousBounds);
-				
+
 				// Put an offset into window un-maximize operation since the kEventWindowGetIdealSize
 				// event only allows the specification of size and not position.
 				if (mMaximized)
@@ -2561,7 +2565,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 					short leftOffset = mPreviousWindowRect.left - currentBounds.left;
 					currentBounds.left += leftOffset;
 					currentBounds.right += leftOffset;
-					
+
 					short topOffset = mPreviousWindowRect.top - currentBounds.top;
 					currentBounds.top += topOffset;
 					currentBounds.bottom += topOffset;
@@ -2581,7 +2585,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 				{
 					currentBounds.bottom = currentBounds.top + MIN_WINDOW_HEIGHT;
 				}
-				
+
 				SetEventParameter(event, kEventParamCurrentBounds, typeQDRectangle, sizeof(Rect), &currentBounds);
 				result = noErr;
 			}
@@ -2592,38 +2596,38 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 				// Get new window bounds
 				Rect newBounds;
 				GetEventParameter(event, kEventParamCurrentBounds, typeQDRectangle, NULL, sizeof(Rect), NULL, &newBounds);
-				
+
 				// Get previous window bounds
 				Rect oldBounds;
 				GetEventParameter(event, kEventParamPreviousBounds, typeQDRectangle, NULL, sizeof(Rect), NULL, &oldBounds);
-				
+
 				// Determine if the new size is larger than the old
 				bool newBoundsLarger = ((newBounds.right - newBounds.left) >= (oldBounds.right - oldBounds.left));
 				newBoundsLarger &= ((newBounds.bottom - newBounds.top) >= (oldBounds.bottom - oldBounds.top));
-				
+
 				// Check to see if this is a zoom event (+ button on window pane)
 				unsigned int eventParams;
 				GetEventParameter(event, kEventParamAttributes, typeUInt32, NULL, sizeof(int), NULL, &eventParams);
 				bool isZoomEvent = ((eventParams & kWindowBoundsChangeZoom) != 0);
-				
+
 				// Maximized flag is if zoom event and increasing window size
 				mMaximized = (isZoomEvent && newBoundsLarger);
-				
+
 				aglUpdateContext(mContext);
-				
+
 				mCallbacks->handleResize(this, newBounds.right - newBounds.left, newBounds.bottom - newBounds.top);
 			}
 			break;
-			
+
 		case kEventWindowGetIdealSize:
 			// Only recommend a new ideal size when un-maximizing
 			if (mMaximized == TRUE)
 			{
 				Point nonMaximizedSize;
-				
+
 				nonMaximizedSize.v = mPreviousWindowRect.bottom - mPreviousWindowRect.top;
 				nonMaximizedSize.h = mPreviousWindowRect.right - mPreviousWindowRect.left;
-				
+
 				SetEventParameter(event, kEventParamDimensions, typeQDPoint, sizeof(Point), &nonMaximizedSize);
 				result = noErr;
 			}
@@ -2678,7 +2682,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 		if (mPreeditor)
 		{
 			switch(evtKind)
-			{		
+			{
 
 			case kEventTSMDocumentAccessGetLength:
 				{
@@ -2697,14 +2701,14 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 				{
 					// Return the selected range, excluding preedit.
 					// In our preeditor, preedit and selection are exclusive, so,
-					// when it has a preedit, there is no selection and the 
+					// when it has a preedit, there is no selection and the
 					// insertion point is on the preedit that corrupses into the
 					// beginning of the preedit when the preedit was removed.
 
 					S32 preedit, preedit_length;
 					mPreeditor->getPreeditRange(&preedit, &preedit_length);
 					const LLWString & text = mPreeditor->getPreeditString();
-					
+
 					CFRange range;
 					if (preedit_length)
 					{
@@ -2768,7 +2772,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 						memcpy(target_pointer, text_utf16.c_str() + range.location, range.length * sizeof(UniChar));
 
 						// Note that result has already been set above.
-					}					
+					}
 				}
 				break;
 
@@ -2815,7 +2819,7 @@ const char* cursorIDToName(int id)
 		case UI_CURSOR_TOOLPLAY:		return "UI_CURSOR_TOOLPLAY";
 		case UI_CURSOR_TOOLPAUSE:		return "UI_CURSOR_TOOLPAUSE";
 		case UI_CURSOR_TOOLMEDIAOPEN:	return "UI_CURSOR_TOOLMEDIAOPEN";
-		case UI_CURSOR_PIPETTE:			return "UI_CURSOR_PIPETTE";		
+		case UI_CURSOR_PIPETTE:			return "UI_CURSOR_PIPETTE";
 		case UI_CURSOR_TOOLSIT:			return "UI_CURSOR_TOOLSIT";
 		case UI_CURSOR_TOOLBUY:			return "UI_CURSOR_TOOLBUY";
 		case UI_CURSOR_TOOLOPEN:		return "UI_CURSOR_TOOLOPEN";
@@ -2823,7 +2827,7 @@ const char* cursorIDToName(int id)
 	}
 
 	llerrs << "cursorIDToName: unknown cursor id" << id << llendl;
-	
+
 	return "UI_CURSOR_ARROW";
 }
 
@@ -2839,42 +2843,42 @@ static void initPixmapCursor(int cursorid, int hotspotX, int hotspotY)
 	fullpath += gDirUtilp->getDirDelimiter();
 	fullpath += cursorIDToName(cursorid);
 	fullpath += ".tif";
-	
+
 	gCursors[cursorid] = createImageCursor(fullpath.c_str(), hotspotX, hotspotY);
 }
 
-void LLWindowMacOSX::setCursor(ECursorType cursor)
+void LLWindowMacOSX::updateCursor()
 {
 	OSStatus result = noErr;
 
-	if (mDragOverrideCursor != -1) 
+	if (mDragOverrideCursor != -1)
 	{
 		// A drag is in progress...remember the requested cursor and we'll
 		// restore it when it is done
-		mCurrentCursor = cursor;
+		mCurrentCursor = mNextCursor;
 		return;
 	}
 		
-	if (cursor == UI_CURSOR_ARROW
+	if (mNextCursor == UI_CURSOR_ARROW
 		&& mBusyCount > 0)
 	{
-		cursor = UI_CURSOR_WORKING;
+		mNextCursor = UI_CURSOR_WORKING;
 	}
 	
-	if(mCurrentCursor == cursor)
+	if(mCurrentCursor == mNextCursor)
 		return;
 
 	// RN: replace multi-drag cursors with single versions
-	if (cursor == UI_CURSOR_ARROWDRAGMULTI)
+	if (mNextCursor == UI_CURSOR_ARROWDRAGMULTI)
 	{
-		cursor = UI_CURSOR_ARROWDRAG;
+		mNextCursor = UI_CURSOR_ARROWDRAG;
 	}
-	else if (cursor == UI_CURSOR_ARROWCOPYMULTI)
+	else if (mNextCursor == UI_CURSOR_ARROWCOPYMULTI)
 	{
-		cursor = UI_CURSOR_ARROWCOPY;
+		mNextCursor = UI_CURSOR_ARROWCOPY;
 	}
 
-	switch(cursor)
+	switch(mNextCursor)
 	{
 	default:
 	case UI_CURSOR_ARROW:
@@ -2926,7 +2930,7 @@ void LLWindowMacOSX::setCursor(ECursorType cursor)
 	case UI_CURSOR_TOOLBUY:
 	case UI_CURSOR_TOOLOPEN:
 	case UI_CURSOR_TOOLPAY:
-		result = setImageCursor(gCursors[cursor]);
+		result = setImageCursor(gCursors[mNextCursor]);
 		break;
 
 	}
@@ -2936,7 +2940,7 @@ void LLWindowMacOSX::setCursor(ECursorType cursor)
 		InitCursor();
 	}
 
-	mCurrentCursor = cursor;
+	mCurrentCursor = mNextCursor;
 }
 
 ECursorType LLWindowMacOSX::getCursor() const
@@ -2967,9 +2971,9 @@ void LLWindowMacOSX::initCursors()
 	initPixmapCursor(UI_CURSOR_TOOLPLAY, 1, 1);
 	initPixmapCursor(UI_CURSOR_TOOLPAUSE, 1, 1);
 	initPixmapCursor(UI_CURSOR_TOOLMEDIAOPEN, 1, 1);
-	initPixmapCursor(UI_CURSOR_TOOLSIT, 1, 1);
-	initPixmapCursor(UI_CURSOR_TOOLBUY, 1, 1);
-	initPixmapCursor(UI_CURSOR_TOOLOPEN, 1, 1);
+	initPixmapCursor(UI_CURSOR_TOOLSIT, 20, 15);
+	initPixmapCursor(UI_CURSOR_TOOLBUY, 20, 15);
+	initPixmapCursor(UI_CURSOR_TOOLOPEN, 20, 15);
 	initPixmapCursor(UI_CURSOR_TOOLPAY, 1, 1);
 
 	initPixmapCursor(UI_CURSOR_SIZENWSE, 10, 10);
@@ -3281,14 +3285,14 @@ void LLWindowMacOSX::setTitle(const std::string &title)
 LLSD LLWindowMacOSX::getNativeKeyData()
 {
 	LLSD result = LLSD::emptyMap();
-	
+
 	if(mRawKeyEvent)
 	{
 		char char_code = 0;
 		UInt32 key_code = 0;
 		UInt32 modifiers = 0;
 		UInt32 keyboard_type = 0;
-		
+
 		GetEventParameter (mRawKeyEvent, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(char), NULL, &char_code);
 		GetEventParameter (mRawKeyEvent, kEventParamKeyCode, typeUInt32, NULL, sizeof(UInt32), NULL, &key_code);
 		GetEventParameter (mRawKeyEvent, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(UInt32), NULL, &modifiers);
@@ -3298,7 +3302,7 @@ LLSD LLWindowMacOSX::getNativeKeyData()
 		result["key_code"] = (S32)key_code;
 		result["modifiers"] = (S32)modifiers;
 		result["keyboard_type"] = (S32)keyboard_type;
-		
+
 #if 0
 		// This causes trouble for control characters -- apparently character codes less than 32 (escape, control-A, etc)
 		// cause llsd serialization to create XML that the llsd deserializer won't parse!
@@ -3307,7 +3311,7 @@ LLSD LLWindowMacOSX::getNativeKeyData()
 		EventParamType actualType = typeUTF8Text;
 		UInt32 actualSize = 0;
 		char *buffer = NULL;
-		
+
 		err = GetEventParameter (mRawKeyEvent, kEventParamKeyUnicodes, typeUTF8Text, &actualType, 0, &actualSize, NULL);
 		if(err == noErr)
 		{
@@ -3320,7 +3324,7 @@ LLSD LLWindowMacOSX::getNativeKeyData()
 			}
 			delete[] buffer;
 		}
-		
+
 		result["unicode"] = unicode;
 #endif
 
@@ -3328,7 +3332,7 @@ LLSD LLWindowMacOSX::getNativeKeyData()
 
 
 	lldebugs << "native key data is: " << result << llendl;
-	
+
 	return result;
 }
 
@@ -3375,17 +3379,17 @@ void *LLWindowMacOSX::getPlatformWindow()
 
 void *LLWindowMacOSX::getMediaWindow()
 {
-	/* 
-		Mozilla needs to be initialized with a WindowRef to function properly.  
+	/*
+		Mozilla needs to be initialized with a WindowRef to function properly.
 		(There's no good reason for this, since it shouldn't be interacting with our window in any way, but that's another issue.)
-		If we're in windowed mode, we _could_ hand it our actual window pointer, but a subsequent switch to fullscreen will destroy that window, 
+		If we're in windowed mode, we _could_ hand it our actual window pointer, but a subsequent switch to fullscreen will destroy that window,
 		which trips up Mozilla.
 		Instead of using our actual window, we create an invisible window which will persist for the lifetime of the application and pass that to Mozilla.
 		This satisfies its deep-seated need to latch onto a WindowRef and solves the issue with switching between fullscreen and windowed modes.
 
 		Note that we will never destroy this window (by design!), but since only one will ever be created per run of the application, that's okay.
 	*/
-	
+
 	if(sMediaWindow == NULL)
 	{
 		Rect window_rect = {100, 100, 200, 200};
@@ -3394,13 +3398,13 @@ void *LLWindowMacOSX::getMediaWindow()
 			NULL,
 			&window_rect,
 			(ConstStr255Param) "\p",
-			false,				// Create the window invisible.  
+			false,				// Create the window invisible.
 			zoomDocProc,		// Window with a grow box and a zoom box
 			kLastWindowOfClass,		// create it behind other windows
 			false,					// no close box
 			0);
 	}
-	
+
 	return (void*)sMediaWindow;
 }
 
@@ -3450,7 +3454,7 @@ void LLWindowMacOSX::allowLanguageTextInput(LLPreeditor *preeditor, BOOL b)
 	}
 
 	UseInputWindow(mTSMDocument, !b);
-	
+
 	// Take care of old and new preeditors.
 	if (preeditor != mPreeditor || !b)
 	{
@@ -3469,7 +3473,7 @@ void LLWindowMacOSX::allowLanguageTextInput(LLPreeditor *preeditor, BOOL b)
 		return;
 	}
 	mLanguageTextInputAllowed = b;
-	
+
 	if (b)
 	{
 		if (mTSMScriptCode != smRoman)
@@ -3518,7 +3522,7 @@ MASK LLWindowMacOSX::modifiersToMask(SInt16 modifiers)
 	if(modifiers & (cmdKey | controlKey)) { mask |= MASK_CONTROL; }
 	if(modifiers & optionKey) { mask |= MASK_ALT; }
 	return mask;
-}	
+}
 
 #if LL_OS_DRAGDROP_ENABLED
 
@@ -3529,53 +3533,53 @@ OSErr LLWindowMacOSX::dragTrackingHandler(DragTrackingMessage message, WindowRef
 	LLWindowMacOSX *self = (LLWindowMacOSX*)handlerRefCon;
 
 	lldebugs << "drag tracking handler, message = " << message << llendl;
-	
+
 	switch(message)
 	{
 		case kDragTrackingInWindow:
 			result = self->handleDragNDrop(drag, LLWindowCallbacks::DNDA_TRACK);
 		break;
-		
+
 		case kDragTrackingEnterHandler:
 			result = self->handleDragNDrop(drag, LLWindowCallbacks::DNDA_START_TRACKING);
 		break;
-		
+
 		case kDragTrackingLeaveHandler:
 			result = self->handleDragNDrop(drag, LLWindowCallbacks::DNDA_STOP_TRACKING);
 		break;
-		
+
 		default:
 		break;
 	}
-	
+
 	return result;
 }
 
-OSErr LLWindowMacOSX::dragReceiveHandler(WindowRef theWindow, void * handlerRefCon,	
+OSErr LLWindowMacOSX::dragReceiveHandler(WindowRef theWindow, void * handlerRefCon,
 										 DragRef drag)
-{	
+{
 	LLWindowMacOSX *self = (LLWindowMacOSX*)handlerRefCon;
 	return self->handleDragNDrop(drag, LLWindowCallbacks::DNDA_DROPPED);
 
 }
 
 OSErr LLWindowMacOSX::handleDragNDrop(DragRef drag, LLWindowCallbacks::DragNDropAction action)
-{	
+{
 	OSErr result = dragNotAcceptedErr;	// overall function result
 	OSErr err = noErr;	// for local error handling
-	
+
 	// Get the mouse position and modifiers of this drag.
 	SInt16 modifiers, mouseDownModifiers, mouseUpModifiers;
 	::GetDragModifiers(drag, &modifiers, &mouseDownModifiers, &mouseUpModifiers);
 	MASK mask = LLWindowMacOSX::modifiersToMask(modifiers);
-	
+
 	Point mouse_point;
 	// This will return the mouse point in global screen coords
 	::GetDragMouse(drag, &mouse_point, NULL);
 	LLCoordScreen screen_coords(mouse_point.h, mouse_point.v);
 	LLCoordGL gl_pos;
 	convertCoords(screen_coords, &gl_pos);
-	
+
 	// Look at the pasteboard and try to extract an URL from it
 	PasteboardRef   pasteboard;
 	if(GetDragPasteboard(drag, &pasteboard) == noErr)
@@ -3583,22 +3587,22 @@ OSErr LLWindowMacOSX::handleDragNDrop(DragRef drag, LLWindowCallbacks::DragNDrop
 		ItemCount num_items = 0;
 		// Treat an error here as an item count of 0
 		(void)PasteboardGetItemCount(pasteboard, &num_items);
-		
+
 		// Only deal with single-item drags.
 		if(num_items == 1)
 		{
 			PasteboardItemID item_id = NULL;
 			CFArrayRef flavors = NULL;
 			CFDataRef data = NULL;
-			
+
 			err = PasteboardGetItemIdentifier(pasteboard, 1, &item_id); // Yes, this really is 1-based.
-			
+
 			// Try to extract an URL from the pasteboard
 			if(err == noErr)
 			{
 				err = PasteboardCopyItemFlavors( pasteboard, item_id, &flavors);
 			}
-			
+
 			if(err == noErr)
 			{
 				if(CFArrayContainsValue(flavors, CFRangeMake(0, CFArrayGetCount(flavors)), kUTTypeURL))
@@ -3611,9 +3615,9 @@ OSErr LLWindowMacOSX::handleDragNDrop(DragRef drag, LLWindowCallbacks::DragNDrop
 					// This is a string that might be an URL.
 					err = PasteboardCopyItemFlavorData(pasteboard, item_id, kUTTypeUTF8PlainText, &data);
 				}
-				
+
 			}
-			
+
 			if(flavors != NULL)
 			{
 				CFRelease(flavors);
@@ -3624,12 +3628,12 @@ OSErr LLWindowMacOSX::handleDragNDrop(DragRef drag, LLWindowCallbacks::DragNDrop
 				std::string url;
 				url.assign((char*)CFDataGetBytePtr(data), CFDataGetLength(data));
 				CFRelease(data);
-				
+
 				if(!url.empty())
 				{
-					LLWindowCallbacks::DragNDropResult res = 
+					LLWindowCallbacks::DragNDropResult res =
 						mCallbacks->handleDragNDrop(this, gl_pos, mask, action, url);
-					
+
 					switch (res) {
 						case LLWindowCallbacks::DND_NONE:		// No drop allowed
 							if (action == LLWindowCallbacks::DNDA_TRACK)
@@ -3664,7 +3668,7 @@ OSErr LLWindowMacOSX::handleDragNDrop(DragRef drag, LLWindowCallbacks::DragNDrop
 						// Restore the cursor
 						ECursorType temp_cursor = mCurrentCursor;
 						// get around the "setting the same cursor" code in setCursor()
-						mCurrentCursor = UI_CURSOR_COUNT; 
+						mCurrentCursor = UI_CURSOR_COUNT;
  						setCursor(temp_cursor);
 					}
 					else {
@@ -3676,7 +3680,7 @@ OSErr LLWindowMacOSX::handleDragNDrop(DragRef drag, LLWindowCallbacks::DragNDrop
 			}
 		}
 	}
-	
+
 	return result;
 }
 
diff --git a/indra/llwindow/llwindowmacosx.h b/indra/llwindow/llwindowmacosx.h
index 3096a0aec..c3ec80167 100644
--- a/indra/llwindow/llwindowmacosx.h
+++ b/indra/llwindow/llwindowmacosx.h
@@ -73,7 +73,7 @@ public:
 	/*virtual*/ void showCursorFromMouseMove();
 	/*virtual*/ void hideCursorUntilMouseMove();
 	/*virtual*/ BOOL isCursorHidden();
-	/*virtual*/ void setCursor(ECursorType cursor);
+	/*virtual*/ void updateCursor();
 	/*virtual*/ ECursorType getCursor() const;
 	/*virtual*/ void captureMouse();
 	/*virtual*/ void releaseMouse();
diff --git a/indra/llwindow/llwindowmesaheadless.h b/indra/llwindow/llwindowmesaheadless.h
index 06146afde..cb4447232 100644
--- a/indra/llwindow/llwindowmesaheadless.h
+++ b/indra/llwindow/llwindowmesaheadless.h
@@ -65,7 +65,7 @@ public:
 	/*virtual*/ void showCursorFromMouseMove() {};
 	/*virtual*/ void hideCursorUntilMouseMove() {};
 	/*virtual*/ BOOL isCursorHidden() {return FALSE;};
-	/*virtual*/ void setCursor(ECursorType cursor) {};
+	/*virtual*/ void updateCursor() {};
 	//virtual ECursorType getCursor() { return mCurrentCursor; };
 	/*virtual*/ void captureMouse() {};
 	/*virtual*/ void releaseMouse() {};
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index 369b8ad88..7fb5dea03 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -39,6 +39,7 @@
 
 #include "llwindowcallbacks.h"
 #include "llkeyboardsdl.h"
+
 #include "llerror.h"
 #include "llgl.h"
 #include "llstring.h"
@@ -221,15 +222,14 @@ LLWindowSDL::LLWindowSDL(LLWindowCallbacks* callbacks,
 #endif // LL_X11
 
 #if LL_GTK
-	// We MUST be the first to initialize GTK, i.e. we have to beat
-	// our embedded Mozilla to the punch so that GTK doesn't get badly
+	// We MUST be the first to initialize GTK so that GTK doesn't get badly
 	// initialized with a non-C locale and cause lots of serious random
 	// weirdness.
 	ll_try_gtk_init();
 #endif // LL_GTK
 
-	// Get the original aspect ratio of the main device.
-	mOriginalAspectRatio = 1024.0 / 768.0;  // !!! *FIX: ? //(double)CGDisplayPixelsWide(mDisplay) / (double)CGDisplayPixelsHigh(mDisplay);
+	// Assume 4:3 aspect ratio until we know better
+	mOriginalAspectRatio = 1024.0 / 768.0;
 
 	if (title.empty())
 		mWindowTitle = "SDL Window";  // *FIX: (???)
@@ -425,7 +425,6 @@ static int x11_detect_VRAM_kb()
 BOOL LLWindowSDL::createContext(int x, int y, int width, int height, int bits, BOOL fullscreen, BOOL disable_vsync)
 {
 	//bool			glneedsinit = false;
-//    const char *gllibname = null;
 
 	llinfos << "createContext, fullscreen=" << fullscreen <<
 	    " size=" << width << "x" << height << llendl;
@@ -856,11 +855,13 @@ void LLWindowSDL::hide()
     // *FIX: What to do with SDL?
 }
 
+//virtual
 void LLWindowSDL::minimize()
 {
     // *FIX: What to do with SDL?
 }
 
+//virtual
 void LLWindowSDL::restore()
 {
     // *FIX: What to do with SDL?
@@ -1680,12 +1681,13 @@ void check_vm_bloat()
 	}
 #endif // LL_LINUX
 }
+
+
 // virtual
 void LLWindowSDL::processMiscNativeEvents()
 {
 #if LL_GTK
 	// Pump GTK events to avoid starvation for:
-	// * Embedded Gecko
 	// * DBUS servicing
 	// * Anything else which quietly hooks into the default glib/GTK loop
     if (ll_try_gtk_init())
@@ -1721,7 +1723,7 @@ void LLWindowSDL::processMiscNativeEvents()
 
 void LLWindowSDL::gatherInput()
 {
-	const Uint32 CLICK_THRESHOLD = 500;  // milliseconds
+    const Uint32 CLICK_THRESHOLD = 500;  // milliseconds
     static int leftClick = 0;
     static int rightClick = 0;
     static Uint32 lastLeftDown = 0;
@@ -1747,16 +1749,17 @@ void LLWindowSDL::gatherInput()
 		    mKeyScanCode = event.key.keysym.scancode;
 		    mKeyVirtualKey = event.key.keysym.unicode;
 		    mKeyModifiers = event.key.keysym.mod;
-                gKeyboard->handleKeyDown(event.key.keysym.sym, event.key.keysym.mod);
-		// part of the fix for SL-13243
-		if (SDLCheckGrabbyKeys(event.key.keysym.sym, TRUE) != 0)
-			SDLReallyCaptureInput(TRUE);
 
-                if (event.key.keysym.unicode)
-				{
-					handleUnicodeUTF16(event.key.keysym.unicode,
-									   gKeyboard->currentMask(FALSE));
-				}
+		    gKeyboard->handleKeyDown(event.key.keysym.sym, event.key.keysym.mod);
+		    // part of the fix for SL-13243
+		    if (SDLCheckGrabbyKeys(event.key.keysym.sym, TRUE) != 0)
+			    SDLReallyCaptureInput(TRUE);
+
+		    if (event.key.keysym.unicode)
+		    {
+			    handleUnicodeUTF16(event.key.keysym.unicode,
+					       gKeyboard->currentMask(FALSE));
+		    }
                 break;
 
             case SDL_KEYUP:
@@ -1767,8 +1770,8 @@ void LLWindowSDL::gatherInput()
 		    if (SDLCheckGrabbyKeys(event.key.keysym.sym, FALSE) == 0)
 			    SDLReallyCaptureInput(FALSE); // part of the fix for SL-13243
 
-		gKeyboard->handleKeyUp(event.key.keysym.sym, event.key.keysym.mod);
-                break;
+		    gKeyboard->handleKeyUp(event.key.keysym.sym, event.key.keysym.mod);
+		    break;
 
             case SDL_MOUSEBUTTONDOWN:
             {
@@ -1878,7 +1881,7 @@ void LLWindowSDL::gatherInput()
     			}
                 break;
 		}
-		
+
 		mCallbacks->handleResize(this, width, height);
                 break;
             }
@@ -1932,6 +1935,8 @@ void LLWindowSDL::gatherInput()
 		break;
         }
     }
+	
+	updateCursor();
 
 #if LL_X11
     // This is a good time to stop flashing the icon if our mFlashTimer has
@@ -2018,7 +2023,7 @@ static SDL_Cursor *makeSDLCursorFromBMP(const char *filename, int hotx, int hoty
 	return sdlcursor;
 }
 
-void LLWindowSDL::setCursor(ECursorType cursor)
+void LLWindowSDL::updateCursor()
 {
 	if (ATIbug) {
 		// cursor-updating is very flaky when this bug is
@@ -2026,11 +2031,11 @@ void LLWindowSDL::setCursor(ECursorType cursor)
 		return;
 	}
 
-	if (mCurrentCursor != cursor)
+	if (mCurrentCursor != mNextCursor)
 	{
-		if (cursor < UI_CURSOR_COUNT)
+		if (mNextCursor < UI_CURSOR_COUNT)
 		{
-			SDL_Cursor *sdlcursor = mSDLCursors[cursor];
+			SDL_Cursor *sdlcursor = mSDLCursors[mNextCursor];
 			// Try to default to the arrow for any cursors that
 			// did not load correctly.
 			if (!sdlcursor && mSDLCursors[UI_CURSOR_ARROW])
@@ -2038,9 +2043,9 @@ void LLWindowSDL::setCursor(ECursorType cursor)
 			if (sdlcursor)
 				SDL_SetCursor(sdlcursor);
 		} else {
-			llwarns << "Tried to set invalid cursor number " << cursor << llendl;
+			llwarns << "Tried to set invalid cursor number " << mNextCursor << llendl;
 		}
-		mCurrentCursor = cursor;
+		mCurrentCursor = mNextCursor;
 	}
 }
 
diff --git a/indra/llwindow/llwindowsdl.h b/indra/llwindow/llwindowsdl.h
index 4fbe89b5e..f9dba726d 100644
--- a/indra/llwindow/llwindowsdl.h
+++ b/indra/llwindow/llwindowsdl.h
@@ -78,7 +78,7 @@ public:
 	/*virtual*/ void showCursorFromMouseMove();
 	/*virtual*/ void hideCursorUntilMouseMove();
 	/*virtual*/ BOOL isCursorHidden();
-	/*virtual*/ void setCursor(ECursorType cursor);
+	/*virtual*/ void updateCursor();
 	/*virtual*/ void captureMouse();
 	/*virtual*/ void releaseMouse();
 	/*virtual*/ void setMouseClipping( BOOL b );
@@ -102,7 +102,7 @@ public:
 	/*virtual*/ void gatherInput();
 	/*virtual*/ void swapBuffers();
 
-    /*virtual*/ void delayInputProcessing() { };
+	/*virtual*/ void delayInputProcessing() { };
 
 	// handy coordinate space conversion routines
 	/*virtual*/ BOOL convertCoords(LLCoordScreen from, LLCoordWindow *to);
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp
index 9b4c297ce..cfd3d76ea 100644
--- a/indra/llwindow/llwindowwin32.cpp
+++ b/indra/llwindow/llwindowwin32.cpp
@@ -677,6 +677,7 @@ void LLWindowWin32::hide()
 	ShowWindow(mWindowHandle, SW_HIDE);
 }
 
+//virtual
 void LLWindowWin32::minimize()
 {
 	setMouseClipping(FALSE);
@@ -684,7 +685,7 @@ void LLWindowWin32::minimize()
 	ShowWindow(mWindowHandle, SW_MINIMIZE);
 }
 
-
+//virtual
 void LLWindowWin32::restore()
 {
 	ShowWindow(mWindowHandle, SW_RESTORE);
@@ -1019,6 +1020,7 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
 		dw_style = WS_OVERLAPPEDWINDOW;
 	}
 
+
 	// don't post quit messages when destroying old windows
 	mPostQuit = FALSE;
 
@@ -1070,6 +1072,8 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
 		return FALSE;
 	}
 
+	LL_INFOS("Window") << "Device context retrieved." << llendl ;
+
 	if (!(pixel_format = ChoosePixelFormat(mhDC, &pfd)))
 	{
 		close();
@@ -1078,6 +1082,8 @@ BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BO
 		return FALSE;
 	}
 
+	LL_INFOS("Window") << "Pixel format chosen." << llendl ;
+
 	// Verify what pixel format we actually received.
 	if (!DescribePixelFormat(mhDC, pixel_format, sizeof(PIXELFORMATDESCRIPTOR),
 		&pfd))
@@ -1653,13 +1659,13 @@ void LLWindowWin32::initCursors()
 	mCursor[ UI_CURSOR_PIPETTE ] = LoadCursor(module, TEXT("TOOLPIPETTE"));
 
 	// Color cursors
-	mCursor[UI_CURSOR_TOOLSIT] = loadColorCursor(TEXT("TOOLSIT"));
-	mCursor[UI_CURSOR_TOOLBUY] = loadColorCursor(TEXT("TOOLBUY"));
-	mCursor[UI_CURSOR_TOOLPAY] = loadColorCursor(TEXT("TOOLPAY"));
-	mCursor[UI_CURSOR_TOOLOPEN] = loadColorCursor(TEXT("TOOLOPEN"));
-	mCursor[UI_CURSOR_TOOLPLAY] = loadColorCursor(TEXT("TOOLPLAY"));
-	mCursor[UI_CURSOR_TOOLPAUSE] = loadColorCursor(TEXT("TOOLPAUSE"));
-	mCursor[UI_CURSOR_TOOLMEDIAOPEN] = loadColorCursor(TEXT("TOOLMEDIAOPEN"));
+	mCursor[ UI_CURSOR_TOOLSIT ] = loadColorCursor(TEXT("TOOLSIT"));
+	mCursor[ UI_CURSOR_TOOLBUY ] = loadColorCursor(TEXT("TOOLBUY"));
+	mCursor[ UI_CURSOR_TOOLPAY ] = loadColorCursor(TEXT("TOOLPAY"));
+	mCursor[ UI_CURSOR_TOOLOPEN ] = loadColorCursor(TEXT("TOOLOPEN"));
+	mCursor[ UI_CURSOR_TOOLPLAY ] = loadColorCursor(TEXT("TOOLPLAY"));
+	mCursor[ UI_CURSOR_TOOLPAUSE ] = loadColorCursor(TEXT("TOOLPAUSE"));
+	mCursor[ UI_CURSOR_TOOLMEDIAOPEN ] = loadColorCursor(TEXT("TOOLMEDIAOPEN"));
 
 	// Note: custom cursors that are not found make LoadCursor() return NULL.
 	for( S32 i = 0; i < UI_CURSOR_COUNT; i++ )
@@ -1673,18 +1679,18 @@ void LLWindowWin32::initCursors()
 
 
 
-void LLWindowWin32::setCursor(ECursorType cursor)
+void LLWindowWin32::updateCursor()
 {
-	if (cursor == UI_CURSOR_ARROW
+	if (mNextCursor == UI_CURSOR_ARROW
 		&& mBusyCount > 0)
 	{
-		cursor = UI_CURSOR_WORKING;
+		mNextCursor = UI_CURSOR_WORKING;
 	}
 
-	if( mCurrentCursor != cursor )
+	if( mCurrentCursor != mNextCursor )
 	{
-		mCurrentCursor = cursor;
-		SetCursor( mCursor[cursor] );
+		mCurrentCursor = mNextCursor;
+		SetCursor( mCursor[mNextCursor] );
 	}
 }
 
@@ -1764,6 +1770,8 @@ void LLWindowWin32::gatherInput()
 
 	mInputProcessingPaused = FALSE;
 
+	updateCursor();
+
 	// clear this once we've processed all mouse messages that might have occurred after
 	// we slammed the mouse position
 	mMousePositionModified = FALSE;
diff --git a/indra/llwindow/llwindowwin32.h b/indra/llwindow/llwindowwin32.h
index fefe5d308..63912592f 100644
--- a/indra/llwindow/llwindowwin32.h
+++ b/indra/llwindow/llwindowwin32.h
@@ -72,7 +72,7 @@ public:
 	/*virtual*/ void showCursorFromMouseMove();
 	/*virtual*/ void hideCursorUntilMouseMove();
 	/*virtual*/ BOOL isCursorHidden();
-	/*virtual*/ void setCursor(ECursorType cursor);
+	/*virtual*/ void updateCursor();
 	/*virtual*/ ECursorType getCursor() const;
 	/*virtual*/ void captureMouse();
 	/*virtual*/ void releaseMouse();
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index bd27204b6..63b27b693 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1372,23 +1372,28 @@ if (FMOD OR FMODEX)
   endif (FMOD)
 
   if (DARWIN)
-    set(fmodwrapper_SOURCE_FILES fmodwrapper.cpp)
-    add_library(fmodwrapper SHARED ${fmodwrapper_SOURCE_FILES})
-    if (FMODEX)
-      set(fmodwrapper_needed_LIBRARIES ${FMODEX_LIBRARY} ${CARBON_LIBRARY})
-    endif (FMODEX)
-    if (FMOD)
-      set(fmodwrapper_needed_LIBRARIES ${FMOD_LIBRARY} ${CARBON_LIBRARY})
-    endif (FMOD)
-    set_target_properties(
-      fmodwrapper
-      PROPERTIES
-      BUILD_WITH_INSTALL_RPATH 1
-      INSTALL_NAME_DIR "@executable_path/../Resources"
-      LINK_FLAGS "-unexported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/fmod_hidden_symbols.exp"
-      )
-    set(FMODWRAPPER_LIBRARY fmodwrapper)
-    target_link_libraries(fmodwrapper ${fmodwrapper_needed_LIBRARIES})
+    if(FMOD)
+      set(fmodwrapper_SOURCE_FILES fmodwrapper.cpp)
+      add_library(fmodwrapper SHARED ${fmodwrapper_SOURCE_FILES})
+      if (FMODEX)
+        set(fmodwrapper_needed_LIBRARIES ${FMODEX_LIBRARY} ${CARBON_LIBRARY})
+      endif (FMODEX)
+      if (FMOD)
+        set(fmodwrapper_needed_LIBRARIES ${FMOD_LIBRARY} ${CARBON_LIBRARY})
+      endif (FMOD)
+      set_target_properties(
+        fmodwrapper
+        PROPERTIES
+        BUILD_WITH_INSTALL_RPATH 1
+        INSTALL_NAME_DIR "@executable_path/../Resources"
+        LINK_FLAGS "-unexported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/fmod_hidden_symbols.exp"
+        )
+      set(FMODWRAPPER_LIBRARY fmodwrapper)
+      target_link_libraries(fmodwrapper ${fmodwrapper_needed_LIBRARIES})
+    endif(FMOD)
+    if(FMODEX)
+      set(FMODWRAPPER_LIBRARY ${FMODEX_LIBRARY})
+    endif(FMODEX)
   else (DARWIN)
     # fmodwrapper unnecessary on linux or windows, for fmod and fmodex
     if (FMODEX)
@@ -1798,7 +1803,7 @@ endif (WINDOWS)
 if (DARWIN)
 # Don't do this here -- it's taken care of by viewer_manifest.py
 #  add_custom_command(TARGET ${VIEWER_BINARY_NAME} POST_BUILD
-#    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin/
-#    DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib
+#    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib/release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin/
+#    DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib/release/libllqtwebkit.dylib
 #  )
 endif (DARWIN)
diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif
index 39d89987aaa1677c04ae02ff908de03373fae363..f366026c33150b9ee191c02e133d804ef17ce1c2 100644
GIT binary patch
literal 59044
zcmeHw2Ygev_OPz)*x5TFKmZd)7#ZG+EXU4*goGrJK*MnCo5bJ|JV+RYFv~2Xlmev?
zM%gWNFv}hVUU{rC%4!1?%7zv~DNyoB*LLEB;l79c|9=1PyH2j|(b3V7bdGecq<bZ0
zWq~dL0Cx}uUIH3~FnA${O5B(b#_V7U0Yf@02BTW>ZqP@!!W0Mx*!a}=Vu4mXWQc`W
zVH7*m3M2l_Z1nWOSPKBTq2w_E*0LT>z{2hLbh5%IEjEBIXbquMj6=Y|5LRLFb~L#S
zaVa|x@9(Zbn#%Ft0S1f<uboAcG7vtr7{aO#)VBQGsQkc)!oAZ0`0;y4i{xba^L$YS
zK%_sg-lZyiG0w~>)0_0hGJQEymd9geDU@m*@&gWw&62RV5|)U`=1Ev$2}=m#5-ZCU
z$|1OkS&Wyeb@34ozS|waRIB163iw&9ta2G%rcNJW!1G4*%vX*Wq7<tl5)(Y*DkYWL
zaxHFBFe|khol#O5AE7{LOCXHUu@Ovy#55#6!jh@NtQ@9HZ@`(n7)}f)TFDY{nS5>x
zm(LM!cu`CaizSL>31hjeXtqeg;!AjJru7$*;0d8PgQ`T5D^Im12z~JpWhPU(BsR99
zq9Ue(8>2Ur#<Im?aV(1y%i%;rifH3-ok>v{tuwZ>FtPEG<3^=HU2anAbxg!pQLHzc
z;v*tZLiImu$+YG53F(Y6L@8sGdTnf_qCA!z!-}ov3?s%tsYql7Tw&51^7VR6!dn#*
z7u%G)A^iqUxLjev6OitrS)6FLAfL^V@Hi4aKbi#v#j;~!p=`n<3u;59Fe&V~aAC}R
zTMe-1(ulSxAH7OlGW;KLX`r<7h>Jx+wi7y`Q6#S>ct^@mDeHAnZZ>ELm8+DoxCYna
zI+GFVgWXskDy5`EZ_p}C32LpP6puBjOG@Hm8?esKAXI2pR(&2{TVJ%=*w@uFqbX$=
ztb*1m{o0tu{Nd$zY%Xrpn+-}lWf&}SyVtYI#T#13KVSvP8ybkU8fRrmGIU0hLZ`$t
z<O#4`F>19+lEUIkWkP|FmCRuYL~OR0lgvs<mC0GjEU{1^7ZA0van#232!_e^N;6WI
zm8}Z0P35vVTpo+Vl3Ce`d9oB?s+=tqvc;(^zKyM2)K}PM8`RK%DKvI8DA)f9``55|
zC7E=!5jO7Owi;})7DPSH!-qD;+A6q4P1Nghg~5m;6~;%{bZBooESyjrqAExfN@SiA
zl*pRks<_xj*oJI1ji!E8X^y39;cXZ7&HO9MaNXOik%bjO^=2kUeTk_;VZf!OupT%v
zk`|7Qqcml0u`n973lv~f40}iM^Bh&~cN9NY!mfW9{NE9OL#<VoDRiZ{Dk0WZVQq;2
zO&a6#lG#G8h|OWY$sE0l#<&tbe0=k44_;DZx`cObV|<~DHO7~41*FD?nQV`xch{K6
z<r-_~B9m>*8Es7LVvPwTY!2DRoY=-vg~C)eTgYPxEzdELT*gjL=BKiya_DlTwrBKz
z*YV>?;7FarCN<_vjfq^VF)mlaA$uNhr0ullSgP2?8skZLVzP}nQ)5yWYm6`9kmE6@
zwy|UvYYg^0L}VLtW*d{aTw^@)Ip)+h2IpH{*;nL>;adx`jXAT8rMgyQJlOL<uZoD5
zOymgK2_tCuj+5oeHpYWJ4|0~unN|_LluAw(@ZkF`*NmW{#>iPJ^ybrP<1sGZ#TtX3
zO^`hgr)o^#a*dHz(Yb95zW;ZnRphfJ@H-%~=ix-FC~~pJU|*5!c{tT7ie0QR0ohly
z3~H<&+Pw1{O|I0%8WT$RWE*p88%uVv#zYeI)h0QDc3$sZ=6a2hbN5bdV{q*3(!Qcd
z!WEKj%$XzT6jy4D4^5(kOMW%r%r?drNmKYz7N3>sidibCF%GFQ=k^uZVwY=-PrlJ~
zY8#WfSYv2i7Wo`=;&Y6h>~f8f-vm2#UXd+xvBt>Zvr|o?+|}xmkRN$Cw}GX&Tw{Fl
zBM+yxu~gS<j2u2YQ)3*KYc<AUk&DNiI~e1zU92&<OoE(LbZQ&pxK?9aj)YB4Q8`m%
zaGL;LDpw|BTbI;2cPSEFoyj5Fm~*XSGTX%(BbOpI-s$0;UqB~wT&po2OTr<isGMpQ
zxh~ci+!}%$k2zOkVzHbj6|r5iq*fr|!nZBtNB2(E7|-PzBNstCb(Sib?{bZC$?=#|
z+nB($8sot|bI4gLXKIWG7eTX9*kZPI$2I4U#{}?eV7R*^`8v~yuQPdY5wuG+CL}*r
zbnXb62NyxRRAcbNQnHOX)hfzet}(KA@6^5`4=!7GWgFv@-)}p$fx$KFu2q+WO`1e!
zYK+fvvBo$O7Wr9@Q#HnRvBt<rMJG?(^Eocp7>~4yPHkgcmurk%>*v&tBA@4CjR_=t
z@{<8)wlSVe%$23cxNNyAR<%HN!QnIcs>P`qle<`BVsfpYlc%UsT&XdkgaucQk*`{u
z+Qw2{tTA{p6geJqrpEXj*J_MIPEk2iT`WN|pU3AW+YbM5?wc{8gaZ%%Aiv3Rrp8{`
z=3dB7l?qvWF8tn<BjpL-ZJT?zhlhyVg4?;>j?|{x+&fug95(s=wsSQm7Kwx+mQ=<P
zSqEdz))*X&k=rUd(<+L^uGARZ1(Qu~UFzgECUvdG*zhYVvajgWHkRTtjS2JFXctU)
zOfUHrl@q_BVzC=<!Tst1rj|DSpB{;1Ia8M_;ljQm*~XmN##kKJY78F6$R^vEGc_iM
zn^C>}kl=S|V{m>74x-7vqEj`N>SB$dv*yX?Si^Hnsn-p|4gblx&hYeTg%&sA24g~r
zL9b;h%F8usr2?H19Xm{?vK~xdUZywcjb-|Brb*AVKl0qt;_R6G51z-X!VT*G<P2rI
zT-M8p`M<5u@4TAR@losVXhr`YYLk}ZzZ)OGZaXvn)dSn(;JNVV9C}N&Ohv89pem8T
zYUkj5cKF#(E?y$B>l>mI=GE{3d-*>wpiQDSYJgVGD!tOIg-4=i$P@ng+4Yu8*+qRF
zXT3pPs@5qq^8Y@C*RW_v$tG<(q1w)3w<t%B8<hriIdP`FHCh~!x*eX-f}&V&HpNFo
zG_Zz;i&ttjI-|s-E-8tRC^MPLC9$zOqt)ao_1ahz63dQZ#YWf?MJJLYtR&l@h5{w*
zWCA;mplpO|NXJ57n2Q_r8Z(hkxW*IyV%f;GMzs%a8ny4+quK{IjoJ{iw@z(J;8;^@
zf^HhCCoI-5T&^y~jW7;h5XIpO;U$8XIEo|SL~(>XctM<q7scnY;Khb8#EZC59I+sZ
z%VI}y*&=v}qu^^Q7|ww>$VbS67o-&;KOcs}i_7D3x=BS+nTW&VO64qBicl`%O8HWL
zih!5O7fSgep2(W<MmcMm?F_A=6faP#Ol1jNTS@J3uO-jKb)~P+Tais8B&$uv9Ndtn
z(3Wd(y9$Bo1gdh4?F7Wy0yOFbSO7!<p$4x1V-&A9V?;H6Q<*H4R;JgM8*rl$b_Npo
zRu$Oe8p>j!&q3V;*qbn@l^HtNr+|^IO~j^;H&Zm_Wf3zHc#gUf*Cg<)={LnUjhCZQ
z=oAK-URR<nH5(c?(AR}o<2%io;Fan(SQ8ZTsx?7a2~osCxf&X2LfEMOzBa(Fv<=~X
z-xSd<plL*zUZXeUl`E7uGG7EQJ5*EZM(vI(5D9ouJeF9%B3#(kg=~(+<q#N)%Y}G8
z+d{*OLa~H|3+)1I^AH1Fh~bI&EW(900m9HCKo{B&As1R0<U)GrijgaVl+Z<KaiP6I
zE=q+9?GSQdT<8*Up%vn>c`y{YFt^aPV1xuLLarF*6S@SAm=9qg2jPX#VnG+$H6B|G
zc_J6Zg%jU|i)h3mL?adxG-5UZBW_}Xn^=re6caqfC?^~iTMz|pUlg>LQGzI8lqgCZ
z1x3SVN3l6kY;F{r7X@u0Bw`DrpyA{|T4+w8HHC(j4{a_qnb5jIquEU^fG?8eJT_m-
zm5SMXxgeP(kg<5s)bhD0d>%Y}n^0yWjXArH*AE9?|JbY#ezmsO2T6$9mZewW3Ea5Y
z*P-p|U_)?*OqOHNm#CouHs+=!Gc!_T0=8Hnh~~t=YW!Ndw-(;g>~rO*37)X4A%VRk
zXucG$7-@^CcCy=0KqoV{XGbPtFAaw<DK3X1vL_(LWiJhfFexsFBC;nS#bqxIhcGEF
zha$2kAjM@b4Tmr(E{7trCm_XTFAaw<DK3X1vL_(LWiJhfFexsFBC;nS#bqxIhcGEF
zha$2kAjM@b4Tmr(E{7trCm_XTFAaw<DK3X1vL_(LWiJhfFexsFBC;nS#bqxIhcGEF
zha$2kAjM@b4Tmr(E{7trCm_XTFAaw<DK3X1vL_(LWiJhfFexsFBC;nS#bqxIhcGEF
zha$2kAjM@b4Tmr(E{7trCm_XTFAaw<DK3X1vL_(LWiJhfFexsFBC;nS#bqxIhcGEF
zha$2kAjM@b4Ttbs#pM~7SP9pP48cuIT&IeUsE9~R0O1q>;6D&0XJpZ65CDMD2-ktY
z`QQA#=uzz6u%*jJmVR+ib!I!Fr{1%KfpmDs;GgwQ@ajl}`4TSSBvx5cq24FFKHm8T
zh0X{UR^mG4a7+3jL`ZAs`ha|301BW3Mo<p#27p6Y35HvFJRm3`_qsX)0zidXc<>2-
z0Ccg}gtj6=iE<LT^r`pvBmB+l{jG@-J|g@cgbN)@8j=2l-xH-k{4j#HmVnbiY)J_W
z(Lk4O3AJLDE?8KP;lL0K^n<RA2IU(A(G3`a=TqnhPy(==ulrGNqTtts)YZL97$FP9
zny4Iv4^@%|AB*r|R+*z*qmm$bloHhL1O~|o;wVX$%Ua8jegSCEK?~%iJb@01WsQSy
zI<rOtZ&Y}>7b}c-Pq@fEKcz4q`rSZpSTk@~FVK$;*M;g-#_Zz3O6ap{C0A);Lm!b&
zK3w#!(d$YPG5TfVB_?}+GF<Uy^)pd;ZfTh<9Qo-+xSSq0_R(Y-p$}`6jvEmM(Sh({
z5S|RV9dAadL2oW^grZwk%i=n-7RK>T$wS=XT2#0Q7y5k^W|KY**Wqy88?J%~kUzW}
zw-S3=h!F;bWN1s7@aF3BQ_TjARq$5fBGoj;WEo3s%CXSU6&h2%qO=i}uM&sx@JdsL
zF+D#kvska!AYykLx)HHQncgr$s!^BftcCZp6h7UChA|l`yhLHvm>}qZHcfa9c^@0P
zF}YW9DY1IVPPhRU{>f?e0Wb>asn;P{dzkd)*=Caww^a-j=Ba@d=@qPZvEBqL)GK%|
zsN%9F<V0)fgm?jOcu^7`60pUV1rso;!IoBqC;-u}k<^&hYmg->^(Y7fSlv%`HNd}n
zYDOx+V3SQpHo5K|@Rq9d#rQy37Nocjd<h>=RY49|-9<0~c)Pp1d$@ahcz6eRd3pte
z_<4K#g@gqKg#-nK1$Yxb>&@b6>S8`#UOv7){=UBc!M?t}!N~CqwnPc|Ck*QLfB<(`
zBqkM$0F(fX8i3VZhK-j}cK}O-xpc#bAIvcNQDNa|Zghsbho={O@H7s@0EKD`^amIX
zqf%%THwN9^jq1&XfdN!n+d#IPw3i|%V(3^7J$Uxguaeuf56RtI%;g!zos=;;%*lIr
z<#(l#AG+-8@g3zK<*QQmEjJ08o$7rR|Kpnp`+qcFdz2bEcg4hSKR$5!*T<i4I(X)K
zZJ&~1ljg15{QcP*PlRa&r4=81vTDnrbHDu=04NlgTN;rk2HlNMWT7oPkOp%wG$P22
zGj?_`%E8{;lMlJ=i?0~Q&5`AWD2=?|JJ3-E7#;chPQgqpZ>CD=EimC%>$C9Y97Hx`
zq3#0krV?oefJAWd*{#}hk<B{)9l1iZ`S#<(JFCTeW`B2T-7W2fbED@R+&}u#?U$?8
zJ-IY9@6W#r?$?3D(bqTCj=J<<L*LAAgNA;?>UPLfwAwU1;hU3>Qns~<?Qrn%PbW8h
zzImf8Wr66JG3uhW<*s=L=GN}ceYyR*>iU-DwH3{Z{^*->AN%ss$rlIfK-%SdPZIw+
zp7&Gj<qe(gh<2tuxe=MO_RiORpPblxyHCGoiG`1EHjC5$J>cS)w232sc{cFI{GEmV
zW{=KwCwA68xINE2{K1{~+l!{{Jny~!p0R(+{>sraHy=M<Bs<>QJfn8>$z9(>8z;{B
z<+|VH0Wa1qUQ+d2v+%)N+8q1od>xPk=It@*rktiH_BnKWfnvPi{%6Bt^M>r~evk6!
zuYF#OEIKC~xxVCh_wVaKO`p@XJ13qol*b-eb#MCZ`F%fW(Y2C#MmeLRl>MY{o_gJn
z&x2ThFP>Bf21eY8*Y`N}xonN{x@k*z>Xm_~pW)}c7p^@NHRR@|dBRBDoq>7%XJ~ib
z+g(!!GU@>1)<;Vp_YpkX@H~G0nVhpz*KFH+-|zA5gYWM;Qu=t*;I4IGOC31Xw)>d6
z^Mq|^OH}yY(1lN10Q`UysDK_6!-pRe<bW~=o8V<6pmInN<bZ++WFQal5JSSs_*Fv?
zxNX+z%aIvHPg|4_`Z3@It4_VYzNZ2480vK(qNYC^l4c`#(;Y=b#N<WFfUE=mf7Ssz
z<AEWQ)X@9)%~u#oaZ?^{GO2Z?sNapO5y&!`WR3dYo|Z-Oz03;KS4P$gBx{(Bdi!Yx
zT_b<4s&RO}L1(meMLp57^i;h;3p?MI{<&vrJqGf2%jucMK{@qQqs=iiaPI{bii^_q
z*6FhpCKFC{A8ia<n(T(Ta<!=pH%K+5a0Fl~gBwK<BLKf9XvE9f>kNBMY%Lt@)OSMB
zGs15vib0>Eg`HCfG{}%<9YLWUWGL!zC&S@C8jt8yHn}#ErHvkqNrM__iSi_C%(!(}
zgBojali)N19HQ8T2Q~@M#Z`8pO=IW59Y$>2(Zk0sabokA9EGW@(byokw-F~oq{fDX
z>h*w%`ql!5!ZbppnhM2mqg17mYD`iS-0!5=Y{G47^Qp(k;K<XObyT~&Wg5K^m%?F;
zqLipL5C_~-bV|Jn)>A7X!UdvwlcyL4v2V?bC#3b2>C1;VE(j7sbGg~FksFS9q2X^b
zUIsbp4c2rJQE0kJtFeWnja}e)MQ5@NR_RtsiuE4m;Ep5{NJuu%TwJ2p!2Q|mhTROH
z23j~BQwn<@s7V44fI?BKaFdo|wMK0k{@NOaB<IsWnx#<Ml;zui?cFn@&?bL7z6ENX
zN?%bg>mWF;DmR<5;HXax_wYd_uMZ2e$oq}b@UY3vdJneVZPE#{`fXBsleCbOni0eH
zHzs9c0jw--ti!GTS6Cxq+G=&Z?CZq=Lo(q6MoJ|#OK5kQ`Xc+M=`-O*Pc{{3h#Cxe
z0e?b^S&H&Zy=5yvYr<$E$J-W$M!!}(isP4|Q)<jA#0_mVMkIpjSfCZ(4>v#)XMhtG
z^+EIuoeGj7Cf1IgSEgErr|3{~Fj{#d^?O<LR%jdeqx1rMne`^rnCe?wJ>LLgUmJrl
zMO$tfE`!qsHeM*6Ef7uxs7L7G7G4@_LdeqjS!1GsKimb;KFB-IG#pkJi+#5%w@<#D
z*mEi!M<aA=04g{Gw(=$hfDTn5%geLXUu20gVc}7+>a}B2TWA*Ch(x6@DJ*4ws~td-
zUtZ7}$;?JLd61E7<H3Nql){WuTY_}xFU-oZd4nw8JiXbVBpO5S+zeZo7h$<`^l*M@
zxLu)qZMkX`g6f4|0emjuS!$hHtI*gb5=!79B43}UR^dv8p;5DAKvAPgSuauIsk96-
zgr-qz<W;~sWbd60YlfZzpHEty$$)l#DeT*i$v6hXJmBmhoUKzRjpbQ+sre`(+!cn2
zwueEm^#?Wb<g8^h@?&&*4wGpM_=ooZWw`-9A+a1t&sD)q=O8=*!kP*b8v9@mAsk#h
z1i=(klY$K}gAfiwaH$23B4{jd5`tA)oeI*RJeRAqDg+;Z@Z@1;G<!$Qgz%(cY8=Xd
zdK$v*HD;|E!f0kUSc@y58Kt3lo%SYNSq5PiguM;<xiSdHLGgK)+QG$kunA71L0W(w
z9mK>Evy-wj6K+@}Vy5F28rW}&&Vi46g+aw6jDrr&om<L`Vu8R{w%#Go7U!*jc64t8
zk!~&Fk9rY0!$OZX;2L5!;PkM@h~O+bbyfqecmV)gCIS$4p#j&v8rIYa0Bk;PSDsK*
zU#$E8Ra8{OsBvWs5@`L;AwfOmn*qD@Vo-YZ+ZHk9mU&1fs?|!kEtlEAgzq+#I5WCw
zCH}7?+GWcwA5n1YNF2RG!I^zvErUiEsv8<#v`HaTt!uQok{yTtGMXI+1X}7f1cFw)
z1i=GifdBDeK)rVq(1N@GwP-O6!Rqyv>Cp#HSO8Ga<~K{dhcFB$+(r&%CiGH_YGQ61
z$a3?UO0!{@g@lG~Zom^xgam`;pfzX*I>EOl93TYUKoUp+-9a{dchnaQfNzV+U}wbu
zD!?c(7EA)uz%1}FSO}JY6<`hc5_}D|fE{2j_#XTKPJlDuBB%k^!5#1rJOR()Y$F5n
z!Gf^nSR1SZ))nJmA}j$*!7{O2tS>eQE5&q}85@O-$EIO(u!Y!CYz_7mwhh~h9l=gw
z=dml;E$k2M8HGymrUX-3Q94p$DI$uL(u0yu=}#%845f^qOrU&7nNL|pSx?za*-QC>
za)wevxkIU?0;(4^l-iaWO%+jP)NE=$Y6;aq9Zj7|okv|p{gS$!dWiZXwT60^`WKB(
z3!*V;(X?)~bXsqkk~Wk!nl_!bkhYq(nRbBoBkc<9A?>A`k6XA~S2u}UhFhUqsau8H
zB)55PE8RA^9dtY6cHQj>olXy>N79A#bb4R<VERb<boyuX4fH+qlk{u!S_XsBoY9pL
z&&Xyd7$(Lf#sbEA#%{(b#&yP1cQ5xg?i}}2_kQj=_i^s?+}FDAazEw%oBMMQe~%6x
z5|3;TmB(<8nI0=VwtF1+xbE@XGr%*_Gu|`bbFk-F&-tETdLHz=<oU?U%PYc5?A6Ol
z?N#M9-)p1SVXrG*e|ZObckz~a7kQh#KlEPZy~q2!_ah%4pN>9BKK*=5J|Ft5@!9Y5
zv(HoCAm13@3}2P+7~fBQH~XIQz3=DY*TGNfH^6U%-#ou>{EqwG_4n}a=r8kE_>cDg
z)PI}*Ise*#pa6D2c7QfudcfL%BLO!98G#)GQvy|i69Sh9?hm{cL=9>eBnwgojSpH8
zbTH_8Fg-XjI3sv)@U-ABf{z713<(V3h4cxj4EZ!<XGl#bHMC=BMyMuqX6V<UXG5Pg
zYt>BJ3~x52*_X{uHTyHHWmr-e9yT>>L)e+HXU&<-Q<@KHKD+sr=9gR0T6AgAt3^eN
z#VroDxZ5(gWw(~fmQ!1P-SR>>CA>>`ZurRX<>5!eYg@H$mDZ}f)q+<0TitCP+B&KA
z;MQ|n?`nOkO;DSJHtIHW+w5+0n;F8CGBwQk%md7aZNuB9w>7t2+V)u6=Mj++y(7j&
zY>2qr&a<7UT}ivS?e?{M*uG8stoEbYuWNsygGUEZhq4ZzbU4)E&yJBD3p#$#aZAUW
zkztV;ks~74MPBOU(<!mj&`!%bo$gHUEb2U@^Jkq;bfI+NcPZ=gX_w<&DP09!)m=a9
zdNRrlZi%OhS{8LK+B;erJuG@%^p%*<n9P`QF<WBp$F`5{7dt!lQ0z+<pQT}~U|nPf
zvb(d#vA47T;B?_AIiGS)bA7m}+%ep(+~0X!c{pz|?<al`Ka2kXe;@yEfly!&d?~mk
zY%d%nTqHav3Kr#vri%`X-Neb_G2$KKza#>QN%FPiLAU5`L%OZ)b~7$A4v$+AcP&05
zUJ<`Ez9xa0Fesrqp(e3yq9Sow;?<;fNvfokNxw-uO9xBWOYbMMk`2k5lK+%RWbe!N
z$f@!)`BeF_l)#kUDGO76PK`({O<kAzFpZx!GHp+~TY8W5+3DvpT4g9R)?_^FF6{n(
z_X9n=d*t<4*yCzumrO(E_AE+P_pFbyF7@otQ`d7#HptG%{wVu$PGru|obP(kd*$@{
zwAYPXcJ8R$LwP}Y1M}AAJ;_hbpP7HLcc<Rw-uwFa^(pGJrq7=R@`5=9HHEQ-?-%~i
zw?$ud->v-^{rdD<*{}A!l=nV<?|KoxXj0MH{*nDF`yUz5Vt{7A&Vhad6$8H+<Tj{a
z(Aq&S6xoVpirV6g;zh*|l``cg$~&qg)m+srJRYBe|5g%TGN<HbX?*ENrMJow%jT8c
zRm;>1)xQr;AG~DnpF^^TtQu0MDbQ@tx@!k%x9I|PLv#o9t@V}qljU8@CzaO>l??rO
z=tDyf!%8D&>~Gv^3WlAjqvlTLiRLTA5{7*`>}f@xif<|dDs`1dhj$r1W%zF+Qb&9~
zk~UH~a^I-7qsET9^1k%_rK7RY#iRF)X*XuVnCn$(RjbE(jvX@g-{V;0=8SthzF_?J
z39TknO}I8OZQ{B~zLN}-&VA7BgC&z`lhu=tP2o;iFy-Y`)zp7YV@;bk?ZtHE^ncA@
z&zL`>?!%G~kIfX!Ts(_DOE>H6?8Mot=LF0dG3VMxSs!hl%bYuP?&FUKetcveZ{Ctm
zJU=miQZqku{?-NU7tC7lVqw|BGoL1Zx?xfHqA831{7m)Psl`c)zg*I4$+RWUs@2s$
zElpdxd0EG0^On<>4_kg?MV}RiJ{NtyW@U?&(^meyO1G+Jb?)i|YlLgotPNi~a~)-!
zdEKq`Me9#|A^&3Qm(gD?-4MEA+D5R^yz%x|gT6ZZb&s$2eIxqj%Wpe;yJ%C;rm35;
z&BHf8+)}osW^3QAC%1Lqwr_j4?VG-f`EJ#YwmUxE8M1TcF3(*PcGc}3vAcFp`JTIb
zOZQ&eH*nv@{e}BaALw=9*ufqL4}YKf{r*GJL%R>hAKr09a%9`TME~0IgW!kFNBKuL
z{hR;qO~(YsHXj!r-+DrPV*AOsle<nOp4$7P{KxN4XPo}wOwThX&-On1)48H^H9x6-
zx_Mr6{`U*RE<C?jb;<40)XV;t=lvZ1^Riz$|FWS*P_y%j{L0a*c~>u9Q(n9CtMS(t
z*C*WYxiRmzHovX8$+@}XR_d)2x8J*c{Z9Fv=XWRF3%IxFey982K1h0S^kLz{>%SX*
zulr;AqvnrRJ?1^$SDRD&^Aqip=YLLp+WhJ2zeIl>dRFl4x91fv7%%4k-TCkBFMGVa
zRHv=0s{+g%QTtFI#)PB;8(HhUWmIg>#aTj=&sQGPQ<c58{yNOpZ5Gy3(YLLsbEGHb
z^Q5Fv-?ql)g8@Op@jq*x4?8wMx8~~X+C+KMFYMbLLT6C0+$`xr#o->=zSOlz75DPN
z^Yx(3$6Gu3?f}%nq>!7_jvalbz0f~&OLF(kFH%q5FJOVzcgKee$ZGptP1d6^Ulg=?
z+HHlW%={f_CE8-l4qq}#)pLH)iq>}-(rMqM{>991DHvJR=0e>1k~tJW;U{@4zr1uq
z&oZA2@6B6uy3-}5?D@v!7e|4;yPwR>m<)mr0r9q;H#YEndXK(TIdo%K_WBFWpU4ZI
zwVv_!kK5I?lFeg2{vponesh55y~?{?pE7YU<@rtE{Q}SiZlwP30<_%d`Td5C%jMo6
z(7(s`G-h@C@UtCDk9^@VTfh3*6Xw)e;W*v@=HLe+Z|1;&Dq2w{Xnrys2o6?(X3duC
z_k@9@{YjwJp#amMabdk~g6zWpJJ@#XG1-8!7KcX74cYJRpX}Y8&dlySK6|ZKz{DD?
zW%R*-oO7{<lKKgxnN?I?GeBK`rbW^p7p_Jh1K0v_mD}litSb78$L91>|EXgaW`j8a
zCnhG(_a1v}!iK=CQ@0j@9@mN<&ImZY8hGUaur2F{++T-eR6huwTd^-^{;shf$AZl}
zCZ>26VOx1c-*lgSx*YHeLMZHT#vt%u;DMMxkL*SBqUe*CGQOA##4A@{dJw1wU#^<)
zxi^ox6r1ra2o&4|C6@p=KD5dsCwN(E68OkmMfJJ#e0OC0uOQ%))j;_Rpux|cLVMi?
zEeqYxJ_tMxCS4wXeTal{wo`|1!!FLN-BWU@pu^FB1r{C#iORXRul_wD32d5O725gm
z%iV{*+WGP6n*oInY1O+_gT|j<&GlEDy}UiWCd@Yuux=)w(pGuZ2nSWQ2m{^KRp7{~
zAM<Z4=Jek(T)VCcoc(r~IE}S<>;m_eyH4#--LyLRqWH{?<<q~@>Wi+_V5Qrtu$6Z~
zvx|p8guV)#-(BUFMgv&2`T*#N6}$T}OTT7}sqWswP0{JA%Fv!el1^;>1k_Hi_6C$R
z`AOd7--rBI#Tb|mx+~)J;Zyog1_e*5utOKC=xxmUOPvDN9RP8;^w!MMW%Oap(jn)L
zEI+!{u(9gkd*#8@;RhB@xLlkL3ZE|q)c2)N7czeNy%TfO)#}pNQ&X9xR~i3m+j(-(
zzOgHAwtYS&{As(C5jQiFmVI(@NAZV$)rhKbY!7%mHVFhKo$@?$@GBo?&!jIB&i$P1
zEAnusuck3_+A;QFov`eO4_W7aR)kEsIx5G%!-S1@0hPuESbmpr)tHxJ<f?$2V9?Ef
zE?`!*Vk!@QKWkhuHl@6TccpW4>Liuho@r-e1|KZ^A_>gigY9a)|KFL|pcYT3u^y?l
z{N0ldxnD^FAIwMsaUab3%;!ou_#g?~op|Nt)Ko(zQ?_VEi}H4X>0w+6xE(pRxCrYR
zmCIav;Oc7G=`N}&5XQ*_G><626mhE3y#JW~7aP0SawJn(IWz57RcO)1)(O=s*86QN
zyk6Ds26pEjJ>k^mgo1~E7@58IdRAc})$OkLiS805Va@_>2acFxK2%McT<Qa8pM6ww
zc$7b@T0S){ZG6=;U+VbS=p<S%-XPI~*nRZOv|H>pjME-pgQc<fU)kyoD=TMhTXA|1
zShOTdygGZSII%_bp6ZMv;+ZuQrN8u|c(wQ0zc8;S)x$lyJ#*IA*s5QpzV6SWuYJ4a
z!{xUbit65h+-KaXQ(p1E-F?0!c+RLuc5>qWno+^mcF6L2%}Lt-(UCEqH-9jz^U-OO
z!-79*r|p*|>A}m621|Hr=N^BuGV#Fsy;?J0uFbeg%Srb?&m21SvroE=D0C0=V=B62
zPI)%1<6zN9DEzoSCqP8kak~nxy+}IO>ni^J`oaF!!pBZIcOq%+_5Lx_nAiMS%%puq
z3xYxx(-M<C$9yoWZhE`Jy1u=(bQlLtFpC#XDtL$u(u53Pn*KJ<Vn!tGEAO)@Ii-lc
zEKsDadNgFYLOgx%%C6eILCo$e#<mFSm~^jpDd*$SOO|tJZmPrQXVUyfAIPOurw7B)
zQ`OjMf6yiF&7UxPipKU|H$mIwDV;e;G<HIleMt{Os+h`!$NS&en6&bXhu^jLy>a=`
zc|~m2AZEdhB_}7xBrP#t9`_UFS;8L_K&{5C@5A9JwVDFZ;1fcCSxs$#p&$PK56Pvv
AF8}}l

literal 14776
zcmeGj3v3kE@tqGFe3*~<)&%I{0Ow%t_CDC>yPggHVC>2V#y%5+5+!@L>+|8g+s*DC
z{uC9Iqya)2(W*(6q(ab8s8Xp=g(xVXkfs!*PzWVa+7g<OCQ=g=K1!R0B7{5d-R}K-
zJ~%!Rh1=8azL_^~-kaIEd9(BOc|2$yLTD74g07+wP}0GPFM4vLpsY(M=aDkd>89xP
zDn1{e0=1k6<zkJG<AiRqiYG19GUho|qtU&gn}&b`?ou~XcVDbLS2tay$2DaM{H+Lj
zL6ZP$*4bj^I$d=FO<TNe-T};e!UI6R;)(sFUuZvZ{Zq{tKf4La8#e^C@i?CW-dG>e
zpW(`SgpA{ndaq>#A4j!z3yL6j3nJw(Tae9SsdQPYTy`sEwY#j9F8c!HUf3rx{vJ-D
zd|V(Ht~OrSf6zz;*=pm16&{O6tmnFeO#>3wKCsm5AL#KrS>wVQgL@%^`J4I}(bN^>
z6;6^VPWD%q*0+`7>OL3LggAwv`a*nIcJ);oNdp&@F`70~ghc77Hg<YiDMb+Yo}fb6
z%vENa$!?!dbxBN!>lLIP%4)7K0!xYQa<w%ystf_DHg+qD=%VS~-d=OB-7H7}+Uj&V
zX^V}v*-SuTlKaC7(`O3H_d|bVAi>U9v#@L?V>0`N5FPBKt!4`i9T_OnRRf441w|z&
zgek@+M3ib{Bobs@cGhmG<ZN9gJ5yC*vRYZ6smf<@nw%AW#%k|k{8p#WXrMH?8PVfO
z-y<l9bQucaUMb2A2#?3rAowF8F03>+)I>GL3V!HT)E=ZZ0Dq<dxalFxKr9-oFhMSm
zHHrhZf`aMTL&L+l{YS2otaO}HS5947X&@`&oOR{Ym6ZmvBF<S?PF-1PAS>dWb>-BR
zl?JjR&RJJZU0G=$E8?7W<<ymx2C^c)QR{;Ij+PbT!jKB;g`5wX4!Nj2_*K<4dq&{=
z8$u(KaB~Q5d}Gm9o96CYaca*mbldmr+R}^Z^=EP2j6J|N#8Yb^T?BcR>QYF#lu}&S
zFR;OIpt`if+i0pH`J-74%j&%=TNhIzACwiUwWF@3xt=OD(R8gS@*Gt!gv1DBooKqj
z+d#FpG`D*pPh_F##Y;=6(uBMagULyT2MA@lRT4x_Qu<qfs|gyIS%ocy+()#Vq;Ub3
z4f>TDL!rBe>#u<%kvYmtl!9T!+{y&FMnMWOQ1mnjQgA?kTod2M$!;3cLo>B``u0i?
zC*90`iDMK&(%KZdWd+y=Qo93GhzUcNK&es~3NtbeDqN^ml9>KDYX*ZbFleX^Z5STc
z77jCkq4PBk8|0910rSl`B0nF5yjE;DK%9-NnR$l<wt-Q&MCL5OH8|sGvQ(MuR<G6R
zT2Se-Iaax8QgzMo$_j93<e5MsS9tUsJcSyIo7Rd%p|qw^H?64|`ng{FSteoCFgV$$
zbryR>X|3=7$9mF;hV4XCo;6vIIRh%ZAp>gnGd%c+yUln~#ELl`u$r9DiTRfsGno}I
z4+g<(?!p->jc75`$<0@{V7}56obvy?Tjs1`#EaQb&i!CjXyMIuyB|5?^G2gyk%1`u
zkzlw>cqAIhT;If%6qeSqt0S_)u^8FL`Qw3Q%nCCH6DfgrmeFXYsBCEHUFg<=LaaC~
zRK(?LzFG_`CT^X;6(BMtTFeld#wW*XpdI!F>8L9ll}YG$Oai^8AG8*crUv<0>NPX>
zp<zB~GbPTqS;&_Swxl>e<CxP0`tb-gCDKo@`vk*Jz-IGE;a_l1m~N_^!`QCLT9ssW
zs!0!nb~w`8t}_{(vt9DS8hzc3`RuH07am_T_-aUWv|`7-6u!*S9Cm^?OKbR=Tewbd
zYZgQ1RzX(U$+tI&xsHtg;G6fjnMB0as-`N!jEUzINIWGCEwj@alJ|&lOU)?_FMQ@6
zGPy;&$>K0sApPNREpWQ*mAA?*4ta6ES<~tWGvCgPeh1iC23d!3jraVto;H1#(J6c@
z(|X)*BtBEX-o|<T4m03XVTZBcVP^4R(0AeFeurDID6;p$1V5aZ36p$BJJph#<nb!U
zEt%xi5U{qj8S*N4-7g+Hs!^52Vz$9+*7YrH!SdT0c;#ym{5^3-T?{XCG+u+s6oo4N
zVnX1We)S0!_EewlCAo@(VZ|~Ynfe$irWQM<N|}jE8X?^=88bCZ6jAFqHO!2sQBp<J
zBy`hcLA1s|)^5Kb>$-hppF$IYT?nua{88Sb!SjRX^#yrt`aph}{tDUMpw<30uMF>4
zKrEcFCqqwmXsjEAGRDS^?op^jw}pUI3^}Ag#&C|H$CKVM7d#5MleOr%q;71y;llNZ
ztWxXG6Wo|0uf&99k&$4jxj(voJ(<+ZgzFgOMG|6A7|BS4yM#C>`%%Bj;{u@s?t_D*
z1XAguJZ2D>tb~(sjETX01TKleGl>lUB5)zO!bRm`ATa0!)4=`>d>CSSA`<GqCfFuK
zcXdGx57z>M(W#j2FT5DT*q}y-R>4)HsUR3r979HP319>ggIwtj{pYwkUCrR&&D0Ui
zVAl9!f~X$x9+@~aia=Nopp(2s(Nm?w&kK?LFVU9MFsR4!MP<bxLX>*qa+1Aa1RRMt
z3SfLD9f<^5g*qS%h9f)=H$3bD*clRL<z>Fret^_=ZGOcH5HSodY`x)yZ~$O(v~XQY
zB3!2kAr+=DL0h0(tH*GG%m@9Pyn=6$0n#P)lTYdZJps;<1ZZwZ;5{-R2@x>~RRG^9
zz$PCq90@_2qQ&i)JFL(G4&X6NL=l#7VNL@7ivPOE3l38yHbjXr2G=x)0u<bCxBU8u
z#CsQadZ8;-xmfwh7>^v_k}w4fuXve25^k)YgLYh>(kwT5JuN=iZ-g0+($Go7h24TQ
zP|F7cnx@7@g@?~PqG)J2lI6OX2(Lh~a1AV_r6I@52n3x>KH3+k7kEKRP;POQf8CN;
z1vEiRg)r82p(2ROB8tpuhJou0JQ&gtY>`h;z@UcUN5doTP9-P*#A3`0Z=53#>{NpT
z8*V;<XA!squ0Vm%I8+NRT|ho?krZl0-B4EGlt~F(37U8f3JN)p8Cftxw0_~4Wfw<G
zLb@l>qbK&Ul{3a|Z163w+OeWszwYft<Ez}OP2b(p#I{xOzUqQ!>zKA?c2(h+=Z<nG
zobKoIXFS=mtF^O~JvPR^bGuw}+U0R>dZ%k|=av7gE82GAi!GO{Cp_@|9o|o*OA9WS
zFW=DdtJhY}@%@oQ55BTylxb@%`@+f{-m~x5{B7h<PM5u2_T!VYdLKWveNE9M*M;zo
zW98QV13&C&-22`|rOYzo{-3Yg|L6Qw1#MG*bo~9D;=G4_C2RL~qwn-LE~$U+gF}xM
zm(O|eYxhf^e&+ac>(h?k{yMOG>Z;RndBul^zge*FVBWd6-}-FZspGR>p1k>$$iJ_=
zdBo9CFly`MM~gm?pLp}^M?ZL|bMD!Xk3WB=a^_3xrZIo|=AW0_j_-Q!%HMxE_VWCz
z2QSW>cl7c3M=Sqwu<4mXeVyUuGssPsd^~!m>C>H`REkf3wQ2svlZLB@JP$d?8JCw2
z{P*>9-sZwX?=~zS_tx_1OSd)_uYLHw!;iHvlYhV4RWj|cl^yuqkuU9KC+c?3o^tTW
zPhGD~Ht$)x<Bi`uyZO@RO(zd5pMS*mj}PgVjcjqg`=ow@?bxRIe<<<1y4m+s{i{Da
h_q}%~zJnc~ew(`263>d;^0YmPh}x!)mw^tB{{cG)V0Qoj

diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif
index 864c8dee7aedbcfa459e49649c80eaabfe53294a..e9e6a20cd90f08ac85de08fba05677194f0f3b61 100644
GIT binary patch
literal 58560
zcmeHw2V7J~_vmb=cM<!74HekV76I8^Ku{3`L^QT#_X4ZS?z)9yiJ-*T5^Ibt_7r<!
zVu^`0#uAM!8Z~NSjXlv=V${ex_ikZ9P53@{|L^yI?=I}@nKNh3%$#%P+?l!e&SYky
z&Ilnd6oH;2IzSZo;sK5LVFOHYfvE%xbd)#>&5mb4jA@6d00%qx{5+cyV#fnRN)tPb
z=MJ~SIRB;&dM2VYN5Bm)o)S-K;e?YYEnWCT+hM#c9)b|H1}KffC*UxEHIzgbnw+}4
z)UR>gTX{fJG5#yWg1qqkYSn}c93MU(;0<qU9rd{~`)xCx?w5|x@m@fS%gOfV^Q;P?
zjzP%&E7uqbF?M!|!D29%7>sOXu8^InQfu{i9Pzn4u8b>?aV2b?P{tL?cp{Y0t-`2M
z563L*LabP;PmKEgs~u5nttK(5pD2@?X;fk*+VqhoEO%t@JoU)oYN;lwTar&gg{-2~
zSc+Lx?21yI-Yly~j8frc%K*mFoG3OyVi}$oWvf&{W;R=CFkx(A96yd9tLDZF*djrk
zK*W#d3uD-PE?2_gia7#qEKefiiey3_+y044@&PEpq$!f+q@>vkgjix!iN#`+aX97W
z<#FYLID@H}!;?y-94?>3=f?s?thrKeQB}n1&24Q=9DGtRv)ZIJTC@f|8|SMkG*~T(
zQBin7&X2uirAB8#dUG7n$~d*5lvANHa(HoEj*~NFOaQ6KlqO7NF_`iU23^uWDkOo^
zki4$^I!;)M%7P`~x{KxVV|np;JibiGmx)BNTo4r3g^7)_0gp`3hDK#kxo{Cc&OC<&
zxN@mS+mMezqb;gz6qh<mJC6hoE@T&>6B@<k)d2r*%Fw8tx-eQzIzr_dH3!pSrI_Ag
z27U1A>qDcK6&XyWDoc{KR8@>|EZU-?1Wp~+-4z6dW@b9;_)>c*E#<t-&diq7GB82A
zNxw9wIj_=)adI%T!D>=tsb$dQwl8OugVptpMz8|%x(;GD<IGH1hTd#Z>D5?9N)ogy
zPOH^`>yU7HJh6}~=5ymEJf4)V;HIW2Q@9GQR2-iYPgrC9to7{((ozg+E3Pg(TMe*H
z6Y%%~A(zip+Sy8l%2aV$3QsQPNz=F@2V0k{FR;xrX~BW1bS^Y_t^X7DFJbXQG3i<}
zbnZ%r1>3v@VaK`Hi27KEf$Ow{T^m&<Glr`$G0LGsSKnddgy$hlL8emU?kP!)dlO8P
zz^R9=t5(Bo+834f@6xsLcFFo`{^cc@{-3;&jTJ%lY9?kwk)>Q^!sNwZ2mj_IZ5-=o
zX~^2<VRTv#D8Q^Ldrk2R|IN5xQ~UzBkUQM?{~htyS*^N6r7y-bNgRj4IuQSxG$s-%
zcw&Ks$LGDu9legm1Tqm^zJ;X5$}A2i_u73-B=)ezL^44<sWEqIOyY5k)eVtJuc%LY
z{XQo3u*TwLJU-dS+}Ov`#Nss9(Yho>$x|pqX*_ufgnYT<8vWl5{9ye+BIEN&jk!}}
z63=Q(AdvCNkq6AQ-8S+_lX_TVLYYuX_Az&AOzvTgiDZ0oKIYawrtq-FVB{eo`<OfX
zn9}1K6Oz|4xArkuZ}sF@Q6Po87GxiDXCF)Rtj2^e^1yEu5jUC08MGT_&~T5l-rW;-
z&&Px?@*r2K-02nJrj$YvFNFJBwv}KHXpCH?!tZ>#Z9XOtd01mocyfaDitf}{yvH?0
zdPVp4F|lVgCgRE9IUsW6;YP10@vz2VtVoVL+<G08dRSxe<XF)*sj)w3^V;{v1ac2+
zOe_<Teax+WOyOaTNo4p_o8%1IeWQD&=QT#I-Mh7q!Q9!CGiZ@SCJ>W-%$@VGR8MM5
z1TIk~AfFm=XCLE9<f$S#SHw;8#3~hNj8AIJy<<h5)Z-cxk#{uR+Q;M`))@X?7I__W
z<8_Ru@VLgvXM)|juE<k*SYzb$*{v=y#nbANkq>#ew}Yj6Tw@~gArH6qu{6(XjGR8Z
zQ)7ItXEny>k}r?BcQVH3d01ocngqG1=+-{Q_pHVQd>M~iqH?FkV4DD8nn0=K*<Y!3
z?}JqEb|#<fWA62e3Z92GM!t$vf2W7nz5%V^dsbsYu8dDEQMuJC3OuYa*cyVIkGWT4
zQfZ1%F5%fXz;W+&EM6vnyDj8H_iojg(Bm2-UxIe)DwRUyag7Pc`IuY#SiEO7CWJk6
z$W<zLYD@?(L32}iQl5RsHFsafgz+*isWG=|3|@lvsK&(P!;0>mK?~s}Xpd?P9xNsM
zm|Oc;ipMoZj_%z$RusZ(>z?dmBJ%ldw{|diXWg^vlJQ8F=uVA^xE|IRU&bXL%W<p5
zcplamxv1#og?ka-;~Eo^UeT?6OyF^ik?;Dsb)YB`dRSxeG7<U6fIIt`P$?BCQ<VZ<
ziYMM`0d>LjnY`8FR*j{2SYuN1T|YN3QKfoPV`3Q>-W(%uwYas9rFmFma55A*A9JV1
zM10R`j8866xl>)-c!fwP5-1#pf4KL~m{`V#!#~Jpa@?u07q+<<^U~yEu1EmSoATvC
z@#}4K4|{k>$St_tJM2hnxXrzrHOA+W&u_a|V^WDkEaA$PT#0=$=5CF_WQ^Qa(VbpV
zD)pqsU>8iD%Ndk5WBZ>z_3i($W5=X&&uWYZPf?L$MYr~`RF7#)oX5j=!IW{y!#~`q
zF)pwE7Thl$U}|$^|LKuPwlj4FG69Sg$v);*jqyFJF*uBoNA@wdY79n-u186@w~yIR
zE+@CjsoN??ZP1rtrvK!WU^t6d1?RM5CUa7e$xzBx8I3xvT7{oD%qi1r?8lrNod?NV
z3~bi}v~51pg~|Wm>8={gr2S7$<aMc~Q%>yvZH<2IcLV?Z;O^JC?)|^jCvAsG*FVnN
zaRT{^$A2dfXTHPf_Jmoc;k^kz)gH|5Urzgmhe+Vyb(zaZ!+FYjBOGXhto1seowMe@
zIcVKhDVMA-<7{}Hv({}Tyo5zvNe*ed2-R`2w@o=Im|1Po8i^Cq?b(Pk*j@017F2}>
zt0gfis*W|x87oS4db7-;Eh<WkDzR9MG7d*?w!1vFp_GHCaCmWCj_dL42{={;C&a^v
z<%FM1;w2E2^>B6N*ys!Jliqb!qMq=^AbdDHJhW$ZO>UUA|37DSO>UUAE@xl8){?}x
zm(~E?FjsGARvDI}Eym1{M-(5!7m493fv+@%AJ32Bi-qt7oJ1HS5^&+m0~qiUK@49S
zA0y!MVgx)1e5EmP(*x4^fCD~aE_{JjjK@Wg4qt&#!0*ae2vX9NDX9{kRKiQ)357z1
zfG3tpL@B8}1-znSuXw$hHLP|<sj3+3r`1?Wk_3*Hy5L?)-V4(gzd&zCHq4;VTFlv)
zDOXi$)L{-Q1S^6MVRH5Tgi8XPMlbodbLl-v@p3mtnDMLHWHVZ&q10%?%w`x2B#G=Q
zaK$y0P&PhHfYF3WtIp8Fm;y4}yNE*{ucm0o%O+-A;Mv*=OqV3Im){WIFkiM#rB|7h
z27QsX*lMcZL0^_;&+j&Gf>mf=;Z5+A7rhCNl@U!WNYR#JdP3N^{k}B8rL}eG{a=;Q
zC81$Pr9o#f<r-CL40m4yFBeop>U#Z75HE=r#t6C6crFn_Ul;TEwvbO?Y@q<~BA$&#
z7=z~$6CwBo=<|Sq5HLcCh)aav695K}03rAgu>d>_9s)gtQaqFZC4_ic0`NC@h?gP&
zKZJ*n7eXR0cp)KA2&s4owS~}z5fiWk52a8~2niag2w*WE$BV&ZK?r_L2;K<CONqR&
zj7q>bjZ}iuNTmdglt;igHz~nQD#c5b5<I1NP54}1d<^)$81R=d@iF2UNsKfGM8o67
z@c1!2K@3kA1HKT5c;XmvoP3}KcM9GV9IXg^F1SqauHZDgro_W-$rK?^Bp1k~JW)!#
zf*Y^o3c=Ni1gRn+9OX<Xv!2G>ZR5`Az{@Y2&g2)Z-I*jKtS!@^!IA_CoR^_pY_Kjl
zL#fO*8H%*vfXzAG73_>uWjs$BA0Nw)12cXp-9I+o*6njr(vo~&s3C)K7q~A~edliT
z<n9ma8t8uBPL5<DPEj-lAjQ=fDLH9KaXCfN7=RR4W2EGyA;sksMPmR`T#b>ElZF(R
zQxuH>NO3hrN=_P5TuxCm1|Y@N7%4evNO3tu(HMXfS7W5)q#?!S6h&hIQe2IZl9PrM
zms1pt0Z4H*MoLZ^Qd~|^GzK8W)fg!`X-IK7MbQ|56jx)U<fI|R<rGC@08(6yk&=^!
z6qi#JjR8n;HAYHK8d6+NQ8Wf1#nl)oIcZ37IYrSJfD~6_q~xR_#pM)5V*pZIjggX*
zh7^}m6paB$aWzItP8w2NPEj-lAjQ=fDLH9KaXCfN7=RR4W2EGyA;sksMPmR`T#b>E
zlZF(RQxuH>{!v^$3Ee8-U6J9Kg^lSoiBaWI-I7pCDnjs&B#MkoIvoInSoLu230%<i
zdjs!tc10{*HmZ2-x0;h%aeCSvTN+A-Ukd!$e+gb4h_nDAB!X^Lwo+)n5mA4?Jd;Xq
zh8HU_y}Hs?eiI_4HH7{s51Eh(>5&;3;n##PfYqqd&f|B261dma5)eWfij9YehzCPR
zc}Z$3B9&+-QA>Ykd;k$|=8U%{T6mv`dlMl9wlX>f5pf^91mZ&>Xde=AI^q-+L5dDS
zrY+TuSvqgN6T^oT3K{^Rg9fiR1;y532%e82jz9v?&X;{?*YV_+rPS8GP8uN#oHbz_
zL<~2Qx)_&;QS36uYmK)Amq#%{?L}a4IRTEEZ2Q`+4A(D0bvkH{N2!k>z;oI2;5fZi
zr-L6Fe7y=)W~?{7<eryWkOy%F>I;^EfnDGqCcGD_*O;>khp8cE*Gi7s!h;x5PM*QY
z)*1B0I5Ga|g%w#`;|h4=%^qjt={dzEj&wZEG{fukm^ok9%M39}y>b{t8lXeq%OWBf
zDK5NO#U_K*SP#Xty)BFBt)-C1FEtnE4)3BCYxNNKS6MBF?wB5f_ueoKAW&YV5wjEf
z*obiqo{~{o%!VINx1VM;>Fk2H3l~>SeN3jg*r6O74O6AF<f)45Q3a?m$cI%}GR*0D
znY{`P1|3f9<v`aX_AW7)M#^>CV!gfbfwsn{JJ67mrNN3+R-FYvZ+z2)myqW>(DliE
z3yX=jmt2G!Y~!!!?o5CzsJB6n%i7ywFlJdTX3Sw2c$$w64Cw`|U!lPQ2K55o7gSu*
zfSl+p(Ks*U2VZKpy98|WWnl!2Td=KH;S`A81_E4aZ2NbpEi0XdA`qqabnOKc)FUk;
z4N;)WrsF=j_73usYYc_h5M?G%{DuOE7}8V$2TJW(RD=Ayyu7@<{Jg#Wf_;5_gPR2U
z`2{wK2n}r#8X6JoM||u*wn)Q};_vJ0AK)Jp5D*j=5D*ZC2LWNWEWwRoP`eWadqI=f
zG)fer22*Ikl-l#qd8xH~DBYlz3<~jq3gaIdG>*<-vb?-~eBr`VKaql{G)H0(qR=Tc
zDxJz;F})ZxKLI2L)98^QJchiFDl}?DHJ=$aW9es#w(Xka>?#xpP2-L!S?y=$-o1EF
zZ5D+u+c3UE%B(z1>h9&1_@>AEUc&zPyylx9te5Ynb)3E8tuNl&bK=T_4>x{$^6JC<
zqOu8dKH9YR$6p_byZ0+DfBXH9H}5-j?ayFDr9y4#M4ebnhKQ&_Brk*xH5d^U%HUVe
z2*YczE9cl<LA%0>rg1ZsxlPn&;l1`uyaKEaqTR=#63d%vQv1eRuuIM=yt)P*>#9)u
z6Y`@GWd@^e=%**Q9{$ocu>Id%KJ50xrfqyaJ;XcoM&AdU?hN0NQT#*ydFR`%zGU&)
z`um-2f5o-iw)ViB8PBJ*h<@YA=vCXgCJs1Vi;j=2eqQ`=YLAhFwhh1a*5CYFV|)z<
z4*a4&f44yY<uA+64|$TfBhxx4>t<0ICw1TM{WlNqzp>>n;q7nrUAwS<G430+V8+ci
zihlij!>Ol#r_4TbGwamosfXrR)~%{VIR`C!_jA3Cq1Vs0DAx}k+r9XQpTGL{N~<CC
zOJhdF-pC8Tq`GqP$2J9Vn8CPo>ci3&o3<aUMY2<G&a6d`Q*Z4Y|4Bwx?a>oYet9@*
z)q~$Yt3}eSep7mFJ^JIuZ>O0v^9!1lSjVnd`^&X;#e!QyPPN?nZd~6-^AFDbBazAX
z*O#9B%4*qo=M1JB`N%r(!84X*%jLdXo|o-C^4HOsixaQ6>1X=v?vr&L-t4Je&;RX%
zGER<q^C{inr?)mt8F)(cqwKp!Bg;15s71TZ4w`n|xOG!+#^c#zKKmfomw!3cfJUwv
zvF`S-N&8OxH0;6lJ?A*ZOLv^wzxBu)#~-ZBzFF|spxAxETlzgrnrHo{!>Z2?Hh&U}
zy>sB~)>9`=soyYsWq91}_}E=fG}p(3Z~7&_`<dH&*G&-i%{&}v9Q$#8?3{z`7azM<
zvi|ume?RDyReQ$fJ0gjW(icLwN+T4A<Vb@Is1PoiY?O^k0Jgx_Oh87U2>lldHd3No
zB*YmKB?K-35HU8D8jQI6#jnzMLHLISUobgm+&Mx4JOv-E;6x2S4kX<{@Ty-tBTh_y
zNg0qf@c*X`xHu0A?vm<e4FP#7Q!!@A#Vi)Bz8D{`<K75mS}e+X<8~k0%k_P%DtwHM
zdoQHWvFptex|{U%;yIf7>3Jr-*)fFm!Cz-jGnh(Y&~6*o`=mKBz?+fXyE`ARsgD-l
zR6_@QHfZp?c)5OhL#E1N!H8j}gJBDc%k(%!Ybn7@a$PaZ94sZU!2~gL2yB4HdD%y+
z5iiMI3X>$~;1wTt1}?>OFejD5pca5S8Pe@DFMQ+~jt|rouxx<OWAqw_T<giwL66U6
zL+faX_9%2#%sw5$J8M{j<nAVz+PI{LG)T|EG%l$PbLYa&Bo6NQ#mA*^V$+yxm8GQK
zoFc5R86#5U=DLEMdcd3dj|~imGMdPB<*G`vT%(ceEOHC%lTv84U=FqUJ26U_vD&MS
zTbG|wXE0-OnEt4W39A7d@=DdK4H~dhJ0Xq>!R;njRR-99tcwrO1}F{2%K8n##n3Fp
zYTEz~!+GJ;W(8IP91SLWIXF>xx}{X-NXIvXfq9PJ;+W(z?UYpeZ^Xa+;*tp=B%5n3
zEHda|UpJTOItyu0DJ<g@!{`I=k_ZLksd%Zdxl5r|r?phR)S__7`PY$Vs?-i;1=L~t
z_Rc79$lrx;KdoM4D0j*_6y{?_t0fa=i(1(G2XDDEEy5=6S4zX%AvgPPnElrwoltw+
zA+=XY3zt$;V!Hpzq8u!couz|yOMCnU*0?YoR_&C%Qyh@e3l=_7E5I$`yV5wD9Ms*=
z3pR*ys6a<pFz`Y_gcdVZ#$E>77J~MI@dY41M;bnBw&U?Uff;(W&Z@z=fpfADh2S<8
zV#g1_OyJ^7u)yI=VrJ+yK#DW55A=L{Y4upD9`6ojJ8xY5zBauTI2H`>@<RGp4HmpJ
zIeVLvZ!obRj>()_YP3`;VY$J<3(x0Bge3&+NCRyBrLz}=d%8e-PJF=tc29Io^2@bU
zg1OlIyGy(M^HPYts?srhW^Yfx8_t4W-oODcK^4l}T!;PQo~Rcz9&eUYI}WvlXTk<1
z8kI$5Yx_U?0esQS7rc?uYKBFJj2s6K7T{6~GSVCcG9g}&neB*%+M>Azt4U3ChQ2u&
zjx=Awb7vc1U8>ThQ2~xx)l0$cBCsD^m#|E&UR$ctxfBvk-~o|m$kl2vwaQel+p$2@
zxKTPKN?ete0Yh+&rDkC{`~rKwbg&Eq6|PUEdW#9)F{YsZ05<C|q<O=tBdqeN)MjI5
zZdx9m5q6Vd<J-#Mu>AuXdGw=gHu6JkdN!NwNND75u-a&XD<mZw=mi?stPbEBfOX{-
zeC|WJ3vgKBa2%%MmK0`!3IZH~!^Ji@hM=**$vCVj)oXwTud`88s=?ts08cEl;;VkN
zUI0%h(_$b4+6jQ$>8zz%fbkXKuu@C~Zj_F%2eq?c>Jost0Q;Hpa+ClkfcX51UEo3&
z*aFLMK#TB82eBZ<j#hVK!$wCEb~;wBgK<-AHeBviCJmc#4tiK~x3wA1g+gA~vWGz1
zf`3eOq5CHg*R3u6ejh?-l<-4!xVoHmI0IOW1XkZ^)9Y}B^AOtn7D5p})#2JL0ZXkx
zXwwmw_Jrg1V&6Bgyu3V4i>c#qfjU3`O5mh?HQ-WS9A2JtyCZgrZT*ssTeTXt^Rk-Q
za8E>yv11z=@qeAsrCKiah=DC9G5p>O#?A*T1E&k>2Iq@!ZphZ^>ut*9!r{Nn=E4C7
zZFUVn=!)kkY)BjmIueFxcMc(Xs4t=oTm&f;r`~#b=fi>pLjBrYv)MhskWPg40_rq~
zQq5XoO&lq6^4Mytsmw+~$A1{e2NpuYP&3pTwMEfzw}p?ys4GfFsi+6af_qN=(O|gC
zR04w)6DmieQ8k)?rl9HQJv1LJMk~-tv<_`Ro6*;37ut&sqNC^}I*Tr#tLPTGiyon;
zuu93I_)|hD%_was?I~R-e2RpUL`kLeqU2EeQ-)HCDSC>PGMX};GKDgeGM}=PvXb%{
z<x9#g$^ptT${ET<$_>gNlqXag)sGrRZAI-s<xnM5IkhJ>k2;82OdUZTNv)y2OPxzy
zMqNYQMBPO_NIgltK)pqMNJBJVS~x9|7E6=Rl(a0`09p~vM0=AqnKp;EjJA%pm9~%e
z1MLFsHtjDulO9TE(_`sf>FM;obTxeh{Z0B*`h5B)^iA|V^dIOK>38YR8UBoxj4lir
zBZE=EC}xy1CNSnOK4NTSe9Jh=xXO6MWHQ5<9hqWgI<r4>7;_YJD)R&8dge~%G3I6F
zLl%qGjMase$jV}=SQgd<);!i4)(+Nj)>YPHFJG@VUVN`KuK`|quW?>;yjFQ__d4!%
z&FiUmkav4;nRk}A#=Fvcn)eFtt=>nxuX;cA3HIseljxJ@Gt8&jXRgmWpKpE6`P}#Q
z^^NkC`u6eF`d0bQ_5IX$zwbrgzx+b{I{PX82Krh3-u3&~Z>QfGzx)3F{vG_2{RjA4
z{NMFo>Hm%Y&;E}CLIdIgG6FOKV*?fhYzjCY@LQmFVEaIM;NZZKfpY>s4?GfhJIFhz
zLy$5^74&A%f}k&hP6a&-4h`l7X9brAPYqrbd?5IG2rHyRNNR{Cq$Xr}$TuOELusLH
zLzSWG(D9)wLca~Y8paIk7?u$>ENn{H+OWf6cbkMX5jM$hQqg2VlWk2dgww)1glB~7
z!l#9A2>&tsNz+zM<xR1slbWt;dc5hM5iKH;Be00c5$hvPMm%Z8ZkF0?c(WPJHa9!p
zoZh^1^FGbXn=fkqZS&hL!di4~p>8p`#fBC?wWPM}+%l)-sFurH9%}ipRqIyWTNzu;
zYxPa5+pWV}C$}EfdUosWt#7mmZIjeS+h%r~9c^y1o3Q0<9eXZ&5BqLp%gFRdYvj_%
z!;w#;I!5)48W*)b>U>+Dwvx6*ZD+UL-S%#~HtjOojc&KP-B0bk+e_M)w12<-zV?51
z=-8oOhqpUy?r^<hM8}MdBRj6{crMyMx?A*!=w;C-Ix#y*It}miL8qggshvfgOFA#;
ze54DtOMDk?mk+uei($Z4dit1UF{fhvV&$=Av8!V*#)ZfAiW?WVIqo-3JI(;k49-5z
zbFPT1<F4SI<%RHi@W%1B^8Vm==BxP&_$LJZf;7Qc!4|<iVHY7LTqHa#3KeCF-WKf^
z{T(lkH^r}uzaefX9x7faJ|zj0WJ{(>_DdO3g><a+Yw2IIc$r1ELH2vs*sjC7uIhR{
zp<@D;up;4dVpO6kacSa(BzDr!q$Nogx<z(Vbz9c$QgYj5P4Y*{*W{h#!{lq^zbUv1
zlVYRdPo+#bM!7SEmeM_Ca?0V<kkr1Z^HYCLi%Kg_Tb*{dyQur9?mN>N={?hDq@T)Y
zm7&g9nQ^y=xW||tdwTly%<Vb9=cQhqdzpG|&7@}b$efjVu6O(1`rezfP*z6PtgQ3d
z9kWMdf7OTCC%eyrKELMhaz^Lu%MHyPlDjJRQJx}iTHe{d(S5CbcjpJ@56oYg|7X9H
zelz=BDBu)~DLB}_d4FyHEdy8s@&|l0;NcsoZ@l-$)q$dc69)b`sN<lDK?epmAFLa^
zZAjn{)sWAJGKTgWx@zb%RhDX*>S19<;ljeZYNh&p^({@ZX13-AmWa*7t`#K~%`CcJ
zoLD@o_(n;$k~t-}wMy-L?Y&{?!xj(wb9mP9kB8Ul`svn}dX)|>{Zb#IAFkhHXl<x4
z95Z$?PB2~=Asg}Dh`XkqrjN`N^C0sUOBf8M4q2nEZ&@#vC6z5Gdt9Dh{&_`kg}&lY
zW#`ICmDfh5jr?#FeUy6C?$ME>t4CiPBOkN$P0E{vZ|)x3c5Kbqt5w~rKB@Mp9$x+Z
zIPSQa;~tFfH-2kPtD35s%WrjmYxRVH38o3B-tPML;)(Q$+KGoJ2`0^(^n9{r@^@3X
zQ|3&0HdQ_KyLWi+%zdZ!-J*97Pm7<nXgYJce)^9yy3P1xX7J3BGcV7|oV95-d-mkn
z58fN{-hny7Ig8)-dEff}g}J@vZkg9^-t>9T=9kPrxj?aC{lb<DCoTN*1I-7=7bP!R
zx46~fDT|*h(Jnc?wENOc%Q`HZvz)oSZ27M%@>lHpQ1ao*kD7lp<)gnp)_;8AlblcX
ztQ4<YxvJ%=X{)KLt*dXW8Mx-?+LX0h*2S({x;}jUluyy8)=zJKHuSR}H}u@F`*X?X
z>%M6J#lnrD8z*m~Y^vOJcXP?+3tRecIre3bFL!V4x^?4MabJD>b>!Czwl&!{ZM)C*
zn(ehaM(%jH)422YuHs#ncMsWp_M3ulPVDKk=kT{Zzumt#ZSObx<okB)Pu&0Y0oj2s
zzmt5o`C$CPO@~B>HhwSqe&gZz!<&wXk8C+AJ-YQ+!m;hgyB**4L&^_(Ph^}pc(V7&
zV?Xx&@${*Ir!Jh<oW6cWcjn$tWj{SVTXl|cZu0q{^K*V~`SY@0I{mW#Li~ko7gH`C
zx|DnA>}B=kTUX3io?Wf^)&JKy*V<fLd7Xd#>l<k|j^2FZ=G9xqTTgFKxD$M5;cwBu
zeerwp?}zRd+`W3wbg%Z0srQ@R|M-FM!S09I4}X4C`snGOlOH#G{K;REzxF-p_vG5s
z@@K4PbN}x2_txh<pP#EOt*xy>>}*N9aDP@!@}5t*Yy6Zn%FeUX#TNh1yr-tA`)s*V
z7QmQJ>8<J?Y3bC_hx%c1^5`#GQ|6+<q2lpB>z<Y!9;{z^X~x5DDapU^Znh79hf2xG
zl+Rb~@0k@qTa{dXCl5VcgW9~eB|6}1L@P*ca(&9-Lr+S78Wg@+(PPuIv}3>Z<D%BL
z$2S?A8Tr+P%==^4_G|N4(s`C2iYru`TC6>dZtU+mzf$=0a*SnbkxD#N<~L}u_yBdu
zna|Im=O+~TTR%mdfoP;Ing0C>{Y)yNij%#UpI^G8w>I<4>W|Kyh`z#BKKpd}*@bA=
zj(batjOP<}-A=o6f!d}_%tO@C$t>}E=T1I|T($n}w2%av_p>*Y-Ih#Q`|*igF;$G(
zM^`o>>KF90onjA`74KqouCUUFg`TTfGyc<l-qSlJ2Q6Nl-qS)yexKbPH+O_jNb5aQ
zk9vo0o;2@|;i)wPxk<aOD^{?Y$!m1YH?r<8*&Y3ByU{go&-5$&v}z~q&64K(M$c}t
zH=3*P>%nAabsC@j&Gxz7^)tQHJtwAHIm<EK9^_;092$j~&rVod=9WyZo}W{K+SQm>
zW`9Iun@>rjKMx*&;6bFZ@};p`DD7L_8(6?ug7vx*yFRjy;(er_`uLsMC-$R&+^OD=
zkyl@z_>m{7Xh(;=bL>Dzsn5-d9@%^K%lJk4GbU=^sA9CTAnDL2K5Yt`wCYh>Fn*w^
zXKzKTk@;UFkBO=2IYA&2=3iWbvd_W<sdUY-$K{5D(LG8=wKx?UQQc(L^d7$FCwL{6
zkLP_CI-uEm8%OBE*eGL66>Hv=$||a4dfRh?o#+h}LZY`mnAYh~$0bDyR;$Eg^Varb
zM4!AdYQTvDnQzh9M^RSjmAfb#LrlLstO_+}E=;Bl4QE&V!5qadUemI=XOAue8MEdV
z2;<uCOk7lb**IqPz*E?73sLBkiIl`0Mfx?>^S_)<o6lBVVvb}N7c$GP>Bl7;X7MBQ
zuQ1U0E911BvN@gfRg^(ror^oyn~Iu$wqVWh0hj2p!>>0x_)XNrR^1l0&6pVae)Wp$
zkq0J)RB^qIShfl(vqt^=boG(}hvCVkL0yKP8KR2vtqI>hjPU_`;D9fxuYJ;G4}D_L
z>6>1Ej-zHX%z`=77I9~9^xt8m7R>32Xsm_EXW1utsB*A6Kh?-a@7=lZI9XP`NV+v>
zZq)(fp|g{ci%+y1RJEn;=5@0-#`a79{xQ1Ndf(jGzpJ+^4(+6`fIImcsQh0C!vxkF
zQLZG^T>IpYowQSkb(9l$?*qnh6}9D+lC#xK4<+xKcZ-$vg>T3OpNcls%$$AIvL(lI
zeRon$N3aoF*)RRZB1NE_megW=hiF8Nq_x;HGGP0Xi17Z8TPx9uHG!WN9NF2wGbK53
z+tPhu`TM?G(R%rTrIh@F&WQHF!ohlm&)D>LS{3pRUW0rmo^QTfqi-50zh3249+>?X
z)rX$Ge0xfK;PlfH!HfcwbU&Lm<KSqvX3v|mg6~d1bE9U;6`Z{xi%?tPoX8R9_!&o0
zN3h*lOJ`<%*DMV&=_?T}JU{TltS;xIRNr>~a~ECK)4aW6+p(u_pnTj?9x(Aq?By>u
zzq^9V8a%OY2*0X#^3djT&6P#-W=_`j&?c;9c-8txuILePPaxi#K?}%y=liB?YVwsn
zYuQ8l93LOKsqM!#iSv$~p=V}f2(KnQp0)gWh1bQ){t9{mJC$DTKa;t$V<*ePE8bDl
z*{zdz=iLdt|EN-mQ0wbEQDB%3c}-40v~7`XE-_~YhQBFFY1Jv>ieK+7ISfT~#{8&u
zUi9f)cJl6lcS6H*%8u~85>}zwv6uJjPxRTeWY;q-yVvOIp1CUdjY)f!4y9VEmNDt+
z5xtY;1?dx3eXZ#3uWGHHv%$ZnKr~_Ags_@k)zO#e+7Bve>zbte*;jg;=B2sQf;+G{
zNdDyU#E=o}%xBdBR3>MC#C3LwrdlwLq3*IQbCpGi&?RQj#8!bz-%G9z7&Z{ayfvBK
z=W4*|4Xh!zr_BEdtExWJvy-fd_Qi<&d8g0v8N&jqDTuZNzAy{KpHxIksKk?D_$-pW
LgjNSb96tXCbG{aU

literal 15144
zcmeGj3v?4z_N9SBLo4N{hhjO?inK-YYx+rJ`fssin^M~V1r?bjlTVvuLNe*kWvM7_
zsc^upp9A79MRyh4RS*R|unK+w%SUw86=hdh6oIV>;v(y@d*4eYP1-aNe@8KsGn04k
zyYIet@7%fX&VBPV8Z-?dG!k8nzD2{JB!ClNgyfHcvcRt#Man=YxLP3e;)eqi?JY+^
zc?{1d`;cIQ7f)Jv%b4diJdH3-kbr;#?ou#WFv(Y*D!A55k84u>_{$OWg2n?@B1rd@
ziv+oTG}ZlWqjqB6W7B|s&Rsi5ztDbMYg;+SPbq_PN4td|kLnxXjrHOAiN0w?C?y_w
z{|gPQj-jf|EXTUctb@vy$WXdWmZg#@RSG#JSE%G!s!SzP=QlZMeLcfbI>uzN=catV
z<HZ!pV#rOIo2ij$9L0>;Qr6;RYFa9_`j&cqjv*yKPo&PLF@JFr?GPI+R*rGHD8{AF
zO)joZ#??(KsIf5|O*Pr9c9*ItH-$7%K^dc^DHI{$>T^?SHB}VHvetSFN2N=Yl60{`
zF`Y6xX&ckXI_oL9Br^qAIt@lub;%4bLx6Hq%pB)XNu`aAjgm%%gms#v@|>I;sVrTZ
zo-PIov8&n6(M@8z>pJL<48&6FYi4&z$e1L0)+V*oO63xn6gm=7q^lAT$7ykJ7S>MD
zI@ZnQrnub}gDN9Ouhh$Ra<PI|W{Tx<gHEi}$#TRwnR;5TFw%N?jxI$+@p97+jV5@H
zpdiwv&4zoWC^aB78dV9aciR{{S6-6m(U^hNL$?n8MtTQ8Goc2cmJVVDVo9+I{p12!
zJvdM+C|K&dX?Qq4{t@XUEFDMG6;W4M8VHLxVqFn+g{6V8h$Ge&QCC<R2#YvkT@iJK
zrGc=BBi0pBS6CVdi#TFk5p{*7fv||bt93zshtCQzc1Q&^Le2+W3%RH$_$iCZHN$ZJ
z4WSVMxa$cnen#xs<x`)V^Zw>_g6_?at!~8h!jrfzaWn9>S*Zp{7eQVnHyKhc$rNMP
zvj&UZl$$(TJ437_`J<$gS;g9URi%`}YH@K?)$F2*@?t7kER_~I99D)ZW^E2PWSyka
z5^V`pRZ(7}g*=f=DlM%{rjq^gLNq2P86F^XNvoW!gK=`r6~I*t4I~E6kPNvGPd5SM
z0<6KJ=ki1`>UyR*50XR@4>O0;V&^1Pw27I)I&Cx*HD#>R(!xTn$y&|0)KW|j&AiQn
zx92Q4=_b)T8Jc6Ae47}xiv#wif!zVhM%$rFp!8CRVnQ;uaEz_c>7<+cS<@JVfk8ul
zXhZP0v~ZXS4BeWSoenu9T)=!oj!18{Kwir?93T!y*3i6dtf7SF7=Pvlfb($1Q!G=8
z6>_aSN0pJS%FLOsmXfMVj@QKjhZ$Dd<j)muJp*?kPo|dgMWRqCuTiy>S2Of;x%M;5
ziB&`6WFz01?-m8MzF&^@1Q89}39mePpdKRz6!V=7s76m)!AD$a#xp=HpVI-WiTE6!
zfB9}EGY95D3z*FnIAaA7&1X81`RWIluXqIycs{R`Ico^<d^QwuKUfufcyrnA$K}>(
zJyEZNhA8}Yi`~fH?uleBZ{i9FOA8HkZWqTGFtVD__Xn0fD-0b>3<$i#j7CF6WrIWS
z7&RXhV#V>HA}(L@)nZ67ace)W0FfzCCV|kje{#G8I$Mzuj5;$rD*)XelR&S*2hB&M
z1B3i9^%|P{;4mMwIUvqYmys_UvIFA$kYf%O==Vpc10sDtyZ1AEKWsR+6rO@#h3O8I
za|qiN%as9U=QZge(An9+Z8s+n9kE^V!s>b5_4(|uY!_}{IrwTwbW~x-T?t?2@DAJ0
zn*}v|-Ys0Fx0N_-k}B54)sSy*{Bs>4pWyHBaYKoSt<{^Vu+w5I!$IOHU}&M8)}XwH
zkK4eU($K<(?je+0RETBSVi}}Avf;}il_Kkha*Kmr+`q4B&9>7&&5Zstu(1%b4&fSq
z_0xLL^j%1&@RLmI{eHv$o&xqqoY#M520T#MAuM=^S$qie6*#&7%q`gAF#H-O_@Tt~
zo8)KLP!*9$9<OrzAd|c|1T3s7hr9}2_v?=xy-}4+CP|0atjk;2g5|dcc;%~L_4WOX
zjI`CoNbwp}s3??ccK8LZ!B?MPVbAN+wIo;JH!NSqBUB%Q#pGkhfl`Lz5=2O~PsUIU
z{YB(E9vEi!r%?uq$V;e}k_FK`5m~$ajI8T6k$nnf2zDXBI`Gk`g1+9qUSV`pwa_#?
zRrn3r-N4tr7nO>4EFc4%uqQ)Ec4#c=gEGeY4)aJfQLvhTln*(mK*sPNf{rJ>V=j0U
z@K4sFr;@s>`WxoABC<*?>?OFkSgn(`yBxF=mYSPA>(>)V&1AU7AuVzu8rhKxIpE)k
z7%1yevzN!`gc7*-^^p=tCGhY_BrsVCC*z3o!A%67=z}K{8O{+nhFsy|<su?5=mpcj
z{tbMHe0m}h3eOX48Il@}P-BH_G{FeGnC>-eeVBBp5uo{S<!LerM%<4fqqzVu0*OJc
zV2AJot`1hy*Y|zuh-NTr{4s$?k9dzvKQxj+SP!6+r~=RFrNs9Ok^L{8mI)XXV);C>
zVh|z9d*X6{y<r3#{x}L?d<Go;1bl^eKp3>UtycKM!;XfXA$Egnmaa|@khfj6o|6Ma
z3_}ZBZ>+4{1TZ-&7$fHo7jdl33sab&+GOVIF&yo(TJ(%-j<v!CkRYI+;iL}GW8oY@
zfbtSQ-Xly-*6j#DMZ<Rru*rw9yKT@WwzLLwhZS1D0USrWIrb*T&N#up;zt*0!C`ud
zMIK^|!8PSJ69s=iw){f3)2c14)k0TZ<znRrVl*xj6M%`Pt(=xN1>mmIGtiD{;>ulR
zT1|xx_8Vb_BYAWHag3RDwiH?|CSFscJ;K9h9v(Eb9ARLLwA;!-F{S~Q(t?oVWdwo_
zBp;<S6|+{>>8IQ=9{xo)`6{3Zs$}h0*D)OHnC0eN3~v~?PGki`8ibA2u^brGAp9t}
z#pZ$J<VhTZnc<Cd1cIGvaA3n7PT(X0&xR{dAT$~kf=g$S4qPOKs*oAV9Gosv0#|~@
zU4nu_*+_z9m?3J-|JSTD!^R`Q-Du&V=L}hiqdQ7;H!B~VbAxcnO9k;tb)9(B#1+RD
zeLdxYvi-*0$G+(JG9f2sS?Qzltr?xMMl`dgAZGl>qi$S!Af;y4unU5M4F}9$&dlho
zQQljf`qo!ARgJvkjifO#zulImSkm*!nY#Ob|9bw`!zZ%pZ`&|Qvu>X~{qg(jw#>Wp
zrg~S}gf`8R?MJ3exN+tD&*FBJ-?06;l}qoiPCU42+oFdB4>|r|*cfkl=2JPfbYDhh
z)9<GC-LvE6FWwvZL{oAJ8u{?4J#9Par{AA{qUDAc9-234XHVwb4|=0NEI+op;Yi}T
z!lTL4TBF3rZ>>Hadz9UNwl}V2_mMNDii^tpy0mLoo!R=}d-JrLI@+fF-PB>)@zJQS
z7bo?xs}7$0Z|mrNpB!CZcdm75!TzFeSFhNU{Pvl@PCv5i^sY@us?HUbb<G`F+@W~V
z7`u0uStHvek}dmN*>qX&mgUDfma9&m){j=)yFv8vYx}M%T3#}&$1>)XC$?6%mzpVa
zLekCm)nBz^?5%6t*4*8*IB{e3<4Ez!>PfRi&!+x+Rnp#-7Z;^=zj2>&>7KD~Eg84|
z@WswOJ!#Y0Uhk?{w_$I2*)2~^FWK6;YwhOF&if7?S}}fO;>?~q8lJB_`^b~+2fMUu
z@(;vJ+jnep*V}cErDcpix%BldJNFm2)vq@1-QIQfe+4q_v`N2tZTSa_5)W-GYMk+m
zwsi9IvFD4+WrsVL>7MC!FY9bi)qWVgA%(jjh_8|NJh9;5w&8PU?*3{e9g}wc@PpSY
zCL|Wd?>pS`=7ODF!rcqI-^skC;mv6kpC;7K{1fY}IJI_SU3JyTT@?pJ3GcVv_V!Er
z?T6-^>RLQ5d&=2Ef7yP#rhe)JudcfDNW+40l^dI8zo=NKc=iiT^0=9C?i(A8arYll
z=H*n@&RZ6@c>Xo-)IR)**;w_@<7IzVtkBn<%2}<b-ZrV?&2uGBx0`InJO225!qxiq
zpVVe$bsOftx@ukbMccde-R_24?pn~GVVcD?xvtjvs+#Plir1W+{PgKfa}I7z+OqQH
zo#qRzf+sCq_q2DOu6^N=HFaN|XErQ6^}s(~{LF0ssI%~caf0@D)uYAx&#gOwT3g|1
cLBjRky{$M3Ssz87QT#|!>xKPgOo-6`0fqG)TL1t6

diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif
index d6d835a90bc790a75fa65bcacb7679152b6a592f..bea3d9d4420de6a61a4f482239ca0f628337c26b 100644
GIT binary patch
literal 58464
zcmeHw30PA{*YMmVgneJcm4FK_EZH{!2>}EZML=<{A-O;_B$$Lns}-$U*Sb`#Tivzp
zTCGdnwOX}W>#kL6U23&zTdmc$YRiA-CV_z3^nFeK@A;nZ2JYN5XU?3NIcMhFnYnjn
zva(QHgpdacM}H$0Km=UaVNy2^z=R#lpkSaQ;s~Y{?*=}$6=nb&XybEjI1yyU14AOz
z3gg&eRv7bdV54{2N;E>i4JS{CiN-Z>64AttPirfT)8Zj;Q8R$j2|fjf0IVSr?Pzjp
z<1%(*-aC0fQ~B;L<PLG++O=j}CdP-226*#(T3dd;7rtl0;XWA%oe=^pmXqbr>qQkp
z(E-SMS7;0cBqzJrU^bYF4W%4qu8@<ZQfu|tkN8|3SI!m4xl#^KDCdghA_+?9P+6){
z4<^l=0<uV}PmKCy*S;u@R+AW&FUsO(l`6?%ZN@MonLDg&o_g3|wM-M$A;~MDQeIh7
zT0)vtoXQfN-XyO~j8fsW<p5)Jd=!TwF%M3RvSg}PRyIdzFp?Z$96yd9tLBOY9FZVS
zAmWSp!Wa&p%az7+CGi4oEKe%uisV8b$NGy(@&YKqs40}^q^4UF1YcrQvDsWIkB_gY
zsEDf&#2Ji5@jRJK7SH9!^ZBtr5o;Q%H>)aR^`_<)CN@5)q)BbmmYTH&JqPnu6&T9Q
ziBVBFp_-qyWF@6F3F%F7R4L=shLZS7RcSmgjvHUY86qZtROCt{sWKakc?N?n=^qu6
z5MQ6XHvL*oWU9(cCSl#ha`~}5aUPE^7xLvIQ7jh(#kFH%p{&Ov3$&q8nN@aN1Q0XN
zRs-z0)S<1<$Dq*`4*geLYALNe65_Ft?SxKg6w9j~-jOmi>Ka{?mKk-F$~EeEQb(4M
zdb0`i!K<qejapu4FqWvyN!k)s5gBjR78WMN*J7QWK~QK`R!tsXSzk&@;$KzIOy;z5
zsDjoi{mPi8yrHFJd=6<clo{1zS~(QC`KwvwkhQJjU$6r5+6H2+##veNOufmh(yPhL
z)FdcZoK~xmr>2S&N{Lv)P2qFJQXWsnPvNGeD^s~CT$x0iDyC{<-Kcfz5rm~0)MZ#*
zR<;^on=at-1wt;LtF*F}36*J*^i-Zg!jq+QMK-o}QD0))&8P(frqbEb;9UPF>|ep+
zrDQU+CTQG4Z8g|pEvR~&OAe`vwN-GPma5mKDx-<SDol*B>CoPGSUBN0R8^3x)Yv>F
zsj)R7H3{)`u(jE$A5HtR(i}_I!rLzD>-kp{llp(MMiy2S)$5s<429+jm622wK|OF}
zBrP24Myb!*VqtVz7bw7_Dt|-q3msMNHx$1>&Z~JC{LhHLw$`ePRr(@QlN4{Our|d1
zCXI=NDLjcl%H#81XO7-PV*<Gd9^XRSgO}ErKIx6ym`LJcjfvy}F|Dz3v+c3;<{Fc_
zTw}FeWV($xqm9X2tTC~i$EVwv6Wdt2M3T<qNrYU9<vAuzRq|3&MCm+5D!6=w?HT>w
zb^L^K7^(Alw8osNF{x`cCJ@N^bk74u+D?0prORBbF`-;2quZD>HKuT}#zb;HJsxvv
z8%uGq#-QgRrQ4V@+nCbj8WYmbF{idMm~VAuUr``~w-$68b7mV$cdf>R(DT5ril~=N
z^a$DsBWQTX$#rEL6GG2}o~3f8RfLyPDJfzhyx(%o2pTj-&r;zxpH3T(2}CZ|m`u*4
zdmc{JnAqhSqphNI+Zeq6ccoPn@#OFw5Z&`|qE(c-SYyyvq<bDtwTdzqYfMb{6)l4r
z>xVXP{6<rtaIwZDauMCeoZ7}xT&yvv9DlV*kD#5`yH~niWAxm;Q`;Dfon6{jl*$DX
zx{Wz=1fAwejfub{$_4aS1I}z?JgFj0q~MCU>8_Zi0*&!$jXAfk$dkETV<P&Erc>LP
z!o?cH>$2$Qm=m94ycCyfjQ%Frsq>0FrHeI251*ZC5>s8RE;;>?hjSZPn#(mNqCfI*
zY8y*;y~gO_vokfu=eky7d@j9s%(;UxKF`G(gJlx*q@q*X7~i!T6Y%9cdWy=K8iQ>D
zgy{mMl4o5~>)fSCusV}Zw=w5h#T1^4HAXK*s=L#}8^3@~;k#C2Lav-oPf<D5Dhgbz
zG1wY{9*;R!V=`H)P$A{HWJ#@9E`YZ!^hftj)tJ!b8lx9MJ9U;SMdWgg3Fz^dQ`?x>
zwHgz`o;ma^l`}OaghkNYG@guS-Eqyi<1sOO4J_x<8gr_~U=g%SH721yR&?$NS_q4v
zU8*tou#|3NPHkhUF4q{{yLW0|Q3%V{UD?J&^!M9NZD6ow-L>kH^JtUkOpS@SF4h<y
zb|R<0dvoG<Zz7(HHAYV=I(gz=#CN&IgtS$3s#O%YTx0ZFKc{vSMM4*A435*FKN)al
z8xtyJ0%e*~z)N+-suoZe44>&&El$-~s*5!yqu2U5d5S8{l^T=Cxv+AKe%0dCHkR&U
zjp37_=<%2{$76igYK%`$Q8}}Lam6Vjp-7NoJN(1BZ^k5YJ{<l*f0N@(jlHzZy@Z#p
zkZ?r;_}-MS5K7)`n|s*9LrQPK?c8ohdi`zgovblFkN$q!xf+v6r4lJuq2x-fgE41o
z3<hKLwu;WQiZYoiH3qw2^60Hgo!rJ0uGJV1zM`W0icW1~X)e>4B#(!8!IX39!#|v<
zF)pv}7Thl%U}|a8|LKuPmNRt)asl)e={Dw6jqzQpF*uBoN4GI&YAjXh=#bzyX=B!t
z%jqeq+9@ivL0?W9|C3XK;VfbmoYPJkO-Y4DLkUM!TB_5kRrti=_;S6*ddzug%|Y^J
z1IPXVZHxZwnEZb{-Bm*xwg1V9ymq;)krU^CTcO{0ZJ^_WyXiJ*J4)Mfm~`Faylp3t
zzkK|60(Is)oNiB5%XHkD@TvAt?Hru;4Ih!f!RvCno<_|n>;J-l){9!F0a`h0{+ol=
zEt#^5`YO(bH#uwFlEN!k)TU&Uww+LICwp6zlS-P@Mr|o|Lb^2?bq2c~p3;J<z))sR
zjEbsd4N9&o(dkWcv$n7>F{;>XE|tf}>rGaZr#6(t<B)h>95>$nc=iO0mBR_~aAG-S
zCzE&y6lEP;Z8{eEUihSUT^W^6STP8{cpi4GQSF24NA3O3QSF24N3D(7L$5U_@vW)V
zL)VYh6^d0(rfQ2w6T}gTWB4KoTvE7XF?=yUhA$Dq1vsfNMkL_E#RC}dQb7z~CXNws
zc`*W>6fRkeh!2;54>;f>;lc&966_a2I9vjufZskXB}FC^NhN%^3lySMfjC{P6v!kJ
zSeYV|Nu<_{*U4G^Y-g6JipYGe#$22vu$9yf_e%0Eq`v4SdMmPigcPmWlua6QRVAf5
z(pC#Crh=++b?t;*0Gvh-1;Do8_2<&NlH%27jH<@3E0d+tDh(y2M$%-0&OnmLssejl
zeF<gbZUXcsj9PW39{Lmz+1f;G`glD>eO?wZV}WODD@k3F(3*aIeEoRYI+b2!R2uY!
z+M+UJ-3I!qFl&6LSrf8S`x<M4LteHf7%QiW*eg|ALh31D<NEu`0K3xGhWCD5M7x0c
z5tRm=!I)dBQj^$xQM~L>^{MN$JAqg#7RCs<GBKBOp{+}Je2dGcFcwz;coEM+BaFeZ
zB$Nww0opuZzy*v@D&kTu*aU#VB7h4vL?QqSgI%BpSB70FP=bro5`ewIE>1-Nb_lx=
z7hEbXSRo-#2%*@8+=6StNGMo}T^ZyPT#7~}0$9SwcnMf6aKWw#c{1RMT^tvtQ7ISG
z$fTG?CZlL%JPO9#WE3}<45tVNjdCF_pUV@+fbEL`dl@5+k;F)2WHBHb9xsN+kKqYo
zc)}R4g+RoU#DL-C11*?Su%=*WMPPHmWP)`CquD-H46h|qg*=f$ppfxIsp1r_SjiQF
zsTB#*L_#>qnNnsQjXArH*9-?<{n)Gtez~^S1j(t|mSxb8NrHs<SE23dU~O=wQkiWu
z6l%c$n{qm)a5B@BVxCMaj^)QeHGU=CKNjB7>~m7nlf0m-A%}h!m@idb<8JE>I{RK*
zKxcEd<3}fACk)3REiT70vZJ8IWhV^BAT2J(GP0wf#bqZ9#~>{($1<{`pv7e;496fX
zF2^#mqoBoQCk)3REiT70vZJ8IWhV^BAT2J(GP0wf#bqZ9#~>{($1<{`pv7e;496fX
zF2^#mqoBoQCk)3REiT70vZJ8IWhV^BAT2J(GP0wf#bqZ9#~>{($1<{`pv7e;496fX
zF2^#mqoBoQCk)3REiT70vZJ8IWhV^BAT2J(GP0wf#bqZ9#~>{($1<{`pv7e;496fX
zF2^#mqoBoQCk)3REiT70vZJ8IWhV^BAT2J(GP0wf#bqZ9#~>{($1<{`pv7e;49DO<
zipwjZLnW*g8BCfvq+XL4RT0%82{mCL1pi2yl9|O~0f3Nu9b8Ka7jXAczsK<h!j~+4
zyJ-Dk&H0^}p81m{3}wKbfIsV<;?;@@^P^nK=}=`!h50k(_4Ua!s`MsUSV`*DLoMlt
zQX$R2^+kEeh*U_AOsEv@MnnRvMnkPUexWFVdv!GhA*3NJJVcZ~5M1IFp-rh!s+?3V
zeQW%ED1XBme>19tk14+=<$_~LBRYWcd*KwQA3@PRq2LS@UswnsI&j&RP%CE1+<7$^
zK7<gc54biOoNoff)?z50e}Er>1fZO+`Z4d~;8%rISHDRZB@4`&svMLLSCU#Em+}!-
znd4mJl3;lhQPdt32FnR>jAYAYtz}rh2-WJK5%w~kf`emO<6xY=Os9hz6E2Sem5J;M
zi`?_ldgX!N4fTMUK|;O2KQ^oj)oV=M3I?gcXVprM+ROtVl}?_al%q4~i!d?%bs-DQ
z_Wl%D@n-dNaClBpu`L|?*(O*{Pnvq_x|qO6)JeyU3IlWyT<(-7Gu4i_dy&ylR$2$e
zwyc&V^<^ax$0scpbBDF4MOr=heN|;<Lq}3i!n!w70|=Biw3M_Gds&Dv28U#p6mj6@
z>hd$oj5@2}t-{5ssf)=n71@+yp<%0Z<~&tV9V$OH3Gv8EbEYXHFRM#|!Jxy$9yW9x
zV$WiOahO7<Ez(;H?{6u5h7Aod-8E#Ps!V4F&=YT(@Cx#tHgsKb?}8#~^^%=%11<bh
zI@Sb06x7wA$FlY`8%n#CnN6gvV&E_@9aN;3us#I_GgPRT@ZO-};(Fv%YiW&nAs@IH
z9UfA!#g>IoFs{LtR)r}L%N-mnHIDTfXo<?akHQgAeX0673h0!cnT`l(vKiPWSO0{3
z6dFST`Ia&ZD1JtMln-gDfCEu|1&u*I9v&W^9zLF)K7rm|-hrY1K0f}T;laV7!NK8y
zKGe^8vv}&egs-=^ub*##pI<<TpPyd{cKkvtQ3C%BgX;Y#&;yFZVG>b@5lAotiRy2m
z@iM9p5gj0xZUps%4C5aY3deF|yL)(gdBcOJZXkgeOj}?8B3J~I!D6_%vpw9HJ^}~~
zWU?ZIcy5aBs^F+0qxkHQ=}SIIY2G3<=Rko#XdHc7>E3ci?!z08)Fx5b(#`L-O8p>D
zlXh^KS=``EkDKJLTgH5Tw(Qp9^yrz($9_8N(7Eq_Te0=<`P)x=7M72jy>i<Z7k+pu
z>6l+s@!p3YZ$EPJ&hLSU!GPSds64r|-9%ItB6&e9$ia}PU^o7#=^;1=2Xan76tpO~
zVH`a}nH#D$2_Lm&;|#dB5*<7PnON39lh#9QCU4ec;q^I)uFXRAW#q%8(hNi$(B)@8
zJ^8M=f6Kqxt>|!e+j_o{73A4?Pos~^zg=JPV@$6-?#o9EzJKYLd(sgZTh4Aem$m(B
z#13}v-`18a{O-&<&kk>C^21*x<zc-`pLgpny!ykO((guotkPfqrQ)-SZ@t%#==5yQ
znQb?pct=c{K4R>)zWv`H^2y|7=Zo$>y8m?Z_S1hZS~z3+h@Q``%#p8Ol)v-*l<iTw
zBGP&*cioR0yk_W?0e}6y=x)iCdn1=W8@z1*Z`J_Svm3LfPwjhLdv8~NQ=iVg?tDM{
z?7alvt<Pq^-EiOIi(43eOImiQK6U!pohNU#4_+s@ADyxBoJmJMJs-U7^6~!nN}fKC
z*m7;hq@)WE+Lkt*s!nUrxBS<OBgg3z^?r><3LdPzcHVUMVUwG;ru4k^=at4C?xb|8
zjGJ}Z)bHB1Yb!=n-de4>PTqRr)%Bh(I_kvAeWABE>VN66chL&Ni-<qkxBcY#oc{UI
zj2E5WxpZ>%*ttWNZm&x0DZN;3iXdl+=k4k6iNODxyM`yf#%;Oq+n%<0^4UrGorfIK
zhyK-VW&hG+Yt|XR*gL7W+F1Vc)+eG%7q0w#<!}Gr7Cn4tt~?@5ZCF!{wtO?Chi~zk
z`3ss|uSQ+h<zIO)uNp18)%~r%_WeEGE4TU^i;ak+8bl9p;c1MJKT;qKGN1x@IC4-n
zDhAjLmx+Q(fg;!e1qUfnE)rsfR0{r!0Yq-wN(`mg%;KjpP6+?7C4#C|<FDz70G`0T
z5=>P8XG5}V1h2c}h?tnZXc^FT;QwYFurnS6Hc7Rk1HU|#v4}M1l4i43UxfSR*czcM
zvsqcEf9_>jMBlwkh5ORjdZ82@r_N}gqfuYSpQEW8o@dmXY+Y3^ylg$)U@U>oxuyT^
zm0p7Z-fr1lJMwW(y|j4q3?1yvpuur*x;}bCmdb1<sqUqXVPmu1FgR6fE+&l%T@j2B
z%*C*g1T{kNuZPCGti96kSHv!X!B9;n756Xwm*5!e2_?{Z1)x@jEb9mh_b|h7hdc$Q
z2k>}Bud&Isjx25Tc+47HOG}j}MOQ{zhdsElhSUr0XoMk*U3gHv@ElTO7g|4dF6=;J
z<BlIbc8OD)!(^+>#dXFGAw5ha6{0ZJCRC#bT-1LoU>Kwks?b%ahME)_jY4Num|;JZ
zf-*B{Q=4xMMhPQRYu0h?@=@vxCQ<>z990ojYXFBl()4PB2I{Gm5aWVyy~$OT1NI;D
z;svyRN<-<;x&^^vXqZ}N+31bLyzuZig)9b+2BS3{Oca)3F45V-@y0JOp3$3agITtf
zl3~4vJGf)X1W}UBEh{KA=wSagyJ5LI(xMWWt|@}v2X2xG1>#VgDs19Xpw(&3Ltj~=
zu;hGeNwZXHo3i|Bu|2wG_Oi*}j&HtJuQ62A$T}FtU8QB_EEpAPVUHhN@|v)4i@aYe
z4NsfgtoIP>-6ox2tKTNI*GUUYsR1>te{E7W7Rbud#=42s{}O8~Ok1t4k$sIgAfyXS
zaHLg&S;D)|)D$_OqoE6I1Z7i!j;g`H3k6VG%u<zhF<7<=v?h!vdVFkQcyw&V<2e4A
zdbO@hgSmlmGE<4*Iu>Nb_aTj7;*2nnQ4_?@)N6ngGqHB`yt`=iWSSl~2a}aIR=>AJ
zZ@p|2130~)?qvouZcH_;t%h$PweOA5lvYw|9;$?C1sg9M&lU(%1=?W-*y2lPO$b{$
ze``!UF#x+H+6VdMnukJlvDkOJa{K0`QhQQmkaz@d4ZsC=hgM$C0I)$7%G_LA{l%83
z3lts~t42FEwS{HDMkN}RS!F5vKiUC2Ipz)4NLglr$%V`u8xMEDrS-~8w<X91f3K`;
zn>X0v%{7!6)l_5Xk&|f)^QJ6!wgKj!hT0X%&z7q?A-G=n=fiV}%+l($B`Td=B4HFB
z5P61Nt%g*qjCGowJBS)r${LAMPo<^65KLo<Nmv1QVDFOwHN(Jw=TnK^Y{Wam^y=M*
z<9-stJYjYbX7f~PQ)yOidLE7lyT)+v_AwZ?{y-y7FIYw+XJa$6IUHNSzq|*kOO5b^
zB(i~Cpn*;403HLduELDRKEy+SLkb3Cn1O3jh!HXfa5#pGEN~1(V}X+~tSQlJfClHe
zR8ykC@F9T5mzUw$J!Thx$CYbIkOA`?z%6uTC0c;-%x_2usRA>~!t*{Y%%r*)U@pKu
z#=IOQzzHBepCUWBzz#OUG#k(&{OF)2o;a=5Z8)%@k(84`R_LJL6q^l?dzDecp^Sqb
z=GHA`#<5V)OI!0$Xp8fYfp&EN1Y+G<!XJ01bVh`osKwRBti>6i#z<k7ojI)*S1=c$
z?PC!Nzg&xJu^4LV7=*TcZC9Q!TwkpF16EX2#A!)&92RKJ&mln#<?8{v^x|-OHQO3-
zQZ4h899*l_ux(eFkpu5O)FdaiekJ~|Bid!lE*~+lwIqq(v5=geP|LvRg1W)@;!O-W
zT78|(m+UzFm(lDvV9-*p0SI3HHwt+x4h4K2f|x&@K&)VI#O${aLWml@b@A*86BY>N
zN8GX0dw?OFa_cyZso-UpwA9=;Qs(4w)MdtU3keI~+>jScgoL1ms2OUGTEklvK9ZpJ
zC>f=pPN*BaTk4Glz}uu^=&Tq~1saY<p>b#unucbfd1w(@j#i@$XfxW5cB2F63v?Wv
zLg&#HbRFGB_t8W26g`L8NO!`Q2qqd55kyO(9l<B0L=urkbRlwx-o!wnh|m*d#BkzW
zViGZfm`5xjRui8PpAiR$W5j9V8{!7>Bk?QojKO61FhUqj8Lb%c3@Jmw=*-At^k)<?
zhA@UP#xUMz%wa5LtYd6r9AF%0oM&8T+-E#tBBnPpj2X#{WlEV!W;bRZW+Btae1|!a
zIh(nZxq-Qpd4zeEd7b%y`6r9b3TAOwv8?v23|0@8nl*&=4r?-N9%~hA8|x73Eb9jA
zA?t59U$-W1?cC&UnQpz@irgyP#<|UQTj{pd?XcT<x7%({*=%+gJDM$FXRv#-2eIE~
zPiB9_-pJn1KFz+xe&X)#-q5|Bd!l<cca^)@eVqGT_jT_3+|Rh*cK^e}+atn*?~(4&
z$3yQi+GDoI8jrmmXFTqBJogOnZ0RZY?B=QQ9O^mMbGheE&#ygidp`FH^osUM^vd%Z
z<Tc7`j@JgS!(Lat9(#LxM|sP<yL)TBtGwrUZ}L9seZ%`tpCF&MK1!c{K4m`d`+V%P
z-{%{j$G*P4t$dSx`}mrD-}hbZ`?>Em-#`3<{o?#G{WN|f{pR~^^E>1Bv%jZ*OMiv`
z0RLhBv;DXDf9?Muz%!s#fHFW8@J_(|fX@Oh20RH24&()P3oHqo9JnU%Sm50t_n=lm
zX+fHxF+t0MJ`cJT%nWWGtPEBMzZ<+f_;B#;5Ozp(NM^{OkVzryLr#V~3=IkuhV~4t
z44ogkC-iz4GptouW|%H)YS`wm3t`V1G;N@0KsK1rU_*m54So-A9G)CbhEELN7=Awd
zSwl|4w1$HlPH(uq;kS)gjoLQq-l(F{!bXQ1J!l-#xP4=F<B5$oH@@72(WGsYoF;EK
zS=Qu4lP67^HSO56wCUWYpErHbEUZ~_vq8;fHrw0m$B5vFqzG-q%!qvv_c);(1xLr3
z!#Tux7}+E;BeE=VN#x1M=TXs7J)%ZOZH)T1xmR;(^TOscn;&fcuth|RtQNyttZi|*
zrDscN%i@+Fwmj1E_g2xZ@>{*vYJ01@(c#gV(ZizGMqh31+qy&RA+49TKG%lbM%rd@
zn~&O@YRhOVYFpfPe%r6xG1`gSY1@6&?sSYBY?-HzSsHUO)+bgGTOPYM_C{P-T$i}f
zaogj5j&Bj)Cw_YTk@&y4BCd|RoO^{A#OuTx&D+WQmEV@H=FjJ!6Zi_!1tSGJ1doL6
zgrsnx@RBH4lqGskbWrq{SRyuxH;8|fw2%yxERbB3hDfuelch&xZn6~FNZD@LpK`I>
zEZ;2urG0Gs!R^<yznc)9Kqf3txRn@{s7hRtcs+@eG%#s#()A9J9aJ5bcDR|`JXw>x
zGWm|8jbe~uo#N*dZi+EwYs&9RxpIVZe=0MzW9r1zlW9R|J<{f-T}zKjFG^pV{;;E{
z<J%qgXSii_&X}HYF|%o=I&*dA!%mV;BRU=G?9(~7^SsVCyR_|M?6Nb9k<}^dgRHAv
zTXxlV-QEp#%k1_+w{Nqfvxj8w>dx+--F<%dA98p(!*h=02Isz&yC(N(UP|87yemCg
z_bBUeu%~~|emz(B{5?N4e@6cGUh%y~^g7<VQEzSU9ev#U^z5^;&y&7seP{K(-A~kS
zT)zwbqx)C(KQ^Gz0NsE+Z~4EadTYx-w}JTs*9?52>ZV$%dQy;Cu%O_fTB-g}eP5HT
znW_1aOeANJcM1~=XB6HoN-X-I=*Qv?#j}eaXqDP|+DC&j1}z%&``~VaKOS7I%hzoz
z@hBNs@|iwJKUjar(9BS2I9=MVbX@86A@U)!hCDQOHm)=grv9cK<`C#iohWNvHn!|W
zc~bfO@;@qiR&1#ZtkhSY7}|E|grRqar4L*2HtTKm+Xsh74j(oA#t6lTCGQaL6ufhA
zWb=_@M&7RKShZ@D*Qmjxz8cLPJ!AB5@8-X|b4=4QRby_A?KpPrIKOemaTnif|K6hU
ztnu3MCnpFd%$@M}M9su6Cvhjup7dg}dh(Z3cvI#~seZrk{gYG0Qx{HSPt#AkFulX{
zRWkx-44ZN5gRBp>&E(9SIP<qzZ_PS3TR3~shh86+eRzFNmpMD;wwOC@?u&WF^Ulvt
znZI#ClLZqN{Qi;VqcaPW7j9V8bkU?m&lYPJUs}>}$+o4fmd;+rURJ*Bhvhw&A6X$?
zv3g~rm6KNf^|Air>#K5B9a=3}y?RZPHB;9z)|RdPab3T4r`D&g-?1Tf!;+0*8z*f-
zo60ub`()rJ7dCg^d~l0&%Z5)|e!5_5@Yadjh;2i+J=|Wr{rZmHJ5GPr>9d17+wa`E
zD{j}vyCZkc-xIoL>RzwCWA;|>8@BJs{?h#q4ip`@b?~i&S3d9c`ME>g51l;R`S8&%
z(!coph~mh;qlrg%ACn*Z>`UpF+mDNnZ#yA6vGps_S6fetPj35K^7W2WvQs-xC!F4U
zro)*7XH(C9aW3=R@$+5JpT5xJ!ljG-E?&Q+xpem%-8YXemtTH<rRu8N)rsE*d^`JE
zlWR-AYxCX4>*DKsZlvBgaWnVkm0Rjt_rEuN|Kj$TAAEn9eJA41>bv~AyMIjo@zlM(
z_io=Wz5o2dxSs-lTJUr0pFjO2`Ii$9dp*4U$oQ!G*U66?KK}SO;co|@WIws~6kh54
zKJkx+f2{gb`sa~n`Ooe=uXy49V$NS}{@VF>=fAI3msD3*Ax^fmMVPPqnB+s7xa)kB
zOk)3)X%e&VC!Ukj)!lb|U+(8Njp(ZC9cgY8?ZsG;oIL!~X2cvcAXxJ5HQn>_lLPdt
zZ%%*GAvO6s-o2J#Qy4@}mSUdjXy<Nz%r(gsKjoq4>rlk39j*O#BWADU(7TgPo_JPr
zxqsO9lup}Tq@VsdpNpD3csF!FR^+bhS&v7q&xf}~%e|CkyHHc<c2l<|i-v2u&gr+j
z*#mdQq%G-xa`GCB->!<doUpEN1_Lof$)3x;U9z!jvG3)+vlpCeeU+npzG>N&;po7=
zyOW!>JUa3S>XM8W4kW(%x<WK8W6;{Cw?2Iz9UQUk)YrSC_MQ68aQ_4EuZ$7H2JRfu
zb^W4Wj9)iRkvAyt*R=Pl&S;n%_09<XxF)R6+&8riVkmqI3Wv`-r46f|x^c75YT}D*
zmG`)fjjIlFSGGv_%ze6-cvIDW=78cxM~3Hx9?amR_@uKr-5S2z?fE8kNAGE6O%DwY
z+!ygt$B;2miwkGAXfei^nZ1(9F|BQUq-{cZ)8+<EUd4fF#d}B1;!fMPdu*ClKVnDg
zZ>9<suQ~7(B~FU^zR5|i$osM?zv*iv37Q2h+O59PM(Ks_KANjIysEWUc`|p&*0d>x
zhOwR=C6|(VZdpA1%PHA~>eeGaeedSF&rjW0>fL$qk4qjHdIVi&^-NK;j?bUNd7|<8
zJnyh)_7dSyqF>K*=ZEl5Y#xaE_Nqc6^+)dyJrTXQFopfAaMP0YNn?efhSbQ=^Och?
zc70gnyQ61d_aRlNxX}<9$D`M1=Fx@^MlIa9hIOO${{9cT_PTy*$A{=ily6C2k0hdd
z{$jV?DD&}<`C}Isu0LD0Sap*<j8jy=F2B~5k#PJyUS!X!Zs^;=qx$^OD)X&@tq<?~
zg&TdHV4*5@SmBKw!#rXOiW?sPC~ADO{zI2#jt@2w%kM@mn-EyV^*DAnvcbny%nd90
zeZT73!n7*p!mVT4elw07$LVEMm5uA$8V!T5Ml!c9-WI7Fw>W>I+oH7@P4B)dtIDW4
zPcT<C-#6YfIdtW+oqLz9Uee&nfx~;|E*#Wyf_f9;8mrKnwqujsBaelxSRFdwv%l|q
z1<X|qZ&gHkj`#V{=PT(<b~$l)fcI!wqdNn+A3W%CvC8++gQ26Zc{Dx}b7T(c1Ovox
zZeQKbMapLg{hBc0>cuEz+WmZYe8dkGd%`#!<-)V06ARc4cP_bD=-qOEyIEKAbj@eA
z*gLk{10)>>Z}&%5vA^`0_gpA`Z+FqYAHMt)p;V5#a%xh?flS7iPl<t*)uU&g^X5$R
zZkgQLeG3Xucvt?}Ref$~{Is?^4kx3Etg-W3<(v_Jd+8J+q8cG$i0_RBqH#BG9G8_6
z1c%FyVEMETjC%jx{Od`Es_VxO{L1<%E8H(ZcWBfHfzP^hJW$OTI5E!6qr2C{N;LLS
z)!0MmSi}8j!IWf%U|h!8Mz@Mlc;E@tX8MbOWuLd_C^VxsyxU2;Ulr-Ld`wVSvhdXS
z$O92+yUS-kIyZ9v{SUpCri(m}%wuN66ix~1DbCz+qftosl875GI!s)0jdMHs7)Nz%
z(yE*vP(~9N{Kt$M)$wofA@gVB`2!*r{@K3q^6!Vt;Vl?B{?Ew?U8NnWmU}Fo7P&e3
zns5Vm^Zrp$IV|SU@J=IdzSD2~kL9NkdV4`KO6Z!6qN0<L-{W;7$2Yv1kiGbPK=29m
zG@krqM#$-T>3QR)ae|Wfk79ZnUUbR&X7A(ioL`qH|GGIf@)PA3mr|EzA06dY{5%P<
zo-HzU?KO=XlDvNc)AK-|8J+>>GmmE6SfM;I<jm<!!qru0L-S5dnAT!v@)YkO9P<xT
z=4Y-tel*-Ca_S4+o*N4k?)O)5GQ&qDbCA>{d>==>c+_GBYuC}xo*%F3wCJmWh&ety
zg<~oh^c90GTXne4nlWCH7rtDRd@rl-yxiY51<3d0ub4SOf8yEp?eag8*G|~a;owml
bb1`9ky9{H##SH4pEr1YbF|!uNgb4jV$mR~D

literal 15176
zcmeGj3v?4z_N9SB3kV3v@^xC2@Jl8i`U^>aw6(>g#56642uzY`8kl5aGNm6E?9qb7
zgIGVfKy@vvu5tin`3MWhDy*Lc;rM|)P*+8lJpw8p#T7;E-uIG8lQs>+-*GXMGc)hr
zci(;Q-nnz%o%`~PMl=B-)EixgzDGTvB!LrOq~u0HSrSrCAZ4JFTqltR@I3)a43ra~
zJW%A5@up-*08d&3%9!U+kw$8e3`f8LcPSYy84)axm5dC~<C<|H{8b2gL4yISkf?*@
ze2G4U#@x|1VK?S|?RcQCxMvsX7upYMSXzSdHxxs;>0YNeo+%@NH`a&$m;7x5Lb3rU
zaL=>zR+chV@dEFw;yqM`LW$H$Wx7_Gsnw_`l}4+|)T*<PE~nPR*cPw?Wn~>sw_bL3
z*WYB6)2^4zNHZ#po~dk=v$)>NmerS9Z1oFlS$0`YcCs#q!Tja5j7MJS<OJ61qgbC!
zpE}i?imPk2P~&0+hN^XOZlAVRFCz`KP{wFlMiCNWfnGM#Xrct3=N32xO0CFLsO1{X
zB&yQOxY!!ryMR(D(qzEWYp>Lr3yJ~^0n*E=1i_=F>6)4vMU6(mdmXeYD=Ujus%f=a
z4is`<om*gP<!;{?=#LD<IWySI?Ng93DQvupcFv?#3MCC4B~zrU0uaaR^axJgO)*x!
zTF}d?tDSajrYa+ov8z;a4U?HBSE=k)d8SpFCC^H;F)B?ZV^d{WWyzE%H{&rHBlidj
zB3-&%xL1nO0m5k17Vx%e7wZ;E3bOqgv-39S)+0X1zyOqNv;pYoF3dnI8mllwE|Ara
z1GR#J>EJ`d!}<A-cqcLGIIga^x?<8mOvG{PimNLo4a7tox30LlV$wiN#BuA2t1BiA
z#6%pouDH5l(m+haaqEh!D<%!ZMEpao3-UW+R)}>&DyRl>K4>K5q7vYjnO|b;f%9(&
z^$Nq?NN@v+`hLD_?2d}IO^->|ZhEG<2GdJV<GN9sfUk?A7DBoR@+$gNNV%j^tlP%h
zoo<IdwcJu9&m{Syl!EC~Ew`EqDG%rL36!Zk-%v7@N|n=ep2x$n)KuQ(sfMf*O&3@S
zD3hV2%mR5LB~2HWrc$XPc_9XqlMD|K`e>7v_pn}}&H!BH&_H1q?5U9Z@OKk7F2LHI
zHX%DXNw<Kl%Z4P8!q3d(b-D$GiE*$+yw}A*(OArTo%KBAnm9A-)6tk7ngyCiZZ9}-
z(oJFWvW&oc#WqPgp8)I~ox1~+i*ZAjKpCJ&PKwIdDX^|Qua~LoV9j6<1_lkqp>@OK
z^1@*zFmx_ELk&43T)=#zj>yJ2A+Hr24iLv8YjoZ&-d?~6Y$$U(z}YzCDOYC7H7biL
zOFKDDt5MI=(WL6K<Mj!^p@?G~p<Ln7v+xwMl{#815{1&DMs>8PX6WZi?Pt0dtA@eJ
zMzOQtBZ_E!|3B6fK{RY9qViPXdW;)T(hoAAG8@BzkGR^5r;}Jgrvp|K_c=lT^21D~
z0_H&{n9Wr<V?_`xXgcxv>L-}5L<M(xKd+WKs~hoxHWYV1SQTP;bH(n*S8cWUqh1dK
zQTSY^yON*lk7TZF;tC5(^X&7heFAI8NHc5e2rPqE7(JNi6nMuNjYf;gx`y6KIx#53
ziW5UcT)yn5MYm$&)*)O0B2%JL0ikKf<ail$hGudk>a>jXFmy*u0=-5av>1_g4)SBv
zYjo~i!+g+Yr#N4&B>!wk3ybrkjyY1G-w~m9iu6P5KE&`tu(3Q+cnf|LrrTN0ZfsYs
z$_z8RfJt|Q&d7*tyIJArxb2b;R{!U2&}YYFyYTo*z*j?}!-O4oDf}}>bl4%@ETZ9y
zZs7{Ot-|9{n0TL1M*e#fn(K)A2LE`E8%;!Pt$|d9n~`&@0Ewrtp+$FEUGg45Zk=;V
z-3uSRhiGn5BUfg~m5~0(&`!?MYSMoyx7g*w{l}VCxtsZAX7pcyjYW~Q8`t=opVlL$
z@1i<|Uu0VE@Ef7e6tF+zy#6aQ;LgH!W5M0b;@zOH!pZ$tZowXp{kJf|cPD1ZBwt=e
z8RC;XUgh{nCiy@Jm}e@1yb50T>xdl#QI%4uP{U`|l`U++^4miA<TLQL1s#kk8P3Pj
zcnvCA6e`qtLIT&wt52}77x3v8lB)<ARxslct&gr^im_v7DWh?TAfzrRW3+~$B8nY%
z4l_H_D4j(VCDhSmK{Pv=tlgd>>$<gMpF%N$T?nua{C+}i`<eDL(!>O_)X{UC^josK
zL99KRFb?lnKz2A`PllB2(73A|$`~6ws(Pbgl4b%@L1dQ#8N+7;J%IF%x!_U2ovcNV
zC3V+yG|Xv0WR+TahT!`3wRjn~&%=0OskzR-em#WLjD~AJWI<lUAUE<M58S<og|ZFR
z1$dk#l)$~cos>W-iJ!+P0+W?+GLC*hxR$`fg79b}!xscjB3HNsxFi!8^nz(%{{}vi
zgL)zoO1~u7VnkO~LJbGkM1qk7Fl$$@31ZYxBSEv^D$=A8jJyLwMspEh1QLT>kq+re
zTpg*Vz5U135zS!M_|F7>J>oqw9Z+uqVLgCO5_0`#fD%71ME1Y<TMoyd6wBwA6@v&-
zffJX*><uH}2*ptV<1_3CB@inD1Hz!Yn&aSxhn)yJL)>=XbnAQ@K!J8<o1g-S7={J5
z-f+Cz0WdiXY^4wi=L@_m08^O2?5Gm!F`Ve*oHo{1!5Mr2Ny7T+N$LQ7Eu6gwP*M=W
zyO+buS9`)xiSR!K*yO{yt6k8hZ($kc4lA^P1GpbkE$}z7Zq^I_6~DU30uD1koa`sY
z7+h20a!_#lx#gEudpS$tObc`sP%c(}IL7F6uwj@)h7&A|BMf(qjfHk>tx)1Cwipdo
z*l&ax_7>4$#7R}Ww?2<^Iz&zN_X`hy^YEjgWiLBh$y9R!6q6RhQd$IZyo^B5;pBa+
zj;TDydqb2v(9b{rreFm$L8ZJK>pDr`J=3cNA1fLLu1n^?kh);|T6qBsstdjkJmRX(
z<m62ph?(Jya|D8&YH(n~?MdJi0++)TC=lw8^1!9@$O<l!LMBuNWdTkfDS<0NgDyis
zp$w!zO3V;7<Q$)VuE$^`X+-nh++j~2)xW90dQ0Y06%(a*?advKshcmqzPZ?L&g886
z#1;9Bxx_ACwOW&NY{Sv<k568+@&NPp*UR6VjEqK^YRAYw-kh*vugsivVt*CVG&+v=
zs#}FL!(Lvmob~%deN&%U{_dNHUq7@lyVbPTJKs`TR`m4W*KIq!<nHI*Uyo?ztTzrh
zZ$q~ya&3>hH&*O4Ij-9&e?iW_Hrr9@ygz%b`R*h0FZS(OBVRS_`H79i6P1OImbQ5p
zUmvnJr+Mv(hN0R;)1?d19J-m?*7i!%2NRBO=~wXmJ?kH_EmZ3p7q|4;ng8y~1DYhY
zy9<sBD{B^cznsxJul~h@|9N<P?&0$%7ap3uy(RJEvzm9l-8$)D<+;P3A8Y%t;^KSC
z@t4NExO+pN-beIqbMA^%XIa&AxhHQsd}*TWn@w9@I{ii4QiZ#b`etJ3r6E1GZMd)L
zZbkq4)Jso#9y+|NuzAb5)jQt0bJ{BEfk(2J>Zk2Ze<|N>n6@OnzjfG<ln0m3K2hk|
zKue1@&qE)LKe%}W)w<c-Z&Jbe{mCoSn%*$pkpCdJeMIWO<xdRH>;0JZ)YcV$tzCP-
zv~OsN;TH9%F=_W1P9^`t)3#>opy_*uUZ1idVQWju()shwPWbF*c|Td%i6uFPbr1FZ
zDEIAMdn+4@H9OC!2A3_|I5B0_A<d?7nzIShhHxq4&6}(vl;wjoMSCWf>vZdL9_;fn
zW4d7b%2Imx)AVCE+;L$y(%wJj+0!krezBygK{D`zIj!$3+2UGzpl#o<eX1jWsJ!vv
zvU9J@yrXe@(VxoGQrO#vZrmr!>G|RNXI9pHcBpCplH1o;Y41O{v3|}`L(BF5YMNBE
zZ2tor58V2}#R|D$!~QMLFP{7Q>~)K#ys*CU-nUonG2D0L{6l@3QNq|h>1JQyV<(Nn
zvRyOsHx2(?%e13KLygwed-w^auNIGN`RLij4qw%b4WplRCOr4lT`Ru!py6ZNjQ^Gy
zzWno==J8Ly+T#=Lg~50HWs>jFtxc!uui3L~-BZR3XztT<{(0=R5szl=a*xP<&3XLT
z=+)czjQH<6o1d`^e`esPQ$}rl>*hxeeDeJH-MWwObWd3|=AO^Tz3}eC-d!@fg_SMZ
zw$rv-W;s@**L=70%y)C`P4n~DwIAHMqkd9D1Cq7|_P*jMr8Pm^BZ{b2X-64eJ2?Ia
DM3f_N

diff --git a/indra/newview/res/toolbuy.cur b/indra/newview/res/toolbuy.cur
index c61cd76bef11e11ae0a31c61c35b64b104996bd6..65bbf01d45be371738df991d0861b45a2adb3b53 100644
GIT binary patch
literal 4286
zcmb`KTTE0(7{|}Du8Sboa=*CCRS4lCx3ER-1w<_gp%IIe*2EOEu{8}zZ3#(9D2AlG
zP|_DFPbDqk0n&%+gGsYd)Wjz0L+t|vVjJ5EmI|9tX@gAv|0%OME}j+8ll*qhnVB>H
zZ@%xFnX{Var<pXnUDG185N#|})1ov@%K)g-Dgj#Yi_0#5pZXC(XfFc{Y6g2i2#5r+
z8^oZD2Csl1z&;k>2TU(X+k~;KfVwT<U2q1x4Qhb{6o7a@I|6~U;YIZ^4z)Q}7)a00
z&lf1k8gPRtFbF;Xd4T>12mZkCMfCB$(x%Vt;QeFAjtQ5`<zak$+zoD?KYxA%?H_|=
zz}N%>%M0o==6gW`=-}L`?RL8{?Ee?;*TK^A^70Sp^ChSPDS$Z<fL=SwKfKGiGv-Y9
zcf7T`y1Jwt8|6C6M<XL6jKybw%Y!zD>_i{$DZgX2X{p}Yw{G1Mtn(_@@%#w=zXx@|
z2Eu*m+wJzfzyaO@=Rgm!*=$`22?-sMk&#V)ett6MdY^mgdhGa7i1psy-bLtM1oT1V
zv-F{{8@!g1lG2@<oBL^IX66^k$;n^s+qdr<g0|7r)YJ>n(b1Ef=k)Y6h7q39NS`($
zKb}DMS5OKPz4bA67_^+w?T?R-|28x<bQa|U=sn)Qf4?BOUyX~4ThMD`ZgSlzJCO4-
z{`!(_v<<qCK|M&}YYJ+orKO$2*yGT>pPrunZ((7fC@Lxv1qB5jsLN-rHD1hlj3r|(
zD}4NH=+g&W2R3w-`q17Dy)&_~u@`awm$#-~pZB!kz<~qO2D~Q{6BFI6<3&GXy?fRn
z@9CezhY!mV{nnwK2|`gV^%3jJn3$OFP_7gg7klRFt*d{g9-$q1d3m1sD=qq7-K+S}
z2Iz9_@hmV?AM@Q46&3Y0=e<>Jy&crg$;o+2A7jgB`i7btx)G>X=a1*?fvzJsIQaha
ze6H72_ubvyB0D?#nflOr6TA-c0rxwe6CPdV`|$Aa3$SyQxyEsi962I}hK9u8;NT|e
z>guGwj~_oS`^?VHih+RvarW%lP4kBq*H|v#xySQnlQwM#3k&;6&4=ZwQ>Vnr%E~io
zZEY1(Q&X~SY-~)-%*=@4;bAd1Hz$3}+*7fJULxRmYp9L3H01p6dfzMk+qZ9vwzf8L
z^5jVm2M-<;EiElF?-}=N*RBcdPol4{Pt4EHt2hhnj}J{I)2kTY=NXIknxv$pCFOhl
z{I6WOBFEPI#`~W7H8nNj&Ye4Qy&XMzRIUZCBj~@OVr*1GzlE{akE`bIOTVI`LiG3d
z%Q-VvjKk^Erv>&+nL`;F8Ny<*IE{2wJ@ijxWo4~791c-ZQX=W-=#cTfdiAQzZB?(z
z&dyG;u&^Mt>GP(hCb>tdc9vWdyLRn*Pw5zy&~Lz=yUe)K2Euu8PSoeRR`sg9apQ(y
z-t+nT_3NAZl$MqX%xRUrHPTh}=#zx=<v03MjsHCT%a<?9xwp5sOa12NW-&1_A^5Gq
zJmOf$sd<c@qjY?gSpPT6%gY6QK--;8r)U1$S6Qd0zP?^ePEN`gsC9bj(j~bj==-Xw
zDiIM8ao3lozRha2eh8h%)z#I~hC_!ANgKHK=o8vy#OUa#oU>}LtgPhzv>F%~*sIs@
zbq_z8vH#C<Z=>(Z%F1>G-=%M`pWMfoR$rRlZOBz8a_wP5LxZ$|@z@U3rr&TLF2bLk
z-s5lOIVdQo7x8oRtYQo~=2l=|+Kn9fJ0v9J^Q~wZ^`Q;ei~r<4R$E&u?O;reU?28H
zo-E=F9WWYqJN1kOzHw)ekE@N1jq*HXZZJOyHF-v|4SVlDIKO}K_xInC&yDOt{#XJ6
z0zQHrcM;Qh<o6=ty9Pf$;XT&*1FZ3%;jd4&n`=gzM)ep!4e%^G0oph2GmQFgvmV`f
zEmZ)U5clw($c44jV-<h&nDMb@#vfTTHdFHwxQBJ+!gs3+pAtP=fc;$f%)5u>NS5%I
MYfXa`zdCXK2cgutGynhq

literal 2238
zcmcJPze`*}5Xa}mBg!EpHdcZ^s#s4GD}%jYV=Za+Uob_$t85JfgzYSnkQ8bB3$98L
zx7H?t!9tKgv^$76`OLi2JAd3=n!LN&eLLTsna`WOdm>MylDRpF>+^)jG<PqsIqVfy
z2~NKn^%P^p=oVK?gs-$(^~A`nwA*cI|7gp__fOJjG-P68LMA6CWol|lrl+T6W@bhf
z78Yc2aZ%RS*JX8eRaRD3WNB$hT5nC()=b{Zq1dk?-wuDv;n|tI`|_1SiX|*#rCusN
z#i#hxeO7Nt_!ItwKjBaKJuKtT_%n-)KjUYTg1_J|_zRAL-&h-KD^Xb)mHJ8|B}m02
z$}=bo3WLI+Fa#0|3WLI+FenUx34_9*FenTPL!iT;FenTPgTkPO4-SPxox?0TfQQ*X
z87mlme`Ht^#S?`RNfRv52E@cof+fKcZGj`fk>E&hBsii~a3mNK3<(BrU4kRQkYFg(
zGR9~jb?Oi6Xs>q%Dr#qTMXRZuVagQE6v!}TYG=eul1%MP?KqC8ji36N`kDHEM49@T
z-eedu44FRovC)-ydOXaGevI^>P_MvN;3(9Kqje5?P~a%e!Gpzd6I5U+uoNH)1>+|G
zOChkZso*HE@Wsf(nG{%x_aj*R*Wjms4+ew5U@#aA27@7fPB0W03<iUtz(5*|{V*5|
z27|#sY79RN27|$102uWP$&5f_QzA!Vo#3#@?R%2U%SYMR*pSW5P1)YwmfhW5IXF0w
z{r!D8Iy#c$<6}8JJ(ctGbGf{{luoB37k^AX?CtSCZqZ%;5BNmBSb1Jwnl%60r6V#w
z)U|tgVBFrz(5Lt9>}}H9l*mm!Jx6TnE&a~Fw*mKbUyjtBA>wX^J4;vlWV1Wv?y1ct
zXVHh_p?$%%d`Azyo5F+iTL91gu>P$a)$i!uyIS_ZI=ojc?z()Q`BA;Q9c`HGvHzeC
z-V))1<!*j|ipQ@y{&CH{p%0crA0oRxOhz9nH%G|BgGa0N<J%7Nj-5Omvy(<;C%hZn
zes;RX`(pk|uB%RkjbBwAaeFi0k(cvV)$`ZaW3pvC@j`jVOJx>Y#<nmLSJ)Ufjv?DD
Jwv26Ie*x8YS;qhX

diff --git a/indra/newview/res/toolopen.cur b/indra/newview/res/toolopen.cur
index 8408f7c7ebb3b523ea4189845b5de94ab97d6087..22ecbd522898bb167946a86a3beb79f87bc9afc2 100644
GIT binary patch
literal 4286
zcmb`KSxlT&7>56ufewYj0J3j0>=44fgni#Z5)(sX8kZ}ZkSZ}IR*8uu6=I?{NaV(P
zgGPlL<An`ZW-h#{fh$S^T7qVTwur@H8<ui>-{bs${tm-1(4OR(bLMRCcfRwTb7mC9
zs2CKRO;Ms0i}HQAqQoeQk^@ksGy=5Z6Uin&pZX9&D9-~-Y66#m1w?~*H*v^g!3!W1
zuumW`0>g9CHefC@pzc-hCb$7!2W_AVl!8P+J3@f8;aT-D54Aa01js5WDG|uY5paTE
zz!-Q36ao4p5(EL`v*=^Is!gBUz}x-({ladyYfMj1JEx|m?oLche1-N8KpNoQgn__k
z)aRaG0ZHIG*G_Gx(}`*SPbeRQP4FxFd<mLBI$%r$qt}Jv4`aD@?m5H#4NvW%p&@C9
zJ3mJLcye-*d+{mY@u1C?i|AvV>UW$rCBsvDZf;Jn&Lcmbot=G*{y&3uU<HxB^ldiV
z6;K6U1vkMkv0AM|Nl8i9qobo=G8&C?&-Fg{(ADgi7vgwuaBu^<cL045?M)vVmq2TJ
zdisZjg@qsI=H`BpmX`K)N=nLi1a04BWMtfqjg9?*>s(q|!Zbq5Pt&K3Gcz+!p!+AN
z0m+{Fm^%Vm1JL~>F){JS@bK{a$R9v&FFQM15R_dB2?>w%+E|-Bcd8wTd%6GmoNcrX
zx_h7lq;r@GwKFp_Z({Cg=sL2pvJT41%0zj2xhO3y)u1lF^Q<v3<}sJtb6Mfz!>vyr
z@ElmtRq8|g67+7w$H(76`5#YBy*|sdp}4qM+JJE)IXT(MIwtygbaYfZhb+@S-QC?X
zN55le=YnulOMUEhV_aO^Psn#FDk`+Kdg|)GQ;*P&qM{;g{i+syua?#Qp$*XG+2dPa
zqCVDpIVL9NTdvz*ZM_}TFDNK@N*{B}@AM5d-MUezSKlA)?SXDpSXh`t?{nDYGf{tJ
zWJLOjKJcawtyjQ{pak%~<2#}0LO}XHGBWZu>~t~K)OGn3M<e?!EG&re@o~9MoR<^p
zhZfIRA>g~m_vVB)ZHS17SWtD<+#mhL#YM5@+!AABV=@NlW5%Ak*U(D_d~Z+HMq4Ig
zepT;#+Hh84pZWQD;c~ge`lEHZcE*8wp9Sv6b%ViBjro1Pv1o5eO-<d@`<`>}@9&=q
zZBzAkc6Ou<{H~q{<~&Exe;Hl1`^8%s`d7L49IuBOz7qR#|EW*(V_DA0$q|8pfdiQ1
zEd6VFd3i@wRaK(0vhrLkFE5LOg9EX<yL)0>ety0P2ncw~5B)COx&PMI)(YBiURGCE
zr49OVH8nK?YjV-Ie(0y-efg`Qq2Yvfb#=8?r{4>`7R$6jU&px+QxBnEaF#yXasKbt
z*VhaBfVO)>ukWp0U)R*sB%-3C?)jt5K4!D|J>1`W&CSiy2HHVdTU)j7dVRIsTi)2%
z$h*K55)yLDUw!z=g!}(~dwaW}@9OI6B%JHCw6?aU^;7$EY)40jz<uJtoMwOZ*$=Tg
zfIED>tE)@e!2M`zYZJ^p)8XNvtY@1FwL3dIc?WF3pYNVWTkRVf8hQ(7(8)WDd&oIe
zwzs#X8CzRhTAkX)zO)-LuxqhcK3C_vNKPAY7ysSc+bh@4xw#L-;c#eWwT?bwU&Q|g
z-q6o3qUkw?dx77$zat)9eSLkRr>93SHW;6Tnyh16OH0c>-tRwxf`TsOb5CvcJK`rW
zI5_xy*l`bg`Vg_cf&D##pP#Ud_u>K0_;2vnN9T<-Rm0yL^JfCSW!J!K?sAU5<Im`a
zW~R*sU=?Bo|B384JHuwNHf+L=H52~GnsAw#Ho*$cm0eM+cKnnW_5=2_<7eIqjw9K`
NU#=qsQhb$={sTBU5zqht

literal 2238
zcma);ziVto6oAi~K*AD;K}Z!y-rQGsZyI45Qz_{KuSuP5w%T2bT_QnntJH!aFjlWn
z(ZVKw!B!S#>ZCF7AjN|aFll5#as1A?_pZAt;@my+<D5C?d~@brSdn+6BYS&d?Yni6
zZD#Kyd&tK~M^I{8tq1En^eWaSBK%}BsRw$dGM!Fk`twwte)?8cS65|yeO)#-He_pS
zOSZSSWoKtcoO4o^r5qn0%hA!193CFZ!NGw{KFjjzRhBR1M)G5lA8&q<o40S}i|>CR
zkw*d&kyI}|I*-ny^Qz1BmViE>59kB>fL`4q`iMTVi0C7F21)1>`h-5ANa!=`%sMB_
z?CCxEJ%Kz<Ub0wvIuC<~!NcHTFeDf}3?2p#gNMN|Vel|`7(5If21AFz!{A}?FnAbz
zMhAz7!z)M5Rsl4O`a~ol==I331d<051%d`xtPB_flK@MA#mWLlfFr;W;0SP7so)4O
z1Q-GgTDky7fFZz;$d&1>gyg9o)>dAv4piih?6OjmJHix68c7ggisX(MBS9j$Bf0H5
zEH`@cNAgGV>lH=vM`{ych%iLzpw~uK?DS|D>Gc|^K_Xv*Ey0n<XIHBn)F8o;l!JrW
zb>oy^Nw6d!5((`UfF<FW*pyHtSok5t;Z71PN$X)O`Znk-po1a9kYUI$WEe6G_Bz3k
zV8}3J7!nMGLD&yNh9Sd{VIVYu9)=7<h9Lux$)5<8am;KA#0abd9NA*)o**ye8#y^S
zk<-&tIX^#_%gal-zP^^Lt1G#^y_LJWJGsBVmxqT3d47JD*=#0Hzh(LQ^=rQ43Dwna
zKnLR4O5^G>OZR^^zVpRaxWD<iK{eo4^{f7%eAzGEaCw6psJYaqEc#{7jrNx|IDGA~
zEd~C=r3f0o4qx?4lDP43DS*arw~)VZqtQ};#@_&mP^$l81pF5gyd*yU3j}Ux=W7`7
zAB{)*!@sIv{#XYU2cQP{kB3Y4x;|PS@)y`g!~I47HbFJuc$FKEAy~94p8m>8E8xxm
zSg?2X{7Oe}{ugKC(f!;%=k8$N%vDt?qQg8IE!izX-IW7(b^$<Z|220PZ=ZQMBfz+|
z6W$fBXd5%<zG6dT$J}KD+UC*0xeN7IliBMXZ3rEm*>h{|c0&s>pQta57{aUU+~Z>{
z^+eN~UEg*!FE^sJb~P(ukEeK#+$u0Ob~D=vRNe0AwecHsujm)OQu~6QcbJ%(zcw$p
zYo4OtZ|tqP<XYzs6Ek<`-um^-rO!Rr_Qv}khf{W1YqrI|bXFdbUD9kKYmKZhcK%EL
z!2Ww9GsaJm52n(2_enaP8UHLklok1eQP)qhvhqgO){xDqZ0=5E^P`FEeopc~0h^71
A761SM

diff --git a/indra/newview/res/toolsit.cur b/indra/newview/res/toolsit.cur
index 60b0e773e57c9c1e836cae411bac712f9f129c6e..d26b6f8638e638cdb987ad9011f9e7e591626cd4 100644
GIT binary patch
literal 4286
zcmb`KOH5rw7{?FXQYe(CydUNAhL8e<wgG9&OQ5v1iHT`r8Xqg0G}XkISS2Qs)HEit
z(ZrQ?r2)gnxUfrd7p~fbm34tOK~uH0VDTneBp1ft|9I!-a5(n{ODFl?nKNf*e&2lG
zJkE8TbSKRThaIQb$#=diaGX-daas{o&LH9~zofAHyXD6i<2(s5Xb9~?`KSa{#8pmS
zhMq#XNNqAuI!b#&>@>#8MB<)DucFK7Wi*QVP!Fm?vLgq%Htd$qIAUw8Le$*d-EGLF
z7>c5A(MRYF)P>}aB9w*Fcf+T@Wy|Mb^!mAT=S(CLNoa0vE;>6qdvkhv`ZM0YgX)oD
zlZP^P$ydzxqiS?fa~C@rjWX<iiSi~|U0z<kMVn925NbeL6WO$Sto27<&0R6qa(~6o
zo}8R??TF`_<PT?NW)zDLk+z3y&VL*}{jA^FZBC<~y|A!gROib#d45Ryc{GM<QBf*>
zI2_)O`p}E$3YwB?YilQ~tE(@Tl$1P|o}TW;-0O26H(|$j#%x}@c5Maj4J03w1o2_)
zMb9)eG`!o{+4+83TiYk~_4S`0IB;NA;@uaGjg8mK%F4ddJQo)i8O9{?WPI7k`q+T`
zGwMe*em-Lt!ny?agQ}{kuL}wa?vUSu_o$_%#YmLbDl030_p+IryYH+Wta~^9-dyiw
z8{9`|95tw$mDo*9O;;Fu4({FN=H~UohYy=0M~;}Do}Prn)wA}RlGZ$9xiNPuQvAgE
z@`3h2ElpiM?7i?VS5#Eop!|oQ>E){|8x9>h<k~<#Q&UqDRh^RjOq>(@P-Xe&)TvW$
zPP<LmZK!~1mrtw*%gf8ZA^+>>(W8mEdb#uS^IPi0lVnF%S65>GmL=cYvW<^yfUCWy
zyC5V!^W9fkS~{b7d)a;-ZMX1co7#xq(b2Jm&)Dv>d?RL@TTH#Ze-d{O+`hcLyt{s%
z`+5Fn@s;F*AU>=Y(6gu;>AcfDk>JwR^?gxM(RJ)x(^~WTTVtns_VU>;+vX2Td#n@b
z-qU@vjV&7r3k$#Za%}nk@D&63SZmM58eR?3eVdfcyC&BBuYTX#xmjC+p1pN;9meBq
zI3FLRrKLU1_$lvL-jCGP)vfw{Z^xDog3`vurdeNKcVAf>?S4?MeFXn`8YIq_pfddP
zioG4fn+I`&>b!kyxwW;`WMpJq3SxTe;9qEOZ;$o$^_kw@-Yv2$%`+B@*~e|Uzn`8D
z9z1CF?Ai00mlafoKf#&%=dokQjBH4yZQyu?zfXUEzhO>m@@){)TSuEZ?w4N%1_n~H
z#YmR?e2vALy3g1hURF?<v&Uio-#l^Rgpm(qdom^C``Zr<4VmKN;@d$yf1UW5nVD~K
zem@!>9(HYz9YIRQ_qH7z9MpNdmXnin)z1og7M~R2{J%3cHfH3z<HwH&DjDClSKsmR
zal?6XmoYPgc>X%^CD!UC&hQ5l6BDitiicmx_-ZHi$&)8_2Cv}HH~pMs&z7$|H#hex
zdnc+hOfl4$JCWMTZq~uy`T6-DCu0TGd->J|&f?`WXU>?>(NWh9#Wb1JMs3*xE8L;e
zL5x&&e!iX+3%+rGWIe8(J$u%iK7HC~ZD@T;VyaH>Mn*>dq0diQSy?;wx!0Z`zUoLB
z+1c4|W5;b`dY?7ELVRQRc|&FHi+k+xABfp|J6&sDt}Q3yd+Qm$3F$7ofL@B1TkROT
z%;~PQI)G}8S>iuYguOGBX?~ju@v#=-k8Fs;G_;DA*jEw0TO)i*Ozl8w7vVE+iR~z@
N@|P>-fYPl<`WK^8r~Uu{

literal 2238
zcmbW1ziT5$6vv-e1{+~;EQ2e<IlIleGfd^m!TphITszgMkZw=H3%cTnRk=F2K)^87
zU6C9~k;Z?4(<BfNTxU0N<wD>Da>k912)}%0R<fl#Uz3$)X6O5UefG^tB8kk%+M2}c
zr+JYT?sCQ&<15CDAckwUTH-vz97eqQB7CLauNG!*<@oqmj{iKC_kX;V+1Xi{pP!e7
zg#}q!T9TEO6<J+fl{8IdeSKYac6Q|P<HxeSy)B!Yo6>)w^5lui_i`%wx0l~e|B=(d
zK)(C=7YZ4MWjKbfwg%0h88j0#tz0a+MYre{-J*vuhwjiF8;9=DS;V7zbdT;4Ji4-1
z_UdD0!)&N;NMr~yq7ut985j%<1_lE|M1sM<U|=vX7#JcZ3<d@RgMq=o5Yb^UFc=sN
z3<d_HXmA)fOyE$B9YA3XAII<v^zg{ASc+Q;S&~{<VjD18ZY(Some>|JEF2aN3x|ax
zwh9glgN4Du5L##9urOE{JhhZLwvam2hka~s=nhoWc6h~BQ`^DhDC#KSU~<%U7#&F*
zwH>wNam3o_)OXZ()DK7GsPE{FgTcYz=tDR*x)Prrg_SuRBR%lc^RRh1JoVzy1`c}Q
z;qZZj2aCr|kcY*?;(_oKjIRJJo<NV2NAR%lWsrw6@v!*NkH`|<hHwgKFenTPgTkON
zC=Bs+g2BU}FenTj2GTI_he2Ub7!(FlGtgmB7!(EtK&kIZrUWWZmK>J7g+pWR;A7=W
z`B8Rvccs_s$-%*a93CFZ$;pWv9UaNp*_oW5pUcI?g<M`<%GK4C+}zyA`+rq_c=Lwe
zai8vn-#}Q%7k43V*s9b&cQu-yvqU{>d~7b4CzR$V=6Zd?p=@N8b2<@o?@%_m4<6Z+
zy<S#XtEF6CPN&VI5~Di8f74|4cwZLvMmbW`5yO;IQ9OHE2@gbL$jY)Ze1tYm(kvQ9
zFg+Yy&-NNpFB<%7jsvFFtcYDNo<5vCD@JWCc=oBlxXFq%%d%#ck)CPFLD{7#Var*@
zx0yxCI~T>Crb(LTt#+%^?e(&hY*S_qqb!O%N!p!G_b^L~i3}mUo`rsvS*z6z@ma5X
zhY-z`y-wkfHsfu{!o!BhPwWNHF-nN7GNZ-75MP#I7Y~q^m<vm#kw0RWd*H?VmBZL0
zO^ZCu)1;m5;Sp<(6I3~hztSXc<w>5V<-I*ruCB6ZC#_B^X(to*v61yzk+izKZYxQX
zyZ8xny)2S;@37NtrFlH;3jW>$dljGOqxgGUxZ@2TUzL5l`+qCtUo*D!-R-^(hTrP-
zhgJP>{i_ZK*LwT)Ky~q*>Ks0`Exp~?*WvShy%}!ZcI44;Ll%c?GI#Th)Sfq`wlR2R
lz8JhTGrzxFmYG*I*^rvNU}(QK!>BRl7>oM)`cW*Z`X3<>YVrU8

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 8e037e4e5..05a9885ea 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -464,12 +464,8 @@ class DarwinManifest(ViewerManifest):
             self.path(self.info_plist_name(), dst="Info.plist")
 
             # copy additional libs in <bundle>/Contents/MacOS/
-            self.path("../../libraries/universal-darwin/lib_release/libhunspell-1.2.dylib", dst="MacOS/libhunspell-1.2.dylib")
-            self.path("../../libraries/universal-darwin/lib_release/libndofdev.dylib", dst="MacOS/libndofdev.dylib")
-            #self.path("../../libraries/universal-darwin/lib_release/libvorbisenc.2.dylib", dst="MacOS/libvorbisenc.2.dylib")
-            #self.path("../../libraries/universal-darwin/lib_release/libvorbisfile.3.dylib", dst="MacOS/libvorbisfile.3.dylib")
-            #self.path("../../libraries/universal-darwin/lib_release/libvorbis.0.dylib", dst="MacOS/libvorbis.0.dylib")
-            #self.path("../../libraries/universal-darwin/lib_release/libogg.0.dylib", dst="MacOS/libogg.0.dylib")
+            self.path("../../libraries/universal-darwin/lib/release/libndofdev.dylib", dst="Resources/libndofdev.dylib")
+            self.path("../../libraries/universal-darwin/lib/release/libhunspell-1.3.0.dylib", dst="Resources/libhunspell-1.3.0.dylib")
 
             # most everything goes in the Resources directory
             if self.prefix(src="", dst="Resources"):
@@ -514,11 +510,11 @@ class DarwinManifest(ViewerManifest):
 		self.path("../llcommon/" + self.args['configuration'] + "/libllcommon.dylib", "libllcommon.dylib")
                 
                 libfile = "lib%s.dylib"
-                libdir = "../../libraries/universal-darwin/lib_release"
+                libdir = "../../libraries/universal-darwin/lib/release"
 
                 for libfile in ("libapr-1.0.dylib",
                                 "libaprutil-1.0.dylib",
-                                "libexpat.0.5.0.dylib"):
+                                "libexpat.1.5.2.dylib"):
                     self.path(os.path.join(libdir, libfile), libfile)
 
                 # For using FMOD for sound...but, fmod is proprietary so some might not use it...
@@ -545,7 +541,7 @@ class DarwinManifest(ViewerManifest):
                 for libfile in ("libllcommon.dylib",
                                 "libapr-1.0.dylib",
                                 "libaprutil-1.0.dylib",
-                                "libexpat.0.5.0.dylib"):
+                                "libexpat.1.5.2.dylib"):
                     target_lib = os.path.join('../../..', libfile)
                     self.run_command("ln -sf %(target)r %(link)r" %
                                      {'target': target_lib,
@@ -561,7 +557,7 @@ class DarwinManifest(ViewerManifest):
                     self.path("../plugins/filepicker/" + self.args['configuration'] + "/basic_plugin_filepicker.dylib", "basic_plugin_filepicker.dylib")
                     self.path("../plugins/quicktime/" + self.args['configuration'] + "/media_plugin_quicktime.dylib", "media_plugin_quicktime.dylib")
                     self.path("../plugins/webkit/" + self.args['configuration'] + "/media_plugin_webkit.dylib", "media_plugin_webkit.dylib")
-                    self.path("../../libraries/universal-darwin/lib_release/libllqtwebkit.dylib", "libllqtwebkit.dylib")
+                    self.path("../../libraries/universal-darwin/lib/release/libllqtwebkit.dylib", "libllqtwebkit.dylib")
 
                     self.end_prefix("llplugin")              
 
diff --git a/indra/plugins/webkit/CMakeLists.txt b/indra/plugins/webkit/CMakeLists.txt
index de027561e..dcd14e695 100644
--- a/indra/plugins/webkit/CMakeLists.txt
+++ b/indra/plugins/webkit/CMakeLists.txt
@@ -115,8 +115,8 @@ if (DARWIN)
   add_custom_command(
     TARGET media_plugin_webkit POST_BUILD
 #    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllqtwebkit.dylib
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/
-    DEPENDS media_plugin_webkit ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib/release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/
+    DEPENDS media_plugin_webkit ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib/release/libllqtwebkit.dylib
     )
     
 endif (DARWIN)
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt
index a6cb74007..f226c139e 100644
--- a/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/indra/test_apps/llplugintest/CMakeLists.txt
@@ -370,8 +370,8 @@ endif (DARWIN OR WINDOWS)
 
 if (DARWIN)
   add_custom_command(TARGET llmediaplugintest POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${PLUGINS_DESTINATION_DIR}
-    DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib/release/libllqtwebkit.dylib ${PLUGINS_DESTINATION_DIR}
+    DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib/release/libllqtwebkit.dylib
   )
 endif (DARWIN)
 
diff --git a/install.xml b/install.xml
index 285544e0f..91f6251b3 100644
--- a/install.xml
+++ b/install.xml
@@ -87,9 +87,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>a2794fbeeb03f530a6b7a0879c544f32</string>
+            <string>3cae5f0fd8f3dd80a59b450562f781bc</string>
             <key>url</key>
-            <uri>https://github.com/downloads/LightDrake/Public-Libraries/apr_suite-1.4.5-darwin-20120618.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/apr_suite-1.4.5-darwin-20120715.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -127,9 +127,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>e4c0aa075086ec2f6b62c9498b381d63</string>
+            <string>90b8ec87cab3debaf8da5436dc8f3819</string>
             <key>url</key>
-            <uri>https://github.com/downloads/LightDrake/Public-Libraries/ares-1.7.1-darwin-20110217.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/ares-1.7.1-darwin-20120712.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -652,9 +652,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>ebad9348d0cbf1d768de727c1d6e1822</string>
+            <string>6505f9e93ac0f7595df8dd566f49c298</string>
             <key>url</key>
-            <uri>https://github.com/downloads/LightDrake/Public-Libraries/jpeglib-8c-darwin-20110228.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/jpeglib-8c-darwin-20120712.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
@@ -944,9 +944,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>095e8a20cd0c74e2121ca81fdf389d25</string>
+            <string>1acdf58efa7a728fd390a710c659ec65</string>
             <key>url</key>
-            <uri>https://github.com/downloads/LightDrake/Public-Libraries/openssl-1.0.0g-darwin-20120207.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/openssl-1.0.0g-darwin-20120712.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>

From 46f7250f087645eb6ea1a1f32213f21ba283dcc5 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sun, 15 Jul 2012 21:12:31 -0500
Subject: [PATCH 026/199] Fixup multisample rbos. Samplecount validation all
 done in LLMultisampleBuffer::allocate, and falls back to non-multisample
 safely if multisampled rbos cannot/shouldn't be used.

---
 indra/llrender/llgl.cpp             | 38 ++-----------------------
 indra/llrender/llgl.h               |  5 ----
 indra/llrender/llrendertarget.cpp   | 44 +++++++++++++++++------------
 indra/newview/llviewershadermgr.cpp |  2 +-
 indra/newview/pipeline.cpp          |  7 -----
 5 files changed, 29 insertions(+), 67 deletions(-)

diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp
index 92d095b80..cf287f98c 100644
--- a/indra/llrender/llgl.cpp
+++ b/indra/llrender/llgl.cpp
@@ -435,11 +435,7 @@ LLGLManager::LLGLManager() :
 	mHasPointParameters(FALSE),
 	mHasDrawBuffers(FALSE),
 	mHasTextureRectangle(FALSE),
-	mHasTextureMultisample(FALSE),
 	mHasTransformFeedback(FALSE),
-	mMaxSampleMaskWords(0),
-	mMaxColorTextureSamples(0),
-	mMaxDepthTextureSamples(0),
 	mMaxIntegerSamples(0),
 
 	mHasAnisotropic(FALSE),
@@ -732,12 +728,10 @@ bool LLGLManager::initGL()
 	
 	stop_glerror();
 
-	if (mHasTextureMultisample)
+	if (mHasFramebufferMultisample)
 	{
-		glGetIntegerv(GL_MAX_COLOR_TEXTURE_SAMPLES, &mMaxColorTextureSamples);
-		glGetIntegerv(GL_MAX_DEPTH_TEXTURE_SAMPLES, &mMaxDepthTextureSamples);
 		glGetIntegerv(GL_MAX_INTEGER_SAMPLES, &mMaxIntegerSamples);
-		glGetIntegerv(GL_MAX_SAMPLE_MASK_WORDS, &mMaxSampleMaskWords);
+		glGetIntegerv(GL_MAX_SAMPLES, &mMaxSamples);
 	}
 
 	stop_glerror();
@@ -749,24 +743,12 @@ bool LLGLManager::initGL()
 	}
 #endif
 	stop_glerror();
-	mHasTextureMultisample = FALSE;
-#if LL_WINDOWS
-	if (mIsATI)
-	{ //using multisample textures on ATI results in black screen for some reason
-		mHasTextureMultisample = FALSE;
-	}
-#endif
 
 	if (mIsIntel && mGLVersion <= 3.f)
 	{ //never try to use framebuffer objects on older intel drivers (crashy)
 		mHasFramebufferObject = FALSE;
 	}
 
-	if (mHasFramebufferObject)
-	{
-		glGetIntegerv(GL_MAX_SAMPLES, &mMaxSamples);
-	}
-
 	stop_glerror();
 	
 	setToDebugGPU();
@@ -847,14 +829,6 @@ std::string LLGLManager::getRawGLString()
 	return gl_string;
 }
 
-U32 LLGLManager::getNumFBOFSAASamples(U32 samples)
-{
-	samples = llmin(samples, (U32) mMaxColorTextureSamples);
-	samples = llmin(samples, (U32) mMaxDepthTextureSamples);
-	samples = llmin(samples, (U32) 4);
-	return samples;
-}
-
 void LLGLManager::shutdownGL()
 {
 	if (mInited)
@@ -960,7 +934,6 @@ void LLGLManager::initExtensions()
 	mHasDrawBuffers = ExtensionExists("GL_ARB_draw_buffers", gGLHExts.mSysExts);
 	mHasBlendFuncSeparate = ExtensionExists("GL_EXT_blend_func_separate", gGLHExts.mSysExts);
 	mHasTextureRectangle = ExtensionExists("GL_ARB_texture_rectangle", gGLHExts.mSysExts);
-	mHasTextureMultisample = ExtensionExists("GL_ARB_texture_multisample", gGLHExts.mSysExts);
 	mHasDebugOutput = ExtensionExists("GL_ARB_debug_output", gGLHExts.mSysExts);
 	mHasTransformFeedback = mGLVersion >= 4.f ? TRUE : FALSE;
 #if !LL_DARWIN
@@ -1198,13 +1171,6 @@ void LLGLManager::initExtensions()
 	{
 		glBlendFuncSeparateEXT = (PFNGLBLENDFUNCSEPARATEEXTPROC) GLH_EXT_GET_PROC_ADDRESS("glBlendFuncSeparateEXT");
 	}
-	if (mHasTextureMultisample)
-	{
-		glTexImage2DMultisample = (PFNGLTEXIMAGE2DMULTISAMPLEPROC) GLH_EXT_GET_PROC_ADDRESS("glTexImage2DMultisample");
-		glTexImage3DMultisample = (PFNGLTEXIMAGE3DMULTISAMPLEPROC) GLH_EXT_GET_PROC_ADDRESS("glTexImage3DMultisample");
-		glGetMultisamplefv = (PFNGLGETMULTISAMPLEFVPROC) GLH_EXT_GET_PROC_ADDRESS("glGetMultisamplefv");
-		glSampleMaski = (PFNGLSAMPLEMASKIPROC) GLH_EXT_GET_PROC_ADDRESS("glSampleMaski");
-	}
 	if (mHasTransformFeedback)
 	{
 		glBeginTransformFeedback = (PFNGLBEGINTRANSFORMFEEDBACKPROC) GLH_EXT_GET_PROC_ADDRESS("glBeginTransformFeedback");
diff --git a/indra/llrender/llgl.h b/indra/llrender/llgl.h
index c7e58aff9..f877834e9 100644
--- a/indra/llrender/llgl.h
+++ b/indra/llrender/llgl.h
@@ -104,11 +104,7 @@ public:
 	BOOL mHasDrawBuffers;
 	BOOL mHasDepthClamp;
 	BOOL mHasTextureRectangle;
-	BOOL mHasTextureMultisample;
 	BOOL mHasTransformFeedback;
-	S32 mMaxSampleMaskWords;
-	S32 mMaxColorTextureSamples;
-	S32 mMaxDepthTextureSamples;
 	S32 mMaxIntegerSamples;
 
 	// Other extensions.
@@ -155,7 +151,6 @@ public:
 	void printGLInfoString();
 	void getGLInfo(LLSD& info);
 
-	U32 getNumFBOFSAASamples(U32 desired_samples = 32);
 	// In ALL CAPS
 	std::string mGLVendor;
 	std::string mGLVendorShort;
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp
index ceb865ad1..589c0dc0d 100644
--- a/indra/llrender/llrendertarget.cpp
+++ b/indra/llrender/llrendertarget.cpp
@@ -699,6 +699,28 @@ bool LLMultisampleBuffer::allocate(U32 resx, U32 resy, U32 color_fmt, bool depth
 	release();
 	stop_glerror();
 
+	if (!gGLManager.mHasFramebufferMultisample || !gGLManager.mHasFramebufferObject || !(sUseFBO || use_fbo))
+		return false;
+
+	if(color_fmt != GL_RGBA)
+	{
+		llwarns << "Unsupported color format: " << color_fmt << llendl;
+		return false;
+	}
+
+	//Restrict to valid sample count
+	{
+		mSamples = samples;
+		mSamples = llmin(mSamples, (U32)4);	//Cap to prevent memory bloat.
+		mSamples = llmin(mSamples, (U32) gGLManager.mMaxIntegerSamples);//GL_RGBA
+
+		if(depth && !stencil)
+			mSamples = llmin(mSamples, (U32) gGLManager.mMaxSamples);	//GL_DEPTH_COMPONENT16_ARB
+	}
+
+	if (mSamples <= 1)
+		return false;
+	
 	mResX = resx;
 	mResY = resy;
 
@@ -706,30 +728,16 @@ bool LLMultisampleBuffer::allocate(U32 resx, U32 resy, U32 color_fmt, bool depth
 	mUseDepth = depth;
 	mStencil = stencil;
 
-	if (!gGLManager.mHasFramebufferMultisample)
-	{
-		llerrs << "Attempting to allocate unsupported render target type!" << llendl;
-		return false;
-	}
-
-	mSamples = gGLManager.getNumFBOFSAASamples(samples);
-	
-	if (mSamples <= 1)
-	{
-		llerrs << "Cannot create a multisample buffer with less than 2 samples." << llendl;
-		return false;
-	}
-
-	stop_glerror();
-
-	if ((sUseFBO || use_fbo) && gGLManager.mHasFramebufferObject)
 	{
 
 		if (depth)
 		{
 			stop_glerror();
 			if(!allocateDepth())
+			{
+				release();
 				return false;
+			}
 			stop_glerror();
 		}
 		glGenFramebuffers(1, (GLuint *) &mFBO);
@@ -779,6 +787,7 @@ bool LLMultisampleBuffer::addColorAttachment(U32 color_fmt)
 	if (glGetError() != GL_NO_ERROR)
 	{
 		llwarns << "Unable to allocate color buffer for multisample render target." << llendl;
+		release();
 		return false;
 	}
 	
@@ -793,7 +802,6 @@ bool LLMultisampleBuffer::addColorAttachment(U32 color_fmt)
 	}
 
 	mTex.push_back(tex);
-	mInternalFormat.push_back(color_fmt);
 	return true;
 }
 
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index 0eb0b3cc2..6ab2cfd17 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -343,7 +343,7 @@ void LLViewerShaderMgr::setShaders()
 	
 	//setup preprocessor definitions
 	LLShaderMgr::instance()->mDefinitions.clear();
-	LLShaderMgr::instance()->mDefinitions["samples"] = llformat("%d", gSavedSettings.getU32("RenderFSAASamples")/*gGLManager.getNumFBOFSAASamples(gSavedSettings.getU32("RenderFSAASamples"))*/);
+	LLShaderMgr::instance()->mDefinitions["samples"] = llformat("%d", gSavedSettings.getU32("RenderFSAASamples"));
 	LLShaderMgr::instance()->mDefinitions["NUM_TEX_UNITS"] = llformat("%d", gGLManager.mNumTextureImageUnits);
 
 	initAttribsAndUniforms();
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index f71adc331..27632dcfc 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -632,12 +632,6 @@ void LLPipeline::allocateScreenBuffer(U32 resX, U32 resY)
 	static const LLCachedControl<U32> RenderFSAASamples("RenderFSAASamples",0);
 	U32 samples = RenderFSAASamples.get() - RenderFSAASamples.get() % 2;	//Must be multipe of 2.
 
-	//Don't multisample if not using FXAA, or if fbos are disabled, or if multisampled fbos are not supported.
-	if(!LLPipeline::sRenderDeferred && (!LLRenderTarget::sUseFBO || !gGLManager.mHasFramebufferMultisample))
-	{
-		samples = 0;
-	}
-
 	//try to allocate screen buffers at requested resolution and samples
 	// - on failure, shrink number of samples and try again
 	// - if not multisampled, shrink resolution and try again (favor X resolution over Y)
@@ -791,7 +785,6 @@ bool LLPipeline::allocateScreenBuffer(U32 resX, U32 resY, U32 samples)
 		if (!mScreen.allocate(resX, resY, GL_RGBA, TRUE, TRUE, LLTexUnit::TT_RECT_TEXTURE, FALSE)) return false;
 		if(samples > 1)
 		{
-			
 			if(mSampleBuffer.allocate(resX,resY,GL_RGBA,TRUE,TRUE,LLTexUnit::TT_RECT_TEXTURE,FALSE,samples))
 				mScreen.setSampleBuffer(&mSampleBuffer);
 			else

From 9dc1897b352930bd81e5af85d987f54d329bacc9 Mon Sep 17 00:00:00 2001
From: Damian Zhaoying <damian.zhaoying@avataresargentinos.com.ar>
Date: Sun, 15 Jul 2012 23:56:58 -0300
Subject: [PATCH 027/199] Fix English Inventory UI To translate other languages

---
 .../default/xui/en-us/menu_inventory.xml      |   4 +-
 .../default/xui/es/floater_inventory.xml      | 167 +---
 .../skins/default/xui/es/menu_inventory.xml   | 319 ++-----
 .../skins/default/xui/es/menu_viewer.xml      | 891 +++++-------------
 .../skins/default/xui/es/role_actions.xml     | 110 +--
 5 files changed, 399 insertions(+), 1092 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index a383f978b..dae7ab950 100644
--- a/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -50,7 +50,7 @@
 		<on_click filter="" function="Inventory.DoCreate" userdata="gesture" />
 	</menu_item_call>
 	<menu bottom_delta="0" color="MenuDefaultBgColor" drop_shadow="true" height="175" left="0"
-	     mouse_opaque="false" name="New Clothes" opaque="true" tear_off="false"
+	     label="New Clothes" mouse_opaque="false" name="New Clothes" opaque="true" tear_off="false"
 	     width="125">
 		<menu_item_call bottom_delta="-18" height="18" label="New Shirt" left="0" mouse_opaque="true"
 		     name="New Shirt" width="128">
@@ -102,7 +102,7 @@
     </menu_item_call>
 	</menu>
 	<menu bottom_delta="0" color="MenuDefaultBgColor" drop_shadow="true" height="175" left="0"
-	     mouse_opaque="false" name="New Body Parts" opaque="true" tear_off="false"
+	     label="New Body Parts" mouse_opaque="false" name="New Body Parts" opaque="true" tear_off="false"
 	     width="125">
 		<menu_item_call bottom_delta="-18" height="18" label="New Shape" left="0" mouse_opaque="true"
 		     name="New Shape" width="128">
diff --git a/indra/newview/skins/default/xui/es/floater_inventory.xml b/indra/newview/skins/default/xui/es/floater_inventory.xml
index 1e46da38d..4a398cbee 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory.xml
@@ -2,6 +2,7 @@
 <floater name="Inventory" title="Inventario">
 	  <search_editor label="Escribe aquí para buscar" name="inventory search editor"/>
 	  <button label="" name="collapse_btn" tool_tip="Cerrar Todo" />
+	  <button label="" name="Inventory.ExpandAll" tool_tip="Expandir Todo"/>	  
 	  <text name="group_titles_textbox">
 			 Filtro Rápido:
 	  </text>
@@ -13,7 +14,7 @@
 			 Animaciones
 	  </string>
 	  <string name="filter_type_callingcard">
-			 Tarjestas de Llamada
+			 Tarjetas de Llamada
 	  </string>
 	  <string name="filter_type_wearable">
 			 Ropas / Partes de Cuerpo
@@ -88,141 +89,61 @@
 					Personalizado...
 			 </combo_item>
 	  </combo_box>
-	  <tab_container name="inventory filter tabs" follows="left|top|right|bottom"
-	     bottom_delta="-487" height="480" left="2" width="463"
-	     mouse_opaque="false" tab_position="top">
-
-		<inventory_panel allow_multi_select="true" border="true" bottom="-507"
-		     follows="left|top|right|bottom" height="491" label="All Items" left="1"
-		     mouse_opaque="true" name="All Items" sort_order="InventorySortOrder"
-		     width="461" />
-		<inventory_panel allow_multi_select="true" border="true" bottom_delta="0"
-		     follows="left|top|right|bottom" height="491" label="Recent Items"
-		     left_delta="0" mouse_opaque="true" name="Recent Items"
-		     sort_order="RecentItemsSortOrder" width="461" />
-		<inventory_panel allow_multi_select="true" border="true" bottom_delta="0"
-		     follows="left|top|right|bottom" height="491" label="Worn Items"
-		     left_delta="0" mouse_opaque="true" name="Worn Items"
-		     sort_order="WornItemsSortOrder" width="461" />
-	</tab_container>
-	<menu_bar name="Inventory Menu">
+	  <tab_container name="inventory filter tabs" >
+			 <inventory_panel label="Todos los Items" name="All Items"/>
+			 <inventory_panel label="Items Recientes" name="Recent Items"/>
+			 <inventory_panel label="Items Vestidos" name="Worn Items"/>
+	  </tab_container>
+	  <menu_bar name="Inventory Menu">
 			 <menu label="Archivo" name="File">
-					<menu_item_call label="Abrir" name="Open">
-						  <on_click filter="" function="Inventory.DoToSelected" userdata="open" />
-					</menu_item_call>
+					<menu_item_call label="Abrir" name="Open"></menu_item_call>
 					<menu_item_separator name="separator"/>
-					<menu_item_call label="Nueva Ventana" name="New Window">
-						  <on_click filter="" function="Inventory.NewWindow" userdata="" />
-					</menu_item_call>
+					<menu_item_call label="Nueva Ventana" name="New Window"></menu_item_call>
 					<menu_item_separator name="separator2"/>
-					<menu_item_call label="Mostrar Filtros" name="Show Filters">
-						  <on_click filter="" function="Inventory.ShowFilters" userdata="" />
-					</menu_item_call>
-					<menu_item_call label="Restablecer Filtros" name="Reset Current">
-						  <on_click filter="" function="Inventory.ResetFilter" userdata="" />
-					</menu_item_call>
-					<menu_item_call label="Cerrar todas las Carpetas" name="Close All Folders">
-						  <on_click filter="" function="Inventory.CloseAllFolders" userdata="" />
-					</menu_item_call>
+					<menu_item_call label="Mostrar Filtros" name="Show Filters"></menu_item_call>
+					<menu_item_call label="Restablecer Filtros" name="Reset Current"></menu_item_call>
+					<menu_item_call label="Cerrar todas las Carpetas" name="Close All Folders"></menu_item_call>
 					<menu_item_separator name="separator3"/>
-					<menu_item_call label="Vaciar la Papelera" name="Empty Trash">
-						  <on_click filter="" function="Inventory.EmptyTrash" userdata="" />
-					</menu_item_call>
-					<menu_item_call label="Actualizar Inventario" name="Refresh Inventory">
-						  <on_click filter="" function="Inventory.RefreshInvModel" userdata="" />
-					</menu_item_call>
+					<menu_item_call label="Vaciar la Papelera" name="Empty Trash"></menu_item_call>
+					<menu_item_call label="Actualizar Inventario" name="Refresh Inventory"></menu_item_call>
 			 </menu>
 			 <menu label="Crear" name="Create">
-					<menu_item_call label="Nueva Carpeta" name="New Folder">
-						  <on_click filter="" function="Inventory.DoCreate" userdata="category" />
-					</menu_item_call>
-					<menu_item_call label="Nuevo Script" name="New Script">
-						  <on_click filter="" function="Inventory.DoCreate" userdata="lsl" />
-					</menu_item_call>
-					<menu_item_call label="Nueva Nota" name="New Note">
-						  <on_click filter="" function="Inventory.DoCreate" userdata="notecard" />
-					</menu_item_call>
-					<menu_item_call label="Nuevo Gesto" name="New Gesture">
-						  <on_click filter="" function="Inventory.DoCreate" userdata="gesture" />
-					</menu_item_call>
-					<menu name="New Clothes">
-						  <menu_item_call label="Nueva Camisa" name="New Shirt">
-								 <on_click filter="" function="Inventory.DoCreate" userdata="shirt" />
-						  </menu_item_call>
-						  <menu_item_call label="Nuevos Pantalones" name="New Pants">
-								 <on_click filter="" function="Inventory.DoCreate" userdata="pants" />
-						  </menu_item_call>
-						  <menu_item_call label="Nuevos Zapatos" name="New Shoes">
-								 <on_click filter="" function="Inventory.DoCreate" userdata="shoes" />
-						  </menu_item_call>
-						  <menu_item_call label="Nuevas Medias" name="New Socks">
-								 <on_click filter="" function="Inventory.DoCreate" userdata="socks" />
-						  </menu_item_call>
-						  <menu_item_call label="Nueva Chaqueta" name="New Jacket">
-								 <on_click filter="" function="Inventory.DoCreate" userdata="jacket" />
-						  </menu_item_call>
-						  <menu_item_call label="Nueva Falda" name="New Skirt">
-								 <on_click filter="" function="Inventory.DoCreate" userdata="skirt" />
-						  </menu_item_call>
-						  <menu_item_call label="Nuevos Guantes" name="New Gloves">
-								 <on_click filter="" function="Inventory.DoCreate" userdata="gloves" />
-						  </menu_item_call>
-						  <menu_item_call label="Nueva Camiseta" name="New Undershirt">
-								 <on_click filter="" function="Inventory.DoCreate" userdata="undershirt" />
-						  </menu_item_call>
-						  <menu_item_call label="Nueva Ropa Interior" name="New Underpants">
-								 <on_click filter="" function="Inventory.DoCreate" userdata="underpants" />
-						  </menu_item_call>
-						  <menu_item_call label="Nuevo Tatuaje" name="New Tattoo">
-								 <on_click filter="" function="Inventory.DoCreate" userdata="tattoo" />
-						  </menu_item_call>
-						  <menu_item_call label="Nueva Capa Alfa" name="New Alpha">
-								 <on_click filter="" function="Inventory.DoCreate" userdata="alpha" />
-						  </menu_item_call>
-						  <menu_item_call label="Nueva Física" name="New Physics">
-								 <on_click filter="" function="Inventory.DoCreate" userdata="physics" />
-						  </menu_item_call>
+					<menu_item_call label="Nueva Carpeta" name="New Folder"></menu_item_call>
+					<menu_item_call label="Nuevo Script" name="New Script"></menu_item_call>
+					<menu_item_call label="Nueva Nota" name="New Note"></menu_item_call>
+					<menu_item_call label="Nuevo Gesto" name="New Gesture"></menu_item_call>
+					<menu label="Ropas Nuevas" name="New Clothes">
+						  <menu_item_call label="Nueva Camisa" name="New Shirt"></menu_item_call>
+						  <menu_item_call label="Nuevos Pantalones" name="New Pants"></menu_item_call>
+						  <menu_item_call label="Nuevos Zapatos" name="New Shoes"></menu_item_call>
+						  <menu_item_call label="Nuevas Medias" name="New Socks"></menu_item_call>
+						  <menu_item_call label="Nueva Chaqueta" name="New Jacket"></menu_item_call>
+						  <menu_item_call label="Nueva Falda" name="New Skirt"></menu_item_call>
+						  <menu_item_call label="Nuevos Guantes" name="New Gloves"></menu_item_call>
+						  <menu_item_call label="Nueva Camiseta" name="New Undershirt"></menu_item_call>
+						  <menu_item_call label="Nueva Ropa Interior" name="New Underpants"></menu_item_call>
+						  <menu_item_call label="Nuevo Tatuaje" name="New Tattoo"></menu_item_call>
+						  <menu_item_call label="Nueva Capa Alfa" name="New Alpha"></menu_item_call>
+						  <menu_item_call label="Nueva Física" name="New Physics"></menu_item_call>
 					</menu>
-					<menu name="New Body Parts">
-						  <menu_item_call label="Nueva Forma" name="New Shape">
-								 <on_click filter="" function="Inventory.DoCreate" userdata="shape" />
-						  </menu_item_call>
-						  <menu_item_call label="Nueva Piel" name="New Skin">
-								 <on_click filter="" function="Inventory.DoCreate" userdata="skin" />
-						  </menu_item_call>
-						  <menu_item_call label="Nuevo Pelo" name="New Hair">
-								 <on_click filter="" function="Inventory.DoCreate" userdata="hair" />
-						  </menu_item_call>
-						  <menu_item_call label="Nuevos Ojos" name="New Eyes">
-								 <on_click filter="" function="Inventory.DoCreate" userdata="eyes" />
-						  </menu_item_call>
+					<menu label="Partes de Cuerpo Nuevas" name="New Body Parts">
+						  <menu_item_call label="Nueva Forma" name="New Shape"></menu_item_call>
+						  <menu_item_call label="Nueva Piel" name="New Skin"></menu_item_call>
+						  <menu_item_call label="Nuevo Pelo" name="New Hair"></menu_item_call>
+						  <menu_item_call label="Nuevos Ojos" name="New Eyes"></menu_item_call>
 					</menu>
 			 </menu>
 			 <menu label="Ordenar" name="Sort">
-					<menu_item_check label="Por Nombre" name="By Name">
-						  <on_click filter="" function="Inventory.SetSortBy" userdata="name" />
-					</menu_item_check>
-					<menu_item_check label="Por Fecha" name="By Date">
-						  <on_click filter="" function="Inventory.SetSortBy" userdata="date" />
-					</menu_item_check>
+					<menu_item_check label="Por Nombre" name="By Name"></menu_item_check>
+					<menu_item_check label="Por Fecha" name="By Date"></menu_item_check>
 					<menu_item_separator name="separator"/>
-					<menu_item_check label="Carpetas, siempre por Nombre" name="Folders Always By Name">
-						  <on_click filter="" function="Inventory.SetSortBy" userdata="foldersalwaysbyname" />
-					</menu_item_check>
-					<menu_item_check label="Carpeta de Sistema al Principio" name="System Folders To Top">
-						  <on_click filter="" function="Inventory.SetSortBy" userdata="systemfolderstotop" />
-					</menu_item_check>
+					<menu_item_check label="Carpetas, siempre por Nombre" name="Folders Always By Name"></menu_item_check>
+					<menu_item_check label="Carpeta de Sistema al Principio" name="System Folders To Top"></menu_item_check>
 			 </menu>
 			 <menu label="Buscar" name="Search">
-					<menu_item_check label="Nombre del Item" name="Item name">
-						  <on_click filter="" function="Inventory.SetSearchType" userdata="name" />
-					</menu_item_check>
-					<menu_item_check label="Descripción del Item" name="Item description">
-						  <on_click filter="" function="Inventory.SetSearchType" userdata="description" />
-					</menu_item_check>
-					<menu_item_check label="Creador del Item" name="Item creatorr">
-						  <on_click filter="" function="Inventory.SetSearchType" userdata="creator" />
-					</menu_item_check>
+					<menu_item_check label="Nombre del Item" name="Item name"></menu_item_check>
+					<menu_item_check label="Descripción del Item" name="Item description"></menu_item_check>
+					<menu_item_check label="Creador del Item" name="Item creatorr"></menu_item_check>
 			 </menu>
 	  </menu_bar>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml
index c03009e23..98aad1a6e 100644
--- a/indra/newview/skins/default/xui/es/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/es/menu_inventory.xml
@@ -1,230 +1,97 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu name="Popup">
-	  <menu_item_call name="Task Buy" label="Comprar" >
-			 <on_click filter="" function="Inventory.DoToSelected" userdata="task_buy" />
-	  </menu_item_call>
-	  <menu_item_call name="Task Open" label="Abrir" >
-			 <on_click filter="" function="Inventory.DoToSelected" userdata="task_open" />
-	  </menu_item_call>
-	  <menu_item_call name="Task Play" label="Reproducir" >
-			 <on_click filter="" function="Inventory.DoToSelected" userdata="task_play" />
-	  </menu_item_call>
-	  <menu_item_call name="Task Properties" label="Propiedades" >
-			 <on_click filter="" function="Inventory.DoToSelected" userdata="task_properties" />
-	  </menu_item_call>
-	  <menu_item_call name="Task Rename" label="Renombrar" >
-			 <on_click filter="" function="Inventory.DoToSelected" userdata="rename" />
-	  </menu_item_call>
-	  <menu_item_call name="Task Remove" label="Borrar" >
-			 <on_click filter="" function="Inventory.DoToSelected" userdata="delete" />
-	  </menu_item_call>
-	  <menu_item_call name="Empty Trash" label="Vaciar Papelera" >
-			 <on_click filter="" function="Inventory.EmptyTrash" userdata="rename" />
-	  </menu_item_call>
-	  <menu_item_call name="Empty Lost And Found" label="Vaciar Perdidos y Encontrados" >
-			 <on_click filter="" function="Inventory.EmptyLostAndFound" userdata="rename" />
-	  </menu_item_call>
-	  <menu_item_call name="New Folder" label="Carpeta nueva" >
-			 <on_click filter="" function="Inventory.DoCreate" userdata="category" />
-	  </menu_item_call>
-	  <menu_item_call name="New Script" label="Script nuevo" >
-			 <on_click filter="" function="Inventory.DoCreate" userdata="lsl" />
-	  </menu_item_call>
-	  <menu_item_call  name="New Note" label="Nota nueva" >
-			 <on_click filter="" function="Inventory.DoCreate" userdata="notecard" />
-	  </menu_item_call>
-	  <menu_item_call name="New Gesture" label="Gesto nuevo" >
-			 <on_click filter="" function="Inventory.DoCreate" userdata="gesture" />
-	  </menu_item_call>
+	  <menu_item_call name="Task Buy" label="Comprar" ></menu_item_call>
+	  <menu_item_call name="Task Open" label="Abrir" ></menu_item_call>
+	  <menu_item_call name="Task Play" label="Reproducir" ></menu_item_call>
+	  <menu_item_call name="Task Properties" label="Propiedades" ></menu_item_call>
+	  <menu_item_call name="Task Rename" label="Renombrar" ></menu_item_call>
+	  <menu_item_call name="Task Remove" label="Borrar" ></menu_item_call>
+	  <menu_item_call name="Empty Trash" label="Vaciar Papelera" ></menu_item_call>
+	  <menu_item_call name="Empty Lost And Found" label="Vaciar Perdidos y Encontrados" ></menu_item_call>
+	  <menu_item_call name="New Folder" label="Carpeta nueva" ></menu_item_call>
+	  <menu_item_call name="New Script" label="Script nuevo" ></menu_item_call>
+	  <menu_item_call  name="New Note" label="Nota nueva" ></menu_item_call>
+	  <menu_item_call name="New Gesture" label="Gesto nuevo" ></menu_item_call>
 	  <menu name="New Clothes" label="Nuevas Ropas">
-		<menu_item_call name="New Shirt" label=" Camisa nueva" >
-			<on_click filter="" function="Inventory.DoCreate" userdata="shirt" />
-		</menu_item_call>
-		<menu_item_call name="New Pants" label="Pantalones nuevos" >
-			<on_click filter="" function="Inventory.DoCreate" userdata="pants" />
-		</menu_item_call>
-		<menu_item_call name="New Shoes" label="Zapatos nuevos" >
-			<on_click filter="" function="Inventory.DoCreate" userdata="shoes" />
-		</menu_item_call>
-		<menu_item_call name="New Socks" label=" Calzetines nuevos" >
-			<on_click filter="" function="Inventory.DoCreate" userdata="socks" />
-		</menu_item_call>
-		<menu_item_call name="New Jacket" label="Chaqueta nueva" >
-			<on_click filter="" function="Inventory.DoCreate" userdata="jacket" />
-		</menu_item_call>
-		<menu_item_call name="New Skirt" label="Falda nueva" >
-			<on_click filter="" function="Inventory.DoCreate" userdata="skirt" />
-		</menu_item_call>
-		<menu_item_call name="New Gloves" label="Guantes nuevos" >
-			<on_click filter="" function="Inventory.DoCreate" userdata="gloves" />
-		</menu_item_call>
-		<menu_item_call name="New Undershirt" label="Camiseta nueva" >
-			<on_click filter="" function="Inventory.DoCreate" userdata="undershirt" />
-		</menu_item_call>
-		<menu_item_call name="New Underpants" label="Calzoncillos nuevos" >
-			<on_click filter="" function="Inventory.DoCreate" userdata="underpants" />
-		</menu_item_call>
-		<menu_item_call name="New Tattoo" label="Tatuaje nuevo" >
-			<on_click filter="" function="Inventory.DoCreate" userdata="tattoo" />
-		</menu_item_call>
-		<menu_item_call name="New Alpha" label="Alfa nueva" >
-			<on_click filter="" function="Inventory.DoCreate" userdata="alpha" />
-		</menu_item_call>
-    <menu_item_call name="New Physics" label="Física nueva" >
-      <on_click filter="" function="Inventory.DoCreate" userdata="physics" />
-    </menu_item_call>
-	</menu>
-	<menu name="New Body Parts">
-		<menu_item_call name="New Shape" label="Shape nuevo" >
-			<on_click filter="" function="Inventory.DoCreate" userdata="shape" />
-		</menu_item_call>
-		<menu_item_call name="New Skin" label="Skin nuevo" >
-			<on_click filter="" function="Inventory.DoCreate" userdata="skin" />
-		</menu_item_call>
-		<menu_item_call name="New Hair" label="Pelo nuevo" >
-			<on_click filter="" function="Inventory.DoCreate" userdata="hair" />
-		</menu_item_call>
-		<menu_item_call name="New Eyes" label="Ojos nuevos" >
-			<on_click filter="" function="Inventory.DoCreate" userdata="eyes" />
-		</menu_item_call>
-	</menu>
-	<menu_item_call name="Landmark Open" label="Teleport" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
-	</menu_item_call>
-	<menu_item_call name="Animation Open" label="Abrir" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
-	</menu_item_call>
-	<menu_item_call name="Sound Open" label="Abrir" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
-	</menu_item_call>
-	<menu_item_call name="Find Original" label="Encontrar original" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="goto" />
-	</menu_item_call>
-	<menu_item_call name="Purge Item" label="Limpiar objeto" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="purge" />
-	</menu_item_call>
-	<menu_item_call name="Restore Item" label="Restaurar objeto" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="restore" />
-	</menu_item_call>
-	<menu name="Open With...">
-		<menu_item_call name="Hex Open" label="Editor Hexa" >
-			<on_click filter="" function="Inventory.DoToSelected" userdata="open hex" />
-		</menu_item_call>
-		<menu_item_call name="Open Text" label="Editor de Texto" >
-			<on_click filter="" function="Inventory.DoToSelected" userdata="open text" />
-		</menu_item_call>
-		<menu_item_call name="Rez" label="Rezear Objeto" >
-			<on_click filter="" function="Inventory.DoToSelected" userdata="rez" />
-		</menu_item_call>
-	</menu>
-	<menu_item_call name="Open" label="Abrir" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
-	</menu_item_call>
-	<menu_item_call name="Properties" label="Propiedades">
-		<on_click filter="" function="Inventory.DoToSelected" userdata="properties" />
-	</menu_item_call>
-	<menu_item_call name="Rename" label="Renombrar" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="rename" />
-	</menu_item_call>
-	<menu_item_call name="Copy Asset UUID" label="Copiar Asset UUID" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="copy_uuid" />
-	</menu_item_call>
-	<menu_item_call name="Reupload..." label="Resubir..." >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="reupload" />
-	</menu_item_call>
-	<menu_item_call name="Acquire Asset ID" label="Adquirir Asset ID" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="acquire_asset_id" />
-	</menu_item_call>
-	<menu_item_separator name="Copy Separator" />
-	<menu_item_call name="Copy" label="Copiar" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="copy" />
-	</menu_item_call>
-	<menu_item_call name="Paste" label="Pegar">
-		<on_click filter="" function="Inventory.DoToSelected" userdata="paste" />
-	</menu_item_call>
-	<menu_item_call name="Paste As Link" label="Pegar como Link" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="paste_link" />
-	</menu_item_call>
-	<menu_item_call name="Restore to Last Position" label="Restaurar en el mundo" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="restoreToWorld" />
-	</menu_item_call>
-	<menu_item_separator name="Paste Separator" />
-	<menu_item_call name="Remove Link" label="Borrar Link" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="delete" />
-	</menu_item_call>
-	<menu_item_call name="Delete" label="Borrar">
-		<on_click filter="" function="Inventory.DoToSelected" userdata="delete" />
-	</menu_item_call>
-	<menu_item_separator name="Folder Wearables Separator" />
-  <menu_item_call name="Wear Items" label="Vestirse objetos" >
-    <on_click filter="" function="Inventory.DoToSelected" userdata="wearitems" />
-  </menu_item_call>
-  <menu_item_call name="Add To Outfit" label="Añadirse objetos" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="addtooutfit" />
-	</menu_item_call>
-	<menu_item_call name="Replace Outfit" label="Reemplazar ropa" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="replaceoutfit" />
-	</menu_item_call>
-  <menu_item_call name="Take Off Items" label="Quitarse objetos" >
-    <on_click filter="" function="Inventory.DoToSelected" userdata="removefromoutfit" />
-  </menu_item_call>
-  <menu_item_separator name="Calling Card Separator" />
-	<menu_item_call name="Conference Chat Folder" label="Comenzar conversacion de grupo" >
-		<on_click filter="" function="Inventory.BeginIMSession" userdata="everyone" />
-	</menu_item_call>
-	<menu_item_separator name="Sound Separator" />
-	<menu_item_call name="Sound Play" label="Reproducir" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="open" />
-	</menu_item_call>
-	<menu_item_separator name="Landmark Separator" />
-	<menu_item_call name="Teleport To Landmark" label="Sobre el hito" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="about" />
-	</menu_item_call>
-	<menu_item_separator name="Animation Separator" />
-	<menu_item_call name="Animation Play" label="Reproducir en el mundo">
-		<on_click filter="" function="Inventory.DoToSelected" userdata="playworld" />
-	</menu_item_call>
-	<menu_item_call name="Animation Audition" label="Reproducir en la zona" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="playlocal" />
-	</menu_item_call>
-	<menu_item_separator name="Send Instant Message Separator" />
-	<menu_item_call name="Send Instant Message" label="Enviar IM" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="begin_im" />
-	</menu_item_call>
-	<menu_item_call name="Offer Teleport..." label="Ofrecer Teleport..." >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="lure" />
-	</menu_item_call>
-	<menu_item_call name="Conference Chat" label="Comenzar conversacion de grupo" >
-		<on_click filter="" function="Inventory.BeginIMSession" userdata="selected" />
-	</menu_item_call>
-	<menu_item_separator name="Gesture Separator" />
-	<menu_item_call name="Activate" label="Activar" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="activate" />
-	</menu_item_call>
-	<menu_item_call name="Deactivate" label="Desactivar" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="deactivate" />
-	</menu_item_call>
-	<menu_item_separator name="Attach Separator" />
-	<menu_item_call name="Object Wear" label="Vestirse" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="attach" />
-	</menu_item_call>
-	<menu_item_call name="Object Add" label="Agregar Objeto" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="wear_add" />
-	</menu_item_call>
-	<menu name="Attach To" label="Anexar a" />
-	<menu name="Attach To HUD" label="Anexar como HUD"  />
-	<menu_item_call name="Detach From Yourself" label="Desvestirse" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="detach" />
-	</menu_item_call>
-	<menu_item_call name="Wearable Edit" label="Editar" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="edit" />
-	</menu_item_call>
-	<menu_item_call name="Wearable Wear"  label="Vestirse" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="wear" />
-	</menu_item_call>
-	<menu_item_call name="Take Off" label="Dejar" >
-		<on_click filter="" function="Inventory.DoToSelected" userdata="take_off" />
-	</menu_item_call>
-	<menu_item_call name="--no options--" label="--sin opciones--"  />
-	<--menu_item_separator name="Wearable Separator" /-->
+			 <menu_item_call name="New Shirt" label="Camisa nueva" ></menu_item_call>
+			 <menu_item_call name="New Pants" label="Pantalones nuevos" ></menu_item_call>
+			 <menu_item_call name="New Shoes" label="Zapatos nuevos" ></menu_item_call>
+			 <menu_item_call name="New Socks" label="Calcetines nuevos" ></menu_item_call>
+			 <menu_item_call name="New Jacket" label="Chaqueta nueva" ></menu_item_call>
+			 <menu_item_call name="New Skirt" label="Falda nueva" ></menu_item_call>
+			 <menu_item_call name="New Gloves" label="Guantes nuevos" ></menu_item_call>
+			 <menu_item_call name="New Undershirt" label="Camiseta nueva" ></menu_item_call>
+			 <menu_item_call name="New Underpants" label="Ropa Interior nueva" ></menu_item_call>
+			 <menu_item_call name="New Tattoo" label="Tatuaje nuevo" ></menu_item_call>
+			 <menu_item_call name="New Alpha" label="Alfa nueva" ></menu_item_call>
+			 <menu_item_call name="New Physics" label="Física nueva" ></menu_item_call>
+	  </menu>
+	  <menu name="New Body Parts" label="Partes de Cuerpo Nuevas" >
+			 <menu_item_call name="New Shape" label="Forma nueva" ></menu_item_call>
+			 <menu_item_call name="New Skin" label="Piel nueva" ></menu_item_call>
+			 <menu_item_call name="New Hair" label="Pelo nuevo" ></menu_item_call>
+			 <menu_item_call name="New Eyes" label="Ojos nuevos" ></menu_item_call>
+	  </menu>
+	  <menu_item_call name="Landmark Open" label="Teleport" ></menu_item_call>
+	  <menu_item_call name="Animation Open" label="Abrir" ></menu_item_call>
+	  <menu_item_call name="Sound Open" label="Abrir"></menu_item_call>
+	  <menu_item_call name="Find Original" label="Encontrar original" ></menu_item_call>
+	  <menu_item_call name="Purge Item" label="Limpiar objeto" ></menu_item_call>
+	  <menu_item_call name="Restore Item" label="Restaurar objeto" ></menu_item_call>
+	  <menu name="Open With..." label="Abrir con...">
+			 <menu_item_call name="Hex Open" label="Editor Hexa" ></menu_item_call>
+			 <menu_item_call name="Open Text" label="Editor de Texto" ></menu_item_call>
+			 <menu_item_call name="Rez" label="Rezear Objeto" ></menu_item_call>
+	  </menu>
+	  <menu_item_call name="Open" label="Abrir" ></menu_item_call>
+	  <menu_item_call name="Properties" label="Propiedades"></menu_item_call>
+	  <menu_item_call name="Rename" label="Renombrar" ></menu_item_call>
+	  <menu_item_call name="Copy Asset UUID" label="Copiar Asset UUID" ></menu_item_call>
+	  <menu_item_call name="Reupload..." label="Resubir..." ></menu_item_call>
+	  <menu_item_call name="Acquire Asset ID" label="Adquirir Asset ID" ></menu_item_call>
+	  <menu_item_separator name="Copy Separator" />
+	  <menu_item_call name="Copy" label="Copiar" ></menu_item_call>
+	  <menu_item_call name="Paste" label="Pegar"></menu_item_call>
+	  <menu_item_call name="Paste As Link" label="Pegar como Link" ></menu_item_call>
+	  <menu_item_call name="Restore to Last Position" label="Restaurar en el mundo" ></menu_item_call>
+	  <menu_item_separator name="Paste Separator" />
+	  <menu_item_call name="Remove Link" label="Borrar Link" ></menu_item_call>
+	  <menu_item_call name="Delete" label="Borrar"></menu_item_call>
+	  <menu_item_separator name="Folder Wearables Separator" />
+	  <menu_item_call name="Wear Items" label="Vestirse objetos" ></menu_item_call>
+	  <menu_item_call name="Add To Outfit" label="Añadir al vestuario" ></menu_item_call>
+	  <menu_item_call name="Replace Outfit" label="Reemplazar Vestuario" ></menu_item_call>
+	  <menu_item_call label="Quitar del Vestuario" name="Remove From Outfit"></menu_item_call>
+	  <menu_item_separator name="Outfit Separator"></menu_item_separator>
+	  <menu_item_separator name="Calling Card Separator" />
+	  <menu_item_call name="Conference Chat Folder" label="Iniciar Conferencia Grupal" ></menu_item_call>
+	  <menu_item_separator name="Sound Separator" />
+	  <menu_item_call name="Sound Play" label="Reproducir" ></menu_item_call>
+	  <menu_item_separator name="Landmark Separator" />
+	  <menu_item_call name="Teleport To Landmark" label="Sobre el hito" ></menu_item_call>
+	  <menu_item_separator name="Animation Separator" />
+	  <menu_item_call name="Animation Play" label="Reproducir en el mundo"></menu_item_call>
+	  <menu_item_call name="Animation Audition" label="Reproducir localmente" ></menu_item_call>
+	  <menu_item_separator name="Send Instant Message Separator" />
+	  <menu_item_call name="Send Instant Message" label="Enviar MI" ></menu_item_call>
+	  <menu_item_call name="Offer Teleport..." label="Ofrecer Teleport..." ></menu_item_call>
+	  <menu_item_call name="Conference Chat" label="Iniciar Conferencia Grupal" ></menu_item_call>
+	  <menu_item_separator name="Gesture Separator" />
+	  <menu_item_call name="Activate" label="Activar" ></menu_item_call>
+	  <menu_item_call name="Deactivate" label="Desactivar" ></menu_item_call>
+	  <menu_item_separator name="Wearable And Object Separator" />
+	  <menu_item_call name="Wearable And Object Wear" label="Vestirse Objeto" ></menu_item_call>
+	  <menu_item_call label="Añadir al Vestuario" name="Wearable Add"></menu_item_call>
+	  <menu_item_call label="&#9650; >Hacia Adelante" name="Wearable Move Forward"></menu_item_call>
+	  <menu_item_call label="&#9660; Hacia Atrás" name="Wearable Move Back"></menu_item_call>
+	  <menu label="Anexar a " name="Attach To"/>
+	  <menu label="Anexar al HUD" name="Attach To HUD"/>
+	  <menu_item_call label="Quitarse" name="Detach From Yourself"></menu_item_call>
+	  <menu_item_call label="Editar" name="Wearable Edit"></menu_item_call>
+	  <menu_item_call label="Quitarse" name="Take Off"></menu_item_call>
+	  <menu_item_separator name="Marketplace Separator" />
+	  <menu_item_call label="Copiar al Merchant Outbox" name="Merchant Copy"/>
+	  <menu_item_call label="Enviar a Marketplace" name="Marketplace Send"/>
+	  <menu_item_call label="--sin opciones--" name="--no options--" />
+	  <!--menu_item_separator name="Wearable Separator" -->	
 </menu>
diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml
index 819b782dd..af96c05b7 100644
--- a/indra/newview/skins/default/xui/es/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/es/menu_viewer.xml
@@ -1,666 +1,229 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
-     height="18" left="0" mouse_opaque="true" name="Main Menu" opaque="false"
-     tear_off="false" width="802">
-	<menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
-	    height="263" label="Archivo" left="0" mouse_opaque="false" name="File"
-	    opaque="true" tear_off="true" width="243">
-    <menu_item_call label="Imágen ([UPLOADFEE])..." name="Upload Image" >
-		<on_click function="File.UploadImage" userdata="" />
-		<on_enable function="File.EnableUpload" />
-    </menu_item_call>
-    <menu_item_call label="Sonido ([UPLOADFEE])..." name="Upload Sound" >
-        <on_click function="File.UploadSound" userdata="" />
-        <on_enable function="File.EnableUpload" />
-    </menu_item_call>
-    <menu_item_call label="Animación ([UPLOADFEE])..." name="Upload Animation" >
-        <on_click function="File.UploadAnim" userdata="" />
-        <on_enable function="File.EnableUpload" />
-    </menu_item_call>
-    <menu_item_call label="Masiva ([UPLOADFEE] por archivo)..." name="Bulk Upload" >
-        <on_click function="File.UploadBulk" userdata="" />
-    </menu_item_call>
-	<menu_item_call label="Importar XML" name="Import">
-		<on_click function="Object.Import" />
-		<on_enable function="Object.EnableImport" />
-	</menu_item_call>
-	<menu_item_call label="Importar con Texturas" name="Import2">
-		<on_click function="Object.ImportUpload" />
-		<on_enable function="Object.EnableImport" />
-	</menu_item_call>
-    <menu_item_separator label="-----------" name="separator" />
-    <menu_item_call label="Definir Permisos por Defecto..." name="perm prefs" >
-        <on_click function="ShowFloater" userdata="perm prefs" />
-    </menu_item_call>
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Cerrar Ventana" name="Close Window" >
-			<on_click function="File.CloseWindow" userdata="" />
-			<on_enable function="File.EnableCloseWindow" userdata="" />
-		</menu_item_call>
-		<menu_item_call label="Cerrar todas las Ventanas" name="Close All Windows" >
-			<on_click function="File.CloseAllWindows" userdata="" />
-			<on_enable function="File.EnableCloseAllWindows" userdata="" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Guardar Vista Previa Como..." name="Save Preview As..." >
-			<on_click function="File.SavePreview" userdata="" />
-			<on_enable function="File.EnableSaveAs" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Hacer una Foto" name="Take Snapshot" >
-			<on_click function="File.TakeSnapshot" userdata="" />
-		</menu_item_call>
-		<menu_item_call label="Guardar Foto" name="Snapshot to Disk" >
-			<on_click function="File.TakeSnapshotToDisk" userdata="" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator4"/>
-		<menu_item_call label="Salir" name="Quit" >
-			<on_click function="File.Quit" userdata="" />
-		</menu_item_call>
-	    <!--menu_item_call bottom="-259" enabled="true" height="19" label="Log Out" left="0" color="1 0 0 1"
-			mouse_opaque="true" name="Log Out" width="243">
-			<on_click function="File.LogOut" userdata="" />
-		</menu_item_call-->
-	</menu>
-	<menu label="Editar" name="Edit" >
-		<menu_item_call label="Deshacer" name="Undo" >
-			<on_click function="Edit.Undo" userdata="" />
-			<on_enable function="Edit.EnableUndo" />
-		</menu_item_call>
-		<menu_item_call label="Rehacer" name="Redo" >
-			<on_click function="Edit.Redo" userdata="" />
-			<on_enable function="Edit.EnableRedo" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Cortar" name="Cut" >
-			<on_click function="Edit.Cut" userdata="" />
-			<on_enable function="Edit.EnableCut" />
-		</menu_item_call>
-		<menu_item_call label="Copiar" name="Copy" >
-			<on_click function="Edit.Copy" userdata="" />
-			<on_enable function="Edit.EnableCopy" />
-		</menu_item_call>
-		<menu_item_call label="Pegar" name="Paste" >
-			<on_click function="Edit.Paste" userdata="" />
-			<on_enable function="Edit.EnablePaste" />
-		</menu_item_call>
-		<menu_item_call label="Borrar" name="Delete" >
-			<on_click function="Edit.Delete" userdata="" />
-			<on_enable function="Edit.EnableDelete" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Buscar..." name="Search..." >
-			<on_click function="Edit.Search" userdata="" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Seleccionar Todo" name="Select All" >
-			<on_click function="Edit.SelectAll" userdata="" />
-			<on_enable function="Edit.EnableSelectAll" />
-		</menu_item_call>
-		<menu_item_call label="Deseleccionar" name="Deselect" >
-			<on_click function="Edit.Deselect" userdata="" />
-			<on_enable function="Edit.EnableDeselect" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_call label="Duplicar" name="Duplicate" >
-			<on_click function="Edit.Duplicate" userdata="" />
-			<on_enable function="Edit.EnableDuplicate" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu label="Anexar Objeto" name="Attach Object" />
-		<menu label="Quitarse Objeto" name="Detach Object" />
-		<menu label="Quitarse Ropas" name="Take Off Clothing" >
-			<menu_item_call label="Camisa" name="Shirt" >
-				<on_click function="Edit.TakeOff" userdata="shirt" />
-				<on_enable function="Edit.EnableTakeOff" userdata="shirt" />
-			</menu_item_call>
-			<menu_item_call label="Pantalones" name="Pants" >
-				<on_click function="Edit.TakeOff" userdata="pants" />
-				<on_enable function="Edit.EnableTakeOff" userdata="pants" />
-			</menu_item_call>
-			<menu_item_call label="Zapatos" name="Shoes" >
-				<on_click function="Edit.TakeOff" userdata="shoes" />
-				<on_enable function="Edit.EnableTakeOff" userdata="shoes" />
-			</menu_item_call>
-			<menu_item_call label="Calcetines" name="Socks" >
-				<on_click function="Edit.TakeOff" userdata="socks" />
-				<on_enable function="Edit.EnableTakeOff" userdata="socks" />
-			</menu_item_call>
-			<menu_item_call label="Chaqueta" name="Jacket" >
-				<on_click function="Edit.TakeOff" userdata="jacket" />
-				<on_enable function="Edit.EnableTakeOff" userdata="jacket" />
-			</menu_item_call>
-			<menu_item_call label="Guantes" name="Gloves">
-				<on_click function="Edit.TakeOff" userdata="gloves" />
-				<on_enable function="Edit.EnableTakeOff" userdata="gloves" />
-			</menu_item_call>
-			<menu_item_call label="Camiseta" name="Menu Undershirt" >
-				<on_click function="Edit.TakeOff" userdata="undershirt" />
-				<on_enable function="Edit.EnableTakeOff" userdata="undershirt" />
-			</menu_item_call>
-			<menu_item_call label="Calzoncillos" name="Menu Underpants" >
-				<on_click function="Edit.TakeOff" userdata="underpants" />
-				<on_enable function="Edit.EnableTakeOff" userdata="underpants" />
-			</menu_item_call>
-			<menu_item_call label="Falda" name="Skirt" >
-				<on_click function="Edit.TakeOff" userdata="skirt" />
-				<on_enable function="Edit.EnableTakeOff" userdata="skirt" />
-			</menu_item_call>
-			<menu_item_call label="Tatuaje" name="Tattoo" >
-				<on_click function="Edit.TakeOff" userdata="tattoo" />
-				<on_enable function="Edit.EnableTakeOff" userdata="tattoo" />
-			</menu_item_call>
-            <menu_item_separator label="-----------" name="separator51" />
-			<menu_item_call label="Alfa" name="Alpha" >
-				<on_click function="Edit.TakeOff" userdata="alpha" />
-				<on_enable function="Edit.EnableTakeOff" userdata="alpha" />
-			</menu_item_call>
-            <menu_item_call label="Física" name="Physics" >
-                <on_click function="Edit.TakeOff" userdata="physics" />
-                <on_enable function="Edit.EnableTakeOff" userdata="physics" />
-            </menu_item_call>
-            <menu_item_separator label="-----------" name="separator51" />
-			<menu_item_call label="Toda la Ropa" name="All Clothes" >
-				<on_click function="Edit.TakeOff" userdata="all" />
-			</menu_item_call>
-		</menu>
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="Gestos..." name="Gestures..." >
-			<on_click function="ShowFloater" userdata="gestures" />
-		</menu_item_call>
-		<menu_item_call label="Perfil..." name="Profile..." >
-			<on_click function="ShowAgentProfile" userdata="agent" />
-		</menu_item_call>
-		<menu_item_call label="Apariencia..." name="Appearance..." >
-			<on_click function="ShowFloater" userdata="appearance" />
-			<on_enable function="Edit.EnableCustomizeAvatar" />
-		</menu_item_call>
-		<menu_item_call label="Mostrar el Nombre..." name="Display Name..." >
-			<on_click function="ShowFloater" userdata="displayname" />
-			<on_enable function="Edit.EnableChangeDisplayname" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator7" />
-		<menu_item_check label="Amigos..." name="Friends..." >
-			<on_click function="ShowFloater" userdata="friends" />
-			<on_check function="FloaterVisible" userdata="friends" />
-		</menu_item_check>
-		<menu_item_call label="Grupos..." name="Groups..." >
-			<on_click function="ShowAgentGroups" userdata="agent" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator8" />
-		<menu_item_call label="Preferencias..." name="Preferences..." >
-			<on_click function="ShowFloater" userdata="preferences" />
-		</menu_item_call>
-	</menu>
-	<menu label="Ver"  name="View" >
-		<tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
-		<menu_item_call label="Vista Subjetiva" name="Mouselook" >
-			<on_click function="View.Mouselook" userdata="" />
-			<on_enable function="View.EnableMouselook" />
-		</menu_item_call>
-		<menu_item_check label="Construir" name="Build" >
-			<on_click function="View.BuildMode" userdata="" />
-			<on_check function="View.CheckBuildMode" />
-		</menu_item_check>
-		<menu_item_check label="Flycam del Joystick" name="Joystick Flycam" >
-			<on_click function="View.JoystickFlycam" userdata="" />
-			<on_check function="View.CheckJoystickFlycam" />
-			<on_enable function="View.EnableJoystickFlycam" />
-		</menu_item_check>
-		<menu_item_call label="Volver a Vista por Defecto" name="Reset View" >
-			<on_click function="View.ResetView" userdata="" />
-		</menu_item_call>
-		<menu_item_call label="Mirar al último que habló" name="Look at Last Chatter" >
-			<on_click function="View.LookAtLastChatter" userdata="" />
-			<on_enable function="View.EnableLastChatter" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_check label="Barra de Herramientas" name="Toolbar" >
-			<on_click function="ShowFloater" userdata="toolbar" />
-			<on_check function="FloaterVisible" userdata="toolbar" />
-		</menu_item_check>
-		<menu_item_check label="Chat local" name="Chat History" >
-             <on_click function="ShowFloater" userdata="chat history"/>
-             <on_check function="FloaterVisible" userdata="chat history" />
-        </menu_item_check>
-		<menu_item_check label="Comunicarse" name="Instant Message" >
-			<on_click function="View.Communicate"/>
-            <on_check function="FloaterVisible" userdata="communicate" />
-        </menu_item_check>
-		<menu_item_check label="Inventario" name="Inventory" >
-			<on_click function="ShowFloater" userdata="inventory" />
-            <on_check function="FloaterVisible" userdata="inventory" />
-        </menu_item_check>
-		<menu_item_check label="Participantes Activos" name="Active Speakers" >
-			<on_click function="ShowFloater" userdata="active speakers" />
-			<on_check function="FloaterVisible" userdata="active speakers" />
-		</menu_item_check>
-		<menu_item_check label="Lista de Ignorados" name="Mute List" >
-			<on_click function="ShowFloater" userdata="mute list" />
-			<on_check function="FloaterVisible" userdata="mute list" />
-		</menu_item_check>
-		<menu_item_check label="Historial de Teleport" name="Teleport History" >
-			<on_click function="ShowFloater" userdata="teleport history" />
-			<on_check function="FloaterVisible" userdata="teleport history" />
-		</menu_item_check>
-		<menu_item_check label="Filtro de Media" name="Media Filter" >
-			<on_click function="ShowFloater" userdata="media filter" />
-			<on_check function="FloaterVisible" userdata="media filter" />
-		</menu_item_check>
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_check label="Controles de Cámara" name="Camera Controls" >
-			<on_click function="ShowFloater" userdata="camera controls" />
-			<on_check function="FloaterVisible" userdata="camera controls" />
-		</menu_item_check>
-		<menu_item_check label="Controles de Movimiento" name="Movement Controls">
-			<on_click function="ShowFloater" userdata="movement controls" />
-			<on_check function="FloaterVisible" userdata="movement controls" />
-		</menu_item_check>
-		<menu_item_check label="Mapa del Mundo" name="World Map" >
-			<on_click function="ShowFloater" userdata="world map" />
-			<on_check control="ShowWorldMap" />
-		</menu_item_check>
-		<menu_item_check label="MiniMapa" name="Mini-Map" >
-			<on_click function="ShowFloater" userdata="mini map" />
-			<on_check control="ShowMiniMap" />
-		</menu_item_check>
-		<menu_item_check label="Radar" name="Radar" >
-			<on_click function="View.ToggleAvatarList" userdata="radar" />
-			<on_check control="ShowRadar" />
-		</menu_item_check>
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_check label="Estadísticas" name="Statistics Bar" >
-			<on_click function="ShowFloater" userdata="stat bar" />
-			<on_check function="FloaterVisible" userdata="stat bar" />
-		</menu_item_check>
-		<menu_item_separator label="-----------" name="separator100" />
-		<menu_item_check label="Búsqueda en �rea" name="Area Search" >
-			<on_click function="ShowFloater" userdata="areasearch" />
-			<on_check function="FloaterVisible" userdata="areasearch" />
-		</menu_item_check>
-		<menu_item_check label="Límites de Parcelas" name="Property Lines" >
-			<on_click function="ToggleControl" userdata="ShowPropertyLines" />
-			<on_check control="ShowPropertyLines" />
-		</menu_item_check>
-		<menu_item_check label="Líneas de Prohibición" name="Banlines" >
-			<on_click function="ToggleControl" userdata="ShowBanLines" />
-			<on_check control="ShowBanLines" />
-		</menu_item_check>
-		<menu_item_check label="Propietarios del Terreno" name="Land Owners" >
-			<on_click function="ToggleControl" userdata="ShowParcelOwners" />
-			<on_check control="ShowParcelOwners" />
-		</menu_item_check>
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu label="Información Adicional" name="Hover Tips" >
-			<menu_item_check label="Mostrar Información Adicional" name="Show Tips" >
-				<on_click function="View.ShowHoverTips" userdata="" />
-				<on_check function="View.CheckShowHoverTips" />
-			</menu_item_check>
-			<menu_item_separator label="-----------" name="separator" />
-			<menu_item_check label="Información Adicional del Terreno" name="Land Tips" >
-				<on_click function="ToggleControl" userdata="ShowLandHoverTip" />
-				<on_enable function="View.CheckShowHoverTips" />
-				<on_check control="ShowLandHoverTip" />
-			</menu_item_check>
-			<menu_item_check label="Consejos en Todos los Objetos" name="Tips On All Objects" >
-				<on_click function="ToggleControl" userdata="ShowAllObjectHoverTip" />
-				<on_enable function="View.CheckShowHoverTips" />
-				<on_check control="ShowAllObjectHoverTip" />
-			</menu_item_check>
-		</menu>
-		<menu_item_check label="Realzar Transparencias" name="Highlight Transparent" >
-			<on_click function="View.HighlightTransparent" userdata="" />
-			<on_check function="View.CheckHighlightTransparent" />
-		</menu_item_check>
-		<menu_item_check name="beacons" label="Balizas" >
-		    <on_click function="ShowFloater" userdata="beacons" />
-			<on_check function="FloaterVisible" userdata="beacons" />
-		</menu_item_check>
-    <menu_item_check label="Ocultar Partículas" name="Hide Particles" >
-        <on_click function="View.ToggleRenderType" userdata="hideparticles" />
-        <on_check function="View.CheckRenderType" userdata="hideparticles" />
-    </menu_item_check>
-    <menu_item_check label="Mostrar los HUD en uso" name="Show HUD Attachments" >
-			<on_click function="View.ShowHUDAttachments" userdata="" />
-			<on_check function="View.CheckHUDAttachments" />
-		</menu_item_check>
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="Acercar Zoom" name="Zoom In" >
-			<on_click function="View.ZoomIn" userdata="" />
-		</menu_item_call>
-		<menu_item_call label="Zoom Predeterminado" name="Zoom Default" >
-			<on_click function="View.ZoomDefault" userdata="" />
-		</menu_item_call>
-		<menu_item_call label="Alejar Zoom" name="Zoom Out" >
-			<on_click function="View.ZoomOut" userdata="" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="Pantalla Completa" name="Toggle Fullscreen" >
-			<on_click function="View.Fullscreen" userdata="" />
-		</menu_item_call>
-		<menu_item_call label="Interfaz en tamaño Predeterminado" name="Set UI Size to Default" >
-			<on_click function="View.DefaultUISize" userdata="" />
-		</menu_item_call>
-	</menu>
-	<menu label="Mundo" name="World" >
-		<menu_item_call label="Chat" name="Chat" >
-			<on_click function="World.Chat" userdata="" />
-		</menu_item_call>
-		<menu_item_check label="Correr Siempre" name="Always Run" >
-			<on_click function="World.AlwaysRun" userdata="" />
-			<on_check function="World.CheckAlwaysRun" userdata="" />
-		</menu_item_check>
-		<menu_item_call label="Sentarse en el piso" name="Sit on Ground" >
-			<on_click function="World.SitOnGround" userdata="" />
-			<on_enable function="World.EnableSitOnGround" userdata="" />
-		</menu_item_call>
-		<menu_item_check label="Volar" name="Fly" >
-			<on_click function="World.Fly" userdata="" />
-			<on_enable function="World.EnableFly" />
-			<on_check control="FlyBtnState" />
-		</menu_item_check>
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Crear un Hito Aquí" name="Create Landmark Here" >
-			<on_click function="World.CreateLandmark" userdata="" />
-			<on_enable function="World.EnableCreateLandmark" userdata="" />
-		</menu_item_call>
-		<menu_item_call label="Fijar Base Aquí" name="Set Home to Here" >
-			<on_click function="World.SetHomeLocation" userdata="" />
-			<on_enable function="World.EnableSetHomeLocation" userdata="" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Teleport a Base" name="Teleport Home" >
-			<on_click function="World.TeleportHome" userdata="" />
-			<on_enable function="World.EnableTeleportHome" userdata="" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator3" />
-    	<menu_item_call label="Falso Estado Ausente" name="Fake Away Status" >
-      		<on_click function="World.FakeAway" userdata="" />
-    	</menu_item_call>
-		<menu_item_call label="Pasar a Estado Ausente" name="Set Away" >
-			<on_click function="World.SetAway" userdata="" />
-		</menu_item_call>
-		<menu_item_call label="Pasar a Estado Ocupado" name="Set Busy" >
-			<on_click function="World.SetBusy" userdata="" />
-		</menu_item_call>
-		<menu_item_call label="Detener las animaciones del Avatar" name="Stop Animating My Avatar" >
-			<on_click function="Tools.StopAllAnimations" userdata="" />
-		</menu_item_call>
-		<menu_item_call label="Liberar Teclas" name="Release Keys" >
-			<on_click function="Tools.ReleaseKeys" userdata="" />
-			<on_enable function="Tools.EnableReleaseKeys" userdata="" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_call label="Historial de la Cuenta..." name="Account History..." >
-			<on_click function="PromptShowURL" name="AccountHistory_url"
-			     userdata="WebLaunchAccountHistory,http://secondlife.com/account/transactions.php" />
-		</menu_item_call>
-		<menu_item_call label="Administrar mi Cuenta..." name="Manage My Account..." >
-			<on_click function="PromptShowURL" name="ManageMyAccount_url"
-			     userdata="WebLaunchJoinNow,http://secondlife.com/account/" />
-		</menu_item_call>
-		<menu_item_call label="Comprar [CURRENCY]..." name="Buy and Sell L$..." >
-			<on_click function="ShowFloater" userdata="buy currency" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator5" />
-		<menu_item_call label="Mi Terreno..." name="My Land..." >
-			<on_click function="ShowFloater" userdata="my land" />
-		</menu_item_call>
-		<menu_item_call label="Acerca del Terreno..." name="About Land..." >
-			<on_click function="ShowFloater" userdata="about land" />
-		</menu_item_call>
-		<menu_item_call label="Comprar Terreno..." name="Buy Land..." >
-			<on_click function="ShowFloater" userdata="buy land" />
-			<on_enable function="World.EnableBuyLand" />
-		</menu_item_call>
-		<menu_item_call label="Región/Estado..." name="Region/Estate..." >
-			<on_click function="ShowFloater" userdata="about region" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu label="Configuración del Entorno" name="Environment Settings" >
-			<menu_item_call label="Amanecer" name="Sunrise" >
-				<on_click function="World.EnvSettings" userdata="sunrise" />
-			</menu_item_call>
-			<menu_item_call label="Mediodía" name="Noon" >
-				<on_click function="World.EnvSettings" userdata="noon" />
-			</menu_item_call>
-			<menu_item_call label="Atardecer" name="Sunset" >
-				<on_click function="World.EnvSettings" userdata="sunset" />
-			</menu_item_call>
-			<menu_item_call label="Medianoche" name="Midnight" >
-				<on_click function="World.EnvSettings" userdata="midnight" />
-			</menu_item_call>
-			<menu_item_call label="Volver a los valores de la Región" name="Revert to Region Default" >
-				<on_click function="World.EnvSettings" userdata="default" />
-			</menu_item_call>
-			<menu_item_separator label="-----------" name="separator" />
-      <menu_item_call label="Editor del Entorno" name="Environment Editor" >
-        <on_click function="World.EnvSettings" userdata="editor" />
-      </menu_item_call>
-      <menu_item_call label="Editor del Ciclo Diario" name="Day Cycle Editor" >
-        <on_click function="World.DayCycle" userdata="editor" />
-      </menu_item_call>
-	  <menu_item_call label="Efectos de Post-Procesado" name="Post-Processing Effects" >
-			 <on_click function="World.PostProcess" userdata="editor" />
-     </menu_item_call>
-		</menu>
-	</menu>
-	<menu label="Herramientas" left="0" name="Tools" >
-		<menu label="Seleccionar Herramienta" name="Select Tool" >
-			<menu_item_call label="Foco" name="Focus" >
-				<on_click function="Tools.SelectTool" userdata="focus" />
-			</menu_item_call>
-			<menu_item_call label="Mover" name="Move" >
-				<on_click function="Tools.SelectTool" userdata="move" />
-			</menu_item_call>
-			<menu_item_call label="Editar" name="Edit" >
-				<on_click function="Tools.SelectTool" userdata="edit" />
-			</menu_item_call>
-			<menu_item_call label="Crear" name="Create" >
-				<on_click function="Tools.SelectTool" userdata="create" />
-			</menu_item_call>
-			<menu_item_call label="Terreno" name="Land" >
-				<on_click function="Tools.SelectTool" userdata="land" />
-			</menu_item_call>
-		</menu>
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_check label="Seleccionar sólo mis Objetos" name="Select Only My Objects" >
-			<on_click function="Tools.SelectOnlyMyObjects" userdata="agents" />
-			<on_check control="SelectOwnedOnly" />
-		</menu_item_check>
-		<menu_item_check label="Seleccionar sólo Objetos movibles" name="Select Only Movable Objects" >
-			<on_click function="Tools.SelectOnlyMovableObjects" userdata="movable" />
-			<on_check control="SelectMovableOnly" />
-		</menu_item_check>
-		<menu_item_check label="Seleccionar marcando los alrededores" name="Select By Surrounding" >
-			<on_click function="Tools.SelectBySurrounding" userdata="" />
-			<on_check control="RectangleSelectInclusive" />
-		</menu_item_check>
-		<menu_item_check label="Mostrar Esquema de Selección" name="Show Selection Outlines" >
-			<on_click function="Tools.ShowSelectionHighlights" userdata="" />
-			<on_check control="RenderHighlightSelections" />
-		</menu_item_check>
-		<menu_item_check label="Mostrar objetos seleccionados ocultos" name="Show Hidden Selection" >
-			<on_click function="Tools.ShowHiddenSelection" userdata="" />
-			<on_check control="RenderHiddenSelections" />
-		</menu_item_check>
-		<menu_item_check label="Mostrar radio de luz de la selección" name="Show Light Radius for Selection" >
-			<on_click function="Tools.ShowSelectionLightRadius" userdata="" />
-			<on_check control="RenderLightRadius" />
-		</menu_item_check>
-		<menu_item_check label="Mostrar rayo indicador" name="Show Selection Beam" >
-			<on_click function="ToggleControl" userdata="ShowSelectionBeam" />
-			<on_check control="ShowSelectionBeam" />
-		</menu_item_check>
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_check label="Ajustar a la cuadrícula" name="Snap to Grid" >
-			<on_click function="ToggleControl" userdata="SnapEnabled" />
-			<on_check control="SnapEnabled" />
-			<on_enable function="Tools.EnableToolNotPie" />
-		</menu_item_check>
-		<menu_item_call label="Ajustar Objetos a los Ejes XY de la cuadrícula" name="Snap Object XY to Grid" >
-			<on_click function="Tools.SnapObjectXY" userdata="" />
-			<on_enable function="Tools.EnableToolNotPie" />
-		</menu_item_call>
-		<menu_item_call label="Usar Seleccionado como cuadrícula" name="Use Selection for Grid" >
-			<on_click function="Tools.UseSelectionForGrid" userdata="" />
-			<on_enable function="SomethingSelected" />
-		</menu_item_call>
-		<menu_item_call label="Opciones de la Cuadrícula..." name="Grid Options..." >
-			<on_click function="ShowFloater" userdata="grid options" />
-			<on_enable function="Tools.EnableToolNotPie" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_check label="Editar partes enlazadas" name="Edit Linked Parts" >
-			<on_click function="ToggleControl" userdata="EditLinkedParts" />
-			<on_click function="Tools.EditLinkedParts" userdata="" />
-			<on_check control="EditLinkedParts" />
-			<on_enable function="Tools.EnableToolNotPie" />
-		</menu_item_check>
-		<menu label="Seleccionar partes enlazadas" name="Select Linked Parts" >
-			<menu_item_call label="Seleccionar parte siguiente" name="Select Next Part" >
-				<on_click function="Tools.SelectNextPart" userdata="next" />
-				<on_enable function="Tools.EnableSelectNextPart" />
-			</menu_item_call>
-			<menu_item_call label="Seleccionar Parte  Anterior" name="Select Previous Part" >
-				<on_click function="Tools.SelectNextPart" userdata="previous" />
-				<on_enable function="Tools.EnableSelectNextPart" />
-			</menu_item_call>
-			<menu_item_call label="Incluir Parte Siguiente" name="Include Next Part" >
-				<on_click function="Tools.SelectNextPart" userdata="includenext" />
-				<on_enable function="Tools.EnableSelectNextPart" />
-			</menu_item_call>
-			<menu_item_call label="Incluir Parte Anterior" name="Include Previous Part" >
-				<on_click function="Tools.SelectNextPart" userdata="includeprevious" />
-				<on_enable function="Tools.EnableSelectNextPart" />
-			</menu_item_call>
-		</menu>
-		<menu_item_call label="Enlazar" name="Link" >
-			<on_click function="Tools.Link" userdata="" />
-			<on_enable function="Tools.EnableLink" />
-		</menu_item_call>
-		<menu_item_call label="Desenlazar" name="Unlink" >
-			<on_click function="Tools.Unlink" userdata="" />
-			<on_enable function="Tools.EnableUnlink" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator4" />
-		<menu_item_call label="Foco en la Selección" name="Focus on Selection" >
-			<on_click function="Tools.LookAtSelection" userdata="focus" />
-			<on_enable function="Tools.SomethingSelectedNoHUD" />
-		</menu_item_call>
-		<menu_item_call label="Zoom en lo Seleccionado" name="Zoom to Selection" >
-			<on_click function="Tools.LookAtSelection" userdata="zoom" />
-			<on_enable function="Tools.SomethingSelectedNoHUD" />
-		</menu_item_call>
-		<menu_item_call label="Comprar Objeto" name="Menu Object Take" >
-			<on_click function="Tools.BuyOrTake" userdata="" />
-			<on_enable function="Tools.EnableBuyOrTake" userdata="Buy,Take" name="EnableBuyOrTake"/>
-		</menu_item_call>
-		<menu_item_call label="Agarrar una Copia" name="Take Copy" >
-			<on_click function="Tools.TakeCopy" userdata="" />
-			<on_enable function="Tools.EnableTakeCopy" />
-		</menu_item_call>
-		<menu_item_call label="Devolver Objeto" name="Return..." >
-			<on_click function="Object.Return" userdata="" />
-			<on_enable function="Object.EnableReturn" />
-		</menu_item_call>
-		<menu_item_call label="Devolver el Objeto al Contenido de Objetos" name="Save Object Back to Object Contents" >
-			<on_click function="Tools.SaveToObjectInventory" userdata="" />
-			<on_enable function="Tools.EnableSaveToObjectInventory" />
-		</menu_item_call>
-		<menu_item_call label="Administrador - Borrar" name="Admin Delete" >
-			<on_click function="Tools.AdminDelete" userdata="" />
-			<on_enable function="Tools.EnableAdminDelete" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator6" />
-		<menu_item_call label="Mostrar ventana de avisos/errores de Script " name="Show Script Warning/Error Window" >
-			<on_click function="ShowFloater" userdata="script errors" />
-		</menu_item_call>
-		<menu label="Recompilar Scripts de la Selección" name="Recompile Scripts in Selection" >
-		     <menu_item_call label="Mono" name="Mono" >
-			     <on_click function="Tools.SelectedScriptAction" userdata="compile mono" />
-			     <on_enable function="EditableSelectedMono" />
-		     </menu_item_call>
-		     <menu_item_call label="LSL" name="LSL" >
-			     <on_click function="Tools.SelectedScriptAction" userdata="compile lsl" />
-			     <on_enable function="EditableSelected" />
-		     </menu_item_call>
-		</menu>
-		<menu_item_call label="Reiniciar Scripts en la Selección" name="Reset Scripts in Selection" >
-			<on_click function="Tools.SelectedScriptAction" userdata="reset" />
-			<on_enable function="EditableSelected" />
-		</menu_item_call>
-		<menu_item_call label="Definir Ejecución de Scripts en la Selección" name="Set Scripts to Running in Selection" >
-			<on_click function="Tools.SelectedScriptAction" userdata="start" />
-			<on_enable function="EditableSelected" />
-		</menu_item_call>
-		<menu_item_call label="Definir la no ejecución de Scripts en la Selección" name="Set Scripts to Not Running in Selection" >
-			<on_click function="Tools.SelectedScriptAction" userdata="stop" />
-			<on_enable function="EditableSelected" />
-		</menu_item_call>
-    <menu_item_call label="Borrar Scripts en la Selección" name="Remove Scripts in Selection" >
-      <on_click function="Tools.ScriptDelete" />
-      <on_enable function="Tools.EnableScriptDelete" />
-    </menu_item_call>
-	</menu>
-	<menu label="Ayuda" left="227" name="Help" >
-		<menu_item_call label="Ayuda de Second Life" name="Second Life Help" >
-			<on_click function="ShowFloater" userdata="help f1" />
-		</menu_item_call>
-		<menu_item_call label="Tutorial" name="Tutorial" >
-			<on_click function="ShowFloater" userdata="help tutorial" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator" />
-		<menu_item_call label="Blog Oficial de Linden Lab..." name="Official Linden Blog..." >
-			<on_click function="PromptShowURL" name="OfficialLindenBlog_url"
-			     userdata="WebLaunchSupportWiki,http://blog.secondlife.com/" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator2" />
-		<menu_item_call label="Portal de Scripting..." name="Scripting Portal..." >
-			<on_click function="PromptShowURL" name="ScriptingPortal_url"
-			     userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator3" />
-		<menu_item_call label="Denunciar Abuso..." name="Report Abuse..." >
-			<on_click function="ShowFloater" userdata="complaint reporter" />
-		</menu_item_call>
-		<menu_item_call label="Choques, Empujones y Golpes..." name="Bumps, Pushes &amp;amp; Hits..." >
-			<on_click function="ShowFloater" userdata="mean events" />
-		</menu_item_call>
-		<menu_item_call label="Medidor de Lag" name="Lag Meter">
-			<on_click function="ShowFloater" userdata="lag meter" />
-		</menu_item_call>
-		<menu_item_separator label="-----------" name="separator7" />
-		<menu label="Informe de Fallos" name="Bug Reporting" >
-			<menu_item_call label="Seguimiento de Problemas Público..." name="Public Issue Tracker..." >
-				<on_click function="PromptShowURL" name="PublicIssueTracker_url"
-				     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
-			</menu_item_call>
-			<menu_item_call label="Ayuda del Seguimiento de Problemas Público..." name="Publc Issue Tracker Help..." >
-				<on_click function="PromptShowURL" name="PublicIssueTrackerHelp_url"
-				     userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker" />
-			</menu_item_call>
-			<menu_item_separator label="-----------" name="separator7" />
-			<menu_item_call label="Informe de Fallos 101..." 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="Problemas de Seguridad..." name="Security Issues..." >
-				<on_click function="PromptShowURL" name="SecurityIssues_url"
-				     userdata="WebLaunchSecurityIssues,http://wiki.secondlife.com/wiki/Security_issues" />
-			</menu_item_call>
-			<menu_item_call label="Wiki de QA..." name="QA Wiki..." >
-				<on_click function="PromptShowURL" name="QAWiki_url"
-				     userdata="WebLaunchQAWiki,http://wiki.secondlife.com/wiki/QA_Portal" />
-			</menu_item_call>
-			<menu_item_separator label="-----------" name="separator9" />
-			<menu_item_call label="Informar un Fallo..." name="Report Bug..." >
-				<on_click function="PromptShowURL" name="ReportBug_url"
-				     userdata="WebLaunchPublicIssue,http://jira.secondlife.com" />
-			</menu_item_call>
-		</menu>
-		<menu_item_call label="Acerca de Singularity..." name="About Second Life..." >
-			<on_click function="ShowFloater" userdata="about" />
-		</menu_item_call>
-	</menu>
+<menu_bar name="Main Menu">
+	  <menu label="Archivo" name="File">
+			 <menu_item_call label="Imagen ([UPLOADFEE])..." name="Upload Image" ></menu_item_call>
+			 <menu_item_call label="Sonido ([UPLOADFEE])..." name="Upload Sound" ></menu_item_call>
+			 <menu_item_call label="Animación ([UPLOADFEE])..." name="Upload Animation" ></menu_item_call>
+			 <menu_item_call label="Masiva ([UPLOADFEE] por archivo)..." name="Bulk Upload" ></menu_item_call>
+			 <menu_item_call label="Importar XML" name="Import"></menu_item_call>
+			 <menu_item_call label="Importar con Texturas" name="Import2"></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator" />
+			 <menu_item_call label="Definir Permisos por Defecto..." name="perm prefs" ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator" />
+			 <menu_item_call label="Cerrar Ventana" name="Close Window" ></menu_item_call>
+			 <menu_item_call label="Cerrar todas las Ventanas" name="Close All Windows" ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator2" />
+			 <menu_item_call label="Guardar Vista Previa Como..." name="Save Preview As..." ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator3" />
+			 <menu_item_call label="Hacer una Foto" name="Take Snapshot" ></menu_item_call>
+			 <menu_item_call label="Guardar Foto" name="Snapshot to Disk" ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator4"/>
+			 <menu_item_call label="Salir" name="Quit" ></menu_item_call>
+	  </menu>
+	  <menu label="Editar" name="Edit" >
+			 <menu_item_call label="Deshacer" name="Undo" ></menu_item_call>
+			 <menu_item_call label="Rehacer" name="Redo" ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator" />
+			 <menu_item_call label="Cortar" name="Cut" ></menu_item_call>
+			 <menu_item_call label="Copiar" name="Copy" ></menu_item_call>
+			 <menu_item_call label="Pegar" name="Paste" ></menu_item_call>
+			 <menu_item_call label="Borrar" name="Delete" ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator2" />
+			 <menu_item_call label="Buscar..." name="Search..." ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator3" />
+			 <menu_item_call label="Seleccionar Todo" name="Select All" ></menu_item_call>
+			 <menu_item_call label="Deseleccionar" name="Deselect" ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator4" />
+			 <menu_item_call label="Duplicar" name="Duplicate" ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator5" />
+			 <menu label="Anexar Objeto" name="Attach Object" />
+			 <menu label="Quitarse Objeto" name="Detach Object" />
+			 <menu label="Quitarse Ropas" name="Take Off Clothing" >
+					<menu_item_call label="Camisa" name="Shirt" ></menu_item_call>
+					<menu_item_call label="Pantalones" name="Pants" ></menu_item_call>
+					<menu_item_call label="Zapatos" name="Shoes" ></menu_item_call>
+					<menu_item_call label="Calcetines" name="Socks" ></menu_item_call>
+					<menu_item_call label="Chaqueta" name="Jacket" ></menu_item_call>
+					<menu_item_call label="Guantes" name="Gloves"></menu_item_call>
+					<menu_item_call label="Camiseta" name="Menu Undershirt" ></menu_item_call>
+					<menu_item_call label="Ropa Interior" name="Menu Underpants" ></menu_item_call>
+					<menu_item_call label="Falda" name="Skirt" ></menu_item_call>
+					<menu_item_call label="Tatuaje" name="Tattoo" ></menu_item_call>
+					<menu_item_separator label="-----------" name="separator51" />
+					<menu_item_call label="Alfa" name="Alpha" ></menu_item_call>
+					<menu_item_call label="Física" name="Physics" ></menu_item_call>
+					<menu_item_separator label="-----------" name="separator51" />
+					<menu_item_call label="Toda la Ropa" name="All Clothes" ></menu_item_call>
+			 </menu>
+			 <menu_item_separator label="-----------" name="separator6" />
+			 <menu_item_call label="Gestos..." name="Gestures..." ></menu_item_call>
+			 <menu_item_call label="Perfil..." name="Profile..." ></menu_item_call>
+			 <menu_item_call label="Apariencia..." name="Appearance..." ></menu_item_call>
+			 <menu_item_call label="Nombre a Mostrar..." name="Display Name..." ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator7" />
+			 <menu_item_check label="Amigos..." name="Friends..." ></menu_item_check>
+			 <menu_item_call label="Grupos..." name="Groups..." ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator8" />
+			 <menu_item_call label="Preferencias..." name="Preferences..." ></menu_item_call>
+	  </menu>
+	  <menu label="Ver"  name="View" >
+			 <tearoff_menu label="~~~~~~~~~~~" name="~~~~~~~~~~~" />
+			 <menu_item_call label="Vista Subjetiva" name="Mouselook" ></menu_item_call>
+			 <menu_item_check label="Construir" name="Build" ></menu_item_check>
+			 <menu_item_check label="Flycam del Joystick" name="Joystick Flycam" ></menu_item_check>
+			 <menu_item_call label="Volver a Vista por Defecto" name="Reset View" ></menu_item_call>
+			 <menu_item_call label="Mirar al último que habló" name="Look at Last Chatter" ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator" />
+			 <menu_item_check label="Barra de Herramientas" name="Toolbar" ></menu_item_check>
+			 <menu_item_check label="Chat local" name="Chat History" ></menu_item_check>
+			 <menu_item_check label="Comunicarse" name="Instant Message" ></menu_item_check>
+			 <menu_item_check label="Inventario" name="Inventory" ></menu_item_check>
+			 <menu_item_check label="Participantes Activos" name="Active Speakers" ></menu_item_check>
+			 <menu_item_check label="Lista de Ignorados" name="Mute List" ></menu_item_check>
+			 <menu_item_check label="Historial de Teleport" name="Teleport History" ></menu_item_check>
+			 <menu_item_check label="Filtro de Media" name="Media Filter" ></menu_item_check>
+			 <menu_item_separator label="-----------" name="separator2" />
+			 <menu_item_check label="Controles de Cámara" name="Camera Controls" ></menu_item_check>
+			 <menu_item_check label="Controles de Movimiento" name="Movement Controls"></menu_item_check>
+			 <menu_item_check label="Mapa del Mundo" name="World Map" ></menu_item_check>
+			 <menu_item_check label="MiniMapa" name="Mini-Map" ></menu_item_check>
+			 <menu_item_check label="Radar" name="Radar" ></menu_item_check>
+			 <menu_item_separator label="-----------" name="separator3" />
+			 <menu_item_check label="Estadísticas" name="Statistics Bar" ></menu_item_check>
+			 <menu_item_separator label="-----------" name="separator100" />
+			 <menu_item_check label="Búsqueda en �rea" name="Area Search" ></menu_item_check>
+			 <menu_item_check label="Límites de Parcelas" name="Property Lines" ></menu_item_check>
+			 <menu_item_check label="Líneas de Prohibición" name="Banlines" ></menu_item_check>
+			 <menu_item_check label="Propietarios del Terreno" name="Land Owners" ></menu_item_check>
+			 <menu_item_separator label="-----------" name="separator4" />
+			 <menu label="Información Adicional" name="Hover Tips" >
+					<menu_item_check label="Mostrar Información Adicional" name="Show Tips" ></menu_item_check>
+					<menu_item_separator label="-----------" name="separator" />
+					<menu_item_check label="Información Adicional del Terreno" name="Land Tips" ></menu_item_check>
+					<menu_item_check label="Información Adicional en Todos los Objetos" name="Tips On All Objects" ></menu_item_check>
+			 </menu>
+			 <menu_item_check label="Realzar Transparencias" name="Highlight Transparent" ></menu_item_check>
+			 <menu_item_check name="beacons" label="Balizas" ></menu_item_check>
+			 <menu_item_check label="Ocultar Partículas" name="Hide Particles" ></menu_item_check>
+			 <menu_item_check label="Mostrar los HUD en uso" name="Show HUD Attachments" ></menu_item_check>
+			 <menu_item_separator label="-----------" name="separator5" />
+			 <menu_item_call label="Acercar Zoom" name="Zoom In" ></menu_item_call>
+			 <menu_item_call label="Zoom Predeterminado" name="Zoom Default" ></menu_item_call>
+			 <menu_item_call label="Alejar Zoom" name="Zoom Out" ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator6" />
+			 <menu_item_call label="Pantalla Completa" name="Toggle Fullscreen" ></menu_item_call>
+			 <menu_item_call label="Interfaz en tamaño Predeterminado" name="Set UI Size to Default" ></menu_item_call>
+	  </menu>
+	  <menu label="Mundo" name="World" >
+			 <menu_item_call label="Chat" name="Chat" ></menu_item_call>
+			 <menu_item_check label="Correr Siempre" name="Always Run" ></menu_item_check>
+			 <menu_item_call label="Sentarse en el piso" name="Sit on Ground" ></menu_item_call>
+			 <menu_item_check label="Volar" name="Fly" ></menu_item_check>
+			 <menu_item_separator label="-----------" name="separator" />
+			 <menu_item_call label="Crear un Hito Aquí" name="Create Landmark Here" ></menu_item_call>
+			 <menu_item_call label="Fijar Base Aquí" name="Set Home to Here" ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator2" />
+			 <menu_item_call label="Teleport a Base" name="Teleport Home" ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator3" />
+			 <menu_item_call label="Falso Estado Ausente" name="Fake Away Status" ></menu_item_call>
+			 <menu_item_call label="Pasar a Estado Ausente" name="Set Away" ></menu_item_call>
+			 <menu_item_call label="Pasar a Estado Ocupado" name="Set Busy" ></menu_item_call>
+			 <menu_item_call label="Detener las animaciones del Avatar" name="Stop Animating My Avatar" ></menu_item_call>
+			 <menu_item_call label="Liberar Teclas" name="Release Keys" ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator4" />
+			 <menu_item_call label="Historial de la Cuenta..." name="Account History..." ></menu_item_call>
+			 <menu_item_call label="Administrar mi Cuenta..." name="Manage My Account..." ></menu_item_call>
+			 <menu_item_call label="Comprar [CURRENCY]..." name="Buy and Sell L$..." ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator5" />
+			 <menu_item_call label="Mi Terreno..." name="My Land..." ></menu_item_call>
+			 <menu_item_call label="Acerca del Terreno..." name="About Land..." ></menu_item_call>
+			 <menu_item_call label="Comprar Terreno..." name="Buy Land..." ></menu_item_call>
+			 <menu_item_call label="Región/Estado..." name="Region/Estate..." ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator6" />
+			 <menu label="Configuración del Entorno" name="Environment Settings" >
+					<menu_item_call label="Amanecer" name="Sunrise" ></menu_item_call>
+					<menu_item_call label="Mediodía" name="Noon" ></menu_item_call>
+					<menu_item_call label="Atardecer" name="Sunset" ></menu_item_call>
+					<menu_item_call label="Medianoche" name="Midnight" ></menu_item_call>
+					<menu_item_call label="Volver a los valores de la Región" name="Revert to Region Default" ></menu_item_call>
+					<menu_item_separator label="-----------" name="separator" />
+					<menu_item_call label="Editor del Entorno" name="Environment Editor" ></menu_item_call>
+					<menu_item_call label="Editor del Ciclo Diario" name="Day Cycle Editor" ></menu_item_call>
+					<menu_item_call label="Efectos de Post-Procesado" name="Post-Processing Effects" ></menu_item_call>
+			 </menu>
+	  </menu>
+	  <menu label="Herramientas" left="0" name="Tools" >
+			 <menu label="Seleccionar Herramienta" name="Select Tool" >
+					<menu_item_call label="Foco" name="Focus" ></menu_item_call>
+					<menu_item_call label="Mover" name="Move" ></menu_item_call>
+					<menu_item_call label="Editar" name="Edit" ></menu_item_call>
+					<menu_item_call label="Crear" name="Create" ></menu_item_call>
+					<menu_item_call label="Terreno" name="Land" ></menu_item_call>
+			 </menu>
+			 <menu_item_separator label="-----------" name="separator" />
+			 <menu_item_check label="Seleccionar sólo mis Objetos" name="Select Only My Objects" ></menu_item_check>
+			 <menu_item_check label="Seleccionar sólo Objetos movibles" name="Select Only Movable Objects" ></menu_item_check>
+			 <menu_item_check label="Seleccionar marcando los alrededores" name="Select By Surrounding" ></menu_item_check>
+			 <menu_item_check label="Mostrar Esquema de Selección" name="Show Selection Outlines" ></menu_item_check>
+			 <menu_item_check label="Mostrar objetos seleccionados ocultos" name="Show Hidden Selection" ></menu_item_check>
+			 <menu_item_check label="Mostrar radio de luz de la selección" name="Show Light Radius for Selection" ></menu_item_check>
+			 <menu_item_check label="Mostrar rayo indicador" name="Show Selection Beam" ></menu_item_check>
+			 <menu_item_separator label="-----------" name="separator2" />
+			 <menu_item_check label="Ajustar a la cuadrícula" name="Snap to Grid" ></menu_item_check>
+			 <menu_item_call label="Ajustar Objetos a los Ejes XY de la cuadrícula" name="Snap Object XY to Grid" ></menu_item_call>
+			 <menu_item_call label="Usar Seleccionado como cuadrícula" name="Use Selection for Grid" ></menu_item_call>
+			 <menu_item_call label="Opciones de la Cuadrícula..." name="Grid Options..." ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator3" />
+			 <menu_item_check label="Editar partes enlazadas" name="Edit Linked Parts" ></menu_item_check>
+			 <menu label="Seleccionar partes enlazadas" name="Select Linked Parts" >
+					<menu_item_call label="Seleccionar parte siguiente" name="Select Next Part" ></menu_item_call>
+					<menu_item_call label="Seleccionar Parte  Anterior" name="Select Previous Part" ></menu_item_call>
+					<menu_item_call label="Incluir Parte Siguiente" name="Include Next Part" ></menu_item_call>
+					<menu_item_call label="Incluir Parte Anterior" name="Include Previous Part" ></menu_item_call>
+			 </menu>
+			 <menu_item_call label="Enlazar" name="Link" ></menu_item_call>
+			 <menu_item_call label="Desenlazar" name="Unlink" ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator4" />
+			 <menu_item_call label="Foco en la Selección" name="Focus on Selection" ></menu_item_call>
+			 <menu_item_call label="Zoom en lo Seleccionado" name="Zoom to Selection" ></menu_item_call>
+			 <menu_item_call label="Comprar Objeto" name="Menu Object Take" ></menu_item_call>
+			 <menu_item_call label="Agarrar una Copia" name="Take Copy" ></menu_item_call>
+			 <menu_item_call label="Devolver Objeto" name="Return..." ></menu_item_call>
+			 <menu_item_call label="Devolver el Objeto al Contenido de Objetos" name="Save Object Back to Object Contents" ></menu_item_call>
+			 <menu_item_call label="Administrador - Borrar" name="Admin Delete" ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator6" />
+			 <menu_item_call label="Mostrar ventana de avisos/errores de Script " name="Show Script Warning/Error Window" ></menu_item_call>
+			 <menu label="Recompilar Scripts de la Selección" name="Recompile Scripts in Selection" >
+					<menu_item_call label="Mono" name="Mono" ></menu_item_call>
+					<menu_item_call label="LSL" name="LSL" ></menu_item_call>
+			 </menu>
+			 <menu_item_call label="Reiniciar Scripts en la Selección" name="Reset Scripts in Selection" ></menu_item_call>
+			 <menu_item_call label="Definir Ejecución de Scripts en la Selección" name="Set Scripts to Running in Selection" ></menu_item_call>
+			 <menu_item_call label="Definir la no ejecución de Scripts en la Selección" name="Set Scripts to Not Running in Selection" ></menu_item_call>
+			 <menu_item_call label="Borrar Scripts en la Selección" name="Remove Scripts in Selection" ></menu_item_call>
+	  </menu>
+	  <menu label="Ayuda" left="227" name="Help" >
+			 <menu_item_call label="Ayuda de Second Life" name="Second Life Help" ></menu_item_call>
+			 <menu_item_call label="Tutorial" name="Tutorial" ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator" />
+			 <menu_item_call label="Blog Oficial de Linden Lab..." name="Official Linden Blog..." ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator2" />
+			 <menu_item_call label="Portal de Scripting..." name="Scripting Portal..." ></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator3" />
+			 <menu_item_call label="Denunciar Abuso..." name="Report Abuse..." ></menu_item_call>
+			 <menu_item_call label="Choques, Empujones y Golpes..." name="Bumps, Pushes &amp;amp; Hits..." ></menu_item_call>
+			 <menu_item_call label="Medidor de Lag" name="Lag Meter"></menu_item_call>
+			 <menu_item_separator label="-----------" name="separator7" />
+			 <menu label="Informe de Fallos" name="Bug Reporting" >
+					<menu_item_call label="Seguimiento de Problemas Público..." name="Public Issue Tracker..." ></menu_item_call>
+					<menu_item_call label="Ayuda del Seguimiento de Problemas Público..." name="Publc Issue Tracker Help..." ></menu_item_call>
+					<menu_item_separator label="-----------" name="separator7" />
+					<menu_item_call label="Informe de Fallos 101..." name="Bug Reporing 101..." ></menu_item_call>
+					<menu_item_call label="Problemas de Seguridad..." name="Security Issues..." ></menu_item_call>
+					<menu_item_call label="Wiki de QA..." name="QA Wiki..." ></menu_item_call>
+					<menu_item_separator label="-----------" name="separator9" />
+					<menu_item_call label="Informar un Fallo..." name="Report Bug..." ></menu_item_call>
+			 </menu>
+			 <menu_item_call label="Acerca de Singularity..." name="About Second Life..." ></menu_item_call>
+	  </menu>
 </menu_bar>
diff --git a/indra/newview/skins/default/xui/es/role_actions.xml b/indra/newview/skins/default/xui/es/role_actions.xml
index cfd2e16c3..ef97c7d28 100644
--- a/indra/newview/skins/default/xui/es/role_actions.xml
+++ b/indra/newview/skins/default/xui/es/role_actions.xml
@@ -12,83 +12,39 @@
 		     longdescription="Cambiar nombres de roles, títulos, descripciones y si los integrantes de lo roles son visibles. Esto se hace al pié de la pestaña Miembros y Roles &gt; subpestaña Roles luego de seleccionar un rol." name="role properties" value="6" />
 			 <action description="Designar miembros para el rol de Asignador" longdescription="Designar miembros para un rol en la sección Roles asignados de la pestaña Miembros y Roles &gt; subpestaña Miembros. Un miembro con este poder sólo puede asignar a otros el rol que él posee." name="role assign member limited" value="7" />
 			 <action description="Designar miembros para cualquier Rol" longdescription="Designar miembros para cualquier rol en la sección Roles asignados de la pestaña Miembros y Roles &gt; subpestaña Miembros. *AVISO* Todos los miembros con esta capacidad podrán asignarse a sí mismos (y a otros miembros) roles con mayores poderes de los que actualmente tienen. Potencialmente, podrían elevarse hasta poderes cercanos a los del propietario. Asegúrate de lo que estás haciendo antes de otorgar esta capacidad." name="role assign member" value="8" />
-			 <action description="Quitar miembros de los roles"
-		     longdescription="Quitar miembros de roles en la sección Capacidades asignadas de Miembros y Roles &gt; subpestaña Roles. No se pueden quitar a los Propietarios."
-		     name="role remove member" value="9" />
-		<action description="Assign and Remove Abilities in Roles"
-		     longdescription="Assign and Remove Abilities in Roles in the Allowed Abilities section of the Members &amp; Roles tab &gt; Roles sub-tab. *WARNING* Any Member in a Role with this Ability can assign themselves--and any other non-Owner Member--all Abilities, potentially elevating themselves to near-Owner power. Be sure you know what you&apos;re doing before assigning this Ability."
-		     name="role change actions" value="10" />
-	</action_set>
-	<action_set
-	     description="These Abilities include powers to modify this group&apos;s identity, such as changing public visibility, charter, and insignia."
-	     name="Group Identity">
-		<action
-		     description="Change Charter, Insignia, and &apos;Show in search&apos;"
-		     longdescription="Change Charter, Insignia, and &apos;Show in search&apos;. This is done in the General tab."
-		     name="group change identity" value="11" />
-	</action_set>
-	<action_set
-	     description="These Abilities include powers to deed, modify, and sell land in this group&apos;s land holdings. To get to the About Land window, right-click the ground and select &apos;About Land...&apos;, or click the parcel info in the menu bar."
-	     name="Parcel Management">
-		<action description="Deed land and buy land for group"
-		     longdescription="Deed land and buy land for group. This is done in About Land &gt; General tab."
-		     name="land deed" value="12" />
-		<action description="Abandon land to Governor Linden"
-		     longdescription="Abandon land to Governor Linden. *WARNING* Any Member in a Role with this Ability can abandon group-owned land in About Land &gt; General tab, reverting it to Linden ownership without a sale! Be sure you know what you&apos;re doing before assigning this Ability."
-		     name="land release" value="13" />
-		<action description="Set land for sale info"
-		     longdescription="Set land for sale info. *WARNING* Any Member in a Role with this Ability can sell group-owned land in About Land &gt; General tab as they wish! Be sure you know what you&apos;re doing before assigning this Ability."
-		     name="land set sale info" value="14" />
-		<action description="Subdivide and join parcels"
-		     longdescription="Subdivide and join parcels. This is done by right-clicking the ground, &apos;Edit Terrain&apos;, and dragging your mouse on the land to make a selection. To subdivide, select what you want to split and click &apos;Subdivide...&apos;. To join, select two or more contiguous parcels and click &apos;Join...&apos;. "
-		     name="land divide join" value="15" />
-	</action_set>
-	<action_set
-	     description="These Abilities include powers to change the parcel name and publish settings, Find directory visibility, and landing point &amp; TP routing options."
-	     name="Parcel Identity">
-		<action description="Toggle &apos;Show in Find Places&apos; and set category"
-		     longdescription="Toggle &apos;Show in Find Places&apos; and setting a parcel&apos;s category in About Land &gt; Options tab."
-		     name="land find places" value="17" />
-		<action
-		     description="Change parcel name, description, and &apos;Show in search&apos; settings"
-		     longdescription="Change parcel name, description, and &apos;Show in search&apos; settings. This is done in About Land &gt; Options tab."
-		     name="land change identity" value="18" />
-		<action description="Set landing point and set teleport routing"
-		     longdescription="On a group-owned parcel, Members in a Role with this Ability can set a landing point to specify where incoming teleports arrive, and also set teleport routing for further control. This is done in About Land &gt; Options tab."
-		     name="land set landing point" value="19" />
-	</action_set>
-	<action_set
-	     description="These Abilities include powers which affect parcel options, such as &apos;Create Objects&apos;, &apos;Edit Terrain&apos;, and music &amp; media settings."
-	     name="Parcel Settings">
-		<action description="Change music &amp; media settings"
-		     longdescription="Change streaming music and movie settings in About Land &gt; Media tab."
-		     name="land change media" value="20" />
-		<action description="Toggle &apos;Edit Terrain&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."
-		     name="land edit" value="21" />
-		<action description="Toggle various About Land &gt; Options settings"
-		     longdescription="Toggle &apos;Safe (no damage)&apos;, &apos;Fly&apos;, and allow other Residents to: &apos;Create Objects&apos;, &apos;Edit Terrain&apos;, &apos;Create Landmarks&apos;, and &apos;Run Scripts&apos; on group-owned land in About Land &gt; Options tab."
-		     name="land options" value="22" />
-	</action_set>
-	<action_set
-	     description="These Abilities include powers which allow Members to bypass restrictions on group-owned parcels."
-	     name="Parcel Powers">
-		<action description="Always allow &apos;Edit Terrain&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."
-		     name="land allow edit land" value="23" />
-		<action description="Always allow &apos;Fly&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."
-		     name="land allow fly" value="24" />
-		<action description="Always allow &apos;Create Objects&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."
-		     name="land allow create" value="25" />
-		<action description="Always allow &apos;Create Landmark&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."
-		     name="land allow landmark" value="26" />
-		<action description="Allow &apos;Set Home to Here&apos; on group land"
-		     longdescription="Members in a Role with this Ability can use World menu &gt; Set Home to Here on a parcel deeded to this group."
-		     name="land allow set home" value="28" />
-		<action description="Allow &apos;Event Hosting&apos; on group land"
+			 <action description="Quitar miembros de los roles" longdescription="Quitar miembros de roles en la sección Capacidades asignadas de Miembros y Roles &gt; subpestaña Roles. No se pueden quitar a los Propietarios." name="role remove member" value="9" />
+		<action description="Añadir o quitar capacidades a los roles" longdescription="Añadir o quitar capacidades a los roles en la sección Capacidades asignadas de Miembros y Roles &gt; subpestaña Roles. *AVISO* Todos los miembros con esta capacidad podrán asignarse a sí mismos -y a otros miembros- roles con mayores poderes de los que actualmente tienen. Potencialmente, podrían elevarse hasta poderes cercanos a los del propietario. Asegúrate de lo que estás haciendo antes de otorgar esta capacidad." name="role change actions" value="10" /> 
+	  </action_set>
+	  <action_set description="Estas capacidades incluyen poderes para modificar la identidad del grupo, como su visibilidad pública, su carta o su emblema." name="Group Identity">
+			 <action
+		     description="Cambiar la carta, emblema y &apos;Mostrar en la búsqueda&apos;" longdescription="Cambiar la carta, emblema y &apos;Mostrar en la búsqueda&apos;, y qué miembros serán visibles en la información del grupo de la pestaña General." name="group change identity" value="11" />
+	  </action_set>
+	  <action_set description="Estas capacidades incluyen poderes para transferir, modificar y vender terrenos del grupo. Ve al menú Mundo &gt; Acerca del terreno, o pulsa con el botón derecho en el terreno y selecciona &apos;Acerca del terreno...&apos;, o pulsa en la información de la parcela en la barra superior del menú." name="Parcel Management">
+			 <action description="Transferir  y comprar terreno para el grupo" longdescription="Transferir y comprar terreno para el grupo. Se hace en Acerca del terreno &gt; pestaña General." name="land deed" value="12" />
+			 <action description="Abandonar terreno a favor de Governor Linden"
+		     longdescription="Abandonar al terreno a favor de Governor Linden. *AVISO* Todos los miembros del Rol con esta capacidad pueden abandonar terreno perteneciente al grupo en Acerca del terreno &gt; pestaña General, devolviendo la posesión a Linden ¡gratuitamente! Asegúrate de lo que estás haciendo antes de otorgar esta capacidad." name="land release" value="13" />
+			 <action description="Vender terreno"
+		     longdescription="Vender terreno. *AVISO* Todos los miembros del ROl con esta capacidad pueden vender terreno perteneciente al grupo -¡en la forma en que quieran!- en Acerca del terreno &gt; pestaña General. Asegúrate de lo que estás haciendo antes de otorgar esta capacidad." name="land set sale info" value="14" />
+			 <action description="Dividir y unir parcelas" longdescription="Dividir y unir parcelas. Se hace pulsando con el botón derecho en el terreno, &apos;Modificar el terreno&apos;, y dibujando en el terreno con el ratón lo que se quiere seleccionar. Para dividir, selecciona la parte que quieres separar y pulsa &apos;Subdividir...&apos;. Para unir, selecciona dos o más parcelas contiguas y pulsa &apos;Unir...&apos;." name="land divide join" value="15" />
+	  </action_set>
+	  <action_set description="Estas capacidades incluyen poder cambiar el nombre de la parcela y su configuración pública, también si se muestra en la Búsqueda y las opciones del punto de llegada y el de teleporte." name="Parcel Identity">
+			 <action description="Activar/Desactivar &apos;Mostrar en Búsqueda&apos; y el definir la Categoría" longdescription="Activar/Desactivar el &apos;Mostrar en Búsqueda&apos; y en que Categoría se mostrará en Acerca del terreno &gt; pestaña Opciones." name="land find places" value="17" />
+			 <action description="Cambiar el nombre de la parcela, la descripción, y la configuración de &apos;Mostrar en Búsqueda&apos;" longdescription="Cambiar el nombre y descripción de la parcela, y la configuración de &apos;Mostrar en Búsqueda&apos;. Se hace en Acerca del terreno &gt; pestaña Opciones." name="land change identity" value="18" />
+			 <action description="Definir los puntos de llegada y teleporte" longdescription="En una parcela perteneciente al grupo, los miembros con un rol que tenga esta capacidad pueden definir el Punto de Llegada o el de Teleporte para un mejor control. Se hace en Acerca del terreno &gt; pestaña Opciones." name="land set landing point" value="19" />
+	  </action_set>
+	  <action_set description="Estas capacidades incluyen poderes que afectan a las opciones de la parcela, como &apos;Crear objetos&apos;, &apos;Editar el terreno&apos; y las configuraciones de la música y los media." name="Parcel Settings">
+			 <action description="Cambiar música y configuraciones de los media"
+		     longdescription="Cambiar la música en streaming y las configuraciones de vídeo en Acerca del terreno &gt; pestaña Media." name="land change media" value="20" />
+			 <action description="Activar/desactivar &apos;Editar el terreno&apos;" longdescription="Activar/desactivar &apos;Editar el terreno&apos;. *AVISO* Acerca del terreno &gt; pestaña Opciones &gt; Editar el terreno, permite a cualquiera alterar la forma de tu terreno y sustituir y mover plantas Linden. Asegúrate de lo que estás haciendo antes de otorgar esta capacidad. La edición del terreno se activada/desactiva en Acerca del terreno &gt; pestaña Opciones." name="land edit" value="21" />
+			 <action description="Activar/desactivar varios ítems de Acerca del terreno &gt; Opciones" longdescription="Activar/desactivar en un terreno del grupo los ítems de Acerca del terreno &gt; pestaña Opciones: &apos;Seguro (sin daño)&apos;, &apos;Volar&apos;, y permitir a otros residentes: &apos;Crear objetos&apos;, &apos;Editar el terreno&apos;, &apos;Crear hitos&apos;, y &apos;Ejecutar scripts&apos;." name="land options" value="22" />
+	  </action_set>
+	  <action_set description="Estas capacidades incluyen poderes que permiten a los miembros rebasar las restricciones de parcelas pertenecientes al grupo." name="Parcel Powers">
+			 <action description="Permitir siempre &apos;Editar el terreno&apos;" longdescription="Los Miembros del rol con esta capacidad pueden editar el terreno de una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones." name="land allow edit land" value="23" />
+			 <action description="Permitir siempre &apos;Volar&apos;" longdescription="Los Miembros del rol con esta capacidad pueden volar sobre una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones." name="land allow fly" value="24" />
+			 <action description="Permitir siempre &apos;Crear objetos&apos;" longdescription="Los Miembros del rol con esta capacidad pueden crear objetos en una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones." name="land allow create" value="25" />
+			 <action description="Permitir siempre &apos;Crear hitos&apos;" longdescription="Los Miembros del rol con esta capacidad pueden crear un hito en una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones." name="land allow landmark" value="26" />
+			 <action description="Permitir &apos;Fijar Base&apos; en el terreno del grupo"  longdescription="Los Miembros del rol con esta capacidad pueden usar el menú Mundo &gt; Fijar mi Base aquí en una parcela transferida al grupo." name="land allow set home" value="28" />
+			 <action description="Allow &apos;Event Hosting&apos; on group land"
 		     longdescription="Members in a Role with this Ability can select group owned parcels as venus when hosting an event."
 		     name="land allow host event" value="41" />			 
 	</action_set>

From 2bb58bac2ea96162e36a9a75b5848bbd74a8cb15 Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Sun, 15 Jul 2012 23:32:12 -0400
Subject: [PATCH 028/199] Corrected annoyance and inconsistencies for OSX

---
 indra/newview/English.lproj/InfoPlist.strings | 4 ++--
 indra/newview/Info-Singularity.plist          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index ef558b071..ca5535951 100644
--- a/indra/newview/English.lproj/InfoPlist.strings
+++ b/indra/newview/English.lproj/InfoPlist.strings
@@ -2,6 +2,6 @@
 
 CFBundleName = "Singularity";
 
-CFBundleShortVersionString = "Singularity Viewer 1.5.0.0";
-CFBundleGetInfoString = "Singularity Viewer 1.5.0.0, Copyright 2010 Siana Gearz";
+CFBundleShortVersionString = "Singularity Viewer 1.7.0.0";
+CFBundleGetInfoString = "Singularity Viewer 1.7.0.0, Copyright 2012 Siana Gearz";
 
diff --git a/indra/newview/Info-Singularity.plist b/indra/newview/Info-Singularity.plist
index e8deb4e00..06a83b2fb 100644
--- a/indra/newview/Info-Singularity.plist
+++ b/indra/newview/Info-Singularity.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string>singularity.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.secondlife.indra.viewer</string>
+	<string>org.singularityviewer.singularity</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

From 3cee90fe8b721bb88360ea1df9e763ab48ec7d3b Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Mon, 16 Jul 2012 01:00:55 -0500
Subject: [PATCH 029/199] Lets not call glDeleteTextures any more, since the
 glGenTextures/glDeleteTextures paradigm has gone away.

---
 indra/llrender/llimagegl.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index 1e698adfc..6d7054e7e 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -330,7 +330,6 @@ S32 LLImageGL::updateBoundTexMem(const S32 mem, const S32 ncomponents, S32 categ
 //static 
 void LLImageGL::destroyGL(BOOL save_state)
 {
-	deleteDeadTextures(); //Dump unimportant textures.
 	for (S32 stage = 0; stage < gGLManager.mNumTextureUnits; stage++)
 	{
 		gGL.getTexUnit(stage)->unbind(LLTexUnit::TT_TEXTURE);
@@ -364,7 +363,6 @@ void LLImageGL::destroyGL(BOOL save_state)
 	}
 	llinfos << "Storing " << stored_count << " images..." << llendl;
 	sAllowReadBackRaw = false ;
-	deleteDeadTextures();//Now, actually call glDeleteTextures for everything.
 }
 
 //static 
@@ -1528,7 +1526,7 @@ void LLImageGL::deleteDeadTextures()
 {
 	bool reset = false;
 
-	for(U32 i=0;i<LLTexUnit::TT_NONE;++i)
+	/*for(U32 i=0;i<LLTexUnit::TT_NONE;++i)
 	{
 		for(dead_texturelist_t::iterator it=sDeadTextureList[i].begin();it!=sDeadTextureList[i].end();++it)
 		{
@@ -1554,7 +1552,7 @@ void LLImageGL::deleteDeadTextures()
 				stop_glerror();
 			}
 		}
-	}
+	}*/
 
 	if (reset)
 	{

From 92a5b143473b6c30611ca02d4f8a27cff14bfaf5 Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Mon, 16 Jul 2012 16:10:15 -0400
Subject: [PATCH 030/199] Linux64 libs and fixes

---
 indra/cmake/CURL.cmake            |   3 +
 indra/cmake/FMODEX.cmake          |   2 +-
 indra/cmake/GooglePerfTools.cmake |   8 +-
 indra/cmake/LLWindow.cmake        |   6 +-
 indra/newview/CMakeLists.txt      |   4 -
 indra/newview/viewer_manifest.py  |  34 ++++----
 install.xml                       | 139 ++++++++++++++++++++++--------
 7 files changed, 132 insertions(+), 64 deletions(-)

diff --git a/indra/cmake/CURL.cmake b/indra/cmake/CURL.cmake
index 3b35f0bae..aa6ff57f9 100644
--- a/indra/cmake/CURL.cmake
+++ b/indra/cmake/CURL.cmake
@@ -14,6 +14,9 @@ else (STANDALONE)
     optimized libcurl)
   else (WINDOWS)
     set(CURL_LIBRARIES curl)
+    if(LINUX AND WORD_SIZE EQUAL 64)
+      list(APPEND CURL_LIBRARIES idn)
+    endif(LINUX AND WORD_SIZE EQUAL 64)
   endif (WINDOWS)
   set(CURL_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include)
 endif (STANDALONE)
diff --git a/indra/cmake/FMODEX.cmake b/indra/cmake/FMODEX.cmake
index bf74341fe..283260d80 100644
--- a/indra/cmake/FMODEX.cmake
+++ b/indra/cmake/FMODEX.cmake
@@ -18,7 +18,7 @@ if (NOT FMODEX_LIBRARY)
   set(FMODEX_SDK_DIR CACHE PATH "Path to the FMOD Ex SDK.")
   if (FMODEX_SDK_DIR)
     find_library(FMODEX_LIBRARY
-                 fmodex fmodex_vc fmodexL_vc
+                 fmodex_vc fmodexL_vc fmodex fmodexL fmodex64 fmodexL64
                  PATHS
                  ${FMODEX_SDK_DIR}/api/lib
                  ${FMODEX_SDK_DIR}/api
diff --git a/indra/cmake/GooglePerfTools.cmake b/indra/cmake/GooglePerfTools.cmake
index 8fbe08dc2..c102542e0 100644
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -1,12 +1,16 @@
 # -*- cmake -*-
 include(Prebuilt)
 
+if(WORD_SIZE EQUAL 64)
+  set(DISABLE_TCMALLOC TRUE)
+endif(WORD_SIZE EQUAL 64)
+
 if (STANDALONE)
   include(FindGooglePerfTools)
 else (STANDALONE)
-  if (LINUX OR WINDOWS)
+  if (LINUX OR WINDOWS AND NOT WORD_SIZE EQUAL 64)
     use_prebuilt_binary(gperftools)
-  endif (LINUX OR WINDOWS)
+  endif (LINUX OR WINDOWS AND NOT WORD_SIZE EQUAL 64)
   if (WINDOWS)
     set(TCMALLOC_LIBRARIES libtcmalloc_minimal.lib)
     set(TCMALLOC_LINKER_FLAGS "/INCLUDE:\"__tcmalloc\"")
diff --git a/indra/cmake/LLWindow.cmake b/indra/cmake/LLWindow.cmake
index f8d2a2902..d75068402 100644
--- a/indra/cmake/LLWindow.cmake
+++ b/indra/cmake/LLWindow.cmake
@@ -18,7 +18,11 @@ else (STANDALONE)
     use_prebuilt_binary(SDL)
     set (SDL_FOUND TRUE)
     set (SDL_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR})
-    set (SDL_LIBRARY SDL directfb fusion direct)
+    if(WORD_SIZE EQUAL 64)
+      set (SDL_LIBRARY SDL)
+    else(WORD_SIZE EQUAL 64)
+      set (SDL_LIBRARY SDL directfb fusion direct)
+    endif(WORD_SIZE EQUAL 64)
   endif (LINUX)
 endif (STANDALONE)
 
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 63b27b693..c41698c34 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -474,8 +474,6 @@ set(viewer_SOURCE_FILES
     llviewerfoldertype.cpp
     llviewergenericmessage.cpp
     llviewergesture.cpp
-    #llviewerimage.cpp
-    #llviewerimagelist.cpp
     llviewerinventory.cpp
     llviewerjoint.cpp
     llviewerjointattachment.cpp
@@ -976,8 +974,6 @@ set(viewer_HEADER_FILES
     llviewerfoldertype.h
     llviewergenericmessage.h
     llviewergesture.h
-    #llviewerimage.h
-    #llviewerimagelist.h
     llviewerinventory.h
     llviewerjoint.h
     llviewerjointattachment.h
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 05a9885ea..0c06505e4 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -825,26 +825,24 @@ class Linux_x86_64Manifest(LinuxManifest):
 
         self.path("../llcommon/libllcommon.so", "lib64/libllcommon.so")
 
-        if (not self.standalone()) and self.prefix("../../libraries/x86_64-linux/lib_release_client", dst="lib64"):
-            self.path("libapr-1.so.0")
-            self.path("libaprutil-1.so.0")
-            self.path("libdb-4.2.so")
-            self.path("libcrypto.so.0.9.8")
-            self.path("libexpat.so.1")
-            self.path("libhunspell-1.2.so.0.0.0", "libhunspell-1.2.so.0")
-            self.path("libssl.so.0.9.8")
-            self.path("libuuid.so", "libuuid.so.1")
-            self.path("libSDL-1.2.so.0")
+        if (not self.standalone()) and self.prefix("../../libraries/x86_64-linux/lib/release", dst="lib64"):
+            self.path("libapr-1.so*")
+            self.path("libaprutil-1.so*")
+            self.path("libdb-*.so*")
+            self.path("libcrypto.so.*")
+            self.path("libexpat.so*")
+            self.path("libhunspell-1.3.so*")
+            self.path("libssl.so*")
+            self.path("libuuid.so*")
+            self.path("libSDL-1.2.so*")
             self.path("libELFIO.so")
-            self.path("libjpeg.so.7")
-            self.path("libpng12.so.0")
-            self.path("libopenjpeg.so.2")
-            self.path("libxml2.so.2")
-            #self.path("libz.so.1") #not needed
+            self.path("libjpeg.so*")
+            self.path("libpng.so*")
+            self.path("libz.so*")
 
             # OpenAL
-            self.path("libopenal.so.1")
-            self.path("libalut.so.0")
+            self.path("libopenal.so*")
+            self.path("libalut.so*")
 
             self.end_prefix("lib64")
 
@@ -860,7 +858,7 @@ class Linux_x86_64Manifest(LinuxManifest):
                 self.end_prefix("lib32")
 
         # 32bit libs needed for voice
-        if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"):
+        if self.prefix("../../libraries/x86_64-linux/lib/release/32bit-compat", dst="lib32"):
             self.path("libalut.so")
             self.path("libidn.so.11")
             self.path("libopenal.so.1")
diff --git a/install.xml b/install.xml
index 91f6251b3..405dd7233 100644
--- a/install.xml
+++ b/install.xml
@@ -76,6 +76,13 @@
             <key>url</key>
             <uri>https://github.com/downloads/LightDrake/Public-Libraries/SDL-1.2.14-linux-20110309.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>2d40e76689d6e8c034490c1cbe9a4961</string>
+            <key>url</key>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/SDL-1.2.14-linux-x86_64-20120604.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>apr_suite</key>
@@ -101,9 +108,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>1a7e1186855d48d8316ce86803095f70</string>
+            <string>66326975f779213886dbaaf021fa3412</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.2.8-linux64-20080909a.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/apr_suite-1.4.5-linux-x86_64-20120604.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -141,9 +148,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>f7cbf2b6e74de4556148663b93ead4d3</string>
+            <string>e2bf7c556ce3525cb6ad20f2d4d80cf4</string>
             <key>url</key>
-            <uri>https://github.com/downloads/Shyotl/SingularityViewer/ares-1.3.0-linux64-20080909.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/ares-1.7.5-linux-x86_64-20120605.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -178,6 +185,13 @@
             <key>url</key>
             <uri>https://github.com/downloads/LightDrake/Public-Libraries/boost-1.45.0-linux-20110604.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>a7c23f5395f79033dbb09b201f16a4ce</string>
+            <key>url</key>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/boost-1.48.0-linux-x86_64-20120514.tar.bz2</uri>
+          </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
@@ -247,9 +261,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>8a28849f4b9d99601dbc8db9d6a2f9ba</string>
+            <string>f6d0f7a6151c1b5a2633679126fbefb0</string>
             <key>url</key>
-            <uri>https://github.com/downloads/Shyotl/SingularityViewer/curl-7.16.4a-linux64-20090303.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/curl-7.24.0-linux-x86_64-20120605.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -277,6 +291,13 @@
             <key>url</key>
             <uri>https://github.com/downloads/LightDrake/Public-Libraries/db-5.1.25-linux-20110309.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>894f6a09e581bcf4a2c36f8f66379704</string>
+            <key>url</key>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/db-5.1.25-Linux-x86_64-20110807.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>dbghelp</key>
@@ -318,9 +339,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>09be41e3145e1a960e50f2f9ce0a5e7d</string>
+            <string>3751294773dff647b3493764dc6539dc</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/dbusglib-linux64-20101007.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/dbus_glib-0.76-linux64-20110310.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -340,9 +361,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>e829a52ba67e02b011cf2e372914d32f</string>
+            <string>d826535e096d707ef1a2783ce66ad2f9</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/elfio-1.0.3-linux64-20091129.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/elfio-1.0.3-linux64-20091129.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -373,9 +394,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>278c61871419b9a4d50a4f88b7922403</string>
+            <string>58d7d0a12984cd57822c709d51ee18f7</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-linux64-20080909.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/expat-2.0.1-linux-x86_64-20120530.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -399,6 +420,13 @@
             <key>url</key>
             <uri>https://github.com/downloads/LightDrake/Public-Libraries/fontconfig-2.8.0-linux-20110311.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>1736c637f7ae184fa94b3eb2c0e5f5da</string>
+            <key>url</key>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/fontconfig-2.8.0-linux-x86_64-20120531.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>freeglut</key>
@@ -447,9 +475,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>1b4624ab06a7ba30e29d1994424db41e</string>
+            <string>9513c22a343369043536514bc87e5801</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/freetype-2.3.11-linux64-20091230.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/freetype-2.3.11-linux-x86_64-20120616.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -477,6 +505,13 @@
             <key>url</key>
             <uri>https://github.com/downloads/LightDrake/Public-Libraries/glext-82-win32-linux.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>b94a97e60b37afee73f5525cd07ba959</string>
+            <key>url</key>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/glext-82-win32-linux.tar.bz2</uri>
+          </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
@@ -504,9 +539,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>58c11add6b275c163950364df5b2964a</string>
+            <string>36575a2975f9ef70281a3062867bd2f8</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/glib-2.20.5-linux64-20100515.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/glib-2.25.17-linux-x86_64-20120422.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -574,9 +609,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>7e6fc4e185e8444a07b58ba7c0df255a</string>
+            <string>37541c812162f009f50e3749220fb782</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.24-linux64-20091230.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/gstreamer-0.10.28-linux-x86_64-20120608.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -597,6 +632,13 @@
             <key>url</key>
             <uri>https://github.com/downloads/LightDrake/Public-Libraries/gtk-etc-linux-20101106.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>1b69a92d684a1b8208aa1d227d8d1bdf</string>
+            <key>url</key>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/gtk_etc-0.0.1-linux-x86_64-20120609.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>hunspell</key>
@@ -626,9 +668,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>5388725d012c3bfabcc420be53442018</string>
+            <string>889d6abceda50f12d0f22c1310844c4b</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/hunspell-1.2-linux64-20100902.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/libhunspell-1.3.2-linux-x86_64-20120708.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -666,9 +708,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>0e7facf7d48531d20c0cd6a3c3f04021</string>
+            <string>7f2e1c0ea2f589c4888ec7f5a214af88</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/jpeglib-6b-linux64-20080909.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/jpeglib-7-linux-x86_64-20120531b.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -746,9 +788,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>5ee1e62bde38520c7f134c4afb9ac9b1</string>
+            <string>ec833cfbfce8a818158e289a6c21ad72</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libpng-1.2.35-linux64-20090304.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/libpng-1.5.10-linux-x86_64-20120420.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -776,6 +818,13 @@
             <key>url</key>
             <uri>https://github.com/downloads/LightDrake/Public-Libraries/libuuid-1.6.2-linux-20110315.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>dc25f523bd0505bbd03fb2b277299b13</string>
+            <key>url</key>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/uuid-1.6.2-linux-x86_64-20120601.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>libxml</key>
@@ -794,9 +843,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>921d7f980519101afb74623e29e9d175</string>
+            <string>9bf2223e26eb4d659fe8e9283bfe73a2</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/libxml-2.6.24-linux64-20080909.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/libxml2-2.7.8-linux-x86_64-20120420.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -820,6 +869,13 @@
             <key>url</key>
             <uri>https://github.com/downloads/LightDrake/Public-Libraries/llqtwebkit-4.7.1-linux-20120228.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>c6f662eaa9aeaf03f73779393640f386</string>
+            <key>url</key>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/llqtwebkit-linux-x86_64-20120716.tar.bz2</uri>
+          </map>
           <key>windows</key>
           <map>
             <key>md5sum</key>
@@ -882,9 +938,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>d1986d287655f159be50d661c125ba19</string>
+            <string>d2a9640c34a9a2848ba9fc63146bdce4</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/ndofdev-linux64-0.3.1-20100817.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/libndofdev-0.3.1-linux-x86_64-20120604.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -922,9 +978,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>83c72b57a95e8c42560fb67955169f19</string>
+            <string>50d232fcf120f85bf259d1b93aa767a7</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/ogg-vorbis-linux64-20091202.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/ogg_vorbis-1.2.2-1.3.2-linux-x86_64-20120604.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -958,9 +1014,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>00b23f28a2457d9dabbaff0b29ee7323</string>
+            <string>e4d434731ad8280e85f5177da8d8ed3a</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.8g-linux64-20080909.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/openssl-1.0.0g-linux-x86_64-20120605.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -991,9 +1047,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>5ad0a3ab623356c1ad61394ba238f99f</string>
+            <string>843758dffdb98db9523a65fab6e136e3</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-soft-1.6.372-linux64-20081219.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/openal-1.14-1.1.0-linux-x86_64-20120605.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -1047,6 +1103,13 @@
             <key>url</key>
             <uri>https://github.com/downloads/LightDrake/Public-Libraries/linux-pulse-headers-0.9.14_1.tar.bz2</uri>
           </map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>736693c3f82458baee10e3eb37bc87df</string>
+            <key>url</key>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/linux64-pulse-headers-0.9.14.tar.bz2</uri>
+          </map>
         </map>
       </map>
       <key>tut</key>
@@ -1133,9 +1196,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>dc67b896c56116df8e18f2d1bbd07031</string>
+            <string>1caff2e120fac6e73cc0c60d6635d527</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-linux64-20080909.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/xmlrpc_epi-0.54.1-linux-x86_64-20120531.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -1173,9 +1236,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>4bddfb2c6dd7b1470a3ed675ac14bd9a</string>
+            <string>367cb642f1471f85f1094827ac960dbe</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3-linux64-20080909.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/zlib-1.2.6-linux-x86_64-20120419.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>

From 84795863e5acddb85634d1ae6b5823ffcc2c74fd Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Mon, 16 Jul 2012 17:07:22 -0400
Subject: [PATCH 031/199] Translations updated

Updated French Translation from Nomade's Zip for MultiWear.
Updated Translations to use basically the same format, and not have some cruft.
Abouts updated to include Spanish translators: Damian Zhaoying, and Franxizco Romano.
---
 .../skins/default/xui/en-us/floater_about.xml |    2 +-
 indra/newview/skins/default/xui/es/alerts.xml |    1 -
 .../skins/default/xui/es/floater_about.xml    |   64 +-
 .../default/xui/es/floater_about_land.xml     | 1159 ++-
 .../xui/es/floater_active_speakers.xml        |   21 +-
 .../xui/es/floater_animation_preview.xml      |  322 +-
 .../default/xui/es/floater_area_search.xml    |   50 +-
 .../skins/default/xui/es/floater_auction.xml  |   14 +-
 .../default/xui/es/floater_audio_volume.xml   |    2 +-
 .../default/xui/es/floater_avatar_picker.xml  |   90 +-
 .../xui/es/floater_avatar_textures.xml        |   52 +-
 .../skins/default/xui/es/floater_beacons.xml  |   31 +-
 .../default/xui/es/floater_build_options.xml  |   14 +-
 .../default/xui/es/floater_bulk_perms.xml     |   96 +-
 .../skins/default/xui/es/floater_bumps.xml    |   37 +-
 .../default/xui/es/floater_buy_contents.xml   |   42 +-
 .../default/xui/es/floater_buy_currency.xml   |  130 +-
 .../skins/default/xui/es/floater_buy_land.xml |  481 +-
 .../default/xui/es/floater_buy_object.xml     |   54 +-
 .../skins/default/xui/es/floater_camera.xml   |   21 +-
 .../default/xui/es/floater_chat_history.xml   |  184 +-
 .../default/xui/es/floater_chatterbox.xml     |    7 +-
 .../default/xui/es/floater_choose_group.xml   |   19 +-
 .../default/xui/es/floater_color_picker.xml   |   71 +-
 .../skins/default/xui/es/floater_critical.xml |   18 +-
 .../default/xui/es/floater_customize.xml      | 1237 ++--
 .../xui/es/floater_day_cycle_options.xml      |  208 +-
 .../xui/es/floater_device_settings.xml        |    4 +-
 .../default/xui/es/floater_directory.xml      |  861 ++-
 .../default/xui/es/floater_display_name.xml   |   42 +-
 .../default/xui/es/floater_env_settings.xml   |   46 +-
 .../skins/default/xui/es/floater_gesture.xml  |   32 +-
 .../xui/es/floater_hardware_settings.xml      |   86 +-
 .../skins/default/xui/es/floater_html.xml     |   24 +-
 .../skins/default/xui/es/floater_im.xml       |   86 +-
 .../default/xui/es/floater_image_preview.xml  |   98 +-
 .../skins/default/xui/es/floater_inspect.xml  |   28 +-
 .../xui/es/floater_instant_message.xml        |   99 +-
 .../xui/es/floater_instant_message_ad_hoc.xml |   75 +-
 .../xui/es/floater_instant_message_group.xml  |   91 +-
 .../es/floater_inventory_item_properties.xml  |  170 +-
 .../xui/es/floater_inventory_view_finder.xml  |   55 +-
 .../skins/default/xui/es/floater_joystick.xml |  205 +-
 .../skins/default/xui/es/floater_lagmeter.xml |  303 +-
 .../default/xui/es/floater_land_holdings.xml  |   76 +-
 .../default/xui/es/floater_landmark_ctrl.xml  |   16 +-
 .../default/xui/es/floater_live_lsleditor.xml |   21 +-
 .../default/xui/es/floater_lsl_guide.xml      |    9 +-
 .../default/xui/es/floater_media_browser.xml  |   60 +-
 .../default/xui/es/floater_mem_leaking.xml    |   30 +-
 .../skins/default/xui/es/floater_mini_map.xml |    4 +-
 .../skins/default/xui/es/floater_moveview.xml |   30 +-
 .../default/xui/es/floater_mute_object.xml    |   20 +-
 .../default/xui/es/floater_my_friends.xml     |    8 +-
 .../xui/es/floater_name_description.xml       |   20 +-
 .../skins/default/xui/es/floater_new_im.xml   |   11 +-
 .../xui/es/floater_new_outfit_dialog.xml      |  188 +-
 .../default/xui/es/floater_notification.xml   |   13 +-
 .../xui/es/floater_notifications_console.xml  |   10 +-
 .../default/xui/es/floater_object_im_info.xml |   34 +-
 .../default/xui/es/floater_openobject.xml     |   11 +-
 .../skins/default/xui/es/floater_pay.xml      |   47 +-
 .../default/xui/es/floater_pay_object.xml     |   58 +-
 .../default/xui/es/floater_perm_prefs.xml     |   30 +-
 .../skins/default/xui/es/panel_audio.xml      |   23 +-
 .../default/xui/es/panel_audio_device.xml     |   48 +-
 .../skins/default/xui/es/panel_avatar.xml     |  433 +-
 .../xui/es/panel_avatar_classified.xml        |   68 +-
 .../default/xui/es/panel_avatar_pick.xml      |   14 +-
 .../skins/default/xui/es/panel_chat_bar.xml   |   35 +-
 .../default/xui/es/panel_group_invite.xml     |   40 +-
 .../default/xui/es/panel_group_land_money.xml |  128 +-
 .../default/xui/es/panel_preferences_im.xml   |   58 +-
 .../xui/es/panel_preferences_popups.xml       |   34 +-
 .../default/xui/es/panel_preferences_web.xml  |   48 +-
 .../skins/default/xui/es/panel_status_bar.xml |   66 +-
 .../skins/default/xui/es/ui_strings.xml       |    2 +-
 indra/newview/skins/default/xui/fr/alerts.xml |    2 +-
 .../skins/default/xui/fr/floater_about.xml    |  152 +-
 .../default/xui/fr/floater_about_land.xml     |  572 +-
 .../xui/fr/floater_active_speakers.xml        |   22 +-
 .../xui/fr/floater_animation_preview.xml      |  329 +-
 .../default/xui/fr/floater_area_search.xml    |   76 +-
 .../skins/default/xui/fr/floater_auction.xml  |   27 +-
 .../default/xui/fr/floater_audio_volume.xml   |    8 +-
 .../default/xui/fr/floater_avatar_picker.xml  |   80 +-
 .../xui/fr/floater_avatar_textures.xml        |   56 +-
 .../skins/default/xui/fr/floater_beacons.xml  |   29 +-
 .../default/xui/fr/floater_build_options.xml  |   16 +-
 .../default/xui/fr/floater_bulk_perms.xml     |   88 +-
 .../skins/default/xui/fr/floater_bumps.xml    |   42 +-
 .../default/xui/fr/floater_buy_contents.xml   |   42 +-
 .../default/xui/fr/floater_buy_currency.xml   |  138 +-
 .../skins/default/xui/fr/floater_buy_land.xml |  486 +-
 .../default/xui/fr/floater_buy_object.xml     |   52 +-
 .../skins/default/xui/fr/floater_camera.xml   |   24 +-
 .../default/xui/fr/floater_chat_history.xml   |  189 +-
 .../default/xui/fr/floater_chatterbox.xml     |    5 +-
 .../default/xui/fr/floater_choose_group.xml   |   19 +-
 .../default/xui/fr/floater_color_picker.xml   |   64 +-
 .../skins/default/xui/fr/floater_critical.xml |   22 +-
 .../default/xui/fr/floater_customize.xml      |  987 ++-
 .../xui/fr/floater_day_cycle_options.xml      |  191 +-
 .../xui/fr/floater_device_settings.xml        |    5 +-
 .../default/xui/fr/floater_directory.xml      |  837 ++-
 .../default/xui/fr/floater_display_name.xml   |   47 +-
 .../default/xui/fr/floater_env_settings.xml   |   54 +-
 .../default/xui/fr/floater_font_test.xml      |   12 +-
 .../skins/default/xui/fr/floater_gesture.xml  |   37 +-
 .../default/xui/fr/floater_god_tools.xml      |  222 +-
 .../default/xui/fr/floater_group_info.xml     |  522 +-
 .../xui/fr/floater_hardware_settings.xml      |  155 +-
 .../skins/default/xui/fr/floater_html.xml     |   32 +-
 .../skins/default/xui/fr/floater_hud.xml      |    4 +-
 .../skins/default/xui/fr/floater_im.xml       |   88 +-
 .../default/xui/fr/floater_image_preview.xml  |  124 +-
 .../skins/default/xui/fr/floater_import.xml   |   34 +-
 .../skins/default/xui/fr/floater_inspect.xml  |   25 +-
 .../xui/fr/floater_instant_message.xml        |  109 +-
 .../xui/fr/floater_instant_message_ad_hoc.xml |   84 +-
 .../xui/fr/floater_instant_message_group.xml  |   93 +-
 .../default/xui/fr/floater_inventory.xml      |  196 +-
 .../fr/floater_inventory_item_properties.xml  |  170 +-
 .../xui/fr/floater_inventory_view_finder.xml  |   48 +-
 .../skins/default/xui/fr/floater_joystick.xml |  167 +-
 .../skins/default/xui/fr/floater_lagmeter.xml |  304 +-
 .../default/xui/fr/floater_land_holdings.xml  |   80 +-
 .../default/xui/fr/floater_landmark_ctrl.xml  |   20 +-
 .../default/xui/fr/floater_live_lsleditor.xml |   24 +-
 .../default/xui/fr/floater_lsl_guide.xml      |   14 +-
 .../default/xui/fr/floater_media_browser.xml  |   40 +-
 .../default/xui/fr/floater_mem_leaking.xml    |   36 +-
 .../skins/default/xui/fr/floater_mini_map.xml |    8 +-
 .../skins/default/xui/fr/floater_moveview.xml |   24 +-
 .../skins/default/xui/fr/floater_mute.xml     |   24 +-
 .../default/xui/fr/floater_mute_object.xml    |   23 +-
 .../default/xui/fr/floater_my_friends.xml     |   14 +-
 .../xui/fr/floater_name_description.xml       |   22 +-
 .../skins/default/xui/fr/floater_new_im.xml   |   22 +-
 .../xui/fr/floater_new_outfit_dialog.xml      |  176 +-
 .../default/xui/fr/floater_notification.xml   |   14 +-
 .../xui/fr/floater_notifications_console.xml  |   10 +-
 .../default/xui/fr/floater_object_im_info.xml |   32 +-
 .../default/xui/fr/floater_openobject.xml     |   16 +-
 .../skins/default/xui/fr/floater_pay.xml      |   44 +-
 .../default/xui/fr/floater_pay_object.xml     |   62 +-
 .../default/xui/fr/floater_perm_prefs.xml     |   32 +-
 .../default/xui/fr/floater_post_process.xml   |  108 +-
 .../skins/default/xui/fr/floater_postcard.xml |   88 +-
 .../default/xui/fr/floater_preferences.xml    |   18 +-
 .../xui/fr/floater_preview_animation.xml      |   33 +-
 .../xui/fr/floater_preview_classified.xml     |    4 +-
 .../default/xui/fr/floater_preview_event.xml  |    4 +-
 .../fr/floater_preview_existing_landmark.xml  |   17 +-
 .../xui/fr/floater_preview_gesture.xml        |  132 +-
 .../xui/fr/floater_preview_notecard.xml       |   32 +-
 .../floater_preview_notecard_keep_discard.xml |   34 +-
 .../default/xui/fr/floater_preview_sound.xml  |   24 +-
 .../xui/fr/floater_preview_texture.xml        |   25 +-
 .../default/xui/fr/floater_preview_url.xml    |    4 +-
 .../xui/fr/floater_price_for_listing.xml      |   38 +-
 .../skins/default/xui/fr/floater_profile.xml  |    8 +-
 .../default/xui/fr/floater_region_info.xml    |    4 +-
 .../default/xui/fr/floater_report_abuse.xml   |  366 +-
 .../default/xui/fr/floater_report_bug.xml     |  216 +-
 .../default/xui/fr/floater_script_debug.xml   |   12 +-
 .../xui/fr/floater_script_ed_panel.xml        |   86 +-
 .../default/xui/fr/floater_script_preview.xml |   12 +-
 .../default/xui/fr/floater_script_queue.xml   |    8 +-
 .../default/xui/fr/floater_script_search.xml  |   30 +-
 .../default/xui/fr/floater_select_key.xml     |   14 +-
 .../default/xui/fr/floater_sell_land.xml      |  144 +-
 .../default/xui/fr/floater_settings_debug.xml |   34 +-
 .../xui/fr/floater_sim_release_message.xml    |   32 +-
 .../xui/fr/floater_skin_preview_template.xml  |   68 +-
 .../skins/default/xui/fr/floater_snapshot.xml |  279 +-
 .../default/xui/fr/floater_sound_preview.xml  |   39 +-
 .../default/xui/fr/floater_statistics.xml     |    4 +-
 .../skins/default/xui/fr/floater_telehub.xml  |   62 +-
 .../skins/default/xui/fr/floater_test.xml     |    4 +-
 .../default/xui/fr/floater_texture_ctrl.xml   |   48 +-
 .../skins/default/xui/fr/floater_tools.xml    | 1290 ++--
 .../default/xui/fr/floater_top_objects.xml    |  110 +-
 .../skins/default/xui/fr/floater_tos.xml      |   54 +-
 .../default/xui/fr/floater_url_entry.xml      |   26 +-
 .../default/xui/fr/floater_voice_wizard.xml   |   18 +-
 .../skins/default/xui/fr/floater_water.xml    |  178 +-
 .../xui/fr/floater_wearable_save_as.xml       |   22 +-
 .../xui/fr/floater_windlight_options.xml      |  380 +-
 .../default/xui/fr/floater_world_map.xml      |  144 +-
 indra/newview/skins/default/xui/fr/fonts.xml  |   18 +-
 .../skins/default/xui/fr/menu_inventory.xml   |  160 +-
 .../skins/default/xui/fr/menu_login.xml       |   54 +-
 .../skins/default/xui/fr/menu_mini_map.xml    |   16 +-
 .../default/xui/fr/menu_pie_attachment.xml    |   30 +-
 .../skins/default/xui/fr/menu_pie_avatar.xml  |   36 +-
 .../skins/default/xui/fr/menu_pie_land.xml    |   20 +-
 .../skins/default/xui/fr/menu_pie_object.xml  |   54 +-
 .../skins/default/xui/fr/menu_pie_self.xml    |   75 +-
 .../skins/default/xui/fr/menu_slurl.xml       |   12 +-
 .../skins/default/xui/fr/menu_viewer.xml      |  552 +-
 .../skins/default/xui/fr/mime_types.xml       |  460 +-
 .../skins/default/xui/fr/notifications.xml    | 6217 +++++++++--------
 indra/newview/skins/default/xui/fr/notify.xml |    8 +-
 .../skins/default/xui/fr/panel_audio.xml      |   20 +-
 .../default/xui/fr/panel_audio_device.xml     |   50 +-
 .../skins/default/xui/fr/panel_avatar.xml     |  460 +-
 .../xui/fr/panel_avatar_classified.xml        |   74 +-
 .../default/xui/fr/panel_avatar_pick.xml      |   20 +-
 .../skins/default/xui/fr/panel_chat_bar.xml   |   41 +-
 .../skins/default/xui/fr/panel_classified.xml |   62 +-
 .../skins/default/xui/fr/panel_event.xml      |  140 +-
 .../skins/default/xui/fr/panel_friends.xml    |   56 +-
 .../skins/default/xui/fr/panel_group.xml      |   26 +-
 .../default/xui/fr/panel_group_finder.xml     |   18 +-
 .../default/xui/fr/panel_group_general.xml    |  193 +-
 .../default/xui/fr/panel_group_invite.xml     |   52 +-
 .../default/xui/fr/panel_group_land_money.xml |  166 +-
 .../default/xui/fr/panel_group_notices.xml    |  148 +-
 .../default/xui/fr/panel_group_roles.xml      |  437 +-
 .../default/xui/fr/panel_group_voting.xml     |  339 +-
 .../skins/default/xui/fr/panel_groups.xml     |   61 +-
 .../default/xui/fr/panel_land_covenant.xml    |   78 +-
 .../skins/default/xui/fr/panel_login.xml      |  121 +-
 .../default/xui/fr/panel_master_volume.xml    |   10 +-
 .../default/xui/fr/panel_media_controls.xml   |   76 +-
 .../default/xui/fr/panel_media_remote.xml     |   20 +-
 .../xui/fr/panel_media_remote_expanded.xml    |   56 +-
 .../skins/default/xui/fr/panel_mini_map.xml   |   54 +-
 .../xui/fr/panel_notifications_channel.xml    |   30 +-
 .../skins/default/xui/fr/panel_overlaybar.xml |   51 +-
 .../skins/default/xui/fr/panel_place.xml      |   78 +-
 .../default/xui/fr/panel_place_small.xml      |   86 +-
 .../xui/fr/panel_preferences_ascent_chat.xml  |  112 +
 .../fr/panel_preferences_ascent_system.xml    |  668 +-
 .../fr/panel_preferences_ascent_vanity.xml    |   55 +
 .../xui/fr/panel_preferences_audio.xml        |   62 +-
 .../default/xui/fr/panel_preferences_chat.xml |  250 +-
 .../xui/fr/panel_preferences_general.xml      |  291 +-
 .../xui/fr/panel_preferences_graphics1.xml    |  463 +-
 .../xui/fr/panel_preferences_grids.xml        |  484 +-
 .../default/xui/fr/panel_preferences_im.xml   |   67 +-
 .../xui/fr/panel_preferences_input.xml        |   66 +-
 .../xui/fr/panel_preferences_network.xml      |   67 +-
 .../xui/fr/panel_preferences_popups.xml       |   44 +-
 .../xui/fr/panel_preferences_skins.xml        |   49 +-
 .../xui/fr/panel_preferences_voice.xml        |   62 +-
 .../default/xui/fr/panel_preferences_web.xml  |   24 +-
 .../default/xui/fr/panel_region_covenant.xml  |  163 +-
 .../default/xui/fr/panel_region_debug.xml     |   80 +-
 .../default/xui/fr/panel_region_estate.xml    |  156 +-
 .../default/xui/fr/panel_region_general.xml   |  118 +-
 .../default/xui/fr/panel_region_terrain.xml   |   54 +-
 .../default/xui/fr/panel_region_texture.xml   |  144 +-
 .../default/xui/fr/panel_scrolling_param.xml  |   24 +-
 .../default/xui/fr/panel_speaker_controls.xml |   82 +-
 .../skins/default/xui/fr/panel_status_bar.xml |   82 +-
 .../skins/default/xui/fr/panel_toolbar.xml    |   34 +-
 .../skins/default/xui/fr/panel_top_pick.xml   |   20 +-
 .../default/xui/fr/panel_voice_controls.xml   |   20 +-
 .../default/xui/fr/panel_voice_enable.xml     |   46 +-
 .../default/xui/fr/panel_voice_options.xml    |   42 +-
 .../default/xui/fr/panel_voice_remote.xml     |   10 +-
 .../xui/fr/panel_voice_remote_expanded.xml    |   10 +-
 .../skins/default/xui/fr/role_actions.xml     |  402 +-
 .../newview/skins/default/xui/fr/strings.xml  | 1207 ++--
 .../skins/default/xui/fr/teleport_strings.xml |  105 +-
 .../default/xui/fr/teleport_strings2.xml      |   77 +
 .../skins/default/xui/fr/ui_strings.xml       |   21 +-
 .../skins/default/xui/fr/xui_version.xml      |    8 +-
 270 files changed, 18468 insertions(+), 18438 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
 create mode 100644 indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml
 create mode 100644 indra/newview/skins/default/xui/fr/teleport_strings2.xml

diff --git a/indra/newview/skins/default/xui/en-us/floater_about.xml b/indra/newview/skins/default/xui/en-us/floater_about.xml
index bd6044274..5b421b9d0 100644
--- a/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -14,7 +14,7 @@
 Singularity Viewer is developed and maintained by Siana Gearz, Shyotl Kuhr, Aleric Inglewood, Narv Czervik, Tigh MacFanatic, Inusaito Kanya, Sovereign Engineer and Latif Khalifa, with contributions by Fractured Crystal, Fritigern Gothly, Henri Beauchamp, McCabe Maxsted, Kadah Coba, Kitty Barnett, nhede Core, Nomade Zhao, Revolution Smythe, Selvone Franizzi, Thickbrick Sleaford, Zauber Parecelsus, Wolfspirit Magic and others. Singularity is based upon Ascent source code. Credits for Ascent include Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, and others. Ascent is based upon the Inertia source code.
 
 Singularity Viewer includes source code contributions of the following residents: Able Whitman, Adam Marker, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Argent Stonecutter, Asuka Neely, Balp Allen, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fractured Crystal, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kunnis Basiat, Lisa Lowe, Lockhart Cordoso, 
-maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas
+maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas, Franxisco Romano, Damian Zhaoying
 
 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, 
diff --git a/indra/newview/skins/default/xui/es/alerts.xml b/indra/newview/skins/default/xui/es/alerts.xml
index e2ac429e4..2c3c306e9 100644
--- a/indra/newview/skins/default/xui/es/alerts.xml
+++ b/indra/newview/skins/default/xui/es/alerts.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <alerts>
 </alerts>
-
 <!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index a7484f4f3..48ddb47ea 100644
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -1,47 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="Acerca de Singularity Viewer">
-	  <tab_container name="about_tab">
-			 <panel label="Información" help_topic="about_support_tab" name="support_panel">
-					<button label="Copiar al portapapeles" name="copy_btn"/>
-			 </panel>
-			 <panel label="Créditos" help_topic="about_credits_tab" name="credits_panel">
-					<text_editor name="credits_editor">
-Singularity Viewer es desarrollado y mantenido por Siana Gearz, Shyotl Kuhr, Aleric Inglewood and Narv Czervik, con contribuciones de Henri Beauchamp, Kitty Barnett, Thickbrick Sleaford, Zauber Parecelsus, Wolfspirit Magic y otros. Singularity está basado en el código fuente del Visor  Ascent. Los créditos del Visor Ascent incluyen a Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, y otros. El Visor Ascent está basado en el código fuente del visor Inertia.
+  <tab_container name="about_tab">
+    <panel label="Información" help_topic="about_support_tab" name="support_panel">
+      <button label="Copiar al portapapeles" name="copy_btn"/>
+    </panel>
 
-Singularity Viewer incluye código fuente aportado por los siguientes residentes: Able Whitman, Adam Marker, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Argent Stonecutter, Asuka Neely, Balp Allen, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fractured Crystal, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kunnis Basiat, Lisa Lowe, Lockhart Cordoso, maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas, Franxisco Romano, Damian Zhaoying
+    <panel label="Créditos" help_topic="about_credits_tab" name="credits_panel">
+      <text_editor name="credits_editor">
+Singularity Viewer es desarrollado y mantenido por Siana Gearz, Shyotl Kuhr, Aleric Inglewood, Narv Czervik, Tigh MacFanatic, Inusaito Kanya, Sovereign Engineer y Latif Khalifa, con contribuciones de Fractured Crystal, Fritigern Gothly, Henri Beauchamp, McCabe Maxsted, Kadah Coba, Kitty Barnett, nhede Core, Nomade Zhao, Revolution Smythe, Selvone Franizzi, Thickbrick Sleaford, Zauber Parecelsus, Wolfspirit Magic y otros. Singularity está basado en el código fuente del Visor Ascent. Los créditos del Visor Ascent incluyen a Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, y otros. El Visor Ascent está basado en el código fuente del visor Inertia.
 
-Second Life llega a ti gracias a 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, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl y muchos otro más.
+Singularity Viewer incluye código fuente aportado por los siguientes residentes: Able Whitman, Adam Marker, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Argent Stonecutter, Asuka Neely, Balp Allen, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fractured Crystal, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kunnis Basiat, Lisa Lowe, Lockhart Cordoso, 
+maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas, Franxisco Romano, Damian Zhaoying
 
-Linden Lab agradece a los siguientes residentes: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
+Second Life llega a ti gracias a 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, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl y muchos otro más.
 
+Linden Lab agradece a los siguientes residentes: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota 
+Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
+      </text_editor>
+    </panel>
 
+    <panel label="Licenses" name="licenses_panel">
+      <text_editor name="licenses_editor"> 
 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)
+APR Copyright (C) 2000-2012 The Apache Software Foundation
+Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
+cURL Copyright (C) 1996-2010, 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.
+expat Copyright (C) 1998-2000 Thai Open Source Software Center Ltd., 2001-2006 Expat maintainers.
+FMOD Sound System, Copyright (C) 1994-2012 Firelight Technologies Pty, 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.
+GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
+google-perftools Copyright (C) 2005, Google Inc.
 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.
+ogg/vorbis Copyright (C) 2002, Xiph.org Foundation
+OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
+PCRE Copyright (c) 1997-2012 University of Cambridge
 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.
-google-perftools Copyright (c) 2005, Google Inc.
+zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 
-All rights reserved.  ver licenses.txt para mayor información.
+<!--Translate: This software contains source code provided by NVIDIA Corporation.-->
+
+All rights reserved.  Ver licenses.txt para mayor información.
 
 Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-
-
-Para ser exitoso en los negocios, se audaz, se el primero, se diferente. --Henry Marchant</text_editor>
-			 </panel>
-	  </tab_container>  
-	  <string name="you_are_at">
-			 Estás en [POSITION]
-	  </string>
+      </text_editor>
+    </panel>
+  </tab_container>  
+  <string name="you_are_at">Estás en [POSITION]</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_about_land.xml b/indra/newview/skins/default/xui/es/floater_about_land.xml
index 9bfbfd172..75d26d7f1 100644
--- a/indra/newview/skins/default/xui/es/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_about_land.xml
@@ -1,594 +1,579 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floaterland" title="Acerca del terreno">
-	  <tab_container name="landtab">
-			 <!-- Panel General -->
-			 <panel label="General" name="land_general_panel">
-					<text name="Name:">
-						  Nombre:
-					</text>
-					<text name="Description:">
-						  Descripción:
-					</text>
-					<text name="LandType">
-						  Tipo:
-					</text>
-					<text name="LandTypeText">
-						  Mainland / Homestead
-					</text>
-					<text name="ContentRating">
-						  Calificación:
-					</text>
-					<text name="ContentRatingText">
-						  Adulto
-					</text>
-					<text name="Owner:">
-						  Propietario:
-					</text>
-					<text name="OwnerText">
-						  Leyla Linden
-					</text>
-					<button label="Perfil..." label_selected="Perfil..." name="Profile..."/>
-					<string name="group_owned_text">
-						  (Propiedad del Grupo)
-					</string>
-					<string name="profile_text">
-						  Perfil...
-					</string>
-					<string name="info_text">
-						  Información...
-					</string>
-					<string name="public_text">
-						  (público)
-					</string>
-					<string name="none_text">
-						  (ninguno)
-					</string>					
-					<text name="Group:">
-						  Grupo:
-					</text>
-					<button label="Definir..." label_selected="Definir..." name="Set..."/>
-					<button bottom="-160"  label="Info" name="group_profile"/>
-					<check_box label="Permitir transferir al grupo" name="check deed" tool_tip="Un oficial del grupo puede transferir este terreno al grupo. El terreno será sostenido por el grupo en sus asignaciones de terreno."/>
-					<button label="Transferir..." label_selected="Transferir..." name="Deed..." tool_tip="Sólo puedes transferir un terreno si eres un oficial del grupo seleccionado."/>
-					<check_box label="El propietario hace una contribución transfiriendo" name="check contrib" tool_tip="Cuando el terreno se transfiere al grupo, el antiguo propietario contribuye con una asignación suficiente de terreno."/>
-					<text name="For Sale:">
-						  En Venta:
-					</text>
-					<text name="Not for sale.">
-						  No está en Venta.
-					</text>
-					<text name="For Sale: Price L$[PRICE].">
-						  Precio: [CURRENCY][PRICE] ([CURRENCY][PRICE_PER_SQM]/m².).
-					</text>
-					<text name="SalePending"/>
-					<button label="Vender el Terreno..." label_selected="Vender el Terreno..." name="Sell Land..."/>
-					<text name="For sale to">
-						  En venta a: [BUYER]
-					</text>
-					<text name="Sell with landowners objects in parcel.">
-						  Los objetos se incluyen en la venta.
-					</text>
-					<text name="Selling with no objects in parcel.">
-						  Los objetos no se incluyen en la venta.
-					</text>
-					<button label="Cancelar la venta del terreno" label_selected="Cancelar la venta del terreno" name="Cancel Land Sale"/>
-					<text name="Claimed:">
-						  Reclamada:
-					</text>
-					<text name="DateClaimText">
-						  Mar 15 Ago 13:47:25 2006
-					</text>
-					<text name="PriceLabel">
-						  Superficie:
-					</text>
-					<text name="PriceText">
-						  4048 m²
-					</text>
-					<text name="Traffic:">
-						  Tráfico:
-					</text>
-					<text name="DwellText">
-						  0
-					</text>
-					<button label="Comprar terreno..." label_selected="Comprar terreno..." name="Buy Land..." width="120"/>
-					<button label="Comprar para el grupo..." label_selected="Comprar para el grupo..." name="Buy For Group..." width="160" left="280"/>
-					<button label="Comprar un Pase..." label_selected="Comprar un Pase..." name="Buy Pass..." tool_tip="Un pase te da acceso temporal a este terreno." width="120"/>
-					<button label="Abandonar terreno..." label_selected="Abandonar terreno..." name="Abandon Land..." width="160" left="280"/>
-					<button label="Reclamar tereno..." label_selected="Reclamar terreno..." name="Reclaim Land..."/>
-					<button label="Venta Linden..." label_selected="Venta Linden..." name="Linden Sale..." tool_tip="El terreno debe estar en propiedad, con contenido, y no estar en subasta."/>
-					<string name="new users only">
-						  Sólo usuarios nuevos
-					</string>
-					<string name="anyone">
-						  Cualquiera
-					</string>
-					<string name="area_text">
-						  Superficie
-					</string>
-					<string name="area_size_text">
-						  [AREA] m²
-					</string>
-					<string name="auction_id_text">
-						  ID de la subasta: [ID]
-					</string>
-					<string name="need_tier_to_modify">
-						  Debe aprobar su compra para modificar este terreno.
-					</string>
-					<string name="sale_pending_text">
-						  (Venta pendiente)
-					</string>
-					<string name="no_selection_text">
-						  No se ha seleccionado una parcela.
-Ve al Menú Mundo > Acerca del terreno o selecciona otra parcela para ver sus características.
-					</string>
-			 </panel>
-			 <!-- Panel Convenio -->
-			 <panel label="Convenio" name="land_covenant_panel" >
-					<text name="estate_section_lbl">
-						  Estado:
-					</text>
-					<text name="estate_name_lbl">
-						  Nombre:
-					</text>
-					<text name="estate_name_text">
-						  mainland
-					</text>
-					<text name="estate_owner_lbl">
-						  Propietario:
-					</text>
-					<text name="estate_owner_text">
-						  (ninguno)
-					</text>
-					<text_editor name="covenant_editor">
-						  No se ha aportado un contrato para este estado.
-					</text_editor>
-					<text name="covenant_timestamp_text">
-						  Última modificación Mie 31 Dic 16:00:00 1969
-					</text>
-					<text name="region_section_lbl">
-						  Región:
-					</text>
-					<text name="region_name_lbl">
-						  Nombre:
-					</text>
-					<text name="region_name_text">
-						  leyla
-					</text>
-					<text name="region_landtype_lbl">
-						  Tipo:
-					</text>
-					<text name="region_landtype_text">
-						  Mainland / Homestead
-					</text>
-					<text name="region_maturity_lbl">
-						  Calificación:
-					</text>
-					<text name="region_maturity_text">
-						  Adulto
-					</text>
-					<text name="resellable_lbl">
-						  Revender:
-					</text>
-					<text name="resellable_clause">
-						  El terreno de esta región no se podrá revender.
-					</text>
-					<text name="changeable_lbl">
-						  Subdividir:
-					</text>
-					<text name="changeable_clause">
-						  El terreno de esta región no se podrá unir/subdividir.
-					</text>
-					<string name="can_resell">
-						  El terreno comprado en esta región se podrá revender.
-					</string>
-					<string name="can_not_resell">
-						  El terreno comprado en esta región no se podrá revender.
-					</string>
-					<string name="can_change">
-						  El terreno comprado en esta región se podrá unir o subdividir.
-					</string>
-					<string name="can_not_change">
-						  El terreno comprado en esta región no se podrá unir o dividir.
-					</string>
-			 </panel>
-			 <!-- Panel Objetos -->
-			 <panel label="Objetos" name="land_objects_panel">
-					<text name="parcel_object_bonus">
-						  Plus de Objectos en la Región: [BONUS]
-					</text>
-					<text name="Simulator primitive usage:">
-						  Uso de primitivas en el Simulador:
-					</text>
-					<text name="objects_available" left="180" width="250">
-						  [COUNT] de un máximo de [MAX] ([AVAILABLE] disponibles)
-					</text>
-					<string name="objects_available_text" left="180" width="250">
-						  [COUNT] de un máximo de  [MAX] ([AVAILABLE] disponibles)
-					</string>
-					<string name="objects_deleted_text" left="180" width="250">
-						  [COUNT] de un máximo de [MAX] ([DELETED] serán borrados)
-					</string>
-					<text name="Primitives parcel supports:">
-						  Prims que acepta la parcela:
-					</text>
-					<text name="object_contrib_text" left="180">
-						  [COUNT]
-					</text>
-					<text name="Primitives on parcel:">
-						  Prims en la parcela:
-					</text>
-					<text name="total_objects_text" left="180">
-						  [COUNT]
-					</text>
-					<text name="Owned by parcel owner:">
-						  Del propietario de la parcela:
-					</text>
-					<text name="owner_objects_text" left="180">
-						  [COUNT]
-					</text>
-					<button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-150"/>
-					<button label="Retornar..." label_selected="Retornar..." name="ReturnOwner..." tool_tip="Return objects to their owners." right="-20"/>
-					<text name="Set to group:">
-						  Del grupo:
-					</text>
-					<text name="group_objects_text" left="180">
-						  [COUNT]
-					</text>
-					<button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-150"/>
-					<button label="Retornar..." label_selected="Retornar..." name="ReturnGroup..." tool_tip="Retornar objetos a sus propietarios." right="-20"/>
-					<text name="Owned by others:">
-						  Propiedad de Otros:
-					</text>
-					<text name="other_objects_text" left="180">
-						  [COUNT]
-					</text>
-					<button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-150"/>
-					<button label="Retornar..." label_selected="Retornar..." name="ReturnOther..." tool_tip="Retornar objetos a sus propietarios." right="-20"/>
-					<text name="Selected / sat upon:">
-						  Selecc./con gente sentada:
-					</text>
-					<text name="selected_objects_text" left="180">
-						  [COUNT]
-					</text>
-					<text name="Autoreturn" width="350">
-						  Autoretorno de objetos a otros residentes (minutos; 0 para desactivar):
-					</text>
-					<line_editor name="clean other time" right="-25"/>
-					<text name="Object Owners:" width="250">
-						  Propietarios de los objetos:
-					</text>
-					<button label="Actualizar la lista" label_selected="Actualizar la lista" name="Refresh List" left="190" widht="50"/>
-					<button label="Retornar objetos..." label_selected="Retornar objetos..." name="Return objects..." left="300" width="120"/>
-					<name_list name="owner list">
-						  <column name="type" label="Tipo"/>
-						  <column name="online_status"/>
-						  <column name="name" label="Nombre" />
-						  <column name="count" label="Cantidad"/>
-						  <column name="mostrecent" label="Recientes"/>
-					</name_list>
-					</panel>
-					<!-- Panel de Opciones -->
-					<panel label="Opciones" name="land_options_panel">
-						  <text name="allow_label">
-								 Permitir a otros residentes:
-						  </text>
-						  <check_box label="Editar Terreno" name="edit land check" tool_tip="Si se marca, cualquiera podrá modificar tu terreno. Mejor dejarlo desmarcado, pues siempre puedes modificar tu terreno."/>
-						  <check_box label="Crear Hitos" name="check landmark"/>
-						  <check_box label="Volar" name="check fly" tool_tip="Si se marca, los residentes podrán volar en tu terreno. Si no, sólo podrán volar al cruzarlo o hasta que aterricen en él."/>
-						  <text name="allow_label2" left="160">
-								 Crear Objetos:
-						  </text>
-						  <check_box label="Todos los Residentes" name="edit objects check" left="240"/>
-						  <check_box label="Grupo" name="edit group objects check"/>
-						  <text name="allow_label3" left="160">
-								 Dejar Objetos:
-						  </text>
-						  <check_box label="Todos los Residentes" name="all object entry check" left="240"/>
-						  <check_box label="Grupo" name="group object entry check"/>
-						  <text name="allow_label4" left="160">
-								 Ejecutar Scripts:
-						  </text>
-						  <check_box label="Todos los Residentes" name="check other scripts" left="240"/>
-						  <check_box label="Grupo" name="check group scripts"/>
-						  <text name="land_options_label">
-								 Opciones del terreno:
-						  </text>
-						  <check_box label="Seguro (sin daño)" name="check safe" tool_tip="Marcado, convierte el terreno en &apos;seguro&apos;, desactivando el daño en combate. Si no, se activa el daño en combate."/>
-						  <string name="push_restrict_text">
-								 Sin empujones
-						  </string>
-						  <string name="push_restrict_region_text">
-								 Sin empujones (Prevalece lo marcado en la Región)
-						  </string>						  
-						  <check_box name="PushRestrictCheck" tool_tip="Previene scripts que empujen. Marcando esta opción evitará que en tu terreno haya comportamientos destructivos."/>
-						  <check_box label="Mostrar parcela en la busqueda ([DIRECTORYFEE]) en" left="14" name="ShowDirectoryCheck" tool_tip="Permitir que aparezca esta parcela en los resultados de la búsqueda"/>
-						  <string name="search_enabled_tooltip">
-								 Permitir que aparezca esta parcela en los resultados de la búsqueda
-						  </string>
-						  <string name="search_disabled_small_tooltip">
-								 Esta opción está desactivada porque la parcela tiene 128 m² o menos.
+	<tab_container name="landtab">
+		<panel label="General" name="land_general_panel">
+			<text name="Name:">
+				Nombre:
+			</text>
+			<text name="Description:">
+				Descripción:
+			</text>
+			<text name="LandType">
+				Tipo:
+			</text>
+			<text name="LandTypeText">
+				Mainland / Homestead
+			</text>
+			<text name="ContentRating">
+				Calificación:
+			</text>
+			<text name="ContentRatingText">
+				Adulto
+			</text>
+			<text name="Owner:">
+				Propietario:
+			</text>
+			<text name="OwnerText">
+				Leyla Linden
+			</text>
+			<button label="Perfil..." label_selected="Perfil..." name="Profile..."/>
+			<string name="group_owned_text">
+				(Propiedad del Grupo)
+			</string>
+			<string name="profile_text">
+				Perfil...
+			</string>
+			<string name="info_text">
+				Información...
+			</string>
+			<string name="public_text">
+				(público)
+			</string>
+			<string name="none_text">
+				(ninguno)
+			</string>
+			<text name="Group:">
+				Grupo:
+			</text>
+			<button label="Definir..." label_selected="Definir..." name="Set..."/>
+			<button bottom="-160"  label="Info" name="group_profile"/>
+			<check_box label="Permitir transferir al grupo" name="check deed" tool_tip="Un oficial del grupo puede transferir este terreno al grupo. El terreno será sostenido por el grupo en sus asignaciones de terreno."/>
+			<button label="Transferir..." label_selected="Transferir..." name="Deed..." tool_tip="Sólo puedes transferir un terreno si eres un oficial del grupo seleccionado."/>
+			<check_box label="El propietario hace una contribución transfiriendo" name="check contrib" tool_tip="Cuando el terreno se transfiere al grupo, el antiguo propietario contribuye con una asignación suficiente de terreno."/>
+			<text name="For Sale:">
+				En Venta:
+			</text>
+			<text name="Not for sale.">
+				No está en Venta.
+			</text>
+			<text name="For Sale: Price L$[PRICE].">
+				Precio: [CURRENCY][PRICE] ([CURRENCY][PRICE_PER_SQM]/m².).
+			</text>
+			<text name="SalePending"/>
+			<button label="Vender el Terreno..." label_selected="Vender el Terreno..." name="Sell Land..."/>
+			<text name="For sale to">
+				En venta a: [BUYER]
+			</text>
+			<text name="Sell with landowners objects in parcel.">
+				  Los objetos se incluyen en la venta.
+			</text>
+			<text name="Selling with no objects in parcel.">
+				  Los objetos no se incluyen en la venta.
+			</text>
+			<button label="Cancelar la venta del terreno" label_selected="Cancelar la venta del terreno" name="Cancel Land Sale"/>
+			<text name="Claimed:">
+				Reclamada:
+			</text>
+			<text name="DateClaimText">
+				Mar 15 Ago 13:47:25 2006
+			</text>
+			<text name="PriceLabel">
+				Superficie:
+			</text>
+			<text name="PriceText">
+				4048 m²
+			</text>
+			<text name="Traffic:">
+				Tráfico:
+			</text>
+			<text name="DwellText">
+				0
+			</text>
+			<button label="Comprar terreno..." label_selected="Comprar terreno..." name="Buy Land..." width="120"/>
+			<button label="Comprar para el grupo..." label_selected="Comprar para el grupo..." name="Buy For Group..." width="160" left="280"/>
+			<button label="Comprar un Pase..." label_selected="Comprar un Pase..." name="Buy Pass..." tool_tip="Un pase te da acceso temporal a este terreno." width="120"/>
+			<button label="Abandonar terreno..." label_selected="Abandonar terreno..." name="Abandon Land..." width="160" left="280"/>
+			<button label="Reclamar tereno..." label_selected="Reclamar terreno..." name="Reclaim Land..."/>
+			<button label="Venta Linden..." label_selected="Venta Linden..." name="Linden Sale..." tool_tip="El terreno debe estar en propiedad, con contenido, y no estar en subasta."/>
+			<string name="new users only">
+				Sólo usuarios nuevos
+			</string>
+			<string name="anyone">
+				Cualquiera
+			</string>
+			<string name="area_text">
+				Superficie
+			</string>
+			<string name="area_size_text">
+				[AREA] m²
+			</string>
+			<string name="auction_id_text">
+				ID de la subasta: [ID]
+			</string>
+			<string name="need_tier_to_modify">
+				Debe aprobar su compra para modificar este terreno.
+			</string>
+			<string name="sale_pending_text">
+				(Venta pendiente)
+			</string>
+			<string name="no_selection_text">
+				No se ha seleccionado una parcela.
+Ve al Menú Mundo &gt; Acerca del terreno o selecciona otra parcela para ver sus características.
+			</string>
+		</panel>
+		<panel label="Convenio" name="land_covenant_panel" >
+			<text name="estate_section_lbl">
+				Estado:
+			</text>
+			<text name="estate_name_lbl">
+				Nombre:
+			</text>
+			<text name="estate_name_text">
+				mainland
+			</text>
+			<text name="estate_owner_lbl">
+				Propietario:
+			</text>
+			<text name="estate_owner_text">
+				(ninguno)
+			</text>
+			<text_editor name="covenant_editor">
+				No se ha aportado un contrato para este estado.
+			</text_editor>
+			<text name="covenant_timestamp_text">
+				Última modificación Mie 31 Dic 16:00:00 1969
+			</text>
+			<text name="region_section_lbl">
+				Región:
+			</text>
+			<text name="region_name_lbl">
+				Nombre:
+			</text>
+			<text name="region_name_text">
+				leyla
+			</text>
+			<text name="region_landtype_lbl">
+				Tipo:
+			</text>
+			<text name="region_landtype_text">
+				Mainland / Homestead
+			</text>
+			<text name="region_maturity_lbl">
+				Calificación:
+			</text>
+			<text name="region_maturity_text">
+				Adulto
+			</text>
+			<text name="resellable_lbl">
+				Revender:
+			</text>
+			<text name="resellable_clause">
+				El terreno de esta región no se podrá revender.
+			</text>
+			<text name="changeable_lbl">
+				Subdividir:
+			</text>
+			<text name="changeable_clause">
+				El terreno de esta región no se podrá unir/subdividir.
+			</text>
+			<string name="can_resell">
+				El terreno comprado en esta región se podrá revender.
+			</string>
+			<string name="can_not_resell">
+				El terreno comprado en esta región no se podrá revender.
+			</string>
+			<string name="can_change">
+				El terreno comprado en esta región se podrá unir o subdividir.
+			</string>
+			<string name="can_not_change">
+				El terreno comprado en esta región no se podrá unir o dividir.
+			</string>
+		</panel>
+		<panel label="Objetos" name="land_objects_panel">
+			<text name="parcel_object_bonus">
+				Plus de Objectos en la Región: [BONUS]
+			</text>
+			<text name="Simulator primitive usage:">
+				Uso de primitivas en el Simulador:
+			</text>
+			<text name="objects_available" left="180" width="250">
+				[COUNT] de un máximo de [MAX] ([AVAILABLE] disponibles)
+			</text>
+			<string name="objects_available_text" left="180" width="250">
+				[COUNT] de un máximo de  [MAX] ([AVAILABLE] disponibles)
+			</string>
+			<string name="objects_deleted_text" left="180" width="250">
+				[COUNT] de un máximo de [MAX] ([DELETED] serán borrados)
+			</string>
+			<text name="Primitives parcel supports:">
+				Prims que acepta la parcela:
+			</text>
+			<text name="object_contrib_text" left="180">
+				[COUNT]
+			</text>
+			<text name="Primitives on parcel:">
+				Prims en la parcela:
+			</text>
+			<text name="total_objects_text" left="180">
+				[COUNT]
+			</text>
+			<text name="Owned by parcel owner:">
+				Del propietario de la parcela:
+			</text>
+			<text name="owner_objects_text" left="180">
+				[COUNT]
+			</text>
+			<button label="Mostrar" label_selected="Mostrar" name="ShowOwner" right="-150"/>
+			<button label="Retornar..." label_selected="Retornar..." name="ReturnOwner..." tool_tip="Return objects to their owners." right="-20"/>
+			<text name="Set to group:">
+				Del grupo:
+			</text>
+			<text name="group_objects_text" left="180">
+				[COUNT]
+			</text>
+			<button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-150"/>
+			<button label="Retornar..." label_selected="Retornar..." name="ReturnGroup..." tool_tip="Retornar objetos a sus propietarios." right="-20"/>
+			<text name="Owned by others:">
+				Propiedad de Otros:
+			</text>
+			<text name="other_objects_text" left="180">
+				[COUNT]
+			</text>
+			<button label="Mostrar" label_selected="Mostrar" name="ShowOther" right="-150"/>
+			<button label="Retornar..." label_selected="Retornar..." name="ReturnOther..." tool_tip="Retornar objetos a sus propietarios." right="-20"/>
+			<text name="Selected / sat upon:">
+				Selecc./con gente sentada:
+			</text>
+			<text name="selected_objects_text" left="180">
+				[COUNT]
+			</text>
+			<text name="Autoreturn" width="350">
+				Autoretorno de objetos a otros residentes (minutos; 0 para desactivar):
+			</text>
+			<line_editor name="clean other time" right="-25"/>
+			<text name="Object Owners:" width="250">
+				Propietarios de los objetos:
+			</text>
+			<button label="Actualizar la lista" label_selected="Actualizar la lista" name="Refresh List" left="190" width="50"/>
+			<button label="Retornar objetos..." label_selected="Retornar objetos..." name="Return objects..." left="300" width="120"/>
+			<name_list name="owner list">
+				<column name="type" label="Tipo"/>
+				<column name="online_status"/>
+				<column name="name" label="Nombre"/>
+				<column name="count" label="Cantidad"/>
+				<column name="mostrecent" label="Recientes"/>
+			</name_list>
+		</panel>
+		<panel label="Opciones" name="land_options_panel">
+			<text name="allow_label">
+				Permitir a otros residentes:
+			</text>
+			<check_box label="Editar Terreno" name="edit land check" tool_tip="Si se marca, cualquiera podrá modificar tu terreno. Mejor dejarlo desmarcado, pues siempre puedes modificar tu terreno."/>
+			<check_box label="Crear Hitos" name="check landmark"/>
+			<check_box label="Volar" name="check fly" tool_tip="Si se marca, los residentes podrán volar en tu terreno. Si no, sólo podrán volar al cruzarlo o hasta que aterricen en él."/>
+			<text name="allow_label2" left="160">
+				Crear Objetos:
+			</text>
+			<check_box label="Todos los Residentes" name="edit objects check" left="240"/>
+			<check_box label="Grupo" name="edit group objects check"/>
+			<text name="allow_label3" left="160">
+				Dejar Objetos:
+			</text>
+			<check_box label="Todos los Residentes" name="all object entry check" left="240"/>
+			<check_box label="Grupo" name="group object entry check"/>
+			<text name="allow_label4" left="160">
+				Ejecutar Scripts:
+			</text>
+			<check_box label="Todos los Residentes" name="check other scripts" left="240"/>
+			<check_box label="Grupo" name="check group scripts"/>
+			<text name="land_options_label">
+				Opciones del terreno:
+			</text>
+			<check_box label="Seguro (sin daño)" name="check safe" tool_tip="Marcado, convierte el terreno en 'seguro', desactivando el daño en combate. Si no, se activa el daño en combate."/>
+			<string name="push_restrict_text">
+				Sin empujones
+			</string>
+			<string name="push_restrict_region_text">
+				Sin empujones (Prevalece lo marcado en la Región)
+			</string>
+			<check_box name="PushRestrictCheck" tool_tip="Previene scripts que empujen. Marcando esta opción evitará que en tu terreno haya comportamientos destructivos."/>
+			<check_box label="Mostrar parcela en la busqueda ([DIRECTORYFEE]) en" name="ShowDirectoryCheck" tool_tip="Permitir que aparezca esta parcela en los resultados de la búsqueda" left="14"/>
+			<string name="search_enabled_tooltip">
+				Permitir que aparezca esta parcela en los resultados de la búsqueda
+			</string>
+			<string name="search_disabled_small_tooltip">
+				Esta opción está desactivada porque la parcela tiene 128 m² o menos.
 Sólo las parcelas más grandes pueden listarse en la búsqueda.
-						  </string>
-						  <string name="search_disabled_permissions_tooltip">
-										Esta opción no esta activada porque no puedes modificar las opciones de la parcela.
-						  </string>
-						  <combo_box name="land category with adult" left="280">
-								 <combo_item name="AnyCategory" value="any">
-										Cualquier Categoría
-								 </combo_item>
-								 <combo_item name="LindenLocation" value="linden">
-										Localización Linden
-								 </combo_item>
-								 <combo_item name="Adult" value="adult">
-										Adulto
-								 </combo_item>
-								 <combo_item name="Arts&amp;Culture" value="arts">
-										Arte y Cultura
-								 </combo_item>
-								 <combo_item name="Business" value="store">
-										Negocios
-								 </combo_item>
-								 <combo_item name="Educational" value="educational">
-										Educativo
-								 </combo_item>
-								 <combo_item name="Gaming" value="game">
-										Juegos de azar
-								 </combo_item>
-								 <combo_item name="Hangout" value="gather">
-										Entretenimiento
-								 </combo_item>
-								 <combo_item name="NewcomerFriendly" value="newcomer">
-										Para recién llegados
-								 </combo_item>
-								 <combo_item name="Parks&amp;Nature" value="park">
-										Parques y Naturaleza
-								 </combo_item>
-								 <combo_item name="Residential" value="home">
-										Residencial
-								 </combo_item>
-								 <combo_item name="Shopping" value="shopping">
-										Compras
-								 </combo_item>
-								 <combo_item name="Other" value="other">
-										Otros
-								 </combo_item>
-								 <combo_item name="Rental" value="rental">
-										Alquiler
-								 </combo_item>
-						  </combo_box>
-						  <!-- The following combo box is identical to the previous one, except for the
-						  fact that the Adult item is missing. This seems to be the only way to safely
-						  delete the adult item with our UI toolkit.
-						  Once we have completed the transition period, the one WITH adult can be deleted. -->
-						  <combo_box name="land category" left="280">
-								 <combo_item name="AnyCategory" value="any">
-										Cualquier Categoría
-								 </combo_item>
-								 <combo_item name="LindenLocation" value="linden">
-										Localización Linden
-								 </combo_item>
-								 <combo_item name="Arts&amp;Culture" value="arts">
-										Arte y Cultura
-								 </combo_item>
-								 <combo_item name="Business" value="store">
-										Negocios
-								 </combo_item>
-								 <combo_item name="Educational" value="educational">
-										Educativo
-								 </combo_item>
-								 <combo_item name="Gaming" value="game">
-										Juegos de Azar
-								 </combo_item>
-								 <combo_item name="Hangout" value="gather">
-										Entretenimiento
-								 </combo_item>
-								 <combo_item name="NewcomerFriendly" value="newcomer">
-										Para recién llegados
-								 </combo_item>
-								 <combo_item name="Parks&amp;Nature" value="park">
-										Parques y Naturaleza
-								 </combo_item>
-								 <combo_item name="Residential" value="home">
-										Residencial
-								 </combo_item>
-								 <combo_item name="Shopping" value="shopping">
-										Compras
-								 </combo_item>
-								 <combo_item name="Other" value="other">
-										Otros
-								 </combo_item>
-								 <combo_item name="Rental" value="rental">
-										Alquiler
-								 </combo_item>
-						  </combo_box>
-						  <button label="?" label_selected="?" name="?" left="420"/>
-						  <check_box label="Contenido Mature" name="MatureCheck"/>
-						  <string name="mature_check_mature">
-								 Contenido Mature
-						  </string>
-						  <string name="mature_check_adult">
-								 Contenido Adulto
-						  </string>
-						  <string name="mature_check_mature_tooltip">
-								 La información o el contenido de su parcela se considera mature.
-						  </string>
-						  <string name="mature_check_adult_tooltip">
-								 La información o el contenido de su parcela se considera adulto.
-						  </string>
-						  <text name="allow_label5">
-								 Permitir a residentes en otras parcelas:
-						  </text>
-						  <check_box label="Ver Avatares" name="SeeAvatarsCheck" tool_tip="Premite a los residentes en otras parcelas ver y conversar con los residentes en esta parcela, y tu prodrás verlos y conversar también con ellos."/>
-						  <string name="see_avs_text">
-								 Ver y conversar con residentes en esta parcela
-						  </string>
-						  <text name="Snapshot:">
-								 Foto:
-						  </text>
-						  <texture_picker name="snapshot_ctrl" tool_tip="Pulsa aquí para elegir una imagen"/>
-						  <text name="landing_point">
-								 Punto de llegada: [LANDING]
-						  </text>
-						  <string name="landing_point_none">
-								 (ninguno)
-						  </string>
-						  <button label="Definir" label_selected="Definir" name="Set" tool_tip="Configura el punto de llegada donde aparecerán los visitantes. Configúralo a la posición de tu avatar dentro de esta parcela."/>
-						  <button label="Borrar" label_selected="Borrar" name="Clear" tool_tip="Borra el punto de llegada."/>
-						  <text name="Teleport Routing: ">
-								 Punto de Teleporte:
-						  </text>
-						  <combo_box name="landing type" tool_tip="Punto de Teleporte -- define como manejar los teleportes en tu terreno.">
-								 <combo_item name="Blocked" value="Blocked">
-										Bloqueado
-								 </combo_item>
-								 <combo_item name="LandingPoint" value="Landing Point">
-										Punto de Llegada
-								 </combo_item>
-								 <combo_item name="Anywhere" value="Anywhere">
-										Cualquiera
-								 </combo_item>
-						  </combo_box>
-			 </panel>
-			 <!-- Panel de Media -->
-			 <panel label="Media" name="land_media_panel" >
-					<text name="with media:" width="70">
-						  Tipo de media:
-					</text>
-					<combo_box name="media type" tool_tip="Especifica si la URL es una película, página web u otro tipo de media" left="90"/>
-					<text name="mime_type" />
-					<text name="at URL:">
-						  URL base:
-					</text>
-					<line_editor name="media_url"/>
-					<button label="Definir..." label_selected="Definir..." name="set_media_url"/>
-					<text name="at URL2:">
-						  URL actual:
-					</text>
-					<text name="current_url"/>
-					<button label="Reiniciar..." label_selected="Reiniciar..." name="reset_media_url"/>
-					<text name="media_reset" tool_tip="Tiempo transcurrido para revertir al URL por defecto de la parcela (0 para no retornar el valor defecto)" width="300">
-						  Retornar al URL por defecto en:
-					</text>
-					<spinner name="media_reset_time" tool_tip="Tiempo transcurrido para revertir al URL por defecto de la parcela (0 para no retornar el valor defecto)" left_delta="170"/>
-					<text name="minutes">
-						  minutos
-					</text>
-					<text name="Description:">
-						  Descripción:
-					</text>
-					<line_editor name="url_description" tool_tip="Texto mostrado al lado del botón Ejecutar/Cargar" />
-					<text name="Media texture:">
-						  Textura:
-					</text>
-					<texture_picker label="" name="media texture" tool_tip="Pulsa aquí para elegir una textura"/>
-					<text name="replace_texture_help">
-						  Los objetos que usen esta textura mostrarán la
+			</string>
+			<string name="search_disabled_permissions_tooltip">
+				Esta opción no esta activada porque no puedes modificar las opciones de la parcela.
+			</string>
+			<combo_box name="land category with adult" left="280">
+				<combo_item name="AnyCategory">
+					Cualquier Categoría
+				</combo_item>
+				<combo_item name="LindenLocation">
+					Localización Linden
+				</combo_item>
+				<combo_item name="Adult">
+					Adulto
+				</combo_item>
+				<combo_item name="Arts&amp;Culture">
+					Arte y Cultura
+				</combo_item>
+				<combo_item name="Business">
+					Negocios
+				</combo_item>
+				<combo_item name="Educational">
+					Educativo
+				</combo_item>
+				<combo_item name="Gaming">
+					Juegos de azar
+				</combo_item>
+				<combo_item name="Hangout">
+					Entretenimiento
+				</combo_item>
+				<combo_item name="NewcomerFriendly">
+					Para recién llegados
+				</combo_item>
+				<combo_item name="Parks&amp;Nature">
+					Parques y Naturaleza
+				</combo_item>
+				<combo_item name="Residential">
+					Residencial
+				</combo_item>
+				<combo_item name="Shopping">
+					Compras
+				</combo_item>
+				<combo_item name="Other">
+					Otros
+				</combo_item>
+				<combo_item name="Rental">
+					Alquiler
+				</combo_item>
+			</combo_box>
+			<!-- The following combo box is identical to the previous one, except for the
+				fact that the Adult item is missing. This seems to be the only way to safely
+				delete the adult item with our UI toolkit.
+				Once we have completed the transition period, the one WITH adult can be deleted. -->
+			<combo_box name="land category" left="280">
+				<combo_item name="AnyCategory">
+					Cualquier Categoría
+				</combo_item>
+				<combo_item name="LindenLocation">
+					Localización Linden
+				</combo_item>
+				<combo_item name="Arts&amp;Culture">
+					Arte y Cultura
+				</combo_item>
+				<combo_item name="Business">
+					Negocios
+				</combo_item>
+				<combo_item name="Educational">
+					Educativo
+				</combo_item>
+				<combo_item name="Gaming">
+					Juegos de Azar
+				</combo_item>
+				<combo_item name="Hangout">
+					Entretenimiento
+				</combo_item>
+				<combo_item name="NewcomerFriendly">
+					Para recién llegados
+				</combo_item>
+				<combo_item name="Parks&amp;Nature">
+					Parques y Naturaleza
+				</combo_item>
+				<combo_item name="Residential">
+					Residencial
+				</combo_item>
+				<combo_item name="Shopping">
+					Compras
+				</combo_item>
+				<combo_item name="Other" value="other">
+					Otros
+				</combo_item>
+				<combo_item name="Rental" value="rental">
+					Alquiler
+				</combo_item>
+			</combo_box>
+			<button label="?" label_selected="?" name="?" left="420"/>
+			<check_box label="Contenido Mature" name="MatureCheck"/>
+			<string name="mature_check_mature">
+				Contenido Mature
+			</string>
+			<string name="mature_check_adult">
+				Contenido Adulto
+			</string>
+			<string name="mature_check_mature_tooltip">
+				La información o el contenido de su parcela se considera mature.
+			</string>
+			<string name="mature_check_adult_tooltip">
+				La información o el contenido de su parcela se considera adulto.
+			</string>
+			<text name="allow_label5">
+				Permitir a residentes en otras parcelas:
+			</text>
+			<check_box label="Ver Avatares" name="SeeAvatarsCheck" tool_tip="Premite a los residentes en otras parcelas ver y conversar con los residentes en esta parcela, y tu prodrás verlos y conversar también con ellos."/>
+			<string name="see_avs_text">
+				Ver y conversar con residentes en esta parcela
+			</string>
+			<text name="Snapshot:">
+				 Foto:
+			</text>
+			<texture_picker name="snapshot_ctrl" tool_tip="Pulsa aquí para elegir una imagen"/>
+			<text name="landing_point">
+				Punto de llegada: [LANDING]
+			</text>
+			<string name="landing_point_none">
+				(ninguno)
+			</string>
+			<button label="Definir" label_selected="Definir" name="Set" tool_tip="Configura el punto de llegada donde aparecerán los visitantes. Configúralo a la posición de tu avatar dentro de esta parcela."/>
+			<button label="Borrar" label_selected="Borrar" name="Clear" tool_tip="Borra el punto de llegada."/>
+			<text name="Teleport Routing: ">
+				Punto de Teleporte:
+			</text>
+			<combo_box name="landing type" tool_tip="Punto de Teleporte -- define como manejar los teleportes en tu terreno.">
+				<combo_item name="Blocked" value="Blocked">
+					Bloqueado
+				</combo_item>
+				<combo_item name="LandingPoint" value="Landing Point">
+					Punto de Llegada
+				</combo_item>
+				<combo_item name="Anywhere" value="Anywhere">
+					Cualquiera
+				</combo_item>
+			</combo_box>
+		</panel>
+		<panel label="Media" name="land_media_panel">
+			<text name="with media:" width="70">
+				Tipo de media:
+			</text>
+			<combo_box name="media type" tool_tip="Especifica si la URL es una película, página web u otro tipo de media" left="90"/>
+			<text name="mime_type"/>
+			<text name="at URL:">
+				URL base:
+			</text>
+			<line_editor name="media_url"/>
+			<button label="Definir..." label_selected="Definir..." name="set_media_url"/>
+			<text name="at URL2:">
+				URL actual:
+			</text>
+			<text name="current_url"/>
+			<button label="Reiniciar..." label_selected="Reiniciar..." name="reset_media_url"/>
+			<text name="media_reset" tool_tip="Tiempo transcurrido para revertir al URL por defecto de la parcela (0 para no retornar el valor defecto)" width="300">
+				Retornar al URL por defecto en:
+			</text>
+			<spinner name="media_reset_time" tool_tip="Tiempo transcurrido para revertir al URL por defecto de la parcela (0 para no retornar el valor defecto)" left_delta="170"/>
+			<text name="minutes">
+				minutos
+			</text>
+			<text name="Description:">
+				Descripción:
+			</text>
+			<line_editor name="url_description" tool_tip="Texto mostrado al lado del botón Ejecutar/Cargar" />
+			<text name="Media texture:">
+				Textura:
+			</text>
+			<texture_picker label="" name="media texture" tool_tip="Pulsa aquí para elegir una textura"/>
+			<text name="replace_texture_help">
+				Los objetos que usen esta textura mostrarán la
 película o la web cuando pulse la flecha de ejecución.
 
 Selecciona la miniatura para elegir una textura diferente.
-					</text>
-					<text name="Options:">
-						  Opciones:
-					</text>
-					<check_box label="Bucle" name="media_loop" tool_tip="El media se ejecuta en bucle permanente. Cuando haya terminado su ejecución, se reiniciará desde el comienzo."/>
-					<check_box label="Escala automática" name="media_auto_scale" tool_tip="Marcando esta opción, se ajustará el tamaño del contenido automáticamente. Puede ser ligeramente más lento y con menor calidad visual, pero no tendrás que ajustar ni alinear ninguna textura."/>
-					<text name="media_size" tool_tip="Tamaño para mostrar la webs, déjalo en  0 para el valor por defecto."  width="100">
-						  Tamaño de Media:
-					</text>
-					<spinner name="media_size_width" tool_tip="Ancho para mostrar la webs, déjalo en  0 para el valor por defecto." left="110"/>
-					<spinner name="media_size_height" tool_tip="Alto para mostrar la webs, déjalo en  0 para el valor por defecto."/>
-					<text name="pixels">
-						  pixeles
-					</text>
-					<text name="Interaction:">
-						  Interactivo:
-					</text>
-					<radio_group name="radio_navigate_allow">
-						  <radio_item name="Anyone" tool_tip="Cualquier residente puede interactuar con el media.">
-								 Cualquiera
-						  </radio_item>
-						  <radio_item name="Group" tool_tip="Sólo miembros del Grupo con permiso de control puede interactuar con el media.">
-								 Grupo
-						  </radio_item>
-					</radio_group>
-					<check_box label="Permitir navegar solamente en estos dominios:" name="check navigate filter" />
-					<line_editor name="navigate_filter_domain" />
-					<button label="Agregar..." label_selected="Agregar.." name="add_navigate_filter"/>
-					<scroll_list name="filter_list" >
-						  <column label="Dominio" name="domain" sort="domain"/>
-					</scroll_list>
-					<button label="Quitar" label_selected="Quitar" name="remove_navigate_filter"/>
-			 </panel>
-			 <!-- Panel de Audio -->
-			 <panel name="land_audio_panel">
-					<text name="MusicURL:">
-						  URL de la música:
-					</text>
-					<line_editor name="music_url" left="110"/>
-					<text name="Sound:">
-						  Música:
-					</text>
-					<check_box label="Restringir gestos y sonidos de objetos a esta parcela" name="check_sound_local"/>
-					<button label="?" label_selected="?" name="?"/>
-					<text name="Avatar Sounds:">
-						  Sonidos de Avatares:
-					</text>
-					<check_box label="Cualquiera" name="all av sound check"/>
-					<check_box label="Grupo" name="group av sound check"/>
-					<text name="Voice:">
-						  Voz:
-					</text>
-					<radio_group name="parcel_voice_channel">
-						  <radio_item name="Estate" tool_tip="Utilizar el canal de voz del estado.">
-								 Canal del Estado
-						  </radio_item>
-						  <radio_item name="Parcel" tool_tip="Restringir la Voz a esta parcela.">
-								 Canal de la Parcela
-						  </radio_item>
-						  <radio_item name="Disabled" tool_tip="Deshabilitar la voz en esta parcela.">
-								 Deshabilitada
-						  </radio_item>
-					</radio_group>
-			 </panel>
-			 <!-- Panel de Acceso -->
-			 <panel label="Acceso" name="land_access_panel">
-					<text name="Limit access to this parcel to:">
-						  Acceso a esta parcela
-					</text>
-					<check_box label="Permitir Acceso Público" name="public_access"/>
-					<text name="Only Allow">
-						  Bloquear acceso por:
-					</text>
-					<check_box label="Residentes que no tengan información de pago en archivo" name="limit_payment" tool_tip="Prohibir a residentes no identificados."/>
-					<check_box label="Residentes no verificados como adultos" name="limit_age_verified" tool_tip="Prohibir a los residentes que no han verificado su edad. Ver support.secondlife.com para mayor información."/>
-					<string name="estate_override">
-						  Una o mas de estas opciones está configurada a nivel del Estado
-					</string>
-					<check_box label="Permitir Acceso al Grupo: [GROUP]" name="GroupCheck" tool_tip="Definir el Grupo en la pestaña General."/>
-					<check_box label="Vender pases para:" name="PassCheck" tool_tip="Permitir acceso temporario a esta parcela"/>
-					<combo_box name="pass_combo">
-					<combo_item name="Anyone" value="anyone">
-						  Cualquiera
-					</combo_item>
-					<combo_item name="Group" value="group">
-						  Grupo
-					</combo_item>
-					</combo_box>
-					<spinner label="Precio en [CURRENCY]:" name="PriceSpin"/>
-					<spinner label="Horas de acceso:" name="HoursSpin"/>
-					<text label="Permitir siempre" name="AllowedText">
-						  Residentes permitidos
-					</text>
-					<name_list name="AccessList" tool_tip="([LISTED] listados, [MAX] max)"/>
-					<button label="Agregar..." label_selected="Agregar..." name="add_allowed"/>
-					<button label="Quitar" label_selected="Quitar" name="remove_allowed"/>
-					<text label="Ban" name="BanCheck">
-						  Residentes prohibidos
-					</text>
-					<name_list name="BannedList" tool_tip="([LISTED] listados, [MAX] max)"/>
-					<button label="Agregar..." label_selected="Agregar..." name="add_banned"/>
-					<button label="Quitar" label_selected="Quitar" name="remove_banned"/>
-			 </panel>
-	  </tab_container>
+			</text>
+			<text name="Options:">
+				Opciones:
+			</text>
+			<check_box label="Bucle" name="media_loop" tool_tip="El media se ejecuta en bucle permanente. Cuando haya terminado su ejecución, se reiniciará desde el comienzo."/>
+			<check_box label="Escala automática" name="media_auto_scale" tool_tip="Marcando esta opción, se ajustará el tamaño del contenido automáticamente. Puede ser ligeramente más lento y con menor calidad visual, pero no tendrás que ajustar ni alinear ninguna textura."/>
+			<text name="media_size" tool_tip="Tamaño para mostrar la webs, déjalo en  0 para el valor por defecto."  width="100">
+				Tamaño de Media:
+			</text>
+			<spinner name="media_size_width" tool_tip="Ancho para mostrar la webs, déjalo en  0 para el valor por defecto." left="110"/>
+			<spinner name="media_size_height" tool_tip="Alto para mostrar la webs, déjalo en  0 para el valor por defecto."/>
+			<text name="pixels">
+				pixeles
+			</text>
+			<text name="Interaction:">
+				  Interactivo:
+			</text>
+			<radio_group name="radio_navigate_allow">
+				<radio_item name="Anyone" tool_tip="Cualquier residente puede interactuar con el media.">
+					Cualquiera
+				</radio_item>
+				<radio_item name="Group" tool_tip="Sólo miembros del Grupo con permiso de control puede interactuar con el media.">
+					Grupo
+				</radio_item>
+			</radio_group>
+		</panel>
+		<panel name="land_audio_panel">
+			<text name="MusicURL:">
+				URL de la música:
+			</text>
+			<line_editor name="music_url" left="110"/>
+			<text name="Sound:">
+				Música:
+			</text>
+			<check_box label="Restringir gestos y sonidos de objetos a esta parcela" name="check_sound_local"/>
+			<button label="?" label_selected="?" name="?"/>
+			<text name="Avatar Sounds:">
+				Sonidos de Avatares:
+			</text>
+			<check_box label="Cualquiera" name="all av sound check"/>
+			<check_box label="Grupo" name="group av sound check"/>
+			<text name="Voice:">
+				Voz:
+			</text>
+			<radio_group name="parcel_voice_channel">
+				<radio_item name="Estate" tool_tip="Utilizar el canal de voz del estado.">
+					Canal del Estado
+				</radio_item>
+				<radio_item name="Parcel" tool_tip="Restringir la Voz a esta parcela.">
+					Canal de la Parcela
+				</radio_item>
+				<radio_item name="Disabled" tool_tip="Deshabilitar la voz en esta parcela.">
+					Deshabilitada
+				</radio_item>
+			</radio_group>
+		</panel>
+		<panel label="Acceso" name="land_access_panel">
+			<text name="Limit access to this parcel to:">
+				Acceso a esta parcela
+			</text>
+			<check_box label="Permitir Acceso Público" name="public_access"/>
+			<text name="Only Allow">
+				Bloquear acceso por:
+			</text>
+			<check_box label="Residentes que no tengan información de pago en archivo" name="limit_payment" tool_tip="Prohibir a residentes no identificados."/>
+			<check_box label="Residentes no verificados como adultos" name="limit_age_verified" tool_tip="Prohibir a los residentes que no han verificado su edad. Ver support.secondlife.com para mayor información."/>
+			<string name="estate_override">
+				Una o mas de estas opciones está configurada a nivel del Estado
+			</string>
+			<check_box label="Permitir Acceso al Grupo: [GROUP]" name="GroupCheck" tool_tip="Definir el Grupo en la pestaña General."/>
+			<check_box label="Vender pases para:" name="PassCheck" tool_tip="Permitir acceso temporario a esta parcela"/>
+			<combo_box name="pass_combo">
+				<combo_item name="Anyone">
+					Cualquiera
+				</combo_item>
+				<combo_item name="Group">
+					Grupo
+				</combo_item>
+			</combo_box>
+			<spinner label="Precio en [CURRENCY]:" name="PriceSpin"/>
+			<spinner label="Horas de acceso:" name="HoursSpin"/>
+			<text label="Permitir siempre" name="AllowedText">
+				Residentes permitidos
+			</text>
+			<name_list name="AccessList" tool_tip="([LISTED] listados, [MAX] max)"/>
+			<button label="Agregar..." label_selected="Agregar..." name="add_allowed"/>
+			<button label="Quitar" label_selected="Quitar" name="remove_allowed"/>
+			<text label="Ban" name="BanCheck">
+				Residentes prohibidos
+			</text>
+			<name_list name="BannedList" tool_tip="([LISTED] listados, [MAX] max)"/>
+			<button label="Agregar..." label_selected="Agregar..." name="add_banned"/>
+			<button label="Quitar" label_selected="Quitar" name="remove_banned"/>
+		</panel>
+	</tab_container>
 </floater>
-<!--   -->
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_active_speakers.xml b/indra/newview/skins/default/xui/es/floater_active_speakers.xml
index ba202b456..486f296f7 100644
--- a/indra/newview/skins/default/xui/es/floater_active_speakers.xml
+++ b/indra/newview/skins/default/xui/es/floater_active_speakers.xml
@@ -1,14 +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="Participantes Activos">
-	  <panel name="active_speakers_panel">
-			 <scroll_list name="speakers_list">
-					<column name="icon_speaking_status"/>
-					<column label="Nombre" name="speaker_name" />
-					<column label="" name="speaking_status"/>
-			 </scroll_list>
-			 <panel name="volume_container">
-					<volume_slider name="speaker_volume" />
-					<button label="" name="mute_btn" tool_tip="Ignorar la voz de este residente"/>
-			 </panel>
-	  </panel>
+	<panel name="active_speakers_panel">
+		<scroll_list name="speakers_list">
+			<column label="Nombre" name="speaker_name"/>
+		</scroll_list>
+		<panel name="volume_container">
+			<button name="mute_btn" tool_tip="Ignorar la voz de este residente"/>
+		</panel>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_animation_preview.xml b/indra/newview/skins/default/xui/es/floater_animation_preview.xml
index a398dac25..10ea5094d 100644
--- a/indra/newview/skins/default/xui/es/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_animation_preview.xml
@@ -1,172 +1,168 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Animation Preview" >
-	  <pad height="12" />
-	  <text name="name_label">
-			 Nombre:
-	  </text>
-	  <line_editor name="name_form"/>
-	  <text name="description_label">
-			 Descripción:
-	  </text>
-	  <line_editor name="description_form"/>
-	  <pad height="0" />
-	  <spinner label="Prioridad" name="priority" tool_tip="Controla qué otras animaciones pueden ser anuladas por ésta."/>
-	  <check_box label="Bucle" name="loop_check" tool_tip="Haz esta animación en bucle." />
-	  <spinner label="Inicio(%)"  label_width="40" name="loop_in_point" tool_tip="Indica el punto en el que la animación empieza el bucle." left="85" />
-	  <spinner label="Fin(%)"  label_width="30" name="loop_out_point" tool_tip="Indica el punto en el que la animación termina el bucle." />
-	  <text name="hand_label">
-			 Posición de las Manos
-	  </text>
-	  <combo_box name="hand_pose_combo" right="190" tool_tip="Controla lo que hacen las manos durante la animación" left_delta="110">
-			 <combo_item name="Spread" value="">
-					Extendidas
-			 </combo_item>
-			 <combo_item name="Relaxed" value="Hands_Relaxed">
-					Relajadas
-			 </combo_item>
-			 <combo_item name="PointBoth" value="Hands_Point">
-					Ambas Señalando
-			 </combo_item>
-			 <combo_item name="Fist" value="Hands_Fist">
-					Puño
-			 </combo_item>
-			 <combo_item name="RelaxedLeft" value="Hands_Relaxed_L">
-					La izquierda relajada
-			 </combo_item>
-			 <combo_item name="PointLeft" value="Hands_Point_L">
-					La izquierda señalando
-			 </combo_item>
-			 <combo_item name="FistLeft" value="Hands_Fist_L">
-					La izquierda en puño
-			 </combo_item>
-			 <combo_item name="RelaxedRight" value="Hands_Relaxed_R">
-					La derecha relajada
-			 </combo_item>
-			 <combo_item name="PointRight" value="Hands_Point_R">
-					La derecha señalando
-			 </combo_item>
-			 <combo_item name="FistRight" value="Hands_Fist_R">
-					La derecha en puño
-			 </combo_item>
-			 <combo_item name="SaluteRight" value="Hands_Salute_R">
-					La derecha saludando
-			 </combo_item>
-			 <combo_item name="Typing" value="Hands_Typing">
-					Escribiendo
-			 </combo_item>
-			 <combo_item name="PeaceRight" value="Hands_Peace_R">
-					Derecha en Signo de Paz
-			 </combo_item>
-	  </combo_box>
-	  <text bottom_delta="-22" follows="top|left" height="15" left="10" name="emote_label" >
-			 Expresión
-	  </text>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Animation Preview">
+	<text name="name_label">
+		Nombre:
+	</text>
+	<text name="description_label">
+		Descripción:
+	</text>
+	<spinner label="Prioridad" name="priority" tool_tip="Controla qué otras animaciones pueden ser anuladas por ésta."/>
+	<check_box label="Bucle" name="loop_check" tool_tip="Haz esta animación en bucle."/>
+	<spinner label="Inicio(%)" label_width="40" name="loop_in_point" tool_tip="Indica el punto en el que la animación empieza el bucle." left="85"/>
+	<spinner label="Fin(%)" label_width="30" name="loop_out_point" tool_tip="Indica el punto en el que la animación termina el bucle."/>
+	<text name="hand_label">
+		Posición de las Manos
+	</text>
+	<combo_box name="hand_pose_combo" tool_tip="Controla lo que hacen las manos durante la animación" right="190" left_delta="110">
+		<combo_item name="Spread">
+			Extendidas
+		</combo_item>
+		<combo_item name="Relaxed">
+			Relajadas
+		</combo_item>
+		<combo_item name="PointBoth">
+			Ambas Señalando
+		</combo_item>
+		<combo_item name="Fist">
+			Puño
+		</combo_item>
+		<combo_item name="RelaxedLeft">
+			La izquierda relajada
+		</combo_item>
+		<combo_item name="PointLeft">
+			La izquierda señalando
+		</combo_item>
+		<combo_item name="FistLeft">
+			La izquierda en puño
+		</combo_item>
+		<combo_item name="RelaxedRight">
+			La derecha relajada
+		</combo_item>
+		<combo_item name="PointRight">
+			La derecha señalando
+		</combo_item>
+		<combo_item name="FistRight">
+			La derecha en puño
+		</combo_item>
+		<combo_item name="SaluteRight">
+			La derecha saludando
+		</combo_item>
+		<combo_item name="Typing">
+			Escribiendo
+		</combo_item>
+		<combo_item name="PeaceRight">
+			Derecha en Signo de Paz
+		</combo_item>
+	</combo_box>
+	<text bottom_delta="-22" follows="top|left" height="15" left="10" name="emote_label">
+		Expresión
+	</text>
 	<combo_box label="" name="emote_combo" tool_tip="Controla qué hace la cara durante la animación" left_delta="110">
-			 <combo_item name="[None]">
-					[Nada]
-			 </combo_item>
-			 <combo_item name="Aaaaah">
-					Aaaaah
-			 </combo_item>
-			 <combo_item name="Afraid">
-					Con Miedo
-			 </combo_item>
-			 <combo_item name="Angry">
-					Enfadada
-			 </combo_item>
-			 <combo_item name="BigSmile">
-					Gran Sonrisa
-			 </combo_item>
-			 <combo_item name="Bored">
-					Aburrida
-			 </combo_item>
-			 <combo_item name="Cry">
-					Llorar
-			 </combo_item>
-			 <combo_item name="Disdain">
-					Desdén
-			 </combo_item>
-			 <combo_item name="Embarrassed">
-					Avergonzada
-			 </combo_item>
-			 <combo_item name="Frown">
-					Fruncir el ceño
-			 </combo_item>
-			 <combo_item name="Kiss">
-					Besar
-			 </combo_item>
-			 <combo_item name="Laugh">
-					Carcajada
-			 </combo_item>
-			 <combo_item name="Plllppt">
-					Sacar la lengua
-			 </combo_item>
-			 <combo_item name="Repulsed">
-					Rechazo
-			 </combo_item>
-			 <combo_item name="Sad">
-					Triste
-			 </combo_item>
-			 <combo_item name="Shrug">
-					Encogerse de hombros
-			 </combo_item>
-			 <combo_item name="Smile">
-					Sonrisa
-			 </combo_item>
-			 <combo_item name="Surprise">
-					Sorpresa
-			 </combo_item>
-			 <combo_item name="Wink">
-					Guiño
-			 </combo_item>
-			 <combo_item name="Worry">
-					Preocupación
-			 </combo_item>
-	  </combo_box>
-	  <text name="preview_label">
-			 Vista Previa
-	  </text>
-	  <combo_box label="" name="preview_base_anim" tool_tip="Comprueba cómo se comporta tu animación a la vez que el avatar realiza acciones comunes." left_delta="110">
-			 <combo_item name="Standing">
-					De Pie
-			 </combo_item>
-			 <combo_item name="Walking">
-					Caminando
-			 </combo_item>
-			 <combo_item name="Sitting">
-					Sentado
-			 </combo_item>
-			 <combo_item name="Flying">
-					Volando
-			 </combo_item>
-	  </combo_box>
-	  <spinner label="Combinar (seg)" label_width="72"  name="ease_in_time" tool_tip="Tiempo (en segundos) en el que se combinan las animaciones." width="122"/>
-	  <spinner label="No Combinar (seg)" label_width="90"  name="ease_out_time" tool_tip="Tiempo (en segundos) en el que dejan de combinarse las animaciones." left="145" width="140"/>
-	  <button label="" name="play_btn" tool_tip="Reproducir/pausar tu animación." />
-	  <button label="" name="stop_btn" tool_tip="Detener la reproducción de la animación" />
-	  <slider label="" name="playback_slider" />
-	  <text name="bad_animation_text">
-			 No se ha podido leer el archivo de la animación.
+		<combo_item name="[None]">
+			[Nada]
+		</combo_item>
+		<combo_item name="Aaaaah">
+			Aaaaah
+		</combo_item>
+		<combo_item name="Afraid">
+			Con Miedo
+		</combo_item>
+		<combo_item name="Angry">
+			Enfadada
+		</combo_item>
+		<combo_item name="BigSmile">
+			Gran Sonrisa
+		</combo_item>
+		<combo_item name="Bored">
+			Aburrida
+		</combo_item>
+		<combo_item name="Cry">
+			Llorar
+		</combo_item>
+		<combo_item name="Disdain">
+			Desdén
+		</combo_item>
+		<combo_item name="Embarrassed">
+			Avergonzada
+		</combo_item>
+		<combo_item name="Frown">
+			Fruncir el ceño
+		</combo_item>
+		<combo_item name="Kiss">
+			Besar
+		</combo_item>
+		<combo_item name="Laugh">
+			Carcajada
+		</combo_item>
+		<combo_item name="Plllppt">
+			Sacar la lengua
+		</combo_item>
+		<combo_item name="Repulsed">
+			Rechazo
+		</combo_item>
+		<combo_item name="Sad">
+			Triste
+		</combo_item>
+		<combo_item name="Shrug">
+			Encogerse de hombros
+		</combo_item>
+		<combo_item name="Smile">
+			Sonrisa
+		</combo_item>
+		<combo_item name="Surprise">
+			Sorpresa
+		</combo_item>
+		<combo_item name="Wink">
+			Guiño
+		</combo_item>
+		<combo_item name="Worry">
+			Preocupación
+		</combo_item>
+	</combo_box>
+	<text name="preview_label">
+		Vista Previa
+	</text>
+	<combo_box label="" name="preview_base_anim" tool_tip="Comprueba cómo se comporta tu animación a la vez que el avatar realiza acciones comunes." left_delta="110">
+		<combo_item name="Standing">
+			De Pie
+		</combo_item>
+		<combo_item name="Walking">
+			Caminando
+		</combo_item>
+		<combo_item name="Sitting">
+			Sentado
+		</combo_item>
+		<combo_item name="Flying">
+			Volando
+		</combo_item>
+	</combo_box>
+	<spinner label="Combinar (seg)" label_width="72" name="ease_in_time" tool_tip="Tiempo (en segundos) en el que se combinan las animaciones." width="122"/>
+	<spinner label="No Combinar (seg)" label_width="90" name="ease_out_time" tool_tip="Tiempo (en segundos) en el que dejan de combinarse las animaciones." left="145" width="140"/>
+	<button label="" name="play_btn" tool_tip="Reproducir/pausar tu animación."/>
+	<button label="" name="stop_btn" tool_tip="Detener la reproducción de la animación"/>
+	<slider label="" name="playback_slider"/>
+	<text name="bad_animation_text">
+		No se ha podido leer el archivo de la animación.
 
 Recomendamos usar archivos BVH exportados de
 Poser 4
-	  </text>
-	  <button label="Cancelar" name="cancel_btn"/>
-	  <button label="Subir ([UPLOADFEE])" name="ok_btn"/>
-	  <string name="failed_to_initialize">
-			 Fallo al iniciar el movimiento
-	  </string>
-	  <string name="anim_too_long">
-			 El archivo de la Animación dura [LENGTH] segundos.
+	</text>
+	<button label="Cancelar" name="cancel_btn"/>
+	<button label="Subir ([UPLOADFEE])" name="ok_btn"/>
+	<string name="failed_to_initialize">
+		 Fallo al iniciar el movimiento
+	</string>
+	<string name="anim_too_long">
+		 El archivo de la Animación dura [LENGTH] segundos.
 
 La duración máxima de una animación es de [MAX_LENGTH] segundos.
-	  </string>
-	  <string name="failed_file_read">
-			 No se ha podido leer el archivo de la animación.
+	</string>
+	<string name="failed_file_read">
+		No se ha podido leer el archivo de la animación.
 
 [STATUS]
-	  </string>
-	  <string name="in_world">
-			 La vista previa se reproduce en tu avatar.
-	  </string>
+	</string>
+	<string name="in_world">
+		La vista previa se reproduce en tu avatar.
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_area_search.xml b/indra/newview/skins/default/xui/es/floater_area_search.xml
index b9c0a9563..27b3c6a08 100644
--- a/indra/newview/skins/default/xui/es/floater_area_search.xml
+++ b/indra/newview/skins/default/xui/es/floater_area_search.xml
@@ -1,30 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="area search" title="Búsqueda de Objetos en el �rea">
-	  <text name="name_label">
-			 Búsqueda por Nombre:
-	  </text>
-	  <text name="desc_label">
-			 Búsqueda por Descrición:
-	  </text>
-	  <line_editor name="Name query chunk" tool_tip=""/>
-	  <line_editor name="Description query chunk" tool_tip=""/>
-	  <text name="owner_label">
-			 Búsqueda por Propietario:
-	  </text>
-	  <text name="group_label">
-			 Búsqueda por Grupo:
-	  </text>
-	  <line_editor name="Owner query chunk" tool_tip=""/>
-	  <line_editor name="Group query chunk" tool_tip=""/>
-	  <scroll_list name="result_list">
-			 <column name="Name" label="Nombre" tool_tip="Haz doble click en cualquier resultado para marcar su posición"/>
-			 <column name="Description" label="Descripción" tool_tip="Haz doble click en cualquier resultado para marcar su posición"/>
-			 <column name="Owner" label="Propietario" tool_tip="Haz doble click en cualquier resultado para marcar su posición"/>
-			 <column name="Group" label="Grupo" tool_tip="Haz doble click en cualquier resultado para marcar su posición"/>
-	  </scroll_list>
-	  <button name="Refresh" label="Actualizar"/>
-	  <button name="Stop" label="Detener"/>
-	  <text name="counter" >
-			 Listados/Pendientes/Total
-	  </text>
+	<text name="name_label">
+		Búsqueda por Nombre:
+	</text>
+	<text name="desc_label">
+		Búsqueda por Descrición:
+	</text>
+	<text name="owner_label">
+		Búsqueda por Propietario:
+	</text>
+	<text name="group_label">
+		Búsqueda por Grupo:
+	</text>
+	<scroll_list name="result_list">
+		<column name="Name" label="Nombre" tool_tip="Haz doble click en cualquier resultado para marcar su posición"/>
+		<column name="Description" label="Descripción" tool_tip="Haz doble click en cualquier resultado para marcar su posición"/>
+		<column name="Owner" label="Propietario" tool_tip="Haz doble click en cualquier resultado para marcar su posición"/>
+		<column name="Group" label="Grupo" tool_tip="Haz doble click en cualquier resultado para marcar su posición"/>
+	</scroll_list>
+	<button name="Refresh" label="Actualizar"/>
+	<button name="Stop" label="Detener"/>
+	<text name="counter">
+		Listados/Pendientes/Total
+	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_auction.xml b/indra/newview/skins/default/xui/es/floater_auction.xml
index 3caaadc6e..67c29151c 100644
--- a/indra/newview/skins/default/xui/es/floater_auction.xml
+++ b/indra/newview/skins/default/xui/es/floater_auction.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_auction" title="Iniciar venta de terreno Linden">
-	  <icon name="snapshot_icon" />
-	  <text name="parcel_text"/>
-	  <check_box label="Incluir la valla amarilla de selección" name="fence_check"/>
-	  <button label="Instantánea" label_selected="Instantánea" name="snapshot_btn"/>
-	  <button label="OK" label_selected="OK" name="ok_btn"/>
-	  <string name="already for sale">
-			 No puedes subastar parcelas que ya están en venta.
-	  </string>
+	<check_box label="Incluir la valla amarilla de selección" name="fence_check"/>
+	<button label="Instantánea" label_selected="Instantánea" name="snapshot_btn"/>
+	<button label="OK" label_selected="OK" name="ok_btn"/>
+	<string name="already for sale">
+		No puedes subastar parcelas que ya están en venta.
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_audio_volume.xml b/indra/newview/skins/default/xui/es/floater_audio_volume.xml
index f366ccb52..f1c44d381 100644
--- a/indra/newview/skins/default/xui/es/floater_audio_volume.xml
+++ b/indra/newview/skins/default/xui/es/floater_audio_volume.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Volume" title="Volumen">
-	  <label="Volumen" name="Volume Panel"/>
+	<panel label="Volumen" name="Volume Panel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
index e60f26468..b166f0808 100644
--- a/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/es/floater_avatar_picker.xml
@@ -1,50 +1,46 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="avatarpicker" title="Elegir a un Residente">
-	  <tab_container name="ResidentChooserTabs" >
-			 <panel name="SearchPanel" label="Buscar" >
-					<text name="InstructSearchResidentName" >
-						  Escribe parte del nombre del residente:
-					</text>
-					<line_editor name="Edit" />
-					<button label="Buscar" label_selected="Buscar" name="Find"/>
-					<scroll_list name="SearchResults"/>
-			 </panel>
-			 <panel name="CallingCardsPanel" label="Tarjeta de Llamada" >
-					<text name="InstructSelectCallingCard">
-						  Elige una Tarjeta de Llamada:
-					</text>
-					<inventory_panel name="InventoryPanel" />
-			 </panel>
-			 <panel name="NearMePanel" label="Cercanos" >
-					<text name="InstructSelectResident">
-						  Seleccionar un residente cercano:
-					</text>
-					<button label="Actualizar Lista" label_selected="Actualizar Lista" name="Refresh"/>
-					<slider name="near_me_range" label="Alcance" />
-					<text name="meters">
-						  Metros
-					</text>
-					<scroll_list name="NearMe"  />
-			 </panel>
-			 <panel name="KeyPanel" label="Por UUID" >
-					<text name="InstructSelectResident">
-						  UUID del Avatar o Grupo:
-					</text>
-					<line_editor name="EditUUID"/>
-			 </panel>
-	  </tab_container>
-	  <button label="Elegir" label_selected="Elegir" name="Select"/>
-	  <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
-	  <string name="not_found">
-			 No se ha encontrado a &apos;[TEXT]&apos;
-	  </string>
-	  <string name="no_one_near">
-			 Nadie Cercano
-	  </string>
-	  <string name="no_results">
-			 Sin resultados
-	  </string>
-	  <string name="searching">
-			 Buscando...
-	  </string>
+	<tab_container name="ResidentChooserTabs">
+		<panel name="SearchPanel" label="Buscar">
+			<text name="InstructSearchResidentName">
+				Escribe parte del nombre del residente:
+			</text>
+			<button label="Buscar" label_selected="Buscar" name="Find"/>
+		</panel>
+		<panel name="CallingCardsPanel" label="Tarjeta de Llamada">
+			<text name="InstructSelectCallingCard">
+				Elige una Tarjeta de Llamada:
+			</text>
+		</panel>
+		<panel name="NearMePanel" label="Cercanos">
+			<text name="InstructSelectResident">
+				Seleccionar un residente cercano:
+			</text>
+			<button label="Actualizar Lista" label_selected="Actualizar Lista" name="Refresh"/>
+			<slider name="near_me_range" label="Alcance"/>
+			<text name="meters">
+				Metros
+			</text>
+			<scroll_list name="NearMe"/>
+		</panel>
+		<panel name="KeyPanel" label="Por UUID" >
+			<text name="InstructSelectResident">
+				UUID del Avatar o Grupo:
+			</text>
+		</panel>
+	</tab_container>
+	<button label="Elegir" label_selected="Elegir" name="Select"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<string name="not_found">
+		No se ha encontrado a '[TEXT]'
+	</string>
+	<string name="no_one_near">
+		Nadie Cercano
+	</string>
+	<string name="no_results">
+		Sin resultados
+	</string>
+	<string name="searching">
+		Buscando...
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
index 7ea3a01dc..b73ec1a92 100644
--- a/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/es/floater_avatar_textures.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="avatar_texture_debug" title="Texturas del Avatar" >
-	  <button label="Enviar IDs a la Consola" label_selected="Volcado" name="Dump"/>
-	  <!-- The names of the following must match the definitions in llvoavatardefines.cpp -->
-	  <texture_picker label="Pelo Base" name="hair-baked"/>
-	  <texture_picker label="Pelo" name="hair_grain"/>
-	  <texture_picker label="Ojos Base" name="eyes-baked"/>
-	  <texture_picker label="ojos" name="eyes_iris"/>
-	  <texture_picker label="Cabeza Base" name="head-baked"/>
-	  <texture_picker label="Maquillaje" name="head_bodypaint"/>
-	  <texture_picker label="Tatuajes Cabeza" name="head_tattoo"/>
-	  <texture_picker label="Tatuaje Parte Superior del Cuerpo" name="upper_tattoo"/>
-	  <texture_picker label="Tatuaje Parte Inferior del Cuerpo" name="lower_tattoo"/>
-	  <texture_picker label="Base Parte Superior del Cuerpo" name="upper-baked"/>
-	  <texture_picker label="Piel Parte Superior del Cuerpo" name="upper_bodypaint"/>
-	  <texture_picker label="Camiseta" name="upper_undershirt"/>
-	  <texture_picker label="Camisa" name="upper_shirt"/>
-	  <texture_picker label="Chaqueta" name="upper_jacket" />
-	  <texture_picker label="Guantes" name="upper_gloves"/>
-	  <texture_picker label="Base Parte Inferior del Cuerpo" name="lower-baked"/>
-	  <texture_picker label="Piel Parte Inferior del cuerpo" name="lower_bodypaint"/>
-	  <texture_picker label="Calzoncillos" name="lower_underpants"/>
-	  <texture_picker label="Pants" name="Pantalones"/>
-	  <texture_picker label="Fada Chaqueta" name="lower_jacket"/>
-	  <texture_picker label="Medias" name="lower_socks"/>
-	  <texture_picker label="Falda Base" name="skirt-baked"/>
-	  <texture_picker label="Falda" name="skirt"/>
-	  <texture_picker label="Zapatos" name="lower_shoes"/>
+	<button label="Enviar IDs a la Consola" label_selected="Volcado" name="Dump"/>
+	<!-- The names of the following must match the definitions in llvoavatardefines.cpp -->
+	<texture_picker label="Pelo Base" name="hair-baked"/>
+	<texture_picker label="Pelo" name="hair_grain"/>
+	<texture_picker label="Ojos Base" name="eyes-baked"/>
+	<texture_picker label="ojos" name="eyes_iris"/>
+	<texture_picker label="Cabeza Base" name="head-baked"/>
+	<texture_picker label="Maquillaje" name="head_bodypaint"/>
+	<texture_picker label="Tatuajes Cabeza" name="head_tattoo"/>
+	<texture_picker label="Tatuaje Parte Superior del Cuerpo" name="upper_tattoo"/>
+	<texture_picker label="Tatuaje Parte Inferior del Cuerpo" name="lower_tattoo"/>
+	<texture_picker label="Base Parte Superior del Cuerpo" name="upper-baked"/>
+	<texture_picker label="Piel Parte Superior del Cuerpo" name="upper_bodypaint"/>
+	<texture_picker label="Camiseta" name="upper_undershirt"/>
+	<texture_picker label="Camisa" name="upper_shirt"/>
+	<texture_picker label="Chaqueta" name="upper_jacket" />
+	<texture_picker label="Guantes" name="upper_gloves"/>
+	<texture_picker label="Base Parte Inferior del Cuerpo" name="lower-baked"/>
+	<texture_picker label="Piel Parte Inferior del cuerpo" name="lower_bodypaint"/>
+	<texture_picker label="Calzoncillos" name="lower_underpants"/>
+	<texture_picker label="Pants" name="Pantalones"/>
+	<texture_picker label="Fada Chaqueta" name="lower_jacket"/>
+	<texture_picker label="Medias" name="lower_socks"/>
+	<texture_picker label="Falda Base" name="skirt-baked"/>
+	<texture_picker label="Falda" name="skirt"/>
+	<texture_picker label="Zapatos" name="lower_shoes"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_beacons.xml b/indra/newview/skins/default/xui/es/floater_beacons.xml
index cf5077c9a..87b1124b8 100644
--- a/indra/newview/skins/default/xui/es/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/es/floater_beacons.xml
@@ -1,17 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="beacons" title="Balizas" control_name="ShowBeaconsFloater">
-	  <panel name="beacons_panel">
-			 <check_box name="always_on" label="Mantener balizas activas al cerrar" control_name="keepbeacons" />
-			 <check_box name="touch_only" label="Solo Objetos con script de toque" control_name="scripttouchbeacon" />
-			 <check_box name="scripted" label="Objetos con Scripts" control_name="scriptsbeacon" />
-			 <check_box name="physical" label="Objetos Materiales" control_name="physicalbeacon" />
-			 <check_box name="sounds" label="Fuentes de Sonidos" control_name="soundsbeacon" />
-			 <check_box name="particles" label="Fuentes de Partículas" control_name="particlesbeacon" />
-			 <check_box name="highlights" label="Activar los Realzados" control_name="renderhighlights" />
-			 <check_box name="beacons" label="Activar Balizas" control_name="renderbeacons" />
-			 <text type="string" name="beacon_width_label">
-					Ancho de la Baliza:
-			 </text>
-			 <slider name="beacon_width" control_name="DebugBeaconLineWidth"/>    
-	  </panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="beacons" title="Balizas">
+	<panel name="beacons_panel">
+		<check_box name="always_on" label="Mantener balizas activas al cerrar"/>
+		<check_box name="touch_only" label="Solo Objetos con script de toque"/>
+		<check_box name="scripted" label="Objetos con Scripts"/>
+		<check_box name="physical" label="Objetos Materiales"/>
+		<check_box name="sounds" label="Fuentes de Sonidos"/>
+		<check_box name="particles" label="Fuentes de Partículas"/>
+		<check_box name="highlights" label="Activar los Realzados"/>
+		<check_box name="beacons" label="Activar Balizas"/>
+		<text name="beacon_width_label">
+			Ancho de la Baliza:
+		</text>
+	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_build_options.xml b/indra/newview/skins/default/xui/es/floater_build_options.xml
index c45fe8e79..61326adf6 100644
--- a/indra/newview/skins/default/xui/es/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/es/floater_build_options.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="build options floater" title="Opciones de la Grilla">
-	  <spinner label="Unidad de la Grilla (metros)" label_width="145" name="GridResolution"/>
-	  <spinner label="Extensión de la Grilla (metros)" label_width="146" name="GridDrawSize"/>
-	  <check_box label="Activar Subunidades" name="GridSubUnit"/>
-	  <check_box label="Ver la Sección Transversal" name="GridCrossSection"/>
-	  <slider label="Opacidad de la Grilla" name="GridOpacity"/>
-	  <spinner label="Pasos Restringidos" name="GridProtractorSize"/>
-	  <spinner label="Pasos sin Restricción" name="RotationStep"/>
+	<spinner label="Unidad de la Grilla (metros)" label_width="145" name="GridResolution"/>
+	<spinner label="Extensión de la Grilla (metros)" label_width="146" name="GridDrawSize"/>
+	<check_box label="Activar Subunidades" name="GridSubUnit"/>
+	<check_box label="Ver la Sección Transversal" name="GridCrossSection"/>
+	<slider label="Opacidad de la Grilla" name="GridOpacity"/>
+	<spinner label="Pasos Restringidos" name="GridProtractorSize"/>
+	<spinner label="Pasos sin Restricción" name="RotationStep"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_bulk_perms.xml b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml
index ab046b8b3..1d3ffc116 100644
--- a/indra/newview/skins/default/xui/es/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/es/floater_bulk_perms.xml
@@ -1,56 +1,44 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floaterbulkperms" title="Modificación masiva de Permisos del Contenido" >
-	  <text name="applyto">
-			 Tipos de Contenido
-	  </text>
-	  <icon name="icon_animation"/>
-	  <check_box label="Animación" name="check_animation"/>
-	  <icon name="icon_bodypart"/>
-	  <check_box label="Partes del Cuerpo" name="check_bodypart"/>
-	  <icon name="icon_clothing"/>
-	  <check_box label="Ropas" name="check_clothing"/>
-	  <icon name="icon_gesture"/>
-	  <check_box label="Gestos" name="check_gesture"/>
-	  <icon name="icon_landmark"/>
-	  <check_box label="Hitos" name="check_landmark"/>
-	  <icon name="icon_notecard"/>
-	  <check_box label="Notas" name="check_notecard"/>
-	  <icon name="icon_object"/>
-	  <check_box label="Objetos" name="check_object"/>
-	  <icon name="icon_script"/>
-	  <check_box label="Scripts" name="check_script"/>
-	  <icon name="icon_sound"/>
-	  <check_box label="Sonidos" name="check_sound"/>
-	  <icon name="icon_texture"/>
-	  <check_box label="Texturas" name="check_texture"/>
-	  <button label="Marcar Todo" label_selected="Todo" name="check_all" width="110"/>
-	  <button label="Desmarcar Todo" label_selected="Ninguno" name="check_none" width="110"/>
-	  <text name="newperms">
-			 Nuevos Permisos
-	  </text>
-	  <check_box label="Compartir con el Grupo" name="share_with_group"/>
-	  <check_box label="Permitir a Cualquiera que lo copie" name="everyone_copy"/>
-	  <text name="NextOwnerLabel">
-			 El próximo propietario puede:
-	  </text>
-	  <check_box label="Modificarlo" name="next_owner_modify"/>
-	  <check_box label="Copiarlo" name="next_owner_copy"/>
-	  <check_box label="Revenderlo/Darlo" name="next_owner_transfer"/>
-	  <scroll_list name="queue output" />
-	  <button label="Ayuda" name="help"/>
-	  <button label="Aplicar" name="apply"/>
-	  <button label="Cerrar" name="close"/>
-	  <string name="nothing_to_modify_text">
-			 Lo seleccionado tiene contenido no editable..
-	  </string>
-	  <string name="status_text">
-			 Configurando permisos de [NAME]
-	  </string>
-	  <string name="start_text">
-			 Iniciando el cambio de permisos solicitado...
-	  </string>
-	  <string name="done_text">
-			 Finalizando el cambio de permisos solicitado.
-	  </string>
-
+<floater name="floaterbulkperms" title="Modificación masiva de Permisos del Contenido">
+	<text name="applyto">
+		Tipos de Contenido
+	</text>
+	<check_box label="Animación" name="check_animation"/>
+	<check_box label="Partes del Cuerpo" name="check_bodypart"/>
+	<check_box label="Ropas" name="check_clothing"/>
+	<check_box label="Gestos" name="check_gesture"/>
+	<check_box label="Hitos" name="check_landmark"/>
+	<check_box label="Notas" name="check_notecard"/>
+	<check_box label="Objetos" name="check_object"/>
+	<check_box label="Scripts" name="check_script"/>
+	<check_box label="Sonidos" name="check_sound"/>
+	<check_box label="Texturas" name="check_texture"/>
+	<button label="Marcar Todo" label_selected="Todo" name="check_all" width="110"/>
+	<button label="Desmarcar Todo" label_selected="Ninguno" name="check_none" width="110"/>
+	<text name="newperms">
+		Nuevos Permisos
+	</text>
+	<check_box label="Compartir con el Grupo" name="share_with_group"/>
+	<check_box label="Permitir a Cualquiera que lo copie" name="everyone_copy"/>
+	<text name="NextOwnerLabel">
+		El próximo propietario puede:
+	</text>
+	<check_box label="Modificarlo" name="next_owner_modify"/>
+	<check_box label="Copiarlo" name="next_owner_copy"/>
+	<check_box label="Revenderlo/Darlo" name="next_owner_transfer"/>
+	<button label="Ayuda" name="help"/>
+	<button label="Aplicar" name="apply"/>
+	<button label="Cerrar" name="close"/>
+	<string name="nothing_to_modify_text">
+		Lo seleccionado tiene contenido no editable..
+	</string>
+	<string name="status_text">
+		Configurando permisos de [NAME]
+	</string>
+	<string name="start_text">
+		Iniciando el cambio de permisos solicitado...
+	</string>
+	<string name="done_text">
+		Finalizando el cambio de permisos solicitado.
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_bumps.xml b/indra/newview/skins/default/xui/es/floater_bumps.xml
index 9075f6f73..853546de9 100644
--- a/indra/newview/skins/default/xui/es/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/es/floater_bumps.xml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_bumps" title="Choques, empujones y golpes">
-	  <scroll_list name="bump_list"/>
-	  <string name="none_detected">
-			 No se han detectado
-	  </string>
-	  <string name="bump">
-			 [TIME]  [NAME] ha chocado contigo
-	  </string>
-	  <string name="llpushobject">
-			 [TIME]  [NAME] Te ha empujado con un script
-	  </string>
-	  <string name="selected_object_collide">
-			 [TIME]  [NAME] te ha golpeado con un objeto
-	  </string>
-	  <string name="scripted_object_collide">
-			 [TIME]  [NAME] te ha golpeado con un objeto con script
-	  </string>
-	  <string name="physical_object_collide">
-			 [TIME]  [NAME] te ha impactado con un objeto material
-	  </string>
+	<string name="none_detected">
+		No se han detectado
+	</string>
+	<string name="bump">
+		[TIME]  [NAME] ha chocado contigo
+	</string>
+	<string name="llpushobject">
+		[TIME]  [NAME] Te ha empujado con un script
+	</string>
+	<string name="selected_object_collide">
+		[TIME]  [NAME] te ha golpeado con un objeto
+	</string>
+	<string name="scripted_object_collide">
+		[TIME]  [NAME] te ha golpeado con un objeto con script
+	</string>
+	<string name="physical_object_collide">
+		[TIME]  [NAME] te ha impactado con un objeto material
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_contents.xml b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
index 970e367cf..79f81c2ab 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_contents.xml
@@ -1,25 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_buy_contents"  title="Comprar el Contenido">
-	  <text name="contains_text">
-			 [NAME] contiene:
-	  </text>
-	  <scroll_list name="item_list">
-			 <column name="icon"/>
-			 <column name="text"/>
-	  </scroll_list>
-	  <text name="buy_text">
-			 Comprar por [CURRENCY][AMOUNT] a [NAME]?
-	  </text>
-	  <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
-	  <button label="Comprar" label_selected="Comprar" name="buy_btn"/>
-	  <check_box label="Vestirse la ropa ahora" name="wear_check"/>
-	  <string name="no_copy_text">
-			 (no copiable)
-	  </string>
-	  <string name="no_modify_text">
-			 (no modificable)
-	  </string>
-	  <string name="no_transfer_text">
-			 (no transferible)
-	  </string>
+<floater name="floater_buy_contents" title="Comprar el Contenido">
+	<text name="contains_text">
+		[NAME] contiene:
+	</text>
+	<text name="buy_text">
+		Comprar por [CURRENCY][AMOUNT] a [NAME]?
+	</text>
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<button label="Comprar" label_selected="Comprar" name="buy_btn"/>
+	<check_box label="Vestirse la ropa ahora" name="wear_check"/>
+	<string name="no_copy_text">
+		(no copiable)
+	</string>
+	<string name="no_modify_text">
+		(no modificable)
+	</string>
+	<string name="no_transfer_text">
+		(no transferible)
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_currency.xml b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
index 33ba2dba6..d015b3dcc 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_currency.xml
@@ -1,70 +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="Comprar Dinero">
-	  <text name="info_buying">
-			 Comprando Dinero:
-	  </text>
-	  <text name="info_cannot_buy">
-			 No puedes comprar en este momento:
-	  </text>
-	  <text name="info_need_more">
-			 Necesitas más dinero:
-	  </text>
-	  <icon name="step_error"/>
-	  <text name="error_message" >
-			 Algo no va bien.
-	  </text>
-	  <button label="Ir al sitio web" name="error_web"/>
-	  <icon name="step_1"/>
-	  <text name="contacting">
-			 Contactando con LindeX...
-	  </text>
-	  <text name="buy_action_unknown">
-			 Comprar [CURRENCY] en el sistema LindeX de cambio
-	  </text>
-	  <text name="buy_action" >
-			 [NAME] [CURRENCY] [PRICE]
-	  </text>
-	  <text name="currency_action">
-			 Comprar [CURRENCY]
-	  </text>
-	  <line_editor name="currency_amt">
-			 1234
-	  </line_editor>
-	  <text name="currency_est">
-			  [CURRENCY] por aprox. US$ [USD]
-	  </text>
-	  <text name="getting_data">
-			 Obteniendo datos...
-	  </text>
-	  <text name="balance_label">
-			 Actualmente tienes
-	  </text>
-	  <text name="balance_amount">
-			 [CURRENCY] [AMT]
-	  </text>
-	  <text name="buying_label">
-			 Estás comprando
-	  </text>
-	  <text name="buying_amount">
-			 [CURRENCY] [AMT]
-	  </text>
-	  <text name="total_label">
-			 Tu saldo será de
-	  </text>
-	  <text name="total_amount">
-			 [CURRENCY] [AMT]
-	  </text>
-	  <text name="purchase_warning_repurchase">
-			 Confirmando esta compra sólo compras la moneda.
+	<text name="info_buying">
+		Comprando Dinero:
+	</text>
+	<text name="info_cannot_buy">
+		No puedes comprar en este momento:
+	</text>
+	<text name="info_need_more">
+		Necesitas más dinero:
+	</text>
+	<text name="error_message">
+		Algo no va bien.
+	</text>
+	<button label="Ir al sitio web" name="error_web"/>
+	<text name="contacting">
+		Contactando con LindeX...
+	</text>
+	<text name="buy_action_unknown">
+		Comprar [CURRENCY] en el sistema LindeX de cambio
+	</text>
+	<text name="buy_action">
+		[NAME] [CURRENCY] [PRICE]
+	</text>
+	<text name="currency_action">
+		Comprar [CURRENCY]
+	</text>
+	<line_editor name="currency_amt">
+		1234
+	</line_editor>
+	<text name="currency_est">
+		[CURRENCY] por aprox. US$ [USD]
+	</text>
+	<text name="getting_data">
+		Obteniendo datos...
+	</text>
+	<text name="balance_label">
+		Actualmente tienes
+	</text>
+	<text name="balance_amount">
+		[CURRENCY] [AMT]
+	</text>
+	<text name="buying_label">
+		Estás comprando
+	</text>
+	<text name="buying_amount">
+		[CURRENCY] [AMT]
+	</text>
+	<text name="total_label">
+		Tu saldo será de
+	</text>
+	<text name="total_amount">
+		[CURRENCY] [AMT]
+	</text>
+	<text name="purchase_warning_repurchase">
+		Confirmando esta compra sólo compras la moneda.
 Tendrá ques intentar de nuevo la operación.
-	  </text>
-	  <text name="purchase_warning_notenough">
-			 No estás comprando dinero suficiente.
+	</text>
+	<text name="purchase_warning_notenough">
+		No estás comprando dinero suficiente.
 Aumenta la cantidad a comprar.
-	  </text>
-	  <button label="Cancelar" name="cancel_btn"/>
-	  <button label="Comprar" name="buy_btn"/>
-	  <string name="buy_currency">
-			 Comprar [CURRENCY] [LINDENS] por aprox. US$ [USD]
-	  </string>
+	</text>
+	<button label="Cancelar" name="cancel_btn"/>
+	<button label="Comprar" name="buy_btn"/>
+	<string name="buy_currency">
+		Comprar [CURRENCY] [LINDENS] por aprox. US$ [USD]
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_land.xml b/indra/newview/skins/default/xui/es/floater_buy_land.xml
index b6da85409..96844f3f9 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_land.xml
@@ -1,256 +1,245 @@
-<?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ón:
-	  </text>
-	  <text name="region_name_text">
-			 (desconocida)
-	  </text>
-	  <text name="region_type_label">
-			 Tipo:
-	  </text>
-	  <text name="region_type_text">
-			 (desconocido)
-	  </text>
-	  <text name="estate_name_label">
-			 Estado:
-	  </text>
-	  <text name="estate_name_text">
-			 (desconocido)
-	  </text>
-	  <text name="estate_owner_label">
-			 Propietario del Estado:
-	  </text>
-	  <text name="estate_owner_text">
-			 (desconocido)
-	  </text>
-	  <text name="resellable_changeable_label">
-			 El Terreno comprado en esta región:
-	  </text>
-	  <text name="resellable_clause">
-			 Podrá o no revenderse.
-	  </text>
-	  <text name="changeable_clause">
-			 Podrá o no unirse o dividirse.
-	  </text>
-	  <text name="covenant_text">
-			 Debes aceptar el Contrato del Estado:
-	  </text>
-	  <text name="covenant_timestamp_text" />
-	  <text_editor name="covenant_editor">
-			 Cargando...
-	  </text_editor>
-	  <check_box label="Estoy de acuerdo con el contrato descrito arriba." name="agree_covenant"/>
-	  <texture_picker name="info_image"/>
-	  <text name="info_parcel_label">
-			 Parcela:
-	  </text>
-	  <text name="info_parcel">
-			 Scotopteryx 138,204
-	  </text>
-	  <text name="info_size_label">
-			 Superficie:
-	  </text>
-	  <text name="info_size">
-			 1024 sq.m.
-	  </text>
-	  <text name="info_price_label">
-			 Precio:
-	  </text>
-	  <text name="info_price">
-			 L$ 1500
-(L$ 1.1/m²)
+	<text name="region_name_label">
+		Región:
+	</text>
+	<text name="region_name_text">
+		(desconocida)
+	</text>
+	<text name="region_type_label">
+		Tipo:
+	</text>
+	<text name="region_type_text">
+		(desconocido)
+	</text>
+	<text name="estate_name_label">
+		Estado:
+	</text>
+	<text name="estate_name_text">
+		(desconocido)
+	</text>
+	<text name="estate_owner_label">
+		Propietario del Estado:
+	</text>
+	<text name="estate_owner_text">
+		(desconocido)
+	</text>
+	<text name="resellable_changeable_label">
+		El Terreno comprado en esta región:
+	</text>
+	<text name="resellable_clause">
+		Podrá o no revenderse.
+	</text>
+	<text name="changeable_clause">
+		Podrá o no unirse o dividirse.
+	</text>
+	<text name="covenant_text">
+		Debes aceptar el Contrato del Estado:
+	</text>
+	<text name="covenant_timestamp_text"/>
+	<text_editor name="covenant_editor">
+		Cargando...
+	</text_editor>
+	<check_box label="Estoy de acuerdo con el contrato descrito arriba." name="agree_covenant"/>
+	<text name="info_parcel_label">
+		Parcela:
+	</text>
+	<text name="info_parcel">
+		Scotopteryx 138,204
+	</text>
+	<text name="info_size_label">
+		Superficie:
+	</text>
+	<text name="info_size">
+		1024 m²
+	</text>
+	<text name="info_price_label">
+		Precio:
+	</text>
+	<text name="info_price">
+		[CURRENCY] 1500
+([CURRENCY] 1.1/m²)
 incluyendo los objetos
-	  </text>
-	  <text name="info_action">
-			 Al comprar este terreno:
-	  </text>
-	  <pad height="6" />
-	  <icon name="step_error"/>
-	  <text name="error_message">
-			 Algo no va bien.
-	  </text>
-	  <button label="Ir al sitio web" name="error_web"/>
-	  <pad height="-200" />
-	  <icon name="step_1"/>
-	  <text name="account_action">
-			 Actualiza a la categoría de Miembro Premium.
-	  </text>
-	  <text name="account_reason">
-			 Sólo pueden ser propietarios de terreno los miembros premium.
-	  </text>
-	  <combo_box name="account_level">
-			 <combo_item name="US$9.95/month,billedmonthly">
-					US$9.95/mes, facturados mensualmente
-			 </combo_item>
-			 <combo_item name="US$7.50/month,billedquarterly">
-					US$7.50/mes, facturados cuatrimestralmente
-			 </combo_item>
-			 <combo_item name="US$6.00/month,billedannually">
-					US$6.00/mes, facturados anualmente
-			 </combo_item>
-	  </combo_box>
-	  <pad height="10" />
-	  <icon name="step_2"/>
-	  <text name="land_use_action">
-			 Aumenta tu cuota mensual por uso de terreno a 40 US$/mes.
-	  </text>
-	  <text name="land_use_reason">
-			 Posees 1309 m². de terreno
-Esta parcela tiene 512 m²sq.m. de terreno.
-	  </text>
-	  <pad height="10" />
-	  <icon name="step_3"/>
-	  <text name="purchase_action">
-			 Pagar al Residente  Joe L$ 4000 por el terreno
-	  </text>
-	  <text name="currency_reason">
-			 Tienes L$ 2,100.
-	  </text>
-	  <text name="currency_action">
-			 Comprar más [CURRENCY]
-	  </text>
-	  <pad height="0" width="8" />
-	  <line_editor name="currency_amt">
-			 1000
-	  </line_editor>
-	  <pad height="0" width="8" />
-	  <text name="currency_est">
-			 por aprox. US$ [AMOUNT2]
-	  </text>
-	  <text name="currency_balance">
-			 Tienes L$ 2,100.
-	  </text>
-	  <check_box label="Quitar [AMOUNT] m² de la contribución del grupo" name="remove_contribution" />
-	  <button label="Comprar" name="buy_btn"/>
-	  <button label="Cancelar" name="cancel_btn"/>
-	  <string name="can_resell">
-			 Puede revenderse.
-	  </string>
-	  <string name="can_not_resell">
-			 No puede revenderse.
-	  </string>
-	  <string name="can_change">
-			 Puede unirse o dividirse.
-	  </string>
-	  <string name="can_not_change">
-			 No puede unirse ni dividirse.
-	  </string>
-	  <string name="cant_buy_for_group">
-			 No tienea permiso de comprar terreno para el grupo que tienes activado.	  
-	  </string>
-	  <string name="no_land_selected">
-			 No se ha seleccionado terreno.
-	  </string>
-	  <string name="multiple_parcels_selected">
-			 Se han seleccionado varias parcelas diferentes. 
+	</text>
+	<text name="info_action">
+		Al comprar este terreno:
+	</text>
+	<text name="error_message">
+		Algo no va bien.
+	</text>
+	<button label="Ir al sitio web" name="error_web"/>
+	<text name="account_action">
+		Actualiza a la categoría de Miembro Premium.
+	</text>
+	<text name="account_reason">
+		Sólo pueden ser propietarios de terreno los miembros premium.
+	</text>
+	<combo_box name="account_level">
+		<combo_item name="US$9.95/month,billedmonthly">
+			US$9.95/mes, facturados mensualmente
+		</combo_item>
+		<combo_item name="US$7.50/month,billedquarterly">
+			US$7.50/mes, facturados cuatrimestralmente
+		</combo_item>
+		<combo_item name="US$6.00/month,billedannually">
+			US$6.00/mes, facturados anualmente
+		</combo_item>
+	</combo_box>
+	<text name="land_use_action">
+		Aumenta tu cuota mensual por uso de terreno a 40 US$/mes.
+	</text>
+	<text name="land_use_reason">
+		Posees 1309 m² de terreno
+Esta parcela tiene 512 m² de terreno.
+	</text>
+	<text name="purchase_action">
+		Pagar al Residente Joe [CURRENCY] 4000 por el terreno
+	</text>
+	<text name="currency_reason">
+		Tienes [CURRENCY] 2,100.
+	</text>
+	<text name="currency_action">
+		Comprar más [CURRENCY]
+	</text>
+	<line_editor name="currency_amt">
+		1000
+	</line_editor>
+	<text name="currency_est">
+		por aprox. US$ [AMOUNT2]
+	</text>
+	<text name="currency_balance">
+		Tienes L$ 2,100.
+	</text>
+	<check_box label="Quitar [AMOUNT] m² de la contribución del grupo" name="remove_contribution"/>
+	<button label="Comprar" name="buy_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+	<string name="can_resell">
+		Puede revenderse.
+	</string>
+	<string name="can_not_resell">
+		No puede revenderse.
+	</string>
+	<string name="can_change">
+		Puede unirse o dividirse.
+	</string>
+	<string name="can_not_change">
+		No puede unirse ni dividirse.
+	</string>
+	<string name="cant_buy_for_group">
+		No tienea permiso de comprar terreno para el grupo que tienes activado.
+	</string>
+	<string name="no_land_selected">
+		No se ha seleccionado terreno.
+	</string>
+	<string name="multiple_parcels_selected">
+		Se han seleccionado varias parcelas diferentes.
 Inténtalo seleccionando un área más pequeña.
-	  </string>
-	  <string name="no_permission">
-			 No tienes permiso de comprar terreno para el grupo que tienes activado.
-	  </string>
-	  <string name="parcel_not_for_sale">
-			 La parcela seleccionada no está en venta.
-	  </string>
-	  <string name="group_already_owns">
-			 El grupo ya es propietario de la parcela.
-	  </string>
-	  <string name="you_already_own">
-			 Ya eres propietario de la parcela.
-	  </string>
-	  <string name="set_to_sell_to_other">
-			 La parcela seleccionada está marcada para ser vendida a otro
-	  </string>
-	  <string name="no_public_land">
-			 El área seleccionada no tiene terreno público.
-	  </string>
-	  <string name="not_owned_by_you">
-			 Se ha seleccionado terreno propiedad de otro. 
-Inténtlo seleccionando un área más pequeña.	  
-	  </string>
-	  <string name="processing">
-			 Procesando tu compra...
+	</string>
+	<string name="no_permission">
+		No tienes permiso de comprar terreno para el grupo que tienes activado.
+	</string>
+	<string name="parcel_not_for_sale">
+		La parcela seleccionada no está en venta.
+	</string>
+	<string name="group_already_owns">
+		El grupo ya es propietario de la parcela.
+	</string>
+	<string name="you_already_own">
+		Ya eres propietario de la parcela.
+	</string>
+	<string name="set_to_sell_to_other">
+		La parcela seleccionada está marcada para ser vendida a otro
+	</string>
+	<string name="no_public_land">
+		l área seleccionada no tiene terreno público.
+	</string>
+	<string name="not_owned_by_you">
+		Se ha seleccionado terreno propiedad de otro.
+Inténtlo seleccionando un área más pequeña.
+	</string>
+	<string name="processing">
+		Procesando tu compra...
  
-(Tomará uno o dos minutos).)
-	  </string>
-	  <string name="fetching_error">
-			 Se ha producido un error al ir a buscar la información de compra de terreno.
-	  </string>
-	  <string name="buying_will">
-			 Al comprar este terreno:
-	  </string>
-	  <string name="buying_for_group">
-			 Comprando terreno para el grupo:
-	  </string>
-	  <string name="cannot_buy_now">
-			 No se puede comprar ahora:
-	  </string>
-	  <string name="not_for_sale">
-			 No está en venta:
-	  </string>
-	  <string name="none_needed">
-			 no necesita
-	  </string>
-	  <string name="must_upgrade">
-			 Para poseer terreno, tu cuenta debe ascender de categoría.
-	  </string>
-	  <string name="cant_own_land">
-			 Tu cuenta puede poseer terreno.
-	  </string>
-	  <string name="land_holdings">
-			 Tienes [BUYER] m² de terreno.
-	  </string>
-	  <string name="pay_to_for_land">
-			 Pagar [CURRENCY] [AMOUNT] a [SELLER] por este terreno
-	  </string>
-	  <string name="buy_for_US">
-			 Comprar [CURRENCY] [AMOUNT] por aprox. US$ [AMOUNT2],
-	  </string>
-	  <string name="parcel_meters">
-			 Esta parcela tiene [AMOUNT] m².	  
-	  </string>
-	  <string name="premium_land">
-			 Este terreno es premium, y se contará como de [AMOUNT] m².
-	  </string>
-	  <string name="discounted_land">
-			 Este terreno tiene descuento, y se contará como de [AMOUNT] m².
-	  </string>
-	  <string name="meters_supports_object">
-			 [AMOUNT] m².
+(Tomará uno o dos minutos.)
+	</string>
+	<string name="fetching_error">
+		Se ha producido un error al ir a buscar la información de compra de terreno.
+	</string>
+	<string name="buying_will">
+		Al comprar este terreno:
+	</string>
+	<string name="buying_for_group">
+		Comprando terreno para el grupo:
+	</string>
+	<string name="cannot_buy_now">
+		No se puede comprar ahora:
+	</string>
+	<string name="not_for_sale">
+		No está en venta:
+	</string>
+	<string name="none_needed">
+		no necesita
+	</string>
+	<string name="must_upgrade">
+		Para poseer terreno, tu cuenta debe ascender de categoría.
+	</string>
+	<string name="cant_own_land">
+		Tu cuenta puede poseer terreno.
+	</string>
+	<string name="land_holdings">
+		Tienes [BUYER] m² de terreno.
+	</string>
+	<string name="pay_to_for_land">
+		Pagar [CURRENCY] [AMOUNT] a [SELLER] por este terreno
+	</string>
+	<string name="buy_for_US">
+		Comprar [CURRENCY] [AMOUNT] por aprox. US$ [AMOUNT2],
+	</string>
+	<string name="parcel_meters">
+		Esta parcela tiene [AMOUNT] m².
+	</string>
+	<string name="premium_land">
+		Este terreno es premium, y se contará como de [AMOUNT] m².
+	</string>
+	<string name="discounted_land">
+		Este terreno tiene descuento, y se contará como de [AMOUNT] m².
+	</string>
+	<string name="meters_supports_object">
+		[AMOUNT] m².
 admite [AMOUNT2] objetos
-	  </string>
-	  <string name="sold_with_objects">
-			 vendido con los objetos
-	  </string>
-	  <string name="sold_without_objects">
-			 objetos no incluidos
-	  </string>
-	  <string name="info_price_string">
-			 [CURRENCY] [PRICE]
-([CURRENCY] [PRICE_PER_SQM]/m².)
+	</string>
+	<string name="sold_with_objects">
+		vendido con los objetos
+	</string>
+	<string name="sold_without_objects">
+		objetos no incluidos
+	</string>
+	<string name="info_price_string">
+		[CURRENCY] [PRICE]
+([CURRENCY] [PRICE_PER_SQM]/m²)
 [SOLD_WITH_OBJECTS]
-	  </string>
-	  <string name="insufficient_land_credits">
+	</string>
+	<string name="insufficient_land_credits">
 		Antes de que se complete la compra, el grupo [GROUP] necesitará
 los suficientes créditos de uso en contribución de terreno
 para cubrir esta parcela.
-	  </string>
-	  <string name="have_enough_lindens">
-			 Tienes [CURRENCY] [AMOUNT], que es suficiente para comprar este terreno
-	  </string>
-	  <string name="not_enough_lindens">
-			 Sólo tienes [CURRENCY] [AMOUNT], y necesitas [CURRENCY] [AMOUNT2] más.
-	  </string>
-	  <string name="balance_left">
-			 Luego de la compra, te quedarán [CURRENCY] [AMOUNT] en tu cuenta.
-	  </string>
-	  <string name="balance_needed">
-			 Deberás comprar, al menos, [CURRENCY] [AMOUNT] para costearte este terreno.
-	  </string>
-	  <string name="no_parcel_selected">
-			 (No se ha seleccionado una parcela)
-	  </string>
-	  <string name="buy_currency">
-			 Comprar [CURRENCY] [LINDENS] por aprox. US$ [USD]
-	  </string>
+	</string>
+	<string name="have_enough_lindens">
+		Tienes [CURRENCY] [AMOUNT], que es suficiente para comprar este terreno
+	</string>
+	<string name="not_enough_lindens">
+		Sólo tienes [CURRENCY] [AMOUNT], y necesitas [CURRENCY] [AMOUNT2] más.
+	</string>
+	<string name="balance_left">
+		Luego de la compra, te quedarán [CURRENCY] [AMOUNT] en tu cuenta.
+	</string>
+	<string name="balance_needed">
+		Deberás comprar, al menos, [CURRENCY] [AMOUNT] para costearte este terreno.
+	</string>
+	<string name="no_parcel_selected">
+		(No se ha seleccionado una parcela)
+	</string>
+	<string name="buy_currency">
+		Comprar [CURRENCY] [LINDENS] por aprox. US$ [USD]
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_buy_object.xml b/indra/newview/skins/default/xui/es/floater_buy_object.xml
index c19c5554a..6fd766cf0 100644
--- a/indra/newview/skins/default/xui/es/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/es/floater_buy_object.xml
@@ -1,34 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="contents" title="Comprar una copia del Objeto">
-	  <scroll_list name="object_list">
-			 <column name="icon"/>
-			 <column name="text"/>
-	  </scroll_list>
-	  <text name="contents_text">
-			 y su contenido:
-	  </text>
-	  <scroll_list name="item_list">
-			 <column name="icon"/>
-			 <column name="text"/>
-	  </scroll_list>
-	  <text name="buy_text">
-			 Comprar por [CURRENCY] [AMOUNT] a [NAME]?
-	  </text>
-	  <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 una copia de
-	  </string>
-	  <string name="no_copy_text">
-			 (no copiable)
-	  </string>
-	  <string name="no_modify_text">
-			 (no modificable)
-	  </string>
-	  <string name="no_transfer_text">
-			 (no transferible)
-	  </string>
+	<text name="contents_text">
+		y su contenido:
+	</text>
+	<text name="buy_text">
+		Comprar por [CURRENCY] [AMOUNT] a [NAME]?
+	</text>
+	<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 una copia de
+	</string>
+	<string name="no_copy_text">
+		(no copiable)
+	</string>
+	<string name="no_modify_text">
+		(no modificable)
+	</string>
+	<string name="no_transfer_text">
+		(no transferible)
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_camera.xml b/indra/newview/skins/default/xui/es/floater_camera.xml
index 6eb608111..f05a510fc 100644
--- a/indra/newview/skins/default/xui/es/floater_camera.xml
+++ b/indra/newview/skins/default/xui/es/floater_camera.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="move floater" title="">
-	  <!-- Icons are custom buttons in the code -->
-	  <string name="rotate_tooltip">
-			 Girar la cámara alrededor de lo enfocado
-	  </string>
-	  <string name="zoom_tooltip">
-			 Hacer zoom con la cámara en lo enfocado
-	  </string>
-	  <string name="move_tooltip">
-			 Mover la cámara arriba y abajo, izquierda y derecha.
-	  </string>
+<floater name="move floater">
+	<string name="rotate_tooltip">
+		Girar la cámara alrededor de lo enfocado
+	</string>
+	<string name="zoom_tooltip">
+		Hacer zoom con la cámara en lo enfocado
+	</string>
+	<string name="move_tooltip">
+		Mover la cámara arriba y abajo, izquierda y derecha.
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_chat_history.xml b/indra/newview/skins/default/xui/es/floater_chat_history.xml
index 5548839b4..06f4c9207 100644
--- a/indra/newview/skins/default/xui/es/floater_chat_history.xml
+++ b/indra/newview/skins/default/xui/es/floater_chat_history.xml
@@ -1,96 +1,92 @@
-<?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">
-			 Conectando al Chat de Voz...
-	  </string>
-	  <string name="connected">
-			 Conectado
-		</string>
-	  <string name="unavailable">
-			 La Voz no está disponible en su ubicación actual
-	  </string>
-	  <string name="hang_up">
-			 Desconectado del Chat de Voz
-	  </string>
-	  <string name="voice_icon">
-			 icn_voice-localchat.tga
-	  </string>
-	  <string name="IM_logging_string">
-			 -- Registro de Mensajes Instantáneos activado --
-	  </string>
-	  <string name="IM_end_log_string">
-			 -- Fin del Registro --
-	  </string>
-	  <string name="ScriptQuestionCautionChatGranted">
-			 el objeto '[OBJECTNAME]', propiedad de  '[OWNERNAME]', ubicado en [REGIONNAME] en la posición [REGIONPOS], ha recibido permiso para: [PERMISSIONS].
-	  </string>
-	  <string name="ScriptQuestionCautionChatDenied">
-			 al objeto '[OBJECTNAME]', propiedad de  '[OWNERNAME]', ubicado en [REGIONNAME] en la posición [REGIONPOS], se le ha denegado el permiso para: [PERMISSIONS].
-	  </string>
-	  <string name="ScriptTakeMoney">
-			 Transferir  ([CURRENCY]) de tu cuenta
-	  </string>
-	  <string name="ActOnControlInputs">
-			 Actuar en tus controles de entrada
-	  </string>
-	  <string name="RemapControlInputs">
-			 Reconfigurar tus controles de entrada
-	  </string>
-	  <string name="AnimateYourAvatar">
-			 Animar tu avatar
-	  </string>
-	  <string name="AttachToYourAvatar">
-			 Anexarse a tu avatar
-	  </string>
-	  <string name="ReleaseOwnership">
-			 Anular propiedad y pasar a ser público
-	  </string>
-	  <string name="LinkAndDelink">
-			 Enlazar y desenlazar de otros objetos
-	  </string>
-	  <string name="AddAndRemoveJoints">
-			 Añadir y quitar uniones con otros objetos
-	  </string>
-	  <string name="ChangePermissions">
-			 Cambiar sus permisos
-	  </string>
-	  <string name="TrackYourCamera">
-			 Seguir tu cámara
-	  </string>
-	  <string name="ControlYourCamera">
-			 Controlar tu cámara
-	  </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 Ignorado" name="show mutes"/>
-					<!--check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Translate Chat (powered by Google)" name="translate chat" width="100"/-->
-					<button label="Abrir Historial" name="chat_history_open" tool_tip="Pulsá aquí para abrir el historial de chat en un editor externo." left_delta="150" />
-					<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Pulsa aqui para ver la lista de los participantes en esta sesión de MI"/>
-					<text_editor name="Chat History Editor" />
-					<text_editor name="Chat History Editor with mute" />
-					<panel name="chat_panel">
-						  <string name="gesture_label">
-								 Gestos
-						  </string>
-						  <line_editor label="Pulsa aquí para escribir en el chat." name="Chat Editor" />
-						  <flyout_button label="Decir" name="Say" tool_tip="(Intro)" left="-62" width="68">
-								 <flyout_button_item name="shout_item">
-										Gritar
-								 </flyout_button_item>
-								 <flyout_button_item name="say_item">
-										Decir
-								 </flyout_button_item>
-								 <flyout_button_item name="whisper_item">
-										Susurrar
-								 </flyout_button_item>
-						  </flyout_button>
-					</panel>
-			 </layout_panel>
-			 <layout_panel name="active_speakers_panel" />
-	  </layout_stack>
+	<string name="ringing">
+		Conectando al Chat de Voz...
+	</string>
+	<string name="connected">
+		Conectado
+	</string>
+	<string name="unavailable">
+		La Voz no está disponible en su ubicación actual
+	</string>
+	<string name="hang_up">
+		Desconectado del Chat de Voz
+	</string>
+	<string name="voice_icon">
+		icn_voice-localchat.tga
+	</string>
+	<string name="IM_logging_string">
+		-- Registro de Mensajes Instantáneos activado --
+	</string>
+	<string name="IM_end_log_string">
+		-- Fin del Registro --
+	</string>
+	<string name="ScriptQuestionCautionChatGranted">
+		el objeto '[OBJECTNAME]', propiedad de  '[OWNERNAME]', ubicado en [REGIONNAME] en la posición [REGIONPOS], ha recibido permiso para: [PERMISSIONS].
+	</string>
+	<string name="ScriptQuestionCautionChatDenied">
+		al objeto '[OBJECTNAME]', propiedad de  '[OWNERNAME]', ubicado en [REGIONNAME] en la posición [REGIONPOS], se le ha denegado el permiso para: [PERMISSIONS].
+	</string>
+	<string name="ScriptTakeMoney">
+		Transferir ([CURRENCY]) de tu cuenta
+	</string>
+	<string name="ActOnControlInputs">
+		Actuar en tus controles de entrada
+	</string>
+	<string name="RemapControlInputs">
+		Reconfigurar tus controles de entrada
+	</string>
+	<string name="AnimateYourAvatar">
+		Animar tu avatar
+	</string>
+	<string name="AttachToYourAvatar">
+		Anexarse a tu avatar
+	</string>
+	<string name="ReleaseOwnership">
+		Anular propiedad y pasar a ser público
+	</string>
+	<string name="LinkAndDelink">
+		Enlazar y desenlazar de otros objetos
+	</string>
+	<string name="AddAndRemoveJoints">
+		Añadir y quitar uniones con otros objetos
+	</string>
+	<string name="ChangePermissions">
+		Cambiar sus permisos
+	</string>
+	<string name="TrackYourCamera">
+		Seguir tu cámara
+	</string>
+	<string name="ControlYourCamera">
+		Controlar tu cámara
+	</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 Ignorado" name="show mutes"/>
+			<button label="Abrir Historial" name="chat_history_open" tool_tip="Pulsá aquí para abrir el historial de chat en un editor externo." left_delta="150"/>
+			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Pulsa aqui para ver la lista de los participantes en esta sesión de MI"/>
+			<panel name="chat_panel">
+				<string name="gesture_label">
+					Gestos
+				</string>
+				<line_editor label="Pulsa aquí para escribir en el chat." name="Chat Editor"/>
+				<flyout_button label="Decir" name="Say" tool_tip="(Intro)" left="-62" width="68">
+					<flyout_button_item name="shout_item">
+						Gritar
+					</flyout_button_item>
+					<flyout_button_item name="say_item">
+						Decir
+					</flyout_button_item>
+					<flyout_button_item name="whisper_item">
+						Susurrar
+					</flyout_button_item>
+				</flyout_button>
+			</panel>
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_chatterbox.xml b/indra/newview/skins/default/xui/es/floater_chatterbox.xml
index f9ace1d79..6122650df 100644
--- a/indra/newview/skins/default/xui/es/floater_chatterbox.xml
+++ b/indra/newview/skins/default/xui/es/floater_chatterbox.xml
@@ -1,8 +1,3 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater name="floater_chatterbox" title="Comunicarse">
-	  <icon name="chatterbox_tab_container"></icon>
-	  <tab_container name="chatterbox_tabs_horiz" />
-	  <!--<tab_container bottom="2" follows="left|right|top|bottom" height="370" left="0"
-			 name="chatterbox_tabs_vert" tab_position="left" tab_width="110" width="395" />-->
-</multi_floater>
-
+</multi_floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_choose_group.xml b/indra/newview/skins/default/xui/es/floater_choose_group.xml
index 6d21315e2..3747695d2 100644
--- a/indra/newview/skins/default/xui/es/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/es/floater_choose_group.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="groups" title="Grupos">
-	  <text name="groupdesc">
-			 Elegir un Grupo:
-	  </text>
-	  <scroll_list name="group list">
-			 <column name="name"/>
-	  </scroll_list>
-	  <button label="OK" label_selected="OK" name="OK"/>
-	  <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
-	  <string name="none">
-			 ninguno
-	  </string>
+	<text name="groupdesc">
+		Elegir un Grupo:
+	</text>
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<string name="none">
+		ninguno
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_color_picker.xml b/indra/newview/skins/default/xui/es/floater_color_picker.xml
index 208d0fbf1..ce5c1d5ea 100644
--- a/indra/newview/skins/default/xui/es/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/es/floater_color_picker.xml
@@ -1,41 +1,34 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="ColorPicker" title="Paleta de Colores">
-	  <text name="r_val_text">
-			 Rojo:
-	  </text>
-	  <spinner name="rspin"/>
-	  <text name="g_val_text">
-			 Verde:
-	  </text>
-	  <spinner name="gspin"/>
-	  <text name="b_val_text">
-			 Azul:
-	  </text>
-	  <spinner name="bspin"/>
-	  <text name="h_val_text">
-			 Tono:
-	  </text>
-	  <spinner name="hspin"/>
-	  <text name="s_val_text">
-			 Sat:
-	  </text>
-	  <spinner name="sspin"/>
-	  <text name="l_val_text">
-			 Lum:
-	  </text>
-	  <spinner name="lspin"/>
-	  <check_box label="Aplicar ahora mismo" name="apply_immediate"/>
-	  <button label="" label_selected="" name="color_pipette"/>
-	  <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
-	  <button label="Elegir" label_selected="Elegir" name="select_btn"/>
-	  <text name="Hex Value:">
-			 Hex:
-	  </text>
-	  <line_editor tool_tip="" name="hexval"/>
-	  <text name="Current color:">
-			 Color Actual:
-	  </text>
-	  <text name="(Drag below to save.)">
-			 Arrástralo abajo para guardarlo
-	  </text>
+	<text name="r_val_text">
+		Rojo:
+	</text>
+	<text name="g_val_text">
+		Verde:
+	</text>
+	<text name="b_val_text">
+		Azul:
+	</text>
+	<text name="h_val_text">
+		Tono:
+	</text>
+	<text name="s_val_text">
+		Sat:
+	</text>
+	<text name="l_val_text">
+		Lum:
+	</text>
+	<check_box label="Aplicar ahora mismo" name="apply_immediate"/>
+	<button label="" label_selected="" name="color_pipette"/>
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<button label="Elegir" label_selected="Elegir" name="select_btn"/>
+	<text name="Hex Value:">
+		Hex:
+	</text>
+	<text name="Current color:">
+		Color Actual:
+	</text>
+	<text name="(Drag below to save.)">
+		Arrástralo abajo para guardarlo
+	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_critical.xml b/indra/newview/skins/default/xui/es/floater_critical.xml
index 98d0058fd..da5c55aa4 100644
--- a/indra/newview/skins/default/xui/es/floater_critical.xml
+++ b/indra/newview/skins/default/xui/es/floater_critical.xml
@@ -1,13 +1,11 @@
 <?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"/>
-	  <!-- No title text here because our "critical message" is usually the
-			 community standards. JC -->
-	  <text name="tos_heading">
-			 Por favor, lee cuidadosamente el siguiente mensaje.
-	  </text>
-	  <text_editor name="tos_text">
-			 TOS_TEXT
-	  </text_editor>
+	<button label="Continuar" label_selected="Continuar" name="Continue"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<text name="tos_heading">
+		Por favor, lee cuidadosamente el siguiente mensaje.
+	</text>
+	<text_editor name="tos_text">
+		TOS_TEXT
+	</text_editor>
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_customize.xml b/indra/newview/skins/default/xui/es/floater_customize.xml
index fd63d9856..1debf115b 100644
--- a/indra/newview/skins/default/xui/es/floater_customize.xml
+++ b/indra/newview/skins/default/xui/es/floater_customize.xml
@@ -1,657 +1,616 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater customize" title="Apariencia">
-	  <tab_container name="customize tab container">
-			 <panel label="Partes del Cuerpo" name="body_parts_placeholder" />
-			 <panel label="Forma" name="Shape">
-					<icon name="square"/>
-					<icon name="icon"/>
-					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
-					<button label="Cuerpo" label_selected="Cuerpo" name="Body"/>
-					<button label="Cabeza" label_selected="Cabeza" name="Head"/>
-					<button label="Ojos" label_selected="Ojos" name="Eyes"/>
-					<button label="Orejas" label_selected="Orejas" name="Ears"/>
-					<button label="Nariz" label_selected="Nariz" name="Nose"/>
-					<button label="Boca" label_selected="Boca" name="Mouth"/>
-					<button label="Barbilla" label_selected="Barbilla" name="Chin"/>
-					<button label="Torso" label_selected="Torso" name="Torso"/>
-					<button label="Piernas" label_selected="Piernas" name="Legs"/>
-					<radio_group name="sex radio">
-						  <radio_item name="radio">
-								 Mujer
-						  </radio_item>
-						  <radio_item name="radio2">
-								 Varón
-						  </radio_item>
-					</radio_group>
-					<text name="title">
-						  [DESC]
-					</text>
-					<text name="title_no_modify">
-						  [DESC]: no modificable
-					</text>
-					<text name="title_loading">
-						  [DESC]: cargando...
-					</text>
-					<text name="title_not_worn">
-						  [DESC]: no llevas
-					</text>
-					<text name="path">
-						  Situada en [PATH]
-					</text>
-					<text name="not worn instructions">
-						  Ponte una forma nueva arrastrando una desde tu 
+	<tab_container name="customize tab container">
+		<panel label="Partes del Cuerpo" name="body_parts_placeholder"/>
+		<panel label="Forma" name="Shape">
+			<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+			<button label="Cuerpo" label_selected="Cuerpo" name="Body"/>
+			<button label="Cabeza" label_selected="Cabeza" name="Head"/>
+			<button label="Ojos" label_selected="Ojos" name="Eyes"/>
+			<button label="Orejas" label_selected="Orejas" name="Ears"/>
+			<button label="Nariz" label_selected="Nariz" name="Nose"/>
+			<button label="Boca" label_selected="Boca" name="Mouth"/>
+			<button label="Barbilla" label_selected="Barbilla" name="Chin"/>
+			<button label="Torso" label_selected="Torso" name="Torso"/>
+			<button label="Piernas" label_selected="Piernas" name="Legs"/>
+			<radio_group name="sex radio">
+				<radio_item name="radio">
+					Mujer
+				</radio_item>
+				<radio_item name="radio2">
+					Varón
+				</radio_item>
+			</radio_group>
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: no modificable
+			</text>
+			<text name="title_loading">
+				[DESC]: cargando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: no llevas
+			</text>
+			<text name="path">
+				Situada en [PATH]
+			</text>
+			<text name="not worn instructions">
+				Ponte una forma nueva arrastrando una desde tu 
 inventario hasta tu avatar. O comienza de cero creando 
 una nueva y vistiéndotela.
-					</text>
-					<text name="no modify instructions">
-						  No tienes permiso para modificar este ítem.
-					</text>
-					<text name="Item Action Label">
-						  Forma:
-					</text>
-					<button label="Crear una Nueva Forma" label_selected="Crear una Nueva Forma" name="Create New"/>
-					<text name="avatar_height_label">
-						  Altura:
-					</text>
-					<text name="avheight">
-						  [AVHEIGHT]
-					</text>
-					<text name="includes_shoes">
-						  (zapatos incluidos)
-					</text>
-					<button label="Guardar" label_selected="Guardar" name="Save"/>
-					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
-			 </panel>
-			 <panel label="Piel" name="Skin">
-					<icon name="square"/>
-					<icon name="icon"/>
-					<button label="Color de Piel" label_selected="Color de Piel" name="Skin Color"/>
-					<button label="Detalles Faciales" label_selected="Detalles Faciales" name="Face Detail"/>
-					<button label="Maquillaje" label_selected="Maquillaje" name="Makeup"/>
-					<button label="Detalles del Cuerpo" label_selected="Detalles del Cuerpo" name="Body Detail"/>
-					<text name="title">
-						  [DESC]
-					</text>
-					<text name="title_no_modify">
-						  [DESC]: no modificable
-					</text>
-					<text name="title_loading">
-						  [DESC]: cargando...
-					</text>
-					<text name="title_not_worn">
-						  [DESC]: no llevas
-					</text>
-					<text name="path">
-						  Situada en [PATH]
-					</text>
-					<text name="not worn instructions">
-						  Ponte una piel nueva arrastrando una desde tu 
+			</text>
+			<text name="no modify instructions">
+				No tienes permiso para modificar este ítem.
+			</text>
+			<text name="Item Action Label">
+				Forma:
+			</text>
+			<button label="Crear una Nueva Forma" label_selected="Crear una Nueva Forma" name="Create New"/>
+			<button label="Guardar" label_selected="Guardar" name="Save"/>
+			<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+		</panel>
+		<panel label="Piel" name="Skin">
+			<button label="Color de Piel" label_selected="Color de Piel" name="Skin Color"/>
+			<button label="Detalles Faciales" label_selected="Detalles Faciales" name="Face Detail"/>
+			<button label="Maquillaje" label_selected="Maquillaje" name="Makeup"/>
+			<button label="Detalles del Cuerpo" label_selected="Detalles del Cuerpo" name="Body Detail"/>
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: no modificable
+			</text>
+			<text name="title_loading">
+				[DESC]: cargando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: no llevas
+			</text>
+			<text name="path">
+				Situada en [PATH]
+			</text>
+			<text name="not worn instructions">
+				Ponte una piel nueva arrastrando una desde tu 
 inventario hasta tu avatar. O comienza de cero creando 
-una nueva y vistiéndotela.      
-					</text>
-					<text name="no modify instructions">
-						  No tienes permiso para modificar este item.
-					</text>
-					<text name="Item Action Label">
-						  Piel:
-					</text>
-					<texture_picker label="Tatuaje: Cabeza" name="Head Tattoos" tool_tip="Pulsa para elegir una imagen" />
-					<texture_picker label="Tatuaje: Superior" name="Upper Tattoos" tool_tip="Pulsa para elegir una imagen" />
-					<texture_picker label="Tatuaje: Inferior" name="Lower Tattoos" tool_tip="Pulsa para elegir una imagen"/>
-					<button label="Crear una Nueva Piel" label_selected="Crear una Nueva Piel" name="Create New"/>
-					<button label="Guardar" label_selected="Guardar" name="Save"/>
-					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
-					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
-			 </panel>
-			 <panel label="Pelo" name="Hair">
-					<icon name="square"/>
-					<icon name="icon"/>
-					<button label="Color" label_selected="Color" name="Color"/>
-					<button label="Peinado" label_selected="Peinado" name="Style"/>
-					<button label="Cejas" label_selected="Cejas" name="Eyebrows"/>
-					<button label="Facial" label_selected="Facial" name="Facial"/>
-					<text name="title">
-						  [DESC]
-					</text>
-					<text name="title_no_modify">
-						  [DESC]: no modificable
-					</text>
-					<text name="title_loading">
-						  [DESC]: cargando...
-					</text>
-					<text name="title_not_worn">
-						  [DESC]: no llevas
-					</text>
-					<text name="path">
-						  Situado en [PATH]
-					</text>
-					<text name="not worn instructions">
-						  Ponte un pelo nuevo arrastrando uno desde tu 
+una nueva y vistiéndotela.
+			</text>
+			<text name="no modify instructions">
+				No tienes permiso para modificar este item.
+			</text>
+			<text name="Item Action Label">
+				Piel:
+			</text>
+			<texture_picker label="Tatuaje: Cabeza" name="Head Tattoos" tool_tip="Pulsa para elegir una imagen" />
+			<texture_picker label="Tatuaje: Superior" name="Upper Tattoos" tool_tip="Pulsa para elegir una imagen" />
+			<texture_picker label="Tatuaje: Inferior" name="Lower Tattoos" tool_tip="Pulsa para elegir una imagen"/>
+			<button label="Crear una Nueva Piel" label_selected="Crear una Nueva Piel" name="Create New"/>
+			<button label="Guardar" label_selected="Guardar" name="Save"/>
+			<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+			<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+		</panel>
+		<panel label="Pelo" name="Hair">
+			<button label="Color" label_selected="Color" name="Color"/>
+			<button label="Peinado" label_selected="Peinado" name="Style"/>
+			<button label="Cejas" label_selected="Cejas" name="Eyebrows"/>
+			<button label="Facial" label_selected="Facial" name="Facial"/>
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: no modificable
+			</text>
+			<text name="title_loading">
+				[DESC]: cargando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: no llevas
+			</text>
+			<text name="path">
+				Situado en [PATH]
+			</text>
+			<text name="not worn instructions">
+				Ponte un pelo nuevo arrastrando uno desde tu 
 inventario hasta tu avatar. O comienza de cero creando 
 uno nuevo y vistiéndotelo.
-					</text>
-					<text name="no modify instructions">
-						  No tienes permiso para modificar este item.
-					</text>
-					<text name="Item Action Label">
-						  Pelo:
-					</text>
-					<texture_picker label="Textura" name="Texture" tool_tip="Pulsa para elegir una imagen"/>
-					<button label="Crear un Pelo Nuevo" label_selected="Crear un Pelo Nuevo" name="Create New"/>
-					<button label="Guardar" label_selected="Guardar" name="Save"/>
-					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
-					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
-			 </panel>
-			 <panel label="Ojos" name="Eyes">
-					<icon name="square"/>
-					<icon name="icon"/>
-					<text name="title">
-						  [DESC]
-					</text>
-					<text name="title_no_modify">
-						  [DESC]: no modificable
-					</text>
-					<text name="title_loading">
-						  [DESC]: cargando...
-					</text>
-					<text name="title_not_worn">
-						  [DESC]: no llevas
-					</text>
-					<text name="path">
-						  Situados en [PATH]
-					</text>
-					<text name="not worn instructions">
-						  Ponte ojos nuevos arrastrando uno desde tu 
+			</text>
+			<text name="no modify instructions">
+				No tienes permiso para modificar este item.
+			</text>
+			<text name="Item Action Label">
+				Pelo:
+			</text>
+			<texture_picker label="Textura" name="Texture" tool_tip="Pulsa para elegir una imagen"/>
+			<button label="Crear un Pelo Nuevo" label_selected="Crear un Pelo Nuevo" name="Create New"/>
+			<button label="Guardar" label_selected="Guardar" name="Save"/>
+			<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+			<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+		</panel>
+		<panel label="Ojos" name="Eyes">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: no modificable
+			</text>
+			<text name="title_loading">
+				[DESC]: cargando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: no llevas
+			</text>
+			<text name="path">
+				Situados en [PATH]
+			</text>
+			<text name="not worn instructions">
+				Ponte ojos nuevos arrastrando uno desde tu 
 inventario hasta tu avatar. O comienza de cero creando 
-uno nuevo y vistiéndotelo.					
-					</text>
-					<text name="no modify instructions">
-						  No tienes permiso para modificar este item.
-					</text>
-					<text name="Item Action Label">
-						  Ojos:
-					</text>
-					<texture_picker label="Iris" name="Iris" tool_tip="Pulsa para elegir una imagen"/>
-					<button label="Crear Ojos Nuevos" label_selected="Crear Ojos Nuevos" name="Create New"/>
-					<button label="Guardar" label_selected="Guardar" name="Save"/>
-					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
-					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
-			 </panel>
-			 <panel label="Ropa" name="clothes_placeholder" />
-			 <panel label="Camisa" name="Shirt">
-					<icon name="square"/>
-					<icon name="icon"/>
-					<texture_picker label="Tela" name="Tela" tool_tip="Pulsa para elegir una imagen"/>
-					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/>
-					<button label="Crear una Camisa Nuevo" label_selected="Crear una Camisa Nuevo" name="Create New"/>
-					<button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
-					<button label="Guardar" label_selected="Guardar" name="Save"/>
-					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
-					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
-					<text name="title">
-						  [DESC]
-					</text>
-					<text name="title_no_modify">
-						  [DESC]: no modificable
-					</text>
-					<text name="title_loading">
-						  [DESC]: cargando...
-					</text>
-					<text name="title_not_worn">
-						  [DESC]: no llevas
-					</text>
-					<text name="path">
-						  Situada en [PATH]
-					</text>
-					<text name="not worn instructions">
-						  Ponte una camisa nueva arrastrando una desde tu 
-inventario hasta tu avatar. O comienza de cero creando 
-una nueva y vistiéndotela.					
-					</text>
-					<text name="no modify instructions">
-						  No tienes permiso para modificar este item.
-					</text>
-					<text name="Item Action Label">
-						  Camisa:
-					</text>
-			 </panel>
-			 <panel label="Pantalones" name="Pants">
-					<icon name="square"/>
-					<icon name="icon"/>
-					<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/>
-					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
-					<button label="Crear un Nuevo Pantalón" label_selected="Crear un Nuevo Pantalón" name="Create New"/>
-					<button label="Quitarlo" label_selected="Quitarlo" name="Take Off"/>
-					<button label="Guardar" label_selected="Guardar" name="Save"/>
-					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
-					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
-					<text name="title">
-						  [DESC]
-					</text>
-					<text name="title_no_modify">
-						  [DESC]: no modificable
-					</text>
-					<text name="title_loading">
-						  [DESC]: cargando...
-					</text>
-					<text name="title_not_worn">
-						  [DESC]: no llevas
-					</text>
-					<text name="path">
-						  Situado en [PATH]
-					</text>
-					<text name="not worn instructions">
-						  Ponte un pantalón nuevo arrastrando uno desde tu 
-inventario hasta tu avatar. O comienza de cero creando 
-uno nuevo y vistiéndotelo.					
-					</text>
-					<text name="no modify instructions">
-						  No tienes permiso para modificar este iem.
-					</text>
-					<text name="Item Action Label">
-						  Pantalones:
-					</text>
-			 </panel>
-			 <panel label="Zapatos" name="Shoes">
-					<icon name="square"/>
-					<icon name="icon"/>
-					<text name="title">
-						  [DESC]
-					</text>
-					<text name="title_no_modify">
-						  [DESC]: no modificable
-					</text>
-					<text name="title_loading">
-						  [DESC]: cargando...
-					</text>
-					<text name="title_not_worn">
-						  [DESC]: no llevas
-					</text>
-					<text name="path">
-						  Situados en [PATH]
-					</text>
-					<text name="not worn instructions">
-						  Ponte nuevos zapatos arrastrándolos desde tu 
-inventario hasta tu avatar. O comienza de cero creando 
-un par nuevo y vistiéndotelo.					
-					</text>
-					<text name="no modify instructions">
-						  No tienes permiso para modificar este item.
-					</text>
-					<text name="Item Action Label">
-						  Zapatos:
-					</text>
-					<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/>
-					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
-					<button label="Crear Zapatos Nuevos" label_selected="Crear Zapatos Nuevos" name="Create New"/>
-					<button label="Quitárselos" label_selected="Quitárselos" name="Take Off"/>
-					<button label="Guardar" label_selected="Guardar" name="Save"/>
-					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
-					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
-			 </panel>
-			 <panel label="Medias" name="Socks">
-					<icon name="square"/>
-					<icon name="icon"/>
-					<text name="title">
-						  [DESC]
-					</text>
-					<text name="title_no_modify">
-						  [DESC]: no modificable
-					</text>
-					<text name="title_loading">
-						  [DESC]: cargando...
-					</text>
-					<text name="title_not_worn">
-						  [DESC]: no llevas
-					</text>
-					<text name="path">
-						  Situados en [PATH]
-					</text>
-					<text name="not worn instructions">
-						  Ponte medias nuevas arrastrándolas desde tu 
-inventario hasta tu avatar. O comienza de cero creando 
-un par nuevo y vistiéndotelas.						
-					</text>
-					<text name="no modify instructions">
-						  No tienes permiso para modificar este item.
-					</text>
-					<text name="Item Action Label">
-						  Medias:
-					</text>
-					<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen" />
-					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
-					<button label="Crear Medias Nuevas" label_selected="Crear Medias Nuevas" name="Create New"/>
-					<button label="Quitárselas" label_selected="Quitárselas" name="Take Off"/>
-					<button label="Guardar" label_selected="Guardar" name="Save"/>
-					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
-					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
-			 </panel>
-			 <panel label="Chaqueta" name="Jacket">
-					<icon name="square"/>
-					<icon name="icon"/>
-					<text name="title">
-						  [DESC]
-					</text>
-					<text name="title_no_modify">
-						  [DESC]: no modificable
-					</text>
-					<text name="title_loading">
-						  [DESC]: cargando...
-					</text>
-					<text name="title_not_worn">
-						  [DESC]: no llevas
-					</text>
-					<text name="path">
-						  Situada en [PATH]
-					</text>
-					<text name="not worn instructions">
-						  Ponte una chaqueta nueva arrastrándola desde tu 
+uno nuevo y vistiéndotelo.
+			</text>
+			<text name="no modify instructions">
+				No tienes permiso para modificar este item.
+			</text>
+			<text name="Item Action Label">
+				Ojos:
+			</text>
+			<texture_picker label="Iris" name="Iris" tool_tip="Pulsa para elegir una imagen"/>
+			<button label="Crear Ojos Nuevos" label_selected="Crear Ojos Nuevos" name="Create New"/>
+			<button label="Guardar" label_selected="Guardar" name="Save"/>
+			<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+			<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+		</panel>
+		<panel label="Ropa" name="clothes_placeholder"/>
+		<panel label="Camisa" name="Shirt">
+			<texture_picker label="Tela" name="Tela" tool_tip="Pulsa para elegir una imagen"/>
+			<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/>
+			<button label="Crear una Camisa Nuevo" label_selected="Crear una Camisa Nuevo" name="Create New"/>
+			<button label="Quitarla" label_selected="Quitarla" name="Take Off"/>
+			<button label="Guardar" label_selected="Guardar" name="Save"/>
+			<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+			<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: no modificable
+			</text>
+			<text name="title_loading">
+				[DESC]: cargando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: no llevas
+			</text>
+			<text name="path">
+				Situada en [PATH]
+			</text>
+			<text name="not worn instructions">
+				Ponte una camisa nueva arrastrando una desde tu 
 inventario hasta tu avatar. O comienza de cero creando 
 una nueva y vistiéndotela.
-					</text>
-					<text name="no modify instructions">
-						  No tienes permiso para modificar este item.
-					</text>
-					<text name="Item Action Label">
-						  Chaqueta:
-					</text>
-					<texture_picker label="Tela Superior" name="Upper Fabric" tool_tip="Pulsa para elegir una imagen" />
-					<texture_picker label="Tela Inferior" name="Lower Fabric" tool_tip="Pulsa para elegir una imagen" />
-					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
-					<button label="Crear una Nueva Chaqueta" label_selected="Crear una Nueva Chaqueta" name="Create New"/>
-					<button label="Quitársela" label_selected="Quitársela" name="Take Off"/>
-					<button label="Guardar" label_selected="Guardar" name="Save"/>
-					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
-					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
-			 </panel>
-			 <panel label="Guantes" name="Gloves">
-					<icon name="square"/>
-					<icon name="icon"/>
-					<text name="title">
-						  [DESC]
-					</text>
-					<text name="title_no_modify">
-						  [DESC]: no modificable
-					</text>
-					<text name="title_loading">
-						  [DESC]: cargando...
-					</text>
-					<text name="title_not_worn">
-						  [DESC]: no llevas
-					</text>
-					<text name="path">
-						  Situados en [PATH]
-					</text>
-					<text name="not worn instructions">
-						  Ponte guantes nuevos arrastrándolos desde tu 
+			</text>
+			<text name="no modify instructions">
+				No tienes permiso para modificar este item.
+			</text>
+			<text name="Item Action Label">
+				Camisa:
+			</text>
+		</panel>
+		<panel label="Pantalones" name="Pants">
+			<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/>
+			<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
+			<button label="Crear un Nuevo Pantalón" label_selected="Crear un Nuevo Pantalón" name="Create New"/>
+			<button label="Quitarlo" label_selected="Quitarlo" name="Take Off"/>
+			<button label="Guardar" label_selected="Guardar" name="Save"/>
+			<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+			<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: no modificable
+			</text>
+			<text name="title_loading">
+				[DESC]: cargando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: no llevas
+			</text>
+			<text name="path">
+				Situado en [PATH]
+			</text>
+			<text name="not worn instructions">
+				Ponte un pantalón nuevo arrastrando uno desde tu 
 inventario hasta tu avatar. O comienza de cero creando 
-nuevos y vistiéndotelos.					
-					</text>
-					<text name="no modify instructions">
-						  No tienes permiso para modificar este item.
-					</text>
-					<text name="Item Action Label">
-						  Guantes:
-					</text>
-					<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen" />
-					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
-					<button label="Crear Guantes Nuevos" label_selected="Crear Guantes Nuevos" name="Create New"/>
-					<button label="Quitárselos" label_selected="Quitárselos" name="Take Off"/>
-					<button label="Guardar" label_selected="Guardar" name="Save"/>
-					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
-					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
-			 </panel>
-			 <panel label="Camiseta" name="Undershirt">
-					<icon name="square"/>
-					<icon name="icon"/>
-					<text name="title">
-						  [DESC]
-					</text>	
-					<text name="title_no_modify">
-						  [DESC]: no modificable
-					</text>
-					<text name="title_loading">
-						  [DESC]: cargando...
-					</text>
-					<text name="title_not_worn">
-						  [DESC]: no llevas
-					</text>
-					<text name="path">
-						  Situada en [PATH]
-					</text>
-					<text name="not worn instructions">
-						  Ponte una camiseta nueva arrastrándola desde tu 
+uno nuevo y vistiéndotelo.
+			</text>
+			<text name="no modify instructions">
+				No tienes permiso para modificar este item.
+			</text>
+			<text name="Item Action Label">
+				Pantalones:
+			</text>
+		</panel>
+		<panel label="Zapatos" name="Shoes">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: no modificable
+			</text>
+			<text name="title_loading">
+				[DESC]: cargando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: no llevas
+			</text>
+			<text name="path">
+				Situados en [PATH]
+			</text>
+			<text name="not worn instructions">
+				Ponte nuevos zapatos arrastrándolos desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+un par nuevo y vistiéndotelo.
+			</text>
+			<text name="no modify instructions">
+				No tienes permiso para modificar este item.
+			</text>
+			<text name="Item Action Label">
+				Zapatos:
+			</text>
+			<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/>
+			<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
+			<button label="Crear Zapatos Nuevos" label_selected="Crear Zapatos Nuevos" name="Create New"/>
+			<button label="Quitárselos" label_selected="Quitárselos" name="Take Off"/>
+			<button label="Guardar" label_selected="Guardar" name="Save"/>
+			<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+			<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+		</panel>
+		<panel label="Medias" name="Socks">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: no modificable
+			</text>
+			<text name="title_loading">
+				[DESC]: cargando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: no llevas
+			</text>
+			<text name="path">
+				Situados en [PATH]
+			</text>
+			<text name="not worn instructions">
+				Ponte medias nuevas arrastrándolas desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+un par nuevo y vistiéndotelas.
+			</text>
+			<text name="no modify instructions">
+				No tienes permiso para modificar este item.
+			</text>
+			<text name="Item Action Label">
+				Medias:
+			</text>
+			<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen" />
+			<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
+			<button label="Crear Medias Nuevas" label_selected="Crear Medias Nuevas" name="Create New"/>
+			<button label="Quitárselas" label_selected="Quitárselas" name="Take Off"/>
+			<button label="Guardar" label_selected="Guardar" name="Save"/>
+			<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+			<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+		</panel>
+		<panel label="Chaqueta" name="Jacket">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: no modificable
+			</text>
+			<text name="title_loading">
+				[DESC]: cargando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: no llevas
+			</text>
+			<text name="path">
+				Situada en [PATH]
+			</text>
+			<text name="not worn instructions">
+				Ponte una chaqueta nueva arrastrándola desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+una nueva y vistiéndotela.
+			</text>
+			<text name="no modify instructions">
+				No tienes permiso para modificar este item.
+			</text>
+			<text name="Item Action Label">
+				Chaqueta:
+			</text>
+			<texture_picker label="Tela Superior" name="Upper Fabric" tool_tip="Pulsa para elegir una imagen"/>
+			<texture_picker label="Tela Inferior" name="Lower Fabric" tool_tip="Pulsa para elegir una imagen"/>
+			<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/>
+			<button label="Crear una Nueva Chaqueta" label_selected="Crear una Nueva Chaqueta" name="Create New"/>
+			<button label="Quitársela" label_selected="Quitársela" name="Take Off"/>
+			<button label="Guardar" label_selected="Guardar" name="Save"/>
+			<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+			<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+		</panel>
+		<panel label="Guantes" name="Gloves">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: no modificable
+			</text>
+			<text name="title_loading">
+				[DESC]: cargando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: no llevas
+			</text>
+			<text name="path">
+				Situados en [PATH]
+			</text>
+			<text name="not worn instructions">
+				Ponte guantes nuevos arrastrándolos desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+nuevos y vistiéndotelos.
+			</text>
+			<text name="no modify instructions">
+				No tienes permiso para modificar este item.
+			</text>
+			<text name="Item Action Label">
+				Guantes:
+			</text>
+			<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/>
+			<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/>
+			<button label="Crear Guantes Nuevos" label_selected="Crear Guantes Nuevos" name="Create New"/>
+			<button label="Quitárselos" label_selected="Quitárselos" name="Take Off"/>
+			<button label="Guardar" label_selected="Guardar" name="Save"/>
+			<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+			<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+		</panel>
+		<panel label="Camiseta" name="Undershirt">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: no modificable
+			</text>
+			<text name="title_loading">
+				[DESC]: cargando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: no llevas
+			</text>
+			<text name="path">
+				Situada en [PATH]
+			</text>
+			<text name="not worn instructions">
+				Ponte una camiseta nueva arrastrándola desde tu 
 inventario hasta tu avatar. O comienza de cero creando 
 una camiseta y vistiéndotela.
-					</text>
-					<text name="no modify instructions">
-						  No tienes permiso para modificar este item.
-					</text>
-					<text name="Item Action Label">
-						  Ropa Interior:
-					</text>
-					<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen" />
-					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
-					<button label="Crear una Camiseta Nueva" label_selected="Crear una Camiseta Nueva" name="Create New"/>
-					<button label="Quitársela" label_selected="Quitársela" name="Take Off"/>
-					<button label="Guardar" label_selected="Guardar" name="Save"/>
-					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
-					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
-			 </panel>
-			 <panel label="Ropa Interior" name="Underpants">
-					<icon name="square"/>
-					<icon name="icon"/>
-					<text name="title">
-						  [DESC]
-					</text>
-					<text name="title_no_modify">
-						  [DESC]: no modificable
-					</text>
-					<text name="title_loading">
-						  [DESC]: cargando...
-					</text>
-					<text name="title_not_worn">
-						  [DESC]: no llevas
-					</text>
-					<text name="path">
-						  Situada en [PATH]
-					</text>
-					<text name="not worn instructions">
-						  Ponte ropa interior nueva arrastrándola desde tu 
+			</text>
+			<text name="no modify instructions">
+				No tienes permiso para modificar este item.
+			</text>
+			<text name="Item Action Label">
+				Ropa Interior:
+			</text>
+			<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/>
+			<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/>
+			<button label="Crear una Camiseta Nueva" label_selected="Crear una Camiseta Nueva" name="Create New"/>
+			<button label="Quitársela" label_selected="Quitársela" name="Take Off"/>
+			<button label="Guardar" label_selected="Guardar" name="Save"/>
+			<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+			<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+		</panel>
+		<panel label="Ropa Interior" name="Underpants">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: no modificable
+			</text>
+			<text name="title_loading">
+				[DESC]: cargando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: no llevas
+			</text>
+			<text name="path">
+				Situada en [PATH]
+			</text>
+			<text name="not worn instructions">
+				Ponte ropa interior nueva arrastrándola desde tu 
 inventario hasta tu avatar. O comienza de cero creando 
-ropa interior y vistiéndotela.					
-					</text>
-					<text name="no modify instructions">
-						  No tienes permiso para modificar este item.
-					</text>
-					<text name="Item Action Label">
-						  Ropa Interior:
-					</text>
-					<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen" />
-					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
-					<button label="Crear nueva Ropa Interior" label_selected="Crear nueva Ropa Interior" name="Create New"/>
-					<button label="Quitársela" label_selected="Quitársela" name="Take Off"/>
-					<button label="Guardar" label_selected="Guardar" name="Save"/>
-					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
-					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
-			 </panel>
-			 <panel label="Falda" name="Skirt">
-					<icon name="square"/>
-					<icon name="icon"/>
-					<text name="title">
-						  [DESC]
-					</text>
-					<text name="title_no_modify">
-						  [DESC]: no modificable
-					</text>
-					<text name="title_loading">
-						  [DESC]: cargando...
-					</text>
-					<text name="title_not_worn">
-						  [DESC]: no llevas
-					</text>
-					<text name="path">
-						  Situada en [PATH]
-					</text>
-					<text name="not worn instructions">
-						  Ponte una falda nueva arrastrándola desde tu 
-inventario hasta tu avatar. O comienza de cero creando 
-una nueva y vistiéndotela.					
-					</text>
-					<text name="no modify instructions">
-						  No tienes permiso para modificar este item.
-					</text>
-					<text name="Item Action Label">
-						  Falda:
-					</text>
-					<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/>
-					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
-					<button label="Crear una Nueva Falda" label_selected="Crear una Nueva Falda" name="Create New"/>
-					<button label="Quitársela" label_selected="Quitársela" name="Take Off"/>
-					<button label="Guardar" label_selected="Guardar" name="Save"/>
-					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
-					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
-			 </panel>
-			 <panel name="Tattoo" label="Tatuaje" >
-					<icon name="square"/>
-					<icon name="icon"/>
-					<text name="title">
-						  [DESC]
-					</text>
-					<text name="title_no_modify">
-						  [DESC]: no modificable
-					</text>
-					<text name="title_loading">
-						  [DESC]: cargando...
-					</text>
-					<text name="title_not_worn">
-						  [DESC]: no llevas
-					</text>
-					<text name="path">
-						  Situada en [PATH]
-					</text>
-					<text name="not worn instructions">
-						  Ponte un nuevo Tatuaje arrastrándolo desde tu 
-inventario hasta tu avatar. O comienza de cero creando 
-uno nuevo y vistiéndotelo.
-					</text>
-					<text name="no modify instructions">
-						  No tienes permiso para modificar este item.
-					</text>
-					<text name="Item Action Label">
-						  Tatuaje:
-					</text>
-					<texture_picker name="Head Tattoo" label="Tatuaje: Cabeza" tool_tip="Pulsa para elegir una imagen" />
-					<texture_picker name="Upper Tattoo" label="Tatuaje:Superior" tool_tip="Pulsa para elegir una imagen"/>
-					<texture_picker name="Lower Tattoo" label="Tatuaje: Inferior" tool_tip="Pulsa para elegir una imagen"/>
-					<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
-					<button name="Create New" label="Crear Nuevo Tatuaje" label_selected="Crear Nuevo Tatuaje"/>
-					<button name="Take Off" label="Quitárselo" label_selected="Quitárselo"/>
-					<button name="Save" label="Guardar" label_selected="Guardar"/>
-					<button name="Save As" label="Guardar Como..." label_selected="Guardar Como..."/>
-					<button name="Revert" label="Restablecer" label_selected="Restablecer"/>
-			 </panel>
-			 <panel name="Alpha" label="Alfa">
-					<icon name="square"/>
-					<icon name="icon"/>
-					<text name="title">
-						  [DESC]
-					</text>
-					<text name="title_no_modify">
-						  [DESC]: no modificable
-					</text>
-					<text name="title_loading">
-						  [DESC]: cargando...
-					</text>
-					<text name="title_not_worn">
-						  [DESC]: no llevas
-					</text>
-					<text name="path">
-						  Situado en [PATH]
-					</text>
-					<text name="not worn instructions">
-						  Ponte una nueva Capa Alfa arrastrándola desde tu 
+ropa interior y vistiéndotela.
+			</text>
+			<text name="no modify instructions">
+				No tienes permiso para modificar este item.
+			</text>
+			<text name="Item Action Label">
+				Ropa Interior:
+			</text>
+			<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/>
+			<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/>
+			<button label="Crear nueva Ropa Interior" label_selected="Crear nueva Ropa Interior" name="Create New"/>
+			<button label="Quitársela" label_selected="Quitársela" name="Take Off"/>
+			<button label="Guardar" label_selected="Guardar" name="Save"/>
+			<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+			<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+		</panel>
+		<panel label="Falda" name="Skirt">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: no modificable
+			</text>
+			<text name="title_loading">
+				[DESC]: cargando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: no llevas
+			</text>
+			<text name="path">
+				Situada en [PATH]
+			</text>
+			<text name="not worn instructions">
+				Ponte una falda nueva arrastrándola desde tu 
 inventario hasta tu avatar. O comienza de cero creando 
 una nueva y vistiéndotela.
-					</text>
-					<text name="no modify instructions">
-						  No tienes permiso para modificar este item.
-					</text>
-					<text name="Item Action Label">
-						  Alfa:
-					</text>
-					<texture_picker name="Head Alpha" label="Alfa: Cabeza" tool_tip="Pulsa para elegir una imagen"/>
-					<texture_picker name="Upper Alpha" label="Alfa Superior" tool_tip="Pulsa para elegir una imagen"/>
-					<texture_picker  name="Lower Alpha" label="Alfa Inferior" tool_tip="Pulsa para elegir una imagen"/>
-					<check_box name="head alpha texture invisible"/>
-					<check_box name="upper alpha texture invisible"/>
-					<check_box name="lower alpha texture invisible"/>
-					<texture_picker name="Hair Alpha" label="Alfa: Pelo" tool_tip="Pulsa para elegir una imagen"/>
-					<texture_picker name="Eye Alpha" label="Alfa: Ojos" tool_tip="Pulsa para elegir una imagen"/>
-					<check_box name="hair alpha texture invisible"/>
-					<check_box name="eye alpha texture invisible"/>
-					<button name="Create New" label="Crear Nuevo Alfa" label_selected="Crear Nuevo Alfa"/>
-					<button name="Take Off" label="Quitárselo" label_selected="Quitárselo"/>
-					<button name="Save" label="Guardar" label_selected="Guardar"/>
-					<button name="Save As" label="Guardar Como..." label_selected="Guardar Como..."/>
-					<button name="Revert" label="Restablecer" label_selected="Restablecer"/>
-			 </panel>
-			 <panel label="Física" name="Physics">
-					<icon name="square"/>
-					<icon name="icon"/>
-					<button label="Rebote del Vientre" label_selected="Rebote del Vientre" name="Belly Bounce"/>
-					<button label="Rebote de Senos" label_selected="Rebote de Senos" name="Breast Bounce"/>
-					<button label="Escote" label_selected="Escote" name="Breast Cleavage"/>
-					<button label="Balanceo de Senos" label_selected="Balanceo de Senos" name="Breast Sway"/>
-					<button label="Rebote de Glúteos" label_selected="Rebote de Glúteos" name="Butt Bounce"/>
-					<button label="Balanceo de Glúteos" label_selected="Balanceo de Glúteos" name="Butt Sway"/>
-					<button label="Parámetros Avanzados" label_selected="Parámetros Avanzados" name="Advanced Parameters"/>
-					<button name="Take Off" label="Quitarse" label_selected="Quitarse"/>
-					<text name="title">
-						  [DESC]
-					</text>
-					<text name="title_no_modify">
-						  [DESC]: no modificable
-					</text>
-					<text name="title_loading">
-						  [DESC]: cargando...
-					</text>
-					<text name="title_not_worn">
-						  [DESC]: no llevas
-					</text>
-					<text name="path">
-						  Situada en  [PATH]
-					</text>
-					<text name="not worn instructions">
-						  Ponte una nueva Capa Física arrastrándola desde tu 
+			</text>
+			<text name="no modify instructions">
+				No tienes permiso para modificar este item.
+			</text>
+			<text name="Item Action Label">
+				Falda:
+			</text>
+			<texture_picker label="Tela" name="Fabric" tool_tip="Pulsa para elegir una imagen"/>
+			<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color"/>
+			<button label="Crear una Nueva Falda" label_selected="Crear una Nueva Falda" name="Create New"/>
+			<button label="Quitársela" label_selected="Quitársela" name="Take Off"/>
+			<button label="Guardar" label_selected="Guardar" name="Save"/>
+			<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+			<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+		</panel>
+		<panel name="Tattoo" label="Tatuaje">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: no modificable
+			</text>
+			<text name="title_loading">
+				[DESC]: cargando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: no llevas
+			</text>
+			<text name="path">
+				Situada en [PATH]
+			</text>
+			<text name="not worn instructions">
+				Ponte un nuevo Tatuaje arrastrándolo desde tu 
 inventario hasta tu avatar. O comienza de cero creando 
-una nueva y vistiéndotela.					
-					</text>
-					<text name="no modify instructions">
-						  No tienes permiso para modificar este item.
-					</text>
-					<text name="Item Action Label">
-						  Física:
-					</text>
-					<button label="Crear Nueva Capa Física" label_selected="Crear Nueva Capa Física" name="Create New"/>
-					<button label="Guardar" label_selected="Guardar" name="Save"/>
-					<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
-					<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
-			 </panel>
-	  </tab_container>
-	  <scroll_container name="panel_container"/>
-	  <text name="AvatarHeightText">
-			 Altura del Avatar:
-	  </text>
-	  <text name="HeightTextM">
-			 (métrico)
-	  </text>
-	  <text name="HeightTextI">
-			 (imperial)
-	  </text>
-	  <button name="Import" label="Importar"/>
-	  <button name="Export" label="Exportar"/>	
-	  <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
-	  <button label="OK" label_selected="OK" name="Ok"/>
-	  <button label="Hacer un Vestuario..." label_selected="Hacer un Vestuario..." name="Make Outfit"/>
+uno nuevo y vistiéndotelo.
+			</text>
+			<text name="no modify instructions">
+				No tienes permiso para modificar este item.
+			</text>
+			<text name="Item Action Label">
+				Tatuaje:
+			</text>
+			<texture_picker name="Head Tattoo" label="Tatuaje: Cabeza" tool_tip="Pulsa para elegir una imagen" />
+			<texture_picker name="Upper Tattoo" label="Tatuaje:Superior" tool_tip="Pulsa para elegir una imagen"/>
+			<texture_picker name="Lower Tattoo" label="Tatuaje: Inferior" tool_tip="Pulsa para elegir una imagen"/>
+			<color_swatch label="Color/Tinte" name="Color/Tint" tool_tip="Pulsa para abrir el selector de color" />
+			<button name="Create New" label="Crear Nuevo Tatuaje" label_selected="Crear Nuevo Tatuaje"/>
+			<button name="Take Off" label="Quitárselo" label_selected="Quitárselo"/>
+			<button name="Save" label="Guardar" label_selected="Guardar"/>
+			<button name="Save As" label="Guardar Como..." label_selected="Guardar Como..."/>
+			<button name="Revert" label="Restablecer" label_selected="Restablecer"/>
+		 </panel>
+		 <panel name="Alpha" label="Alfa">
+				<text name="title">
+					[DESC]
+				</text>
+				<text name="title_no_modify">
+					[DESC]: no modificable
+				</text>
+				<text name="title_loading">
+					[DESC]: cargando...
+				</text>
+				<text name="title_not_worn">
+					[DESC]: no llevas
+				</text>
+				<text name="path">
+					Situado en [PATH]
+				</text>
+				<text name="not worn instructions">
+					Ponte una nueva Capa Alfa arrastrándola desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+una nueva y vistiéndotela.
+				</text>
+				<text name="no modify instructions">
+					No tienes permiso para modificar este item.
+				</text>
+				<text name="Item Action Label">
+					Alfa:
+				</text>
+				<texture_picker name="Head Alpha" label="Alfa: Cabeza" tool_tip="Pulsa para elegir una imagen"/>
+				<texture_picker name="Upper Alpha" label="Alfa Superior" tool_tip="Pulsa para elegir una imagen"/>
+				<texture_picker  name="Lower Alpha" label="Alfa Inferior" tool_tip="Pulsa para elegir una imagen"/>
+				<check_box name="head alpha texture invisible"/>
+				<check_box name="upper alpha texture invisible"/>
+				<check_box name="lower alpha texture invisible"/>
+				<texture_picker name="Hair Alpha" label="Alfa: Pelo" tool_tip="Pulsa para elegir una imagen"/>
+				<texture_picker name="Eye Alpha" label="Alfa: Ojos" tool_tip="Pulsa para elegir una imagen"/>
+				<check_box name="hair alpha texture invisible"/>
+				<check_box name="eye alpha texture invisible"/>
+				<button name="Create New" label="Crear Nuevo Alfa" label_selected="Crear Nuevo Alfa"/>
+				<button name="Take Off" label="Quitárselo" label_selected="Quitárselo"/>
+				<button name="Save" label="Guardar" label_selected="Guardar"/>
+				<button name="Save As" label="Guardar Como..." label_selected="Guardar Como..."/>
+				<button name="Revert" label="Restablecer" label_selected="Restablecer"/>
+		</panel>
+		<panel label="Física" name="Physics">
+			<button label="Rebote del Vientre" label_selected="Rebote del Vientre" name="Belly Bounce"/>
+			<button label="Rebote de Senos" label_selected="Rebote de Senos" name="Breast Bounce"/>
+			<button label="Escote" label_selected="Escote" name="Breast Cleavage"/>
+			<button label="Balanceo de Senos" label_selected="Balanceo de Senos" name="Breast Sway"/>
+			<button label="Rebote de Glúteos" label_selected="Rebote de Glúteos" name="Butt Bounce"/>
+			<button label="Balanceo de Glúteos" label_selected="Balanceo de Glúteos" name="Butt Sway"/>
+			<button label="Parámetros Avanzados" label_selected="Parámetros Avanzados" name="Advanced Parameters"/>
+			<button name="Take Off" label="Quitarse" label_selected="Quitarse"/>
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: no modificable
+			</text>
+			<text name="title_loading">
+				[DESC]: cargando...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: no llevas
+			</text>
+			<text name="path">
+				Situada en [PATH]
+			</text>
+			<text name="not worn instructions">
+				Ponte una nueva Capa Física arrastrándola desde tu 
+inventario hasta tu avatar. O comienza de cero creando 
+una nueva y vistiéndotela.
+			</text>
+			<text name="no modify instructions">
+				No tienes permiso para modificar este item.
+			</text>
+			<text name="Item Action Label">
+				Física:
+			</text>
+			<button label="Crear Nueva Capa Física" label_selected="Crear Nueva Capa Física" name="Create New"/>
+			<button label="Guardar" label_selected="Guardar" name="Save"/>
+			<button label="Guardar Como..." label_selected="Guardar Como..." name="Save As"/>
+			<button label="Restablecer" label_selected="Restablecer" name="Revert"/>
+		</panel>
+	</tab_container>
+	<scroll_container name="panel_container"/>
+	<text name="AvatarHeightText">
+		Altura del Avatar:
+	</text>
+	<text name="HeightTextM">
+		(métrico)
+	</text>
+	<text name="HeightTextI">
+		(imperial)
+	</text>
+	<button name="Import" label="Importar"/>
+	<button name="Export" label="Exportar"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<button label="OK" label_selected="OK" name="Ok"/>
+	<button label="Hacer un Vestuario..." label_selected="Hacer un Vestuario..." name="Make Outfit"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
index 67f5c7347..24f65d541 100644
--- a/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/es/floater_day_cycle_options.xml
@@ -1,113 +1,101 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Day Cycle Floater" title="Editor del Ciclo Diario">
-	  <tab_container name="Day Cycle Tabs">
-			 <panel label="Ciclo Diario" name="Day Cycle">
-					<button label="?" name="WLDayCycleHelp"/>
-					<multi_slider label="" name="WLTimeSlider"/>
-					<multi_slider name="WLDayCycleKeys"/>
-					<text name="WL12am">
-						  00:00
-					</text>
-					<text name="WL3am">
-						  03:00
-					</text>
-					<text name="WL6am">
-						  06:00
-					</text>
-					<text name="WL9amHash">
-						  09:00
-					</text>
-					<text name="WL12pmHash">
-						  12:00
-					</text>
-					<text name="WL3pm">
-						  15:00
-					</text>
-					<text name="WL6pm">
-						  18:00
-					</text>
-					<text name="WL9pm">
-						  21:00
-					</text>
-					<text name="WL12am2">
-						  24:00
-					</text>
-					<text name="WL12amHash">
-						  |
-					</text>
-					<text name="WL3amHash">
-						  I
-					</text>
-					<text name="WL6amHash">
-						  |
-					</text>
-					<text name="WL9amHash2">
-						  I
-					</text>
-					<text name="WL12pmHash2">
-						  |
-					</text>
-					<text name="WL3pmHash">
-						  I
-					</text>
-					<text name="WL6pmHash">
-						  |
-					</text>
-					<text name="WL9pmHash">
-						  I
-					</text>
-					<text name="WL12amHash2">
-						  |
-					</text>
-					<button label="Añadir Punto" label_selected="Añadir Punto" name="WLAddKey"/>
-					<button label="Quitar Punto" label_selected="Quitar Punto" name="WLDeleteKey"/>
-					<text name="WLCurKeyFrameText" width="200">
-						  Configuración fotográma clave:
-					</text>
-					<text name="WLCurKeyTimeText">
-						  Hora Clave:
-					</text>
-					<spinner label="Hora" name="WLCurKeyHour"/>
-					<spinner label="Min" name="WLCurKeyMin"/>
-					<text name="WLCurKeyTimeText2">
-						  Modelo Predifinido:
-					</text>
-					<combo_box label="Predifinido" name="WLKeyPresets"/>
-					<view_border height="115" left="12" width="190" />
-					<text name="DayCycleText">
-						  Intervalo:
-					</text>
-					<combo_box label="5 min" name="WLSnapOptions"/>
-					<text name="DayCycleText2">
-						  Duración del Ciclo:
-					</text>
-					<spinner label="Hora" name="WLLengthOfDayHour"/>
-					<spinner label="Min" name="WLLengthOfDayMin"/>
-					<spinner label="Seg" name="WLLengthOfDaySec"/>
-					<text name="DayCycleText3">
-						  Vista Previa:
-					</text>
-					<button label="Ver" label_selected="Ver" name="WLAnimSky"/>
-					<button label="Parar" label_selected="Parar" name="WLStopAnimSky"/>
-					<button label="Usar Horario del Estado" label_selected="Usar Horario del Estado" name="WLUseLindenTime"/>
-					<text name="KeyFramePresetsText">
-						  Predefinidos:
-					</text>
-					<combo_box name="DayCyclePresetsCombo"/>
-					<button label="Nuevo" label_selected="Nuevo" name="DayCycleNewPreset"/>
-					<button label="Guardar" label_selected="Guardar" name="DayCycleSavePreset"/>
-					<button label="Borrar" label_selected="Borrar" name="DayCycleDeletePreset"/>
-					<!--<button bottom="-295" enabled="true" font="SansSerif" halign="center" height="20"
-						  label="Save Test Day" label_selected="Save Test Day"
-						  left="480" mouse_opaque="true" name="WLSaveDayCycle" scale_image="true"
-						  width="150" />
-					<button bottom="-320" enabled="true" font="SansSerif" halign="center" height="20"
-						  label="Load Test Day" label_selected="Load Test Day"
-						  left="480" mouse_opaque="true" name="WLLoadDayCycle" scale_image="true"
-						  width="150" /> -->
-			 </panel>
-	  </tab_container>
-	  <string name="DaycycleDefaultNames">
-			 Default:Happy%20Bivouac
-	  </string>
+	<tab_container name="Day Cycle Tabs">
+		<panel label="Ciclo Diario" name="Day Cycle">
+			<button label="?" name="WLDayCycleHelp"/>
+			<text name="WL12am">
+				00:00
+			</text>
+			<text name="WL3am">
+				03:00
+			</text>
+			<text name="WL6am">
+				06:00
+			</text>
+			<text name="WL9amHash">
+				09:00
+			</text>
+			<text name="WL12pmHash">
+				12:00
+			</text>
+			<text name="WL3pm">
+				15:00
+			</text>
+			<text name="WL6pm">
+				18:00
+			</text>
+			<text name="WL9pm">
+				21:00
+			</text>
+			<text name="WL12am2">
+				24:00
+			</text>
+			<text name="WL12amHash">
+				|
+			</text>
+			<text name="WL3amHash">
+				I
+			</text>
+			<text name="WL6amHash">
+				|
+			</text>
+			<text name="WL9amHash2">
+				I
+			</text>
+			<text name="WL12pmHash2">
+				|
+			</text>
+			<text name="WL3pmHash">
+				I
+			</text>
+			<text name="WL6pmHash">
+				|
+			</text>
+			<text name="WL9pmHash">
+				I
+			</text>
+			<text name="WL12amHash2">
+				|
+			</text>
+			<button label="Añadir Punto" label_selected="Añadir Punto" name="WLAddKey"/>
+			<button label="Quitar Punto" label_selected="Quitar Punto" name="WLDeleteKey"/>
+			<text name="WLCurKeyFrameText" width="200">
+				Configuración fotográma clave:
+			</text>
+			<text name="WLCurKeyTimeText">
+				Hora Clave:
+			</text>
+			<spinner label="Hora" name="WLCurKeyHour"/>
+			<spinner label="Min" name="WLCurKeyMin"/>
+			<text name="WLCurKeyTimeText2">
+				Modelo Predifinido:
+			</text>
+			<combo_box label="Predifinido" name="WLKeyPresets"/>
+			<text name="DayCycleText">
+				Intervalo:
+			</text>
+			<combo_box label="5 min" name="WLSnapOptions"/>
+			<text name="DayCycleText2">
+				Duración del Ciclo:
+			</text>
+			<spinner label="Hora" name="WLLengthOfDayHour"/>
+			<spinner label="Min" name="WLLengthOfDayMin"/>
+			<spinner label="Seg" name="WLLengthOfDaySec"/>
+			<text name="DayCycleText3">
+				Vista Previa:
+			</text>
+			<button label="Ver" label_selected="Ver" name="WLAnimSky"/>
+			<button label="Parar" label_selected="Parar" name="WLStopAnimSky"/>
+			<button label="Usar Horario del Estado" label_selected="Usar Horario del Estado" name="WLUseLindenTime"/>
+			<text name="KeyFramePresetsText">
+				Predefinidos:
+			</text>
+			<button label="Nuevo" label_selected="Nuevo" name="DayCycleNewPreset"/>
+			<button label="Guardar" label_selected="Guardar" name="DayCycleSavePreset"/>
+			<button label="Borrar" label_selected="Borrar" name="DayCycleDeletePreset"/>
+		</panel>
+	</tab_container>
+	<string name="DaycycleDefaultNames">
+		Default:Happy%20Bivouac
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_device_settings.xml b/indra/newview/skins/default/xui/es/floater_device_settings.xml
index f82219e75..1e92828f1 100644
--- a/indra/newview/skins/default/xui/es/floater_device_settings.xml
+++ b/indra/newview/skins/default/xui/es/floater_device_settings.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_device_settings" title="Configuración Dispositivos de Voz">
-	  <panel name="device_settings" />
-</floater>
+<floater name="floater_device_settings" title="Configuración Dispositivos de Voz"/>
diff --git a/indra/newview/skins/default/xui/es/floater_directory.xml b/indra/newview/skins/default/xui/es/floater_directory.xml
index 57b26204b..d9d8ff2c6 100644
--- a/indra/newview/skins/default/xui/es/floater_directory.xml
+++ b/indra/newview/skins/default/xui/es/floater_directory.xml
@@ -1,451 +1,416 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="directory" title="Buscar en Second Life">
-	  <tab_container name="Directory Tabs" >
-			 <panel label="Todo" name="find_all_panel">
-					<string name="searching_text">
-						  Buscando...
-					</string>
-					<string name="not_found_text">
-						  Nada encontrado.
-					</string>
-					<text name="find">
-						  Buscar:
-					</text>
-					<line_editor label="Buscar" name="search_editor" tool_tip="Buscar en Second Life"/>
-					<button label="" name="back_btn"/>
-					<button label="" name="forward_btn"/>
-					<button label="" name="reload_btn"/>
-					<button label="Buscar" name="search_btn"/>
-					<combo_box name="Category">
-						  <combo_item name="AnyCategory" value="All">
-								 Cualquier Categoría
-						  </combo_item>
-						  <combo_item name="Events" value="Events">
-								 Eventos
-						  </combo_item>
-						  <combo_item name="Groups" value="Groups">
-								 Grupos
-						  </combo_item>
-						  <combo_item name="People" value="People">
-								 Gente
-						  </combo_item>
-						  <combo_item name="Places" value="Places">
-								 Lugares
-						  </combo_item>
-						  <combo_item name="Wiki" value="Wiki">
-								 Wiki
-						  </combo_item>
-					</combo_box>
-					<check_box label="Contenido PG" name="incpg"/>
-					<check_box label="Contenido Mature" name="incmature"/>
-					<check_box label="Contenido Adulto" name="incadult"/>
-					<button label="?" label_selected="?" name="?"/>
-					<web_browser name="find_browser"/>
-					<text name="status_text"/>
-					<string name="loading_text">
-						  Cargando...
-					</string>
-					<string name="done_text">
-						  Hecho
-					</string>
-					<string name="redirect_404_url">
-						  http://secondlife.com/app/search/notfound.html
-					</string>
-					<string name="default_search_page">
-						  "http://secondlife.com/app/search/index.php?"
-					</string>
-			 </panel>
-			 <panel label="Clasificados" name="classified_panel">
-					<string name="searching_text">
-						  Buscando...
-					</string>
-					<string name="not_found_text">
-						  Nada encontrado.
-					</string>
-					<text name="find">
-						  Buscar:
-					</text>
-					<line_editor name="name"/>
-					<check_box label="Contenido PG" name="incpg"/>
-					<check_box label="Contenido Mature" name="incmature"/>
-					<check_box label="Adult content" name="incadult"/>
-					<combo_box name="Category">
-						  <combo_item name="AnyCategory" value="0">
-								 Cualquier Categoría
-						  </combo_item>
-						  <combo_item name="Shopping" value="1">
-								 Compras
-						  </combo_item>
-						  <combo_item name="LandRental" value="2">
-								 Terreno en alquiler
-						  </combo_item>
-						  <combo_item name="PropertyRental" value="3">
-								 Propiedad en alquiler
-						  </combo_item>
-						  <combo_item name="SpecialAttraction" value="4">
-								 Atracciones Especiales
-						  </combo_item>
-						  <combo_item name="NewProducts" value="5">
-								 Nuevos Productos
-						  </combo_item>
-						  <combo_item name="Employment" value="6">
-								 Empleos
-						  </combo_item>
-						  <combo_item name="Wanted" value="7">
-								 Se busca
-						  </combo_item>
-						  <combo_item name="Service" value="8">
-								 Servicios
-						  </combo_item>
-						  <combo_item name="Personal" value="9">
-								 Personal
-						  </combo_item>
-					</combo_box>
-					<button label="Navegar" label_selected="Navegar" name="Browse"/>
-					<button label="Buscar" label_selected="Buscar" name="Search"/>
-					<button label="Poner un Anuncio..." label_selected="Poner un Anuncio..." name="Place an Ad..."/>
-					<button label="Borrar" label_selected="Borrar" name="Delete"/>
-					<scroll_list name="results">
-						  <column label="" name="icon"/>
-						  <column label="" name="type"/>
-						  <column label="Nombre" name="name"/>
-						  <column label="Precio" name="price"/>
-					</scroll_list>
-					<text name="result_text"/>
-					<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
-					<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
-			 </panel>
-			 <panel label="Eventos" name="events_panel">
-					<string name="searching_text">
-						  Buscando...
-					</string>
-					<string name="not_found_text">
-						  Nada encontrado.
-					</string>
-					<text name="text2">
-						  Buscar:
-					</text>
-					<line_editor name="event_search_text"/>
-					<radio_group name="date_mode">
-						  <radio_item name="current">
-								 En curso y próximos
-						  </radio_item>
-						  <radio_item name="date">
-								 Fecha
-						  </radio_item>
-					</radio_group>
-					<button label="&lt;&lt;" label_selected="&lt;&lt;" name="&lt;&lt;" tool_tip="Retroceder un día"/>
-					<text name="date_text">
-						  6/6
-					</text>
-					<button label="&gt;&gt;" label_selected="&gt;&gt;" name="&gt;&gt;" tool_tip="Avanzar un día" />
-					<button label="Hoy" label_selected="Hoy" name="Today" tool_tip="Mostrar los eventos del día de hoy"/>
-					<text name="text">
-						  Categoría:
-					</text>
-					<combo_box name="category combo">
-						  <combo_item name="All" value="0">
-								 Cualquier categoría
-						  </combo_item>
-						  <combo_item name="Discussion" value="18">
-								 Debates
-						  </combo_item>
-						  <combo_item name="Sports" value="19">
-								 Deportes
-						  </combo_item>
-						  <combo_item name="LiveMusic" value="20">
-								 Música en Vivo
-						  </combo_item>
-						  <combo_item name="Commercial" value="22">
-								 Comercial
-						  </combo_item>
-						  <combo_item name="Nightlife/Entertainment" value="23">
-								 Vida Nocturna/Entretenimiento
-						  </combo_item>
-						  <combo_item name="Games/Contests" value="24">
-								 Juegos/Concursos
-						  </combo_item>
-						  <combo_item name="Pageants" value="25">
-								 Representaciones
-						  </combo_item>
-						  <combo_item name="Education" value="26">
-								 Educación
-						  </combo_item>
-						  <combo_item name="ArtsandCulture" value="27">
-								 Arte y Cultura
-						  </combo_item>
-						  <combo_item name="Charity/SupportGroups" value="28">
-								 Representaciones
-						  </combo_item>
-						  <combo_item name="Miscellaneous" value="29">
-								 Miscelaneos
-						  </combo_item>
-					</combo_box>
-					<check_box label="Contenido PG" name="incpg"/>
-					<check_box label="Contenido Mature" name="incmature"/>
-					<check_box label="Contenido Adulto" name="incadult"/>
-					<button label="Buscar" label_selected="Buscar" name="Search"/>
-					<button label="Borrar" label_selected="Borrar" name="Delete"/>
-					<scroll_list name="results">
-						  <column label="" name="icon"/>
-						  <column label="" name="type"/>
-						  <column label="Nombre" name="name" />
-						  <column label="Hora (PT)" name="date"/>
-						  <column label="" name="event_id"/>
-						  <column label="Hora" name="time"/>
-					</scroll_list>
-					<text name="result_text"/>
-					<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
-					<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
-			 </panel>
-			 <panel label="Escaparate" name="showcase_panel">
-					<string name="searching_text">
-						  Buscando...
-					</string>
-					<string name="not_found_text">
-						  Nada encontrado.
-					</string>
-					<button label="" name="back_btn"/>
-					<button label="" name="forward_btn"/>
-					<button label="" name="reload_btn"/>
-					<!-- No mature content checkbox, showcase is all PG -->
-					<web_browser name="showcase_browser" />
-					<text name="status_text"/>
-					<string name="loading_text">
-						  Cargando...
-					</string>
-					<string name="done_text">
-						  Hecho
-					</string>
-					<string name="redirect_404_url">
-						  http://secondlife.com/app/search/notfound.html
-					</string>
-					<string name="default_search_page">
-						  "http://secondlife.com/app/showcase/index.php?"
-					</string>
-			 </panel>
-			 <panel label="Venta de Terrenos" name="land_sales_panel">
-					<string name="searching_text">
-						  Buscando...
-					</string>
-					<string name="not_found_text">
-						  Ninguno encontrado.
-					</string>
-					<string name="land_help_text">
-						  El terreno puede comprarse directamente en la moneda del mundo ([CURRENCY]) , o con [CURRENCY] o [REALCURRENCY]. en una
+	<tab_container name="Directory Tabs">
+		<panel label="Todo" name="find_all_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+				Nada encontrado.
+			</string>
+			<text name="find">
+				Buscar:
+			</text>
+			<line_editor label="Buscar" name="search_editor" tool_tip="Buscar en Second Life"/>
+			<button label="Buscar" name="search_btn"/>
+			<combo_box name="Category">
+				<combo_item name="AnyCategory">
+					Cualquier Categoría
+				</combo_item>
+				<combo_item name="Events">
+					Eventos
+				</combo_item>
+				<combo_item name="Groups">
+					Grupos
+				</combo_item>
+				<combo_item name="People">
+					Gente
+				</combo_item>
+				<combo_item name="Places">
+					Lugares
+				</combo_item>
+				<combo_item name="Wiki">
+					Wiki
+				</combo_item>
+			</combo_box>
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Contenido Mature" name="incmature"/>
+			<check_box label="Contenido Adulto" name="incadult"/>
+			<button label="?" label_selected="?" name="?"/>
+			<string name="loading_text">
+				Cargando...
+			</string>
+			<string name="done_text">
+				Hecho
+			</string>
+			<string name="redirect_404_url">
+				http://secondlife.com/app/search/notfound.html
+			</string>
+			<string name="default_search_page">
+				http://secondlife.com/app/search/index.php?
+			</string>
+		</panel>
+		<panel label="Clasificados" name="classified_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+					  Nada encontrado.
+			</string>
+			<text name="find">
+				  Buscar:
+			</text>
+			<line_editor name="name"/>
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Contenido Mature" name="incmature"/>
+			<check_box label="Adult content" name="incadult"/>
+			<combo_box name="Category">
+				<combo_item name="AnyCategory">
+					Cualquier Categoría
+				</combo_item>
+				<combo_item name="Shopping">
+					Compras
+				</combo_item>
+				<combo_item name="LandRental">
+					Terreno en alquiler
+				</combo_item>
+				<combo_item name="PropertyRental">
+					 Propiedad en alquiler
+				</combo_item>
+				<combo_item name="SpecialAttraction">
+					Atracciones Especiales
+				</combo_item>
+				<combo_item name="NewProducts">
+					Nuevos Productos
+				</combo_item>
+				<combo_item name="Employment">
+					Empleos
+				</combo_item>
+				<combo_item name="Wanted">
+					Se busca
+				</combo_item>
+				<combo_item name="Service">
+					Servicios
+				</combo_item>
+				<combo_item name="Personal">
+					Personal
+				</combo_item>
+			</combo_box>
+			<button label="Navegar" label_selected="Navegar" name="Browse"/>
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<button label="Poner un Anuncio..." label_selected="Poner un Anuncio..." name="Place an Ad..."/>
+			<button label="Borrar" label_selected="Borrar" name="Delete"/>
+			<scroll_list name="results">
+				<column label="Nombre" name="name"/>
+				<column label="Precio" name="price"/>
+			</scroll_list>
+			<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
+			<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+		</panel>
+		<panel label="Eventos" name="events_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+				Nada encontrado.
+			</string>
+			<text name="text2">
+				Buscar:
+			</text>
+			<line_editor name="event_search_text"/>
+			<radio_group name="date_mode">
+				<radio_item name="current">
+					En curso y próximos
+				</radio_item>
+				<radio_item name="date">
+					Fecha
+				</radio_item>
+			</radio_group>
+			<button label="&lt;&lt;" label_selected="&lt;&lt;" name="&lt;&lt;" tool_tip="Retroceder un día"/>
+			<text name="date_text">
+				6/6
+			</text>
+			<button label="&gt;&gt;" label_selected="&gt;&gt;" name="&gt;&gt;" tool_tip="Avanzar un día" />
+			<button label="Hoy" label_selected="Hoy" name="Today" tool_tip="Mostrar los eventos del día de hoy"/>
+			<text name="text">
+				Categoría:
+			</text>
+			<combo_box name="category combo">
+				<combo_item name="All">
+					Cualquier categoría
+				</combo_item>
+				<combo_item name="Discussion">
+					Debates
+				</combo_item>
+				<combo_item name="Sports">
+					Deportes
+				</combo_item>
+				<combo_item name="LiveMusic">
+					Música en Vivo
+				</combo_item>
+				<combo_item name="Commercial">
+					Comercial
+				</combo_item>
+				<combo_item name="Nightlife/Entertainment">
+					Vida Nocturna/Entretenimiento
+				</combo_item>
+				<combo_item name="Games/Contests">
+					Juegos/Concursos
+				</combo_item>
+				<combo_item name="Pageants">
+					Representaciones
+				</combo_item>
+				<combo_item name="Education">
+					Educación
+				</combo_item>
+				<combo_item name="ArtsandCulture">
+					Arte y Cultura
+				</combo_item>
+				<combo_item name="Charity/SupportGroups">
+					Representaciones
+				</combo_item>
+				<combo_item name="Miscellaneous">
+					Miscelaneos
+				</combo_item>
+			</combo_box>
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Contenido Mature" name="incmature"/>
+			<check_box label="Contenido Adulto" name="incadult"/>
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<button label="Borrar" label_selected="Borrar" name="Delete"/>
+			<scroll_list name="results">
+				<column label="Nombre" name="name"/>
+				<column label="Hora (PT)" name="date"/>
+				<column label="Hora" name="time"/>
+			</scroll_list>
+			<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
+			<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+		</panel>
+		<panel label="Escaparate" name="showcase_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+				Nada encontrado.
+			</string>
+			<button label="" name="back_btn"/>
+			<button label="" name="forward_btn"/>
+			<string name="loading_text">
+				Cargando...
+			</string>
+			<string name="done_text">
+				Hecho
+			</string>
+			<string name="redirect_404_url">
+				http://secondlife.com/app/search/notfound.html
+			</string>
+			<string name="default_search_page">
+				"http://secondlife.com/app/showcase/index.php?"
+			</string>
+		</panel>
+		<panel label="Venta de Terrenos" name="land_sales_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+				Ninguno encontrado.
+			</string>
+			<string name="land_help_text">
+				El terreno puede comprarse directamente en la moneda del mundo ([CURRENCY]) , o con [CURRENCY] o [REALCURRENCY]. en una
 subasta. Para comprarlo directamente, visítalo y pulsa en el nombre del terreno en la barra superior del visor.					
-					</string>
-					<text name="find">
-						  Buscar:
-					</text>
-					<check_box label="Contenido PG" name="incpg"/>
-					<check_box label="Contenido Mature" name="incmature"/>
-					<check_box label="Contenido Adulto" name="incadult"/>
-					<combo_box name="type">
-						  <combo_item name="AllTypes" value="All Types">
-								 Todos los tipos
-						  </combo_item>
-						  <combo_item name="Auction" value="Auction">
-								 Subasta
-						  </combo_item>
-						  <combo_item name="MainlandSales" value="Mainland Sales">
-								 En Venta - Mainland
-						  </combo_item>
-						  <combo_item name="EstateSales" value="Estate Sales">
-								 En Venta - Estado
-						  </combo_item>
-					</combo_box>
-					<check_box label="Precio &#8804; " name="pricecheck"/>
-					<text name="pricecheck_symbol">
-						  [CURRENCY]
-					</text>
-					<check_box label="Superficie &#8805; " name="areacheck"/>
-					<text name="areacheck_symbol">
-						  m²
-					</text>
-					<line_editor name="priceedit"/>
-					<line_editor name="areaedit"/>
-					<button label="Buscar" label_selected="Buscar" name="Search"/>
-					<scroll_list name="results">
-						  <column label="" name="icon"/>
-						  <column label="" name="type"/>
-						  <column label="Nombre" name="name" />
-						  <column label="Tipo" name="landtype"/>
-						  <column label="Precio [CURRENCY]" name="price"/>
-						  <column label="Superifice" name="area"/>
-						  <column label="[CURRENCY]/m²" name="per_meter"/>
-					</scroll_list>
-					<text name="result_text"/>
-					<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
-					<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
-			 </panel>
-			 <panel label="Lugares" name="places_panel">
-					<string name="searching_text">
-						  Buscando...
-					</string>
-					<string name="not_found_text">
-						  Ninguno Encontrado.
-					</string>
-					<text name="find">
-						  Buscar:
-					</text>
-					<line_editor name="name"/>
-					<check_box label="Contenido PG" name="incpg"/>
-					<check_box label="Contenido Mature" name="incmature"/>
-					<check_box label="Contenido Adulto" name="incadult"/>
-					<combo_box name="Category">
-						  <combo_item name="AnyCategory" value="any">
-								 Cualquier Categoría
-						  </combo_item>
-						  <combo_item name="LindenLocation" value="linden">
-								 Localización Linden
-						  </combo_item>
-						  <combo_item name="Arts&amp;Culture" value="arts">
-								 Arte y Cultura
-						  </combo_item>
-						  <combo_item name="Business" value="store">
-								 Negocios
-						  </combo_item>
-						  <combo_item name="Educational" value="educational">
-								 Educacional
-						  </combo_item>
-						  <combo_item name="Gaming" value="game">
-								 Juegos de Azar
-						  </combo_item>
-						  <combo_item name="Hangout" value="gather">
-								 Entretenimiento
-						  </combo_item>
-						  <combo_item name="NewcomerFriendly" value="newcomer">
-								 Para recién llegados
-						  </combo_item>
-						  <combo_item name="Parks&amp;Nature" value="park">
-								 Parques y Naturaleza
-						  </combo_item>
-						  <combo_item name="Residential" value="home">
-								 Residencial
-						  </combo_item>
-						  <combo_item name="Shopping" value="shopping">
-								 Compras
-						  </combo_item>
-						  <combo_item name="Other" value="other">
-								 Otra
-						  </combo_item>
-						  <combo_item name="Rental" value="rental">
-								 Alquiler
-						  </combo_item>
-					</combo_box>
-						  <!-- This is used only during the AO transition and can be deleted once the AO transition is
-						  complete. It is identical to the combo box above except that it has the Adult category. 
-						  You might also want to set it back to default visible and enabled. -->
-					<combo_box name="Category_Adult">
-						  <combo_item name="AnyCategory" value="any">
-								 Cualquier Categoría
-						  </combo_item>
-						  <combo_item name="LindenLocation" value="linden">
-								 Localización Linden
-						  </combo_item>				
-						  <combo_item name="Adult" value="adult">
-								 Adulto
-						  </combo_item>
-						  <combo_item name="Arts&amp;Culture" value="arts">
-								 Arte y Cultura
-						  </combo_item>
-						  <combo_item name="Business" value="store">
-								 Negocios
-						  </combo_item>
-						  <combo_item name="Educational" value="educational">
-								 Educacional
-						  </combo_item>
-						  <combo_item name="Gaming" value="game">
-								 Juegos de Azar
-						  </combo_item>
-						  <combo_item name="Hangout" value="gather">
-								 Entretenimiento
-						  </combo_item>
-						  <combo_item name="NewcomerFriendly" value="newcomer">
-								 Para recién llegados
-						  </combo_item>
-						  <combo_item name="Parks&amp;Nature" value="park">
-								 Parques y Naturaleza
-						  </combo_item>
-						  <combo_item name="Residential" value="home">
-								 Residencial
-						  </combo_item>
-						  <combo_item name="Shopping" value="shopping">
-								 Compras
-						  </combo_item>
-						  <combo_item name="Other" value="other">
-								 Otra
-						  </combo_item>
-						  <combo_item name="Rental" value="rental">
-								 Alquiler
-						  </combo_item>						  
-					</combo_box>
-					<button label="Buscar" label_selected="Buscar" name="Search"/>
-					<scroll_list name="results">
-						  <column label="" name="icon"/>
-						  <column label="" name="type"/>
-						  <column label="Nombre" name="name" />
-						  <column label="Tráfico" name="dwell"/>
-					</scroll_list>
-					<text name="result_text"/>
-					<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
-					<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
-			 </panel>
-			 <panel label="Personas" name="people_panel">
-					<string name="searching_text">
-						  Buscando...
-					</string>
-					<string name="not_found_text">
-						  Nadie Encontrado.
-					</string>
-					<text name="find">
-						  Buscar:
-					</text>
-					<line_editor name="name"/>
-					<button label="Buscar" label_selected="Buscar" name="Search"/>
-					<scroll_list name="results">
-						  <column label="" name="icon"/>
-						  <column label="" name="type"/>
-						  <column label="Nombre" name="name"/>
-					</scroll_list>
-					<text name="result_text"/>
-					<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
-					<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
-			 </panel>
-			 <panel label="Grupos" name="groups_panel">
-					<string name="searching_text">
-						  Buscando...
-					</string>
-					<string name="not_found_text">
-						  Ninguno Encontrado.
-					</string>
-					<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
-					<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
-					<text name="find">
-						  Buscar:
-					</text>
-					<line_editor name="name"/>
-					<button label="Buscar" label_selected="Buscar" name="Search"/>
-					<check_box label="Contenido PG" name="incpg"/>
-					<check_box label="Contenido Mature" name="incmature"/>
-					<check_box label="Contenido Adulto" name="incadult"/>
-					<scroll_list name="results">
-						  <column label="" name="icon"/>
-						  <column label="" name="type"/>
-						  <column label="Nombre" name="name" />
-						  <column label="Miembros" name="members"/>
-						  <column label="" name="score"/>
-					</scroll_list>
-					<text name="result_text"/>
-			 </panel>
-	  </tab_container>
-	  <panel name="classified_details_panel"/>
-	  <panel name="Panel Avatar"/>
-	  <panel name="event_details_panel"/>
-	  <panel name="group_details_panel_holder">
-			 <panel name="group_details_panel"/>
-	  </panel>
-	  <panel name="place_details_panel"/>
-	  <panel name="place_details_small_panel"/>
+			</string>
+			<text name="find">
+				Buscar:
+			</text>
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Contenido Mature" name="incmature"/>
+			<check_box label="Contenido Adulto" name="incadult"/>
+			<combo_box name="type">
+				<combo_item name="AllTypes">
+					Todos los tipos
+				</combo_item>
+				<combo_item name="Auction">
+					Subasta
+				</combo_item>
+				<combo_item name="MainlandSales">
+					En Venta - Mainland
+				</combo_item>
+				<combo_item name="EstateSales">
+					En Venta - Estado
+				</combo_item>
+			</combo_box>
+			<check_box label="Precio &#8804; " name="pricecheck"/>
+			<text name="pricecheck_symbol">
+				[CURRENCY]
+			</text>
+			<check_box label="Superficie &#8805; " name="areacheck"/>
+			<text name="areacheck_symbol">
+				m²
+			</text>
+			<line_editor name="priceedit"/>
+			<line_editor name="areaedit"/>
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<scroll_list name="results">
+				<column label="Nombre" name="name"/>
+				<column label="Tipo" name="landtype"/>
+				<column label="Precio [CURRENCY]" name="price"/>
+				<column label="Superifice" name="area"/>
+				<column label="[CURRENCY]/m²" name="per_meter"/>
+			</scroll_list>
+			<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
+			<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+		</panel>
+		<panel label="Lugares" name="places_panel">
+			<string name="searching_text">
+				  Buscando...
+			</string>
+			<string name="not_found_text">
+				  Ninguno Encontrado.
+			</string>
+			<text name="find">
+				  Buscar:
+			</text>
+			<line_editor name="name"/>
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Contenido Mature" name="incmature"/>
+			<check_box label="Contenido Adulto" name="incadult"/>
+			<combo_box name="Category">
+				<combo_item name="AnyCategory">
+					Cualquier Categoría
+				</combo_item>
+				<combo_item name="LindenLocation">
+					Localización Linden
+				</combo_item>
+				<combo_item name="Arts&amp;Cultures">
+					Arte y Cultura
+				</combo_item>
+				<combo_item name="Business">
+					Negocios
+				</combo_item>
+				<combo_item name="Educational">
+					Educacional
+				</combo_item>
+				<combo_item name="Gaming">
+					Juegos de Azar
+				</combo_item>
+				<combo_item name="Hangout">
+					Entretenimiento
+				</combo_item>
+				<combo_item name="NewcomerFriendly">
+					Para recién llegados
+				</combo_item>
+				<combo_item name="Parks&amp;Nature">
+					Parques y Naturaleza
+				</combo_item>
+				<combo_item name="Residential">
+					Residencial
+				</combo_item>
+				<combo_item name="Shopping">
+					Compras
+				</combo_item>
+				<combo_item name="Other">
+					Otra
+				</combo_item>
+				<combo_item name="Rental">
+					Alquiler
+				</combo_item>
+			</combo_box>
+			<!-- This is used only during the AO transition and can be deleted once the AO transition is
+				  complete. It is identical to the combo box above except that it has the Adult category. 
+				  You might also want to set it back to default visible and enabled. -->
+			<combo_box name="Category_Adult">
+				<combo_item name="AnyCategory">
+					Cualquier Categoría
+				</combo_item>
+				<combo_item name="LindenLocation">
+					Localización Linden
+				</combo_item>
+				<combo_item name="Adult">
+					Adulto
+				</combo_item>
+				<combo_item name="Arts&amp;Culture">
+					Arte y Cultura
+				</combo_item>
+				<combo_item name="Business">
+					Negocios
+				</combo_item>
+				<combo_item name="Educational">
+					Educacional
+				</combo_item>
+				<combo_item name="Gaming">
+					Juegos de Azar
+				</combo_item>
+				<combo_item name="Hangout">
+					Entretenimiento
+				</combo_item>
+				<combo_item name="NewcomerFriendly">
+					Para recién llegados
+				</combo_item>
+				<combo_item name="Parks&amp;Nature">
+					Parques y Naturaleza
+				</combo_item>
+				<combo_item name="Residential">
+					Residencial
+				</combo_item>
+				<combo_item name="Shopping">
+					Compras
+				</combo_item>
+				<combo_item name="Other">
+					Otra
+				</combo_item>
+				<combo_item name="Rental">
+					Alquiler
+				</combo_item>
+			</combo_box>
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<scroll_list name="results">
+				  <column label="Nombre" name="name" />
+				  <column label="Tráfico" name="dwell"/>
+			</scroll_list>
+			<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
+			<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+		</panel>
+		<panel label="Personas" name="people_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+				Nadie Encontrado.
+			</string>
+			<text name="find">
+				Buscar:
+			</text>
+			<line_editor name="name"/>
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<scroll_list name="results">
+				<column label="Nombre" name="name"/>
+			</scroll_list>
+			<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
+			<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+		</panel>
+		<panel label="Grupos" name="groups_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+				Ninguno Encontrado.
+			</string>
+			<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
+			<button label="&lt; Anterior" label_selected="&lt; Anterior" name="&lt; Prev"/>
+			<text name="find">
+				Buscar:
+			</text>
+			<line_editor name="name"/>
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Contenido Mature" name="incmature"/>
+			<check_box label="Contenido Adulto" name="incadult"/>
+			<scroll_list name="results">
+				<column label="Nombre" name="name"/>
+				<column label="Miembros" name="members"/>
+			</scroll_list>
+			<text name="result_text"/>
+		</panel>
+	</tab_container>
+	<panel name="Panel Avatar"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_display_name.xml b/indra/newview/skins/default/xui/es/floater_display_name.xml
index 299c78256..d108278c2 100644
--- a/indra/newview/skins/default/xui/es/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/es/floater_display_name.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Display Name" title="CAMBIAR TU NOMBRE A MOSTRAR">
-	  <text name="lockout_text">
-			 No puedes cambiar el nombre mostrado hasta: [TIME].
-	  </text>
-	  <text name="set_name_label">
-			 Nuevo Nombre a Mostrar:
-	  </text>
-	  <line_editor name="display_name_editor"/>
-	  <text name="name_confirm_label">
-			 Vuelve a escribir tu nombre nuevo para confirmarlo:
-	  </text>
-	  <line_editor name="display_name_confirm"/>
-	  <button label="Guardar" name="save_btn" tool_tip="Guardar tu nuevo Nombre a Mostrar" />
-	  <button label="Restablecer" name="reset_btn" tool_tip="Hacer que tu Nombre a Mostrar sea el mismo que tu nombre de usuario" />
-	  <button label="Cancelar" name="cancel_btn" tool_tip="Cancelar y cerrar esta ventana" />
-	  <text name="name_confirm_label2"  bottom_delta="-23">
-			 El nombre que le has dado a tu avatar se denomina 
+<floater name="Display Name" title="Cambiar Tu Nombre A Mostrar">
+	<text name="lockout_text">
+		No puedes cambiar el nombre mostrado hasta: [TIME].
+	</text>
+	<text name="set_name_label">
+		Nuevo Nombre a Mostrar:
+	</text>
+	<line_editor name="display_name_editor"/>
+	<text name="name_confirm_label">
+		Vuelve a escribir tu nombre nuevo para confirmarlo:
+	</text>
+	<line_editor name="display_name_confirm"/>
+	<button label="Guardar" name="save_btn" tool_tip="Guardar tu nuevo Nombre a Mostrar" />
+	<button label="Restablecer" name="reset_btn" tool_tip="Hacer que tu Nombre a Mostrar sea el mismo que tu nombre de usuario" />
+	<button label="Cancelar" name="cancel_btn" tool_tip="Cancelar y cerrar esta ventana" />
+	<text name="name_confirm_label2"  bottom_delta="-23">
+		El nombre que le has dado a tu avatar se denomina 
 Nombre a Mostrar.
-	  </text>
-	  <text name="name_confirm_label3"  bottom_delta="-30">
-			 Puedes cambiarlo una vez a la semana.
-	  </text>
+	</text>
+	<text name="name_confirm_label3"  bottom_delta="-30">
+		Puedes cambiarlo una vez a la semana.
+	</text>
 </floater>
     
diff --git a/indra/newview/skins/default/xui/es/floater_env_settings.xml b/indra/newview/skins/default/xui/es/floater_env_settings.xml
index 133997fb7..855fb2c3d 100644
--- a/indra/newview/skins/default/xui/es/floater_env_settings.xml
+++ b/indra/newview/skins/default/xui/es/floater_env_settings.xml
@@ -1,29 +1,25 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Environment Editor Floater" title="Editor de Entorno">
-	  <text name="EnvTimeText">
-			 Duración del Día:
-	  </text>
-	  <text name="EnvTimeText2">
-			 12:00 PM
-	  </text>
-	  <icon name="EnvDayCycle"/>
-	  <slider label="" name="EnvTimeSlider"/>
-	  <text name="EnvCloudText">
-			 Nubosidad
-	  </text>
-	  <slider label="" name="EnvCloudSlider"/>
-	  <text name="EnvWaterColorText">
-			 Color del
+	<text name="EnvTimeText">
+		Duración del Día:
+	</text>
+	<text name="EnvTimeText2">
+		12:00 PM
+	</text>
+	<text name="EnvCloudText">
+		Nubosidad
+	</text>
+	<text name="EnvWaterColorText">
+		Color del
 Agua
-	  </text>
-	  <color_swatch label="" name="EnvWaterColor" tool_tip="Pulsa para abrir el Selector de Color" />
-	  <text name="EnvWaterFogText">
-			 Claridad del 
+	</text>
+	<color_swatch name="EnvWaterColor" tool_tip="Pulsa para abrir el Selector de Color" />
+	<text name="EnvWaterFogText">
+		Claridad del 
 Agua
-	  </text>
-	  <slider label="" name="EnvWaterFogSlider"/>
-	  <button label="Usar Horario del Estado" name="EnvUseEstateTimeButton"/>
-	  <button label="Cielo Avanzado" name="EnvAdvancedSkyButton"/>
-	  <button label="Agua Avanzada" name="EnvAdvancedWaterButton"/>
-	  <button label="?" name="EnvSettingsHelpButton"/>
+	</text>
+	<button label="Usar Horario del Estado" name="EnvUseEstateTimeButton"/>
+	<button label="Cielo Avanzado" name="EnvAdvancedSkyButton"/>
+	<button label="Agua Avanzada" name="EnvAdvancedWaterButton"/>
+	<button label="?" name="EnvSettingsHelpButton"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_gesture.xml b/indra/newview/skins/default/xui/es/floater_gesture.xml
index 06560f600..2fd2cbcd4 100644
--- a/indra/newview/skins/default/xui/es/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/es/floater_gesture.xml
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="gestures" title="Gestos Activos">
-	  <text name="help_label">
-			 Pulsa dos veces en un gesto para reproducir las animaciones
-	  </text>
-	  <scroll_list name="gesture_list">
-			 <column label="Disparador" name="trigger" width="75"/>
-			 <column label="Tecla" name="shortcut"/>
-			 <column label="" name="key"/>
-			 <column label="Nombre" name="name"/>
-	  </scroll_list>
-	  <button label="Nueva" name="new_gesture_btn"/>
-	  <!--
-	  <button bottom_delta="0" follows="bottom|right" height="20" label="Inventory"
-			 left_delta="89" name="inventory_btn" width="83" />
-	  -->
-	  <button label="Editar" name="edit_btn"/>
-	  <button label="Reproducir" name="play_btn"/>
-	  <button label="Detener" name="stop_btn"/>
+	<text name="help_label">
+		Pulsa dos veces en un gesto para reproducir las animaciones
+	</text>
+	<scroll_list name="gesture_list">
+		<column label="Disparador" name="trigger" width="75"/>
+		<column label="Tecla" name="shortcut"/>
+		<column label="Nombre" name="name"/>
+	</scroll_list>
+	<button label="Nueva" name="new_gesture_btn"/>
+	<!--
+	<button label="Inventory" name="inventory_btn"/>
+	-->
+	<button label="Editar" name="edit_btn"/>
+	<button label="Reproducir" name="play_btn"/>
+	<button label="Detener" name="stop_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
index ff23c256d..831158db6 100644
--- a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Hardware Settings Floater" title="Opciones del Dispositivo">
-	  <text name="Filtering:">
-			 Filtrado:
-	  </text>
-	  <check_box label="Filtrado Anisotrópico (más lento si se activa)" name="ani"/>
-	  <text name="Antialiasing:">
-			 Antialiasing:
-	  </text>
-	  <combo_box label="Antialiasing" name="fsaa">
-			 <combo_item name="FSAADisabled" value="0">
-					Desactivado
-			 </combo_item>
-			 <combo_item name="2x" value="2">
-					2x
-			 </combo_item>
-			 <combo_item name="4x" value="4">
-					4x
-			 </combo_item>
-			 <combo_item name="8x" value="8">
-					8x
-			 </combo_item>
-			 <combo_item name="16x" value="16">
-					16x
-			 </combo_item>
-	  </combo_box>
-	  <spinner label="Gama:" name="gamma"/>
-	  <text name="(brightness, lower is brighter)">
-			 (brillo; menor es más brillante, 0=predeterminado)
-	  </text>
-	  <text name="Enable VBO:">
-			 Activar VBO:
-	  </text>
-	  <check_box label="Activar OpenGL Vertex Buffer Objects" name="vbo" tool_tip="En hardware moderno, habilitar esta opción mejora el rendimiento. Pero en hardware antiguo, el habilitarlo hace que, frecuentemente, se obtenga una implementación pobre de VBO, lo que puede provocarle caídas."/>
-	  <check_box label="Activar Streamed VBOs" left="157" name="vbo_stream" tool_tip="Desactivar esta opción puede mejorar el rendimiento cuando se habilita VBO. Desactivarlo produce una mejora visible en diversas GPUs de AMD."/>
-	  <text name="Enable FBO:">
-			 Activar Framebuffer Objects:
-	  </text>
-	  <check_box label="Activar OpenGL Frame Buffer Objects" name="fbo" tool_tip="Habilitar esta opción en hardware moderno puede proporcionar una mejora en el rendimiento. Sin embargo, si se habilita en combinacoón con el antialiasing en GPUs de AMD pueden causar problemas de mezcla de texturas. Este ajuste es necesario para renderizado diferido.."/>
-	  <slider label="Memoria para Texturas (MB):" name="GrapicsCardTextureMemory" tool_tip="Cantidad de memoria asignada a las texturas. Por defecto es la memoria de la tarjeta de vídeo. Reducir esta cantidad puede mejorar el rendimiento, pero también puede hacer que las texturas se vean borrosas."/>
-	  <spinner label="Intensidad de la Niebla:" name="fog"/>
-	  <text name="note">
-			 Nota: Las configuraciones de Gama e Intensidad de la Niebla no están
+	<text name="Filtering:">
+		Filtrado:
+	</text>
+	<check_box label="Filtrado Anisotrópico (más lento si se activa)" name="ani"/>
+	<text name="Antialiasing:">
+		Antialiasing:
+	</text>
+	<combo_box label="Antialiasing" name="fsaa">
+		<combo_item name="FSAADisabled" value="0">
+			Desactivado
+		</combo_item>
+		<combo_item name="2x" value="2">
+			2x
+		</combo_item>
+		<combo_item name="4x" value="4">
+			4x
+		</combo_item>
+		<combo_item name="8x" value="8">
+			8x
+		</combo_item>
+		<combo_item name="16x" value="16">
+			16x
+		</combo_item>
+	</combo_box>
+	<spinner label="Gama:" name="gamma"/>
+	<text name="(brightness, lower is brighter)">
+		(brillo; menor es más brillante, 0=predeterminado)
+	</text>
+	<text name="Enable VBO:">
+		Activar VBO:
+	</text>
+	<check_box label="Activar OpenGL Vertex Buffer Objects" name="vbo" tool_tip="En hardware moderno, habilitar esta opción mejora el rendimiento. Pero en hardware antiguo, el habilitarlo hace que, frecuentemente, se obtenga una implementación pobre de VBO, lo que puede provocarle caídas."/>
+	<check_box label="Activar Streamed VBOs" left="157" name="vbo_stream" tool_tip="Desactivar esta opción puede mejorar el rendimiento cuando se habilita VBO. Desactivarlo produce una mejora visible en diversas GPUs de AMD."/>
+	<text name="Enable FBO:">
+		Activar Framebuffer Objects:
+	</text>
+	<check_box label="Activar OpenGL Frame Buffer Objects" name="fbo" tool_tip="Habilitar esta opción en hardware moderno puede proporcionar una mejora en el rendimiento. Sin embargo, si se habilita en combinacoón con el antialiasing en GPUs de AMD pueden causar problemas de mezcla de texturas. Este ajuste es necesario para renderizado diferido.."/>
+	<slider label="Memoria para Texturas (MB):" name="GrapicsCardTextureMemory" tool_tip="Cantidad de memoria asignada a las texturas. Por defecto es la memoria de la tarjeta de vídeo. Reducir esta cantidad puede mejorar el rendimiento, pero también puede hacer que las texturas se vean borrosas."/>
+	<spinner label="Intensidad de la Niebla:" name="fog"/>
+	<text name="note">
+		Nota: Las configuraciones de Gama e Intensidad de la Niebla no están
 disponibles cuando se activan las Sombras de la Atmósfera.
-	  </text>
-	  <button label="OK" label_selected="OK"name="OK"/>
+	</text>
+	<button label="OK" label_selected="OK" name="OK"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_html.xml b/indra/newview/skins/default/xui/es/floater_html.xml
index 4ed62caf4..db56ff9d1 100644
--- a/indra/newview/skins/default/xui/es/floater_html.xml
+++ b/indra/newview/skins/default/xui/es/floater_html.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="htmlfloater" title="">
-	  <button label="Cerrar" name="close_btn"/>
-	  <web_browser name="html_floater_browser"/>
-	  <button label="Volver" name="back_btn"/>
-	  <button label="Avanzar" name="forward_btn"/>
-	  <line_editor name="url_edit" />
-	  <button label="Ir" name="go_btn"/>
-	  <string name="home_page_url">
-			 http://www.secondlife.com
-	  </string>
-	  <string name="support_page_url">
-			 http://wiki.secondlife.com/wiki/Knowledge_Base
-	  </string>
+	<button label="Cerrar" name="close_btn"/>
+	<web_browser name="html_floater_browser"/>
+	<button label="Volver" name="back_btn"/>
+	<button label="Avanzar" name="forward_btn"/>
+	<line_editor name="url_edit"/>
+	<button label="Ir" name="go_btn"/>
+	<string name="home_page_url">
+		http://www.secondlife.com
+	</string>
+	<string name="support_page_url">
+		http://wiki.secondlife.com/wiki/Knowledge_Base/es
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_im.xml b/indra/newview/skins/default/xui/es/floater_im.xml
index c17e81326..55cf5cf51 100644
--- a/indra/newview/skins/default/xui/es/floater_im.xml
+++ b/indra/newview/skins/default/xui/es/floater_im.xml
@@ -1,47 +1,45 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater name="im_floater" title="Mensaje Instantáneo">
-	  <tab_container name="Preview Tabs" />
-			 <string name="only_user_message">
-					Eres el único usuario en la sesión.
-			 </string>
-			 <string name="offline_message">
-					[NAME] está fuera de línea.
-			 </string>
-			 <string name="invite_message">
-					Pulsa el botón [BUTTON NAME] para aceptar/conectar este chat de voz.
-			 </string>
-			 <string name="muted_message">
-					Has ignorado a este residente. Al enviarle un mensaje, automáticamente dejarás de ignorarle.
-			 </string>
-			 <string name="generic_request_error">
-					Error al hacer lo solicitado; por favor, inténtalo más tarde.
-			 </string>
-			 <string name="insufficient_perms_error">
-					No tienes los permisos suficientes.
-			 </string>
-			 <string name="session_does_not_exist_error">
-					La sesión ya acabó
-			 </string>
-			 <string name="no_ability_error">
-					No tienes esa capacidad.
-			 </string>
-			 <string name="not_a_mod_error">
-					No eres un moderador de la sesión.
-			 </string>
-			 <string name="muted_error">
-					Un moderador del grupo ha desactivado tu chat de texto.
-			 </string>
-			 <!-- ALL of the event strings should have [RECIPIENT] in them -->
-			 <string name="add_session_event">
-					No se ha podido añadir usuarios a la sesión de chat con [RECIPIENT].
-			 </string>
-			 <string name="message_session_event">
-					No se ha podido enviar tu mensaje a la sesión de chat con [RECIPIENT].
-			 </string>
-			 <string name="removed_from_group">
-					Has sido expulsado del grupo.
-			 </string>
-			 <string name="close_on_no_ability">
-					Ya no tendrás más la capacidad de estar en la sesión de chat.
-			 </string>
+	<string name="only_user_message">
+		Eres el único usuario en la sesión.
+	</string>
+	<string name="offline_message">
+		[NAME] está fuera de línea.
+	</string>
+	<string name="invite_message">
+		Pulsa el botón [BUTTON NAME] para aceptar/conectar este chat de voz.
+	</string>
+	<string name="muted_message">
+		Has ignorado a este residente. Al enviarle un mensaje, automáticamente dejarás de ignorarle.
+	</string>
+	<string name="generic_request_error">
+		Error al hacer lo solicitado; por favor, inténtalo más tarde.
+	</string>
+	<string name="insufficient_perms_error">
+		No tienes los permisos suficientes.
+	</string>
+	<string name="session_does_not_exist_error">
+		La sesión ya acabó
+	</string>
+	<string name="no_ability_error">
+		No tienes esa capacidad.
+	</string>
+	<string name="not_a_mod_error">
+		No eres un moderador de la sesión.
+	</string>
+	<string name="muted_error">
+		Un moderador del grupo ha desactivado tu chat de texto.
+	</string>
+	<string name="add_session_event">
+		No se ha podido añadir usuarios a la sesión de chat con [RECIPIENT].
+	</string>
+	<string name="message_session_event">
+		No se ha podido enviar tu mensaje a la sesión de chat con [RECIPIENT].
+	</string>
+	<string name="removed_from_group">
+		Has sido expulsado del grupo.
+	</string>
+	<string name="close_on_no_ability">
+		Ya no tendrás más la capacidad de estar en la sesión de chat.
+	</string>
 </multi_floater>
diff --git a/indra/newview/skins/default/xui/es/floater_image_preview.xml b/indra/newview/skins/default/xui/es/floater_image_preview.xml
index dc8542c24..5057dd73d 100644
--- a/indra/newview/skins/default/xui/es/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_image_preview.xml
@@ -1,55 +1,55 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Image Preview" title="">
-	  <text name="name_label">
-			 Nombre:
-	  </text>
-	  <line_editor name="name_form"/>
-	  <text name="description_label">
-			 Descripción:
-	  </text>
-	  <line_editor name="description_form"/>
-	  <text name="preview_label">
+	<text name="name_label">
+		Nombre:
+	</text>
+	<line_editor name="name_form"/>
+	<text name="description_label">
+		Descripción:
+	</text>
+	<line_editor name="description_form"/>
+	<text name="preview_label">
 			 Vista Previa como:
-	  </text>
-	  <combo_box label="Ropa" name="clothing_type_combo">
-			 <combo_item name="Image">
-					Imagen
-			 </combo_item>
-			 <combo_item name="Hair">
-					Pelo
-			 </combo_item>
-			 <combo_item name="FemaleHead">
-					Cabeza Femenina
-			 </combo_item>
-			 <combo_item name="FemaleUpperBody">
-					Cuerpo Superior Femenino
-			 </combo_item>
-			 <combo_item name="FemaleLowerBody">
-					Cuerpo Inferior Femenino
-			 </combo_item>
-			 <combo_item name="MaleHead">
-					Cabeza Masculina
-			 </combo_item>
-			 <combo_item name="MaleUpperBody">
-					Cuerpo Superior Masculino
-			 </combo_item>
-			 <combo_item name="MaleLowerBody">
-					Cuerpo Inferior Masculino
-			 </combo_item>
-			 <combo_item name="Skirt">
-					Falda
-			 </combo_item>
-			 <combo_item name="SculptedPrim">
-					Prim Sculpt
-			 </combo_item>
-	  </combo_box>
-	  <text name="bad_image_text">
-			 No se puede leer la imagen.
+	</text>
+	<combo_box label="Ropa" name="clothing_type_combo">
+		<combo_item name="Image">
+			Imagen
+		</combo_item>
+		<combo_item name="Hair">
+			Pelo
+		</combo_item>
+		<combo_item name="FemaleHead">
+			Cabeza Femenina
+		</combo_item>
+		<combo_item name="FemaleUpperBody">
+			Cuerpo Superior Femenino
+		</combo_item>
+		<combo_item name="FemaleLowerBody">
+			Cuerpo Inferior Femenino
+		</combo_item>
+		<combo_item name="MaleHead">
+			Cabeza Masculina
+		</combo_item>
+		<combo_item name="MaleUpperBody">
+			Cuerpo Superior Masculino
+		</combo_item>
+		<combo_item name="MaleLowerBody">
+			Cuerpo Inferior Masculino
+		</combo_item>
+		<combo_item name="Skirt">
+			Falda
+		</combo_item>
+		<combo_item name="SculptedPrim">
+			Prim Sculpt
+		</combo_item>
+	</combo_box>
+	<text name="bad_image_text">
+		No se puede leer la imagen.
 
 Intenta guardándola como Targa de 24 bits (.tga).
-	  </text>
-	  <check_box label="Usar Compresión sin pérdid" name="lossless_check"/>
-	  <check_box label="Temporaria (Gratis)" name="temp_check" tooltip="Fija el item como temporario, lo cual significa que es gratis pero por un período de tiempo luego del cual, desaparece"/>
-	  <button label="Cancelar" name="cancel_btn"/>
-	  <button label="Subir ([UPLOADFEE])" name="ok_btn"/>
+	</text>
+	<check_box label="Usar Compresión sin pérdid" name="lossless_check"/>
+	<check_box label="Temporaria (Gratis)" name="temp_check" tooltip="Fija el item como temporario, lo cual significa que es gratis pero por un período de tiempo luego del cual, desaparece"/>
+	<button label="Cancelar" name="cancel_btn"/>
+	<button label="Subir ([UPLOADFEE])" name="ok_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inspect.xml b/indra/newview/skins/default/xui/es/floater_inspect.xml
index 7a6ebed49..04238d694 100644
--- a/indra/newview/skins/default/xui/es/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/es/floater_inspect.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floatername="inspect" title="Inspeccionar Objetos">
-	  <scroll_list name="object_list" tool_tip="Elige un objeto de la lista para ubicarlo en el mundo">
-			 <column label="Objeto" name="object_name" />
-			 <column label="Propietario" name="owner_name" />
-			 <column label="Último Propietario" name="last_owner_name" />
-			 <column label="Creador" name="creator_name" />
-			 <column label="Caras" name="face_num" width="35" />
-			 <column label="Vértices" name="vertex_num" width="35" />
-			 <column label="Scripts" name="script_num" width="35" />
-			 <column label="Total Inv." name="inv_num" width="35" />
-			 <column label="Fecha de Creación" name="creation_date" width="150" />
-	  </scroll_list>
-	  <button label="Ver Perfil de Propietario..." label_selected="" name="button owner" tool_tip="Ver Perfil del Propietario del objeto seleccionado"/>
-	  <button label="Ver Perfil del Creador..." label_selected="" name="button creator" tool_tip="Ver Perfil del Creador del objeto seleccionado"/>
+<floater name="inspect" title="Inspeccionar Objetos">
+	<scroll_list name="object_list" tool_tip="Elige un objeto de la lista para ubicarlo en el mundo">
+		<column label="Objeto" name="object_name"/>
+		<column label="Propietario" name="owner_name"/>
+		<column label="Último Propietario" name="last_owner_name"/>
+		<column label="Creador" name="creator_name"/>
+		<column label="Caras" name="face_num" width="35"/>
+		<column label="Vértices" name="vertex_num" width="35"/>
+		<column label="Scripts" name="script_num" width="35"/>
+		<column label="Total Inv." name="inv_num" width="35"/>
+		<column label="Fecha de Creación" name="creation_date" width="150"/>
+	</scroll_list>
+	<button label="Ver Perfil de Propietario..." label_selected="" name="button owner" tool_tip="Ver Perfil del Propietario del objeto seleccionado"/>
+	<button label="Ver Perfil del Creador..." label_selected="" name="button creator" tool_tip="Ver Perfil del Creador del objeto seleccionado"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_instant_message.xml b/indra/newview/skins/default/xui/es/floater_instant_message.xml
index 1e05dd469..3b343be29 100644
--- a/indra/newview/skins/default/xui/es/floater_instant_message.xml
+++ b/indra/newview/skins/default/xui/es/floater_instant_message.xml
@@ -1,54 +1,55 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater label="(desconocido)" name="im_floater" title="(desconocido)">
-	  <string name="answering">
-			 Conectando...
-	  </string>
-	  <string name="ringing">
-			 Llamando...
-	  </string>
-	  <string name="connected">
-			 Conectado, pulsa Colgar para terminar
-	  </string>
-	  <string name="hang_up">
-			 Llamada terminada
-	  </string>
-	  <string name="voice_icon">icn_voice-pvtfocus.tga</string>
-	  <string name="title_string">
-			 Mensaje Instantáneo con [NAME]
-	  </string>
-	  <string name="typing_start_string">
-			 [NAME] está escribiendo...
-	  </string>
-	  <string name="session_start_string">
-			 Iniciando sesión con [NAME], espera por favor.
-	  </string>
-	  <string name="default_text_label">
-			 Pulsa aquí para enviar un Mensaje Instantáneo.
-	  </string>
-	  <string name="unavailable_text_label">
-			 El chat de texto no está disponible para esta llamada.
-	  </string>
-	  <string name="inventory_item_offered">
-			 Ofrecido un Item de Inventario
-	  </string>
-	  <button label="Perfil" name="profile_callee_btn"/>
-	  <button label="Teleportar" name="profile_tele_btn"/>
-	  <button label="Historial" name="history_btn"/>
-	  <check_box name="rp_mode">
-			 Modo RP
-	  </check_box>
-	  <button label="Llamar" name="start_call_btn"/>
-	  <button label="Colgar" name="end_call_btn"/>
-	  <panel name="speaker_controls">
-			 <volume_slider name="speaker_volume"/>
-			 <button label="" name="mute_btn" tool_tip="Silenciar la Voz" width="25"/>
-	  </panel>
-	  <text_editor name="im_history" />
-	  <line_editor label="Pulsa aquí para iniciar un Mensaje Instantáneo" name="chat_editor"/>
-	  <button label="Enviar" name="send_btn"/>
-	  <string name="live_help_dialog">
-			 *** Bienvenido a la Petición de Ayuda *** 
+	<string name="answering">
+		Conectando...
+	</string>
+	<string name="ringing">
+		Llamando...
+	</string>
+	<string name="connected">
+		Conectado, pulsa Colgar para terminar
+	</string>
+	<string name="hang_up">
+		Llamada terminada
+	</string>
+	<string name="voice_icon">
+		icn_voice-pvtfocus.tga
+	</string>
+	<string name="title_string">
+		Mensaje Instantáneo con [NAME]
+	</string>
+	<string name="typing_start_string">
+		[NAME] está escribiendo...
+	</string>
+	<string name="session_start_string">
+		Iniciando sesión con [NAME], espera por favor...
+	</string>
+	<string name="default_text_label">
+		Pulsa aquí para enviar un Mensaje Instantáneo.
+	</string>
+	<string name="unavailable_text_label">
+		El chat de texto no está disponible para esta llamada.
+	</string>
+	<string name="inventory_item_offered">
+		Ofrecido un Item de Inventario
+	</string>
+	<button label="Perfil" name="profile_callee_btn"/>
+	<button label="Teleportar" name="profile_tele_btn"/>
+	<button label="Historial" name="history_btn"/>
+	<check_box name="rp_mode">
+		Modo RP
+	</check_box>
+	<button label="Llamar" name="start_call_btn"/>
+	<button label="Colgar" name="end_call_btn"/>
+	<panel name="speaker_controls">
+		<button label="" name="mute_btn" tool_tip="Silenciar la Voz" width="25"/>
+	</panel>
+	<line_editor label="Pulsa aquí para iniciar un Mensaje Instantáneo" name="chat_editor"/>
+	<button label="Enviar" name="send_btn"/>
+	<string name="live_help_dialog">
+		*** Bienvenido a la Petición de Ayuda *** 
 Por favor, en primer lugar revisa nuestras páginas de ayuda de SL pulsando F1, o accede a la Base de Conocimientos http://secondlife.com/knowledgebase/ 
 Si no encuentras allí la respuesta que buscas, por favor, empiecza el proceso escribiendo tu pregunta, y espera unos momentos a que responda algún ayudante que esté disponible.
--=-=- El tiempo de respuesta puede variar, especialmente durante las horas punta -=-=-	  
+-=-=- El tiempo de respuesta puede variar, especialmente durante las horas punta -=-=-
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_instant_message_ad_hoc.xml b/indra/newview/skins/default/xui/es/floater_instant_message_ad_hoc.xml
index dc2f6ef45..3874d0768 100644
--- a/indra/newview/skins/default/xui/es/floater_instant_message_ad_hoc.xml
+++ b/indra/newview/skins/default/xui/es/floater_instant_message_ad_hoc.xml
@@ -1,43 +1,42 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater label="(desconocido)" name="im_floater" title="(desconocido)">
-	  <string name="ringing">
-			 Conectando el chat de voz...
-	  </string>
-	  <string name="connected">
-			 Conectado, pulsa Colgar para terminar
-	  </string>
-	  <string name="hang_up">
-			Salir del chat de voz
-	  </string>
-	  <string name="voice_icon">
-			 icn_voice-groupfocus.tga
-	  </string>
-	  <string name="title_string">
-			 Mensaje Instantáneo con [NAME]
-	  </string>
-	  <string name="typing_start_string">
-			 [NAME] está escribiendo...
-	  </string>
-	  <string name="session_start_string">
-			 Iniciando sesión con [NAME], espera por favor.
-	  </string>
-	  <string name="default_text_label">
-			 Pulsa aquí para enviar un Mensaje Instantáneo.
-	  </string>
-	  <layout_stack name="panels">
-			 <layout_panel name="im_contents_panel">
-					<button label="Llamar" name="start_call_btn"/>
-					<button label="Colgar" name="end_call_btn"/>
-					<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Pulse aquí para moverse por la lista de participantes activos en esta sesión de MI."/>
-					<text_editor name="im_history" />
-					<line_editor label="Pulsa aquí para enviar un Mensaje Instantáneo" name="chat_editor" />
-					<button label="Enviar" name="send_btn"/>
-			 </layout_panel>
-			 <layout_panel name="active_speakers_panel"/>
-	  </layout_stack>
-	  <string name="live_help_dialog">
-			 *** Bienvenido a la Petición de Ayuda *** 
+	<string name="ringing">
+		Conectando el chat de voz...
+	</string>
+	<string name="connected">
+		Conectado, pulsa Colgar para terminar
+	</string>
+	<string name="hang_up">
+		Salir del chat de voz
+	</string>
+	<string name="voice_icon">
+		icn_voice-groupfocus.tga
+	</string>
+	<string name="title_string">
+		Mensaje Instantáneo con [NAME]
+	</string>
+	<string name="typing_start_string">
+		[NAME] está escribiendo...
+	</string>
+	<string name="session_start_string">
+		Iniciando sesión con [NAME], espera por favor...
+	</string>
+	<string name="default_text_label">
+		Pulsa aquí para enviar un Mensaje Instantáneo.
+	</string>
+	<layout_stack name="panels">
+		<layout_panel name="im_contents_panel">
+			<button label="Llamar" name="start_call_btn"/>
+			<button label="Colgar" name="end_call_btn"/>
+			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Pulse aquí para moverse por la lista de participantes activos en esta sesión de IM."/>
+			<line_editor label="Pulsa aquí para enviar un Mensaje Instantáneo" name="chat_editor"/>
+			<button label="Enviar" name="send_btn"/>
+		</layout_panel>
+	</layout_stack>
+	<string name="live_help_dialog">
+		*** Bienvenido a la Petición de Ayuda *** 
 Por favor, en primer lugar revisa nuestras páginas de ayuda de SL pulsando F1, o accede a la Base de Conocimientos http://secondlife.com/knowledgebase/ 
 Si no encuentras allí la respuesta que buscas, por favor, empieza el proceso escribiendo tu pregunta, y espera unos momentos a que responda algunos de los ayudantes disponibles.
--=-=- El tiempo de respuesta puede variar, especialmente durante las horas punta -=-=-	  
+-=-=- El tiempo de respuesta puede variar, especialmente durante las horas punta -=-=-
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_instant_message_group.xml b/indra/newview/skins/default/xui/es/floater_instant_message_group.xml
index 60c4a1508..24bc78978 100644
--- a/indra/newview/skins/default/xui/es/floater_instant_message_group.xml
+++ b/indra/newview/skins/default/xui/es/floater_instant_message_group.xml
@@ -1,50 +1,49 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater label="(desconocido)" name="im_floater" title="(desconocido)">
-	  <string name="ringing">
-			 Joining Voice Chat...
-	  </string>
-	  <string name="connected">
-			 Connected, click End Call to hang up
-	  </string>
-	  <string name="hang_up">
-			 Left Voice Chat
-	  </string>
-	  <string name="voice_icon">
-			 icn_voice-groupfocus.tga
-	  </string>
-	  <string name="title_string">
-			 Instant Message with [NAME]
-	  </string>
-	  <string name="typing_start_string">
-			 [NAME] is typing...
-	  </string>
-	  <string name="session_start_string">
-			 Starting session with [NAME], please wait.
-	  </string>
-	  <string name="default_text_label">
-			 Click here to instant message.
-	  </string>
-	  <string name="moderated_chat_label">
-			 (Moderated: Voices off by default)
-	  </string>
-	  <string name="muted_text_label">
-			 Your text chat has been disabled by a Group Moderator.
-	  </string>
-	  <layout_stack name="panels">
-			 <layout_panel name="im_contents_panel" >
-					<button label="Group Info" name="group_info_btn"/>
-					<button label="Join Call" name="start_call_btn"/>
-					<button label="End Call" name="end_call_btn"/>
-					<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Click here to toggle a list of active participants in this IM session."/>
-					<text_editor name="im_history"/>
-					<line_editor name="chat_editor"/>
-					<button label="Enviar" name="send_btn"/>
-			 </layout_panel>
-			 <layout_panel name="active_speakers_panel"/>
-	  </layout_stack>
-	  <string name="live_help_dialog">
-			 *** Bienvenido a la Petición de Ayuda *** 
+	<string name="ringing">
+		Joining Voice Chat...
+	</string>
+	<string name="connected">
+		Connected, click End Call to hang up
+	</string>
+	<string name="hang_up">
+		Left Voice Chat
+	</string>
+	<string name="voice_icon">
+		icn_voice-groupfocus.tga
+	</string>
+	<string name="title_string">
+		Instant Message with [NAME]
+	</string>
+	<string name="typing_start_string">
+		[NAME] is typing...
+	</string>
+	<string name="session_start_string">
+		Starting session with [NAME], please wait.
+	</string>
+	<string name="default_text_label">
+		Click here to instant message.
+	</string>
+	<string name="moderated_chat_label">
+		(Moderated: Voices off by default)
+	</string>
+	<string name="muted_text_label">
+		Your text chat has been disabled by a Group Moderator.
+	</string>
+	<layout_stack name="panels">
+		<layout_panel name="im_contents_panel">
+			<button label="Group Info" name="group_info_btn"/>
+			<button label="Join Call" name="start_call_btn"/>
+			<button label="End Call" name="end_call_btn"/>
+			<button label="Historial" name="history_btn"/>
+			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Click here to toggle a list of active participants in this IM session."/>
+			<button label="Enviar" name="send_btn"/>
+		</layout_panel>
+	</layout_stack>
+	<string name="live_help_dialog">
+		*** Bienvenido a la Petición de Ayuda *** 
 Por favor, en primer lugar revisa nuestras páginas de ayuda de SL pulsando F1, o accede a la Base de Conocimientos http://secondlife.com/knowledgebase/ 
 Si no encuentras allí la respuesta que buscas, por favor, empieza el proceso escribiendo tu pregunta, y espera unos momentos a que responda algunos de los ayudantes disponibles.
--=-=- El tiempo de respuesta puede variar, especialmente durante las horas punta -=-=-	  
+-=-=- El tiempo de respuesta puede variar, especialmente durante las horas punta -=-=-
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
index 17af8b173..b82689d35 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
@@ -1,89 +1,85 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="item properties" title="Propiedades de los Items de Inventario">
-	  <icon name="IconLocked"/>
-	  <text name="LabelItemNameTitle">
-			 Nombre:
-	  </text>
-	  <line_editor name="LabelItemName"/>
-	  <text name="LabelItemDescTitle">
-			 Descripción:
-	  </text>
-	  <line_editor name="LabelItemDesc"/>
-	  <text name="LabelCreatorTitle">
-			 Creador:
-	  </text>
-	  <text name="LabelCreatorName" >
-			 Nicole Linden
-	  </text>
-	  <button label="Perfil..." label_selected="" name="BtnCreator"/>
-	  <text name="LabelOwnerTitle">
-			 Propietario:
-	  </text>
-	  <text name="LabelOwnerName">
-			 Thrax Linden
-	  </text>
-	  <button label="Perfil..." label_selected="" name="BtnOwner"/>
-	  <text name="LabelAcquiredTitle">
-			 Adquirido:
-	  </text>
-	  <text name="LabelAcquiredDate">
-			 Mie May 24 12:50:46 2006
-	  </text>
-	  <text name="OwnerLabel">
-			 Puedes:
-	  </text>	  
-	  <check_box label="Modificar" name="CheckOwnerModify"/>
-	  <check_box label="Copiar" name="CheckOwnerCopy"/>
-	  <check_box label="Venderlo/Darlo" name="CheckOwnerTransfer"/>
-	  <text name="BaseMaskDebug">
-			 B:
-	  </text>
-	  <text name="OwnerMaskDebug">
-			 O:
-	  </text>
-	  <text name="GroupMaskDebug">
-			 G:
-	  </text>
-	  <text name="EveryoneMaskDebug">
-			 E:
-	  </text>
-	  <text name="NextMaskDebug">
-			 N:
-	  </text>
-	  <check_box label="Compartir con el Grupo" name="CheckShareWithGroup"/>
-	  <check_box label="Permitir a cualquiera que lo copie" name="CheckEveryoneCopy"/>
-	  <text name="NextOwnerLabel"  width="250">
-			 El próximo propietario puede:
-	  </text>
-	  <check_box label="Modificarlo" name="CheckNextOwnerModify"/>
-	  <check_box label="Copiarlo" name="CheckNextOwnerCopy"/>
-	  <check_box label="Venderlo/Darlo" name="CheckNextOwnerTransfer"/>
-	  <text name="SaleLabel" width="150">
-			 Marcar Item como:
-	  </text>
-	  <check_box label="En Venta" name="CheckPurchase"/>
-	  <radio_group name="RadioSaleType">
-			 <radio_item name="radio">
-					Original
-			 </radio_item>
-			 <radio_item name="radio2">
-					Copia
-			 </radio_item>
-	  </radio_group>
-	  <text name="TextPrice">
-			 Precio:  [CURRENCY]
-	  </text>
-	  <line_editor name="EditPrice"/>
-	  <string name="unknown">
-			 (desconocido)
-	  </string>
-	  <string name="public">
-			 (público)
-	  </string>
-	  <string name="you_can">
-			 Puedes:
-	  </string>	  
-	  <string name="owner_can">
-			 El Propietario Puede:
-	  </string>
+	<text name="LabelItemNameTitle">
+		Nombre:
+	</text>
+	<text name="LabelItemDescTitle">
+		Descripción:
+	</text>
+	<text name="LabelCreatorTitle">
+		Creador:
+	</text>
+	<text name="LabelCreatorName">
+		Nicole Linden
+	</text>
+	<button label="Perfil..." label_selected="" name="BtnCreator"/>
+	<text name="LabelOwnerTitle">
+		Propietario:
+	</text>
+	<text name="LabelOwnerName">
+		Thrax Linden
+	</text>
+	<button label="Perfil..." label_selected="" name="BtnOwner"/>
+	<text name="LabelAcquiredTitle">
+		Adquirido:
+	</text>
+	<text name="LabelAcquiredDate">
+		Mie May 24 12:50:46 2006
+	</text>
+	<text name="OwnerLabel">
+		Puedes:
+	</text>
+	<check_box label="Modificar" name="CheckOwnerModify"/>
+	<check_box label="Copiar" name="CheckOwnerCopy"/>
+	<check_box label="Venderlo/Darlo" name="CheckOwnerTransfer"/>
+	<text name="BaseMaskDebug">
+		B:
+	</text>
+	<text name="OwnerMaskDebug">
+		O:
+	</text>
+	<text name="GroupMaskDebug">
+		G:
+	</text>
+	<text name="EveryoneMaskDebug">
+		E:
+	</text>
+	<text name="NextMaskDebug">
+		N:
+	</text>
+	<check_box label="Compartir con el Grupo" name="CheckShareWithGroup"/>
+	<check_box label="Permitir a cualquiera que lo copie" name="CheckEveryoneCopy"/>
+	<text name="NextOwnerLabel" width="250">
+		El próximo propietario puede:
+	</text>
+	<check_box label="Modificarlo" name="CheckNextOwnerModify"/>
+	<check_box label="Copiarlo" name="CheckNextOwnerCopy"/>
+	<check_box label="Venderlo/Darlo" name="CheckNextOwnerTransfer"/>
+	<text name="SaleLabel" width="150">
+		Marcar Item como:
+	</text>
+	<check_box label="En Venta" name="CheckPurchase"/>
+	<radio_group name="RadioSaleType">
+		<radio_item name="radio">
+			Original
+		</radio_item>
+		<radio_item name="radio2">
+			Copia
+		</radio_item>
+	</radio_group>
+	<text name="TextPrice">
+		Precio:  [CURRENCY]
+	</text>
+	<string name="unknown">
+		(desconocido)
+	</string>
+	<string name="public">
+		(público)
+	</string>
+	<string name="you_can">
+		Puedes:
+	</string>
+	<string name="owner_can">
+		El Propietario Puede:
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
index 736572f4d..7cb2dff63 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_view_finder.xml
@@ -1,35 +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="ítems_recientes_del_inventario" width="160">
-	  <icon name="icon_animation"/>
-	  <check_box label="Animación" name="check_animation"/>
-	  <icon name="icon_calling_card"/>
-	  <check_box label="Tarjetas de Llamada" name="check_calling_card"/>
-	  <icon name="icon_clothing" />
-	  <check_box label="Ropas" name="check_clothing"/>
-	  <icon name="icon_gesture"/>
-	  <check_box label="Gestos" name="check_gesture"/>
-	  <icon name="icon_landmark"/>
-	  <check_box label="Hitos" name="check_landmark"/>
-	  <icon name="icon_notecard"/>
-	  <check_box label="Notas" name="check_notecard"/>
-	  <icon name="icon_object"/>
-	  <check_box label="Objetos" name="check_object"/>
-	  <icon name="icon_script"/>
-	  <check_box label="Scripts" name="check_script"/>
-	  <icon name="icon_sound"/>
-	  <check_box label="Sonidos" name="check_sound"/>
-	  <icon name="icon_texture"/>
-	  <check_box label="Texturas" name="check_texture"/>
-	  <icon name="icon_snapshot"/>
-	  <check_box label="Fotos" name="check_snapshot"/>
-	  <button label="Todo" label_selected="Todo" name="All"/>
-	  <button label="Nada" label_selected="Nada" name="None"/>
-	  <check_box label="Mostrar Carpetas Siempre" name="check_show_empty"/>
-	  <check_box label="Desde Fin Sesión Anterior" name="check_since_logoff"/>
-	  <text name="- OR -">
-			 - O -
-	  </text>
-	  <spinner label="Horas Atrás" name="spin_hours_ago"/>
-	  <spinner label="Días Atrás" name="spin_days_ago"/>
-	  <button label="Cerrar" label_selected="Cerrar" name="Close"/>
+	<check_box label="Animación" name="check_animation"/>
+	<check_box label="Tarjetas de Llamada" name="check_calling_card"/>
+	<check_box label="Ropas" name="check_clothing"/>
+	<check_box label="Gestos" name="check_gesture"/>
+	<check_box label="Hitos" name="check_landmark"/>
+	<check_box label="Notas" name="check_notecard"/>
+	<check_box label="Objetos" name="check_object"/>
+	<check_box label="Scripts" name="check_script"/>
+	<check_box label="Sonidos" name="check_sound"/>
+	<check_box label="Texturas" name="check_texture"/>
+	<check_box label="Fotos" name="check_snapshot"/>
+	<button label="Todo" label_selected="Todo" name="All"/>
+	<button label="Nada" label_selected="Nada" name="None"/>
+	<check_box label="Mostrar Carpetas Siempre" name="check_show_empty"/>
+	<check_box label="Desde Fin Sesión Anterior" name="check_since_logoff"/>
+	<text name="- OR -">
+		- O -
+	</text>
+	<spinner label="Horas Atrás" name="spin_hours_ago"/>
+	<spinner label="Días Atrás" name="spin_days_ago"/>
+	<button label="Cerrar" label_selected="Cerrar" name="Close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_joystick.xml b/indra/newview/skins/default/xui/es/floater_joystick.xml
index e265833ff..6ad797452 100644
--- a/indra/newview/skins/default/xui/es/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/es/floater_joystick.xml
@@ -1,124 +1,85 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Joystick" title="Configuración del Joystick">
-	  <check_box name="enable_joystick" >
-			 Activar Joystick:
-	  </check_box>
-	  <text name="joystick_type"></text>
-	  <string name="JoystickMonitor">
-			 Monitor de Joystick
-	  </string>
-	  <string name="Axis">
-			 Eje [NUM]
-	  </string>
-	  <string name="NoDevice">
-			 No se ha detectado el dispositivo
-	  </string>
-	  <spinner name="JoystickAxis1" label="Mapeo Eje X"/>
-	  <spinner name="JoystickAxis4" label="Mapeo Arriba/Abajo"/>
-	  <spinner name="JoystickAxis6" label="Mapeo de Zoom"/>
-	  <spinner name="JoystickAxis2" label="Mapeo Eje Y"/>
-	  <spinner name="JoystickAxis5" label="Mapeo Izq./der."/>
-	  <spinner name="JoystickAxis0" label="Mapeo Eje Z"/>
-	  <spinner name="JoystickAxis3" label="Mapeo de Giro"/>
-	  <check_box label="Zoom Directo" name="ZoomDirect"/>
-	  <check_box label="Cursor 3D" name="Cursor3D"/>
-	  <check_box label="Nivel Automático" name="AutoLeveling"/>
-	  <text name="Control Modes:">
-			 Modos de Control:
-	  </text>
-	  <check_box name="JoystickAvatarEnabled">
-			 Avatar
-	  </check_box>
-	  <check_box name="JoystickBuildEnabled">
-			 Construir
-	  </check_box>
-	  <check_box name="JoystickFlycamEnabled">
-			 Flycam
-	  </check_box>
-	  <text name="XScale">
-			 Escala de X
-	  </text>
-	  <spinner name="AvatarAxisScale1"/>
-	  <spinner name="BuildAxisScale1"/>
-	  <spinner name="FlycamAxisScale1"/>
-	  <text name="YScale">
-			 Escala de Y
-	  </text>
-	  <spinner name="AvatarAxisScale2"/>
-	  <spinner name="BuildAxisScale2"/>
-	  <spinner name="FlycamAxisScale2"/>
-	  <text name="ZScale">
-			 Escala de Z
-	  </text>
-	  <spinner name="AvatarAxisScale0"/>
-	  <spinner name="BuildAxisScale0"/>
-	  <spinner name="FlycamAxisScale0"/>
-	  <text name="PitchScale">
-			 Escala Arriba/Abajo
-	  </text>
-	  <spinner name="AvatarAxisScale4"/>
-	  <spinner name="BuildAxisScale4"/>
-	  <spinner name="FlycamAxisScale4"/>
-	  <text name="YawScale">
-			 Escala Izq./Der.
-	  </text>
-	  <spinner name="AvatarAxisScale5"/>
-	  <spinner name="BuildAxisScale5"/>
-	  <spinner name="FlycamAxisScale5"/>
-	  <text name="RollScale">
-			 Escala de Giro
-	  </text>
-	  <spinner name="BuildAxisScale3"/>
-	  <spinner name="FlycamAxisScale3"/>
-	  <text name="XDeadZone">
-			 Zona Muerta de X
-	  </text>
-	  <spinner name="AvatarAxisDeadZone1"/>
-	  <spinner name="BuildAxisDeadZone1"/>
-	  <spinner name="FlycamAxisDeadZone1"/>
-	  <text name="YDeadZone">
-			 Zona Muerta de Y</text>
-	  <spinner name="AvatarAxisDeadZone2"/>
-	  <spinner name="BuildAxisDeadZone2"/>
-	  <spinner name="FlycamAxisDeadZone2"/>
-	  <text name="ZDeadZone">
-			 Zona Muerta de Z
-	  </text>
-	  <spinner name="AvatarAxisDeadZone0"/>
-	  <spinner name="BuildAxisDeadZone0"/>
-	  <spinner name="FlycamAxisDeadZone0"/>
-	  <text name="PitchDeadZone">
-			 Zona Muerta Arriba/Abajo
-	  </text>
-	  <spinner name="AvatarAxisDeadZone4"/>
-	  <spinner name="BuildAxisDeadZone4"/>
-	  <spinner name="FlycamAxisDeadZone4"/>
-	  <text name="YawDeadZone">
-			 Zona Muerta Izq./der.
-	  </text>
-	  <spinner name="AvatarAxisDeadZone5"/>
-	  <spinner name="BuildAxisDeadZone5"/>
-	  <spinner name="FlycamAxisDeadZone5"/>
-	  <text name="RollDeadZone">
-			 Zona Muerta de Giro
-	  </text>
-	  <spinner name="BuildAxisDeadZone3"/>
-	  <spinner name="FlycamAxisDeadZone3"/>
-	  <text name="Feathering">
-			 Rigidez
-	  </text>
-	  <spinner name="AvatarFeathering"/>
-	  <spinner name="BuildFeathering"/>
-	  <spinner name="FlycamFeathering"/>
-	  <text name="ZoomScale2">
-			 Escala de Zoom
-	  </text>
-	  <spinner name="FlycamAxisScale6"/>
-	  <text name="ZoomDeadZone">
-			 Zona Muerta de Zoom
-	  </text>
-	  <spinner name="FlycamAxisDeadZone6"/>
-	  <button label="Predeterminado SpaceNavigator" name="SpaceNavigatorDefaults" left="330" width="210"/>
-	  <button label="OK" label_selected="OK" name="ok_btn"/>
-	  <button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<check_box name="enable_joystick">
+		Activar Joystick:
+	</check_box>
+	<string name="JoystickMonitor">
+		Monitor de Joystick
+	</string>
+	<string name="Axis">
+		Eje [NUM]
+	</string>
+	<string name="NoDevice">
+		No se ha detectado el dispositivo
+	</string>
+	<spinner name="JoystickAxis1" label="Mapeo Eje X"/>
+	<spinner name="JoystickAxis4" label="Mapeo Arriba/Abajo"/>
+	<spinner name="JoystickAxis6" label="Mapeo de Zoom"/>
+	<spinner name="JoystickAxis2" label="Mapeo Eje Y"/>
+	<spinner name="JoystickAxis5" label="Mapeo Izq./der."/>
+	<spinner name="JoystickAxis0" label="Mapeo Eje Z"/>
+	<spinner name="JoystickAxis3" label="Mapeo de Giro"/>
+	<check_box label="Zoom Directo" name="ZoomDirect"/>
+	<check_box label="Cursor 3D" name="Cursor3D"/>
+	<check_box label="Nivel Automático" name="AutoLeveling"/>
+	<text name="Control Modes:">
+		Modos de Control:
+	</text>
+	<check_box name="JoystickAvatarEnabled">
+		Avatar
+	</check_box>
+	<check_box name="JoystickBuildEnabled">
+		Construir
+	</check_box>
+	<check_box name="JoystickFlycamEnabled">
+		Flycam
+	</check_box>
+	<text name="XScale">
+		Escala de X
+	</text>
+	<text name="YScale">
+		Escala de Y
+	</text>
+	<text name="ZScale">
+		Escala de Z
+	</text>
+	<text name="PitchScale">
+		Escala Arriba/Abajo
+	</text>
+	<text name="YawScale">
+		Escala Izq./Der.
+	</text>
+	<text name="RollScale">
+		Escala de Giro
+	</text>
+	<text name="XDeadZone">
+		Zona Muerta de X
+	</text>
+	<text name="YDeadZone">
+		Zona Muerta de Y
+	</text>
+	<text name="ZDeadZone">
+		Zona Muerta de Z
+	</text>
+	<text name="PitchDeadZone">
+		Zona Muerta Arriba/Abajo
+	</text>
+	<text name="YawDeadZone">
+		Zona Muerta Izq./der.
+	</text>
+	<text name="RollDeadZone">
+		Zona Muerta de Giro
+	</text>
+	<text name="Feathering">
+		Rigidez
+	</text>
+	<text name="ZoomScale2">
+		Escala de Zoom
+	</text>
+	<text name="ZoomDeadZone">
+		Zona Muerta de Zoom
+	</text>
+	<button label="Predeterminado SpaceNavigator" name="SpaceNavigatorDefaults" left="330" width="210"/>
+	<button label="OK" label_selected="OK" name="ok_btn"/>
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_lagmeter.xml b/indra/newview/skins/default/xui/es/floater_lagmeter.xml
index 1d8dd271b..9cd94fbf1 100644
--- a/indra/newview/skins/default/xui/es/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/es/floater_lagmeter.xml
@@ -1,155 +1,152 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_lagmeter" title="Medidor de Lag">
-	  <button label="" label_selected="" name="client_lagmeter" tool_tip="Estado de lag del Cliente" />
-	  <text name="client">
-			 Cliente:
-	  </text>
-	  <text name="client_text">
-			 Normal
-	  </text>
-	  <text name="client_lag_cause"/>
-	  <button label="" label_selected="" name="network_lagmeter" tool_tip="Estado de lag de la Red"/>
-	  <text name="network">
-			 Red:
-	  </text>
-	  <text name="network_text">
-			 Normal
-	  </text>
-	  <text name="network_lag_cause"/>
-	  <button label="" label_selected="" name="server_lagmeter" tool_tip="Estado de lag del Servidor"/>
-	  <text name="server">
-			 Servidor:
-	  </text>
-	  <text name="server_text">
-			 Normal
-	  </text>
-	  <text name="server_lag_cause"/>
-	  <button help_url="https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=4851"  label="?" name="server_help"/>
-	  <button label="&gt;&gt;" name="minimize"/>
-	  <string name="max_title_msg">
-			 Medidor de Lag
-	  </string>
-	  <string name="max_width_px">
-			 360
-	  </string>
-	  <string name="min_title_msg">
-			 Lag
-	  </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, ventana en segundo plano
-	  </string>
-	  <string name="client_frame_time_critical_msg">
-			 Frames del cliente valorados por debajo de [CLIENT_FRAME_RATE_CRITICAL]
-	  </string>
-	  <string name="client_frame_time_warning_msg">
-			 Frames del cliente valorados entre [CLIENT_FRAME_RATE_CRITICAL] and [CLIENT_FRAME_RATE_WARNING]
-	  </string>
-	  <string name="client_frame_time_normal_msg">
-			 Normal
-	  </string>
-	  <string name="client_draw_distance_cause_msg">
-			 Causa posible: Distancia de dibujo fijada muy alta
-	  </string>
-	  <string name="client_texture_loading_cause_msg">
-			 Posible causa: imágenes cargándose
-	  </string>
-	  <string name="client_texture_memory_cause_msg">
-			 Posible causa: demasiadas imágenes en la memoria
-	  </string>
-	  <string name="client_complex_objects_cause_msg">
-			 Posible causa: demasiados objetos complejos en la escena
-	  </string>
-	  <string name="network_text_msg">
-			 Red
-	  </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">
-			 La conexión deja caer más del  [NETWORK_PACKET_LOSS_CRITICAL]% de los paquetes
-	  </string>
-	  <string name="network_packet_loss_warning_msg">
-			 La conexión deja caer [NETWORK_PACKET_LOSS_WARNING]%-[NETWORK_PACKET_LOSS_CRITICAL]% de los paquetes
-	  </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">
-			 El tiempo de conexión (ping) supera los [NETWORK_PING_CRITICAL] ms
-	  </string>
-	  <string name="network_ping_warning_msg">
-			 El tiempo de conexión (ping) es de [NETWORK_PING_WARNING]-[NETWORK_PING_CRITICAL] ms
-	  </string>
-	  <string name="network_packet_loss_cause_msg">
-			 Posiblemente una mala conexión o se ha fijado un ancho de banda demasiado alto.
-	  </string>
-	  <string name="network_ping_cause_msg">
-			 Posiblemente una mala conexión o se está ejecutando una aplicación de archivos compartidos.
-	  </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">
-			 Frecuencia (framerate) por debajo de [SERVER_FRAME_RATE_CRITICAL]
-	  </string>
-	  <string name="server_frame_time_warning_msg">
-			 Frecuencia (framerate) entre [SERVER_FRAME_RATE_CRITICAL] y [SERVER_FRAME_RATE_WARNING]
-	  </string>
-	  <string name="server_frame_time_normal_msg">
-			 Normal
-	  </string>
-	  <string name="server_physics_cause_msg">
-			 Causa Posible: Demasiados objetos físicos
-	  </string>
-	  <string name="server_scripts_cause_msg">
-			 Causa Posible: Demasiados objetos con Scripts
-	  </string>
-	  <string name="server_net_cause_msg">
-			 Causa Posible: Demasiado tráfico en la red
-	  </string>
-	  <string name="server_agent_cause_msg">
-			 Causa Posible: demasiada gente moviéndose en la región
-	  </string>
-	  <string name="server_images_cause_msg">
-			 Causa Posible: demasiados cálculos de imágenes
-	  </string>
-	  <string name="server_generic_cause_msg">
-			 Causa Posible: Demasiada carga en el servidor
-	  </string>
-	  <string name="smaller_label">
-			 &gt;&gt;
-	  </string>
-	  <string name="bigger_label">
-			 &lt;&lt;
-	  </string>
+	<button name="client_lagmeter" tool_tip="Estado de lag del Cliente"/>
+	<text name="client">
+		Cliente:
+	</text>
+	<text name="client_text">
+		Normal
+	</text>
+	<button name="network_lagmeter" tool_tip="Estado de lag de la Red"/>
+	<text name="network">
+		Red:
+	</text>
+	<text name="network_text">
+		Normal
+	</text>
+	<button label="" label_selected="" name="server_lagmeter" tool_tip="Estado de lag del 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 Lag
+	</string>
+	<string name="max_width_px">
+		360
+	</string>
+	<string name="min_title_msg">
+		Lag
+	</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, ventana en segundo plano
+	</string>
+	<string name="client_frame_time_critical_msg">
+		Frames del cliente valorados por debajo de [CLIENT_FRAME_RATE_CRITICAL]
+	</string>
+	<string name="client_frame_time_warning_msg">
+		Frames del cliente valorados entre [CLIENT_FRAME_RATE_CRITICAL] y [CLIENT_FRAME_RATE_WARNING]
+	</string>
+	<string name="client_frame_time_normal_msg">
+		Normal
+	</string>
+	<string name="client_draw_distance_cause_msg">
+		Causa posible: Distancia de dibujo fijada muy alta
+	</string>
+	<string name="client_texture_loading_cause_msg">
+		Posible causa: imágenes cargándose
+	</string>
+	<string name="client_texture_memory_cause_msg">
+		Posible causa: demasiadas imágenes en la memoria
+	</string>
+	<string name="client_complex_objects_cause_msg">
+		Posible causa: demasiados objetos complejos en la escena
+	</string>
+	<string name="network_text_msg">
+		Red
+	</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">
+		La conexión deja caer más del [NETWORK_PACKET_LOSS_CRITICAL]% de los paquetes
+	</string>
+	<string name="network_packet_loss_warning_msg">
+		La conexión deja caer [NETWORK_PACKET_LOSS_WARNING]% y [NETWORK_PACKET_LOSS_CRITICAL]% de los paquetes
+	</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">
+		El tiempo de conexión (ping) supera los [NETWORK_PING_CRITICAL] ms
+	</string>
+	<string name="network_ping_warning_msg">
+		El tiempo de conexión (ping) es de [NETWORK_PING_WARNING] y [NETWORK_PING_CRITICAL] ms
+	</string>
+	<string name="network_packet_loss_cause_msg">
+		Posiblemente una mala conexión o se ha fijado un ancho de banda demasiado alto.
+	</string>
+	<string name="network_ping_cause_msg">
+		Posiblemente una mala conexión o se está ejecutando una aplicación de archivos compartidos.
+	</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">
+		Frecuencia (framerate) por debajo de [SERVER_FRAME_RATE_CRITICAL]
+	</string>
+	<string name="server_frame_time_warning_msg">
+		Frecuencia (framerate) entre [SERVER_FRAME_RATE_CRITICAL] y [SERVER_FRAME_RATE_WARNING]
+	</string>
+	<string name="server_frame_time_normal_msg">
+		Normal
+	</string>
+	<string name="server_physics_cause_msg">
+		Causa Posible: Demasiados objetos físicos
+	</string>
+	<string name="server_scripts_cause_msg">
+		Causa Posible: Demasiados objetos con Scripts
+	</string>
+	<string name="server_net_cause_msg">
+		Causa Posible: Demasiado tráfico en la red
+	</string>
+	<string name="server_agent_cause_msg">
+		Causa Posible: demasiada gente moviéndose en la región
+	</string>
+	<string name="server_images_cause_msg">
+		Causa Posible: demasiados cálculos de imágenes
+	</string>
+	<string name="server_generic_cause_msg">
+		Causa Posible: Demasiada carga en el servidor
+	</string>
+	<string name="smaller_label">
+		&gt;&gt;
+	</string>
+	<string name="bigger_label">
+		&lt;&lt;
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_land_holdings.xml b/indra/newview/skins/default/xui/es/floater_land_holdings.xml
index af49f8253..d7917b82a 100644
--- a/indra/newview/skins/default/xui/es/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/es/floater_land_holdings.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="land holdings floater" title="Mis Propiedades">
-	  <scroll_list name="parcel list">
-			 <column label="Nombre de la Parcela" name="name"/>
-			 <column label="Región" name="location"/>
-			 <column label="Tipo" name="type"/>
-			 <column label="Superficie" name="area"/>
-			 <column label="" name="hidden" width="-1" />
-	  </scroll_list>
-	  <button label="Teleportar" label_selected="Teleportar" name="Teleport" tool_tip="Teleportar al centro de este terreno" />
-	  <button label="Mostrar en el Mapa" label_selected="Mostrar en el Mapa" name="Show on Map" tool_tip="Mostrar este terreno en el mapa del mundo" />
-	  <text name="contrib_label">
-			 Contribuciones a tus grupos:
-	  </text>
-	  <scroll_list name="grant list">
-			 <column label="Grupo" name="group"/>
-			 <column label="Superficie" name="area"/>
-	  </scroll_list>
-	  <text name="allowed_label">
-			 Propiedades de terreno permitidas en el plan de pago actual:
-	  </text>
-	  <text name="allowed_text">
-			 [AREA] m²
-	  </text>
-	  <text name="current_label">
-			 Propiedades de terreno actuales:
-	  </text>
-	  <text name="current_text">
-			 [AREA] m²
-	  </text>
-	  <text name="available_label">
-			 Disponible para compras de terreno:
-	  </text>
-	  <text name="available_text">
-			 [AREA] m²
-	  </text>
-	  <string name="area_string">
-			 [AREA] m²
-	  </string>
+	<scroll_list name="parcel list">
+		<column label="Nombre de la Parcela" name="name"/>
+		<column label="Región" name="location"/>
+		<column label="Tipo" name="type"/>
+		<column label="Superficie" name="area"/>
+		<column label="" name="hidden" width="-1"/>
+	</scroll_list>
+	<button label="Teleportar" label_selected="Teleportar" name="Teleport" tool_tip="Teleportar al centro de este terreno"/>
+	<button label="Mostrar en el Mapa" label_selected="Mostrar en el Mapa" name="Show on Map" tool_tip="Mostrar este terreno en el mapa del mundo"/>
+	<text name="contrib_label">
+		Contribuciones a tus grupos:
+	</text>
+	<scroll_list name="grant list">
+		<column label="Grupo" name="group"/>
+		<column label="Superficie" name="area"/>
+	</scroll_list>
+	<text name="allowed_label">
+		Propiedades de terreno permitidas en el plan de pago actual:
+	</text>
+	<text name="allowed_text">
+		[AREA] m²
+	</text>
+	<text name="current_label">
+		Propiedades de terreno actuales:
+	</text>
+	<text name="current_text">
+		[AREA] m²
+	</text>
+	<text name="available_label">
+		Disponible para compras de terreno:
+	</text>
+	<text name="available_text">
+		[AREA] m²
+	</text>
+	<string name="area_string">
+		[AREA] m²
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_landmark_ctrl.xml b/indra/newview/skins/default/xui/es/floater_landmark_ctrl.xml
index 436936c5a..db483c035 100644
--- a/indra/newview/skins/default/xui/es/floater_landmark_ctrl.xml
+++ b/indra/newview/skins/default/xui/es/floater_landmark_ctrl.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="landmarkpicker" title="Organizar: Hitos">
-	  <check_box label="Mostrar Carpetas" name="show_folders_check"/>
-	  <search_editor name="inventory search editor"/>
-	  <inventory_panel name="inventory panel"/>
-	  <button label="Nuevo" label_selected="Nuevo" name="New"/>
-	  <button label="Renombrar" label_selected="Renombrar" name="Rename"/>
-	  <button label="Nueva Carpeta" label_selected="Nueva Carpeta" name="NewFolder"/>
-	  <button label="Editar" label_selected="Editar" name="Edit"/>
-	  <button label="Borrar" label_selected="Borrar" name="Delete"/>
-	  <button label="Cerrar" label_selected="Cerrar" name="Close"/>
+	<check_box label="Mostrar Carpetas" name="show_folders_check"/>
+	<button label="Nuevo" label_selected="Nuevo" name="New"/>
+	<button label="Renombrar" label_selected="Renombrar" name="Rename"/>
+	<button label="Nueva Carpeta" label_selected="Nueva Carpeta" name="NewFolder"/>
+	<button label="Editar" label_selected="Editar" name="Edit"/>
+	<button label="Borrar" label_selected="Borrar" name="Delete"/>
+	<button label="Cerrar" label_selected="Cerrar" name="Close"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
index 1af605dc8..3a0cc6990 100644
--- a/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/es/floater_live_lsleditor.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="script ed float" title="Script: Nuevo Script" >
-	  <button label="Restablecer" label_selected="Restablecer" name="Reset"/>
-	  <check_box label="Ejecuntándose" name="running"/>
-	  <check_box label="Mono" name="mono"/>
-	  <panel name="script ed panel" />
-	  <string name="not_allowed">
-			 No tienes permiso para ver este script.
-	  </string>
-	  <string name="script_running">
-			 Ejecutándose
-	  </string>
+<floater name="script ed float" title="Script: Nuevo Script">
+	<button label="Restablecer" label_selected="Restablecer" name="Reset"/>
+	<check_box label="Ejecuntándose" name="running"/>
+	<check_box label="Mono" name="mono"/>
+	<string name="not_allowed">
+		No tienes permiso para ver este script.
+	</string>
+	<string name="script_running">
+		Ejecutándose...
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_lsl_guide.xml b/indra/newview/skins/default/xui/es/floater_lsl_guide.xml
index b673261f4..447c0114c 100644
--- a/indra/newview/skins/default/xui/es/floater_lsl_guide.xml
+++ b/indra/newview/skins/default/xui/es/floater_lsl_guide.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="script ed float" title="LSL Wiki">
-	  <check_box label="Seguimiento del Cursor" name="lock_check"/>
-	  <combo_box label="Bloquear" name="history_combo"/>
-	  <button label="Retroceder" name="back_btn"/>
-	  <button label="Avanzar" name="fwd_btn"/>
-	  <web_browser name="lsl_guide_html"/>
+	<check_box label="Seguimiento del Cursor" name="lock_check"/>
+	<combo_box label="Bloquear" name="history_combo"/>
+	<button label="Retroceder" name="back_btn"/>
+	<button label="Avanzar" name="fwd_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_media_browser.xml b/indra/newview/skins/default/xui/es/floater_media_browser.xml
index fd29cd0b0..c13d6bf02 100644
--- a/indra/newview/skins/default/xui/es/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/es/floater_media_browser.xml
@@ -1,36 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="floater_about" title="Navegador de Medios">
-	  <layout_stack name="stack1">
-			 <layout_panel name="nav_controls" >
-					<button label="" name="back"/>
-					<button label="" name="forward"/>
-					<button label="" name="reload"/>
-					<combo_box name="address"/>
-					<button label="Ir" name="go"/>
-					<!--button bottom_delta="0" enabled="true" follows="right|top" height="25" label="" image_overlay="go-home-4.png" 
-			     l		eft_delta="58" name="home" width="35" /-->
-			 </layout_panel>
-			 <layout_panel name="time_controls">
-					<button name="rewind"/>
-					<button label="" name="play" />
-					<button label="" name="pause" />
-					<button label="Parar" name="stop"/>
-					<button label="Avanzar" name="seek"/>
-			 </layout_panel>
-			 <layout_panel name="parcel_owner_controls">
-					<button label="Enviar URL actual a la parecela" name="assign"/>
-			 </layout_panel>
-			 <layout_panel name="external_controls">
-					<web_browser name="browser"/>
-					<button label="Abrir en mi Navegador externo" name="open_browser"/>
-					<check_box label="Abrir siempre en mi Navegador externo" name="open_always"/>
-					<!--button bottom="5" follows="bottom|right" height="20" label="Close" left="-70" name="close" width="70" /-->
-			 </layout_panel>
-	  </layout_stack>
-	  <string name="home_page_url">
-			 http://www.secondlife.com
-	  </string>
-	  <string name="support_page_url">
-			 http://wiki.secondlife.com/wiki/Knowledge_Base
-	  </string>
+	<layout_stack name="stack1">
+		<layout_panel name="nav_controls">
+			<button label="" name="back"/>
+			<button label="" name="forward"/>
+			<button label="" name="reload"/>
+			<combo_box name="address"/>
+			<button label="Ir" name="go"/>
+			<!--button bottom_delta="0" enabled="true" follows="right|top" height="25" label="" image_overlay="go-home-4.png" left_delta="58" name="home" width="35" /-->
+		</layout_panel>
+		<layout_panel name="time_controls">
+			<button name="rewind"/>
+			<button label="" name="play"/>
+			<button label="" name="pause"/>
+			<button label="Parar" name="stop"/>
+			<button label="Avanzar" name="seek"/>
+		</layout_panel>
+		<layout_panel name="parcel_owner_controls">
+			<button label="Enviar URL actual a la parecela" name="assign"/>
+		</layout_panel>
+		<layout_panel name="external_controls">
+			<button label="Abrir en mi Navegador externo" name="open_browser"/>
+			<check_box label="Abrir siempre en mi Navegador externo" name="open_always"/>
+			<!--button bottom="5" follows="bottom|right" height="20" label="Close" left="-70" name="close" width="70" /-->
+		</layout_panel>
+	</layout_stack>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_mem_leaking.xml b/indra/newview/skins/default/xui/es/floater_mem_leaking.xml
index dbc695e74..122b8aef7 100644
--- a/indra/newview/skins/default/xui/es/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/es/floater_mem_leaking.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="MemLeak" title="Simulación de Fuga de Memoria">
-	  <spinner label="Velocidad de fuga (bytes por cuadro):" name="leak_speed"/>
-	  <spinner label="Fuga Máxima de Memoria (MB):" name="max_leak"/>
-	  <text name="total_leaked_label">
-			 Memoria fugada actualmente: [SIZE] KB
-	  </text>	
-	  <text name="note_label_1">
-			 [NOTE1]
-	  </text>
-	  <text name="note_label_2">
-			 [NOTE2]
-	  </text>	
-	  <button label="Iniciar" name="start_btn"/>
-	  <button label="Detener" name="stop_btn"/>
-	  <button label="Liberar" name="release_btn"/>
-	  <button label="Cerrar"  name="close_btn"/>
+	<spinner label="Velocidad de fuga (bytes por cuadro):" name="leak_speed"/>
+	<spinner label="Fuga Máxima de Memoria (MB):" name="max_leak"/>
+	<text name="total_leaked_label">
+		Memoria fugada actualmente: [SIZE] KB
+	</text>
+	<text name="note_label_1">
+		[NOTE1]
+	</text>
+	<text name="note_label_2">
+		[NOTE2]
+	</text>
+	<button label="Iniciar" name="start_btn"/>
+	<button label="Detener" name="stop_btn"/>
+	<button label="Liberar" name="release_btn"/>
+	<button label="Cerrar"  name="close_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_mini_map.xml b/indra/newview/skins/default/xui/es/floater_mini_map.xml
index 185252e45..de5e9d0cf 100644
--- a/indra/newview/skins/default/xui/es/floater_mini_map.xml
+++ b/indra/newview/skins/default/xui/es/floater_mini_map.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="minimap" >
-	  <panel label="Mini Mapa" name="mini_mapview" tool_tip="(haz doble click para abrir el Mapa, Mayus+Click y arrastra para desplazar)"/>
+	<panel label="Mini Mapa" name="mini_mapview" tool_tip="(haz doble click para abrir el Mapa, Mayus+Click y arrastra para desplazar)"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_moveview.xml b/indra/newview/skins/default/xui/es/floater_moveview.xml
index 97a963be0..22f01710b 100644
--- a/indra/newview/skins/default/xui/es/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/es/floater_moveview.xml
@@ -1,17 +1,17 @@
-<?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="Girar a la Izquierda" />
-	  <button label="" label_selected="" name="turn right btn" tool_tip="Girar a la Derecha" />
-	  <button label="" label_selected="" name="move up btn" tool_tip="Saltar o iniciar vuelo" />
-	  <button label="" label_selected="" name="move down btn" tool_tip="Agacharse o Descender"/>
-	  <!--
-	  <button bottom="-54" control_name="FlyBtnState" enabled="true" follows="left|bottom"
-			 font="SansSerif" halign="center" height="20" label="Fly"
-			 label_selected="Fly" left="116" mouse_opaque="true" name="fly btn"
-			 scale_image="true" tool_tip="Start or stop flying" width="65" />
-	  -->
-	  <joystick_slide name="slide left btn" tool_tip="Moverse a la Izquierda" />
-	  <joystick_slide name="slide right btn" tool_tip="Moverse a la Derecha" />
-	  <joystick_turn name="forward btn" tool_tip="Avanzar" />
-	  <joystick_turn name="backward btn" tool_tip="Retroceder" />
+	<button label="" label_selected="" name="turn left btn" tool_tip="Girar a la Izquierda"/>
+	<button label="" label_selected="" name="turn right btn" tool_tip="Girar a la Derecha"/>
+	<button label="" label_selected="" name="move up btn" tool_tip="Saltar o iniciar vuelo"/>
+	<button label="" label_selected="" name="move down btn" tool_tip="Agacharse o Descender"/>
+	<!--
+	<button bottom="-54" control_name="FlyBtnState" enabled="true" follows="left|bottom"
+		font="SansSerif" halign="center" height="20" label="Fly"
+		label_selected="Fly" left="116" mouse_opaque="true" name="fly btn"
+		scale_image="true" tool_tip="Start or stop flying" width="65" />
+	-->
+	<joystick_slide name="slide left btn" tool_tip="Moverse a la Izquierda"/>
+	<joystick_slide name="slide right btn" tool_tip="Moverse a la Derecha"/>
+	<joystick_turn name="forward btn" tool_tip="Avanzar"/>
+	<joystick_turn name="backward btn" tool_tip="Retroceder"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_mute_object.xml b/indra/newview/skins/default/xui/es/floater_mute_object.xml
index 7bcfba5eb..8fa5917d8 100644
--- a/indra/newview/skins/default/xui/es/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/es/floater_mute_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="mute by name" title="Ignorar Objeto por su Nombre">
-	  <text name="message">
-			 Ignorar según el nombre sólo afecta al chat y los MI del
+	<text name="message">
+		Ignorar según el nombre sólo afecta al chat y los MI del
 objeto, no a sus sonidos. 
-Debes escribir exactamente el nombre del objeto.	  
-	  </text>
-	  <line_editor name="object_name">
-			 Nombre del Objeto
-	  </line_editor>
-	  <button label="Ok" name="OK"/>
-	  <button label="Cancelar" name="Cancel"/>
+Debes escribir exactamente el nombre del objeto.
+	</text>
+	<line_editor name="object_name">
+		Nombre del Objeto
+	</line_editor>
+	<button label="OK" name="OK"/>
+	<button label="Cancelar" name="Cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_my_friends.xml b/indra/newview/skins/default/xui/es/floater_my_friends.xml
index 80b2d14f1..3a8e5e61d 100644
--- a/indra/newview/skins/default/xui/es/floater_my_friends.xml
+++ b/indra/newview/skins/default/xui/es/floater_my_friends.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_my_friends" title="Contactos">
-	  <tab_container name="friends_and_groups" >
-			 <panel label="Amigos" name="friends_panel"/>
-			 <panel label="Grupos" name="groups_panel"/>
-	  </tab_container>
+	<tab_container name="friends_and_groups">
+		<panel label="Amigos" name="friends_panel"/>
+		<panel label="Grupos" name="groups_panel"/>
+	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_name_description.xml b/indra/newview/skins/default/xui/es/floater_name_description.xml
index e02262097..bbacb13ee 100644
--- a/indra/newview/skins/default/xui/es/floater_name_description.xml
+++ b/indra/newview/skins/default/xui/es/floater_name_description.xml
@@ -1,13 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="Name/Description">
-	  <text name="name_label">
-			 Nombre:
-	  </text>
-	  <line_editor name="name_form"/>
-	  <text name="description_label">
-			 Descripción:
-	  </text>
-	  <line_editor name="description_form"/>
-	  <button label="Cancelar" name="cancel_btn"/>
-	  <button label="Subir ([UPLOADFEE])" name="ok_btn"/>
+	<text name="name_label">
+		Nombre:
+	</text>
+	<text name="description_label">
+		Descripción:
+	</text>
+	<button label="Cancelar" name="cancel_btn"/>
+	<button label="Subir ([UPLOADFEE])" name="ok_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_new_im.xml b/indra/newview/skins/default/xui/es/floater_new_im.xml
index 55ccd342d..298a838cc 100644
--- a/indra/newview/skins/default/xui/es/floater_new_im.xml
+++ b/indra/newview/skins/default/xui/es/floater_new_im.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater label="Nuevo MI" name="New IM" title="Nuevo MI">
-	  <name_list name="user_list"/>
-	  <button label="Iniciar" label_selected="Iniciar" name="start_btn"/>
-	  <button label="Cerrar" label_selected="Cerrar" name="close_btn"/>
-	  <string name="online_descriptor">
-			 (en línea)
-	  </string>
+	<button label="Iniciar" label_selected="Iniciar" name="start_btn"/>
+	<button label="Cerrar" label_selected="Cerrar" name="close_btn"/>
+	<string name="online_descriptor">
+		(en línea)
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_new_outfit_dialog.xml b/indra/newview/skins/default/xui/es/floater_new_outfit_dialog.xml
index a5a2a3578..0c9a6bf26 100644
--- a/indra/newview/skins/default/xui/es/floater_new_outfit_dialog.xml
+++ b/indra/newview/skins/default/xui/es/floater_new_outfit_dialog.xml
@@ -1,99 +1,99 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container" title="" >
-	  <button label="Guardar" label_selected="Guardar" name="Save"/>
-	  <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
-	  <check_box label="Forma" name="checkbox_shape"/>
-	  <check_box label="Piel" name="checkbox_skin"/>
-	  <check_box label="Pelo" name="checkbox_hair"/>
-	  <check_box label="Ojos" name="checkbox_eyes"/>
-	  <text name="Options:">
-			 Opciones:
-	  </text>
-	  <!--<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
-			 height="16" initial_value="false" label="Rename Clothing To Folder Name"
-			 left="13" mouse_opaque="true" name="rename" radio_style="false" width="210" />-->
-	  <check_box name="checkbox_use_outfits" label="Usar Carpetas de Vestuario del  Viewer 2" />
-	  <check_box name="checkbox_use_links" label="Usar enlaces para item no copiables, no modificables o de punto multiple" />
-	  <check_box label="Camisa" name="checkbox_shirt"/>
-	  <check_box label="Pantalones" name="checkbox_pants"/>
-	  <check_box label="Zapatos" name="checkbox_shoes"/>
-	  <check_box label="Medias" name="checkbox_socks"/>
-	  <check_box label="Chaqueta" name="checkbox_jacket"/>
-	  <check_box label="Guantes" name="checkbox_gloves"/>
-	  <check_box label="Camiseta" name="checkbox_undershirt"/>
-	  <check_box label="Ropa Interior" name="checkbox_underpants"/>
-	  <check_box label="Flada" name="checkbox_skirt"/>
-	  <check_box label="Tatuaje" name="checkbox_tattoo"/>
-	  <check_box label="Alfa" name="checkbox_alpha"/>
-	  <check_box label="Física" name="checkbox_physics"/>
-	  <check_box label="Pecho" name="checkbox_Chest"/>
-	  <check_box label="Cráneo" name="checkbox_Skull"/>
-	  <check_box label="Hombro Izquierdo" name="checkbox_Left Shoulder"/>
-	  <check_box label="Hombro Derecho" name="checkbox_Right Shoulder"/>
-	  <check_box label="Mano Izquierda" name="checkbox_Left Hand"/>
-	  <check_box label="Mano Derecha" name="checkbox_Right Hand"/>
-	  <check_box label="Pié Izquierdo" name="checkbox_Left Foot"/>
-	  <check_box label="Pié Derecho" name="checkbox_Right Foot"/>
-	  <check_box label="Columna" name="checkbox_Spine"/>
-	  <check_box label="Pelvis" name="checkbox_Pelvis"/>
-	  <check_box label="Boca" name="checkbox_Mouth"/>
-	  <check_box label="Mentón" name="checkbox_Chin"/>
-	  <check_box label="Oreja Izquierda" name="checkbox_Left Ear"/>
-	  <check_box label="Oreja Derecha" name="checkbox_Right Ear"/>
-	  <check_box label="Globo Ocular Izquierdo" name="checkbox_Left Eyeball"/>
-	  <check_box label="Globo Ocular Derecho" name="checkbox_Right Eyeball"/>
-	  <check_box label="Nariz" name="checkbox_Nose"/>
-	  <check_box label="Brazo Derecho" name="checkbox_R Upper Arm"/>
-	  <check_box label="Antebrazo Derecho" name="checkbox_R Forearm"/>
-	  <check_box label="Brazo Izquierdo" name="checkbox_L Upper Arm"/>
-	  <check_box label="Antebrazo Izquierdo" name="checkbox_L Forearm"/>
-	  <check_box label="Cadera Derecha" name="checkbox_Right Hip"/>
-	  <check_box label="Muslo Derecho" name="checkbox_R Upper Leg"/>
-	  <check_box label="Pierna Derecha" name="checkbox_R Lower Leg"/>
-	  <check_box label="Cadera Izquierda" name="checkbox_Left Hip"/>
-	  <check_box label="Muslo Izquierdo" name="checkbox_L Upper Leg"/>
-	  <check_box label="Pierna Izquierda" name="checkbox_L Lower Leg"/>
-	  <check_box label="Estómago" name="checkbox_Stomach"/>
-	  <check_box label="Pectoral Izquierdo" name="checkbox_Left Pec"/>
-	  <check_box label="Pectoral Derecho" name="checkbox_Right Pec"/>
-	  <check_box label="Cuello" name="checkbox_Neck"/>
-	  <check_box label="Root" left="413" name="checkbox_Root"/>
-	  <check_box label="Centro 2" name="checkbox_Center 2"/>
-	  <check_box label="Superior Derecha" name="checkbox_Top Right"/>
-	  <check_box label="Arriba" name="checkbox_Top"/>
-	  <check_box label="Superior Izquierda" name="checkbox_Top Left"/>
-	  <check_box label="CentrO" name="checkbox_Center"/>
-	  <check_box label="Inferior Izquierdo" name="checkbox_Bottom Left"/>
-	  <check_box label="Abajo" name="checkbox_Bottom"/>
-	  <check_box label="Inferior Derecha" name="checkbox_Bottom Right"/>
-	  <text name="Make New Outfit">
-			 Hacer Nuevo Vestuario
-	  </text>
-	  <text 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.">
-			 Los Vestuarios son carpetas que contienen ropas y partes de cuerpo.
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="modal container">
+	<button label="Guardar" label_selected="Guardar" name="Save"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<check_box label="Forma" name="checkbox_shape"/>
+	<check_box label="Piel" name="checkbox_skin"/>
+	<check_box label="Pelo" name="checkbox_hair"/>
+	<check_box label="Ojos" name="checkbox_eyes"/>
+	<text name="Options:">
+		Opciones:
+	</text>
+	<!--<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
+		height="16" initial_value="false" label="Rename Clothing To Folder Name"
+		left="13" mouse_opaque="true" name="rename" radio_style="false" width="210" />-->
+	<check_box name="checkbox_use_outfits" label="Usar Carpetas de Vestuario del  Viewer 2" />
+	<check_box name="checkbox_use_links" label="Usar enlaces para item no copiables, no modificables o de punto multiple" />
+	<check_box label="Camisa" name="checkbox_shirt"/>
+	<check_box label="Pantalones" name="checkbox_pants"/>
+	<check_box label="Zapatos" name="checkbox_shoes"/>
+	<check_box label="Medias" name="checkbox_socks"/>
+	<check_box label="Chaqueta" name="checkbox_jacket"/>
+	<check_box label="Guantes" name="checkbox_gloves"/>
+	<check_box label="Camiseta" name="checkbox_undershirt"/>
+	<check_box label="Ropa Interior" name="checkbox_underpants"/>
+	<check_box label="Flada" name="checkbox_skirt"/>
+	<check_box label="Tatuaje" name="checkbox_tattoo"/>
+	<check_box label="Alfa" name="checkbox_alpha"/>
+	<check_box label="Física" name="checkbox_physics"/>
+	<check_box label="Pecho" name="checkbox_Chest"/>
+	<check_box label="Cráneo" name="checkbox_Skull"/>
+	<check_box label="Hombro Izquierdo" name="checkbox_Left Shoulder"/>
+	<check_box label="Hombro Derecho" name="checkbox_Right Shoulder"/>
+	<check_box label="Mano Izquierda" name="checkbox_Left Hand"/>
+	<check_box label="Mano Derecha" name="checkbox_Right Hand"/>
+	<check_box label="Pié Izquierdo" name="checkbox_Left Foot"/>
+	<check_box label="Pié Derecho" name="checkbox_Right Foot"/>
+	<check_box label="Columna" name="checkbox_Spine"/>
+	<check_box label="Pelvis" name="checkbox_Pelvis"/>
+	<check_box label="Boca" name="checkbox_Mouth"/>
+	<check_box label="Mentón" name="checkbox_Chin"/>
+	<check_box label="Oreja Izquierda" name="checkbox_Left Ear"/>
+	<check_box label="Oreja Derecha" name="checkbox_Right Ear"/>
+	<check_box label="Globo Ocular Izquierdo" name="checkbox_Left Eyeball"/>
+	<check_box label="Globo Ocular Derecho" name="checkbox_Right Eyeball"/>
+	<check_box label="Nariz" name="checkbox_Nose"/>
+	<check_box label="Brazo Derecho" name="checkbox_R Upper Arm"/>
+	<check_box label="Antebrazo Derecho" name="checkbox_R Forearm"/>
+	<check_box label="Brazo Izquierdo" name="checkbox_L Upper Arm"/>
+	<check_box label="Antebrazo Izquierdo" name="checkbox_L Forearm"/>
+	<check_box label="Cadera Derecha" name="checkbox_Right Hip"/>
+	<check_box label="Muslo Derecho" name="checkbox_R Upper Leg"/>
+	<check_box label="Pierna Derecha" name="checkbox_R Lower Leg"/>
+	<check_box label="Cadera Izquierda" name="checkbox_Left Hip"/>
+	<check_box label="Muslo Izquierdo" name="checkbox_L Upper Leg"/>
+	<check_box label="Pierna Izquierda" name="checkbox_L Lower Leg"/>
+	<check_box label="Estómago" name="checkbox_Stomach"/>
+	<check_box label="Pectoral Izquierdo" name="checkbox_Left Pec"/>
+	<check_box label="Pectoral Derecho" name="checkbox_Right Pec"/>
+	<check_box label="Cuello" name="checkbox_Neck"/>
+	<check_box label="Root" left="413" name="checkbox_Root"/>
+	<check_box label="Centro 2" name="checkbox_Center 2"/>
+	<check_box label="Superior Derecha" name="checkbox_Top Right"/>
+	<check_box label="Arriba" name="checkbox_Top"/>
+	<check_box label="Superior Izquierda" name="checkbox_Top Left"/>
+	<check_box label="CentrO" name="checkbox_Center"/>
+	<check_box label="Inferior Izquierdo" name="checkbox_Bottom Left"/>
+	<check_box label="Abajo" name="checkbox_Bottom"/>
+	<check_box label="Inferior Derecha" name="checkbox_Bottom Right"/>
+	<text name="Make New Outfit">
+		Hacer Nuevo Vestuario
+	</text>
+	<text 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.">
+		Los Vestuarios son carpetas que contienen ropas y partes de cuerpo.
 Arrastra una carpeta de Vestuario a tu avatar para verstirtelo.			 
 
 &quot;Hacer Nuevo Vestuario&quot; crea una carpeta nueva y guarda en ella
 los items que actualmente tienes vestidos.
-	  </text>
-	  <text name="Folder name:">
-			 Nombre de Carpeta:
-	  </text>
-	  <text name="Items to include in outfit:">
-			 Items a incluir en el vestuario:
-	  </text>
-	  <button label="Marcar Todo" name="Check All"/>
-	  <button label="Desmarcar Todo" name="Uncheck All"/>
-	  <text name="Body Parts:">
-			 Partes del Cuerpo:
-	  </text>
-	  <text name="Clothes:">
-			 Ropas:
-	  </text>
-	  <text name="Attachments:">
-			 Accesorios:
-	  </text>
-	  <line_editor name="name ed">
-			 Nuevo Vestuario
-	  </line_editor>
+	</text>
+	<text name="Folder name:">
+		Nombre de Carpeta:
+	</text>
+	<text name="Items to include in outfit:">
+		Items a incluir en el vestuario:
+	</text>
+	<button label="Marcar Todo" name="Check All"/>
+	<button label="Desmarcar Todo" name="Uncheck All"/>
+	<text name="Body Parts:">
+		Partes del Cuerpo:
+	</text>
+	<text name="Clothes:">
+		Ropas:
+	</text>
+	<text name="Attachments:">
+		Accesorios:
+	</text>
+	<line_editor name="name ed">
+		Nuevo Vestuario
+	</line_editor>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_notification.xml b/indra/newview/skins/default/xui/es/floater_notification.xml
index 39bd8e680..8c1d7525d 100644
--- a/indra/newview/skins/default/xui/es/floater_notification.xml
+++ b/indra/newview/skins/default/xui/es/floater_notification.xml
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater title="Consola de Notificaciones" name="notification">
-	  <text_editor name="payload" >
-			 Cargando...
-	  </text_editor>
-	  <combo_box label="Respuesta" name="response" >
-	  </combo_box>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="notification" title="Consola de Notificaciones">
+	<text_editor name="payload">
+		Cargando...
+	</text_editor>
+	<combo_box label="Respuesta" name="response"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_notifications_console.xml b/indra/newview/skins/default/xui/es/floater_notifications_console.xml
index c3e180c1c..f3e15c859 100644
--- a/indra/newview/skins/default/xui/es/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/es/floater_notifications_console.xml
@@ -1,7 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater title="Consola de Notificaciones" name="notifications_console">
-	  <combo_box name="notification_types" label="Elige el tipo de Notificación"/>
-	  <button name="add_notification" label="Añadir"/>
-	  <layout_stack name="notification_channels" >
-	  </layout_stack>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="notifications_console" title="Consola de Notificaciones">
+	<combo_box name="notification_types" label="Elige el tipo de Notificación"/>
+	<button name="add_notification" label="Añadir"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_object_im_info.xml b/indra/newview/skins/default/xui/es/floater_object_im_info.xml
index 305b5e11c..d443b3f64 100644
--- a/indra/newview/skins/default/xui/es/floater_object_im_info.xml
+++ b/indra/newview/skins/default/xui/es/floater_object_im_info.xml
@@ -1,20 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="object im info" title="Información del Objeto" >
-	  <text name="LabelItemNameTitle">
-			 Objeto:
-	  </text>
-	  <text name="ObjectName"/>
-	  <text name="LabelSlurlTitle">
-			Ubicación:
-	  </text>
-	  <text name="Slurl"/>
-	  <!-- A new viewer talking to an old sim will not have a slurl available and will show this. -->
-	  <text name="Unknown_Slurl">
-			 (Información de la ubicación no disponible)
-	  </text>
-	  <text name="LabelOwnerNameTitle">
-			 Propietario:
-	  </text>
-	  <text name="OwnerName"/>
-	  <button label="Ignorar al Propietario" label_selected="Ignorar al Propietario" name="Mute"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="object im info" title="Información del Objeto">
+	<text name="LabelItemNameTitle">
+		Objeto:
+	</text>
+	<text name="LabelSlurlTitle">
+		Ubicación:
+	</text>
+	<text name="Unknown_Slurl">
+		(Información de la ubicación no disponible)
+	</text>
+	<text name="LabelOwnerNameTitle">
+		Propietario:
+	</text>
+	<button label="Ignorar al Propietario" label_selected="Ignorar al Propietario" name="Mute"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_openobject.xml b/indra/newview/skins/default/xui/es/floater_openobject.xml
index db5c404ee..75c3876c9 100644
--- a/indra/newview/skins/default/xui/es/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/es/floater_openobject.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="objectcontents" title="Contenido del Objeto">
-	  <panel name="object_contents"/>
-	  <text name="object_name">
-			 [DESC]:
-	  </text>
-	  <button label="Copiar al Inventario" label_selected="Copiar al Inventario" name="copy_to_inventory_button"/>
-	  <button label="Copiar y Vestirse" label_selected="Copiar y Vestirse" name="copy_and_wear_button"/>
+	<text name="object_name">
+		[DESC]:
+	</text>
+	<button label="Copiar al Inventario" label_selected="Copiar al Inventario" name="copy_to_inventory_button"/>
+	<button label="Copiar y Vestirse" label_selected="Copiar y Vestirse" name="copy_and_wear_button"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pay.xml b/indra/newview/skins/default/xui/es/floater_pay.xml
index eef3b9982..9dbb0a093 100644
--- a/indra/newview/skins/default/xui/es/floater_pay.xml
+++ b/indra/newview/skins/default/xui/es/floater_pay.xml
@@ -1,26 +1,25 @@
-<?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="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="Pagar" label_selected="Pagar" name="pay btn"/>
-	  <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
-	  <text name="payee_label" width="150">
-			 Pagar al Residente:
-	  </text>
-	  <text name="payee_name" left="130">
-			 [NAME]
-	  </text>
-	  <text name="fastpay text">
-			 Pago Rápido:
-	  </text>
-	  <text name="message text" >
-			 Mensaje:
-	  </text>
-	  <line_editor name="message" />
-	  <text name="amount text">
-			 Importe:
-	  </text>
-	  <line_editor name="amount" />
+	<button label="[CURRENCY]1" label_selected="[CURRENCY]1" name="fastpay 1"/>
+	<button label="[CURRENCY]5" label_selected="[CURRENCY]5" name="fastpay 5"/>
+	<button label="[CURRENCY]10" label_selected="[CURRENCY]10" name="fastpay 10"/>
+	<button label="[CURRENCY]20" label_selected="[CURRENCY]20" name="fastpay 20"/>
+	<button label="Pagar" label_selected="Pagar" name="pay btn"/>
+	<button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
+	<text name="payee_label" width="150">
+		Pagar al Residente:
+	</text>
+	<text name="payee_name" left="130">
+		[NAME]
+	</text>
+	<text name="fastpay text">
+		Pago Rápido:
+	</text>
+	<text name="message text" >
+		Mensaje:
+	</text>
+	<text name="amount text">
+		Importe:
+	</text>
+	<line_editor name="amount"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_pay_object.xml b/indra/newview/skins/default/xui/es/floater_pay_object.xml
index 75283e834..ecaabe1d7 100644
--- a/indra/newview/skins/default/xui/es/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/es/floater_pay_object.xml
@@ -1,31 +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 name="payee_group">
-			 Pagar al Grupo:
-	  </text>
-	  <text name="payee_resident" left="10" width="110">
-			 Pagar al Residente:
-	  </text>
-	  <text name="payee_name" left="125">
-			 [NAME]
-	  </text>
-	  <text name="object_name_label" left="10" width="80">
-			 Vía el Objeto:
-	  </text>
-	  <text name="object_name_text" left="95">
-			 ...
-	  </text>
-	  <text name="fastpay text" left="5">
-			 Pago Rápido:
-	  </text>
-	  <text name="amount text">
-			 Importe:
-	  </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="Pagar" label_selected="Pagar" name="pay btn"/>
-	  <button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
-	  <line_editor name="amount"/>
+	<text name="payee_group">
+		Pagar al Grupo:
+	</text>
+	<text name="payee_resident" left="10" width="110">
+		Pagar al Residente:
+	</text>
+	<text name="payee_name" left="125">
+		[NAME]
+	</text>
+	<text name="object_name_label" left="10" width="80">
+		Vía el Objeto:
+	</text>
+	<text name="object_name_text" left="95">
+		...
+	</text>
+	<text name="fastpay text" left="5">
+		Pago Rápido:
+	</text>
+	<text name="amount text">
+		Importe:
+	</text>
+	<button label="[CURRENCY]1" label_selected="[CURRENCY]1" name="fastpay 1"/>
+	<button label="[CURRENCY]5" label_selected="[CURRENCY]5" name="fastpay 5"/>
+	<button label="[CURRENCY]10" label_selected="[CURRENCY]10" name="fastpay 10"/>
+	<button label="[CURRENCY]20" label_selected="[CURRENCY]20" name="fastpay 20"/>
+	<button label="Pagar" label_selected="Pagar" name="pay btn"/>
+	<button label="Cancelar" label_selected="Cancelar" name="cancel btn"/>
+	<line_editor name="amount"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_perm_prefs.xml b/indra/newview/skins/default/xui/es/floater_perm_prefs.xml
index fd0b8de3f..ad67e1ac1 100644
--- a/indra/newview/skins/default/xui/es/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/es/floater_perm_prefs.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="perm prefs" title="Permisos de subida por defecto" >
-	  <panel label="Permisos" name="permissions" >
-			 <button name="help" label="?" label_selected="?" />
-			 <check_box label="Compartir con el Grupo" name="share_with_group"/>
-			 <check_box label="Permitir copiar a cualquiera" name="everyone_copy"/>
-			 <text name="NextOwnerLabel">
-					El Próximo propietario puede:
-			 </text>
-			 <check_box label="Modificar" name="next_owner_modify"/>
-			 <check_box label="Copiar" name="next_owner_copy"/>
-			 <check_box label="Venderlo/Darlo" name="next_owner_transfer"/>
-	  </panel>
-	  <button label="OK" label_selected="OK"name="ok"/>
-	  <button label="Cancelar" label_selected="Cancelar" name="cancel"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="perm prefs" title="Permisos de subida por defecto">
+	<panel label="Permisos" name="permissions">
+		<button label="?" label_selected="?" name="help"/>
+		<check_box label="Compartir con el Grupo" name="share_with_group"/>
+		<check_box label="Permitir copiar a cualquiera" name="everyone_copy"/>
+		<text name="NextOwnerLabel">
+			El Próximo propietario puede:
+		</text>
+		<check_box label="Modificar" name="next_owner_modify"/>
+		<check_box label="Copiar" name="next_owner_copy"/>
+		<check_box label="Venderlo/Darlo" name="next_owner_transfer"/>
+	</panel>
+	<button label="OK" label_selected="OK" name="ok"/>
+	<button label="Cancelar" label_selected="Cancelar" name="cancel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/panel_audio.xml b/indra/newview/skins/default/xui/es/panel_audio.xml
index 27f4b7c96..8b7680af6 100644
--- a/indra/newview/skins/default/xui/es/panel_audio.xml
+++ b/indra/newview/skins/default/xui/es/panel_audio.xml
@@ -1,17 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Audio y  Video" name="Media panel">
-	  <slider label="Maestro" name="System Volume"/>
-	  <button label="" name="mute_audio"/> 
-	  <slider label="Música" name="Music Volume"/>
-	  <button label="" name="mute_music"/>
-	  <slider label="Media" name="Media Volume"/>
-	  <button label="" name="mute_media"/>
-	  <slider label="Voz" name="Voice Volume"/>
-	  <button label="" name="mute_voice"/>
-	  <slider label="Sonidos" name="SFX Volume"/>
-	  <button label="" name="mute_sfx"/>
-	  <slider label="Ambiente" name="Wind Volume"/>
-	  <button label="" name="mute_wind"/>
-	  <slider label="UI" name="UI Volume"/>
-	  <button label="" name="mute_ui"/>
+	<slider label="Maestro" name="System Volume"/>
+	<slider label="Música" name="Music Volume"/>
+	<slider label="Media" name="Media Volume"/>
+	<slider label="Voz" name="Voice Volume"/>
+	<slider label="Sonidos" name="SFX Volume"/>
+	<slider label="Ambiente" name="Wind Volume"/>
+	<slider label="UI" name="UI Volume"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_audio_device.xml b/indra/newview/skins/default/xui/es/panel_audio_device.xml
index 42dc2079a..f65c29710 100644
--- a/indra/newview/skins/default/xui/es/panel_audio_device.xml
+++ b/indra/newview/skins/default/xui/es/panel_audio_device.xml
@@ -1,27 +1,25 @@
-<?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">
-			 Dispositivos de Audio
-	  </text>
-	  <text name="Input device (microphone):">
-			 Dispostitivo de Entrada (micrófono):
-	  </text>
-	  <combo_box name="voice_input_device"/>
-	  <text name="Output device (speakers):">
-			 Dospositiv o de Salida (parlantes):
-	  </text>
-	  <combo_box name="voice_output_device"/>
-	  <text name="Input level:">
-			 Nivel de Entrada
-	  </text>
-	  <text_editor name="voice_intro_text1">
-			 Ajusta el control deslizante para variar el volumen en que te escucharán los otros residentes. Para probar el nivel de entrada, simplemente habla en tu micrófono.
-	  </text_editor>
-	  <volume_slider name="mic_volume_slider" tool_tip="Cambia el volumen usando este control deslizante" />
-	  <text name="wait_text">
-			 Espera por favor
-	  </text>
-	  <string name="default_text">
-			 Por defecto
-	  </string>
+	<text name="Audio Devices">
+		Dispositivos de Audio
+	</text>
+	<text name="Input device (microphone):">
+		Dispostitivo de Entrada (micrófono):
+	</text>
+	<text name="Output device (speakers):">
+		Dospositiv o de Salida (parlantes):
+	</text>
+	<text name="Input level:">
+		Nivel de Entrada
+	</text>
+	<text_editor name="voice_intro_text1">
+		Ajusta el control deslizante para variar el volumen en que te escucharán los otros residentes. Para probar el nivel de entrada, simplemente habla en tu micrófono.
+	</text_editor>
+	<volume_slider name="mic_volume_slider" tool_tip="Cambia el volumen usando este control deslizante" />
+	<text name="wait_text">
+		Espera por favor
+	</text>
+	<string name="default_text">
+		Por defecto
+	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_avatar.xml b/indra/newview/skins/default/xui/es/panel_avatar.xml
index 8808d6620..c70b745ea 100644
--- a/indra/newview/skins/default/xui/es/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/es/panel_avatar.xml
@@ -1,229 +1,218 @@
-<?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="2º Vida" name="2nd Life">
-					<string name="CaptionTextAcctInfo">
-						  [ACCTTYPE]
+	<tab_container name="tab">
+		<panel label="2º Vida" name="2nd Life">
+			<string name="CaptionTextAcctInfo">
+				[ACCTTYPE]
 [PAYMENTINFO]
 [AGEVERIFICATION]
-					</string>
-					<string name="AcctTypeResident">
-						  Residente
-					</string>
-					<string name="AcctTypeTrial">
-						  Prueba
-					</string>
-					<string name="AcctTypeCharterMember">
-						  Miembro Fundador
-					</string>
-					<string name="AcctTypeEmployee">
-						  Empleado de Linden Lab
-					</string>
-					<string name="PaymentInfoUsed">
-						  Información de Pago utilizada
-					</string>
-					<string name="PaymentInfoOnFile">
-						  Información de Pago en Archivo
-					</string>
-					<string name="NoPaymentInfoOnFile">
-						  Sin Información de Pago
-					</string>
-					<string name="AgeVerified">
-						  Edad Verificada
-					</string>
-					<string name="NotAgeVerified">
-						  Edad No Verificada
-					</string>
-					<text name="Key:">
-						  Key:
-					</text>
-					<name_editor name="avatar_key"/>
-					<button label="Copiar" tool_tip="Copyiar key al portapapeles" name="copy_key"/>
-					<text name="Name:" >
-						  Nombre:
-					</text>
-					<name_editor name="name"/>
-					<line_editor name="dnname" />
-					<text name="online_yes">
-						  En Línea
-					</text>
-					<text name="label">
-						  Nacido:
-					</text>
-					<line_editor name="born"/>
-					<text name="label2">
-						  Cuenta:
-					</text>
-					<view_border name="acct_border"/>
-					<text name="acct"/>
-					<text name="partner_label" tool_tip="Compañera/o en Second Life. Para más información ver www.secondlife.com/partner">
-						  Compañera/o:
-					</text>
-					<button label="i" label_selected="i" name="partner_info" tool_tip="Pulsa para abrir el Perfil del Compañero/a" left_delta="75"/>
-					<button label="?" label_selected="?" name="partner_help"/>
-					<line_editor name="partner_edit" tool_tip="Comapañera/o en Second Life partner. Para más información ver www.secondlife.com/partner">
-						  [NAME]
-					</line_editor>
-					<text name="Photo:">
-						  Foto:
-					</text>
-					<texture_picker label="" name="img" tool_tip="Pulsa aquí para seleccionar una foto" />
-					<button label="" name="bigimg"/>
-					<text name="Groups:">
-						  Grupos:
-					</text>
-					<scroll_list name="groups"/>
-					<text name="About:">
-						  Sobre mi:
-					</text>
-					<text name="(500 chars)">
-						  (500 caracts)	
-					</text>
-					<text_editor name="about" />
-					<text name="Give item:">
-						  Dar un Item:
-					</text>
-					<view_border name="drop_target_rect"/>
-					<view_border name="drop_target_rect_vis"/>
-					<text name="Give inventory" tool_tip="Arrastra hasta aquí items de tu inventario para dárselos a este usuario">
-						  Arrastra hastsa aquí un ítem del inventario.
-					</text>
-					<check_box label="Mostrar en la Búsqueda" name="allow_publish" tool_tip="Publicar información del Perfil en la búsqueda."/>
-					<button label="?" label_selected="?" name="?"/>
-					<button label="Localizar en el Mapa" label_selected="Localizar en el Mapa" name="Find on Map" left="10" width="135"/>
-					<button label="Ofrecer Teleporte" label_selected="Ofrecer Teleporte" name="Offer Teleport..." left_delta="143" width="120"/>
-					<button label="Añadir como Amigo" label_selected="Añadir como Amigo" name="Add Friend..." left_delta="129" />
-					<button label="Pagar..." label_selected="Pagar..." name="Pay..." left="10"/>
-					<button label="Mensaje Instantáneo" label_selected="Mensaje Instantáneo" name="Instant Message..." tool_tip="Mensaje Instantáneo (IM)" left_delta="78"/>
-					<button label="Ignorar" label_selected="Ignorar" name="Mute" left_delta="148"/>
-					<button label="Invitar al Grupo" label_selected="Invitar al Grupo" name="GroupInvite_Button" left_delta="68" width="110"/>
-			 </panel>
-			 <!-- Panel Perfil Web -->
-			 <panel label="Web" name="WebProfile" width="400"> 
-					<line_editor name="url_edit"/>
-					<flyout_button label="Cargar" label_selected="Cargar" name="load" tool_tip="Cargar este perfil con el navegador incorporado" >
-						  <flyout_button_item value="open" name="open_item">En navegador externo</flyout_button_item>
-						  <flyout_button_item value="home" name="home_item">Inicio</flyout_button_item>
-					</flyout_button>
-					<button label="?" label_selected="?" name="web_profile_help" />
-					<check_box label="Cargar Pefil Web Automáticamente" tool_tip="Carga Automáticamente todos los perfiles web."/>
-					<web_browser name="profile_html" start_url="" />
-					<text name="status_text" />
-			 </panel>
-			 <!-- Panel Intereses -->
-			 <panel label="Intereses" name="Interests">
-					<text name="I Want To:">
-						  Quiero:
-					</text>
-					<check_box label="Construir" name="chk0"/>
-					<check_box label="Explorar" name="chk1"/>
-					<check_box label="Conocer Gente" name="chk2"/>
-					<check_box label="Ser Contratado" name="chk6"/>
-					<check_box label="Estar en un Grupo" name="chk3"/>
-					<check_box label="Comprar" name="chk4" />
-					<check_box label="Vender" name="chk5"/>
-					<check_box label="Contratar" name="chk7"/>
-					<line_editor name="want_to_edit" />
-					<text name="Skills:">
-						  Habilidades:
-					</text>
-					<check_box label="Texturas" name="schk0"/>
-					<check_box label="Arquitectura" name="schk1"/>
-					<check_box label="Programar Eventos" name="schk2"/>					
-					<check_box label="Modelaje" name="schk3"/>					
-					<check_box label="Programación" name="schk4"/>
-					<check_box label="Caracterizar Personajes" name="schk5"/>
-					<line_editor name="skills_edit"/>
-					<text name="Languages:">
-						  Idiomas:	
-					</text>
-					<line_editor name="languages_edit"/>
-			 </panel>
-			 <!-- Panel Destacados -->
-			 <panel label="Destacados" name="Picks">
-					<text name="Tell everyone about your favorite places in Second Life.">
-						  Muestra a los demás tus lugares favoritos en Second Life.
-					</text>
-					<button label="Nuevo..." label_selected="Nuevo..." name="New..."/>
-					<button label="Borrar..." label_selected="Borrar..." name="Delete..."/>
-					<!-- <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
-						  label="Import..." label_selected="Import..." left_delta="74"
-						  mouse_opaque="true" name="Import..." width="70" />
-						  <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
-						  label="Export..." label_selected="Export..." left_delta="74"
-						  mouse_opaque="true" name="Export..." width="70" />-->
-					<tab_container name="picks tab" />
-					<text name="loading_text">
-						  Cargando...
-					</text>
-			 </panel>
-			 <!-- Panel Clasificados -->
-			 <panel label="Clasificados" name="Classified">
-					<text name="Place an ad in Second Life&apos;s classified listings.">
-						  Pon tu anuncio en los Clasificados de Second Life.
-					</text>
-					<button label="Nuevo..." label_selected="Nuevo..." name="New..."/>
-					<button label="Borrar..." label_selected="Borrar..." name="Delete..."/>
-					<tab_container name="classified tab"/>
-					<text name="loading_text">
-						  Cargando...
-					</text>
-			 </panel>
-			 <!-- Panel Primera Vida -->
-			 <panel label="1º Vida" name="1st Life">
-					<text name="Photo:">
-						  Foto:
-					</text>
-					<texture_picker label="" name="img" tool_tip="Pulsa aquí para elegir una foto" />
-					<button label="" name="flbigimg"/>
-					<text name="Info:">
-						  Información:
-					</text>
-					<text name="(250 chars)">
-						  (250 characts)
-					</text>
-					<text_editor name="about"/>
-			 </panel>
-			 <!-- Panel Mis Notas -->
-			 <panel label="Mis Notas" name="My Notes">
-					<string name="Loading">
-						  Cargando...
-					</string>
-					<text name="label">
-						  Usa este espacio para escribir tus notas acerca de esta persona. Lleva un
+			</string>
+			<string name="AcctTypeResident">
+				Residente
+			</string>
+			<string name="AcctTypeTrial">
+				Prueba
+			</string>
+			<string name="AcctTypeCharterMember">
+				Miembro Fundador
+			</string>
+			<string name="AcctTypeEmployee">
+				Empleado de Linden Lab
+			</string>
+			<string name="PaymentInfoUsed">
+				Información de Pago utilizada
+			</string>
+			<string name="PaymentInfoOnFile">
+				Información de Pago en Archivo
+			</string>
+			<string name="NoPaymentInfoOnFile">
+				Sin Información de Pago
+			</string>
+			<string name="AgeVerified">
+				Edad Verificada
+			</string>
+			<string name="NotAgeVerified">
+				Edad No Verificada
+			</string>
+			<text name="Key:">
+				Key:
+			</text>
+			<button label="Copiar" tool_tip="Copyiar key al portapapeles" name="copy_key"/>
+			<text name="Name:" >
+				Nombre:
+			</text>
+			<text name="online_yes">
+				En Línea
+			</text>
+			<text name="label">
+				Nacido:
+			</text>
+			<line_editor name="born"/>
+			<text name="label2">
+				Cuenta:
+			</text>
+			<view_border name="acct_border"/>
+			<text name="acct"/>
+			<text name="partner_label" tool_tip="Compañera/o en Second Life. Para más información ver www.secondlife.com/partner">
+				Compañera/o:
+			</text>
+			<button label="i" label_selected="i" name="partner_info" tool_tip="Pulsa para abrir el Perfil del Compañero/a" left_delta="75"/>
+			<button label="?" label_selected="?" name="partner_help"/>
+			<line_editor name="partner_edit" tool_tip="Comapañera/o en Second Life partner. Para más información ver www.secondlife.com/partner">
+				[NAME]
+			</line_editor>
+			<text name="Photo:">
+				Foto:
+			</text>
+			<texture_picker label="" name="img" tool_tip="Pulsa aquí para seleccionar una foto" />
+			<text name="Groups:">
+				Grupos:
+			</text>
+			<scroll_list name="groups"/>
+			<text name="About:">
+				Sobre mi:
+			</text>
+			<text name="(500 chars)">
+				(500 caracts)
+			</text>
+			<text_editor name="about"/>
+			<text name="Give item:">
+				Dar un Item:
+			</text>
+			<view_border name="drop_target_rect"/>
+			<view_border name="drop_target_rect_vis"/>
+			<text name="Give inventory" tool_tip="Arrastra hasta aquí items de tu inventario para dárselos a este usuario">
+				  Arrastra hastsa aquí un ítem del inventario.
+			</text>
+			<check_box label="Mostrar en la Búsqueda" name="allow_publish" tool_tip="Publicar información del Perfil en la búsqueda."/>
+			<button label="?" label_selected="?" name="?"/>
+			<button label="Localizar en el Mapa" label_selected="Localizar en el Mapa" name="Find on Map" left="10" width="135"/>
+			<button label="Ofrecer Teleporte" label_selected="Ofrecer Teleporte" name="Offer Teleport..." left_delta="143" width="120"/>
+			<button label="Añadir como Amigo" label_selected="Añadir como Amigo" name="Add Friend..." left_delta="129" />
+			<button label="Pagar..." label_selected="Pagar..." name="Pay..." left="10"/>
+			<button label="Mensaje Instantáneo" label_selected="Mensaje Instantáneo" name="Instant Message..." tool_tip="Mensaje Instantáneo (IM)" left_delta="78"/>
+			<button label="Ignorar" label_selected="Ignorar" name="Mute" left_delta="148"/>
+			<button label="Invitar al Grupo" label_selected="Invitar al Grupo" name="GroupInvite_Button" left_delta="68" width="110"/>
+		</panel>
+		 <!-- Panel Perfil Web -->
+		<panel label="Web" name="WebProfile" width="400"> 
+			<line_editor name="url_edit"/>
+			<flyout_button label="Cargar" label_selected="Cargar" name="load" tool_tip="Cargar este perfil con el navegador incorporado" >
+				  <flyout_button_item value="open" name="open_item">En navegador externo</flyout_button_item>
+				  <flyout_button_item value="home" name="home_item">Inicio</flyout_button_item>
+			</flyout_button>
+			<button label="?" label_selected="?" name="web_profile_help" />
+			<check_box label="Cargar Pefil Web Automáticamente" tool_tip="Carga Automáticamente todos los perfiles web."/>
+			<web_browser name="profile_html" start_url="" />
+			<text name="status_text" />
+		</panel>
+		<panel label="Intereses" name="Interests">
+			<text name="I Want To:">
+				Quiero:
+			</text>
+			<check_box label="Construir" name="chk0"/>
+			<check_box label="Explorar" name="chk1"/>
+			<check_box label="Conocer Gente" name="chk2"/>
+			<check_box label="Ser Contratado" name="chk6"/>
+			<check_box label="Estar en un Grupo" name="chk3"/>
+			<check_box label="Comprar" name="chk4" />
+			<check_box label="Vender" name="chk5"/>
+			<check_box label="Contratar" name="chk7"/>
+			<line_editor name="want_to_edit" />
+			<text name="Skills:">
+				  Habilidades:
+			</text>
+			<check_box label="Texturas" name="schk0"/>
+			<check_box label="Arquitectura" name="schk1"/>
+			<check_box label="Programar Eventos" name="schk2"/>
+			<check_box label="Modelaje" name="schk3"/>
+			<check_box label="Programación" name="schk4"/>
+			<check_box label="Caracterizar Personajes" name="schk5"/>
+			<line_editor name="skills_edit"/>
+			<text name="Languages:">
+				Idiomas:
+			</text>
+			<line_editor name="languages_edit"/>
+		</panel>
+		<panel label="Destacados" name="Picks">
+			<text name="Tell everyone about your favorite places in Second Life.">
+				Muestra a los demás tus lugares favoritos en Second Life.
+			</text>
+			<button label="Nuevo..." label_selected="Nuevo..." name="New..."/>
+			<button label="Borrar..." label_selected="Borrar..." name="Delete..."/>
+			<!-- <button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
+				label="Import..." label_selected="Import..." left_delta="74"
+				mouse_opaque="true" name="Import..." width="70" />
+				<button bottom="-44" follows="left|top" font="SansSerif" halign="center" height="20"
+				label="Export..." label_selected="Export..." left_delta="74"
+				mouse_opaque="true" name="Export..." width="70" />-->
+			<tab_container name="picks tab" />
+			<text name="loading_text">
+				Cargando...
+			</text>
+		</panel>
+		<panel label="Clasificados" name="Classified">
+			<text name="Place an ad in Second Life&apos;s classified listings.">
+				Pon tu anuncio en los Clasificados de Second Life.
+			</text>
+			<button label="Nuevo..." label_selected="Nuevo..." name="New..."/>
+			<button label="Borrar..." label_selected="Borrar..." name="Delete..."/>
+			<tab_container name="classified tab"/>
+			<text name="loading_text">
+				  Cargando...
+			</text>
+		</panel>
+		<panel label="1º Vida" name="1st Life">
+			<text name="Photo:">
+				Foto:
+			</text>
+			<texture_picker label="" name="img" tool_tip="Pulsa aquí para elegir una foto" />
+			<text name="Info:">
+				Información:
+			</text>
+			<text name="(250 chars)">
+				(250 characts)
+			</text>
+			<text_editor name="about"/>
+		</panel>
+		<panel label="Mis Notas" name="My Notes">
+			<string name="Loading">
+				Cargando...
+			</string>
+			<text name="label">
+				Usa este espacio para escribir tus notas acerca de esta persona. Lleva un
 seguimiento del progreso de sus empresas, comparte proyectos, etc. Sólo tu
 puedes ver estas notas. Ni esta persona ni ninguna otra pueden verlas.					
-					</text>
-					<text_editor name="notes edit"  />
-			 </panel>
-	  </tab_container>
-	  <!-- Botones Generales del Panel -->
-	  <button label="OK" label_selected="OK" name="OK"/>
-	  <button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
-	  <button label="Expulsar" label_selected="Expulsar" name="Kick"/>
-	  <button label="Congelar" label_selected="Congelar" name="Freeze" tool_tip="Detener el movimiento y el chat de este residente" />
-	  <button label="Descongelar" label_selected="Descongelar" name="Unfreeze" tool_tip="Descongelar al residente"/>
-	  <button label="CSR" label_selected="CSR" name="csr_btn" tool_tip="Abrir la herramienta de servicio al cliente para este residente" />
-	  <string name="ShowOnMapNonFriend">
-			 Ver la posición en el mapa. Desactivado porque no está entre tus amigos.
-	  </string>
-	  <string name="ShowOnMapFriendOffline">
-			 Ver la posición en el mapa. Desactivado porque no está en línea.
-	  </string>
-	  <string name="ShowOnMapFriendOnline">
-			 Ver la posición en el mapa.
-	  </string>
-	  <string name="TeleportGod">
-			 Obligarlo a Teleportarse a tu posición.
-	  </string>
-	  <string name="TeleportPrelude">
-			 Ofrecerle teleporte a tu posición.
+			</text>
+			<text_editor name="notes edit"/>
+		</panel>
+	</tab_container>
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<button label="Expulsar" label_selected="Expulsar" name="Kick"/>
+	<button label="Congelar" label_selected="Congelar" name="Freeze" tool_tip="Detener el movimiento y el chat de este residente" />
+	<button label="Descongelar" label_selected="Descongelar" name="Unfreeze" tool_tip="Descongelar al residente"/>
+	<button label="CSR" label_selected="CSR" name="csr_btn" tool_tip="Abrir la herramienta de servicio al cliente para este residente" />
+	<string name="ShowOnMapNonFriend">
+		Ver la posición en el mapa. Desactivado porque no está entre tus amigos.
+	</string>
+	<string name="ShowOnMapFriendOffline">
+		Ver la posición en el mapa. Desactivado porque no está en línea.
+	</string>
+	<string name="ShowOnMapFriendOnline">
+		Ver la posición en el mapa.
+	</string>
+	<string name="TeleportGod">
+		Obligarlo a Teleportarse a tu posición.
+	</string>
+	<string name="TeleportPrelude">
+		Ofrecerle teleporte a tu posición.
 Desactivado hasta que salgas de la Isla de Orientación
-	  </string>
-	  <string name="TeleportNormal">
-			 Ofrecerle teleporte a tu posición.
-	  </string>
-	  <string name="Loading">
-			 Cargando...
-	  </string>
+	</string>
+	<string name="TeleportNormal">
+		Ofrecerle teleporte a tu posición.
+	</string>
+	<string name="Loading">
+		Cargando...
+	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_avatar_classified.xml b/indra/newview/skins/default/xui/es/panel_avatar_classified.xml
index 4c88840aa..10886e30d 100644
--- a/indra/newview/skins/default/xui/es/panel_avatar_classified.xml
+++ b/indra/newview/skins/default/xui/es/panel_avatar_classified.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Classified" title="Clasificados">
-	  <line_editor name="given_name_editor" tool_tip="El nombre debe comenzar con letras o números, sin signos de puntuación" />
-	  <line_editor name="location_editor" tool_tip="Fija la ubicación para este clasificado en tu actual posición."/>
-	  <button label="Fijar Ubicación" name="set_location_btn"/>
-	  <button label="Teleportar" 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" value="Select">
-					Fijar Clasificación -
-			 </combo_item>
-			 <combo_item name="mature" value="Mature">
-					Contenido Mature
-			 </combo_item>
-			 <combo_item name="pg" value="PG">
-					Contenido PG
-			 </combo_item>
-	  </combo_box>
-	  <text name="classified_info_text" tool_tip="Cuanto mas decidas pagar por este aviso, más arriba en la lista aparecerá">
-			 Aviso colocado: Aún no publicado
-	  </text>
-	  <text name="click_through_text" tool_tip="Total de clicks en cada botón desde que el aviso fue colocado">
-			 Clicks:
-	  </text>
-	  <button label="Publicar..." name="classified_update_btn"/>
-	  <check_box label="Renovar Automáticamente todas las semanas" name="auto_renew_check"/>
-	  <string name="ad_placed_paid">
-			 Aviso Colocado: [DATE], Pagados [CURRENCY][AMT] por listar.
-	  </string>
-	  <string name="update_txt">
-			 Actualizar
-	  </string>
-	  <string name="publish_txt">
-			 Publicar...
-	  </string>
+	<line_editor name="given_name_editor" tool_tip="El nombre debe comenzar con letras o números, sin signos de puntuación" />
+	<line_editor name="location_editor" tool_tip="Fija la ubicación para este clasificado en tu actual posición."/>
+	<button label="Fijar Ubicación" name="set_location_btn"/>
+	<button label="Teleportar" 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">
+			Fijar Clasificación -
+		</combo_item>
+		<combo_item name="mature">
+			Contenido Mature
+		</combo_item>
+		<combo_item name="pg">
+			Contenido PG
+		</combo_item>
+	</combo_box>
+	<text name="classified_info_text" tool_tip="Cuanto mas decidas pagar por este aviso, más arriba en la lista aparecerá">
+		Aviso colocado: Aún no publicado
+	</text>
+	<text name="click_through_text" tool_tip="Total de clicks en cada botón desde que el aviso fue colocado">
+		Clicks:
+	</text>
+	<button label="Publicar..." name="classified_update_btn"/>
+	<check_box label="Renovar Automáticamente todas las semanas" name="auto_renew_check"/>
+	<string name="ad_placed_paid">
+		Aviso Colocado: [DATE], Pagados [CURRENCY][AMT] por listar.
+	</string>
+	<string name="update_txt">
+		Actualizar
+	</string>
+	<string name="publish_txt">
+		Publicar...
+	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_avatar_pick.xml b/indra/newview/skins/default/xui/es/panel_avatar_pick.xml
index fbe6c3b04..b150e667f 100644
--- a/indra/newview/skins/default/xui/es/panel_avatar_pick.xml
+++ b/indra/newview/skins/default/xui/es/panel_avatar_pick.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Pick" title="Destacados">
-	  <button label="Fijar Ubicación" name="set_location_btn"/>
-	  <button label="Teleportar" name="pick_teleport_btn"/>
-	  <button label="Mostrar en el Mapa" name="pick_map_btn"/>
-	  <text name="sort_order_text">
-			 Ordenar:
-	  </text>
-	  <check_box label="Activado" name="enabled_check"/>
+	<button label="Fijar Ubicación" name="set_location_btn"/>
+	<button label="Teleportar" name="pick_teleport_btn"/>
+	<button label="Mostrar en el Mapa" name="pick_map_btn"/>
+	<text name="sort_order_text">
+		Ordenar:
+	</text>
+	<check_box label="Activado" name="enabled_check"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_chat_bar.xml b/indra/newview/skins/default/xui/es/panel_chat_bar.xml
index 37e3b8681..dd54a74d9 100644
--- a/indra/newview/skins/default/xui/es/panel_chat_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_chat_bar.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="chat_bar">
-	  <button label="Chat Local" name="History" tool_tip="Pulsa aquí para ver el historial" />
-	  <line_editor label="Pulsa aqui para entrar en el chat." name="Chat Editor" tool_tip="Presiona Enter para hablar, Mayus-Enter para susurrar o Ctrl-Enter para gritar" />
-	  <flyout_button label="Decir" name="Say" tool_tip="(Enter)">
-			 <flyout_button_item value="shout" name="shout_item">
-					Gritar
-			 </flyout_button_item>
-			 <flyout_button_item value="say" name="say_item">
-					Decir
-			 </flyout_button_item>
-			 <flyout_button_item value="whisper" name="whisper_item">
-					Susurar
-			 </flyout_button_item>
-	  </flyout_button>
-	  <combo_box label="Gestos" name="Gesture">
-	  </combo_box>
-	  <string name="gesture_label">
-			 Gestos
-	  </string>
+	<button label="Chat Local" name="History" tool_tip="Pulsa aquí para ver el historial" />
+	<line_editor label="Pulsa aqui para entrar en el chat." name="Chat Editor" tool_tip="Presiona Enter para hablar, Mayus-Enter para susurrar o Ctrl-Enter para gritar" />
+	<flyout_button label="Decir" name="Say" tool_tip="(Enter)">
+		<flyout_button_item name="shout_item">
+			Gritar
+		</flyout_button_item>
+		<flyout_button_item name="say_item">
+			Decir
+		</flyout_button_item>
+		<flyout_button_item name="whisper_item">
+			Susurar
+		</flyout_button_item>
+	</flyout_button>
+	<combo_box label="Gestos" name="Gesture"/>
+	<string name="gesture_label">
+		Gestos
+	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_invite.xml b/indra/newview/skins/default/xui/es/panel_group_invite.xml
index c8c921958..b30747153 100644
--- a/indra/newview/skins/default/xui/es/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_invite.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Invitar a un Miembro" name="invite_panel">
-	  <text name="help_text">
-			 Puedes seleccionar a varios residentes
+	<text name="help_text">
+		Puedes seleccionar a varios residentes
 para invitarles a tu grupo. Para
-empezar, pulsa &apos;Abrir el selector de
-residentes&apos;.	
-	  </text>
-	  <button label="Abrir el Selector de Residentes" name="add_button" tool_tip=""/>
-	  <name_list name="invitee_list" tool_tip="Para seleccionar a varios residentes, mantén pulsada la tecla Ctrl y pulsa sus nombres" />
-	  <button label="Eliminar de la lista a los seleccionados" name="remove_button" tool_tip="Elimina los residentes seleccionados de la lista de invitaciones" />
-	  <text name="role_text">
-			 Elegir qué rol asignarles:
-	  </text>
-	  <combo_box name="role_name" tool_tip="Elige de la lista de roles cuál asignar a los miembros."/>
-	  <button label="Enviar Invitacioens" name="ok_button"/>
-	  <button label="Cancelar" name="cancel_button"/>
-	  <string name="confirm_invite_owner_str">
-			 ¿Estás seguro de que quieres invitar a un nuevo propietario/s? ¡Esta acción es permanente!
-	  </string>
-	  <string name="loading">
-			 (cargando...)
-	  </string>
+empezar, pulsa 'Abrir el selector de
+residentes'.	
+	</text>
+	<button label="Abrir el Selector de Residentes" name="add_button" tool_tip=""/>
+	<name_list name="invitee_list" tool_tip="Para seleccionar a varios residentes, mantén pulsada la tecla Ctrl y pulsa sus nombres" />
+	<button label="Eliminar de la lista a los seleccionados" name="remove_button" tool_tip="Elimina los residentes seleccionados de la lista de invitaciones" />
+	<text name="role_text">
+		Elegir qué rol asignarles:
+	</text>
+	<combo_box name="role_name" tool_tip="Elige de la lista de roles cuál asignar a los miembros."/>
+	<button label="Enviar Invitacioens" name="ok_button"/>
+	<button label="Cancelar" name="cancel_button"/>
+	<string name="confirm_invite_owner_str">
+		¿Estás seguro de que quieres invitar a un nuevo propietario/s? ¡Esta acción es permanente!
+	</string>
+	<string name="loading">
+		(cargando...)
+	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
index 8109f10fa..1ae6d5b94 100644
--- a/indra/newview/skins/default/xui/es/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Terreno y L$" name="land_money_tab" >
+<panel label="Terreno y [CURRENCY]" name="land_money_tab" >
 	  <string name="help_text">
 			 Se listan las parcelas propiedad del grupo, detallando las contribuciones. Aparece una advertencia si el Terreno total en uso es menor que o igual a la Contribución total. Las pestañas &apos;Planificación&apos;, &apos;Detalles&apos; y &apos;Ventas&apos; aportan información sobre las finanzas del grupo	  
 	  </string>
@@ -15,68 +15,68 @@
 	  </string>
 	  <text name="group_land_heading">
 			 Terreno propiedad del grupo
-	  </text>
-	  <scroll_list name="group_parcel_list">
-			 <column label="Parcela" name="name"/>
-			 <column label="Región" name="location"/>
-			 <column label="Tipo" name="type"/>
-			 <column label="Superficie" name="area"/>
-			 <column label="" name="hidden"/>
-	  </scroll_list>
-	  <button label="Mostrar en el Mapa" label_selected="Mostrar en el Mapa" name="map_button"/>
-	  <text name="total_contributed_land_label">
-			 Contribución Total:
-	  </text>
-	  <text name="total_contributed_land_value">
-			 [AREA] m²
-	  </text>
-	  <text name="total_land_in_use_label">
-			 Terreno total en uso:
-	  </text>
-	  <text name="total_land_in_use_value" >
-			 [AREA] m²
-	  </text>
-	  <text name="land_available_label">
-			 Terreno disponible:
-	  </text>
-	  <text name="land_available_value">
-			 [AREA] m²
-	  </text>
-	  <text name="your_contribution_label">
-			 Tu Contribución:
-	  </text>
-	  <string name="land_contrib_error">
-			 No se ha podido defininir tu contribución de terreno.
-	  </string>
-	  <text name="your_contribution_max_value">
-			 m² ([AMOUNT] máx)
-	  </text>
-	  <text name="group_over_limit_text">
-			 Los miembros del grupo deben contribuir con más créditos de terreno
+	</text>
+	<scroll_list name="group_parcel_list">
+		<column label="Parcela" name="name"/>
+		<column label="Región" name="location"/>
+		<column label="Tipo" name="type"/>
+		<column label="Superficie" name="area"/>
+		<column label="" name="hidden"/>
+	</scroll_list>
+	<button label="Mostrar en el Mapa" label_selected="Mostrar en el Mapa" name="map_button"/>
+	<text name="total_contributed_land_label">
+		Contribución Total:
+	</text>
+	<text name="total_contributed_land_value">
+		[AREA] m²
+	</text>
+	<text name="total_land_in_use_label">
+		Terreno total en uso:
+	</text>
+	<text name="total_land_in_use_value">
+		[AREA] m²
+	</text>
+	<text name="land_available_label">
+		Terreno disponible:
+	</text>
+	<text name="land_available_value">
+		[AREA] m²
+	</text>
+	<text name="your_contribution_label">
+		Tu Contribución:
+	</text>
+	<string name="land_contrib_error">
+		No se ha podido defininir tu contribución de terreno.
+	</string>
+	<text name="your_contribution_max_value">
+		m² ([AMOUNT] máx)
+	</text>
+	<text name="group_over_limit_text">
+		Los miembros del grupo deben contribuir con más créditos de terreno
 para mantener el terreno en uso.	  
-	  </text>
-	  <text name="group_money_heading">
-			 [CURRENCY] del Grupo
-	  </text>
-	  <tab_container name="group_money_tab_container">
-			 <panel label="Planificación" name="group_money_planning_tab">
-					<text_editor name="group_money_planning_text">
-						  Calculando...
-					</text_editor>
-					</panel>
-			 <panel label="Detalles" name="group_money_details_tab">
-					<text_editor name="group_money_details_text">
-						  Calculando...
-					</text_editor>
-					<button label="&lt; Antes" label_selected="&lt; Antes" name="earlier_details_button" tool_tip="Retroceder en el Tiempo" />
-					<button label="Después &gt;" label_selected="Después &gt;" name="later_details_button" tool_tip="Avanzar en el Tiempo" />
-			 </panel>
-			 <panel label="Ventas" name="group_money_sales_tab">
-					<text_editor name="group_money_sales_text">
-						  Calculando...
-					</text_editor>
-					<button label="&lt; Antes" label_selected="&lt; Antes" name="earlier_sales_button" tool_tip="Retroceder en el Tiempo" />
-					<button label="Después &gt;" label_selected="Después &gt;" name="later_sales_button" tool_tip="Avanzar en el Tiempo" />
-			 </panel>
-	  </tab_container>
+	</text>
+	<text name="group_money_heading">
+		[CURRENCY] del Grupo
+	</text>
+	<tab_container name="group_money_tab_container">
+		<panel label="Planificación" name="group_money_planning_tab">
+			<text_editor name="group_money_planning_text">
+				Calculando...
+			</text_editor>
+		</panel>
+		<panel label="Detalles" name="group_money_details_tab">
+			<text_editor name="group_money_details_text">
+				Calculando...
+			</text_editor>
+			<button label="&lt; Antes" label_selected="&lt; Antes" name="earlier_details_button" tool_tip="Retroceder en el Tiempo" />
+			<button label="Después &gt;" label_selected="Después &gt;" name="later_details_button" tool_tip="Avanzar en el Tiempo" />
+		</panel>
+		<panel label="Ventas" name="group_money_sales_tab">
+			<text_editor name="group_money_sales_text">
+				Calculando...
+			</text_editor>
+			<button label="&lt; Antes" label_selected="&lt; Antes" name="earlier_sales_button" tool_tip="Retroceder en el Tiempo" />
+			<button label="Después &gt;" label_selected="Después &gt;" name="later_sales_button" tool_tip="Avanzar en el Tiempo" />
+		</panel>
+	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_im.xml b/indra/newview/skins/default/xui/es/panel_preferences_im.xml
index 6d5023bf5..046787cd7 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_im.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_im.xml
@@ -1,32 +1,32 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Comunicación" name="im">
-	  <text name="text_box">
-			 Mi Estado en Línea:
-	  </text>
-	  <check_box label="Sólo mis amigos y mis grupos pueden ver cuando estoy en línea" name="online_visibility"/>
-	  <text name="text_box2">
-			 Opciones de MI:
-	  </text>
-	  <string name="log_in_to_change">
-			 Iniciar sesión para cambiar
-	  </string>
-	  <check_box label="Enviar MI al Email ([EMAIL])" name="send_im_to_email"/>
-	  <check_box label="Incluir MI en la consola de Chat" name="include_im_in_chat_console"/>
-	  <check_box label="Mostrar horario en los IMI" name="show_timestamps_check"/>
-	  <check_box label="Mostrar notificaciones cuando los amigos inician/terminan sesión" name="friends_online_notify_checkbox"/>
-	  <text name="text_box3">
-			 Respuesta en Modo Ocupado:
-	  </text>
-	  <text name="text_box4">
-			 Opciones de Registro:
-	  </text>
-	  <check_box label="Guardar Registro de MI en mi computador" name="log_instant_messages" />
-	  <check_box label="Mostrar horario en el registro de MI" name="log_instant_messages_timestamp"/>
-	  <check_box label="Mostrar final de la última conversación en MI" name="log_show_history"/>
-	  <check_box label="Guardar Registro del chat local en mi computador" name="log_chat"/>
-	  <check_box label="Mostrar horario en el registro del chat local" name="log_chat_timestamp"/>
-	  <check_box label="Mostrar MI recibidos en el registro de chat local" name="log_chat_IM"/>
-	  <check_box label="Incluir fecha con horario" name="log_date_timestamp"/>
-	  <check_box label="Agregar fecha al nombre de archivo de registro" name="logfile_name_datestamp"/>
-	  <button label="Cambiar Ruta" label_selected="Cambiar Ruta" name="log_path_button"/>
+	<text name="text_box">
+		Mi Estado en Línea:
+	</text>
+	<check_box label="Sólo mis amigos y mis grupos pueden ver cuando estoy en línea" name="online_visibility"/>
+	<text name="text_box2">
+		Opciones de MI:
+	</text>
+	<string name="log_in_to_change">
+		Iniciar sesión para cambiar
+	</string>
+	<check_box label="Enviar MI al Email ([EMAIL])" name="send_im_to_email"/>
+	<check_box label="Incluir MI en la consola de Chat" name="include_im_in_chat_console"/>
+	<check_box label="Mostrar horario en los IMI" name="show_timestamps_check"/>
+	<check_box label="Mostrar notificaciones cuando los amigos inician/terminan sesión" name="friends_online_notify_checkbox"/>
+	<text name="text_box3">
+		Respuesta en Modo Ocupado:
+	</text>
+	<text name="text_box4">
+		Opciones de Registro:
+	</text>
+	<check_box label="Guardar Registro de MI en mi computador" name="log_instant_messages" />
+	<check_box label="Mostrar horario en el registro de MI" name="log_instant_messages_timestamp"/>
+	<check_box label="Mostrar final de la última conversación en MI" name="log_show_history"/>
+	<check_box label="Guardar Registro del chat local en mi computador" name="log_chat"/>
+	<check_box label="Mostrar horario en el registro del chat local" name="log_chat_timestamp"/>
+	<check_box label="Mostrar MI recibidos en el registro de chat local" name="log_chat_IM"/>
+	<check_box label="Incluir fecha con horario" name="log_date_timestamp"/>
+	<check_box label="Agregar fecha al nombre de archivo de registro" name="logfile_name_datestamp"/>
+	<button label="Cambiar Ruta" label_selected="Cambiar Ruta" name="log_path_button"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_popups.xml b/indra/newview/skins/default/xui/es/panel_preferences_popups.xml
index e493daf7e..7f6783a5a 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_popups.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_popups.xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel label="Vent. Emergentes" name="popups" title="Ventanas Emergentes">
-	  <text name="dont_show_label">
-			 No Mostrar las siguientes Ventanas Emergentes:
-	  </text>
-	  <button label="Activar esta Ventana Emergente" name="enable_popup" width="210"/>
-	  <button label="Activar todas las Ventanas Emergentes..." name="reset_dialogs_btn" tool_tip="Activa todas las ventanas emergentes y las notificaciones de primera vez." left="230" width="250"/>
-	  <text name="show_label" >
-			 Mostrar las siguientes Ventanas Emergentes:
-	  </text>
-	  <button label="Desactivar Avisos de Primera Vez..." name="skip_frst_btn" tool_tip="Desactiva todos los avisos de primera vez." width="215"/>
-	  <button label="Desactivar todas las Ventanas Emergentes..." name="skip_dialogs_btn" tool_tip="Desactiva todas las ventanas emergentes y las notificaciones de primera vez." left="235" width="255"/>
-	  <text name="text_box2">
-			 Ofertas de Notas, texturas e Hitos:
-	  </text>
-	  <check_box label="Aceptar Automáticamente" name="accept_new_inventory"/>
-	  <check_box label="Ver Automáticamente despues de aceptar" name="show_new_inventory"/>
-	  <check_box label="Mostrar automáticamente nuevos objetos aceptados en el inventario" name="show_in_inventory"/>
+	<text name="dont_show_label">
+		No Mostrar las siguientes Ventanas Emergentes:
+	</text>
+	<button label="Activar esta Ventana Emergente" name="enable_popup" width="210"/>
+	<button label="Activar todas las Ventanas Emergentes..." name="reset_dialogs_btn" tool_tip="Activa todas las ventanas emergentes y las notificaciones de primera vez." left="230" width="250"/>
+	<text name="show_label" >
+		Mostrar las siguientes Ventanas Emergentes:
+	</text>
+	<button label="Desactivar Avisos de Primera Vez..." name="skip_frst_btn" tool_tip="Desactiva todos los avisos de primera vez." width="215"/>
+	<button label="Desactivar todas las Ventanas Emergentes..." name="skip_dialogs_btn" tool_tip="Desactiva todas las ventanas emergentes y las notificaciones de primera vez." left="235" width="255"/>
+	<text name="text_box2">
+		Ofertas de Notas, texturas e Hitos:
+	</text>
+	<check_box label="Aceptar Automáticamente" name="accept_new_inventory"/>
+	<check_box label="Ver Automáticamente despues de aceptar" name="show_new_inventory"/>
+	<check_box label="Mostrar automáticamente nuevos objetos aceptados en el inventario" name="show_in_inventory"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_web.xml b/indra/newview/skins/default/xui/es/panel_preferences_web.xml
index 9cfd489d1..c4efa79ba 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_web.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_web.xml
@@ -1,28 +1,28 @@
 <?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="Usar el navegador predeterminado del sistema parar abrir la ayuda, páginas web, etc. No se recomienda si el visor se está ejecutando a Pantalla completa.">
-					Usar navegador externo (Firefox, Safari, Opera, Internet Explorer)
-			 </radio_item>
-			 <radio_item name="internal" tool_tip="Usar el navegador incorporado para abrir la ayuda, páginas web, etc. El navegador se abrirá en una nueva ventana dentro de Singularity.">
-					Usar navegador incorporado
-			 </radio_item>
-	  </radio_group>
-	  <text name="cache_size_label_l">
-			 Caché del Navegador:
-	  </text>
-	  <button label="Borrar Ahora" name="clear_cache" width="95"/>
-	  <text name="cookie_label">
-			 Cookies:
-	  </text>
-	  <check_box label="Aceptar la cookies de los sitios" name="cookies_enabled"/>
-	  <text name="proxy_label">
-			 Proxy Web:
-	  </text>
-	  <check_box label="Activar Proxy Web" name="web_proxy_enabled"/>
-	  <text name="proxy_text_label">
+	<radio_group name="use_external_browser">
+		<radio_item name="external" tool_tip="Usar el navegador predeterminado del sistema parar abrir la ayuda, páginas web, etc. No se recomienda si el visor se está ejecutando a Pantalla completa.">
+			Usar navegador externo (Firefox, Safari, Opera, Internet Explorer)
+		</radio_item>
+		<radio_item name="internal" tool_tip="Usar el navegador incorporado para abrir la ayuda, páginas web, etc. El navegador se abrirá en una nueva ventana dentro de Singularity.">
+			Usar navegador incorporado
+		</radio_item>
+	</radio_group>
+	<text name="cache_size_label_l">
+		Caché del Navegador:
+	</text>
+	<button label="Borrar Ahora" name="clear_cache" width="95"/>
+	<text name="cookie_label">
+		Cookies:
+	</text>
+	<check_box label="Aceptar la cookies de los sitios" name="cookies_enabled"/>
+	<text name="proxy_label">
+		Proxy Web:
+	</text>
+	<check_box label="Activar Proxy Web" name="web_proxy_enabled"/>
+	<text name="proxy_text_label">
 			 Dirección:
-	  </text>
-	  <line_editor name="web_proxy_editor" tool_tip="Nombre o dirección IP del proxy que deseas utilizar"/>
-	  <spinner label="Puerto Número:" name="web_proxy_port"/>
+	</text>
+	<line_editor name="web_proxy_editor" tool_tip="Nombre o dirección IP del proxy que deseas utilizar"/>
+	<spinner label="Puerto Número:" name="web_proxy_port"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml
index a67e6e48e..1d83d3681 100644
--- a/indra/newview/skins/default/xui/es/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml
@@ -1,42 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="status">
 	  <text name="ParcelNameText" tool_tip="Nombre de la parcela en la que estás. Pulsa aquí para ver Acerca del Terreno.">
-			 El nombre de la parcela va aquí
+		El nombre de la parcela va aquí
 	  </text>
-	  <text name="BalanceText" tool_tip="Saldo de tu cuenta">
+	<text name="BalanceText" tool_tip="Saldo de tu cuenta">
 			 Cargando...
-	  </text>
-	  <button name="buycurrency" tool_tip="Comprar dinero"/>
-	  <text type="string" name="TimeText" tool_tip="Hora actual (Del Pacífico)">
-			 24:00
-	  </text>
-	  <string name="StatBarDaysOfWeek">
+	</text>
+	<button name="buycurrency" tool_tip="Comprar dinero"/>
+	<text type="string" name="TimeText" tool_tip="Hora actual (Del Pacífico)">
+		24:00
+	</text>
+	<string name="StatBarDaysOfWeek">
 			 Domingo:Lunes:Martes:Miércoles:Viernes:Sábado
-	  </string>
-	  <string name="StatBarMonthsOfYear">
+	</string>
+	<string name="StatBarMonthsOfYear">
 			 Enero:Febrero:Marzo:Abril:Mayo:Junio:Julio:Agosto:Setiembre:Octubre:Noviembre:Diciembre
-	  </string>
-	  <button label="" label_selected="" name="scriptout" tool_tip="Aviso de Errores de Scripts" />
-	  <button label="" label_selected="" name="health" tool_tip="Salud"/>
-	  <text type="string" name="HealthText" tool_tip="Salud">
-			 100%
-	  </text>
-	  <button label="" label_selected="" name="no_fly" tool_tip="Prohibido volar"/>
-	  <button label="" label_selected="" name="no_build" tool_tip="Prohibido Construir/Rezear"/>
-	  <button label="" label_selected="" name="no_scripts" tool_tip="Prohibido ejecutar Scripts" />
-	  <button label="" label_selected="" name="restrictpush" tool_tip="Sin Empujones" />
-	  <button label="" label_selected="" name="status_no_voice" tool_tip="Chat de Voz No Disponible"/>
-	  <button label="" label_selected="" name="buyland" tool_tip="Comprar esta parcela" />
-
-	  <!-- Totally unsexy button hack to get a sexy bevel for sexy search bevel -brent -->
-	  <button label="" name="menubar_search_bevel_bg"/>
-	  <line_editor label="Buscar" name="search_editor" tool_tip="Buscar en Second Life"/>
-	  <button label="" label_selected="" name="search_btn" tool_tip="Buscar en Second Life"/>
-	  <text type="string" name="stat_btn"/>
-	  <string name="packet_loss_tooltip">
-			 Paquetes Perdidos
-	  </string>
-	  <string name="bandwidth_tooltip">
-			 Ancho de Banda
-	  </string>
+	</string>
+	<button name="scriptout" tool_tip="Aviso de Errores de Scripts" />
+	<button name="health" tool_tip="Salud"/>
+	<text name="HealthText" tool_tip="Salud">
+		100%
+	</text>
+	<button name="no_fly" tool_tip="Prohibido volar"/>
+	<button name="no_build" tool_tip="Prohibido Construir/Rezear"/>
+	<button name="no_scripts" tool_tip="Prohibido ejecutar Scripts" />
+	<button name="restrictpush" tool_tip="Sin Empujones" />
+	<button name="status_no_voice" tool_tip="Chat de Voz No Disponible"/>
+	<button name="buyland" tool_tip="Comprar esta parcela" />
+	<line_editor label="Buscar" name="search_editor" tool_tip="Buscar en Second Life"/>
+	<button name="search_btn" tool_tip="Buscar en Second Life"/>
+	<string name="packet_loss_tooltip">
+		Paquetes Perdidos
+	</string>
+	<string name="bandwidth_tooltip">
+		Ancho de Banda
+	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/ui_strings.xml b/indra/newview/skins/default/xui/es/ui_strings.xml
index 3a02ab388..d5c9727f2 100644
--- a/indra/newview/skins/default/xui/es/ui_strings.xml
+++ b/indra/newview/skins/default/xui/es/ui_strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!-- This file contains strings that used to be hardcoded in the UI source.
      It is only for those strings which don't belong in a floater and don't
      belong to SL-specific dialogs.
diff --git a/indra/newview/skins/default/xui/fr/alerts.xml b/indra/newview/skins/default/xui/fr/alerts.xml
index a2a903283..2c3c306e9 100644
--- a/indra/newview/skins/default/xui/fr/alerts.xml
+++ b/indra/newview/skins/default/xui/fr/alerts.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <alerts>
 </alerts>
-<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
+<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/fr/floater_about.xml b/indra/newview/skins/default/xui/fr/floater_about.xml
index 9fd019310..07169eac5 100644
--- a/indra/newview/skins/default/xui/fr/floater_about.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about.xml
@@ -1,99 +1,57 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="440" min_height="100" min_width="100"
-     name="floater_about" rect_control="FloaterAboutRect"
-     title="About Singularity Viewer" width="470">
-	   <tab_container
-		 follows="all" 
-		 bottom="10"
-		 left="10"
-		 height="405" 
-		 width="450" 
-		 name="about_tab"
-		 tab_position="top">
-		 <panel
-		   border="true" 
-		   height="386"		   
-		   label="Info"
-		   help_topic="about_support_tab"
-		   name="support_panel">
-		   <text_editor
-			 parse_urls="true" 
-			follows="top|left"
-			font="SansSerif"
-			height="343"
-			bg_readonly_color="Transparent"
-			left="1"
-			max_length="65536"
-			name="support_editor"
-			top="-1"
-			bottom="28"
-			width="446"
-			word_wrap="true" />
-			<button
-			  follows="left|top" 
-			  label="Copy to Clipboard"
-			  name="copy_btn"
-			  right="-5"
-			  bottom="0"
-			  top_pad="5"
-			  height="25"
-			  width="180" />
-		  </panel>
-		  <panel
-			border="true" 
-			label="Credits" 
-			height="386"		   
-			help_topic="about_credits_tab"
-			name="credits_panel">
-			<text_editor
-			 enabled="false" 
-			 follows="left|top"
-			 bg_readonly_color="Transparent"
-			 left="1"
-			 text_color="LtGray"
-			 max_length="65536"
-			 name="credits_editor"
-			 top="-1"
-			 bottom="0"
-			 width="446"
-			 word_wrap="true">
-Singularity Viewer is developed and maintained by Siana Gearz, Shyotl Kuhr, Aleric Inglewood and Narv Czervik, with contributions by Henri Beauchamp, Kitty Barnett, Thickbrick Sleaford, Zauber Parecelsus, Wolfspirit Magic and others. Singularity is based upon Ascent source code. Credits for Ascent include Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, and others. Ascent is based upon the Inertia source code.
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_about" title="A propos de Singularity">
+  <tab_container name="about_tab">
+    <panel label="Info" help_topic="about_support_tab" name="support_panel">
+      <button label="Copier dans le presse-papier" name="copy_btn"/>
+    </panel>
 
-Singularity Viewer includes source code contributions of the following residents: Able Whitman, Adam Marker, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Argent Stonecutter, Asuka Neely, Balp Allen, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fractured Crystal, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kunnis Basiat, Lisa Lowe, Lockhart Cordoso, maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas
+    <panel label="Credits" help_topic="about_credits_tab" name="credits_panel">
+      <text_editor name="credits_editor">
+Singularity Viewer is developed and maintained by Siana Gearz, Shyotl Kuhr, Aleric Inglewood, Narv Czervik, Tigh MacFanatic, Inusaito Kanya, Sovereign Engineer and Latif Khalifa, with contributions by Fractured Crystal, Fritigern Gothly, Henri Beauchamp, McCabe Maxsted, Kadah Coba, Kitty Barnett, nhede Core, Nomade Zhao, Revolution Smythe, Selvone Franizzi, Thickbrick Sleaford, Zauber Parecelsus, Wolfspirit Magic and others. Singularity is based upon Ascent source code. Credits for Ascent include Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, and others. Ascent is based upon the Inertia source code.
+
+Singularity Viewer includes source code contributions of the following residents: Able Whitman, Adam Marker, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Argent Stonecutter, Asuka Neely, Balp Allen, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fractured Crystal, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kunnis Basiat, Lisa Lowe, Lockhart Cordoso, 
+maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas, Franxisco Romano, Damian Zhaoying
+
+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, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others.
+
+Linden Lab would like to thank the following residents: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota 
+Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
+      </text_editor>
+    </panel>
+
+    <panel label="Licenses" name="licenses_panel">
+      <text_editor name="licenses_editor"> 
+3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
+APR Copyright (C) 2000-2012 The Apache Software Foundation
+Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
+cURL Copyright (C) 1996-2010, 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-2000 Thai Open Source Software Center Ltd., 2001-2006 Expat maintainers.
+FMOD Sound System, Copyright (C) 1994-2012 Firelight Technologies Pty, Ltd.
+FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+GL Copyright (C) 1999-2004 Brian Paul.
+GLOD Copyright (C) 2003-04 Jonathan Cohen, Nat Duca, Chris Niski, Johns Hopkins University and David Luebke, Brenden Schubert, University of Virginia.
+google-perftools Copyright (C) 2005, Google Inc.
+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) 2002, Xiph.org Foundation
+OpenSSL Copyright (C) 1998-2008 The OpenSSL Project.
+PCRE Copyright (c) 1997-2012 University of Cambridge
+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-2012 Jean-loup Gailly and Mark Adler.
+
+This software contains source code provided by NVIDIA Corporation.
 
-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, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others.
-
-Linden Lab would like to thank the following residents: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
-
-
-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.
-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.
-google-perftools Copyright (c) 2005, Google Inc.
-
-All rights reserved.  See licenses.txt for details.
-
-Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-
-
-To be a success in business, be daring, be first, be different. --Henry Marchant</text_editor>
-  </panel>
-	</tab_container>  
-	<string name="you_are_at">
-		You are at [POSITION]
-	</string>
-</floater>
+All rights reserved.  See licenses.txt for details.
+
+Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+      </text_editor>
+    </panel>
+  </tab_container>  
+  <string name="you_are_at">You are at [POSITION]</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_about_land.xml b/indra/newview/skins/default/xui/fr/floater_about_land.xml
index 2c12e5896..a831cdf7c 100644
--- a/indra/newview/skins/default/xui/fr/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_about_land.xml
@@ -1,107 +1,34 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterland" title="À propos du terrain">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floaterland" title="A propos du terrain">
 	<tab_container name="landtab">
 		<panel label="Général" name="land_general_panel">
-			<text length="1" name="Name:" type="string">
-				Nom :
+			<text name="Name:">
+				Nom:
 			</text>
-			<line_editor name="Name"/>
-			<text length="1" name="Description:" type="string">
-				Description :
+			<text name="Description:">
+				Description:
 			</text>
-			<text_editor name="Description"/>
 			<text name="LandType">
-				Type :
+				Type:
 			</text>
 			<text name="LandTypeText">
 				Continent / Homestead
 			</text>
 			<text name="ContentRating">
-				Catégorie :
+				Catégorie:
 			</text>
 			<text name="ContentRatingText">
-				Adult
+				Adulte
 			</text>
-			<text length="1" name="Owner:" type="string">
-				Propriétaire :
+			<text name="Owner:">
+				Propriétaire:
 			</text>
-			<text length="1" name="OwnerText" type="string">
+			<text name="OwnerText">
 				Leyla Linden
 			</text>
 			<button label="Profil..." label_selected="Profil..." name="Profile..."/>
-			<text length="1" name="Group:" type="string">
-				Groupe :
-			</text>
-			<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 length="1" name="Not for sale." type="string">
-				Pas à vendre
-			</text>
-			<text length="1" name="For Sale: Price L$[PRICE]." type="string">
-				Prix : [PRICE] L$ ([PRICE_PER_SQM] L$/m²).
-			</text>
-			<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 length="1" name="Sell with landowners objects in parcel." type="string">
-				Objets inclus dans la vente.
-			</text>
-			<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" left="275" name="Cancel Land Sale" width="165"/>
-			<text length="1" name="Claimed:" type="string">
-				Acquis :
-			</text>
-			<text length="1" name="DateClaimText" type="string">
-				Tue Aug 15 13:47:25 2006
-			</text>
-			<text length="1" name="PriceLabel" type="string">
-				Superficie :
-			</text>
-			<text length="1" name="PriceText" type="string">
-				4048 m²
-			</text>
-			<text length="1" name="Traffic:" type="string">
-				Trafic :
-			</text>
-			<text length="1" name="DwellText" type="string">
-				0
-			</text>
-			<button label="Acheter le terrain..." label_selected="Acheter le terrain..." left="130" name="Buy Land..." width="125"/>
-			<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..." left="130" name="Buy Pass..." tool_tip="Un pass vous donne un accès temporaire à ce terrain." width="125"/>
-			<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
-			</string>
-			<string name="anyone">
-				Tout le monde
-			</string>
-			<string name="area_text">
-				Surface
-			</string>
-			<string name="area_size_text">
-				[AREA] m²
-			</string>
-			<string name="auction_id_text">
-				Code de l&apos;enchère : [ID]
-			</string>
-			<string name="need_tier_to_modify">
-				Pour modifier ce terrain, vous devez approuver votre achat.
-			</string>
 			<string name="group_owned_text">
-				(propriété du groupe)
+				(Propriété du Groupe)
 			</string>
 			<string name="profile_text">
 				Profil...
@@ -115,67 +42,138 @@
 			<string name="none_text">
 				(aucun)
 			</string>
+			<text name="Group:">
+				Groupe:
+			</text>
+			<button label="Définir..." label_selected="Définir..." name="Set..."/>
+			<button bottom="-160"  label="Info" name="group_profile"/>
+			<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'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'officier dans le groupe sélectionné."/>
+			<check_box label="Le propriétaire contribue en cédant du terrain" name="check contrib" tool_tip="Lorsqu'un terrain est cédé au groupe, l'ancien propriétaire fait également un don de terrain suffisant."/>
+			<text name="For Sale:">
+				À vendre:
+			</text>
+			<text name="Not for sale.">
+				Pas à vendre.
+			</text>
+			<text name="For Sale: Price L$[PRICE].">
+				Prix: [CURRENCY][PRICE] ([CURRENCY][PRICE_PER_SQM]/m².).
+			</text>
+			<text name="SalePending"/>
+			<button label="Vendre le terrain..." label_selected="Mise en vente terrain..." name="Sell Land..."/>
+			<text name="For sale to">
+				À vendre à: [BUYER]
+			</text>
+			<text name="Sell with landowners objects in parcel.">
+				Objets inclus dans la vente.
+			</text>
+			<text name="Selling with no objects in parcel.">
+				Objets non inclus dans la vente.
+			</text>
+			<button label="Annuler la vente du terrain" label_selected="Annule la vente du terrain" left="275" name="Cancel Land Sale" width="165"/>
+			<text name="Claimed:">
+				Acquis:
+			</text>
+			<text name="DateClaimText">
+				Tue Aug 15 13:47:25 2006
+			</text>
+			<text name="PriceLabel">
+				Superficie:
+			</text>
+			<text name="PriceText">
+				4048 m²
+			</text>
+			<text name="Traffic:">
+				Trafic:
+			</text>
+			<text name="DwellText">
+				0
+			</text>
+			<button label="Acheter le terrain" label_selected="Achat du terrain" left="130" name="Buy Land..." width="125"/>
+			<button label="Acheter pour le groupe" label_selected="Achat du terrain pour le groupe" name="Buy For Group..."/>
+			<button label="Acheter un pass" label_selected="Achat d&#x27;un pass" left="130" name="Buy Pass..." tool_tip="Un pass vous donne un accès temporaire à ce terrain." width="125"/>
+			<button label="Abandonner le terrain" label_selected="Abandon du terrain" name="Abandon Land..."/>
+			<button label="Redemander le terrain" label_selected="Redemande 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'un résident, avoir un contenu défini et ne pas être aux enchères."/>
+			<string name="new users only">
+				Nouveaux utilisateurs uniquement
+			</string>
+			<string name="anyone">
+				Tout le monde
+			</string>
+			<string name="area_text">
+				Surface
+			</string>
+			<string name="area_size_text">
+				[AREA] m²
+			</string>
+			<string name="auction_id_text">
+				Code de l'enchère: [ID]
+			</string>
+			<string name="need_tier_to_modify">
+				Pour modifier ce terrain, vous devez approuver votre achat.
+			</string>
 			<string name="sale_pending_text">
 				(vente en cours)
 			</string>
 			<string name="no_selection_text">
 				Aucune parcelle sélectionnée.
-Allez dans le menu Monde &gt; À propos du terrain ou sélectionnez une autre parcelle pour en afficher les détails.
+Allez dans le menu Monde &gt; A propos du terrain ou sélectionnez une autre parcelle pour en afficher les détails.
 			</string>
 		</panel>
 		<panel label="Règlement" name="land_covenant_panel">
 			<text name="estate_section_lbl">
-				Domaine :
+				Domaine:
 			</text>
-			<text length="1" name="estate_name_lbl" type="string">
-				Nom :
+			<text name="estate_name_lbl">
+				Nom:
 			</text>
-			<text length="1" name="estate_name_text" type="string">
-				continent
+			<text name="estate_name_text">
+				continent:
 			</text>
-			<text length="1" name="estate_owner_lbl" type="string">
-				Propriétaire :
+			<text name="estate_owner_lbl">
+				Propriétaire:
 			</text>
-			<text length="1" name="estate_owner_text" type="string">
+			<text name="estate_owner_text">
 				(aucun)
 			</text>
-			<text_editor length="1" name="covenant_editor" type="string">
-				Il n&apos;y a aucun règlement pour ce domaine.
+			<text_editor name="covenant_editor">
+				Il n'y a aucun règlement pour ce domaine.
 			</text_editor>
-			<text length="1" name="covenant_timestamp_text" type="string">
-				Last Modified Wed Dec 31 16:00:00 1969
+			<text name="covenant_timestamp_text">
+				Dernière modification Wed Dec 31 16:00:00 1969
 			</text>
 			<text name="region_section_lbl">
-				Région :
+				Région:
 			</text>
-			<text length="1" name="region_name_lbl" type="string">
-				Nom :
+			<text name="region_name_lbl">
+				Nom:
 			</text>
-			<text length="1" name="region_name_text" type="string">
+			<text name="region_name_text">
 				leyla
 			</text>
 			<text name="region_landtype_lbl">
-				Type :
+				Type:
 			</text>
 			<text name="region_landtype_text">
 				Continent / Homestead
 			</text>
 			<text name="region_maturity_lbl">
-				Catégorie :
+				Catégorie:
 			</text>
 			<text name="region_maturity_text">
-				Adult
+				Adulte
 			</text>
 			<text name="resellable_lbl">
-				Revendre :
+				Revendre:
 			</text>
-			<text length="1" name="resellable_clause" type="string">
+			<text name="resellable_clause">
 				Le terrain dans cette région ne peut être revendu.
 			</text>
 			<text name="changeable_lbl">
-				Sous-diviser :
+				Sous-diviser:
 			</text>
-			<text length="1" name="changeable_clause" type="string">
+			<text name="changeable_clause">
 				Le terrain dans cette région ne peut être fusionné/divisé.
 			</text>
 			<string name="can_resell">
@@ -185,22 +183,20 @@ Allez dans le menu Monde &gt; À propos du terrain ou sélectionnez une autre pa
 				Le terrain acheté dans cette région ne peut pas être revendu.
 			</string>
 			<string name="can_change">
-				Le terrain acheté dans cette région peut être fusionné
-ou divisé.
+				Le terrain acheté dans cette région peut être fusionné, ou divisé.
 			</string>
 			<string name="can_not_change">
-				Le terrain acheté dans cette région ne peut pas être fusionné
-ou divisé.
+				Le terrain acheté dans cette région ne peut pas être fusionné, ou divisé.
 			</string>
 		</panel>
 		<panel label="Objets" name="land_objects_panel">
 			<text name="parcel_object_bonus">
-				Facteur Bonus Objets : [BONUS]
+				Facteur Bonus Objets: [BONUS]
 			</text>
-			<text length="1" name="Simulator primitive usage:" type="string">
-				Prims utilisées sur la parcelle :
+			<text name="Simulator primitive usage:">
+				Prims utilisés sur la parcelle:
 			</text>
-			<text left="214" name="objects_available" width="230">
+			<text name="objects_available" left="214" width="230">
 				[COUNT] sur [MAX] ([AVAILABLE] disponibles)
 			</text>
 			<string name="objects_available_text">
@@ -209,95 +205,101 @@ ou divisé.
 			<string name="objects_deleted_text">
 				[COUNT] sur [MAX] ([DELETED] seront supprimés)
 			</string>
-			<text length="1" name="Primitives parcel supports:" type="string" width="200">
-				Prims max. sur la parcelle :
+			<text name="Primitives parcel supports:" width="200">
+				Prims max. sur la parcelle:
 			</text>
-			<text left="214" length="1" name="object_contrib_text" type="string" width="152">
+			<text name="object_contrib_text" left="214" width="152">
 				[COUNT]
 			</text>
-			<text length="1" name="Primitives on parcel:" type="string">
-				Prims sur la parcelle :
+			<text name="Primitives on parcel:">
+				Prims sur la parcelle:
 			</text>
-			<text left="214" length="1" name="total_objects_text" type="string" width="48">
+			<text name="total_objects_text" left="214" width="48">
 				[COUNT]
 			</text>
-			<text left="14" length="1" name="Owned by parcel owner:" type="string" width="180">
-				Appartenant au propriétaire :
+			<text name="Owned by parcel owner:" left="14" width="180">
+				Appartenant au propriétaire:
 			</text>
-			<text left="214" length="1" name="owner_objects_text" type="string" width="48">
+			<text name="owner_objects_text" left="214" width="48">
 				[COUNT]
 			</text>
 			<button label="Afficher" label_selected="Afficher" name="ShowOwner" right="-135" width="60"/>
-			<button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOwner..." right="-10" tool_tip="Renvoyer les objets à leurs propriétaires." width="119"/>
-			<text left="14" length="1" name="Set to group:" type="string" width="180">
-				Données au groupe :
+			<button label="Renvoyer" label_selected="Renvoyer" name="ReturnOwner..." tool_tip="Renvoyer les objets à leurs propriétaires." right="-10" width="119"/>
+			<text name="Set to group:" left="14" width="180">
+				Donnés au groupe:
 			</text>
-			<text left="214" length="1" name="group_objects_text" type="string" width="48">
+			<text name="group_objects_text" left="214" width="48">
 				[COUNT]
 			</text>
 			<button label="Afficher" label_selected="Afficher" name="ShowGroup" right="-135" width="60"/>
-			<button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnGroup..." right="-10" tool_tip="Renvoyer les objets à leurs propriétaires." width="119"/>
-			<text left="14" length="1" name="Owned by others:" type="string" width="128">
-				Appartenant à d&apos;autres :
+			<button label="Renvoyer" label_selected="Renvoyer" name="ReturnGroup..." tool_tip="Renvoyer les objets à leurs propriétaires." right="-10" width="119"/>
+			<text name="Owned by others:" left="14" width="128">
+				Appartenant à d'autres:
 			</text>
-			<text left="214" length="1" name="other_objects_text" type="string" width="48">
+			<text name="other_objects_text" left="214" width="48">
 				[COUNT]
 			</text>
 			<button label="Afficher" label_selected="Afficher" name="ShowOther" right="-135" width="60"/>
-			<button label="Renvoyer..." label_selected="Renvoyer..." name="ReturnOther..." right="-10" tool_tip="Renvoyer les objets à leurs propriétaires." width="119"/>
-			<text left="14" length="1" name="Selected / sat upon:" type="string" width="193">
-				Sélectionnées/où quelqu&apos;un est assis :
+			<button label="Renvoyer" label_selected="Renvoyer" name="ReturnOther..." tool_tip="Renvoyer les objets à leurs propriétaires." right="-10" width="119"/>
+			<text name="Selected / sat upon:" left="14" width="193">
+				Sélection/assis sur:
 			</text>
-			<text left="214" length="1" name="selected_objects_text" type="string" width="48">
+			<text name="selected_objects_text" left="214" width="48">
 				[COUNT]
 			</text>
-			<text left="4" name="Autoreturn" width="412">
-				Renvoi automatique des objets des autres résidents (min., 0 pour désactiver) :
+			<text name="Autoreturn" left="4" width="412">
+				Renvoi automatique des objets des autres résidents (min., 0 pour désactiver):
 			</text>
 			<line_editor name="clean other time" right="-6" width="36"/>
-			<text length="1" name="Object Owners:" type="string">
-				Propriétaires :
+			<text name="Object Owners:">
+				Propriétaires:
 			</text>
 			<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"/>
+			<button label="Renvoyer les objets" label_selected="Renvoyer les objets" name="Return objects..."/>
+			<name_list name="owner list">
+				<column name="type" label="Type"/>
 				<column name="online_status"/>
-				<column label="Nom" name="name"/>
-				<column label="Nombre" name="count"/>
-				<column label="Plus récents" name="mostrecent"/>
+				<column name="name" label="Nom"/>
+				<column name="count" label="Nombre"/>
+				<column name="mostrecent" label="Plus récents"/>
 			</name_list>
 		</panel>
 		<panel label="Options" name="land_options_panel">
-			<text length="1" name="allow_label" type="string">
-				Autoriser les autres résidents à :
+			<text name="allow_label">
+				Autoriser les autres résidents à:
 			</text>
-			<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="Modifier le terrain" name="edit land check" tool_tip="Si cette option est cochée, n'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 left="152" name="allow_label2">
-				Créer des objets :
+			<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'est pas cochée, ils ne pourront voler que lorsqu'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" left="285" name="edit objects check"/>
-			<check_box label="Groupe" left="395" name="edit group objects check"/>
-			<text left="152" name="allow_label3" width="134">
-				Laisser entrer 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" left="285" name="all object entry check"/>
-			<check_box label="Groupe" left="395" name="group object entry check"/>
-			<text left="152" name="allow_label4">
-				Exécuter des scripts :
+			<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="Tous les résidents" left="285" name="check other scripts"/>
-			<check_box label="Groupe" left="395" name="check group scripts"/>
-			<text length="1" name="land_options_label" type="string">
-				Options du terrain :
+			<check_box label="Tous les résidents" name="check other scripts" left="285"/>
+			<check_box label="Groupe" name="check group scripts" left="395"/>
+			<text name="land_options_label">
+				Options du terrain:
 			</text>
-			<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 bottom="-140" label="Pas de bousculades" left="14" 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 bottom="-160" label="Afficher dans la recherche (30 L$/semaine) sous" name="ShowDirectoryCheck" tool_tip="Afficher la parcelle dans les résultats de recherche"/>
+			<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'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."/>
+			<string name="push_restrict_text">
+				Pas de bousculades
+			</string>
+			<string name="push_restrict_region_text">
+				Pas de bousculades (les règles de la région priment)
+			</string>
+			<check_box label="Pas de bousculades" name="PushRestrictCheck" tool_tip="Empêche l'utilisation de scripts causant des bousculades. Cette option est utile pour empêcher les comportements abusifs sur votre terrain." bottom="-140" left="14"/>
+			<check_box label="Afficher dans la recherche ([DIRECTORYFEE]) sous" name="ShowDirectoryCheck" tool_tip="Affiche la parcelle dans les résultats de recherche" bottom="-160"/>
 			<string name="search_enabled_tooltip">
-				Permettre aux autres résidents de voir cette parcelle dans les résultats de recherche
+				Permettre aux autres résidents de voir cette parcelle dans les résultats de recherche.
 			</string>
 			<string name="search_disabled_small_tooltip">
 				Cette option est désactivée car la superficie de cette parcelle est inférieure ou égale à 128 m².
@@ -306,10 +308,7 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 			<string name="search_disabled_permissions_tooltip">
 				Cette option est désactivée car vous ne pouvez pas modifier les options de cette parcelle.
 			</string>
-			<string name="see_avs_text">
-				Voir et discuter avec les autres residents sur cette parcelle
-			</string>
-			<combo_box bottom="-160" left="286" name="land category with adult" width="146">
+			<combo_box name="land category with adult" bottom="-160" left="286" width="146">
 				<combo_item name="AnyCategory">
 					Toutes catégories
 				</combo_item>
@@ -317,7 +316,7 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 					Appartenant aux Lindens
 				</combo_item>
 				<combo_item name="Adult">
-					Adult
+					Adulte
 				</combo_item>
 				<combo_item name="Arts&amp;Culture">
 					Art et Culture
@@ -349,8 +348,15 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 				<combo_item name="Other">
 					Autre
 				</combo_item>
+				<combo_item name="Rental">
+					Rental
+				</combo_item>
 			</combo_box>
-			<combo_box bottom="-160" left="286" name="land category" width="146">
+			<!-- The following combo box is identical to the previous one, except for the
+				fact that the Adult item is missing. This seems to be the only way to safely
+				delete the adult item with our UI toolkit.
+				Once we have completed the transition period, the one WITH adult can be deleted. -->
+			<combo_box name="land category" bottom="-160" left="286" width="146">
 				<combo_item name="AnyCategory">
 					Toutes catégories
 				</combo_item>
@@ -387,161 +393,165 @@ Seules les parcelles de grande taille peuvent apparaître dans la recherche.
 				<combo_item name="Other">
 					Autre
 				</combo_item>
+				<combo_item name="Rental" value="rental">
+					Rental
+				</combo_item>
 			</combo_box>
-			<button bottom="-160" label="?" label_selected="?" left="436" name="?"/>
-			<check_box bottom="-180" label="Contenu Mature" name="MatureCheck" tool_tip=""/>
+			<button label="?" label_selected="?" name="?" bottom="-160" left="436"/>
+			<check_box label="Contenu Mature" name="MatureCheck" bottom="-180"/>
 			<string name="mature_check_mature">
 				Contenu Mature
 			</string>
 			<string name="mature_check_adult">
-				Contenu Adult
+				Contenu Adulte
 			</string>
 			<string name="mature_check_mature_tooltip">
 				Les informations ou contenu de votre parcelle sont classés Mature.
 			</string>
 			<string name="mature_check_adult_tooltip">
-				Les informations ou contenu de votre parcelle sont classés Adult.
+				Les informations ou contenu de votre parcelle sont classés Adulte.
 			</string>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-178" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="allow_label5" v_pad="0" width="278">
+			<text name="allow_label5">
 				
 			</text>
-			<check_box bottom="-196" enabled="false" follows="left|top" font="SansSerifSmall"
-			     height="16" initial_value="false" label="See Avatars" left="14"
-			     mouse_opaque="true" name="SeeAvatarsCheck" radio_style="false"
-			     tool_tip="The residents on other parcels can see and chat with residents on this parcel, and you to see and chat with them."
-			     width="107" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-212" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="Snapshot:" v_pad="0" width="278">
+			<check_box label="See Avatars" name="SeeAvatarsCheck" tool_tip="Communication et visuel possible avec les parcelles autres que celle-ci."/>
+			<string name="see_avs_text">
+				Voir et discuter avec les autres residents sur cette parcelle.
+			</string>
+			<text name="Snapshot:">
 				Photo:
 			</text>
-			<texture_picker allow_no_texture="false" bottom="-349" can_apply_immediately="false"
-			     default_image_name="" enabled="true" follows="left|top" height="135"
-			     label="" left="10" mouse_opaque="true" name="snapshot_ctrl"
-			     tool_tip="Click to choose a picture" width="180" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-353" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="landing_point" v_pad="0" width="278">
-				Lieu d&apos;arrivée: [LANDING]
+			<texture_picker name="snapshot_ctrl" tool_tip="Cliquez pour choisir une image"/>
+			<text name="landing_point">
+				Lieu d'arrivée: [LANDING]
 			</text>
 			<string name="landing_point_none">
 				(aucun)
 			</string>
-			<button bottom="-353" enabled="true" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" label="Définir" label_selected="Set" left="236"
-			     mouse_opaque="true" name="Set" scale_image="true"
-			     tool_tip="Sets the landing point where visitors arrive. Sets to your avatar&apos;s location inside this parcel."
-			     width="50" />
-			<button bottom="-353" enabled="true" follows="left|top" font="SansSerifSmall"
-			     halign="center" height="16" label="Annuler" label_selected="Clear" left="291"
-			     mouse_opaque="true" name="Clear" scale_image="true"
-			     tool_tip="Clear the landing point." width="50" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-373" drop_shadow_visible="true" enabled="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="Teleport Routing: " v_pad="0" width="278">
+			<button label="Définir" label_selected="Définir" name="Set" tool_tip="Définit le point d'arrivée des visiteurs."/>
+			<button label="Annuler" label_selected="Annuler" name="Clear" tool_tip="Enlève le point d'arrivée."/>
+			<text name="Teleport Routing: ">
 				Règles de téléportation:
 			</text>
-			<combo_box allow_text_entry="false" bottom="-375" enabled="true" follows="left|top"
-			     height="18" left="120" max_chars="20" mouse_opaque="true"
-			     name="landing type"
-			     tool_tip="Teleport Routing -- select how to handle teleports onto your land."
-			     width="120">
-				<combo_item type="string" length="1" enabled="true" name="Blocked" value="Blocked">
+			<combo_box name="landing type" tool_tip="Défini les règles d'arrivée sur le terrain.">
+				<combo_item name="Blocked" value="Blocked">
 					Bloqué
 				</combo_item>
-				<combo_item type="string" length="1" enabled="true" name="LandingPoint" value="Landing Point">
-					Lieu d&apos;arrivée fixe
+				<combo_item name="LandingPoint" value="Landing Point">
+					Lieu d'arrivée fixe
 				</combo_item>
-				<combo_item type="string" length="1" enabled="true" name="Anywhere" value="Anywhere">
-					Lieu d&apos;arrivée libre
+				<combo_item name="Anywhere" value="Anywhere">
+					Lieu d'arrivée libre
 				</combo_item>
 			</combo_box>
-
-			<string name="push_restrict_text">
-				Pas de bousculades
-			</string>
-			<string name="push_restrict_region_text">
-				Pas de bousculades (les règles de la région priment)
-			</string>
 		</panel>
 		<panel label="Médias" name="land_media_panel">
-			<text name="with media:" width="85">
-				Type de média :
+			<text name="with media:" width="70">
+				Type de média:
 			</text>
-			<combo_box left="97" 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"/>
+			<combo_box name="media type" tool_tip="Indique s'il s'agit de l'URL d'un film, d'une page web ou autre" left="90"/>
 			<text name="mime_type"/>
-			<text name="at URL:" width="85">
-				URL du média :
+			<text name="at URL:">
+				URL du média:
 			</text>
-			<line_editor left="97" name="media_url"/>
+			<line_editor name="media_url"/>
 			<button label="Définir..." label_selected="Définir..." name="set_media_url"/>
+			<text name="at URL2:">
+				URL Courante:
+			</text>
+			<text name="current_url"/>
+			<button label="Remplacer" label_selected="Remplacer" name="reset_media_url"/>
+			<text name="media_reset" tool_tip="Temps après lequel la parcelle revient a l'URL par défaut (0 pour jamais)" width="300">
+				Retour à l'URL du média dans:
+			</text>
+			<spinner name="media_reset_time" tool_tip="Temps après lequel la parcelle revient a l'URL par défaut (0 pour jamais)" left_delta="170"/>
+			<text name="minutes">
+				minutes
+			</text>
 			<text name="Description:">
-				Description :
+				Description:
 			</text>
-			<line_editor left="97" name="url_description" tool_tip="Texte affiché à côté du bouton Jouer/Charger"/>
-			<text length="1" name="Media texture:" type="string">
-				Remplacer
-la texture :
+			<line_editor name="url_description" tool_tip="Texte affiché à côté du bouton Jouer/Charger"/>
+			<text name="Media texture:">
+				Texture:
 			</text>
-			<texture_picker label="" left="97" name="media texture" tool_tip="Cliquez pour sélectionner une image"/>
+			<texture_picker label="" name="media texture" tool_tip="Cliquez pour sélectionner une image"/>
 			<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.)
+				Les objets avec cette texture affichent le film ou 
+la page web quand vous cliquez sur la flêche Jouer.
+
+Select the thumbnail to choose a different texture.
 			</text>
 			<text name="Options:">
-				Options
-média :
+				Options:
 			</text>
-			<check_box label="Échelle automatique" left="97" 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="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" left="97" 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 left="102" name="media_size" tool_tip="Taille du média Web, laisser 0 pour la valeur par défaut." width="105">
-				Taille du média :
+			<check_box label="En boucle" name="media_loop" tool_tip="Joue le média en boucle. A la fin de la lecture du média, il recommence automatiquement à jouer."/>
+			<check_box label="Echelle automatique" name="media_auto_scale" tool_tip="En sélectionnant cette option, le contenu de cette parcelle sera automatiquement mis à l'échelle. La qualité visuelle sera peut-être amoindrie mais aucune autre mise à l'échelle ou alignement, 'est nécessaire."/>
+			<text name="media_size" width="100">
+				Taille du média:
 			</text>
-			<spinner left_delta="89" 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="Largeur du média web. Valeur par défaut :0." left="110"/>
+			<spinner name="media_size_height" tool_tip="Hauteur du média web. Valeur par défaut :0."/>
 			<text name="pixels">
-				pixels
+				Pixels
 			</text>
-			<text bottom_delta="-28" name="MusicURL:">
-				URL de la
-musique :
+			<text name="Interaction:">
+				  Interaction:
 			</text>
-			<line_editor bottom_delta="-12" left="97" name="music_url"/>
+			<radio_group name="radio_navigate_allow">
+				<radio_item name="Anyone" tool_tip="Chaque résident peut intervenir sur le média.">
+					Tous
+				</radio_item>
+				<radio_item name="Group" tool_tip="Les permissions du groupe contrôlent qui peux intervenir sur le média.">
+					Groupe
+				</radio_item>
+			</radio_group>
+		</panel>
+		<panel name="land_audio_panel">
+			<text name="MusicURL:">
+				URL de la musique:
+			</text>
+			<line_editor name="music_url"/>
 			<text name="Sound:">
-				Son :
+				Sons:
 			</text>
-			<check_box label="Limiter les gestes et sons d&apos;objet à cette parcelle" left="97" name="check sound local"/>
-			<button label="?" label_selected="?" left="378" name="?"/>
-			<text name="Voice settings:">
-				Voix :
+			<check_box label="Limite les gestes et sons d'objet à cette parcelle" name="check_sound_local"/>
+			<button label="?" label_selected="?" name="?"/>
+			<text name="Avatar Sounds:">
+				Sons des avatars:
 			</text>
-			<check_box label="Activer le chat vocal" left="97" name="parcel_enable_voice_channel"/>
-			<check_box label="Activer le chat vocal (contrôlé par le domaine)" left="97" name="parcel_enable_voice_channel_is_estate_disabled"/>
-			<check_box label="Limiter le chat vocal à cette parcelle" left="117" name="parcel_enable_voice_channel_parcel"/>
+			<check_box label="Tous" name="all av sound check"/>
+			<check_box label="Groupe" name="group av sound check"/>
+			<text name="Voice:">
+				Voix:
+			</text>
+			<radio_group name="parcel_voice_channel">
+				<radio_item name="Estate" tool_tip="Utilise le 'Voice channel' de la région.">
+					Channel de la région
+				</radio_item>
+				<radio_item name="Parcel" tool_tip="Limiter la Voice à cette parcelle.">
+					Channel de la parcelle
+				</radio_item>
+				<radio_item name="Disabled" tool_tip="Desactive la voice sur cette parcelle.">
+					Désactivée
+				</radio_item>
+			</radio_group>
 		</panel>
 		<panel label="Accès" name="land_access_panel">
-			<text length="1" name="Limit access to this parcel to:" type="string">
+			<text name="Limit access to this parcel to:">
 				Accès à cette parcelle
 			</text>
-			<check_box label="Autoriser l&apos;accès public" name="public_access"/>
+			<check_box label="Autoriser l'accès public" name="public_access"/>
 			<text name="Only Allow">
-				Bloquer l&apos;accès aux résidents :
+				Bloquer l'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."/>
+			<check_box label="Qui n'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'âge n'a pas été vérifié" name="limit_age_verified" tool_tip="Aux résidents dont l'âge n'a pas été vérifié. Pour plus d'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="Vendre des pass à :" name="PassCheck" tool_tip="Autoriser un accès temporaire à cette parcelle"/>
+			<check_box label="Autoriser l'accès au groupe: [GROUP]" name="GroupCheck" tool_tip="Définir le groupe à l'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">
 					Tout le monde
@@ -550,16 +560,16 @@ musique :
 					Groupe
 				</combo_item>
 			</combo_box>
-			<spinner label="Prix en L$ :" name="PriceSpin"/>
-			<spinner label="Durée en heures :" name="HoursSpin"/>
+			<spinner label="Prix en [CURRENCY]:" name="PriceSpin"/>
+			<spinner label="Durée en heures:" name="HoursSpin"/>
 			<text label="Toujours autoriser" name="AllowedText">
-				Résidents autorisés
+				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="Bannir" name="BanCheck">
-				Résidents bannis
+				Résidents bannis:
 			</text>
 			<name_list name="BannedList" tool_tip="([LISTED] listés, [MAX] max)"/>
 			<button label="Ajouter..." label_selected="Ajouter..." name="add_banned"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_active_speakers.xml b/indra/newview/skins/default/xui/fr/floater_active_speakers.xml
index ea277bfc8..6fe853f4a 100644
--- a/indra/newview/skins/default/xui/fr/floater_active_speakers.xml
+++ b/indra/newview/skins/default/xui/fr/floater_active_speakers.xml
@@ -1,11 +1,11 @@
-<?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"/>
-		</scroll_list>
-		<panel name="volume_container">
-			<button name="mute_btn" tool_tip="Ignorer ce résident"/>
-		</panel>
-	</panel>
-</floater>
+<?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"/>
+		</scroll_list>
+		<panel name="volume_container">
+			<button name="mute_btn" tool_tip="Ignorer ce résident"/>
+		</panel>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml b/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
index 28da329d2..57231ce1d 100644
--- a/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_animation_preview.xml
@@ -1,165 +1,168 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Animation Preview" title="">
-	<text name="name_label">
-		Nom :
-	</text>
-	<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" 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." left_delta="116" width="124">
-		<combo_item name="Standing">
-			Debout
-		</combo_item>
-		<combo_item name="Walking">
-			En train de marcher
-		</combo_item>
-		<combo_item name="Sitting">
-			Assis
-		</combo_item>
-		<combo_item name="Flying">
-			En train de voler
-		</combo_item>
-	</combo_box>
-	<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 l&apos;animation" left_delta="116" width="124">
-		<combo_item name="Spread">
-			Doigts écartés
-		</combo_item>
-		<combo_item name="Relaxed">
-			Détendues
-		</combo_item>
-		<combo_item name="PointBoth">
-			Pointer (les deux)
-		</combo_item>
-		<combo_item name="Fist">
-			Poings
-		</combo_item>
-		<combo_item name="RelaxedLeft">
-			Détendue (gauche)
-		</combo_item>
-		<combo_item name="PointLeft">
-			Pointer (gauche)
-		</combo_item>
-		<combo_item name="FistLeft">
-			Poing gauche
-		</combo_item>
-		<combo_item name="RelaxedRight">
-			Détendue (droite)
-		</combo_item>
-		<combo_item name="PointRight">
-			Pointer (droite)
-		</combo_item>
-		<combo_item name="FistRight">
-			Poing droit
-		</combo_item>
-		<combo_item name="SaluteRight">
-			Saluer (droite)
-		</combo_item>
-		<combo_item name="Typing">
-			Taper
-		</combo_item>
-		<combo_item name="PeaceRight">
-			Paix (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." left_delta="116" width="124">
-		<combo_item name="[None]">
-			[None]
-		</combo_item>
-		<combo_item name="Aaaaah">
-			Aaaaah
-		</combo_item>
-		<combo_item name="Afraid">
-			Effrayé
-		</combo_item>
-		<combo_item name="Angry">
-			En colère
-		</combo_item>
-		<combo_item name="BigSmile">
-			Grand sourire
-		</combo_item>
-		<combo_item name="Bored">
-			Ennui
-		</combo_item>
-		<combo_item name="Cry">
-			Pleurer
-		</combo_item>
-		<combo_item name="Disdain">
-			Mépris
-		</combo_item>
-		<combo_item name="Embarrassed">
-			Gêne
-		</combo_item>
-		<combo_item name="Frown">
-			Froncer les sourcils
-		</combo_item>
-		<combo_item name="Kiss">
-			Embrasser
-		</combo_item>
-		<combo_item name="Laugh">
-			Rire
-		</combo_item>
-		<combo_item name="Plllppt">
-			Plllppt
-		</combo_item>
-		<combo_item name="Repulsed">
-			Dégoût
-		</combo_item>
-		<combo_item name="Sad">
-			Triste
-		</combo_item>
-		<combo_item name="Shrug">
-			Hausser les épaules
-		</combo_item>
-		<combo_item name="Smile">
-			Sourire
-		</combo_item>
-		<combo_item name="Surprise">
-			Surprise
-		</combo_item>
-		<combo_item name="Wink">
-			Clin d&apos;Å“il
-		</combo_item>
-		<combo_item name="Worry">
-			Soucis
-		</combo_item>
-	</combo_box>
-	<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.
-	</text>
-	<button label="Annuler" name="cancel_btn"/>
-	<button label="Charger ([UPLOADFEE])" name="ok_btn"/>
-	<string name="failed_to_initialize">
-		Echec de l&apos;initialisation du mouvement
+<floater name="Animation Preview">
+	<text name="name_label">
+		Nom:
+	</text>
+	<text name="description_label">
+		Description:
+	</text>
+	<spinner label="Priorité" name="priority" tool_tip="Contrôle quelles animations peuvent êtres écrasées par cette animation."/>
+	<check_box label="Boucle" name="loop_check" tool_tip="Joue cette animation en boucle." left="6"/>
+	<spinner width="105" label="Début(%)" label_width="55" name="loop_in_point" tool_tip="Définit le moment de l'animation où la boucle repart." left="76"/>
+	<spinner left="195" label="Fin(%)" name="loop_out_point" tool_tip="Définit le moment de l'animation où la boucle s'arrête."/>
+	<text name="hand_label" width="110">
+		Mouvement de main
+	</text>
+	<combo_box name="hand_pose_combo" tool_tip="Contrôle le mouvement des mains au cours de l'animation" left_delta="116" width="124">
+		<combo_item name="Spread">
+			Doigts écartés
+		</combo_item>
+		<combo_item name="Relaxed">
+			Détendues
+		</combo_item>
+		<combo_item name="PointBoth">
+			Pointer (les deux)
+		</combo_item>
+		<combo_item name="Fist">
+			Poings (les deux)
+		</combo_item>
+		<combo_item name="RelaxedLeft">
+			Détendue (gauche)
+		</combo_item>
+		<combo_item name="PointLeft">
+			Pointer (gauche)
+		</combo_item>
+		<combo_item name="FistLeft">
+			Poing gauche
+		</combo_item>
+		<combo_item name="RelaxedRight">
+			Détendue (droite)
+		</combo_item>
+		<combo_item name="PointRight">
+			Pointer (droite)
+		</combo_item>
+		<combo_item name="FistRight">
+			Poing droit
+		</combo_item>
+		<combo_item name="SaluteRight">
+			Saluer (droite)
+		</combo_item>
+		<combo_item name="Typing">
+			Taper (les deux)
+		</combo_item>
+		<combo_item name="PeaceRight">
+			Paix (droite)
+		</combo_item>
+	</combo_box>
+	<text bottom_delta="-22" follows="top|left" height="15" left="10" name="emote_label">
+		Expression
+	</text>
+	<combo_box label="" name="emote_combo" tool_tip="Contrôle l'expression du visage au cours de l'animation." left_delta="116" width="124">
+		<combo_item name="[None]">
+			[None]
+		</combo_item>
+		<combo_item name="Aaaaah">
+			Aaaaah
+		</combo_item>
+		<combo_item name="Afraid">
+			Effrayé
+		</combo_item>
+		<combo_item name="Angry">
+			En colère
+		</combo_item>
+		<combo_item name="BigSmile">
+			Grand sourire
+		</combo_item>
+		<combo_item name="Bored">
+			Ennui
+		</combo_item>
+		<combo_item name="Cry">
+			Pleurer
+		</combo_item>
+		<combo_item name="Disdain">
+			Mépris
+		</combo_item>
+		<combo_item name="Embarrassed">
+			Gêne
+		</combo_item>
+		<combo_item name="Frown">
+			Froncer les sourcils
+		</combo_item>
+		<combo_item name="Kiss">
+			Embrasser
+		</combo_item>
+		<combo_item name="Laugh">
+			Rire
+		</combo_item>
+		<combo_item name="Plllppt">
+			Plllppt
+		</combo_item>
+		<combo_item name="Repulsed">
+			Dégoût
+		</combo_item>
+		<combo_item name="Sad">
+			Triste
+		</combo_item>
+		<combo_item name="Shrug">
+			Hausser les épaules
+		</combo_item>
+		<combo_item name="Smile">
+			Sourire
+		</combo_item>
+		<combo_item name="Surprise">
+			Surprise
+		</combo_item>
+		<combo_item name="Wink">
+			Clin d'Å“il
+		</combo_item>
+		<combo_item name="Worry">
+			Soucis
+		</combo_item>
+	</combo_box>
+	<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 en étant seul(e) à le voir." left_delta="116" width="124">
+		<combo_item name="Standing">
+			Debout
+		</combo_item>
+		<combo_item name="Walking">
+			En train de marcher
+		</combo_item>
+		<combo_item name="Sitting">
+			Assis
+		</combo_item>
+		<combo_item name="Flying">
+			En train de voler
+		</combo_item>
+	</combo_box>
+	<spinner label="Transition &#10;début (s)"label_width="65" name="ease_in_time" tool_tip="Durée (en secondes) pendant laquelle l'animation s'intègre au mouvement."/>
+	<spinner label="Transition &#10;fin (s)" label_width="65" name="ease_out_time" tool_tip="Durée (en secondes) pendant laquelle l'animation disparaît du mouvement." left="160" width="125"/>
+	<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'animation.
+
+Nous recommandons les fichiers BVH extraits de
+Poser 4
+	</text>
+	<button label="Annuler" name="cancel_btn"/>
+	<button label="Charger ([UPLOADFEE])" name="ok_btn"/>
+	<string name="failed_to_initialize">
+		Echec de l'initialisation du mouvement
+	</string>
+	<string name="anim_too_long">
+		Le fichier d'animation fait [LENGTH] secondes
+
+La longueur maximale est de [MAX_LENGTH] secondes
+	</string>
+	<string name="failed_file_read">
+		Impossible de lire le fichier d'animation
+
+[STATUS]
 	</string>
-	<string name="anim_too_long">
-		Le fichier d&apos;animation fait [LENGTH] secondes.
-
-La longueur maximale est de [MAX_LENGTH] secondes.
-	</string>
-	<string name="failed_file_read">
-		Impossible de lire le fichier d&apos;animation.
-
-[STATUS]
-	</string>
-</floater>
+	<string name="in_world">
+		The animation preview is played on your avatar.
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_area_search.xml b/indra/newview/skins/default/xui/fr/floater_area_search.xml
index 3406d95cd..a2deaaf26 100644
--- a/indra/newview/skins/default/xui/fr/floater_area_search.xml
+++ b/indra/newview/skins/default/xui/fr/floater_area_search.xml
@@ -1,50 +1,26 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="area search" title="Recherche d&apos;objets par zone"
-	min_width="425" min_height="250" width="600" height="400" rect_control="FloaterAreaSearchRect"
-	can_resize="true" can_minimize="true" can_close="true" can_drag_on_left="false">
-	<text name="name_label" bottom="-35" follows="top|left" height="15" left="12">
-		Recherche par Nom:
-	</text>
-	<text name="desc_label" bottom_delta="0" follows="top|left" height="15" left="218">
-		Recherche par Description:
-	</text>
-	<line_editor name="Name query chunk" tool_tip=""
-		bevel_style="in" border_style="line" border_thickness="1"
-		height="20" width="200" left="10" bottom_delta="-20" follows="left|top"
-		font="SansSerifSmall" max_length="256" mouse_opaque="true" />
-	<line_editor name="Description query chunk" tool_tip=""
-		bevel_style="in" border_style="line" border_thickness="1"
-		height="20" width="200" left_delta="206" bottom_delta="0" follows="left|top"
-		font="SansSerifSmall" max_length="256" mouse_opaque="true" spell_check="true" />
-	<text name="owner_label" bottom_delta="-20" follows="top|left" height="15" left="12">
-		Recherche par Propriétaire:
-	</text>
-	<text name="group_label" bottom_delta="0" follows="top|left" height="15" left="218">
-		Recherche par Groupe:
-	</text>
-	<line_editor name="Owner query chunk" tool_tip=""
-		bevel_style="in" border_style="line" border_thickness="1"
-		height="20" width="200" left="10" bottom_delta="-20" follows="left|top"
-		font="SansSerifSmall" max_length="256" mouse_opaque="true" />
-	<line_editor name="Group query chunk" tool_tip=""
-		bevel_style="in" border_style="line" border_thickness="1"
-		height="20" width="200" left_delta="206" bottom_delta="0" follows="left|top"
-		font="SansSerifSmall" max_length="256" mouse_opaque="true" />
-	<scroll_list name="result_list"
-		left="10" right="-10" top="-103" bottom="32"
-		follows="left|top|bottom|right" can_resize="true"
-		column_padding="0" draw_heading="true" multi_select="false" search_column="1">
-		<column name="Name" label="Nom" dynamicwidth="true" tool_tip="Double click pour botenir la position"/>
-    	<column name="Description" label="Description" dynamicwidth="true" tool_tip="Double click pour botenir la position"/>
-    	<column name="Owner" label="Propriétaire" dynamicwidth="true" tool_tip="Double click pour botenir la position"/>
-		<column name="Group" label="Groupe" dynamicwidth="true" tool_tip="Double click pour botenir la position"/>
-	</scroll_list>
-	<button name="Refresh" label="Rafraichir" font="SansSerif" mouse_opaque="true"
-		height="20" width="80" left="10" bottom="6" follows="left|bottom"/>
-	<button name="Stop" label="Stop" font="SansSerif" mouse_opaque="true"
-		height="20" width="80" left_delta="85" bottom="6" follows="left|bottom"/>
-	<text name="counter"
-		height="15" width="220" left_delta="85" bottom="9" follows="left|bottom">
-		Liste/Attente/Total
-	</text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="area search" title="Recherche d'objets par zone">
+	<text name="name_label">
+		Recherche par Nom:
+	</text>
+	<text name="desc_label">
+		Recherche par Description:
+	</text>
+	<text name="owner_label">
+		Recherche par Propriétaire:
+	</text>
+	<text name="group_label">
+		Recherche par Groupe:
+	</text>
+	<scroll_list name="result_list">
+		<column name="Name" label="Nom" tool_tip="Double-clic pour obtenir la position."/>
+		<column name="Description" label="Description" tool_tip="Double-clic pour obtenir la position."/>
+		<column name="Owner" label="Propriétaire" tool_tip="Double-clic pour obtenir la position."/>
+		<column name="Group" label="Groupe" tool_tip="Double-clic pour obtenir la position."/>
+	</scroll_list>
+	<button name="Refresh" label="Rafraichir"/>
+	<button name="Stop" label="Stop"/>
+	<text name="counter">
+		Liste/Attente/Total
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_auction.xml b/indra/newview/skins/default/xui/fr/floater_auction.xml
index 6fe3f66e1..893ef1c98 100644
--- a/indra/newview/skins/default/xui/fr/floater_auction.xml
+++ b/indra/newview/skins/default/xui/fr/floater_auction.xml
@@ -1,18 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_auction" title="Commencer la vente de terrain Linden">
-	<check_box label="Inclure le marquage de sélection jaune" name="fence_check" />
-	<combo_box name="saletype_combo">
-		<combo_item name="Auction">
-			Enchères
-		</combo_item>
-		<combo_item name="FirstLand">
-			Premier terrain
-		</combo_item>
-	</combo_box>
-	<button label="Capture d&apos;écran" label_selected="Capture d&apos;écran"
-	     name="snapshot_btn" width="110" />
-	<button label="OK" label_selected="OK" name="ok_btn" left_delta="114"/>
-	<text name="already for sale">
-		Vous ne pouvez pas mettre aux enchères des parcelles déjà en vente.
-	</text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_auction" title="Commencer la vente de terrain Linden.">
+	<check_box label="Inclure le marquage de sélection jaune" name="fence_check"/>
+	<button label="Capture d'écran" label_selected="Capture d'écran" name="snapshot_btn" width="110"/>
+	<button label="OK" label_selected="OK" name="ok_btn" left_delta="114"/>
+	<string name="already for sale">
+		Vous ne pouvez pas mettre aux enchères des parcelles déjà en vente.
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_audio_volume.xml b/indra/newview/skins/default/xui/fr/floater_audio_volume.xml
index 741813626..54b9359f0 100644
--- a/indra/newview/skins/default/xui/fr/floater_audio_volume.xml
+++ b/indra/newview/skins/default/xui/fr/floater_audio_volume.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Volume" title="Volume">
-	<panel label="Volume" name="Volume Panel" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Volume" title="Volume">
+	<panel label="Volume" name="Volume Panel" />
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
index 01b4c944f..4056358ec 100644
--- a/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
+++ b/indra/newview/skins/default/xui/fr/floater_avatar_picker.xml
@@ -1,42 +1,46 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="avatarpicker" title="Choisir le résident">
-	<tab_container name="ResidentChooserTabs">
-		<panel label="Rechercher" name="SearchPanel">
-			<text name="InstructSearchResidentName">
-				Saisissez une partie du nom du résident :
-			</text>
-			<button label="Trouver" label_selected="Trouver" name="Find"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatarpicker" title="Choisir le résident">
+	<tab_container name="ResidentChooserTabs">
+		<panel label="Rechercher" name="SearchPanel">
+			<text name="InstructSearchResidentName">
+				Saisir une partie du nom du résident:
+			</text>
+			<button label="Trouver" label_selected="Trouver" name="Find"/>
+		</panel>
+		<panel name="CallingCardsPanel" label="Cartes de visite">
+			<text name="InstructSelectCallingCard">
+				Sélectionner une carte de visite:
+			</text>
+		</panel>
+		<panel name="NearMePanel" label="Près de moi">
+			<text name="InstructSelectResident">
+				Choisir un résident près de vous:
+			</text>
+			<button font="SansSerifSmall" label="Rafraîchir la liste" label_selected="Rafraîchir la liste" name="Refresh" left_delta="10" width="105"/>
+			<slider label="Distance" name="near_me_range" bottom_delta="-36"/>
+			<text name="meters">
+				Mètres
+			</text>
+			<scroll_list bottom_delta="-169" height="159" name="NearMe"/>
 		</panel>
-		<panel label="Cartes de visite" name="CallingCardsPanel">
-			<text name="InstructSelectCallingCard">
-				Sélectionnez une carte de visite :
-			</text>
-		</panel>
-		<panel label="Près de moi" name="NearMePanel">
+		<panel name="KeyPanel" label="Avec UUID" >
 			<text name="InstructSelectResident">
-				Choisir un résident
-près de vous :
+				Avatar ou Group UUID:
 			</text>
-			<button font="SansSerifSmall" label="Rafraîchir la liste" label_selected="Rafraîchir la liste" name="Refresh" left_delta="10" width="105"/>
-			<slider label="Distance" name="near_me_range" bottom_delta="-36"/>
-			<text name="meters">
-				mètres
-			</text>
-			<scroll_list bottom_delta="-169" height="159" name="NearMe"  />
 		</panel>
-	</tab_container>
-	<button label="Sélectionner" label_selected="Sélectionner" name="Select"/>
-	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
-	<string name="not_found">
-		&apos;[TEXT]&apos; introuvable
-	</string>
-	<string name="no_one_near">
-		Il n'y a personne près de vous
-	</string>
-	<string name="no_results">
-		Aucun résultat
-	</string>
-	<string name="searching">
-		Recherche...
-	</string>
-</floater>
+	</tab_container>
+	<button label="Sélectionner" label_selected="Sélectionner" name="Select"/>
+	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
+	<string name="not_found">
+		'[TEXT]' introuvable
+	</string>
+	<string name="no_one_near">
+		Il n'y a personne près de vous
+	</string>
+	<string name="no_results">
+		Aucun résultat
+	</string>
+	<string name="searching">
+		Recherche...
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
index 5ad5ad38d..d38aebfcc 100644
--- a/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
+++ b/indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
@@ -1,31 +1,25 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="avatar_texture_debug" title="Textures de l&apos;avatar">
-	<text name="label">
-		Textures fixées
-	</text>
-	<text name="composite_label">
-		Textures composées
-	</text>
-	<button label="Vider ces ID dans la console" label_selected="Vider" name="Dump" left="-185" width="175"/>
-	<texture_picker label="Cheveux" name="hair-baked"/>
-	<texture_picker label="Cheveux" name="hair"/>
-	<texture_picker label="Tête" name="head-baked"/>
-	<texture_picker label="Maquillage" name="head bodypaint"/>
-	<texture_picker label="Yeux" name="eyes-baked"/>
-	<texture_picker label="Å’il" name="iris"/>
-	<texture_picker label="Haut du corps" name="upper-baked"/>
-	<texture_picker label="Tatouage (haut du corps)" name="upper bodypaint"/>
-	<texture_picker label="Tee Shirt" name="undershirt"/>
-	<texture_picker label="Gants" name="gloves"/>
-	<texture_picker label="Chemise" name="shirt"/>
-	<texture_picker label="Veste (haut)" name="upper jacket"/>
-	<texture_picker label="Bas du corps" name="lower-baked"/>
-	<texture_picker label="Tatouage (bas du corps)" name="lower bodypaint"/>
-	<texture_picker label="culotte" name="underpants"/>
-	<texture_picker label="Chaussettes" name="socks"/>
-	<texture_picker label="Chaussures" name="shoes"/>
-	<texture_picker label="Pantalon" name="pants"/>
-	<texture_picker label="Veste" name="lower jacket"/>
-	<texture_picker label="Jupe" name="skirt-baked"/>
-	<texture_picker label="Jupe" name="skirt"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="avatar_texture_debug" title="Textures de l'avatar">
+	<button label="Vider ces ID dans la console" label_selected="Vider" name="Dump" left="-185" width="175"/>
+	<texture_picker label="Cheveux" name="hair-baked"/>
+	<texture_picker label="Cheveux" name="hair"/>
+	<texture_picker label="Tête" name="head-baked"/>
+	<texture_picker label="Maquillage" name="head bodypaint"/>
+	<texture_picker label="Yeux" name="eyes-baked"/>
+	<texture_picker label="Å’il" name="iris"/>
+	<texture_picker label="Haut du corps" name="upper-baked"/>
+	<texture_picker label="Tatouage (haut du corps)" name="upper bodypaint"/>
+	<texture_picker label="Tee Shirt" name="undershirt"/>
+	<texture_picker label="Gants" name="gloves"/>
+	<texture_picker label="Chemise" name="shirt"/>
+	<texture_picker label="Veste (haut)" name="upper jacket"/>
+	<texture_picker label="Bas du corps" name="lower-baked"/>
+	<texture_picker label="Tatouage (bas du corps)" name="lower bodypaint"/>
+	<texture_picker label="culotte" name="underpants"/>
+	<texture_picker label="Chaussettes" name="socks"/>
+	<texture_picker label="Chaussures" name="shoes"/>
+	<texture_picker label="Pantalon" name="pants"/>
+	<texture_picker label="Veste" name="lower jacket"/>
+	<texture_picker label="Jupe" name="skirt-baked"/>
+	<texture_picker label="Jupe" name="skirt"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_beacons.xml b/indra/newview/skins/default/xui/fr/floater_beacons.xml
index 0b060983e..127e94e2b 100644
--- a/indra/newview/skins/default/xui/fr/floater_beacons.xml
+++ b/indra/newview/skins/default/xui/fr/floater_beacons.xml
@@ -1,15 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="beacons" title="Balises">
+<?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 de particules" name="particles"/>
-		<check_box label="Mettre en surbrillance" name="highlights"/>
-		<check_box label="Montrer les balises" name="beacons"/>
-		<text name="beacon_width_label">
-			Largeur de la balise :
-		</text>
-	</panel>
-</floater>
+		<check_box name="always_on" label="Keep beacons when closing floater"/>
+		<check_box name="touch_only" label="Objets scriptés avec &#x22;Toucher&#x22; uniquement"/>
+		<check_box name="scripted" label="Objets scriptés"/>
+		<check_box name="physical" label="Objets physiques"/>
+		<check_box name="sounds" label="Sources sonores"/>
+		<check_box name="particles" label="Sources de particules"/>
+		<check_box name="highlights" label="Mettre en surbrillance"/>
+		<check_box name="beacons" label="Montrer les balises"/>
+		<text name="beacon_width_label">
+			Largeur de la balise :
+		</text>
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_build_options.xml b/indra/newview/skins/default/xui/fr/floater_build_options.xml
index 3451c2de4..a7d1e3d18 100644
--- a/indra/newview/skins/default/xui/fr/floater_build_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_build_options.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="build options floater" title="Options de la grille">
-	<spinner label="Unité (mètres)" name="GridResolution" />
-	<spinner label="Mesures (mètres)" name="GridDrawSize" />
-	<check_box label="Activer la fixation des sous-unités" name="GridSubUnit" />
-	<check_box label="Afficher les sections transversales" name="GridCrossSection" />
-	<slider label="Opacité de la grille" name="GridOpacity" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="build options floater" title="Options de la grille">
+	<spinner label="Unité (mètres)" name="GridResolution"/>
+	<spinner label="Mesures (mètres)" name="GridDrawSize"/>
+	<check_box label="Activer la fixation des sous-unités" name="GridSubUnit"/>
+	<check_box label="Afficher les sections transversales" name="GridCrossSection"/>
+	<slider label="Opacité de la grille" name="GridOpacity"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
index b868aa33a..b18df214c 100644
--- a/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
+++ b/indra/newview/skins/default/xui/fr/floater_bulk_perms.xml
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floaterbulkperms" title="Changement des droits relatifs au contenu">
-	<text name="applyto">
-		Types de contenu
-	</text>
-	<check_box label="Animation" name="check_animation"/>
-	<check_box label="Parties du corps" name="check_bodypart"/>
-	<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"/>
-	<button label="Tout cocher" label_selected="Tout" name="check_all"/>
-	<button label="Tout décocher" label_selected="Aucun" name="check_none"/>
-	<text name="newperms">
-		Nouveaux droits
-	</text>
-	<check_box label="Partager avec le groupe" name="share_with_group"/>
-	<check_box label="Autoriser tout le monde à copier" name="everyone_copy"/>
-	<text name="NextOwnerLabel">
-		Le prochain propriétaire pourra :
-	</text>
-	<check_box label="Modifier" name="next_owner_modify"/>
-	<check_box label="Copier" name="next_owner_copy"/>
-	<check_box label="Revendre/Donner" name="next_owner_transfer"/>
-	<button label="Aide" name="help"/>
-	<button label="Appliquer" name="apply"/>
-	<button label="Fermer" name="close"/>
-	<string name="nothing_to_modify_text">
-		La sélection contient des contenus non modifiables.
-	</string>
-	<string name="status_text">
-		Permissions paramétrées sur [NAME]
-	</string>
-	<string name="start_text">
-		Demande de changement des droits lancée...
-	</string>
-	<string name="done_text">
-		Demande de changement des droits finie.
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floaterbulkperms" title="Changement des droits relatifs au contenu">
+	<text name="applyto">
+		Types de contenu
+	</text>
+	<check_box label="Animation" name="check_animation"/>
+	<check_box label="Parties du corps" name="check_bodypart"/>
+	<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"/>
+	<button label="Tout cocher" label_selected="Tout" name="check_all"/>
+	<button label="Tout décocher" label_selected="Aucun" name="check_none"/>
+	<text name="newperms">
+		Nouveaux droits
+	</text>
+	<check_box label="Partager avec le groupe" name="share_with_group"/>
+	<check_box label="Autoriser tout le monde à copier" name="everyone_copy"/>
+	<text name="NextOwnerLabel">
+		Le prochain propriétaire pourra:
+	</text>
+	<check_box label="Modifier" name="next_owner_modify"/>
+	<check_box label="Copier" name="next_owner_copy"/>
+	<check_box label="Revendre/Donner" name="next_owner_transfer"/>
+	<button label="Aide" name="help"/>
+	<button label="Appliquer" name="apply"/>
+	<button label="Fermer" name="close"/>
+	<string name="nothing_to_modify_text">
+		La sélection contient des contenus non modifiables.
+	</string>
+	<string name="status_text">
+		Permissions paramétrées sur [NAME]
+	</string>
+	<string name="start_text">
+		Demande de changement des droits lancée...
+	</string>
+	<string name="done_text">
+		Demande de changement des droits finie.
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_bumps.xml b/indra/newview/skins/default/xui/fr/floater_bumps.xml
index e859f4d68..f912b2082 100644
--- a/indra/newview/skins/default/xui/fr/floater_bumps.xml
+++ b/indra/newview/skins/default/xui/fr/floater_bumps.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_bumps" title="Collisions, coups et bousculades">
-	<text name="none_detected">
-		Aucun détecté
-	</text>
-	<text name="bump">
-		[TIME]  [NAME] est entré en collision avec vous
-	</text>
-	<text name="llpushobject">
-		[TIME]  [NAME] vous a bousculé avec un script
-	</text>
-	<text name="selected_object_collide">
-		[TIME]  [NAME] vous a donné un coup avec un objet
-	</text>
-	<text name="scripted_object_collide">
-		[TIME]  [NAME] vous a donné un coup avec un objet scripté
-	</text>
-	<text name="physical_object_collide">
-		[TIME]  [NAME] vous a donné un coup avec un objet physique
-	</text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_bumps" title="Collisions, coups et bousculades">
+	<string name="none_detected">
+		Aucun détecté
+	</string>
+	<string name="bump">
+		[TIME]  [NAME] est entré en collision avec vous
+	</string>
+	<string name="llpushobject">
+		[TIME]  [NAME] vous a bousculé avec un script
+	</string>
+	<string name="selected_object_collide">
+		[TIME]  [NAME] vous a donné un coup avec un objet
+	</string>
+	<string name="scripted_object_collide">
+		[TIME]  [NAME] vous a donné un coup avec un objet scripté
+	</string>
+	<string name="physical_object_collide">
+		[TIME]  [NAME] vous a donné un coup avec un objet physique
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_contents.xml b/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
index 916b27050..efe51a97b 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_contents.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_buy_contents" title="Acheter ce contenu">
-	<text name="contains_text">
-		[NAME] contient :
-	</text>
-	<text name="buy_text">
-		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"/>
-	<string name="no_copy_text">
-		(pas de copie)
-	</string>
-	<string name="no_modify_text">
-		(pas de modification)
-	</string>
-	<string name="no_transfer_text">
-		(pas de transfert)
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater_buy_contents" title="Acheter ce contenu">
+	<text name="contains_text">
+		[NAME] contient:
+	</text>
+	<text name="buy_text">
+		Acheter [CURRENCY][AMOUNT] à [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"/>
+	<string name="no_copy_text">
+		(pas de copie)
+	</string>
+	<string name="no_modify_text">
+		(pas de modification)
+	</string>
+	<string name="no_transfer_text">
+		(pas de transfert)
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
index 85d67218d..da9c7a6c6 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml
@@ -1,69 +1,69 @@
-<?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 L$ :
-	</text>
-	<text left="5" name="info_cannot_buy" right="-5">
-		Impossible d&apos;acheter maintenant :
-	</text>
-	<text left="5" name="info_need_more" right="-5">
-		Vous avez besoin de plus de devises:
-	</text>
-	<text name="error_message">
-		Quelque chose ne va pas.
-	</text>
-	<button label="Aller sur le site" name="error_web"/>
-	<text name="contacting">
-		En train de contacter le Lindex...
-	</text>
-	<text name="buy_action_unknown" right="-5">
-		Acheter des L$ sur le marché du LindeX
-	</text>
-	<text name="buy_action">
-		[NAME] L$ [PRICE]
-	</text>
-	<text name="currency_action">
-		Acheter 
-	</text>
-	<line_editor name="currency_amt" width="65">
-		1234
-	</line_editor>
-	<text name="currency_est" width="138" left_delta="68">
-		L$  pour environ [USD] US$
-	</text>
-	<text name="getting_data" width="138">
-		Obtention des données...
-	</text>
-	<text name="balance_label">
-		Actuellement, vous avez
-	</text>
-	<text name="balance_amount">
-		[AMT] L$
-	</text>
-	<text name="buying_label">
-		Vous achetez
-	</text>
-	<text name="buying_amount">
-		[AMT] L$
-	</text>
-	<text name="total_label">
-		Votre solde sera de
-	</text>
-	<text name="total_amount">
-		[AMT] L$
-	</text>
-	<text name="purchase_warning_repurchase" height="48" bottom_delta="-64" right="-10">
-		En confirmant cette transaction, vous achetez
-uniquement les devises. Vous devrez recommencer
-cette opération.
-	</text>
-	<text name="purchase_warning_notenough" bottom_delta="16">
-		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"/>
-	<string name="buy_currency">
-		Acheter [LINDENS] L$ pour environ [USD] US$
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="buy currency" title="Acheter des [CURRENCY]">
+	<text left="5" name="info_buying">
+		Achat de [CURRENCY]:
+	</text>
+	<text left="5" name="info_cannot_buy" right="-5">
+		Impossible d'acheter maintenant :
+	</text>
+	<text left="5" name="info_need_more" right="-5">
+		Vous avez besoin de plus de devises
+	</text>
+	<text name="error_message">
+		Quelque chose ne va pas
+	</text>
+	<button label="Aller sur le site" name="error_web"/>
+	<text name="contacting">
+		En cours de contact avec Lindex
+	</text>
+	<text name="buy_action_unknown" right="-5">
+		Acheter des [CURRENCY] sur le marché du LindeX
+	</text>
+	<text name="buy_action">
+		[NAME] [CURRENCY] [PRICE]
+	</text>
+	<text name="currency_action">
+		Acheter [CURRENCY]
+	</text>
+	<line_editor name="currency_amt" width="65">
+		1234
+	</line_editor>
+	<text name="currency_est" width="138" left_delta="68">
+		[CURRENCY]  pour environ [USD] US$
+	</text>
+	<text name="getting_data" width="138">
+		Obtention des données
+	</text>
+	<text name="balance_label">
+		Actuellement, vous avez 
+	</text>
+	<text name="balance_amount">
+		[AMT] [CURRENCY]
+	</text>
+	<text name="buying_label">
+		Vous achetez
+	</text>
+	<text name="buying_amount">
+		[AMT] [CURRENCY]
+	</text>
+	<text name="total_label">
+		Votre solde sera de
+	</text>
+	<text name="total_amount">
+		[AMT] [CURRENCY]
+	</text>
+	<text name="purchase_warning_repurchase" height="48" bottom_delta="-64" right="-10">
+		En confirmant cette transaction, vous achetez
+uniquement les devises. Vous devrez recommencer
+cette opération
+	</text>
+	<text name="purchase_warning_notenough" bottom_delta="16">
+		Vous n'achetez pas assez de devises.
+Veuillez saisir un montant plus élevé
+	</text>
+	<button label="Acheter" name="buy_btn"/>
+	<button label="Annuler" name="cancel_btn"/>
+	<string name="buy_currency">
+		Acheter [LINDENS] [CURRENCY] pour environ [USD] US$
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_land.xml b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
index 5ed36c983..6a5fc0a8d 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_land.xml
@@ -1,243 +1,243 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="buy land" title="Acheter le terrain">
-	<text name="region_name_label">
-		Région :
-	</text>
-	<text name="region_name_text">
-		(inconnue)
-	</text>
-	<text name="region_type_label">
-		Type :
-	</text>
-	<text name="region_type_text">
-		(inconnu)
-	</text>
-	<text name="estate_name_label">
-		Domaine :
-	</text>
-	<text name="estate_name_text">
-		(inconnu)
-	</text>
-	<text name="estate_owner_label">
-		Propriétaire :
-	</text>
-	<text name="estate_owner_text">
-		(inconnu)
-	</text>
-	<text name="resellable_changeable_label">
-		Terrain acheté dans cette région :
-	</text>
-	<text name="resellable_clause">
-		Peut être revendu ou pas.
-	</text>
-	<text name="changeable_clause">
-		Peut être fusionné/divisé ou pas.
-	</text>
-	<text name="covenant_text">
-		Vous devez accepter le règlement du domaine :
-	</text>
-	<text left="470" name="covenant_timestamp_text"/>
-	<text_editor name="covenant_editor">
-		Chargement...
-	</text_editor>
-	<check_box label="J&apos;accepte le règlement ci-dessus." name="agree_covenant"/>
-	<text name="info_parcel_label">
-		Parcelle :
-	</text>
-	<text name="info_parcel">
-		Scotopteryx 138,204
-	</text>
-	<text name="info_size_label">
-		Taille :
-	</text>
-	<text name="info_size">
-		1024 m²
-	</text>
-	<text name="info_price_label">
-		Prix :
-	</text>
-	<text name="info_price">
-		1500 L$
-		(1,1 L$/m²)
-		vendu avec objets
-	</text>
-	<text name="info_action" width="380">
-		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"/>
-	<text name="account_action">
-		Vous passerez à un compte Premium.
-	</text>
-	<text name="account_reason">
-		Seuls les membres Premium peuvent posséder du terrain.
-	</text>
-	<combo_box name="account_level">
-		<combo_item name="US$9.95/month,billedmonthly">
-			9,95 US$/mois, facturation mensuelle
-		</combo_item>
-		<combo_item name="US$7.50/month,billedquarterly">
-			7,50 US$/mois, facturation trimestrielle
-		</combo_item>
-		<combo_item name="US$6.00/month,billedannually">
-			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>
-	<text name="land_use_reason">
-		Vous êtes propriétaire de 1 309 m² de terrain. 
-Cette parcelle fait 512 m².
-	</text>
-	<text name="purchase_action">
-		Payez au résident X 4 000 L$ pour le terrain
-	</text>
-	<text name="currency_reason">
-		Vous avez 2 100 L$.
-	</text>
-	<text name="currency_action">
-		Acheter des L$
-	</text>
-	<line_editor name="currency_amt">
-		1000
-	</line_editor>
-	<text name="currency_est">
-		pour environ [AMOUNT2] US$
-	</text>
-	<text name="currency_balance">
-		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"/>
-	<string name="can_resell">
-		Peut être revendu.
-	</string>
-	<string name="can_not_resell">
-		Ne peut pas être revendu.
-	</string>
-	<string name="can_change">
-		Peut être fusionné ou divisé.
-	</string>
-	<string name="can_not_change">
-		Ne peut pas être fusionné ou divisé.
-	</string>
-	<string name="cant_buy_for_group">
-		Vous n&apos;avez pas la permission d&apos;acheter de terrain pour votre groupe.
-	</string>
-	<string name="no_land_selected">
-		Aucun terrain sélectionné.
-	</string>
-	<string name="multiple_parcels_selected">
-		Vous avez sélectionné plusieurs parcelles. 
-Sélectionnez une zone plus petite.
-	</string>
-	<string name="no_permission">
-		Vous n&apos;avez pas la permission d&apos;acheter de terrain pour votre groupe.
-	</string>
-	<string name="parcel_not_for_sale">
-		La parcelle sélectionnée n&apos;est pas à vendre.
-	</string>
-	<string name="group_already_owns">
-		La parcelle appartient déjà au groupe.
-	</string>
-	<string name="you_already_own">
-		La parcelle vous appartient déjà.
-	</string>
-	<string name="set_to_sell_to_other">
-		La parcelle sélectionnée doit déjà être vendue à quelqu&apos;un d&apos;autre.
-	</string>
-	<string name="no_public_land">
-		Il n&apos;y a pas de terrain public dans cette zone.
-	</string>
-	<string name="not_owned_by_you">
-		Le terrain sélectionné appartient à quelqu&apos;un d&apos;autre. 
-Sélectionnez une zone plus petite.
-	</string>
-	<string name="processing">
-		Achat en cours de traitement...
- 
-(Veuillez patienter quelques instants.)
-	</string>
-	<string name="fetching_error">
-		Une erreur s&apos;est produite pendant le traitement de l&apos;achat du terrain.
-	</string>
-	<string name="buying_will">
-		Si vous achetez ce terrain :
-	</string>
-	<string name="buying_for_group">
-		Si vous achetez le terrain pour le groupe :
-	</string>
-	<string name="cannot_buy_now">
-		Impossible d&apos;acheter maintenant :
-	</string>
-	<string name="not_for_sale">
-		Pas à vendre :
-	</string>
-	<string name="none_needed">
-		aucun besoin
-	</string>
-	<string name="must_upgrade">
-		Pour posséder du terrain, vous devez avoir un niveau de compte supérieur.
-	</string>
-	<string name="cant_own_land">
-		Avec votre compte, vous pouvez posséder du terrain.
-	</string>
-	<string name="land_holdings">
-		Vous possédez un terrain de [BUYER] m².
-	</string>
-	<string name="pay_to_for_land">
-		Payez [AMOUNT] L$ à [SELLER] pour ce terrain
-	</string>
-	<string name="buy_for_US">
-		Acheter [AMOUNT] L$ pour environ [AMOUNT2] US$,
-	</string>
-	<string name="parcel_meters">
-		Cette parcelle fait [AMOUNT] m².
-	</string>
-	<string name="premium_land">
-		Ce terrain est premium et les frais associés sont ceux d&apos;un terrain de [AMOUNT] m².
-	</string>
-	<string name="discounted_land">
-		Ce terrain est en solde et les frais associés sont ceux d&apos;un terrain de [AMOUNT] m².
-	</string>
-	<string name="meters_supports_object">
-		[AMOUNT] m²
-peuvent contenir [AMOUNT2] prims
-	</string>
-	<string name="sold_with_objects">
-		vendu avec objets
-	</string>
-	<string name="sold_without_objects">
-		objets non inclus
-	</string>
-	<string name="info_price_string">
-		[PRICE] L$
-([PRICE_PER_SQM] L$/m²)
-[SOLD_WITH_OBJECTS]
-	</string>
-	<string name="insufficient_land_credits">
-		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é.
-	</string>
-	<string name="have_enough_lindens">
-		Vous avez [AMOUNT] L$, ce qui est suffisant pour acheter ce terrain.
-	</string>
-	<string name="not_enough_lindens">
-		Vous n&apos;avez que [AMOUNT] L$ et vous avez besoin de [AMOUNT2] L$ de plus.
-	</string>
-	<string name="balance_left">
-		Après cet achat, il vous restera [AMOUNT] L$.
-	</string>
-	<string name="balance_needed">
-		Pour avoir les moyens d&apos;acquérir ce terrain, vous devez acheter au moins [AMOUNT] L$.
-	</string>
-	<string name="no_parcel_selected">
-		(aucune parcelle sélectionnée)
-	</string>
-	<string name="buy_currency">
-		Acheter [LINDENS] L$ pour environ [USD] US$
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="buy land" title="Acheter le terrain">
+	<text name="region_name_label">
+		Région:
+	</text>
+	<text name="region_name_text">
+		(inconnue)
+	</text>
+	<text name="region_type_label">
+		Type:
+	</text>
+	<text name="region_type_text">
+		(inconnu)
+	</text>
+	<text name="estate_name_label">
+		Domaine:
+	</text>
+	<text name="estate_name_text">
+		(inconnu)
+	</text>
+	<text name="estate_owner_label">
+		Propriétaire:
+	</text>
+	<text name="estate_owner_text">
+		(inconnu)
+	</text>
+	<text name="resellable_changeable_label">
+		Terrain acheté dans cette région:
+	</text>
+	<text name="resellable_clause">
+		Peut être revendu ou pas
+	</text>
+	<text name="changeable_clause">
+		Peut être fusionné/divisé ou pas
+	</text>
+	<text name="covenant_text">
+		Vous devez accepter le règlement du domaine:
+	</text>
+	<text left="470" name="covenant_timestamp_text"/>
+	<text_editor name="covenant_editor">
+		Chargement...
+	</text_editor>
+	<check_box label="J'accepte le règlement ci-dessus." name="agree_covenant"/>
+	<text name="info_parcel_label">
+		Parcelle:
+	</text>
+	<text name="info_parcel">
+		Scotopteryx 138,204
+	</text>
+	<text name="info_size_label">
+		Taille:
+	</text>
+	<text name="info_size">
+		1024 m²
+	</text>
+	<text name="info_price_label">
+		Prix:
+	</text>
+	<text name="info_price">
+		1500 [CURRENCY]
+(1,1 [CURRENCY]/m²)
+vendu avec objets
+	</text>
+	<text name="info_action" width="380">
+		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"/>
+	<text name="account_action">
+		Vous passerez à un compte Premium
+	</text>
+	<text name="account_reason">
+		Seuls les membres Premium peuvent posséder du terrain
+	</text>
+	<combo_box name="account_level">
+		<combo_item name="US$9.95/month,billedmonthly">
+			9,95 US$/mois, facturation mensuelle
+		</combo_item>
+		<combo_item name="US$7.50/month,billedquarterly">
+			7,50 US$/mois, facturation trimestrielle
+		</combo_item>
+		<combo_item name="US$6.00/month,billedannually">
+			6,00 US$/mois, facturation annuelle
+		</combo_item>
+	</combo_box>
+	<text name="land_use_action">
+		Augmentez vos frais d'occupation de terrain à 40 US$/mois
+	</text>
+	<text name="land_use_reason">
+		Vous êtes propriétaire de 1 309 m² de terrain
+Cette parcelle fait 512 m².
+	</text>
+	<text name="purchase_action">
+		Payez au résident X 4 000 [CURRENCY] pour le terrain
+	</text>
+	<text name="currency_reason">
+		Vous avez 2 100 [CURRENCY]
+	</text>
+	<text name="currency_action">
+		Acheter des [CURRENCY]
+	</text>
+	<line_editor name="currency_amt">
+		1000
+	</line_editor>
+	<text name="currency_est">
+		pour environ [AMOUNT2] US$
+	</text>
+	<text name="currency_balance">
+		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"/>
+	<string name="can_resell">
+		Peut être revendu.
+	</string>
+	<string name="can_not_resell">
+		Ne peut pas être revendu.
+	</string>
+	<string name="can_change">
+		Peut être fusionné ou divisé.
+	</string>
+	<string name="can_not_change">
+		Ne peut pas être fusionné ou divisé.
+	</string>
+	<string name="cant_buy_for_group">
+		Vous n'avez pas la permission d'acheter de terrain pour votre groupe.
+	</string>
+	<string name="no_land_selected">
+		Aucun terrain sélectionné.
+	</string>
+	<string name="multiple_parcels_selected">
+		Vous avez sélectionné plusieurs parcelles.
+Sélectionnez une zone plus petite.
+	</string>
+	<string name="no_permission">
+		Vous n'avez pas la permission d'acheter de terrain pour votre groupe.
+	</string>
+	<string name="parcel_not_for_sale">
+		La parcelle sélectionnée n'est pas à vendre
+	</string>
+	<string name="group_already_owns">
+		La parcelle appartient déjà au groupe
+	</string>
+	<string name="you_already_own">
+		La parcelle vous appartient déjà
+	</string>
+	<string name="set_to_sell_to_other">
+		La parcelle sélectionnée doit déjà être vendue à quelqu'un d'autre
+	</string>
+	<string name="no_public_land">
+		Il n'y a pas de terrain public dans cette zone
+	</string>
+	<string name="not_owned_by_you">
+		Le terrain sélectionné appartient à quelqu'un d'autre. 
+Sélectionnez une zone plus petite.
+	</string>
+	<string name="processing">
+		Achat en cours de traitement...
+ 
+(Veuillez patienter quelques instants.)
+	</string>
+	<string name="fetching_error">
+		Une erreur s'est produite pendant le traitement de l'achat du terrain
+	</string>
+	<string name="buying_will">
+		Si vous achetez ce terrain:
+	</string>
+	<string name="buying_for_group">
+		Si vous achetez le terrain pour le groupe:
+	</string>
+	<string name="cannot_buy_now">
+		Impossible d'acheter maintenant:
+	</string>
+	<string name="not_for_sale">
+		Pas à vendre:
+	</string>
+	<string name="none_needed">
+		aucun besoin.
+	</string>
+	<string name="must_upgrade">
+		Pour posséder du terrain, vous devez avoir un niveau de compte supérieur.
+	</string>
+	<string name="cant_own_land">
+		Avec votre compte, vous pouvez posséder du terrain.
+	</string>
+	<string name="land_holdings">
+		Vous possédez un terrain de [BUYER] m²
+	</string>
+	<string name="pay_to_for_land">
+		Payez [AMOUNT] [CURRENCY] à [SELLER] pour ce terrain
+	</string>
+	<string name="buy_for_US">
+		Acheter [AMOUNT] [CURRENCY] pour environ [AMOUNT2] US$
+	</string>
+	<string name="parcel_meters">
+		Cette parcelle fait [AMOUNT] m².
+	</string>
+	<string name="premium_land">
+		Ce terrain est un Premium, les frais associés sont ceux d'un terrain de [AMOUNT] m².
+	</string>
+	<string name="discounted_land">
+		Ce terrain est en solde et les frais associés sont ceux d'un terrain de [AMOUNT] m².
+	</string>
+	<string name="meters_supports_object">
+		[AMOUNT] m².
+peuvent contenir [AMOUNT2] prims
+	</string>
+	<string name="sold_with_objects">
+		vendu avec objets
+	</string>
+	<string name="sold_without_objects">
+		objets non inclus
+	</string>
+	<string name="info_price_string">
+		[PRICE] [CURRENCY]
+([PRICE_PER_SQM] [CURRENCY]/m²)
+[SOLD_WITH_OBJECTS]
+	</string>
+	<string name="insufficient_land_credits">
+		Ce groupe, [GROUP], aura besoin de plus de crédit pour payer les frais d'occupation de terrain avant que l'achat de cette parcelle ne soit finalisé
+	</string>
+	<string name="have_enough_lindens">
+		Vous avez [AMOUNT] L$, ce qui est suffisant pour acheter ce terrain
+	</string>
+	<string name="not_enough_lindens">
+		Vous ne poss&#xE9;dez que [AMOUNT] L$. Vous avez besoin de [AMOUNT2] [CURRENCY] de plus
+	</string>
+	<string name="balance_left">
+		Après cet achat, il vous restera [AMOUNT] [CURRENCY]
+	</string>
+	<string name="balance_needed">
+		Pour avoir les moyens d'acquérir ce terrain, vous devez acheter au moins [AMOUNT] [CURRENCY]
+	</string>
+	<string name="no_parcel_selected">
+		Aucune parcelle sélectionnée
+	</string>
+	<string name="buy_currency">
+		Acheter [LINDENS] [CURRENCY] pour environ [USD] US$
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_buy_object.xml b/indra/newview/skins/default/xui/fr/floater_buy_object.xml
index 9e0ce25b9..caf6b869b 100644
--- a/indra/newview/skins/default/xui/fr/floater_buy_object.xml
+++ b/indra/newview/skins/default/xui/fr/floater_buy_object.xml
@@ -1,26 +1,26 @@
-<?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] ?
-	</text>
-	<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>
-	<string name="title_buy_copy_text">
-		Acheter une copie
-	</string>
-	<string name="no_copy_text">
-		(pas de copie)
-	</string>
-	<string name="no_modify_text">
-		(pas de modification)
-	</string>
-	<string name="no_transfer_text">
-		(pas de transfert)
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="contents" title="Acheter une copie de l'objet">
+	<text name="contents_text">
+		et ses contenus:
+	</text>
+	<text name="buy_text">
+		Acheter pour [AMOUNT] [CURRENCY] à [NAME]?
+	</text>
+	<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>
+	<string name="title_buy_copy_text">
+		Acheter une copie
+	</string>
+	<string name="no_copy_text">
+		(pas de copie)
+	</string>
+	<string name="no_modify_text">
+		(pas de modification)
+	</string>
+	<string name="no_transfer_text">
+		(pas de transfert)
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_camera.xml b/indra/newview/skins/default/xui/fr/floater_camera.xml
index 9f280b726..26c78d167 100644
--- a/indra/newview/skins/default/xui/fr/floater_camera.xml
+++ b/indra/newview/skins/default/xui/fr/floater_camera.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="move floater">
-	<string name="rotate_tooltip">
-		Faire tourner la caméra autour du point central
-	</string>
-	<string name="zoom_tooltip">
-		Zoomer en direction du point central
-	</string>
-	<string name="move_tooltip">
-		Déplacer la caméra vers le haut et le bas, la gauche et la droite
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="move floater">
+	<string name="rotate_tooltip">
+		Faire tourner la caméra autour du point central
+	</string>
+	<string name="zoom_tooltip">
+		Zoomer en direction du point central
+	</string>
+	<string name="move_tooltip">
+		Déplacer la caméra vers le haut et le bas, la gauche et la droite
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_chat_history.xml b/indra/newview/skins/default/xui/fr/floater_chat_history.xml
index 9c014289a..2d9371d35 100644
--- a/indra/newview/skins/default/xui/fr/floater_chat_history.xml
+++ b/indra/newview/skins/default/xui/fr/floater_chat_history.xml
@@ -1,98 +1,93 @@
 <?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…
-	</string>
-	<string name="connected">
-		Connecté(e)
-	</string>
-	<string name="unavailable">
-		Voix non disponible à l&apos;endroit où vous êtes
-	</string>
-	<string name="hang_up">
-		Déconnecté du chat vocal
-	</string>
-	<string name="voice_icon">
-		icn_voice-localchat.tga
-	</string>
-	<string name="IM_logging_string">
-		-- Archivage des IM activé --
-	</string>
-	<string name="IM_end_log_string">
-		- Fin de l&apos;archivage --
-	</string>
-	<string name="ScriptQuestionCautionChatGranted">
-		&apos;[OBJECTNAME]&apos;, un objet appartenant à [OWNERNAME], situé dans [REGIONNAME] à [REGIONPOS], a reçu le droit de : [PERMISSIONS].
-	</string>
-	<string name="ScriptQuestionCautionChatDenied">
-		&apos;[OBJECTNAME]&apos;, un objet appartenant à [OWNERNAME], situé dans [REGIONNAME] à [REGIONPOS], n&apos;a pas reçu le droit de : [PERMISSIONS].
-	</string>
-	<string name="ScriptTakeMoney">
-		Débiter vos Linden dollars (L$)
-	</string>
-	<string name="ActOnControlInputs">
-		Utiliser vos touches de commandes
-	</string>
-	<string name="RemapControlInputs">
-		Reconfigurer vos touches de commandes
-	</string>
-	<string name="AnimateYourAvatar">
-		Animer votre avatar
-	</string>
-	<string name="AttachToYourAvatar">
-		Attacher à votre avatar
-	</string>
-	<string name="ReleaseOwnership">
-		Passer l&apos;objet dans le domaine public (sans propriétaire)
-	</string>
-	<string name="LinkAndDelink">
-		Lier et délier d&apos;autres objets
-	</string>
-	<string name="AddAndRemoveJoints">
-		Créer et supprimer des liens avec d&apos;autres objets
-	</string>
-	<string name="ChangePermissions">
-		Modifier ses droits
-	</string>
-	<string name="TrackYourCamera">
-		Suivre votre caméra
-	</string>
-	<string name="ControlYourCamera">
-		Contrôler votre caméra
-	</string>
-	<layout_stack name="panels">
-		<layout_panel name="im_contents_panel">
-			<combo_box label="Gestures" name="Gesture">
-				<combo_item name="Gestures">
-					Gestures
-				</combo_item>
-			</combo_box>
-			<check_box label="Afficher le texte ignoré" name="show mutes"/>
-			<check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall"
-			     height="20" initial_value="false" label="Traduire le Chat" left_delta="0"
-			     name="translate chat" radio_style="false" width="100" />
-                        <button bottom_delta="8" left_delta="180" follows="left|top" font="SansSerifSmall"
-                        height="20" width="100" label="Historique" name="chat_history_open"
-                        tool_top="Click here to open chat history in external editor." />
-
-			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Cliquez ici pour voir la liste des participants actifs dans cette session IM."/>
-			<panel name="chat_panel">
-				<string name="gesture_label">
-					Gestures
-				</string>
-				<line_editor label="Cliquer ici pour chatter." name="Chat Editor"/>
-				<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="whisper_item">
-						Chuchoter
-					</flyout_button_item>
-				</flyout_button>
-			</panel>
-		</layout_panel>
-	</layout_stack>
-</floater>
+<floater name="chat floater" title="Chat Local">
+	<string name="ringing">
+		Connexion au chat vocal du Monde en cours
+	</string>
+	<string name="connected">
+		Connecté(e)
+	</string>
+	<string name="unavailable">
+		Voix non disponible à l'endroit où vous êtes
+	</string>
+	<string name="hang_up">
+		Déconnecté(e) du chat vocal
+	</string>
+	<string name="voice_icon">
+		icn_voice-localchat.tga
+	</string>
+	<string name="IM_logging_string">
+		-- Archivage des IM activé --
+	</string>
+	<string name="IM_end_log_string">
+		- Fin de l'archivage --
+	</string>
+	<string name="ScriptQuestionCautionChatGranted">
+		'[OBJECTNAME]', un objet appartenant à [OWNERNAME], situé dans [REGIONNAME] à [REGIONPOS], a reçu le droit de: [PERMISSIONS].
+	</string>
+	<string name="ScriptQuestionCautionChatDenied">
+		'[OBJECTNAME]', un objet appartenant à [OWNERNAME], situé dans [REGIONNAME] à [REGIONPOS], n'a pas reçu le droit de: [PERMISSIONS].
+	</string>
+	<string name="ScriptTakeMoney">
+		Débiter vos ([CURRENCY])
+	</string>
+	<string name="ActOnControlInputs">
+		Utiliser vos touches de commandes
+	</string>
+	<string name="RemapControlInputs">
+		Reconfigurer vos touches de commandes
+	</string>
+	<string name="AnimateYourAvatar">
+		Animer votre avatar
+	</string>
+	<string name="AttachToYourAvatar">
+		Attacher à votre avatar
+	</string>
+	<string name="ReleaseOwnership">
+		Passer l'objet dans le domaine public (sans propriétaire)
+	</string>
+	<string name="LinkAndDelink">
+		Lier et délier d'autres objets
+	</string>
+	<string name="AddAndRemoveJoints">
+		Créer et supprimer des liens avec d'autres objets
+	</string>
+	<string name="ChangePermissions">
+		Modifier ses droits
+	</string>
+	<string name="TrackYourCamera">
+		Suivre votre caméra
+	</string>
+	<string name="ControlYourCamera">
+		Contrôler votre caméra
+	</string>
+	<layout_stack name="panels">
+		<layout_panel name="im_contents_panel">
+			<combo_box label="Gestures" name="Gesture">
+				<combo_item name="Gestures">
+					Gestures
+				</combo_item>
+			</combo_box>
+			<check_box label="Afficher le texte ignoré" name="show mutes"/>
+			<button label="Historique" name="chat_history_open" tool_tip="Cliquer ici pour ouvrir l'historique de la conversation."/>
+
+			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Cliquez ici pour voir la liste des participants actifs dans cette session IM."/>
+			<panel name="chat_panel">
+				<string name="gesture_label">
+					Gestures
+				</string>
+				<line_editor label="Cliquer ici pour papoter." name="Chat Editor"/>
+				<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="whisper_item">
+						Chuchoter
+					</flyout_button_item>
+				</flyout_button>
+			</panel>
+		</layout_panel>
+	</layout_stack>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_chatterbox.xml b/indra/newview/skins/default/xui/fr/floater_chatterbox.xml
index 090f8e0b4..e18f3abdf 100644
--- a/indra/newview/skins/default/xui/fr/floater_chatterbox.xml
+++ b/indra/newview/skins/default/xui/fr/floater_chatterbox.xml
@@ -1,2 +1,3 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater name="floater_chatterbox" title="Communiquer" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater name="floater_chatterbox" title="Communiquer">
+</multi_floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/fr/floater_choose_group.xml b/indra/newview/skins/default/xui/fr/floater_choose_group.xml
index ade440f29..58794b77a 100644
--- a/indra/newview/skins/default/xui/fr/floater_choose_group.xml
+++ b/indra/newview/skins/default/xui/fr/floater_choose_group.xml
@@ -1,8 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="groups" title="Groupes">
-	<text name="groupdesc">
-		Choisissez un groupe :
-	</text>
-	<button label="OK" label_selected="OK" name="OK" />
-	<button label="Annuler" label_selected="Annuler" name="Cancel" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="groups" title="Groupes">
+	<text name="groupdesc">
+		Choisir un groupe:
+	</text>
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
+	<string name="none">
+		aucun
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_color_picker.xml b/indra/newview/skins/default/xui/fr/floater_color_picker.xml
index adab86dac..42a0d66f2 100644
--- a/indra/newview/skins/default/xui/fr/floater_color_picker.xml
+++ b/indra/newview/skins/default/xui/fr/floater_color_picker.xml
@@ -1,32 +1,34 @@
-<?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 :
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="ColorPicker" title="Choix de couleur">
+	<text name="r_val_text">
+		Rouge:
+	</text>
+	<text name="g_val_text">
+		Vert:
+	</text>
+	<text name="b_val_text">
+		Bleu:
+	</text>
+	<text name="h_val_text">
+		Teinte:
+	</text>
+	<text name="s_val_text">
+		Sat:
+	</text>
+	<text name="l_val_text">
+		Lum:
+	</text>
+	<check_box label="Application auto" name="apply_immediate" left="4" width="108"/>
+	<button label="" label_selected="" name="color_pipette" left_delta="134"/>
+	<button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+	<button label="Sélectionner" label_selected="Sélectionner" name="select_btn"/>
+	<text name="Hex Value:">
+		Hex:
 	</text>
-	<text name="g_val_text">
-		Vert :
-	</text>
-	<text name="b_val_text">
-		Bleu :
-	</text>
-	<text name="h_val_text">
-		Teinte :
-	</text>
-	<text name="s_val_text">
-		Sat :
-	</text>
-	<text name="l_val_text">
-		Lum :
-	</text>
-	<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 left="8" name="(Drag below to save.)" width="114">
-		(Faire glisser dessous
-pour enregistrer.)
-	</text>
-</floater>
+	<text name="Current color:" left="8">
+		Couleur actuelle:
+	</text>
+	<text name="(Drag below to save.)">
+
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_critical.xml b/indra/newview/skins/default/xui/fr/floater_critical.xml
index 6d30d9704..4ba5a7fca 100644
--- a/indra/newview/skins/default/xui/fr/floater_critical.xml
+++ b/indra/newview/skins/default/xui/fr/floater_critical.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container" title=" ">
-	<button label="Continuer" label_selected="Continuer" name="Continue" />
-	<button label="Annuler" label_selected="Annuler" name="Cancel" />
-	<text name="tos_heading">
-		Veuillez lire le message suivant avec attention.
-	</text>
-	<text_editor name="tos_text">
-		TOS_TEXT
-	</text_editor>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container" title="">
+	<button label="Continuer" label_selected="Continuer" name="Continue"/>
+	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
+	<text name="tos_heading">
+		Veuillez lire le message suivant avec attention:
+	</text>
+	<text_editor name="tos_text">
+		TOS_TEXT
+	</text_editor>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/fr/floater_customize.xml b/indra/newview/skins/default/xui/fr/floater_customize.xml
index 9f69e53d8..5e08db994 100644
--- a/indra/newview/skins/default/xui/fr/floater_customize.xml
+++ b/indra/newview/skins/default/xui/fr/floater_customize.xml
@@ -1,502 +1,489 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater customize" title="Apparence" width="548">
-	<tab_container name="customize tab container" tab_min_width="150" width="546">
-		<panel label="Parties du corps" name="body_parts_placeholder"/>
-		<panel label="Silhouette" left="154" name="Shape" width="389">
-			<button label="Rétablir" label_selected="Rétablir" left="305" 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"/>
-			<radio_group name="sex radio">
-				<radio_item length="1" name="radio" type="string">
-					Femme
-				</radio_item>
-				<radio_item length="1" name="radio2" type="string">
-					Homme
-				</radio_item>
-			</radio_group>
-			<text length="1" name="title" type="string">
-				[DESC]
-			</text>
-			<text length="1" name="title_no_modify" type="string">
-				[DESC]: impossible de modifier
-			</text>
-			<text length="1" name="title_loading" type="string">
-				[DESC]: en cours de chargement...
-			</text>
-			<text length="1" name="title_not_worn" type="string">
-				[DESC]: non portée
-			</text>
-			<text length="1" name="path" type="string">
-				Emplacement : [PATH]
-			</text>
-			<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. Vous pouvez aussi en créer une nouvelle 
-et de la porter.
-			</text>
-			<text length="1" name="no modify instructions" type="string">
-				Vous n&apos;avez pas la permission de modifier cet objet.
-			</text>
-			<text name="Item Action Label" right="92">
-				Silhouette :
-			</text>
-			<button label="Créer une silhouette" label_selected="Créer une silhouette" name="Create New"/>
-			<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="111"/>
-		</panel>
-		<panel label="Peau" name="Skin">
-			<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"/>
-			<text length="1" name="title" type="string">
-				[DESC]
-			</text>
-			<text length="1" name="title_no_modify" type="string">
-				[DESC]: impossible de modifier
-			</text>
-			<text length="1" name="title_loading" type="string">
-				[DESC]: en cours de chargement...
-			</text>
-			<text length="1" name="title_not_worn" type="string">
-				[DESC]: non portée
-			</text>
-			<text length="1" name="path" type="string">
-				Emplacement : [PATH]
-			</text>
-			<text length="1" name="not worn instructions" type="string">
-				Pour changer de peau, faites-en glisser une à partir de votre inventaire.
-Vous pouvez aussi en créer une nouvelle et la porter.
-			</text>
-			<text length="1" name="no modify instructions" type="string">
-				Vous n&apos;avez pas la permission de modifier cet objet.
-			</text>
-			<text name="Item Action Label" right="92">
-				Peau :
-			</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"/>
-			<button label="Créer une peau" label_selected="Créer une peau" name="Create New"/>
-			<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="111"/>
-			<button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/>
-		</panel>
-		<panel label="Cheveux" name="Hair">
-			<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"/>
-			<text length="1" name="title" type="string">
-				[DESC]
-			</text>
-			<text length="1" name="title_no_modify" type="string">
-				[DESC]: impossible de modifier
-			</text>
-			<text length="1" name="title_loading" type="string">
-				[DESC]: en cours de chargement...
-			</text>
-			<text length="1" name="title_not_worn" type="string">
-				[DESC]: non portés
-			</text>
-			<text length="1" name="path" type="string">
-				Emplacement : [PATH]
-			</text>
-			<text length="1" name="not worn instructions" type="string">
-				Pour changer de chevelure, faites-en glisser une de votre inventaire
-jusqu&apos;à votre avatar. Vous pouvez aussi en créer une nouvelle
-et la porter.
-			</text>
-			<text length="1" name="no modify instructions" type="string">
-				Vous n&apos;avez pas la permission de modifier cet objet.
-			</text>
-			<text name="Item Action Label" right="92">
-				Cheveux :
-			</text>
-			<texture_picker label="Texture" name="Texture" tool_tip="Cliquez pour sélectionner une image"/>
-			<button label="Créer des cheveux" label_selected="Créer des cheveux" name="Create New"/>
-			<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="111"/>
-			<button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/>
-		</panel>
-		<panel label="Yeux" name="Eyes">
-			<text length="1" name="title" type="string">
-				[DESC]
-			</text>
-			<text length="1" name="title_no_modify" type="string">
-				[DESC]: impossible de modifier
-			</text>
-			<text length="1" name="title_loading" type="string">
-				[DESC]: en cours de chargement...
-			</text>
-			<text length="1" name="title_not_worn" type="string">
-				[DESC]: non portés
-			</text>
-			<text length="1" name="path" type="string">
-				Emplacement : [PATH]
-			</text>
-			<text length="1" name="not worn instructions" type="string">
-				Pour changer vos yeux, faites-les glisser de votre inventaire jusqu&apos;à
-votre avatar. Vous pouvez aussi en créer de nouveaux et les porter.
-			</text>
-			<text length="1" name="no modify instructions" type="string">
-				Vous n&apos;avez pas la permission de modifier cet objet.
-			</text>
-			<text name="Item Action Label" right="92">
-				Yeux :
-			</text>
-			<texture_picker label="Iris" name="Iris" tool_tip="Cliquez pour sélectionner une image"/>
-			<button label="Créer des yeux" label_selected="Créer des yeux" name="Create New"/>
-			<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="111"/>
-			<button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/>
-		</panel>
-		<panel label="Habits" name="clothes_placeholder"/>
-		<panel label="Chemise" name="Shirt">
-			<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"/>
-			<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="111"/>
-			<button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/>
-			<text length="1" name="title" type="string">
-				[DESC]
-			</text>
-			<text length="1" name="title_no_modify" type="string">
-				[DESC]: impossible de modifier
-			</text>
-			<text length="1" name="title_loading" type="string">
-				[DESC]: en cours de chargement...
-			</text>
-			<text length="1" name="title_not_worn" type="string">
-				[DESC]: non portée
-			</text>
-			<text length="1" name="path" type="string">
-				Emplacement : [PATH]
-			</text>
-			<text length="1" name="not worn instructions" type="string">
-				Pour porter une nouvelle chemise, faites-en glisser une de votre inventaire
-jusqu&apos;à votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
-			</text>
-			<text length="1" name="no modify instructions" type="string">
-				Vous n&apos;avez pas la permission de modifier cet objet.
-			</text>
-			<text name="Item Action Label" right="92">
-				Chemise :
-			</text>
-		</panel>
-		<panel label="Pantalon" name="Pants">
-			<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"/>
-			<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="111"/>
-			<button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/>
-			<text length="1" name="title" type="string">
-				[DESC]
-			</text>
-			<text length="1" name="title_no_modify" type="string">
-				[DESC]: impossible de modifier
-			</text>
-			<text length="1" name="title_loading" type="string">
-				[DESC]: en cours de chargement...
-			</text>
-			<text length="1" name="title_not_worn" type="string">
-				[DESC]: non porté
-			</text>
-			<text length="1" name="path" type="string">
-				Emplacement : [PATH]
-			</text>
-			<text length="1" name="not worn instructions" type="string">
-				Pour porter un nouveau pantalon, faites-en glisser un de votre inventaire
-jusqu&apos;à votre avatar. Vous pouvez aussi en créer un nouveau et le porter.
-			</text>
-			<text length="1" name="no modify instructions" type="string">
-				Vous n&apos;avez pas la permission de modifier cet objet.
-			</text>
-			<text name="Item Action Label" right="92">
-				Pantalon :
-			</text>
-		</panel>
-		<panel label="Chaussures" name="Shoes">
-			<text length="1" name="title" type="string">
-				[DESC]
-			</text>
-			<text length="1" name="title_no_modify" type="string">
-				[DESC]: impossible de modifier
-			</text>
-			<text length="1" name="title_loading" type="string">
-				[DESC]: en cours de chargement...
-			</text>
-			<text length="1" name="title_not_worn" type="string">
-				[DESC]: non portées
-			</text>
-			<text length="1" name="path" type="string">
-				Emplacement : [PATH]
-			</text>
-			<text length="1" name="not worn instructions" type="string">
-				Pour porter de nouvelles chaussures, faites-en glisser une paire de votre
-inventaire jusqu&apos;à votre avatar. Vous pouvez aussi en créer une
-nouvelle paire et la porter.
-			</text>
-			<text length="1" name="no modify instructions" type="string">
-				Vous n&apos;avez pas la permission de modifier cet objet.
-			</text>
-			<text name="Item Action Label" right="92">
-				Chaussures :
-			</text>
-			<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"/>
-			<button label="Créer des chaussures" label_selected="Créer des chaussures" 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="111"/>
-			<button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/>
-		</panel>
-		<panel label="Chaussettes" name="Socks">
-			<text length="1" name="title" type="string">
-				[DESC]
-			</text>
-			<text length="1" name="title_no_modify" type="string">
-				[DESC]: impossible de modifier
-			</text>
-			<text length="1" name="title_loading" type="string">
-				[DESC]: en cours de chargement...
-			</text>
-			<text length="1" name="title_not_worn" type="string">
-				[DESC]: non portées
-			</text>
-			<text length="1" name="path" type="string">
-				Emplacement : [PATH]
-			</text>
-			<text length="1" name="not worn instructions" type="string">
-				Pour porter de nouvelles chaussettes, faites-en glisser une paire de votre
-inventaire jusqu&apos;à votre avatar. Vous pouvez aussi en créer une
-nouvelle paire et la porter.
-			</text>
-			<text length="1" name="no modify instructions" type="string">
-				Vous n&apos;avez pas la permission de modifier cet objet.
-			</text>
-			<text name="Item Action Label" right="92">
-				Chaussettes :
-			</text>
-			<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"/>
-			<button label="Créer des chaussettes" label_selected="Créer des chaussettes" 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="111"/>
-			<button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/>
-		</panel>
-		<panel label="Veste" name="Jacket">
-			<text length="1" name="title" type="string">
-				[DESC]
-			</text>
-			<text length="1" name="title_no_modify" type="string">
-				[DESC]: impossible de modifier
-			</text>
-			<text length="1" name="title_loading" type="string">
-				[DESC]: en cours de chargement...
-			</text>
-			<text length="1" name="title_not_worn" type="string">
-				[DESC]: non portée
-			</text>
-			<text length="1" name="path" type="string">
-				Emplacement : [PATH]
-			</text>
-			<text length="1" name="not worn instructions" type="string">
-				Pour porter une nouvelle veste, faites-en glisser une de votre inventaire 
-jusqu&apos;à votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
-			</text>
-			<text length="1" name="no modify instructions" type="string">
-				Vous n&apos;avez pas la permission de modifier cet objet.
-			</text>
-			<text name="Item Action Label" right="92">
-				Veste :
-			</text>
-			<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"/>
-			<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="111"/>
-			<button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/>
-		</panel>
-		<panel label="Gants" name="Gloves">
-			<text length="1" name="title" type="string">
-				[DESC]
-			</text>
-			<text length="1" name="title_no_modify" type="string">
-				[DESC]: impossible de modifier
-			</text>
-			<text length="1" name="title_loading" type="string">
-				[DESC]: en cours de chargement...
-			</text>
-			<text length="1" name="title_not_worn" type="string">
-				[DESC]: non portés
-			</text>
-			<text length="1" name="path" type="string">
-				Emplacement : [PATH]
-			</text>
-			<text length="1" name="not worn instructions" type="string">
-				Pour porter de nouveaux gants, faites-les glisser à partir de votre
-inventaire. Vous pouvez aussi en créer une nouvelle paire et la porter.
-			</text>
-			<text length="1" name="no modify instructions" type="string">
-				Vous n&apos;avez pas la permission de modifier cet objet.
-			</text>
-			<text name="Item Action Label" right="92">
-				Gants :
-			</text>
-			<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"/>
-			<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="111"/>
-			<button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/>
-		</panel>
-		<panel label="Sous-vêtements (haut)" name="Undershirt">
-			<text length="1" name="title" type="string">
-				[DESC]
-			</text>
-			<text length="1" name="title_no_modify" type="string">
-				[DESC]: impossible de modifier
-			</text>
-			<text length="1" name="title_loading" type="string">
-				[DESC]: en cours de chargement...
-			</text>
-			<text length="1" name="title_not_worn" type="string">
-				[DESC]: non portés
-			</text>
-			<text length="1" name="path" type="string">
-				Emplacement : [PATH]
-			</text>
-			<text length="1" name="not worn instructions" type="string">
-				Pour porter de nouveaux sous-vêtements, faites-les glisser à partir de
-votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
-			</text>
-			<text length="1" name="no modify instructions" type="string">
-				Vous n&apos;avez pas la permission de modifier cet objet.
-			</text>
-			<text name="Item Action Label" right="92" bottom="-470">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="floater customize" title="Apparence" width="548">
+	<tab_container name="customize tab container" tab_min_width="150" width="546">
+		<panel label="Parties du corps" name="body_parts_placeholder"/>
+		<panel label="Silhouette" name="Shape" left="154" width="389">
+			<button label="Rétablir" label_selected="Rétablir" name="Revert" left="305" 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"/>
+			<radio_group name="sex radio">
+				<radio_item name="radio">
+					Femme
+				</radio_item>
+				<radio_item name="radio2">
+					Homme
+				</radio_item>
+			</radio_group>
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: Impossible de modifier
+			</text>
+			<text name="title_loading">
+				[DESC]: En cours de chargement...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: Non portée
+			</text>
+			<text name="path">
+				Emplacement: [PATH]
+			</text>
+			<text name="not worn instructions">
+				Pour changer de silhouette, faites-en glisser une à partir de votre
+inventaire jusqu'à votre avatar. Vous pouvez aussi en créer une nouvelle 
+et la porter.
+			</text>
+			<text name="no modify instructions">
+				Vous n'avez pas la permission de modifier cet objet.
+			</text>
+			<text name="Item Action Label" right="92">
+				Silhouette:
+			</text>
+			<button label="Créer une silhouette" label_selected="Créer une silhouette" name="Create New"/>
+			<button label="Enregistrer" label_selected="Enregistrer" name="Save" left="100" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" name="Save As" left="188" width="111"/>
+		</panel>
+		<panel label="Peau" name="Skin">
+			<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"/>
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: Impossible de modifier
+			</text>
+			<text name="title_loading">
+				[DESC]: En cours de chargement...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: Non portée
+			</text>
+			<text name="path">
+				Emplacement: [PATH]
+			</text>
+			<text name="not worn instructions">
+				Pour changer de peau, faites-en glisser une à partir de votre inventaire.
+Vous pouvez aussi en créer une nouvelle et la porter.
+			</text>
+			<text name="no modify instructions">
+				Vous n'avez pas la permission de modifier cet objet.
+			</text>
+			<text name="Item Action Label" right="92">
+				Peau:
+			</text>
+			<texture_picker label="Tatouages tête" name="Head Tattoos" tool_tip="Cliquer pour sélectionner une image" width="78"/>
+			<texture_picker label="Tatouages haut" name="Upper Tattoos" tool_tip="Cliquer pour sélectionner une image" width="78"/>
+			<texture_picker label="Tatouages bas" name="Lower Tattoos" tool_tip="Cliquer pour sélectionner une image" width="78"/>
+			<button label="Créer une peau" label_selected="Créer une peau" name="Create New"/>
+			<button label="Enregistrer" label_selected="Enregistrer" name="Save" left="100" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" name="Save As" left="188" width="111"/>
+			<button label="Rétablir" label_selected="Rétablir" name="Revert" left="305" width="82"/>
+		</panel>
+		<panel label="Cheveux" name="Hair">
+			<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"/>
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: Impossible de modifier
+			</text>
+			<text name="title_loading">
+				[DESC]: En cours de chargement...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: Non portés
+			</text>
+			<text name="path">
+				Emplacement: [PATH]
+			</text>
+			<text name="not worn instructions">
+				Pour changer de chevelure, faites-en glisser une de votre inventaire
+jusqu'à votre avatar. Vous pouvez aussi en créer une nouvelle
+et la porter.
+			</text>
+			<text name="no modify instructions">
+				Vous n'avez pas la permission de modifier cet objet.
+			</text>
+			<text name="Item Action Label" right="92">
+				Cheveux:
+			</text>
+			<texture_picker label="Texture" name="Texture" tool_tip="Cliquer pour sélectionner une image"/>
+			<button label="Créer des cheveux" label_selected="Créer des cheveux" name="Create New"/>
+			<button label="Enregistrer" label_selected="Enregistrer" name="Save" left="100" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" name="Save As" left="188" width="111"/>
+			<button label="Rétablir" label_selected="Rétablir" name="Revert" left="305" width="82"/>
+		</panel>
+		<panel label="Yeux" name="Eyes">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: Impossible de modifier
+			</text>
+			<text name="title_loading">
+				[DESC]: En cours de chargement...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: non portés
+			</text>
+			<text name="path">
+				Emplacement: [PATH]
+			</text>
+			<text name="not worn instructions">
+				Pour changer vos yeux, faites-les glisser de votre inventaire jusqu'à
+votre avatar. Vous pouvez aussi en créer de nouveaux et les porter.
+			</text>
+			<text name="no modify instructions">
+				Vous n'avez pas la permission de modifier cet objet.
+			</text>
+			<text name="Item Action Label" right="92">
+				Yeux:
+			</text>
+			<texture_picker label="Iris" name="Iris" tool_tip="Cliquer pour sélectionner une image"/>
+			<button label="Créer des yeux" label_selected="Créer des yeux" name="Create New"/>
+			<button label="Enregistrer" label_selected="Enregistrer" name="Save" left="100" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" name="Save As" left="188" width="111"/>
+			<button label="Rétablir" label_selected="Rétablir" name="Revert" left="305" width="82"/>
+		</panel>
+		<panel label="Habits" name="clothes_placeholder"/>
+		<panel label="Chemise" name="Shirt">
+			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquer 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"/>
+			<button label="Créer une chemise" label_selected="Créer une chemise" name="Create New"/>
+			<button label="Enlever" label_selected="Enlever" name="Take Off" left="12" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" name="Save" left="100" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" name="Save As" left="188" width="111"/>
+			<button label="Rétablir" label_selected="Rétablir" name="Revert" left="305" width="82"/>
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: Impossible de modifier
+			</text>
+			<text name="title_loading">
+				[DESC]: En cours de chargement...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: Non portés
+			</text>
+			<text name="path">
+				Emplacement: [PATH]
+			</text>
+			<text name="not worn instructions">
+				Pour porter une nouvelle chemise, faites-en glisser une de votre inventaire
+jusqu'à votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
+			</text>
+			<text name="no modify instructions">
+				Vous n'avez pas la permission de modifier cet objet.
+			</text>
+			<text name="Item Action Label" right="92">
+				Chemise:
+			</text>
+		</panel>
+		<panel label="Pantalon" name="Pants">
+			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquer 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"/>
+			<button label="Créer un pantalon" label_selected="Créer un pantalon" name="Create New"/>
+			<button label="Enlever" label_selected="Enlever" name="Take Off" left="12" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" name="Save" left="100" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" name="Save As" left="188" width="111"/>
+			<button label="Rétablir" label_selected="Rétablir" name="Revert" left="305" width="82"/>
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: Impossible de modifier
+			</text>
+			<text name="title_loading">
+				[DESC]: En cours de chargement...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: Non portée
+			</text>
+			<text name="path">
+				Emplacement: [PATH]
+			</text>
+			<text name="not worn instructions">
+				Pour porter un nouveau pantalon, faites-en glisser un de votre inventaire
+jusqu&apos;à votre avatar. Vous pouvez aussi en créer un nouveau et le porter.
+			</text>
+			<text name="no modify instructions">
+				Vous n'avez pas la permission de modifier cet objet.
+			</text>
+			<text name="Item Action Label" right="92">
+				Pantalon:
+			</text>
+		</panel>
+		<panel label="Chaussures" name="Shoes">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: Impossible de modifier
+			</text>
+			<text name="title_loading">
+				[DESC]: En cours de chargement...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: Non portées
+			</text>
+			<text name="path">
+				Emplacement: [PATH]
+			</text>
+			<text name="not worn instructions">
+				Pour porter de nouvelles chaussures, faites-en glisser une paire de votre
+inventaire jusqu'à votre avatar. Vous pouvez aussi en créer une
+nouvelle paire et la porter.
+			</text>
+			<text name="no modify instructions">
+				Vous n'avez pas la permission de modifier cet objet.
+			</text>
+			<text name="Item Action Label" right="92">
+				Chaussures:
+			</text>
+			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquer 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"/>
+			<button label="Créer des chaussures" label_selected="Créer des chaussures" name="Create New" />
+			<button label="Enlever" label_selected="Enlever" name="Take Off" left="12" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" name="Save" left="100" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" name="Save As" left="188" width="111"/>
+			<button label="Rétablir" label_selected="Rétablir" name="Revert" left="305" width="82"/>
+		</panel>
+		<panel label="Chaussettes" name="Socks">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: Impossible de modifier
+			</text>
+			<text name="title_loading">
+				[DESC]: En cours de chargement...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: Non portées
+			</text>
+			<text name="path">
+				Emplacement: [PATH]
+			</text>
+			<text name="not worn instructions">
+				Pour porter de nouvelles chaussettes, faites-en glisser une paire de votre
+inventaire jusqu'à votre avatar. Vous pouvez aussi en créer une
+nouvelle paire et la porter.
+			</text>
+			<text name="no modify instructions">
+				Vous n'avez pas la permission de modifier cet objet.
+			</text>
+			<text name="Item Action Label" right="92">
+				Chaussettes:
+			</text>
+			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquer 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"/>
+			<button label="Créer des chaussettes" label_selected="Créer des chaussettes" 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="111"/>
+			<button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/>
+		</panel>
+		<panel label="Veste" name="Jacket">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: Impossible de modifier
+			</text>
+			<text name="title_loading">
+				[DESC]: En cours de chargement...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: Non portée
+			</text>
+			<text name="path">
+				Emplacement: [PATH]
+			</text>
+			<text name="not worn instructions">
+				Pour porter une nouvelle veste, faites-en glisser une de votre inventaire 
+jusqu&apos;à votre avatar. Vous pouvez aussi en créer une nouvelle et la porter.
+			</text>
+			<text name="no modify instructions">
+				Vous n'avez pas la permission de modifier cet objet.
+			</text>
+			<text name="Item Action Label" right="92">
+				Veste:
+			</text>
+			<texture_picker label="Tissu (dessus)" name="Upper Fabric" tool_tip="Cliquer pour sélectionner une image" width="81"/>
+			<texture_picker label="Tissu (dessous)" name="Lower Fabric" tool_tip="Cliquer pour sélectionner une image" width="81"/>
+			<color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip=" pour ouvrir le sélecteur de couleurs" width="81"/>
+			<button label="Créer une veste" label_selected="Créer une veste" name="Create New"/>
+			<button label="Enlever" label_selected="Enlever" name="Take Off" left="12" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" name="Save" left="100" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" name="Save As" left="188" width="111"/>
+			<button label="Rétablir" label_selected="Rétablir" name="Revert" left="305" width="82"/>
+		</panel>
+		<panel label="Gants" name="Gloves">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: Impossible de modifier
+			</text>
+			<text name="title_loading">
+				[DESC]: En cours de chargement...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: Non portés
+			</text>
+			<text name="path">
+				Emplacement: [PATH]
+			</text>
+			<text name="not worn instructions">
+				Pour porter de nouveaux gants, faites-les glisser à partir de votre
+inventaire. Vous pouvez aussi en créer une nouvelle paire et la porter.
+			</text>
+			<text name="no modify instructions">
+				Vous n'avez pas la permission de modifier cet objet.
+			</text>
+			<text name="Item Action Label" right="92">
+				Gants:
+			</text>
+			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquer 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"/>
+			<button label="Créer des gants" label_selected="Créer des gants" name="Create New"/>
+			<button label="Enlever" label_selected="Enlever" name="Take Off" left="12" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" name="Save" left="100" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" name="Save As" left="188" width="111"/>
+			<button label="Rétablir" label_selected="Rétablir" name="Revert" left="305" width="82"/>
+		</panel>
+		<panel label="Sous-vêtements (haut)" name="Undershirt">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: Impossible de modifier
+			</text>
+			<text name="title_loading">
+				[DESC]: En cours de chargement...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: Non portés
+			</text>
+			<text name="path">
+				Emplacement: [PATH]
+			</text>
+			<text name="not worn instructions">
+				Pour porter de nouveaux sous-vêtements, faites-les glisser à partir de
+votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
+			</text>
+			<text name="no modify instructions">
+				Vous n'avez pas la permission de modifier cet objet.
+			</text>
+			<text name="Item Action Label" right="92" bottom="-470">
 				Sous-vêtements
-(haut) :
-			</text>
-			<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"/>
-			<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="111"/>
-			<button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/>
-		</panel>
-		<panel label="Sous-vêtements (bas)" name="Underpants">
-			<text length="1" name="title" type="string">
-				[DESC]
-			</text>
-			<text length="1" name="title_no_modify" type="string">
-				[DESC]: impossible de modifier
-			</text>
-			<text length="1" name="title_loading" type="string">
-				[DESC]: en cours de chargement...
-			</text>
-			<text length="1" name="title_not_worn" type="string">
-				[DESC]: non portés
-			</text>
-			<text length="1" name="path" type="string">
-				Emplacement : [PATH]
-			</text>
-			<text length="1" name="not worn instructions" type="string">
-				Pour porter de nouveaux sous-vêtements, faites-les glisser à partir de
-votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
-			</text>
-			<text length="1" name="no modify instructions" type="string">
-				Vous n&apos;avez pas la permission de modifier cet objet.
-			</text>
-			<text name="Item Action Label" right="92" bottom="-470">
+(haut):
+			</text>
+			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquer 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"/>
+			<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" name="Take Off" left="12" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" name="Save" left="100" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" name="Save As" left="188" width="111"/>
+			<button label="Rétablir" label_selected="Rétablir" name="Revert" left="305" width="82"/>
+		</panel>
+		<panel label="Sous-vêtements (bas)" name="Underpants">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: Impossible de modifier
+			</text>
+			<text name="title_loading">
+				[DESC]: En cours de chargement...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: Non portés
+			</text>
+			<text name="path">
+				Emplacement: [PATH]
+			</text>
+			<text name="not worn instructions" type="string">
+				Pour porter de nouveaux sous-vêtements, faites-les glisser à partir de
+votre inventaire. Vous pouvez aussi en créer des nouveaux et les porter.
+			</text>
+			<text name="no modify instructions">
+				Vous n'avez pas la permission de modifier cet objet.
+			</text>
+			<text name="Item Action Label" right="92" bottom="-470">
 				Sous-vêtements
-(bas) :
-			</text>
-			<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"/>
-			<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="111"/>
-			<button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/>
-		</panel>
-		<panel label="Jupe" name="Skirt">
-			<text length="1" name="title" type="string">
-				[DESC]
-			</text>
-			<text length="1" name="title_no_modify" type="string">
-				[DESC]: impossible de modifier
-			</text>
-			<text length="1" name="title_loading" type="string">
-				[DESC]: en cours de chargement...
-			</text>
-			<text length="1" name="title_not_worn" type="string">
-				[DESC]: non portée
-			</text>
-			<text length="1" name="path" type="string">
-				Emplacement : [PATH]
-			</text>
-			<text length="1" name="not worn instructions" type="string">
-				Pour porter une nouvelle jupe, faites-en glisser une à partir de votre 
-inventaire. Vous pouvez aussi en créer une nouvelle et la porter.
-			</text>
-			<text length="1" name="no modify instructions" type="string">
-				Vous n&apos;avez pas la permission de modifier cet objet.
-			</text>
-			<text name="Item Action Label" right="92">
-				Jupe :
-			</text>
-			<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"/>
-			<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="111"/>
-			<button label="Rétablir" label_selected="Rétablir" left="305" name="Revert" width="82"/>
-		</panel>
-	</tab_container>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-410" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="16"
-	     left="8" mouse_opaque="true" name="AvatarHeightText" v_pad="0" width="140">
-        Taille:
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="16"
-	     left="8" mouse_opaque="true" name="HeightTextM" v_pad="0" width="140">
-        (metric)
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="16"
-	     left="8" mouse_opaque="true" name="HeightTextI" v_pad="0" width="140">
-        (imperial)
-	</text>
-    <button name="Import" label="Importer"
-          bottom="-486" left="10" height="20" width="70"
-          follows="left|bottom" font="SansSerif" halign="center" />
-    <button name="Export" label="Exporter"
-	      bottom="-506" left="10" height="20" width="70"
-          follows="left|bottom" font="SansSerif" halign="center" />	
-	<scroll_container left="251" name="panel_container"/>
-	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
-	<button label="OK" label_selected="OK" name="Ok"/>
-	<button label="Créer un ensemble..." label_selected="Créer un ensemble..." name="Make Outfit" left="152" width="125"/>
-</floater>
+(bas):
+			</text>
+			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquer 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"/>
+			<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" name="Take Off" left="12" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" name="Save" left="100" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" name="Save As" left="188" width="111"/>
+			<button label="Rétablir" label_selected="Rétablir" name="Revert" left="305" width="82"/>
+		</panel>
+		<panel label="Jupe" name="Skirt">
+			<text name="title">
+				[DESC]
+			</text>
+			<text name="title_no_modify">
+				[DESC]: Impossible de modifier
+			</text>
+			<text name="title_loading">
+				[DESC]: En cours de chargement...
+			</text>
+			<text name="title_not_worn">
+				[DESC]: Non portée
+			</text>
+			<text name="path">
+				Emplacement: [PATH]
+			</text>
+			<text name="not worn instructions">
+				Pour porter une nouvelle jupe, faites-en glisser une à partir de votre 
+inventaire. Vous pouvez aussi en créer une nouvelle et la porter.
+			</text>
+			<text name="no modify instructions">
+				Vous n'avez pas la permission de modifier cet objet.
+			</text>
+			<text name="Item Action Label" right="92">
+				Jupe:
+			</text>
+			<texture_picker label="Tissu" name="Fabric" tool_tip="Cliquer 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"/>
+			<button label="Créer une jupe" label_selected="Créer une jupe" name="Create New"/>
+			<button label="Enlever" label_selected="Enlever" name="Take Off" left="12" width="82"/>
+			<button label="Enregistrer" label_selected="Enregistrer" name="Save" left="100" width="82"/>
+			<button label="Enregistrer sous" label_selected="Enregistrer sous" name="Save As" left="188" width="111"/>
+			<button label="Rétablir" label_selected="Rétablir" name="Revert" left="305" width="82"/>
+		</panel>
+	</tab_container>
+	<scroll_container name="panel_container" left="251"/>
+	<text name="AvatarHeightText">
+		Taille:
+	</text>
+	<text name="HeightTextM">
+		(metric)
+	</text>
+	<text name="HeightTextI">
+		(imperial)
+	</text>
+	<button name="Import" label="Importer"/>
+	<button name="Export" label="Exporter"/>
+	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
+	<button label="OK" label_selected="OK" name="Ok"/>
+	<button label="Créer un ensemble" label_selected="Créer un ensemble" name="Make Outfit" left="152" width="125"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
index 110353989..bf8cfc5c5 100644
--- a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml
@@ -1,97 +1,98 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Day Cycle Floater" title="Editeur du cycle du jour">
-	<tab_container name="Day Cycle Tabs">
-		<panel label="Cycle du jour" name="Day Cycle">
-			<button label="?" name="WLDayCycleHelp" />
-			<text name="WL12am">
-				Minuit
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Day Cycle Floater" title="Editeur du cycle du jour">
+	<tab_container name="Day Cycle Tabs">
+		<panel label="Cycle du jour" name="Day Cycle">
+			<button label="?" name="WLDayCycleHelp"/>
+			<text name="WL12am">
+				Minuit
+			</text>
+			<text name="WL3am">
+				3h
+			</text>
+			<text name="WL6am">
+				6h
+			</text>
+			<text name="WL9amHash">
+				9h
+			</text>
+			<text name="WL12pmHash">
+				Midi
+			</text>
+			<text name="WL3pm">
+				15h
+			</text>
+			<text name="WL6pm">
+				18h
+			</text>
+			<text name="WL9pm">
+				21h
+			</text>
+			<text name="WL12am2">
+				Minuit
+			</text>
+			<text name="WL12amHash">
+				|
+			</text>
+			<text name="WL3amHash">
+				I
+			</text>
+			<text name="WL6amHash">
+				|
+			</text>
+			<text name="WL9amHash2">
+				I
+			</text>
+			<text name="WL12pmHash2">
+				|
+			</text>
+			<text name="WL3pmHash">
+				I
+			</text>
+			<text name="WL6pmHash">
+				|
+			</text>
+			<text name="WL9pmHash">
+				I
+			</text>
+			<text name="WL12amHash2">
+				|
+			</text>
+			<button label="Ajouter clé" label_selected="Ajouter clé" name="WLAddKey" width="89" bottom="-45"/>
+			<button label="Supprimer clé" label_selected="Supprimer clé" name="WLDeleteKey" width="89" bottom="-70"/>
+			<text name="WLCurKeyFrameText">
+				Réglages des images-clés:
+			</text>
+			<text name="WLCurKeyTimeText">
+				Heure de la clé:
+			</text>
+			<spinner label="Heure" name="WLCurKeyHour"/>
+			<spinner label="Min" name="WLCurKeyMin"/>
+			<text name="WLCurKeyTimeText2">
+				Préréglages clés:
+			</text>
+			<combo_box label="Préréglage" name="WLKeyPresets"/>
+			<text name="DayCycleText">
+				Snap:
+			</text>
+			<combo_box label="5 min" name="WLSnapOptions"/>
+			<text name="DayCycleText2">
+				Durée du cycle:
+			</text>
+			<spinner label="Heure" name="WLLengthOfDayHour"/>
+			<spinner label="Min" name="WLLengthOfDayMin"/>
+			<spinner label="S" name="WLLengthOfDaySec" label_width="10" width="50" left_delta="75"/>
+			<text name="DayCycleText3">
+				Prévisualiser:
 			</text>
-			<text name="WL3am">
-				3h
+			<button label="Jouer" label_selected="Jouer" name="WLAnimSky"/>
			<button label="Stop!" label_selected="Stop" name="WLStopAnimSky"/>
			<button label="Utiliser heure domaine" label_selected="Utiliser heure domaine" name="WLUseLindenTime"/>
			<text name="KeyFramePresets">
+				Prédéfinis:
 			</text>
-			<text name="WL6am">
-				6h
-			</text>
-			<text name="WL9amHash">
-				9h
-			</text>
-			<text name="WL12pmHash">
-				Midi
-			</text>
-			<text name="WL3pm">
-				15h
-			</text>
-			<text name="WL6pm">
-				18h
-			</text>
-			<text name="WL9pm">
-				21h
-			</text>
-			<text name="WL12am2">
-				Minuit
-			</text>
-			<text name="WL12amHash">
-				|
-			</text>
-			<text name="WL3amHash">
-				I
-			</text>
-			<text name="WL6amHash">
-				|
-			</text>
-			<text name="WL9amHash2">
-				I
-			</text>
-			<text name="WL12pmHash2">
-				|
-			</text>
-			<text name="WL3pmHash">
-				I
-			</text>
-			<text name="WL6pmHash">
-				|
-			</text>
-			<text name="WL9pmHash">
-				I
-			</text>
-			<text name="WL12amHash2">
-				|
-			</text>
-			<button label="Ajouter clé" label_selected="Ajouter clé" name="WLAddKey" width="89" bottom="-45" />
-			<button label="Supprimer clé" label_selected="Supprimer clé" name="WLDeleteKey" width="89" bottom="-70" />
-			<text name="WLCurKeyFrameText">
-				Réglages des images-clés :
-			</text>
-			<text name="WLCurKeyTimeText">
-				Heure de la clé :
-			</text>
-			<spinner label="Heure" name="WLCurKeyHour" />
-			<spinner label="Min" name="WLCurKeyMin" />
-			<text name="WLCurKeyTimeText2">
-				Préréglages clés :
-			</text>
-			<combo_box label="Préréglage" name="WLKeyPresets" />
-			<text name="DayCycleText">
-				Snap :
-			</text>
-			<combo_box label="5 min" name="WLSnapOptions" />
-			<text name="DayCycleText2">
-				Durée du cycle :
-			</text>
-			<spinner label="Heure" name="WLLengthOfDayHour" />
-			<spinner label="Min" name="WLLengthOfDayMin" />
-			<spinner label="S" name="WLLengthOfDaySec" label_width="10" width="50" left_delta="75"/>
-			<text name="DayCycleText3">
-				Prévisualiser :
-			</text>
-			<button label="Jouer" label_selected="Jouer" name="WLAnimSky" />
-			<button label="Stop !" label_selected="Stop" name="WLStopAnimSky" />
-			<button label="Utiliser heure domaine" label_selected="Aller heure domaine"
-			     name="WLUseLindenTime" />
-			<button label="Enregistrer jour test" label_selected="Enregistrer jour test"
-			     name="WLSaveDayCycle" />
-			<button label="Charger jour test" label_selected="Charger jour test"
-			     name="WLLoadDayCycle" />
-		</panel>
-	</tab_container>
-</floater>
+			<button label="Nouveau" label_selected="Nouveau" name="DayCycleNewPreset"/>
+			<button label="Sauver" label_selected="Sauver" name="DayCycleSavePreset"/>
+			<button label="Barrer" label_selected="Barrer" name="DayCycleDeletePreset"/>
+		</panel>
+	</tab_container>
+	<string name="DaycycleDefaultNames">
+		Default:Happy%20Bivouac
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_device_settings.xml b/indra/newview/skins/default/xui/fr/floater_device_settings.xml
index 656f1c4fb..80ac18494 100644
--- a/indra/newview/skins/default/xui/fr/floater_device_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_device_settings.xml
@@ -1,3 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_device_settings"
-     title="Paramètres du matériel utilisé pour le chat vocal" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_device_settings" title="Paramètres du matériel utilisé pour le chat vocal"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_directory.xml b/indra/newview/skins/default/xui/fr/floater_directory.xml
index b7a1df0a4..635ba690c 100644
--- a/indra/newview/skins/default/xui/fr/floater_directory.xml
+++ b/indra/newview/skins/default/xui/fr/floater_directory.xml
@@ -1,427 +1,416 @@
-<?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">
-			<string name="searching_text">
-				Recherche en cours...
-			</string>
-			<string name="not_found_text">
-				Aucun résultat.
-			</string>
-			<text name="find" width="63">
-				Trouver :
-			</text>
-			<line_editor label="Rechercher" name="search_editor" tool_tip="Rechercher dans Second Life"/>
-			<button label="." name="back_btn" width="20"/>
-			<button label="." left="316" name="forward_btn" width="20"/>
-			<button label="Rechercher" name="search_btn"/>
-			<combo_box name="Category">
-				<combo_item name="AnyCategory">
-					Toutes catégories
+<?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">
+			<string name="searching_text">
+				Recherche en cours
+			</string>
+			<string name="not_found_text">
+				Aucun résultat
+			</string>
+			<text name="find" width="63">
+				Trouver
+			</text>
+			<line_editor label="Rechercher" name="search_editor" tool_tip="Rechercher dans Second Life"/>
+			<button label="Rechercher" name="search_btn"/>
+			<combo_box name="Category">
+				<combo_item name="AnyCategory">
+					Toutes catégories
+				</combo_item>
+				<combo_item name="Events">
+					Événements
+				</combo_item>
+				<combo_item name="Groups">
+					Groupes
+				</combo_item>
+				<combo_item name="People">
+					Résidents
+				</combo_item>
+				<combo_item name="Places">
+					Lieux
+				</combo_item>
+				<combo_item name="Wiki">
+					Wiki
+				</combo_item>
+			</combo_box>
+			<check_box label="Contenu PG" name="incpg"/>
+			<check_box label="Contenu Mature" name="incmature"/>
+			<check_box label="Contenu Adulte" name="incadult"/>
+			<button label="?" label_selected="?" name="?"/>
+			<string name="loading_text">
+				Chargement en cours...
+			</string>
+			<string name="done_text">
+				Fini
+			</string>
+			<string name="redirect_404_url">
+				http://secondlife.com/app/search/notfound.html
+			</string>
+			<string name="default_search_page">
+				http://secondlife.com/app/search/index.php?
+			</string>
+		</panel>
+		<panel label="Petites annonces" name="classified_panel">
+			<string name="searching_text">
+				Recherche en cours...
+			</string>
+			<string name="not_found_text">
+				Aucun résultat
+			</string>
+			<text name="find" width="63">
+				Trouver
+			</text>
+			<line_editor name="name"/>
+			<check_box label="Contenu PG" name="incpg"/>
+			<check_box label="Contenu Mature" name="incmature"/>
+			<check_box label="Contenu Adulte" name="incadult"/>
+			<combo_box name="Category">
+				<combo_item name="AnyCategory">
+					Toutes catégories
+				</combo_item>
+				<combo_item name="Shopping">
+					Shopping
+				</combo_item>
+				<combo_item name="LandRental">
+					Terrains à louer
+				</combo_item>
+				<combo_item name="PropertyRental">
+					Propriétés à louer
+				</combo_item>
+				<combo_item name="SpecialAttraction">
+					Divertissements
+				</combo_item>
+				<combo_item name="NewProducts">
+					Nouveaux produits
+				</combo_item>
+				<combo_item name="Employment">
+					Emplois
+				</combo_item>
+				<combo_item name="Wanted">
+					Offres
+				</combo_item>
+				<combo_item name="Service">
+					Services
+				</combo_item>
+				<combo_item name="Personal">
+					Rencontres
+				</combo_item>
+			</combo_box>
+			<button label="Parcourir" label_selected="Parcourir" name="Browse"/>
+			<button label="Rechercher" label_selected="Rechercher" name="Search" width="85"/>
+			<button label="Passer une annonce" label_selected="Passer une annonce" name="Place an Ad..."/>
+			<button label="Supprimer" label_selected="Supprimer" name="Delete"/>
+			<scroll_list name="results">
+				<column label="Nom" name="name"/>
+				<column label="Prix" name="price"/>
+			</scroll_list>
+			<button label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;"/>
+			<button label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev"/>
+		</panel>
+		<panel label="Événements" name="events_panel">
+			<string name="searching_text">
+				Recherche en cours...
+			</string>
+			<string name="not_found_text">
+				Aucun résultat
+			</string>
+			<text name="text2">
+				Trouver
+			</text>
+			<line_editor name="event_search_text"/>
+			<radio_group name="date_mode">
+				<radio_item name="current">
+					En cours et futurs
+				</radio_item>
+				<radio_item name="date">
+					Date
+				</radio_item>
+			</radio_group>
+			<button label="&lt;&lt;" label_selected="&lt;&lt;" name="&lt;&lt;" tool_tip="Revenir en arrière d'un jour"/>
+			<text name="date_text">
+				6/6
+			</text>
+			<button label="&gt;&gt;" label_selected="&gt;&gt;" name="&gt;&gt;" tool_tip="Avancer d'un jour"/>
+			<button label="Aujourd'hui" label_selected="Aujourd'hui" name="Today" tool_tip="Affiche les événements qui ont lieu aujourd'hui" bottom="-62" left_delta="-72" width="95"/>
+			<text name="text">
+				Catégorie:
+			</text>
+			<combo_box name="category combo" width="175">
+				<combo_item name="All">
+					Toutes catégories
+				</combo_item>
+				<combo_item name="Discussion">
+					Discussions
+				</combo_item>
+				<combo_item name="Sports">
+					Sports
+				</combo_item>
+				<combo_item name="LiveMusic">
+					Musique live
+				</combo_item>
+				<combo_item name="Commercial">
+					Publicités
+				</combo_item>
+				<combo_item name="Nightlife/Entertainment">
+					Divertissements/Soirées
+				</combo_item>
+				<combo_item name="Games/Contests">
+					Jeux/Compétitions
+				</combo_item>
+				<combo_item name="Pageants">
+					Concours
+				</combo_item>
+				<combo_item name="Education">
+					Éducation
+				</combo_item>
+				<combo_item name="ArtsandCulture">
+					Arts et Culture
+				</combo_item>
+				<combo_item name="Charity/SupportGroups">
+					Groupes d'entraide/Caritatif
+				</combo_item>
+				<combo_item name="Miscellaneous">
+					Divers
+				</combo_item>
+			</combo_box>
+			<check_box label="Contenu PG" name="incpg"/>
+			<check_box label="Contenu Mature" name="incmature"/>
+			<check_box label="Contenu Adulte" name="incadult"/>
+			<button label="Rechercher" label_selected="Rechercher" name="Search" tool_tip="Rechercher"/>
+			<button label="Supprimer" label_selected="Supprimer" name="Delete"/>
+			<scroll_list name="results">
+				<column label="Nom" name="name"/>
+				<column label="Heure (Californie)" name="date" width="115"/>
+				<column label="Heure" name="time"/>
+			</scroll_list>
+			<button label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;"/>
+			<button label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev"/>
+		</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="" name="back_btn" width="60"/>
+			<button label="" left_delta="87" name="forward_btn" width="60"/>
+			<string name="loading_text">
+				Chargement en cours...
+			</string>
+			<string name="done_text">
+				Fini
+			</string>
+			<string name="redirect_404_url">
+				http://secondlife.com/app/search/notfound.html
+			</string>
+			<string name="default_search_page">
+				http://secondlife.com/app/showcase/index.php?
+			</string>
+		</panel>
+		<panel label="Terrains à vendre" name="land_sales_panel">
+			<string name="searching_text">
+				Recherche en cours...
+			</string>
+			<string name="not_found_text">
+				Aucun résultat
+			</string>
+			<string name="land_help_text">
+				Vous pouvez acheter un terrain directement en dollars ([CURRENCY]) ou aux enchères (en [CURRENCY] ou [REALCURRENCY]).
+Pour acheter directement, visitez le terrain et cliquez sur le nom de l'endroit dans la barre de titre.
+			</string>
+			<text name="find">
+				Trouver
+			</text>
+			<check_box label="Contenu PG" name="incpg" left="450"/>
+			<check_box label="Contenu Mature" name="incmature" left="450"/>
+			<check_box label="Contenu Adulte" name="incadult" left="450"/>
+			<combo_box name="type" left="298" width="145">
+				<combo_item name="AllTypes">
+					Tous types
+				</combo_item>
+				<combo_item name="Auction">
+					Enchères
+				</combo_item>
+				<combo_item name="MainlandSales">
+					À vendre - Continent
+				</combo_item>
+				<combo_item name="EstateSales">
+					À vendre - Région privée
+				</combo_item>
+			</combo_box>
+			<check_box label="Prix &#8804; " name="pricecheck"/>
+			<text name="pricecheck_symbol" left="186">
+				[CURRENCY]
+			</text>
+			<check_box label="Surface &#8805; " name="areacheck" width="90"/>
+			<text name="areacheck_symbol" left="186">
+				m²
+			</text>
+			<line_editor name="priceedit" left="130"/>
+			<line_editor name="areaedit" left="130"/>
+			<button label="Rechercher" label_selected="Rechercher" name="Search" width="85"/>
+			<scroll_list name="results">
+				<column label="Nom" name="name"/>
+				<column label="Type" name="landtype"/>
+				<column label="Prix en [CURRENCY]" name="price" width="75"/>
+				<column label="Surface" name="area" width="65"/>
+				<column label="[CURRENCY]/m²" name="per_meter"/>
+			</scroll_list>
+			<button label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;"/>
+			<button label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev"/>
+		</panel>
+		<panel label="Lieux" name="places_panel">
+			<string name="searching_text">
+				Recherche en cours...
+			</string>
+			<string name="not_found_text">
+				Aucun résultat
+			</string>
+			<text name="find">
+				Trouver
+			</text>
+			<line_editor name="name"/>
+			<check_box label="Contenu PG" name="incpg"/>
+			<check_box label="Contenu Mature" name="incmature"/>
+			<check_box label="Contenu Adulte" name="incadult"/>
+			<combo_box name="Category">
+				<combo_item name="AnyCategory">
+					Toutes catégories
+				</combo_item>
+				<combo_item name="LindenLocation">
+					Appartenant aux Lindens
+				</combo_item>
+				<combo_item name="Arts&amp;Culture">
+					Art et Culture
+				</combo_item>
+				<combo_item name="Business">
+					Affaires
+				</combo_item>
+				<combo_item name="Educational">
+					Éducation
+				</combo_item>
+				<combo_item name="Gaming">
+					Jeux
+				</combo_item>
+				<combo_item name="Hangout">
+					Favoris
+				</combo_item>
+				<combo_item name="NewcomerFriendly">
+					Accueil pour les nouveaux
+				</combo_item>
+				<combo_item name="Parks&amp;Nature">
+					Parcs et Nature
+				</combo_item>
+				<combo_item name="Residential">
+					Résidentiel
+				</combo_item>
+				<combo_item name="Shopping">
+					Shopping
+				</combo_item>
+				<combo_item name="Other">
+					Autre
 				</combo_item>
-				<combo_item name="Events">
-					Événements
-				</combo_item>
-				<combo_item name="Groups">
-					Groupes
-				</combo_item>
-				<combo_item name="People">
-					Résidents
-				</combo_item>
-				<combo_item name="Places">
-					Lieux
-				</combo_item>
-				<combo_item name="Wiki">
-					Wiki
-				</combo_item>
-			</combo_box>
-			<check_box label="Contenu PG" name="incpg"/>
-			<check_box label="Contenu Mature" name="incmature"/>
-			<check_box label="Contenu Adult" name="incadult"/>
-			<button label="?" label_selected="?" name="?"/>
-			<string name="loading_text">
-				Chargement en cours...
-			</string>
-			<string name="done_text">
-				Fini
-			</string>
-			<string name="redirect_404_url">
-				http://secondlife.com/app/search/notfound.html
-			</string>
-			<string name="default_search_page">
-				http://secondlife.com/app/search/index.php?
-			</string>
-		</panel>
-		<panel label="Petites annonces" name="classified_panel">
-			<string name="searching_text">
-				Recherche en cours...
-			</string>
-			<string name="not_found_text">
-				Aucun résultat.
-			</string>
-			<text name="find" width="63">
-				Trouver :
-			</text>
-			<line_editor name="name"/>
-			<check_box label="Contenu PG" name="incpg"/>
-			<check_box label="Contenu Mature" name="incmature"/>
-			<check_box label="Contenu Adult" name="incadult"/>
-			<combo_box name="Category">
-				<combo_item name="AnyCategory">
-					Toutes catégories
-				</combo_item>
-				<combo_item name="Shopping">
-					Shopping
-				</combo_item>
-				<combo_item name="LandRental">
-					Terrains à louer
-				</combo_item>
-				<combo_item name="PropertyRental">
-					Propriétés à louer
-				</combo_item>
-				<combo_item name="SpecialAttraction">
-					Divertissements
-				</combo_item>
-				<combo_item name="NewProducts">
-					Nouveaux produits
-				</combo_item>
-				<combo_item name="Employment">
-					Emplois
-				</combo_item>
-				<combo_item name="Wanted">
-					Offres
-				</combo_item>
-				<combo_item name="Service">
-					Services
-				</combo_item>
-				<combo_item name="Personal">
-					Rencontres
-				</combo_item>
-			</combo_box>
-			<button label="Parcourir" label_selected="Parcourir" name="Browse"/>
-			<button label="Rechercher" label_selected="Rechercher" name="Search" width="85"/>
-			<button label="Passer une annonce…" label_selected="Passer une annonce…" name="Place an Ad..."/>
-			<button label="Supprimer" label_selected="Supprimer" name="Delete"/>
-			<scroll_list name="results">
-				<column label="" name="icon"/>
-				<column label="" name="type"/>
-				<column label="Nom" name="name"/>
-				<column label="Prix" name="price"/>
-			</scroll_list>
-			<button label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;"/>
-			<button label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev"/>
-		</panel>
-		<panel label="Événements" name="events_panel">
-			<string name="searching_text">
-				Recherche en cours...
-			</string>
-			<string name="not_found_text">
-				Aucun résultat.
-			</string>
-			<text name="text2">
-				Trouver :
-			</text>
-			<line_editor name="event_search_text"/>
-			<radio_group name="date_mode">
-				<radio_item name="current">
-					En cours et futurs
-				</radio_item>
-				<radio_item name="date">
-					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"/>
-			<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 bottom="-62" label="Aujourd&apos;hui" label_selected="Aujourd&apos;hui" left_delta="-72" name="Today" tool_tip="Afficher les événements qui ont lieu aujourd&apos;hui" width="95"/>
-			<text name="text">
-				Catégorie :
-			</text>
-			<combo_box name="category combo" width="175">
-				<combo_item name="All">
-					Toutes catégories
-				</combo_item>
-				<combo_item name="Discussion">
-					Discussions
-				</combo_item>
-				<combo_item name="Sports">
-					Sports
-				</combo_item>
-				<combo_item name="LiveMusic">
-					Musique live
-				</combo_item>
-				<combo_item name="Commercial">
-					Publicités
-				</combo_item>
-				<combo_item name="Nightlife/Entertainment">
-					Divertissements/Soirées
-				</combo_item>
-				<combo_item name="Games/Contests">
-					Jeux/Compétitions
-				</combo_item>
-				<combo_item name="Pageants">
-					Concours
-				</combo_item>
-				<combo_item name="Education">
-					Éducation
-				</combo_item>
-				<combo_item name="ArtsandCulture">
-					Arts et Culture
-				</combo_item>
-				<combo_item name="Charity/SupportGroups">
-					Groupes d&apos;entraide/Caritatif
-				</combo_item>
-				<combo_item name="Miscellaneous">
-					Divers
-				</combo_item>
-			</combo_box>
-			<check_box label="Contenu PG" name="incpg"/>
-			<check_box label="Contenu Mature" name="incmature"/>
-			<check_box label="Contenu Adult" name="incadult"/>
-			<button label="Rechercher" label_selected="Rechercher" name="Search" tool_tip="Rechercher"/>
-			<button label="Supprimer" label_selected="Supprimer" name="Delete"/>
-			<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"/>
-			</scroll_list>
-			<button label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;"/>
-			<button label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev"/>
-		</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" width="82"/>
-			<button label="Suivante" left_delta="87" name="forward_btn" width="82"/>
-			<string name="loading_text">
-				Chargement en cours...
-			</string>
-			<string name="done_text">
-				Fini
-			</string>
-			<string name="redirect_404_url">
-				http://secondlife.com/app/search/notfound.html
-			</string>
-			<string name="default_search_page">
-				http://secondlife.com/app/showcase/index.php?
-			</string>
-		</panel>
-		<panel label="Terrains à vendre" name="land_sales_panel">
-			<string name="searching_text">
-				Recherche en cours...
-			</string>
-			<string name="not_found_text">
-				Aucun résultat.
-			</string>
-			<string name="land_help_text">
-				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.
-			</string>
-			<text name="find">
-				Trouver :
-			</text>
-			<check_box label="Contenu PG" name="incpg" left="450"/>
-			<check_box label="Contenu Mature" name="incmature" left="450"/>
-			<check_box label="Contenu Adult" name="incadult" left="450"/>
-			<combo_box left="298" name="type" width="145">
-				<combo_item name="AllTypes">
-					Tous types
-				</combo_item>
-				<combo_item name="Auction">
-					Enchères
-				</combo_item>
-				<combo_item name="MainlandSales">
-					À vendre - Continent
-				</combo_item>
-				<combo_item name="EstateSales">
-					À vendre - Région privée
-				</combo_item>
-			</combo_box>
-			<check_box label="Prix &#8804; " name="pricecheck"/>
-			<text left="186" name="pricecheck_symbol">
-				L$
-			</text>
-			<check_box label="Surface &#8805; " name="areacheck" width="90"/>
-			<text left="186" name="areacheck_symbol">
-				m²
-			</text>
-			<line_editor left="130" name="priceedit"/>
-			<line_editor left="130" name="areaedit"/>
-			<button label="Rechercher" label_selected="Rechercher" name="Search" width="85"/>
-			<scroll_list name="results">
-				<column label="" name="icon"/>
-				<column label="" name="type"/>
-				<column label="Nom" name="name"/>
-				<column label="Type" name="landtype"/>
-				<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="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;"/>
-			<button label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev"/>
-		</panel>
-		<panel label="Lieux" name="places_panel">
-			<string name="searching_text">
-				Recherche en cours...
-			</string>
-			<string name="not_found_text">
-				Aucun résultat.
-			</string>
-			<text name="find">
-				Trouver :
-			</text>
-			<line_editor name="name"/>
-			<check_box label="Contenu PG" name="incpg"/>
-			<check_box label="Contenu Mature" name="incmature"/>
-			<check_box label="Contenu Adult" name="incadult"/>
-			<combo_box name="Category">
-				<combo_item name="AnyCategory">
-					Toutes catégories
-				</combo_item>
-				<combo_item name="LindenLocation">
-					Appartenant aux Lindens
-				</combo_item>
-				<combo_item name="Arts&amp;Culture">
-					Art et Culture
-				</combo_item>
-				<combo_item name="Business">
-					Affaires
-				</combo_item>
-				<combo_item name="Educational">
-					Éducation
-				</combo_item>
-				<combo_item name="Gaming">
-					Jeux
-				</combo_item>
-				<combo_item name="Hangout">
-					Favoris
-				</combo_item>
-				<combo_item name="NewcomerFriendly">
-					Accueil pour les nouveaux
-				</combo_item>
-				<combo_item name="Parks&amp;Nature">
-					Parcs et Nature
-				</combo_item>
-				<combo_item name="Residential">
-					Résidentiel
-				</combo_item>
-				<combo_item name="Shopping">
-					Shopping
-				</combo_item>
-				<combo_item name="Other">
+				<combo_item name="Rental">
+					Rental
+				</combo_item>
+			</combo_box>
+			<!-- This is used only during the AO transition and can be deleted once the AO transition is
+				  complete. It is identical to the combo box above except that it has the Adult category. 
+				  You might also want to set it back to default visible and enabled. -->
+			<combo_box name="Category_Adult">
+				<combo_item name="AnyCategory">
+					Toutes catégories
+				</combo_item>
+				<combo_item name="LindenLocation">
+					Appartenant aux Lindens
+				</combo_item>
+				<combo_item name="Adult">
+					Adulte
+				</combo_item>
+				<combo_item name="Arts&amp;Culture">
+					Art et Culture
+				</combo_item>
+				<combo_item name="Business">
+					Affaires
+				</combo_item>
+				<combo_item name="Educational">
+					Éducation
+				</combo_item>
+				<combo_item name="Gaming">
+					Jeux
+				</combo_item>
+				<combo_item name="Hangout">
+					Favoris
+				</combo_item>
+				<combo_item name="NewcomerFriendly">
+					Accueil pour les nouveaux
+				</combo_item>
+				<combo_item name="Parks&amp;Nature">
+					Parcs et Nature
+				</combo_item>
+				<combo_item name="Residential">
+					Résidentiel
+				</combo_item>
+				<combo_item name="Shopping">
+					Shopping
+				</combo_item>
+				<combo_item name="Other">
 					Autre
 				</combo_item>
-			</combo_box>
-			<combo_box name="Category_Adult">
-				<combo_item name="AnyCategory">
-					Toutes catégories
-				</combo_item>
-				<combo_item name="LindenLocation">
-					Appartenant aux Lindens
-				</combo_item>
-				<combo_item name="Adult">
-					Adult
-				</combo_item>
-				<combo_item name="Arts&amp;Culture">
-					Art et Culture
-				</combo_item>
-				<combo_item name="Business">
-					Affaires
-				</combo_item>
-				<combo_item name="Educational">
-					Éducation
-				</combo_item>
-				<combo_item name="Gaming">
-					Jeux
-				</combo_item>
-				<combo_item name="Hangout">
-					Favoris
-				</combo_item>
-				<combo_item name="NewcomerFriendly">
-					Accueil pour les nouveaux
-				</combo_item>
-				<combo_item name="Parks&amp;Nature">
-					Parcs et Nature
-				</combo_item>
-				<combo_item name="Residential">
-					Résidentiel
-				</combo_item>
-				<combo_item name="Shopping">
-					Shopping
-				</combo_item>
-				<combo_item name="Other">
-					Autre
-				</combo_item>
-			</combo_box>
-			<button label="Rechercher" label_selected="Rechercher" name="Search"/>
-			<scroll_list name="results">
-				<column label="" name="icon"/>
-				<column label="" name="type"/>
-				<column label="Nom" name="name"/>
-				<column label="Trafic" name="dwell"/>
-			</scroll_list>
-			<button label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;"/>
-			<button label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev"/>
-		</panel>
-		<panel label="Résidents" name="people_panel">
-			<string name="searching_text">
-				Recherche en cours...
-			</string>
-			<string name="not_found_text">
-				Aucun résultat.
-			</string>
-			<text name="find">
-				Trouver :
-			</text>
-			<line_editor name="name"/>
-			<button label="Rechercher" label_selected="Rechercher" name="Search"/>
-			<scroll_list name="results" width="286">
-				<column label="" name="icon"/>
-				<column label="" name="type"/>
-				<column label="Nom" name="name" width="234"/>
-			</scroll_list>
-			<button right="290" label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;"/>
-			<button right="204" label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev"/>
-		</panel>
-		<panel label="Groupes" name="groups_panel">
-			<string name="searching_text">
-				Recherche en cours...
-			</string>
-			<string name="not_found_text">
-				Aucun résultat.
-			</string>
-			<text name="find">
-				Trouver :
-			</text>
-			<line_editor label="Rechercher" name="search_editor" tool_tip="Rechercher dans Second Life"/>
-			<button label="Précédente" name="back_btn" width="82"/>
-			<button label="Suivante" left="316" name="forward_btn" width="77"/>
-			<button label="Rechercher" name="search_btn"/>
-			<check_box label="Contenu PG" name="incpg"/>
-			<check_box label="Contenu Mature" name="incmature"/>
-			<check_box label="Contenu Adult" name="incadult"/>
-			<string name="loading_text">
-				Chargement en cours...
-			</string>
-			<string name="done_text">
-				Fini
-			</string>
-			<string name="redirect_404_url">
-				http://secondlife.com/app/search/notfound.html
-			</string>
-			<string name="default_search_page">
-				http://secondlife.com/app/search/index_groups.php?
-			</string>
-		</panel>
-	</tab_container>
-	<panel left="310" name="Panel Avatar" width="470" />
-</floater>
+				<combo_item name="Rental">
+					Rental
+				</combo_item>
+			</combo_box>
+			<button label="Rechercher" label_selected="Rechercher" name="Search"/>
+			<scroll_list name="results">
+				<column label="Nom" name="name"/>
+				<column label="Trafic" name="dwell"/>
+			</scroll_list>
+			<button label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;"/>
+			<button label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev"/>
+		</panel>
+		<panel label="Résidents" name="people_panel">
+			<string name="searching_text">
+				Recherche en cours...
+			</string>
+			<string name="not_found_text">
+				Aucun résultat
+			</string>
+			<text name="find">
+				Trouver
+			</text>
+			<line_editor name="name"/>
+			<button label="Rechercher" label_selected="Rechercher" name="Search"/>
+			<scroll_list name="results" width="286">
+				<column label="Nom" name="name" width="234"/>
+			</scroll_list>
+			<button right="290" label="Suivante &gt;" label_selected="Suivante &gt;" name="Next &gt;"/>
+			<button right="204" label="&lt; Préc" label_selected="&lt; Préc" name="&lt; Prev"/>
+		</panel>
+		<panel label="Groupes" name="groups_panel">
+			<string name="searching_text">
+				Recherche en cours...
+			</string>
+			<string name="not_found_text">
+				Aucun résultat
+			</string>
+			<button label="Next &gt;" label_selected="Next &gt;" name="Next &gt;"/>
+			<button label="&lt; Prev" label_selected="&lt; Prev" name="&lt; Prev"/>
+			<text name="find">
+				Trouver
+			</text>
+			<line_editor name="name"/>
+			<button label="Rechercher" label_selected="Recherche" name="Search"/>
+			<check_box label="PG" name="incpg"/>
+			<check_box label="Mature" name="incmature"/>
+			<check_box label="Adulte" name="incadult"/>
+			<scroll_list name="results">
+				<column label="Nom" name="name"/>
+				<column label="Membres" name="members"/>
+			</scroll_list>
+			<text name="result_text"/>
+		</panel>
+	</tab_container>
+	<panel left="310" name="Panel Avatar" width="470"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_display_name.xml b/indra/newview/skins/default/xui/fr/floater_display_name.xml
index 9dffcb891..21ed84851 100644
--- a/indra/newview/skins/default/xui/fr/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/fr/floater_display_name.xml
@@ -1,29 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" enabled="true" height="220"
-     mouse_opaque="true" name="Display Name" title="CHANGE DISPLAY NAME" width="400">
-
-    <text length="1" bottom_delta="-50" font="SansSerif" height="25" left="20" text_color="AlertTextColor" name="lockout_text" visible="true" width="360"
-       wrap="true">
-      Prochain changement possible: [TIME].
-    </text>
-    
-    <text left="20" bottom_delta="-20" width="360" height="18" font="SansSerif" name="set_name_label">
-      Nouveau Display Name:
-    </text>
-    <line_editor max_length="31" name="display_name_editor" width="300" height="20" left="50" bottom_delta="-20" />
-    <text left="20" bottom_delta="-25" width="360" height="18" font="SansSerif" name="name_confirm_label">
-      Ecrivez le Display Name a nouveau pour confirmer:
-    </text>
-    <line_editor max_length="31" width="300" name="display_name_confirm" height="20" bottom_delta="-20" left="50" />
-    <button height="20" bottom_delta="-28" label="Sauver" font="SansSerif" left="20" name="save_btn" tool_tip="Save your new Display Name" width="113" />
-    <button height="20" bottom_delta="0" label="Recommencer" font="SansSerif" left_delta="123" name="reset_btn" tool_tip="Make Display Name the same as Username" width="113" />
-    <button height="20" bottom_delta="0" label="Annuler" font="SansSerif" left_delta="123" name="cancel_btn" tool_tip="Cancel and close this Dialog" width="113" />
-    <text left="20" bottom_delta="-25" width="360" height="18" font="SansSerif" name="name_confirm_label">
-      Le nom que vous ajoutez a votre avatar est le Display Name.
-    </text>
-     <text left="20" bottom_delta="-18" width="360" height="18" font="SansSerif" name="name_confirm_label">
-      Ecrivez le Display Name a nouveau pour confirmer.
-    </text>
+<floater name="Display Name" title="Display Name">
+	<text name="lockout_text">
+		Prochain changement possible: [TIME].
+	</text>
+	<text name="set_name_label">
+		Nouveau Display Name:
+	</text>
+	<line_editor name="display_name_editor"/>
+	<text name="name_confirm_label">
+		R&#xE9;&#xE9;crire le Display Name pour confirmer:
+	</text>
+	<line_editor name="display_name_confirm"/>
+	<button label="Sauver" name="save_btn" tool_tip=""/>
+	<button label="Effacer" name="reset_btn" tool_tip="Efface le Display Name en cours"/>
+	<button label="Annuler" name="cancel_btn" tool_tip="Annule et ferme la fen&#xEA;tre"/>
+	<text name="name_confirm_label2">
+		Le Display Name est le nom ajout&#xE9; &#xE0; l&#x27;avatar.
+	</text>
+	<text name="name_confirm_label3">
+		Vous pouvez le changer une fois par semaine.
+	</text>
 </floater>
     
diff --git a/indra/newview/skins/default/xui/fr/floater_env_settings.xml b/indra/newview/skins/default/xui/fr/floater_env_settings.xml
index 1d14142dd..d4900ba37 100644
--- a/indra/newview/skins/default/xui/fr/floater_env_settings.xml
+++ b/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="Éditeur d&apos;environnement">
-	<text bottom="-45" name="EnvTimeText">
-		Heure de la
-journée
-	</text>
-	<text bottom_delta="-36" name="EnvTimeText2">
-		Midi
-	</text>
-	<text name="EnvCloudText">
-		Couverture
-nuageuse
-	</text>
-	<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"/>
-	<text name="EnvWaterFogText">
-		Brouillard
-dans l&apos;eau
-	</text>
-	<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>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Environment Editor Floater" title="Editeur d'environnement">
+	<text bottom="-45" name="EnvTimeText">
+		Heure de la
+journée
+	</text>
+	<text bottom_delta="-36" name="EnvTimeText2">
+		Midi
+	</text>
+	<text name="EnvCloudText">
+		Couverture
+nuageuse
+	</text>
+	<text bottom="-45" name="EnvWaterColorText">
+		Couleur de
+l'eau
+	</text>
+	<color_swatch name="EnvWaterColor" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs"/>
+	<text name="EnvWaterFogText">
+		Brouillard
+dans l'eau
+	</text>
+	<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/indra/newview/skins/default/xui/fr/floater_font_test.xml b/indra/newview/skins/default/xui/fr/floater_font_test.xml
index 11eb11a0d..e736528b3 100644
--- a/indra/newview/skins/default/xui/fr/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/fr/floater_font_test.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="contents" title="Test de la police">
-	<text name="linea">
-		OverrideTest, Times-BOLD doit être sélectionné ici. (De default/xui/fr)
-	</text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="contents" title="Test de la police">
+	<text name="linea">
+		OverrideTest, Times-BOLD doit être sélectionné ici : (De default/xui/fr)
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_gesture.xml b/indra/newview/skins/default/xui/fr/floater_gesture.xml
index 494508200..81e729631 100644
--- a/indra/newview/skins/default/xui/fr/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_gesture.xml
@@ -1,18 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="gestures" title="Gestures utilisées">
-	<text name="help_label">
-		Double-cliquez sur une gesture pour jouer les animations
-et les sons.
-	</text>
-	<scroll_list bottom_delta="-385" height="360" name="gesture_list">
-		<column label="Déclencheur" name="trigger" width="85" />
-		<column label="Touche" name="shortcut" />
-		<column label="" name="key" />
-		<column label="Nom" name="name" width="145"/>
-	</scroll_list>
-	<button label="Nouveau" name="new_gesture_btn" />
-	<button label="Inventaire" name="inventory_btn" />
-	<button label="Modifier" name="edit_btn" />
-	<button label="Jouer" name="play_btn" />
-	<button label="Stop" name="stop_btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="gestures" title="Gestures utilisées">
+	<text name="help_label">
+		Double-cliquer sur une gesture pour jouer les animations
+et les sons.
+	</text>
+	<scroll_list bottom_delta="-385" height="360" name="gesture_list">
+		<column label="Déclencheur" name="trigger" width="85"/>
+		<column label="Touche" name="shortcut"/>
+		<column label="Nom" name="name" width="145"/>
+	</scroll_list>
+	<button label="Nouveau" name="new_gesture_btn"/>
+	<!--
+	<button label="Inventaire" name="inventory_btn"/>
+	-->
+	<button label="Modifier" name="edit_btn"/>
+	<button label="Jouer" name="play_btn"/>
+	<button label="Stop" name="stop_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_god_tools.xml b/indra/newview/skins/default/xui/fr/floater_god_tools.xml
index 81b69eb11..8eef9fcf0 100644
--- a/indra/newview/skins/default/xui/fr/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_god_tools.xml
@@ -1,111 +1,111 @@
-<?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="É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:" width="70">
-				Nom du sim :
-			</text>
-			<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="Interdire 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"/>
-			<text name="Grid Pos: ">
-				Position sur la grille :
-			</text>
-			<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>
-			<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>
-			<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."  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:" width="70">
-				Nom du sim :
-			</text>
-			<text name="region name" left_delta="75">
-				Welsh
-			</text>
-			<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 la &#10;physique" name="disable physics" tool_tip="Cochez pour désactiver tous les effets liés à la physique 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 copiables 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 copiables 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 copiables seront renvoyés."/>
-			<button width="300" label="Afficher les collisions les plus consommatrices" label_selected="Afficher les collisions les plus consommatrices" name="Get Top Colliders" tool_tip="Dresse une liste des objets avec les callbacks les plus fréquents. "/>
-			<button width="300" label="Afficher les objets scriptés les plus consommateurs" label_selected="Afficher les objets scriptés les plus consommateurs" 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:">
-				Destination :
-			</text>
-			<combo_box name="destination">
-				<combo_item name="Selection">
-					Sélection
-				</combo_item>
-				<combo_item name="AgentRegion">
-					Région de l&apos;avatar
-				</combo_item>
-			</combo_box>
-			<text name="Request:">
-				Requête :
-			</text>
-			<combo_box name="request">
-				<combo_item name="colliders&lt;steps&gt;">
-					Objets responsables de collisions : étapes
-				</combo_item>
-				<combo_item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;">
-					Nombre de scripts et schéma optionnel
-				</combo_item>
-				<combo_item name="objects&lt;pattern&gt;">
-					Schéma des objets
-				</combo_item>
-				<combo_item name="rez&lt;asset_id&gt;">
-					rezzer &lt;asset_id&gt;
-				</combo_item>
-			</combo_box>
-			<text name="Parameter:">
-				Paramètre :
-			</text>
-			<button label="Effectuer la requête" label_selected="Effectuer la requête" name="Make Request" width="140"/>
-		</panel>
-	</tab_container>
-</floater>
+<?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="Éjecter tout le monde" label_selected="Éjecter tout le monde" 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:" width="70">
+				Nom du sim :
+			</text>
+			<line_editor left="85" name="region name" width="198" />
+			<check_box label="Initiation" name="check prelude" tool_tip="DéfiniT cette région comme zone d&apos;initiation."/>
+			<check_box label="Soleil fixe" name="check fixed sun" tool_tip="DéfiniT 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="Rend la région visible aux non-admins."  bottom_delta="-32"/>
+			<check_box label="Dégâts" name="check damage" tool_tip="Active les dégâts dans cette région."/>
+			<check_box label="Bloquer le suivi de trafic" name="block dwell" tool_tip="Ne comptabilise pas le trafic."/>
+			<check_box label="Interdire le terraformage" name="block terraform" tool_tip="Empêche les personnes de terraformer leur terrain"/>
+			<check_box label="Bac à sable" name="is sandbox" tool_tip="Bascule cette région en bac à sable."/>
+			<button label="Figer le terrain" label_selected="Figer le terrain" name="Bake Terrain" tool_tip="Enregistre 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="Remplace 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="Échange 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"/>
+			<text name="Grid Pos: ">
+				Position sur la grille :
+			</text>
+			<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>
+			<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>
+			<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="rafraîchit les informations ci-dessus."/>
+			<button label="Appliquer" label_selected="Appliquer" name="Apply" tool_tip="Applique 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électionne 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:" width="70">
+				Nom du sim :
+			</text>
+			<text name="region name" left_delta="75">
+				Welsh
+			</text>
+			<check_box label="Désactiver les &#10;scripts" name="disable scripts" tool_tip="Désactive tous les scripts dans cette région"/>
+			<check_box label="Désactiver les &#10;collisions" name="disable collisions" tool_tip="Désactive les collisions entre non-avatars dans cette région"/>
+			<check_box label="Désactiver la &#10;physique" name="disable physics" tool_tip="Désactive tous les effets liés à la physique dans cette région"/>
+			<button label="Appliquer" label_selected="Appliquer" name="Apply" tool_tip="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éfinit 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="Supprime 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 copiables seront renvoyés."/>
+			<button label="Supprimer les objets scriptés de la cible sur *tous* les terrains" label_selected="Supprime 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 copiables seront renvoyés."/>
+			<button label="Supprimer *tous* les objets de la cible" label_selected="Supprime *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 copiables seront renvoyés."/>
+			<button width="300" label="Afficher les collisions les plus consommatrices" label_selected="Affiche les collisions les plus consommatrices" name="Get Top Colliders" tool_tip="Dresse une liste des objets avec les callbacks les plus fréquents. "/>
+			<button width="300" label="Afficher les objets scriptés les plus consommateurs" label_selected="Affiche les objets scriptés les plus consommateurs" 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:">
+				Destination :
+			</text>
+			<combo_box name="destination">
+				<combo_item name="Selection">
+					Sélection
+				</combo_item>
+				<combo_item name="AgentRegion">
+					Région de l&apos;avatar
+				</combo_item>
+			</combo_box>
+			<text name="Request:">
+				Requête :
+			</text>
+			<combo_box name="request">
+				<combo_item name="colliders&lt;steps&gt;">
+					Objets responsables de collisions : étapes
+				</combo_item>
+				<combo_item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;">
+					Nombre de scripts et schéma optionnel
+				</combo_item>
+				<combo_item name="objects&lt;pattern&gt;">
+					Schéma des objets
+				</combo_item>
+				<combo_item name="rez&lt;asset_id&gt;">
+					rezzer &lt;asset_id&gt;
+				</combo_item>
+			</combo_box>
+			<text name="Parameter:">
+				Paramètres :
+			</text>
+			<button label="Effectuer la requête" label_selected="Effectuer la requête" name="Make Request" width="140"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_group_info.xml b/indra/newview/skins/default/xui/fr/floater_group_info.xml
index 9058299ef..ce7e0c8ba 100644
--- a/indra/newview/skins/default/xui/fr/floater_group_info.xml
+++ b/indra/newview/skins/default/xui/fr/floater_group_info.xml
@@ -1,261 +1,261 @@
-<?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">
-				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 logo et de voter.
-			</text>
-			<text name="txt3">
-				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$.
-			</text>
-			<text name="lbl">
-				Nom :
-			</text>
-			<text name="founder_label">
-				Fondateur :
-			</text>
-			<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="Mature" name="mature" tool_tip="Les informations de votre profil sont considérées comme « mature »."/>
-		</panel>
-		<panel label="Titres" name="tit">
-			<text name="txt">
-				Titres de groupe
-			</text>
-			<text name="txt2">
-				Les groupes peuvent avoir des officiers et des membres avec des titres particuliers.
-			</text>
-			<text name="txt3">
-				Ces titres apparaissent devant leur nom dans le Monde, les chats et les IM.
-			</text>
-			<text name="lbl">
-				Titre de l&apos;officier :
-			</text>
-			<text name="lbl2">
-				Titre du membre :
-			</text>
-			<text name="lbl3">
-				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"/>
-		</panel>
-		<panel label="Membres" name="mem">
-			<text name="txt">
-				Membres du groupe
-			</text>
-			<text name="txt2">
-				Officiers et membres du groupe actuel.
-			</text>
-			<text name="txt3">
-				Cliquez sur le nom d&apos;un membre pour voir son profil.
-			</text>
-			<text name="lbl">
-				Officiers :
-			</text>
-			<text name="members_label">
-				Membres :
-			</text>
-			<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
-					</text>
-					<text name="instructions">
-						Pour commencer une nouvelle élection, cliquez sur Lancer l&apos;élection.  
-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"/>
-					<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."/>
-					<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_item name="radio">
-							Majorité simple
-						</radio_item>
-						<radio_item name="radio2">
-							Majorité des 2/3
-						</radio_item>
-						<radio_item name="radio3">
-							Unanimité
-						</radio_item>
-					</radio_group>
-					<text name="duration_lbl">
-						Durée :
-					</text>
-					<spinner name="duration" tool_tip="Durée de l&apos;élection (en nombre de jours)."/>
-					<text name="duration_days">
-						jours
-					</text>
-					<text name="start_lbl">
-						Début de l&apos;élection :
-					</text>
-					<text name="end_lbl">
-						Fin de l&apos;élection :
-					</text>
-				</panel>
-				<panel label="Proposition" name="panel_group_proposals">
-					<text name="txt">
-						Propositions du groupe
-					</text>
-					<text name="instructions">
-						Il n&apos;y a aucune proposition active. Cliquez sur Créer une proposition pour créer une nouvelle proposition.
-					</text>
-					<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"/>
-					<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."/>
-					<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_item name="radio">
-							Majorité simple
-						</radio_item>
-						<radio_item name="radio2">
-							Majorité des 2/3
-						</radio_item>
-						<radio_item name="radio3">
-							Unanimité
-						</radio_item>
-					</radio_group>
-					<text name="duration_lbl">
-						Durée :
-					</text>
-					<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 :
-					</text>
-					<text name="end_lbl">
-						Fin :
-					</text>
-				</panel>
-				<panel label="Historique" name="History">
-					<text name="txt">
-						Historique des votes
-					</text>
-					<text name="instructions">
-						Vous pouvez afficher les anciens résultats en sélectionnant le vote et
-					</text>
-					<text name="instructions2">
-						en cliquant sur Afficher l&apos;objet.
-					</text>
-					<text name="history_list_lbl">
-						Anciens votes :
-					</text>
-					<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"/>
-				</panel>
-			</tab_container>
-		</panel>
-		<panel label="Invitation" name="inv">
-			<text name="txt">
-				Invitations
-			</text>
-			<text name="txt2">
-				Les invitations sont envoyées par messagerie instantanée.
-			</text>
-			<text name="txt3">
-				Pour ajouter des résidents, cliquez sur Ajouter.
-			</text>
-			<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"/>
-			<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"/>
-			<text name="lbl3">
-				Frais d&apos;inscription :
-			</text>
-			<check_box label="Inscription libre (sans invitation)" name="open"/>
-		</panel>
-		<panel label="Terrain" name="land">
-			<text name="txt">
-				Terrain du groupe
-			</text>
-			<text name="lbl">
-				Total des contributions :
-			</text>
-			<button label="Carte..." label_selected="Carte..." name="map_btn"/>
-			<text name="lbl2">
-				Superficie déjà utilisée :
-			</text>
-			<text name="lbl3">
-				Superficie disponible :
-			</text>
-			<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.
-			</text>
-		</panel>
-		<panel label="Argent" name="mon">
-			<tab_container name="group money history tab">
-				<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"/>
-				</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"/>
-				</panel>
-			</tab_container>
-		</panel>
-	</tab_container>
-	<button label="OK" label_selected="OK" name="OK"/>
-	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
-</floater>
+<?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">
+				Profil du groupe
+			</text>
+			<text name="txt">
+				Les groupes sont un moyen divertissant de collaborer avec vos ami(e)s.
+			</text>
+			<text name="txt2">
+				Les groupes vous permettent d&apos;avoir un titre, un logo et voter.
+			</text>
+			<text name="txt3">
+				Tout le monde peut créer un groupe. Chaque résident peut appartenir jusqu&apos;à 42 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$.
+			</text>
+			<text name="lbl">
+				Nom :
+			</text>
+			<text name="founder_label">
+				Fondateur :
+			</text>
+			<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="Publie votre profil sur le web."/>
+			<button label="?" label_selected="?" name="publish_help_btn"/>
+			<check_box label="Mature" name="mature" tool_tip="Les informations de votre profil sont considérées comme « mature »."/>
+		</panel>
+		<panel label="Titres" name="tit">
+			<text name="txt">
+				Titres de groupe
+			</text>
+			<text name="txt2">
+				Les groupes peuvent avoir des officiers et des membres avec des titres particuliers.
+			</text>
+			<text name="txt3">
+				Ces titres apparaissent devant le nom dans le Monde.
+			</text>
+			<text name="lbl">
+				Titre de l&apos;officier :
+			</text>
+			<text name="lbl2">
+				Titre du membre :
+			</text>
+			<text name="lbl3">
+				Pour créer le logo du groupe, faire glisser une texture depuis l&apos;inventaire.
+			</text>
+			<texture_picker name="insig" tool_tip="Cliquez pour sélectionner une image"/>
+		</panel>
+		<panel label="Membres" name="mem">
+			<text name="txt">
+				Membres du groupe
+			</text>
+			<text name="txt2">
+				Officiers et membres du groupe actuel.
+			</text>
+			<text name="txt3">
+				Cliquer sur le nom d&apos;un membre pour voir son profil.
+			</text>
+			<text name="lbl">
+				Officiers :
+			</text>
+			<text name="members_label">
+				Membres :
+			</text>
+			<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">
+						Elections
+					</text>
+					<text name="instructions">
+						Pour commencer une nouvelle élection, cliquer sur Lancer l&apos;élection.  
+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"/>
+					<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."/>
+					<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_item name="radio">
+							Majorité simple
+						</radio_item>
+						<radio_item name="radio2">
+							Majorité des 2/3
+						</radio_item>
+						<radio_item name="radio3">
+							Unanimité
+						</radio_item>
+					</radio_group>
+					<text name="duration_lbl">
+						Durée :
+					</text>
+					<spinner name="duration" tool_tip="Durée de l&apos;élection (en nombre de jours)."/>
+					<text name="duration_days">
+						jours
+					</text>
+					<text name="start_lbl">
+						Début de l&apos;élection :
+					</text>
+					<text name="end_lbl">
+						Fin de l&apos;élection :
+					</text>
+				</panel>
+				<panel label="Proposition" name="panel_group_proposals">
+					<text name="txt">
+						Propositions du groupe
+					</text>
+					<text name="instructions">
+						Il n&apos;y a aucune proposition active. Cliquez sur Créer une proposition pour créer une nouvelle proposition.
+					</text>
+					<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"/>
+					<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."/>
+					<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_item name="radio">
+							Majorité simple
+						</radio_item>
+						<radio_item name="radio2">
+							Majorité des 2/3
+						</radio_item>
+						<radio_item name="radio3">
+							Unanimité
+						</radio_item>
+					</radio_group>
+					<text name="duration_lbl">
+						Durée :
+					</text>
+					<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 :
+					</text>
+					<text name="end_lbl">
+						Fin :
+					</text>
+				</panel>
+				<panel label="Historique" name="History">
+					<text name="txt">
+						Historique des votes
+					</text>
+					<text name="instructions">
+						Afficher les anciens résultats en sélectionnant le vote et
+					</text>
+					<text name="instructions2">
+						en cliquant sur Afficher l&apos;objet.
+					</text>
+					<text name="history_list_lbl">
+						Anciens votes :
+					</text>
+					<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"/>
+				</panel>
+			</tab_container>
+		</panel>
+		<panel label="Invitation" name="inv">
+			<text name="txt">
+				Invitations
+			</text>
+			<text name="txt2">
+				Les invitations sont envoyées par messagerie instantanée.
+			</text>
+			<text name="txt3">
+				Pour ajouter des résidents, cliquez sur Ajouter.
+			</text>
+			<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"/>
+			<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"/>
+			<text name="lbl3">
+				Frais d&apos;inscription :
+			</text>
+			<check_box label="Inscription libre (sans invitation)" name="open"/>
+		</panel>
+		<panel label="Terrain" name="land">
+			<text name="txt">
+				Terrain du groupe :
+			</text>
+			<text name="lbl">
+				Total des contributions :
+			</text>
+			<button label="Carte" label_selected="Carte" name="map_btn"/>
+			<text name="lbl2">
+				Superficie déjà utilisée :
+			</text>
+			<text name="lbl3">
+				Superficie disponible :
+			</text>
+			<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.
+			</text>
+		</panel>
+		<panel label="Argent" name="mon">
+			<tab_container name="group money history tab">
+				<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"/>
+				</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"/>
+				</panel>
+			</tab_container>
+		</panel>
+	</tab_container>
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
index 4a251bce3..a12d80826 100644
--- a/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_hardware_settings.xml
@@ -1,109 +1,46 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-400" can_close="true" can_drag_on_left="false" 
-	can_minimize="true" can_resize="false" height="244"
-	left="50" min_height="244" min_width="500" mouse_opaque="true" 
-	name="Hardware Settings Floater" title="Hardware Settings" width="500">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-42" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-	     left="10" mouse_opaque="true" name="Filtering:" v_pad="0" width="128">
-		Filtre:
-	</text>
-	<check_box bottom="-46" control_name="RenderAnisotropic" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Filtre anisotrope (plus lent si activé)" left="148"
-	     mouse_opaque="true" name="ani" radio_style="false" width="256" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		bottom="-61" drop_shadow_visible="true" enabled="true" follows="left|top"
-		font="SansSerifSmall" h_pad="0" halign="left" height="12"
-		left="10" mouse_opaque="true" name="Antialiasing:" v_pad="0" width="128">
-    Antialiasing:
-  </text>
-  <combo_box bottom="-65" control_name="RenderFSAASamples" enabled="true" follows="left|top"
-		font="SansSerifSmall" height="16" initial_value="false"
-		label="Antialiasing" left="148"
-		mouse_opaque="true" name="fsaa" width="64">
-    <combo_item name="FSAADisabled" value="0">
-      Désactivé
-    </combo_item>
-    <combo_item name="2x" value="2">
-      2x
-    </combo_item>
-    <combo_item name="4x" value="4">
-      4x
-    </combo_item>
-    <combo_item name="8x" value="8">
-      8x
-    </combo_item>
-    <combo_item name="16x" value="16">
-      16x
-    </combo_item>
-  </combo_box>
-	<spinner bottom_delta="-21" control_name="RenderGamma" decimal_digits="2" enabled="true"
-	     follows="left|top" height="16" increment="0.01"
-	     initial_val="1" label="Gamma:" label_width="138" left="10" max_val="2"
-	     min_val="0.0" mouse_opaque="true" name="gamma" width="202" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		bottom_delta="2" drop_shadow_visible="true" enabled="true" follows="left|top"
-		font="SansSerifSmall" h_pad="0" halign="left" height="12"
-		left="222" mouse_opaque="true" name="(brightness, lower is brighter)"
-		v_pad="0" width="315">
-		(0 = défaut, valeur faible = plus lumineux)
-	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-		font="SansSerifSmall" h_pad="0" halign="left" height="12"
-		left="10" mouse_opaque="true" name="Enable VBO:" v_pad="0"
-		width="128">
-		Activer le VBO:
-	</text>
-	<check_box bottom_delta="-5" control_name="RenderVBOEnable" enabled="true" follows="left|top"
-		font="SansSerifSmall" height="16" initial_value="true"
-		label="Activer OpenGL Vertex Buffer Objects" left="148"
-		mouse_opaque="true" name="vbo" radio_style="false"
-            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."
-		width="315" />
-	<check_box bottom_delta="-18" control_name="ShyotlRenderUseStreamVBO" enabled="true" follows="left|top"
-		font="SansSerifSmall" height="16" initial_value="false"
-		label="Activer Streamed VBOs" left="157"
-		mouse_opaque="true" name="vbo_stream" radio_style="false"
-		tool_tip="Disabling this may improve performance when VBOs are enabled. Disabling produced observable improvement on various AMD GPUs."
-		width="315" />
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-  bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-  font="SansSerifSmall" h_pad="0" halign="left" height="12"
-  left="10" mouse_opaque="true" name="Enable FBO:" v_pad="0"
-  width="140">
-    Activer Framebuffer Objects:
-  </text>
-  <check_box bottom_delta="-5" control_name="RenderUseFBO" enabled="false" follows="left|top"
-		font="SansSerifSmall" height="16" initial_value="true"
-		label="Activer OpenGL Frame Buffer Objects" left="148"
-		mouse_opaque="true" name="fbo" radio_style="false"
-		tool_tip="Enabling this on modern hardware can provide a performance gain. However, enabling this when combined with antialiasing on AMD GPUs may cause edge artifacts. This setting is required for deferred rendering."
-		width="315" />
-	<slider bottom_delta="-21" can_edit_text="false" control_name="TextureMemory" 
-		decimal_digits="0" enabled="true"
-		follows="left|top" height="16" increment="16"
-            initial_val="32" label="Texture Memory (MB):" label_width="135" left="10"
-		max_val="4096" min_val="0" mouse_opaque="true" name="GrapicsCardTextureMemory"
-		tool_tip="Amount of memory to allocate for textures. Defaults to Video Card Memory. Reducing this may improve performance but may also make textures blurry."
-		width="300" />
-
-	<spinner bottom_delta="-24" control_name="RenderFogRatio" decimal_digits="1" enabled="true"
-	     follows="left|top" height="16" increment="0.1"
-	     initial_val="4" label="Coefficient de Brouillard:" label_width="138" left="10"
-	     max_val="10" min_val="0.5" mouse_opaque="true" name="fog" width="202" />
-
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		bottom_delta="-50" drop_shadow_visible="true" enabled="true" follows="left|top"
-		font="SansSerifSmall" h_pad="0" halign="left" height="40"
-		left="10" mouse_opaque="true" name="note" v_pad="0"
-		width="480">
-		Note: le Gamma et le brouillard, sont inactifs quand les Effets atmosphériques le sont.
-	</text>
-
-	<button bottom="10" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" label="OK" label_selected="OK"
-	     left="-110" mouse_opaque="true" name="OK" scale_image="true" width="90" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Hardware Settings Floater" title="Hardware Settings">
+	<text name="Filtering:">
+		Filtre:
+	</text>
+	<check_box label="Filtre anisotrope (plus lent si activé)" name="ani"/>
+	<text name="Antialiasing:">
+		Antialiasing:
+	</text>
+	<combo_box label="Antialiasing" name="fsaa">
+		<combo_item name="FSAADisabled" value="0">
+			Désactivé
+		</combo_item>
+		<combo_item name="2x" value="2">
+			2x
+		</combo_item>
+		<combo_item name="4x" value="4">
+			4x
+		</combo_item>
+		<combo_item name="8x" value="8">
+			8x
+		</combo_item>
+		<combo_item name="16x" value="16">
+			16x
+		</combo_item>
+	</combo_box>
+	<spinner label="Gamma:" name="gamma"/>
+	<text 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'ils sont activés."/>
+	<check_box label="Activer Streamed VBOs" left="157" name="vbo_stream" tool_tip="Désactivé, la performance peut être ameliorée si les VBO sont activés. Désactivé, on observe une meilleure performance pour certains processeurs AMD."/>
+	<text name="Enable FBO:">
+		Activer m&#xE9;moire tampon:
+	</text>
+	<check_box label="Activer m&#xE9;moire tampon de la trame" name="fbo" tool_tip="Cette activation, avec du matériel moderne, peut offrir un gain de performance. Cependant, lorsqu'elle est combiné avec l'antialiasing sur les processeurs AMD GPU peut provoquer des artefacts sur les bords. Ce paramètre est requis pour le rendu différé."/>
+	<slider label="M&#xE9;moire graphique (MB):" name="GrapicsCardTextureMemory" tool_tip="Taille de la m&#xE9;moire allou&#xE9;e aux textures. Par d&#xE9;faut, c&#x27;est celle de la carte graphique.	La réduire peut am&#xE9;liorer les performances mais peut aussi rendre les textures floues."/>
+	<spinner label="Coefficient de Brouillard:" name="fog"/>
+	<text name="note">
+		Note: Le Gamma et le brouillard, sont inactifs quand les effets atmosphériques le sont également.
+	</text>
+	<button label="OK" label_selected="OK" name="OK"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_html.xml b/indra/newview/skins/default/xui/fr/floater_html.xml
index 0783ac417..cf8cb0c26 100644
--- a/indra/newview/skins/default/xui/fr/floater_html.xml
+++ b/indra/newview/skins/default/xui/fr/floater_html.xml
@@ -1,16 +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://wiki.secondlife.com/wiki/Knowledge_Base/fr
-	</string>
-</floater>
+<?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://wiki.secondlife.com/wiki/Knowledge_Base/fr
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_hud.xml b/indra/newview/skins/default/xui/fr/floater_hud.xml
index 55c8b57ae..a8ce59f23 100644
--- a/indra/newview/skins/default/xui/fr/floater_hud.xml
+++ b/indra/newview/skins/default/xui/fr/floater_hud.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_hud" title="Didacticiel" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_hud" title="Didacticiel" />
diff --git a/indra/newview/skins/default/xui/fr/floater_im.xml b/indra/newview/skins/default/xui/fr/floater_im.xml
index 9a9de10e5..04fe584e7 100644
--- a/indra/newview/skins/default/xui/fr/floater_im.xml
+++ b/indra/newview/skins/default/xui/fr/floater_im.xml
@@ -1,43 +1,45 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater name="im_floater" title="Message instantané">
-	<text name="only_user_message">
-		Vous êtes le seul participant à cette session. ce qui est idiot
-	</text>
-      <string name="offline_message">[NAME] is offline.</string>
-	<string name="invite_message">
-		Pour accepter ce chat vocal/vous connecter, cliquez sur le bouton [BUTTON NAME].
-	</string>
-	<string name="muted_message">
-		Vous ignorez ce résident (mute). Si vous lui envoyez un message, il ne sera plus ignoré.
-	</string>
-	<string name="generic_request_error">
-		Erreur lors de la requête, veuillez réessayer ultérieurement.
-	</string>
-	<string name="insufficient_perms_error">
-		Vous n&apos;avez pas les droits requis tant pis pour vous.
-	</string>
-	<string name="session_does_not_exist_error">
-		La session a expiré
-	</string>
-	<string name="no_ability_error">
-		Vous n&apos;avez pas ce pouvoir.
-	</string>
-	<string name="not_a_mod_error">
-		Vous n&apos;êtes pas modérateur de session.
-	</string>
-	<string name="muted_error">
-		Un modérateur de groupe a désactivé votre chat écrit.
-	</string>
-	<string name="add_session_event">
-		Impossible d&apos;ajouter des participants à la session de chat avec [RECIPIENT].
-	</string>
-	<string name="message_session_event">
-		Impossible d&apos;envoyer votre message à la session de chat avec [RECIPIENT].
-	</string>
-	<string name="removed_from_group">
-		Vous avez été supprimé du groupe.
-	</string>
-	<string name="close_on_no_ability">
-		Vous ne pouvez plus participer à la session de chat.
-	</string>
-</multi_floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<multi_floater name="im_floater" title="Message instantané">
+	<string name="only_user_message">
+		Vous êtes le (la) seul(e) participant à cette session, zut alors!
+	</string>
+	<string name="offline_message">
+		[NAME] is offline
+	</string>
+	<string name="invite_message">
+		Pour accepter ce chat vocal/vous connecter, cliquez sur le bouton [BUTTON NAME].
+	</string>
+	<string name="muted_message">
+		Vous ignorez ce résident (mute). Si vous lui envoyez un message, il ne sera plus ignoré.
+	</string>
+	<string name="generic_request_error">
+		Erreur lors de la requête, veuillez réessayer ultérieurement.
+	</string>
+	<string name="insufficient_perms_error">
+		Vous n'avez pas les droits requis.
+	</string>
+	<string name="session_does_not_exist_error">
+		La session a expiré
+	</string>
+	<string name="no_ability_error">
+		Vous n'avez pas ce pouvoir.
+	</string>
+	<string name="not_a_mod_error">
+		Vous n'êtes pas modérateur(trice) de cette session.
+	</string>
+	<string name="muted_error">
+		Un modérateur de groupe a désactivé votre chat écrit.
+	</string>
+	<string name="add_session_event">
+		Impossible d'ajouter des participants à la session de chat avec [RECIPIENT].
+	</string>
+	<string name="message_session_event">
+		Impossible d'envoyer votre message à la session de chat avec [RECIPIENT].
+	</string>
+	<string name="removed_from_group">
+		Vous avez été supprimé(e) du groupe.
+	</string>
+	<string name="close_on_no_ability">
+		Vous ne pouvez plus participer à la session de chat.
+	</string>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_image_preview.xml b/indra/newview/skins/default/xui/fr/floater_image_preview.xml
index 679bfd66e..7ed5785bb 100644
--- a/indra/newview/skins/default/xui/fr/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_image_preview.xml
@@ -1,69 +1,55 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="440" min_height="140" min_width="300"
-     name="Image Preview" title="" width="300">
-	<text bottom_delta="-40" follows="top|left" height="15" left="10" name="name_label">
-		Nom:
-	</text>
-	<line_editor bottom_delta="-24" follows="top|left|right" height="19" max_length="254"
-	     name="name_form" width="280" />
-	<text bottom_delta="-20" follows="top|left" height="15" name="description_label">
-		Description:
-	</text>
-	<line_editor bottom_delta="-24" follows="top|left|right" height="19" max_length="254"
-	     name="description_form" width="280" spell_check="true" />
-	<text bottom_delta="-20" follows="top|left" height="15" name="preview_label">
-		Prévisualiser comme:
-	</text>
-	<combo_box bottom_delta="-6" follows="left|top" height="18" label="Habits"
-	     left="120" name="clothing_type_combo" width="160">
-		<combo_item name="Image">
-			Image
-		</combo_item>
-		<combo_item name="Hair">
-			Cheveux
-		</combo_item>
-		<combo_item name="FemaleHead">
-			Tête de femme
-		</combo_item>
-		<combo_item name="FemaleUpperBody">
-			Corps de femme (haut)
-		</combo_item>
-		<combo_item name="FemaleLowerBody">
-			Corps de femme (bas)
-		</combo_item>
-		<combo_item name="MaleHead">
-			Tête d&apos;homme
-		</combo_item>
-		<combo_item name="MaleUpperBody">
-			Corps d&apos;homme (haut)
-		</combo_item>
-		<combo_item name="MaleLowerBody">
-			Corps d&apos;homme (bas)
-		</combo_item>
-		<combo_item name="Skirt">
-			Jupe
-		</combo_item>
-		<combo_item name="SculptedPrim">
-			Sculptie
-		</combo_item>
-	</combo_box>
-
-	<text bottom="250" follows="top|left" left="10" name="bad_image_text">
-		Impossible de lire l&apos;image.
-
-Sauvegardez en Targa 24 bit (.tga).
-	</text>
-	<check_box bottom="37" control_name="LosslessJ2CUpload" enabled="false"
-	     follows="bottom|left" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Compression sans perte" left="10"
-	     left_delta="2" name="lossless_check" width="280" />
-	<check_box bottom="37" control_name="TemporaryUpload" enabled="true"
-             follows="bottom|left" font="SansSerifSmall" height="16"
-             initial_value="false" label="Temporaire (Gratuit)"
-             left_delta="155" name="temp_check" width="280" tooltip="chargement gratuit mais qui disparaitra a votre reconnection." />
-	<button bottom="10" follows="bottom|right" height="20" label="Annuler" left="165"
-	     name="cancel_btn" width="125" />
-	<button bottom="10" follows="bottom|left" height="20" label="Charger ([UPLOADFEE])"
-	     left="15" name="ok_btn" width="125" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Image Preview" title="">
+	<text name="name_label">
+		Nom:
+	</text>
+	<line_editor name="name_form"/>
+	<text name="description_label">
+		Description:
+	</text>
+	<line_editor name="description_form"/>
+	<text name="preview_label">
+		Prévisualiser comme:
+	</text>
+	<combo_box label="Habits" name="clothing_type_combo">
+		<combo_item name="Image">
+			Image
+		</combo_item>
+		<combo_item name="Hair">
+			Cheveux
+		</combo_item>
+		<combo_item name="FemaleHead">
+			Tête de femme
+		</combo_item>
+		<combo_item name="FemaleUpperBody">
+			Corps de femme (haut)
+		</combo_item>
+		<combo_item name="FemaleLowerBody">
+			Corps de femme (bas)
+		</combo_item>
+		<combo_item name="MaleHead">
+			Tête d'homme
+		</combo_item>
+		<combo_item name="MaleUpperBody">
+			Corps d'homme (haut)
+		</combo_item>
+		<combo_item name="MaleLowerBody">
+			Corps d'homme (bas)
+		</combo_item>
+		<combo_item name="Skirt">
+			Jupe
+		</combo_item>
+		<combo_item name="SculptedPrim">
+			Sculptie
+		</combo_item>
+	</combo_box>
+	<text name="bad_image_text">
+		Impossible de lire l'image.
+
+Sauvegarder en Targa 24 bits (.tga).
+	</text>
+	<check_box label="Compression sans perte" name="lossless_check"/>
+	<check_box label="Temporaire (Gratuit)" name="temp_check" tooltip="chargement gratuit mais qui disparaitra &#xE0; votre de&#xE9;connection."/>
+	<button label="Annuler" name="cancel_btn"/>
+	<button label="Charger ([UPLOADFEE])" name="ok_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_import.xml b/indra/newview/skins/default/xui/fr/floater_import.xml
index 4f106a6d6..3b4cdc03a 100644
--- a/indra/newview/skins/default/xui/fr/floater_import.xml
+++ b/indra/newview/skins/default/xui/fr/floater_import.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Import" title="">
-	<text name="name_label">
-		Nom :
-	</text>
-	<text name="description_label">
-		Description :
-	</text>
-	<text name="preview_label">
-		Fichiers à charger :
-	</text>
-	<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>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Import" title="">
+	<text name="name_label">
+		Nom :
+	</text>
+	<text name="description_label">
+		Description :
+	</text>
+	<text name="preview_label">
+		Fichiers à charger :
+	</text>
+	<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>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inspect.xml b/indra/newview/skins/default/xui/fr/floater_inspect.xml
index 480097eb4..b0f400baf 100644
--- a/indra/newview/skins/default/xui/fr/floater_inspect.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inspect.xml
@@ -1,14 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="inspect" title="Inspecter les objets">
-	<scroll_list name="object_list"
-	     tool_tip="Sélectionner un objet de la liste pour le mettre en surbrillance dans le Monde.">
-		<column label="Nom" name="object_name" />
-		<column label="Propriétaire" name="owner_name" />
-		<column label="Créateur" name="creator_name" />
-		<column label="Date de création" name="creation_date" />
-	</scroll_list>
-	<button label="Voir le profil du propriétaire" name="button owner" width="180"
-	     tool_tip="Voir le profil du propriétaire de l&apos;objet en surbrillance" />
-	<button label="Voir le profil du créateur" name="button creator" left="192" width="180"
-	     tool_tip="Voir le profil du créateur de l&apos;objet en surbrillance" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="inspect" title="Inspecter les objets">
+	<scroll_list name="object_list" tool_tip="Sélectionnez un objet de la liste pour le mettre en surbrillance dans le Monde.">
+		<column label="Nom" name="object_name"/>
+		<column label="Propriétaire" name="owner_name"/>
+		<column label="Créateur" name="creator_name"/>
+		<column label="Date de création" name="creation_date"/>
+	</scroll_list>
+	<button label="Voir le profil du propriétaire" name="button owner" width="180" tool_tip="Voir le profil du propriétaire de l'objet en surbrillance"/>
+	<button label="Voir le profil du créateur" name="button creator" left="192" width="180" tool_tip="Voir le profil du créateur de l'objet en surbrillance"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_instant_message.xml b/indra/newview/skins/default/xui/fr/floater_instant_message.xml
index 03d0bf4d6..69163403f 100644
--- a/indra/newview/skins/default/xui/fr/floater_instant_message.xml
+++ b/indra/newview/skins/default/xui/fr/floater_instant_message.xml
@@ -1,56 +1,53 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="(inconnue)" name="im_floater" title="(inconnue)">
-	<string name="ringing">
-		Appel en cours...
-	</string>
-	<string name="answering">
-		Connexion en cours...
-	</string>
-	<string name="connected">
-		Connecté(e), cliquez sur Stop pour terminer l&apos;appel
-	</string>
-	<string name="hang_up">
-		Appel terminé
-	</string>
-	<string name="inventory_item_offered">
-		Objet de l&apos;inventaire offert
-	</string>
-	<string name="voice_icon">
-		icn_voice-pvtfocus.tga
-	</string>
-	<string name="title_string">
-		Envoyer un message instantané à [NAME]
-	</string>
-	<string name="typing_start_string">
-		[NAME] est en train d&apos;écrire…
-	</string>
-	<string name="session_start_string">
-		Début de la session avec [NAME], veuillez patienter.
-	</string>
-	<string name="default_text_label">
-		Cliquez ici pour envoyer un message instantané.
-	</string>
-	<string name="unavailable_text_label">
-		Le chat écrit n&apos;est pas disponible pour cet appel.
-	</string>
-	<button bottom="-40" follows="left|top" height="20" label="Profil" left="5"
-	     name="profile_callee_btn" width="80" />
-	<button bottom="-40" follows="left|top" halign="center" height="20" label="Teleporter" left_delta="80"
-		 name="profile_tele_btn" width="80" />
-  <button bottom="-40" follows="left|top" halign="center" height="20" label="Historique" left_delta="80"
-          name="history_btn" visible="true" width="80" />
-	<button label="Profil" name="profile_callee_btn"/>
-	<button label="Appeler" name="start_call_btn"/>
-	<button bottom="-40" follows="top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="Stop" name="end_call_btn" visible="false" width="56"/>
-	<panel name="speaker_controls">
-		<button label="" 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"/>
-	<string 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/ 
-Si vous ne trouvez pas ce que vous cherchez, saisissez votre question et attendez quelques instants pour que quelqu&apos;un vous réponde. 
--=-=- Les temps de réponse varient, surtout pendant les périodes de pointe -=-=-
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="(inconnue)" name="im_floater" title="(inconnue)">
+	<string name="ringing">
+		Appel en cours...
+	</string>
+	<string name="answering">
+		Connexion en cours...
+	</string>
+	<string name="connected">
+		Connecté(e), cliquer sur Stop pour terminer l'appel
+	</string>
+	<string name="hang_up">
+		Appel terminé
+	</string>
+	<string name="inventory_item_offered">
+		Objet de l'inventaire offert
+	</string>
+	<string name="voice_icon">
+		icn_voice-pvtfocus.tga
+	</string>
+	<string name="title_string">
+		Envoyer un message instantané à [NAME]
+	</string>
+	<string name="typing_start_string">
+		[NAME] est en train d'écrire...
+	</string>
+	<string name="session_start_string">
+		Début de la session avec [NAME], veuillez patienter...
+	</string>
+	<string name="default_text_label">
+		Cliquer ici pour envoyer un message instantané
+	</string>
+	<string name="unavailable_text_label">
+		Le chat écrit n'est pas disponible pour cet appel
+	</string>
+	<button label="Profil" name="profile_callee_btn"/>
+	<button label="Téléporter" name="profile_tele_btn"/>
+	<button label="Historique" name="history_btn"/>
+	<button label="Profil" name="profile_callee_btn"/>
+	<button label="Appeler" name="start_call_btn"/>
+	<button label="Stop" name="end_call_btn"/>
+	<panel name="speaker_controls">
+		<button label="" name="mute_btn" tool_tip="Ignorez"/>
+	</panel>
+	<line_editor label="Cliquer ici pour envoyer un message instantané" name="chat_editor"/>
+	<button label="Envoyer" name="send_btn"/>
+	<string name="live_help_dialog">
+		*** Bienvenue sur la page Demande d'aide *** 
+Veuillez au préalable consulter les pages d'aide de Second Life en appuyant sur la touche F1, ou en accédant à la base de connaissances http://secondlife.com/knowledgebase/ 
+Si vous ne trouvez pas ce que vous cherchez, saisissez votre question et attendez quelques instants pour que quelqu'un vous réponde. 
+-=-=- Les temps de réponse varient, surtout pendant les périodes de pointe -=-=-
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_instant_message_ad_hoc.xml b/indra/newview/skins/default/xui/fr/floater_instant_message_ad_hoc.xml
index 38119fa3f..afae42d55 100644
--- a/indra/newview/skins/default/xui/fr/floater_instant_message_ad_hoc.xml
+++ b/indra/newview/skins/default/xui/fr/floater_instant_message_ad_hoc.xml
@@ -1,42 +1,42 @@
-<?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...
-	</string>
-	<string name="connected">
-		Connecté(e), cliquez sur Raccrocher pour terminer l&apos;appel
-	</string>
-	<string name="hang_up">
-		A quitté le chat vocal
-	</string>
-	<string name="voice_icon">
-		icn_voice-groupfocus.tga
-	</string>
-	<string name="title_string">
-		Envoyer un message instantané à [NAME]
-	</string>
-	<string name="typing_start_string">
-		[NAME] est en train d&apos;écrire…
-	</string>
-	<string name="session_start_string">
-		Début de la session avec [NAME], veuillez patienter.
-	</string>
-	<string name="default_text_label">
-		Cliquez ici pour envoyer un message instantané.
-	</string>
-	<layout_stack name="panels">
-		<layout_panel name="im_contents_panel">
-			<button label="Appeler" name="start_call_btn" width="95"/>
-			<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">
-		*** 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/ 
-Si vous ne trouvez pas ce que vous cherchez, saisissez votre question et attendez quelques instants pour que quelqu&apos;un vous réponde. 
--=-=- Les temps de réponse varient, surtout pendant les périodes de pointe -=-=-
-	</string>
-</floater>
+<?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
+	</string>
+	<string name="connected">
+		Connecté(e), cliquer sur Stop pour terminer l'appel
+	</string>
+	<string name="hang_up">
+		A quitté le chat vocal
+	</string>
+	<string name="voice_icon">
+		icn_voice-groupfocus.tga
+	</string>
+	<string name="title_string">
+		Envoyer un message instantané à [NAME]
+	</string>
+	<string name="typing_start_string">
+		[NAME] est en train d'écrire...
+	</string>
+	<string name="session_start_string">
+		Début de la session avec [NAME], veuillez patienter...
+	</string>
+	<string name="default_text_label">
+		Cliquer ici pour envoyer un message instantané
+	</string>
+	<layout_stack name="panels">
+		<layout_panel name="im_contents_panel">
+			<button label="Appeler" name="start_call_btn" width="95"/>
+			<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="Affiche/masque la liste des intervenants actifs dans cette session IM."/>
+			<line_editor label="Cliquer ici pour envoyer un message instantané" name="chat_editor"/>
+			<button label="Envoyer" name="send_btn"/>
+		</layout_panel>
+	</layout_stack>
+	<string name="live_help_dialog">
+		*** Bienvenue sur la page Demande d'aide *** 
+Veuillez au préalable consulter les pages d'aide de Second Life en appuyant sur la touche F1, ou en accédant à la base de connaissances http://secondlife.com/knowledgebase/ 
+Si vous ne trouvez pas ce que vous cherchez, saisissez votre question et attendez quelques instants pour que quelqu'un vous réponde. 
+-=-=- Les temps de réponse varient, surtout pendant les périodes de pointe -=-=-
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_instant_message_group.xml b/indra/newview/skins/default/xui/fr/floater_instant_message_group.xml
index 9c0e0ec0d..ca68caf2b 100644
--- a/indra/newview/skins/default/xui/fr/floater_instant_message_group.xml
+++ b/indra/newview/skins/default/xui/fr/floater_instant_message_group.xml
@@ -1,48 +1,49 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="(inconnu)" name="im_floater" title="(inconnu)" min_width="460" >
-	<string name="ringing">
-		En train de rejoindre le chat vocal...
-	</string>
-	<string name="connected">
-		Connecté(e), cliquez sur Raccrocher pour terminer l&apos;appel
-	</string>
-	<string name="hang_up">
-		A quitté le chat vocal
-	</string>
-	<string name="voice_icon">
-		icn_voice-groupfocus.tga
-	</string>
-	<string 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/ 
-    	Si vous ne trouvez pas ce que vous cherchez, saisissez votre question et attendez quelques instants pour que quelqu&apos;un vous réponde. 
-    	-=-=- Les temps de réponse varient, surtout pendant les périodes de pointe -=-=-
-	</string>
-	<string name="title_string">
-		Envoyer un message instantané à [NAME]
-	</string>
-	<string name="typing_start_string">
-		[NAME] est en train d&apos;écrire…
-	</string>
-	<string name="session_start_string">
-		Début de la session avec [NAME], veuillez patienter.
-	</string>
-	<string name="moderated_chat_label">
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater label="(inconnu)" name="im_floater" title="(inconnu)" min_width="460">
+	<string name="ringing">
+		En train de rejoindre le chat vocal
+	</string>
+	<string name="connected">
+		Connecté(e), cliquez sur Stop pour terminer l'appel
+	</string>
+	<string name="hang_up">
+		A quitté le chat vocal
+	</string>
+	<string name="voice_icon">
+		icn_voice-groupfocus.tga
+	</string>
+	<string name="title_string">
+		Envoyer un message instantané à [NAME]
+	</string>
+	<string name="typing_start_string">
+		[NAME] est en train d'écrire...
+	</string>
+	<string name="session_start_string">
+		Début de la session avec [NAME], veuillez patienter...
+	</string>
+	<string name="default_text_label">
+		Cliquer ici pour envoyer un message instantané
+	</string>
+	<string name="moderated_chat_label">
 		(Modéré : Voix désactivées par défaut)
 	</string>
-	<string name="default_text_label">
-		Cliquez ici pour envoyer un message instantané.
-	</string>
-	<string name="muted_text_label">
-		Votre chat écrit a été désactivé par un modérateur de groupe.
-	</string>
-	<layout_stack name="panels">
-		<layout_panel name="im_contents_panel">
-			<button label="Infos sur le groupe" name="group_info_btn" width="130"/>
-			<button label="Participer à l&apos;appel" left_delta="135" 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>
+	<string name="muted_text_label">
+		Votre chat écrit a été désactivé par un modérateur de groupe
+	</string>
+	<layout_stack name="panels">
+		<layout_panel name="im_contents_panel">
+			<button label="Infos sur le groupe" name="group_info_btn" width="130"/>
+			<button label="Participer à l'appel" left_delta="135" name="start_call_btn" width="145"/>
+			<button halign="center" label="Raccrocher" name="end_call_btn" width="145"/>
+			<button label="Historique" name="history_btn"/>
+			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Affiche/Masque la liste des intervenants actifs dans cette session IM."/>
+			<button label="Envoyer" name="send_btn"/>
+		</layout_panel>
+	</layout_stack>
+	<string name="live_help_dialog">
+		*** Bienvenue sur la page Demande d'aide *** 
+Veuillez au préalable consulter les pages d'aide de Second Life en appuyant sur la touche F1, ou en accédant à la base de connaissances http://secondlife.com/knowledgebase/ 
+Si vous ne trouvez pas ce que vous cherchez, saisissez votre question et attendez quelques instants pour que quelqu'un vous réponde. 
+-=-=- Les temps de réponse varient, surtout pendant les périodes de pointe -=-=-
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory.xml b/indra/newview/skins/default/xui/fr/floater_inventory.xml
index 9b5ede512..f5a22e128 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory.xml
@@ -1,95 +1,101 @@
-<?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"/>
-<text name="group_titles_textbox" halign="right" font="SansSerifSmall" follows="left|top"
-		height="16" left="30" bottom_delta="2" right="93">Filtre rapide:</text>
-	<!-- Inventory Type Filter Labels -->
-	<string name="filter_type_all">TOUT</string>
-	<string name="filter_type_animation">Animations</string>
-	<string name="filter_type_callingcard">Cartes de Visite</string>
-	<string name="filter_type_wearable">Habits / Body Parts</string>
-	<string name="filter_type_gesture">Gestures</string>
-	<string name="filter_type_landmark">Reperes / Landmarks</string>
-	<string name="filter_type_notecard">Notecards</string>
-	<string name="filter_type_object">Objets</string>
-	<string name="filter_type_script">Scripts</string>
-	<string name="filter_type_sound">Sons</string>
-	<string name="filter_type_texture">Textures</string>
-	<string name="filter_type_snapshot">Photos</string>
-	<string name="filter_type_custom">Custom...</string>
-	<combo_box name="Quick Filter" label="Filtre Rapide" follows="left|top|right" height="20" left="95" right="-6" bottom_delta="0">
-		<combo_item name="filter_type_all">TOUT</combo_item>
-		<separator />
-		<combo_item name="filter_type_animation">Animations</combo_item>
-		<combo_item name="filter_type_callingcard">Cartes de Visite</combo_item>
-		<combo_item name="filter_type_wearable">Habits / Body Parts</combo_item>
-		<combo_item name="filter_type_gesture">Gestures</combo_item>
-		<combo_item name="filter_type_landmark">Reperes / Landmarks</combo_item>
-		<combo_item name="filter_type_notecard">Notecards</combo_item>
-		<combo_item name="filter_type_object">Objets</combo_item>
-		<combo_item name="filter_type_script">Scripts</combo_item>
-		<combo_item name="filter_type_sound">Sons</combo_item>
-		<combo_item name="filter_type_texture">Textures</combo_item>
-		<combo_item name="filter_type_snapshot">Photos</combo_item>
-		<separator />
-		<combo_item name="filter_type_custom">Custom...</combo_item>
-	</combo_box>
-	<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="Objets Portés" name="Worn 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"/>
-			<menu_item_call label="Rafraichir l'inventaire" name="Refresh Inventory"/>
-		</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="Nouvelle gesture" name="New Gesture"/>
-			<menu name="New Clothes">
-				<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="Nouveaux sous-vêtements (haut)" name="New Undershirt"/>
-				<menu_item_call label="Nouveaux sous-vêtements (bas)" 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>
-		</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="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="Chercher" name="Search">
-			<menu_item_check label="Par nom" name="Item name"/>
-			<menu_item_check label="par description" name="Item description"/>
-			<menu_item_check label="par créateur" name="Item creatorr"/>
-		</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"/>
-		</menu>
-	</menu_bar>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Inventory" title="Inventaire">
+	<search_editor label="Saisir votre recherche ici" name="inventory search editor"/>
+  <button left="6" bottom_delta="-26" height="22" width="22" follows="left|top" halign="center"
+    label="" image_overlay="inv_collapse_all.tga" name="collapse_btn" mouse_opaque="true" font="SansSerif"
+    tool_tip="Collapse All" />
+   <button left="28" bottom_delta="0" height="22" width="22" follows="left|top" halign="center"
+    label="" image_overlay="inv_expand_all.tga" name="Inventory.ExpandAll" mouse_opaque="true" font="SansSerif"
+    tool_tip="Expand All"/>
+ <text name="group_titles_textbox" halign="right" font="SansSerifSmall" follows="left|top"
+		height="16" left="43" bottom_delta="2" right="108">Filtre rapide</text>
+	<!-- Inventory Type Filter Labels -->
+	<string name="filter_type_all">TOUT</string>
+	<string name="filter_type_animation">Animations</string>
+	<string name="filter_type_callingcard">Cartes de Visite</string>
+	<string name="filter_type_wearable">Habits / Body Parts</string>
+	<string name="filter_type_gesture">Gestures</string>
+	<string name="filter_type_landmark">Rep&#xE8;res / Landmarks</string>
+	<string name="filter_type_notecard">Notecards</string>
+	<string name="filter_type_object">Objets</string>
+	<string name="filter_type_script">Scripts</string>
+	<string name="filter_type_sound">Sons</string>
+	<string name="filter_type_texture">Textures</string>
+	<string name="filter_type_snapshot">Photos</string>
+	<string name="filter_type_custom">Personnalis&#xE9;</string>
+	<combo_box name="Quick Filter" label="Filtre Rapide" follows="left|top|right" height="20" left="110" right="-6" bottom_delta="0">
+		<combo_item name="filter_type_all">TOUT</combo_item>
+		<separator />
+		<combo_item name="filter_type_animation">Animations</combo_item>
+		<combo_item name="filter_type_callingcard">Cartes de Visite</combo_item>
+		<combo_item name="filter_type_wearable">Habits / Body Parts</combo_item>
+		<combo_item name="filter_type_gesture">Gestures</combo_item>
+		<combo_item name="filter_type_landmark">Rep&#xE8;res / Landmarks</combo_item>
+		<combo_item name="filter_type_notecard">Notecards</combo_item>
+		<combo_item name="filter_type_object">Objets</combo_item>
+		<combo_item name="filter_type_script">Scripts</combo_item>
+		<combo_item name="filter_type_sound">Sons</combo_item>
+		<combo_item name="filter_type_texture">Textures</combo_item>
+		<combo_item name="filter_type_snapshot">Photos</combo_item>
+		<separator />
+		<combo_item name="filter_type_custom">Personnalis&#xE9;</combo_item>
+	</combo_box>
+	<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="Objets Portés" name="Worn 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"/>
+			<menu_item_call label="Rafraichir l'inventaire" name="Refresh Inventory"/>
+		</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="Nouvelle gesture" name="New Gesture"/>
+			<menu name="New Clothes">
+				<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="Nouveaux sous-vêtements (haut)" name="New Undershirt"/>
+				<menu_item_call label="Nouveaux sous-vêtements (bas)" 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>
+		</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="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="Chercher" name="Search">
+			<menu_item_check label="Par nom" name="Item name"/>
+			<menu_item_check label="par description" name="Item description"/>
+			<menu_item_check label="par créateur" name="Item creatorr"/>
+		</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"/>
+		</menu>
+	</menu_bar>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
index 92dbc36a0..26d4b1d1b 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
@@ -1,85 +1,85 @@
-<?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>
-	<text name="LabelItemDescTitle">
-		Description :
-	</text>
-	<text name="LabelCreatorTitle">
-		Créateur :
-	</text>
-	<text name="LabelCreatorName">
-		Nicole Linden
-	</text>
-	<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"/>
-	<text name="LabelAcquiredTitle">
-		Acquis :
-	</text>
-	<text name="LabelAcquiredDate">
-		Wed May 24 12:50:46 2006
-	</text>
-	<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"/>
-	<text name="BaseMaskDebug">
-		B :
-	</text>
-	<text name="OwnerMaskDebug">
-		O :
-	</text>
-	<text name="GroupMaskDebug">
-		G :
-	</text>
-	<text name="EveryoneMaskDebug">
-		E :
-	</text>
-	<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" 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"/>
-	<text name="SaleLabel">
-		Marquer l&apos;objet :
-	</text>
-	<check_box label="À vendre" name="CheckPurchase"/>
-	<radio_group name="RadioSaleType">
-		<radio_item name="radio">
-			Original
-		</radio_item>
-		<radio_item name="radio2">
-			Copie
-		</radio_item>
-	</radio_group>
-	<text name="TextPrice">
-		Prix :  L$
-	</text>
-	<string name="unknown">
-		(inconnu)
-	</string>
-	<string name="public">
-		(public)
-	</string>
-	<string name="you_can">
-		Vous pouvez :
-	</string>
-	<string name="owner_can">
-		Le propriétaire peut :
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="item properties" title="Propriétés de l'objet de l'inventaire">
+	<text name="LabelItemNameTitle">
+		Nom:
+	</text>
+	<text name="LabelItemDescTitle">
+		Description:
+	</text>
+	<text name="LabelCreatorTitle">
+		Créateur:
+	</text>
+	<text name="LabelCreatorName">
+		Nicole Linden
+	</text>
+	<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"/>
+	<text name="LabelAcquiredTitle">
+		Acquis:
+	</text>
+	<text name="LabelAcquiredDate">
+		Wed May 24 12:50:46 2006
+	</text>
+	<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"/>
+	<text name="BaseMaskDebug">
+		B:
+	</text>
+	<text name="OwnerMaskDebug">
+		O:
+	</text>
+	<text name="GroupMaskDebug">
+		G:
+	</text>
+	<text name="EveryoneMaskDebug">
+		E:
+	</text>
+	<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" 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"/>
+	<text name="SaleLabel">
+		Marquer l'objet:
+	</text>
+	<check_box label="À vendre" name="CheckPurchase"/>
+	<radio_group name="RadioSaleType">
+		<radio_item name="radio">
+			Original
+		</radio_item>
+		<radio_item name="radio2">
+			Copie
+		</radio_item>
+	</radio_group>
+	<text name="TextPrice">
+		Prix:  [CURRENCY]
+	</text>
+	<string name="unknown">
+		(inconnu)
+	</string>
+	<string name="public">
+		(public)
+	</string>
+	<string name="you_can">
+		Vous pouvez:
+	</string>
+	<string name="owner_can">
+		Le propriétaire peut:
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
index dceebdfa4..01eacd4aa 100644
--- a/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
+++ b/indra/newview/skins/default/xui/fr/floater_inventory_view_finder.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Inventory Finder" title="inventory_recent_items">
-	<check_box label="Animations" name="check_animation"/>
-	<check_box label="Cartes de visite" name="check_calling_card"/>
-	<check_box label="Habits / Body Parts" name="check_clothing"/>
-	<check_box label="Gestures" name="check_gesture"/>
-	<check_box label="Reperes / Landmarks" name="check_landmark"/>
-	<check_box label="Notecards" 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_delta="0" left="83"/>
-	<check_box label="Toujours montrer &#10;les dossiers" name="check_show_empty" bottom_delta="-20"/>
-	<check_box label="Depuis la déconnexion" name="check_since_logoff" bottom_delta="-36"/>
-	<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" bottom_delta="-30"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Inventory Finder" title="inventory_recent_items">
+	<check_box label="Animations" name="check_animation"/>
+	<check_box label="Cartes de visite" name="check_calling_card"/>
+	<check_box label="Habits / Body Parts" name="check_clothing"/>
+	<check_box label="Gestures" name="check_gesture"/>
+	<check_box label="Rep&#xE8;res / Landmarks" name="check_landmark"/>
+	<check_box label="Notecards" 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_delta="0" left="83"/>
+	<check_box label="Toujours montrer &#10;les dossiers" name="check_show_empty" bottom_delta="-20"/>
+	<check_box label="Depuis la déconnexion" name="check_since_logoff" bottom_delta="-36"/>
+	<text name="- OR -">
+		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" bottom_delta="-30"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_joystick.xml b/indra/newview/skins/default/xui/fr/floater_joystick.xml
index be336c827..b674ebe89 100644
--- a/indra/newview/skins/default/xui/fr/floater_joystick.xml
+++ b/indra/newview/skins/default/xui/fr/floater_joystick.xml
@@ -1,85 +1,82 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Joystick" title="Configuration du joystick">
-	<check_box name="enable_joystick">
-		Activer :
-	</check_box>
-	<spinner label="Mapping axe des X " name="JoystickAxis1"/>
-	<spinner label="Mapping axe des Y" name="JoystickAxis2"/>
-	<spinner label="Mapping axe des Z" name="JoystickAxis0"/>
-	<spinner label="Mapping du tangage" label_width="111" left="8" name="JoystickAxis4" width="152"/>
-	<spinner label="Mapping du lacet" name="JoystickAxis5"/>
-	<spinner label="Mapping du roulis" name="JoystickAxis3"/>
-	<spinner label="Mapping du zoom" name="JoystickAxis6"/>
-	<check_box label="Zoom direct" name="ZoomDirect"/>
-	<check_box label="Curseur 3D" name="Cursor3D"/>
-	<check_box label="Niveau automatique" name="AutoLeveling"/>
-	<text name="Control Modes:">
-		Modes de contrôle :
-	</text>
-	<check_box name="JoystickAvatarEnabled">
-		Avatar
-	</check_box>
-	<check_box name="JoystickBuildEnabled">
-		Build
-	</check_box>
-	<check_box name="JoystickFlycamEnabled">
-		Flycam
-	</check_box>
-	<text name="XScale">
-		Échelle des X
-	</text>
-	<text name="YScale">
-		Échelle des Y
-	</text>
-	<text name="ZScale">
-		Échelle des Z
-	</text>
-	<text left="9" name="PitchScale" width="104">
-		Échelle du tangage
-	</text>
-	<text name="YawScale">
-		Échelle du lacet
-	</text>
-	<text name="RollScale">
-		Échelle du roulis
-	</text>
-	<text name="XDeadZone">
-		Zone neutre X
-	</text>
-	<text name="YDeadZone">
-		Zone neutre Y
-	</text>
-	<text name="ZDeadZone">
-		Zone neutre Z
-	</text>
-	<text left="4" name="PitchDeadZone" width="110">
-		Zone neutre Tangage
-	</text>
-	<text name="YawDeadZone">
-		Zone neutre lacet
-	</text>
-	<text name="RollDeadZone">
-		Zone neutre roulis
-	</text>
-	<text name="Feathering">
-		Feathering
-	</text>
-	<text name="ZoomScale2">
-		Échelle du zoom
-	</text>
-	<text left="6" name="ZoomDeadZone" width="110">
-		Zone neutre du zoom
-	</text>
-	<button label="Options par défaut du joystick" name="SpaceNavigatorDefaults"/>
-	<button label="OK" label_selected="OK" name="ok_btn"/>
-	<button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
-	<string name="JoystickMonitor">
-		Contrôle du joystick
-	</string>
-	<string name="Axis">
-		Axe [NUM]
-	</string>
-	<string name="NoDevice">
-		aucun joystick détecté
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Joystick" title="Configuration du joystick">
+	<check_box name="enable_joystick">
+		Activer:
+	</check_box>
+	<string name="JoystickMonitor">
+		Contrôle du joystick
+	</string>
+	<string name="Axis">
+		Axe [NUM]
+	</string>
+	<string name="NoDevice">
+		aucun joystick détecté
+	</string>
	<spinner name="JoystickAxis1" label="Mapping axe des X "/>
+	<spinner name="JoystickAxis4" label="Mapping du tangage" label_width="111" left="8" width="152"/>
	<spinner name="JoystickAxis6" label="Mapping du zoom"/>
+	<spinner name="JoystickAxis2" label="Mapping axe des Y"/>
+	<spinner name="JoystickAxis5" label="Mapping du lacet"/>
	<spinner name="JoystickAxis0" label="Mapping axe des Z"/>
+	<spinner name="JoystickAxis3" label="Mapping du roulis"/>
+	<check_box label="Zoom direct" name="ZoomDirect"/>
+	<check_box label="Curseur 3D" name="Cursor3D"/>
+	<check_box label="Niveau automatique" name="AutoLeveling"/>
+	<text name="Control Modes:">
+		Modes de Contrôle:
+	</text>
+	<check_box name="JoystickAvatarEnabled">
+		Avatar
+	</check_box>
+	<check_box name="JoystickBuildEnabled">
+		Build
+	</check_box>
+	<check_box name="JoystickFlycamEnabled">
+		Flycam
+	</check_box>
+	<text name="XScale">
+		Échelle des X
+	</text>
+	<text name="YScale">
+		Échelle des Y
+	</text>
+	<text name="ZScale">
+		Échelle des Z
+	</text>
+	<text name="PitchScale" left="9" width="104">
+		Échelle du tangage
+	</text>
+	<text name="YawScale">
+		Échelle du lacet
+	</text>
+	<text name="RollScale">
+		Échelle du roulis
+	</text>
+	<text name="XDeadZone">
+		Zone neutre X
+	</text>
+	<text name="YDeadZone">
+		Zone neutre Y
+	</text>
+	<text name="ZDeadZone">
+		Zone neutre Z
+	</text>
+	<text name="PitchDeadZone" left="4" width="110">
+		Zone neutre Tangage
+	</text>
+	<text name="YawDeadZone">
+		Zone neutre lacet
+	</text>
+	<text name="RollDeadZone">
+		Zone neutre roulis
+	</text>
+	<text name="Feathering">
+		Feathering
+	</text>
+	<text name="ZoomScale2">
+		Échelle du zoom
+	</text>
+	<text name="ZoomDeadZone" left="6" width="110">
+		Zone neutre du zoom
+	</text>
+	<button label="Options par défaut du joystick" name="SpaceNavigatorDefaults"/>
+	<button label="OK" label_selected="OK" name="ok_btn"/>
+	<button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml b/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
index 54069c9c4..e03a3b636 100644
--- a/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
+++ b/indra/newview/skins/default/xui/fr/floater_lagmeter.xml
@@ -1,152 +1,152 @@
-<?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"/>
-	<text name="network">
-		Réseau :
-	</text>
-	<text name="network_text">
-		Normal
-	</text>
-	<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"/>
-	<string name="max_title_msg">
-		Mesure du lag
-	</string>
-	<string name="max_width_px">
-		360
-	</string>
-	<string name="min_title_msg">
-		Lag
-	</string>
-	<string name="min_width_px">
-		90
-	</string>
-	<string name="client_text_msg">
-		Client
-	</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, fenêtre en arrière-plan
-	</string>
-	<string name="client_frame_time_critical_msg">
-		Taux de défilement client ci-dessous [CLIENT_FRAME_RATE_CRITICAL]
-	</string>
-	<string name="client_frame_time_warning_msg">
-		Taux de défilement client entre [CLIENT_FRAME_RATE_CRITICAL] et [CLIENT_FRAME_RATE_WARNING]
-	</string>
-	<string name="client_frame_time_normal_msg">
-		Normal
-	</string>
-	<string name="client_draw_distance_cause_msg">
-		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
-	</string>
-	<string name="client_texture_memory_cause_msg">
-		Cause possible : trop d&apos;images en mémoire
-	</string>
-	<string name="client_complex_objects_cause_msg">
-		Cause possible : trop d&apos;objets complexes dans la scène
-	</string>
-	<string name="network_text_msg">
-		Réseau
-	</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">
-		La connexion perd plus de [NETWORK_PACKET_LOSS_CRITICAL] % de paquets
-	</string>
-	<string name="network_packet_loss_warning_msg">
-		La connexion perd entre [NETWORK_PACKET_LOSS_WARNING] % et [NETWORK_PACKET_LOSS_CRITICAL] % de paquets
-	</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">
-		Temps de connexion ping supérieur à [NETWORK_PING_CRITICAL] ms
-	</string>
-	<string name="network_ping_warning_msg">
-		Temps de connexion ping entre [NETWORK_PING_WARNING] et [NETWORK_PING_CRITICAL] ms
-	</string>
-	<string name="network_packet_loss_cause_msg">
-		Mauvaise connexion possible ou réglage de la bande passante trop élevé.
-	</string>
-	<string name="network_ping_cause_msg">
-		Mauvaise connexion possible ou app. de partage des fichiers
-	</string>
-	<string name="server_text_msg">
-		Serveur
-	</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">
-		Taux de défilement du simulateur au dessous de [SERVER_FRAME_RATE_CRITICAL]
-	</string>
-	<string name="server_frame_time_warning_msg">
-		Taux de défilement du simulateur entre [SERVER_FRAME_RATE_CRITICAL] et [SERVER_FRAME_RATE_WARNING]
-	</string>
-	<string name="server_frame_time_normal_msg">
-		Normal
-	</string>
-	<string name="server_physics_cause_msg">
-		Cause possible : trop d&apos;objets physiques
-	</string>
-	<string name="server_scripts_cause_msg">
-		Cause possible : trop d&apos;objets scriptés
-	</string>
-	<string name="server_net_cause_msg">
-		Cause possible : trop de trafic réseau
-	</string>
-	<string name="server_agent_cause_msg">
-		Cause possible : trop de personnes en mouvement dans la région
-	</string>
-	<string name="server_images_cause_msg">
-		Cause possible : trop de calculs d&apos;images
-	</string>
-	<string name="server_generic_cause_msg">
-		Cause possible : charge simulateur trop lourde
-	</string>
-	<string name="smaller_label">
-		&gt;&gt;
-	</string>
-	<string name="bigger_label">
-		&lt;&lt;
-	</string>
-</floater>
+<?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"/>
+	<text name="network">
+		Réseau:
+	</text>
+	<text name="network_text">
+		Normal
+	</text>
+	<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"/>
+	<string name="max_title_msg">
+		Mesure du lag
+	</string>
+	<string name="max_width_px">
+		360
+	</string>
+	<string name="min_title_msg">
+		Lag
+	</string>
+	<string name="min_width_px">
+		90
+	</string>
+	<string name="client_text_msg">
+		Client
+	</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, fenêtre en arrière-plan
+	</string>
+	<string name="client_frame_time_critical_msg">
+		Taux de défilement client ci-dessous [CLIENT_FRAME_RATE_CRITICAL]
+	</string>
+	<string name="client_frame_time_warning_msg">
+		Taux de défilement client entre [CLIENT_FRAME_RATE_CRITICAL] et [CLIENT_FRAME_RATE_WARNING]
+	</string>
+	<string name="client_frame_time_normal_msg">
+		Normal
+	</string>
+	<string name="client_draw_distance_cause_msg">
+		Cause possible: la limite d'affichage est trop élevée
+	</string>
+	<string name="client_texture_loading_cause_msg">
+		Cause possible: images en cours de chargement
+	</string>
+	<string name="client_texture_memory_cause_msg">
+		Cause possible: trop d'images en mémoire
+	</string>
+	<string name="client_complex_objects_cause_msg">
+		Cause possible: trop d'objets complexes dans la scène
+	</string>
+	<string name="network_text_msg">
+		Réseau
+	</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">
+		La connexion perd plus de [NETWORK_PACKET_LOSS_CRITICAL]% de paquets
+	</string>
+	<string name="network_packet_loss_warning_msg">
+		La connexion perd entre [NETWORK_PACKET_LOSS_WARNING]% et [NETWORK_PACKET_LOSS_CRITICAL]% de paquets
+	</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">
+		Temps de connexion ping supérieur à [NETWORK_PING_CRITICAL] ms
+	</string>
+	<string name="network_ping_warning_msg">
+		Temps de connexion ping entre [NETWORK_PING_WARNING] et [NETWORK_PING_CRITICAL] ms
+	</string>
+	<string name="network_packet_loss_cause_msg">
+		Mauvaise connexion possible ou réglage de la bande passante trop élevé.
+	</string>
+	<string name="network_ping_cause_msg">
+		Mauvaise connexion possible ou app. de partage des fichiers
+	</string>
+	<string name="server_text_msg">
+		Serveur
+	</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">
+		Taux de défilement du simulateur au dessous de [SERVER_FRAME_RATE_CRITICAL]
+	</string>
+	<string name="server_frame_time_warning_msg">
+		Taux de défilement du simulateur entre [SERVER_FRAME_RATE_CRITICAL] et [SERVER_FRAME_RATE_WARNING]
+	</string>
+	<string name="server_frame_time_normal_msg">
+		Normal
+	</string>
+	<string name="server_physics_cause_msg">
+		Cause possible: trop d'objets physiques
+	</string>
+	<string name="server_scripts_cause_msg">
+		Cause possible: trop d'objets scriptés
+	</string>
+	<string name="server_net_cause_msg">
+		Cause possible: trop de trafic réseau
+	</string>
+	<string name="server_agent_cause_msg">
+		Cause possible: trop de personnes en mouvement dans la région
+	</string>
+	<string name="server_images_cause_msg">
+		Cause possible: trop de calculs d'images
+	</string>
+	<string name="server_generic_cause_msg">
+		Cause possible: charge simulateur trop lourde
+	</string>
+	<string name="smaller_label">
+		&gt;&gt;
+	</string>
+	<string name="bigger_label">
+		&lt;&lt;
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_land_holdings.xml b/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
index 9c4f4ee96..593730092 100644
--- a/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
+++ b/indra/newview/skins/default/xui/fr/floater_land_holdings.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="land holdings floater" title="Mes terrains">
-	<scroll_list name="parcel list">
-		<column label="Nom de la parcelle" name="name"/>
-		<column label="Région" name="location"/>
-		<column label="Type" name="type"/>
-		<column label="Surface" name="area"/>
-		<column label="" name="hidden"/>
-	</scroll_list>
-	<button label="Téléporter" label_selected="Téléporter" name="Teleport" 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="Affichez ce terrain sur la carte du monde."/>
-	<text name="contrib_label">
-		Vos contributions :
-	</text>
-	<scroll_list name="grant list">
-		<column label="Groupe" name="group"/>
-		<column label="Surface" name="area"/>
-	</scroll_list>
-	<text name="allowed_label">
-		Surface de terrain autorisée avec votre compte :
-	</text>
-	<text name="allowed_text">
-		[AREA] m²
-	</text>
-	<text name="current_label">
-		Surface occupée actuellement :
-	</text>
-	<text name="current_text">
-		[AREA] m²
-	</text>
-	<text name="available_label">
-		Disponible à l&apos;achat :
-	</text>
-	<text name="available_text">
-		[AREA] m²
-	</text>
-	<string name="area_string">
-		[AREA] m²
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="land holdings floater" title="Mes terrains">
+	<scroll_list name="parcel list">
+		<column label="Nom de la parcelle" name="name"/>
+		<column label="Région" name="location"/>
+		<column label="Type" name="type"/>
+		<column label="Surface" name="area"/>
+		<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."/>
+	<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."/>
+	<text name="contrib_label">
+		Vos contributions:
+	</text>
+	<scroll_list name="grant list">
+		<column label="Groupe" name="group"/>
+		<column label="Surface" name="area"/>
+	</scroll_list>
+	<text name="allowed_label">
+		Surface de terrain autorisée avec votre compte:
+	</text>
+	<text name="allowed_text">
+		[AREA] m²
+	</text>
+	<text name="current_label">
+		Surface occupée actuellement:
+	</text>
+	<text name="current_text">
+		[AREA] m²
+	</text>
+	<text name="available_label">
+		Disponible à l'achat:
+	</text>
+	<text name="available_text">
+		[AREA] m²
+	</text>
+	<string name="area_string">
+		[AREA] m²
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_landmark_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_landmark_ctrl.xml
index d9ed263b1..29e41c771 100644
--- a/indra/newview/skins/default/xui/fr/floater_landmark_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/floater_landmark_ctrl.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="landmarkpicker" title="Organiser : Repères">
-	<check_box label="Afficher les dossiers" name="show_folders_check" />
-	<button label="Nouveau" label_selected="Nouveau" name="New" />
-	<button label="Renommer" label_selected="Renommer" name="Rename" />
-	<button label="Nouveau dossier" label_selected="Nouveau dossier" name="NewFolder" />
-	<button label="Modifier" label_selected="Modifier" name="Edit" />
-	<button label="Supprimer" label_selected="Supprimer" name="Delete" />
-	<button label="Fermer" label_selected="Fermer" name="Close" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="landmarkpicker" title="Organiser: Repères">
+	<check_box label="Afficher les dossiers" name="show_folders_check"/>
+	<button label="Nouveau" label_selected="Nouveau" name="New"/>
+	<button label="Renommer" label_selected="Renommer" name="Rename"/>
+	<button label="Nouveau dossier" label_selected="Nouveau dossier" name="NewFolder"/>
+	<button label="Modifier" label_selected="Modifier" name="Edit"/>
+	<button label="Supprimer" label_selected="Supprimer" name="Delete"/>
+	<button label="Fermer" label_selected="Fermer" name="Close"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
index e2e2a9af9..0f4ba5648 100644
--- a/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
+++ b/indra/newview/skins/default/xui/fr/floater_live_lsleditor.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="script ed float" title="Script : Nouveau script">
-	<button label="Réinitialiser" label_selected="Réinitialiser" name="Reset" width="100" left="390"/>
-	<check_box label="Exécution en cours" name="running" left="4"/>
-	<check_box label="Mono" name="mono" left="130"/>
-	<string name="not_allowed">
-		Vous n&apos;êtes pas autorisé à afficher ce script.
-	</string>
-	<string name="script_running">
-		Exécution en cours
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script ed float" title="Script: Nouveau script">
+	<button label="Réinitialiser" label_selected="Réinitialiser" name="Reset" width="100" left="390"/>
+	<check_box label="Exécution en cours" name="running" left="4"/>
+	<check_box label="Mono" name="mono" left="130"/>
+	<string name="not_allowed">
+		Vous n'êtes pas autorisé(e) à afficher ce script.
+	</string>
+	<string name="script_running">
+		Exécution en cours...
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml b/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
index 5dc0fa76a..b2a7b52ca 100644
--- a/indra/newview/skins/default/xui/fr/floater_lsl_guide.xml
+++ b/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" left_delta="120" width="70"/>
-	<button label="Précédente" name="back_btn" left_delta="75"/>
-	<button label="Suivante" name="fwd_btn" />
-</floater>
+<?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" 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/indra/newview/skins/default/xui/fr/floater_media_browser.xml b/indra/newview/skins/default/xui/fr/floater_media_browser.xml
index e75b45c43..d83e4c633 100644
--- a/indra/newview/skins/default/xui/fr/floater_media_browser.xml
+++ b/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">
-	<layout_stack name="stack1">
-		<layout_panel name="nav_controls">
-			<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="510"/>
-			<button label="OK" left_delta="515" name="go"/>
-		</layout_panel>
-		<layout_panel name="parcel_owner_controls">
-			<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="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>
+<?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" left_delta="75" name="forward" width="70"/>
+			<button label="Rafraîchir" left_delta="75" name="reload"/>
+			<combo_box left_delta="75" name="address" width="510"/>
+			<button label="OK" left_delta="515" name="go"/>
+		</layout_panel>
+		<layout_panel name="parcel_owner_controls">
+			<button label="Envoyer l'URL sur la parcelle" name="assign"/>
+		</layout_panel>
+		<layout_panel name="external_controls">
+			<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/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
index 8ee3a23b9..b0cba5953 100644
--- a/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
+++ b/indra/newview/skins/default/xui/fr/floater_mem_leaking.xml
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="MemLeak" title="Simulation fuite mémoire">
-	<spinner label="Vitesse de la fuite (octets) :" name="leak_speed" />
-	<spinner label="Max mémoire perdue (Mo) :" name="max_leak" />
-	<text name="total_leaked_label">
-		Mémoire perdue actuelle : [SIZE] Ko
-	</text>
-	<text name="note_label_1">
-		[NOTE1]
-	</text>
-	<text name="note_label_2">
-		[NOTE2]
-	</text>
-	<button label="Commencer" name="start_btn" width="85"/>
-	<button label="Stop" name="stop_btn" left="100"/>
-	<button label="Libérer" name="release_btn"  left="177"/>
-	<button label="Fermer" name="close_btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="MemLeak" title="Simulation fuite mémoire">
+	<spinner label="Vitesse de la fuite (octets) :" name="leak_speed"/>
+	<spinner label="Max mémoire perdue (Mo) :" name="max_leak"/>
+	<text name="total_leaked_label">
+		Mémoire perdue actuelle : [SIZE] Ko
+	</text>
+	<text name="note_label_1">
+		[NOTE1]
+	</text>
+	<text name="note_label_2">
+		[NOTE2]
+	</text>
+	<button label="Commencer" name="start_btn" width="85"/>
+	<button label="Stop" name="stop_btn" left="100"/>
+	<button label="Libérer" name="release_btn"  left="177"/>
+	<button label="Fermer" name="close_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_mini_map.xml b/indra/newview/skins/default/xui/fr/floater_mini_map.xml
index 9627a5a58..ae7c2cd90 100644
--- a/indra/newview/skins/default/xui/fr/floater_mini_map.xml
+++ b/indra/newview/skins/default/xui/fr/floater_mini_map.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="minimap">
-	<panel label="Mini-carte" name="mini_mapview" tool_tip="(Double-cliquez pour ouvrir la carte)"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="minimap">
+	<panel label="Mini-carte" name="mini_mapview" tool_tip="Double-cliquez pour ouvrir la carte"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_moveview.xml b/indra/newview/skins/default/xui/fr/floater_moveview.xml
index 55ea8700a..264a127ed 100644
--- a/indra/newview/skins/default/xui/fr/floater_moveview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_moveview.xml
@@ -1,12 +1,12 @@
-<?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 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>
+<?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'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'avant"/>
+	<joystick_turn name="backward btn" tool_tip="Se déplacer vers l'arrière"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_mute.xml b/indra/newview/skins/default/xui/fr/floater_mute.xml
index 35d8d5975..e17ba0944 100644
--- a/indra/newview/skins/default/xui/fr/floater_mute.xml
+++ b/indra/newview/skins/default/xui/fr/floater_mute.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="mute floater" title="Résidents et objets ignorés(mute)" short_title="Liste des ignorés(mute)">
-	<scroll_list name="mutes" tool_tip="Liste des résidents ignorés(mute)actuellement" />
-	<button label="Ignorer le résident(mute)" label_selected="Ignorer le résident(mute)"
-	     name="Mute resident..."
-	     tool_tip="Choisissez le résident que vous souhaitez ignorer (mute)" />
-	<button label="Ignorer(mute) les objets par nom"
-	     label_selected="Ignorer(mute) les objets par nom"
-	     name="Mute object by name..." />
-	<button label="Ne plus ignorer(unmute)" label_selected="Ne plus ignorer(unmute)" name="Unmute"
-	     tool_tip="Supprimer le résident ou l&apos;objet de la liste des ignorés" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="mute floater" title="Résidents et objets ignorés(mute)" short_title="Liste des ignorés(mute)">
+	<scroll_list name="mutes" tool_tip="Liste des résidents ignorés(mute)actuellement" />
+	<button label="Ignorer le résident(mute)" label_selected="Ignorer le résident(mute)"
+	     name="Mute resident"
+	     tool_tip="Choisir le résident à ignorer (mute)" />
+	<button label="Ignorer(mute) les objets par nom"
+	     label_selected="Ignorer(mute) les objets par nom"
+	     name="Mute object by name..." />
+	<button label="Ne plus ignorer(unmute)" label_selected="Ne plus ignorer(unmute)" name="Unmute"
+	     tool_tip="Supprimer le résident ou l&apos;objet de la liste des ignorés" />
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_mute_object.xml b/indra/newview/skins/default/xui/fr/floater_mute_object.xml
index 665c48630..6f1d71a08 100644
--- a/indra/newview/skins/default/xui/fr/floater_mute_object.xml
+++ b/indra/newview/skins/default/xui/fr/floater_mute_object.xml
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="mute by name" title="Ignorer(mute)les objets par nom">
-	<text name="message">
-		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"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="mute by name" title="Ignorer(mute) les objets par le nom">
+	<text name="message">
+		Saisir le nom exact de l'objet pour muter son spam dans le chat et les ims. Ne permet pas de muter les sons de cet objet.
+	</text>
+	<line_editor name="object_name">
+		Nom de l'objet:
+	</line_editor>
+	<button label="OK" name="OK"/>
+	<button label="Annuler" name="Cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_my_friends.xml b/indra/newview/skins/default/xui/fr/floater_my_friends.xml
index 911647d8b..a0cc1c490 100644
--- a/indra/newview/skins/default/xui/fr/floater_my_friends.xml
+++ b/indra/newview/skins/default/xui/fr/floater_my_friends.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_my_friends" title="Contacts">
-	<tab_container name="friends_and_groups">
-		<panel label="Amis" name="friends_panel" />
-		<panel label="Groupes" name="groups_panel" />
-	</tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_my_friends" title="Contacts">
+	<tab_container name="friends_and_groups">
+		<panel label="Ami(e)s" name="friends_panel"/>
+		<panel label="Groupes" name="groups_panel"/>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_name_description.xml b/indra/newview/skins/default/xui/fr/floater_name_description.xml
index 0028c5df3..686ff9d87 100644
--- a/indra/newview/skins/default/xui/fr/floater_name_description.xml
+++ b/indra/newview/skins/default/xui/fr/floater_name_description.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Name/Description" title="">
-	<text name="name_label">
-		Nom :
-	</text>
-	<text name="description_label">
-		Description :
-	</text>
-	<button label="Annuler" name="cancel_btn"/>
-	<button label="Importer ([AMOUNT] L$)" name="ok_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Name/Description" title="">
+	<text name="name_label">
+		Nom:
+	</text>
+	<text name="description_label">
+		Description:
+	</text>
+	<button label="Annuler" name="cancel_btn"/>
+	<button label="Importer ([UPLOADFEE])" name="ok_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_new_im.xml b/indra/newview/skins/default/xui/fr/floater_new_im.xml
index f20e1d31c..72af1adce 100644
--- a/indra/newview/skins/default/xui/fr/floater_new_im.xml
+++ b/indra/newview/skins/default/xui/fr/floater_new_im.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater label="IM" name="New IM" title="IM">
-	<button label="Commencer" label_selected="Commencer" name="start_btn" />
-	<button label="Fermer" label_selected="Fermer" name="close_btn" />
-	<text name="name_format">
-		[NAME]
-	</text>
-	<text name="online_descriptor">
-		(connecté)
-	</text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater label="IM" name="New IM" title="IM">
+	<button label="Commencer" label_selected="Commencer" name="start_btn"/>
+	<button label="Fermer" label_selected="Fermer" name="close_btn"/>
+	<text name="name_format">
+		[NAME]
+	</text>
+	<string name="online_descriptor">
+		(connecté(e))
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml b/indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml
index e140040c5..0699c64be 100644
--- a/indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml
+++ b/indra/newview/skins/default/xui/fr/floater_new_outfit_dialog.xml
@@ -1,88 +1,88 @@
-<?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 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="Tee Shirt" name="checkbox_Undershirt"/>
-	<check_box label="culotte" 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 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.
-	</text>
-	<text length="1" name="Folder name:" type="string">
-		Nom du dossier :
-	</text>
-	<text length="1" name="Items to include in outfit:" type="string">
-		Articles à inclure à l&apos;ensemble :
-	</text>
-	<text length="1" name="Body Parts:" type="string">
-		Parties du corps :
-	</text>
-	<text left="115" length="1" name="Clothes:" type="string">
-		Habits :
-	</text>
-	<text left="227" length="1" name="Attachments:" type="string">
-		Attachements :
-	</text>
-	<text length="1" name="Options:" type="string">
-		Options :
-	</text>
-	<line_editor name="name ed">
-		Nouvelle tenue
-	</line_editor>
-</floater>
+<?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 le nom du dossier &#10;&#xE0; l'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="Tee Shirt" name="checkbox_Undershirt"/>
+	<check_box label="culotte" 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="Epaule gauche" left="225" name="checkbox_Left Shoulder"/>
+	<check_box label="Epaule 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="Oeil gauche" left="325" name="checkbox_Left Eyeball"/>
+	<check_box label="Oeil 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 name="Make New Outfit">
+		Cr&#xE9;er un ensemble
+	</text>
+	<text 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.">
+		Les ensembles sont des dossiers qui contiennent des habits et des parties du corps.
+Faire glisser le dossier contenant un ensemble vers l&#x27;avatar pour lui faire porter.
+
+Le bouton Cr&#xE9;er un ensemble vous permet de cr&#xE9;er un dossier et d'y sauvegarder les copies
+des articles que vous portez maintenant.
+	</text>
+	<text name="Folder name:">
+		Nom du dossier:
+	</text>
+	<text name="Items to include in outfit:">
+		Articles &#xE0; inclure &#xE0; l'ensemble:
+	</text>
+	<text name="Body Parts:">
+		Parties du corps:
+	</text>
+	<text left="115" name="Clothes:">
+		Habits:
+	</text>
+	<text left="227" name="Attachments:">
+		Attachements:
+	</text>
+	<text name="Options:">
+		Options:
+	</text>
+	<line_editor name="name ed">
+		Nouvelle tenue
+	</line_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_notification.xml b/indra/newview/skins/default/xui/fr/floater_notification.xml
index 7ca2dc3a6..7461c2906 100644
--- a/indra/newview/skins/default/xui/fr/floater_notification.xml
+++ b/indra/newview/skins/default/xui/fr/floater_notification.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="notification" title="Console de notifications">
-	<text_editor name="payload">
-		Chargement..
-	</text_editor>
-	<combo_box label="Réponse" name="response"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="notification" title="Console de notifications">
+	<text_editor name="payload">
+		Chargement...
+	</text_editor>
+	<combo_box label="Réponse" name="response"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_notifications_console.xml b/indra/newview/skins/default/xui/fr/floater_notifications_console.xml
index 7262fe8fe..5f03f61f5 100644
--- a/indra/newview/skins/default/xui/fr/floater_notifications_console.xml
+++ b/indra/newview/skins/default/xui/fr/floater_notifications_console.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="notifications_console" title="Console de notifications">
-	<combo_box label="Sélectionner le type de notification" name="notification_types" width="412"/>
-	<button label="Ajouter" name="add_notification" left="417" width="78"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="notifications_console" title="Console de notifications">
+	<combo_box name="notification_types" label="Sélectionner le type de notification" width="412"/>
+	<button name="add_notification" label="Ajouter" left="417" width="78"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_object_im_info.xml b/indra/newview/skins/default/xui/fr/floater_object_im_info.xml
index cd7664c29..b7c83dac0 100644
--- a/indra/newview/skins/default/xui/fr/floater_object_im_info.xml
+++ b/indra/newview/skins/default/xui/fr/floater_object_im_info.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="object im info" title="Informations sur l&apos;objet">
-	<text name="LabelItemNameTitle">
-		Objet :
-	</text>
-	<text name="LabelSlurlTitle">
-		Lieu :
-	</text>
-	<text name="Unknown_Slurl">
-		(Informations indisponibles)
-	</text>
-	<text name="LabelOwnerNameTitle">
-		Propriétaire :
-	</text>
-	<button label="Ignorer(mute)le propriétaire" label_selected="Ignorer(mute)le propriétaire" name="Mute"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="object im info" title="Informations sur l'objet">
+	<text name="LabelItemNameTitle">
+		Objet:
+	</text>
+	<text name="LabelSlurlTitle">
+		Lieu:
+	</text>
+	<text name="Unknown_Slurl">
+		(Informations indisponibles)
+	</text>
+	<text name="LabelOwnerNameTitle">
+		Propriétaire:
+	</text>
+	<button label="Ignorer(mute)le propriétaire" label_selected="Ignorer(mute)le propriétaire" name="Mute"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_openobject.xml b/indra/newview/skins/default/xui/fr/floater_openobject.xml
index 36c712e8a..8b6ad81ed 100644
--- a/indra/newview/skins/default/xui/fr/floater_openobject.xml
+++ b/indra/newview/skins/default/xui/fr/floater_openobject.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="objectcontents" title="Contenu des objets">
-	<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" width="132" />
-	<button label="Copier et porter" label_selected="Copier et porter" name="copy_and_wear_button" left="152"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="objectcontents" title="Contenu des objets">
+	<text name="object_name">
+		[DESC]:
+	</text>
+	<button label="Copier vers l'inventaire" label_selected="Copier vers l'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/indra/newview/skins/default/xui/fr/floater_pay.xml b/indra/newview/skins/default/xui/fr/floater_pay.xml
index 7d2071326..c82d96c0a 100644
--- a/indra/newview/skins/default/xui/fr/floater_pay.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pay.xml
@@ -1,22 +1,22 @@
-<?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 length="1" name="payee_label" type="string" left="5">
-		Payer :
-	</text>
-	<text length="1" name="payee_name" type="string">
-		[NAME]
-	</text>
-	<text length="1" name="fastpay text" type="string" width="100" halign="left">
-		Paiement rapide :
-	</text>
-	<text left="4" length="1" name="amount text" type="string">
-		Montant :
-	</text>
-	<line_editor left="60" name="amount" width="55"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Give Money" title="">
+	<button label="1 [CURRENCY]" label_selected="1 [CURRENCY]" name="fastpay 1"/>
+	<button label="5 [CURRENCY]" label_selected="5 [CURRENCY]" name="fastpay 5"/>
+	<button label="10 [CURRENCY]" label_selected="10 [CURRENCY]" name="fastpay 10"/>
+	<button label="20 [CURRENCY]" label_selected="20 [CURRENCY]" name="fastpay 20"/>
+	<button label="Payer" label_selected="Payer" name="pay btn"/>
+	<button label="Annuler" label_selected="Annuler" name="cancel btn"/>
+	<text name="payee_label" left="5">
+		Payer:
+	</text>
+	<text name="payee_name">
+		[NAME]
+	</text>
+	<text name="fastpay text" width="100" halign="left">
+		Paiement rapide:
+	</text>
+	<text left="4" name="amount text">
+		Montant:
+	</text>
+	<line_editor left="60" name="amount" width="55"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_pay_object.xml b/indra/newview/skins/default/xui/fr/floater_pay_object.xml
index deb448d10..9705b1696 100644
--- a/indra/newview/skins/default/xui/fr/floater_pay_object.xml
+++ b/indra/newview/skins/default/xui/fr/floater_pay_object.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Give Money" title="">
-	<text length="1" name="payee_group" type="string" width="95">
-		Payer le groupe :
-	</text>
-	<text length="1" name="payee_resident" type="string" width="100" halign="left" >
-		Payer le résident :
-	</text>
-	<text length="1" name="payee_name" type="string" left="105">
-		[NAME]
-	</text>
-	<text length="1" name="object_name_label" type="string" left="25">
-		Via un objet :
-	</text>
-	<text length="1" name="object_name_text" type="string" left="105">
-		...
-	</text>
-	<text length="1" name="fastpay text" type="string" width="95">
-		Paiement rapide :
-	</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" 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>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="Give Money" title="">
+	<text name="payee_group" width="95">
+		Payer le groupe:
+	</text>
+	<text name="payee_resident" halign="left" width="100">
+		Payer le résident:
+	</text>
+	<text name="payee_name" left="105">
+		[NAME]
+	</text>
+	<text name="object_name_label" left="25">
+		Via un objet:
+	</text>
+	<text name="object_name_text" left="105">
+		...
+	</text>
+	<text name="fastpay text" width="95">
+		Paiement rapide:
+	</text>
+	<text name="amount text" left="5" halign="left">
+		Montant :
+	</text>
+	<button label="1 [CURRENCY]" label_selected="1 [CURRENCY]" name="fastpay 1" left="105"/>
+	<button label="5 [CURRENCY]" label_selected="5 [CURRENCY]" name="fastpay 5" left="190"/>
+	<button label="10 [CURRENCY]" label_selected="10 [CURRENCY]" name="fastpay 10" left="105"/>
+	<button label="20 [CURRENCY]" label_selected="20 [CURRENCY]" 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/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml b/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
index 9ea970d89..7b0ac9992 100644
--- a/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
+++ b/indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="perm prefs" title="Droits par défaut">
-	<panel label="Droits" name="permissions">
-		<button label="?" label_selected="?" name="help"/>
-		<check_box label="Partager avec le groupe" name="share_with_group"/>
-		<check_box label="Autoriser tout le monde à copier" name="everyone_copy"/>
-		<text name="NextOwnerLabel">
-			Le prochain propriétaire pourra :
-		</text>
-		<check_box label="Modifier" name="next_owner_modify"/>
-		<check_box label="Copier" name="next_owner_copy"/>
-		<check_box label="Revendre/Donner" name="next_owner_transfer"/>
-	</panel>
-	<button label="OK" label_selected="OK" name="ok"/>
-	<button label="Annuler" label_selected="Annuler" name="cancel"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="perm prefs" title="Droits par défaut">
+	<panel label="Droits" name="permissions">
+		<button label="?" label_selected="?" name="help"/>
+		<check_box label="Partager avec le groupe" name="share_with_group"/>
+		<check_box label="Autoriser tout le monde à copier" name="everyone_copy"/>
+		<text name="NextOwnerLabel">
+			Le prochain propriétaire pourra:
+		</text>
+		<check_box label="Modifier" name="next_owner_modify"/>
+		<check_box label="Copier" name="next_owner_copy"/>
+		<check_box label="Revendre/Donner" name="next_owner_transfer"/>
+	</panel>
+	<button label="OK" label_selected="OK" name="ok"/>
+	<button label="Annuler" label_selected="Annuler" name="cancel"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_post_process.xml b/indra/newview/skins/default/xui/fr/floater_post_process.xml
index 52afb340a..b43e88fdd 100644
--- a/indra/newview/skins/default/xui/fr/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/fr/floater_post_process.xml
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Post-Process Floater" title="Paramètres post-traitement">
-	<tab_container name="Post-Process Tabs">
-		<panel label="Filtre couleur" name="wmiColorFilterPanel">
-			<check_box label="Activer" name="wmiColorFilterToggle" />
-			<text name="wmiColorFilterBrightnessText">
-				Luminosité
-			</text>
-			<text name="wmiColorFilterSaturationText">
-				Saturation
-			</text>
-			<text name="wmiColorFilterContrastText">
-				Contraste
-			</text>
-			<text name="wmiColorFilterBaseText">
-				Couleur de base du contraste
-			</text>
-			<slider label="R" name="wmiColorFilterBaseR" />
-			<slider label="V" name="wmiColorFilterBaseG" />
-			<slider label="B" name="wmiColorFilterBaseB" />
-			<slider label="I" name="wmiColorFilterBaseI" />
-		</panel>
-		<panel label="Vision de nuit" name="wmiNightVisionPanel">
-			<check_box label="Activer" name="wmiNightVisionToggle" />
-			<text name="wmiNightVisionBrightMultText">
-				Multiple d&apos;amplificateur de lumière
-			</text>
-			<text name="wmiNightVisionNoiseSizeText">
-				Taille du bruit
-			</text>
-			<text name="wmiNightVisionNoiseStrengthText">
-				Force du bruit
-			</text>
-		</panel>
-		<panel label="Éclat" name="wmiBloomPanel">
-			<check_box label="Activer" name="wmiBloomToggle" />
-			<text name="wmiBloomExtractText">
-				Extraction de la luminosité
-			</text>
-			<text name="wmiBloomSizeText">
-				Taille de l&apos;éclat
-			</text>
-			<text name="wmiBloomStrengthText">
-				Force de l&apos;éclat
-			</text>
-		</panel>
-		<panel label="Extras" name="Extras">
-			<button label="Charger effet" label_selected="Charger effet" name="PPLoadEffect" />
-			<button label="Enregistrer effet" label_selected="Enregistrer effet"
-			     name="PPSaveEffect" />
-			<line_editor label="Nom de l&apos;effet" name="PPEffectNameEditor" />
-		</panel>
-	</tab_container>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Post-Process Floater" title="Paramètres post-traitement">
+	<tab_container name="Post-Process Tabs">
+		<panel label="Filtre couleur" name="wmiColorFilterPanel">
+			<check_box label="Activer" name="wmiColorFilterToggle"/>
+			<text name="wmiColorFilterBrightnessText">
+				Luminosité
+			</text>
+			<text name="wmiColorFilterSaturationText">
+				Saturation
+			</text>
+			<text name="wmiColorFilterContrastText">
+				Contraste
+			</text>
+			<text name="wmiColorFilterBaseText">
+				Couleur de base du contraste
+			</text>
+			<slider label="R" name="wmiColorFilterBaseR"/>
+			<slider label="V" name="wmiColorFilterBaseG"/>
+			<slider label="B" name="wmiColorFilterBaseB"/>
+			<slider label="I" name="wmiColorFilterBaseI"/>
+		</panel>
+		<panel label="Vision de nuit" name="wmiNightVisionPanel">
+			<check_box label="Activer" name="wmiNightVisionToggle"/>
+			<text name="wmiNightVisionBrightMultText">
+				Multiple d&apos;amplificateur de lumière
+			</text>
+			<text name="wmiNightVisionNoiseSizeText">
+				Taille du bruit
+			</text>
+			<text name="wmiNightVisionNoiseStrengthText">
+				Force du bruit
+			</text>
+		</panel>
+		<panel label="Éclat" name="wmiBloomPanel">
+			<check_box label="Activer" name="wmiBloomToggle"/>
+			<text name="wmiBloomExtractText">
+				Extraction de la luminosité
+			</text>
+			<text name="wmiBloomSizeText">
+				Taille de l'éclat
+			</text>
+			<text name="wmiBloomStrengthText">
+				Force de l'éclat
+			</text>
+		</panel>
+		<panel label="Extras" name="Extras">
+			<button label="Charger effet" label_selected="Charger effet" name="PPLoadEffect"/>
+			<button label="Enregistrer effet" label_selected="Enregistrer effet"
+			     name="PPSaveEffect" />
+			<line_editor label="Nom de l'effet" name="PPEffectNameEditor"/>
+		</panel>
+	</tab_container>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_postcard.xml b/indra/newview/skins/default/xui/fr/floater_postcard.xml
index 38eb0ced4..b39ee7a6b 100644
--- a/indra/newview/skins/default/xui/fr/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/fr/floater_postcard.xml
@@ -1,45 +1,43 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Postcard" title="Envoyer la photo par e-mail">
-	<text name="to_label" width="135">
-		E-mail du destinataire :
-	</text>
-	<line_editor name="to_form" left="143" width="127" />
-	<text name="from_label">
-		Votre e-mail :
-	</text>
-	<line_editor name="from_form" left="143" width="127" />
-	<text name="name_label">
-		Votre nom :
-	</text>
-	<line_editor name="name_form" left="143" width="127" />
-	<text name="subject_label">
-		Sujet :
-	</text>
-	<line_editor name="subject_form" left="143" width="127" />
-	<line_editor label="Saisissez votre sujet ici." name="subject_form" />
-	<text name="msg_label">
-		Message :
-	</text>
-	<check_box label="Publier sur le web" name="allow_publish_check"
-	     tool_tip="Publiez cette carte postale sur le web." />
-	<check_box label="Contenu adulte" name="mature_check"
-	     tool_tip="Cette carte postale est à caractère adulte." />
-	<button label="?" name="publish_help_btn" />
-	<text_editor name="msg_form">
-		Saisissez votre message ici.
-	</text_editor>
-	<text name="fine_print">
-		Si le destinataire s&apos;inscrit sur Second Life, vous recevrez un bonus.
-	</text>
-	<button label="Annuler" name="cancel_btn" />
-	<button label="Envoyer" name="send_btn" />
-	<string name="default_subject">
-		Carte postale de Second Life.
-	</string>
-	<string name="default_message">
-		Ouvrez-moi !
-	</string>
-	<string name="upload_message">
-		Envoi en cours...
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Postcard" title="Envoyer la photo par e-mail">
+	<text name="to_label" width="135">
+		E-mail du destinataire:
+	</text>
+	<line_editor name="to_form" left="143" width="127"/>
+	<text name="from_label">
+		Votre e-mail:
+	</text>
+	<line_editor name="from_form" left="143" width="127"/>
+	<text name="name_label">
+		Votre nom:
+	</text>
+	<line_editor name="name_form" left="143" width="127"/>
+	<text name="subject_label">
+		Sujet:
+	</text>
+	<line_editor name="subject_form" left="143" width="127"/>
+	<line_editor label="Saisir le sujet ici." name="subject_form"/>
+	<text name="msg_label">
+		Message:
+	</text>
+	<check_box label="Publier sur le web" name="allow_publish_check" tool_tip="Publier cette carte postale sur le web."/>
+	<check_box label="Contenu adulte" name="mature_check" tool_tip="Cette carte postale est à caractère adulte."/>
+	<button label="?" name="publish_help_btn"/>
+	<text_editor name="msg_form">
+		Saisir le message ici:
+	</text_editor>
+	<text name="fine_print">
+		Si le destinataire s'inscrit sur [SECOND_LIFE], vous recevrez un bonus.
+	</text>
+	<button label="Annuler" name="cancel_btn"/>
+	<button label="Envoyer" name="send_btn"/>
+	<string name="default_subject">
+		Carte postale de [SECOND_LIFE].
+	</string>
+	<string name="default_message">
+		Ouvrez-moi!
+	</string>
+	<string name="upload_message">
+		Envoi en cours...
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preferences.xml b/indra/newview/skins/default/xui/fr/floater_preferences.xml
index 9dab4d642..e9b762eef 100644
--- a/indra/newview/skins/default/xui/fr/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preferences.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<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>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Preferences" title="Préférences" min_width="330" width="626">
+	<button label="A propos" label_selected="A 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/indra/newview/skins/default/xui/fr/floater_preview_animation.xml b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
index 566ea7350..78b4b6f0e 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_animation.xml
@@ -1,25 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-366" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="85" left="239" min_height="0"
-     min_width="0" mouse_opaque="true" name="preview_anim" width="300">
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
-	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
-	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-	     select_on_focus="false" width="194" spell_check="true" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
-	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
-		Description:
-	</text>
-	<button bottom="-66" enabled="true" font="SansSerif" halign="center" height="19"
-	     label="Jouer dans le monde" label_selected="Stop" left="4" mouse_opaque="true"
-	     name="Anim play btn" scale_image="true"
-	     tool_tip="Tout le monde voit" width="145" />
-	<button bottom="-66" enabled="true" font="SansSerif" halign="center" height="19"
-	     label="Jouer localement" label_selected="Stop" left_delta="150" mouse_opaque="true"
-	     name="Anim audition btn" scale_image="true"
-	     tool_tip="Vous êtes seul(e) à voir" width="135" />
-</floater>
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview_anim">
+	<text name="desc">
+		Description:
+	</text>
+	<button label="Jouer dans le monde" label_selected="Stop" left="4"  name="Anim play btn" tool_tip="Tout le monde voit" width="145" />
+	<button label="Jouer localement" label_selected="Stop" left_delta="150" name="Anim audition btn" tool_tip="Vous êtes seul(e) à voir" width="135"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_classified.xml b/indra/newview/skins/default/xui/fr/floater_preview_classified.xml
index 1b6f26150..02ca16e5b 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_classified.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_classified.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="classified_preview" title="Informations sur la petite annonce" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="classified_preview" title="Informations sur la petite annonce"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_event.xml b/indra/newview/skins/default/xui/fr/floater_preview_event.xml
index e7fc2aa8d..92bf9a3fd 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_event.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_event.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="event_preview" title="Informations sur l&apos;événement" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="event_preview" title="Informations sur l'événement"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_existing_landmark.xml b/indra/newview/skins/default/xui/fr/floater_preview_existing_landmark.xml
index 302951645..e79ac1ff5 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_existing_landmark.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_existing_landmark.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Linden Land, Da Boom (154, 135, 35)"
-     title="  Linden Land, Da Boom (154, 135, 35)">
-	<text type="string" length="1" name="desc txt">
-		Description :
-	</text>
-	<button label="Téléportation" label_selected="" name="Teleport btn" />
-	<button label="Localiser" label_selected="" name="Show on Map btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="existing_landmark_preview">
+	<text name="desc txt">
+		Description:
+	</text>
+	<button label="Téléportation" label_selected="" name="Teleport btn" />
+	<button label="Localiser" label_selected="" name="Show on Map btn" />
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
index d234059db..8615851cc 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_gesture.xml
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="gesture_preview">
-	<string name="stop_txt">
-		Stop
-	</string>
-	<string name="preview_txt">
-		Prévisualiser
-	</string>
-	<string name="none_text">
-		-- Aucune --
-	</string>
-	<text name="desc_label">
-		Description :
-	</text>
-	<text name="trigger_label">
-		Déclencheur :
-	</text>
-	<text name="replace_text"
-	     tool_tip="Remplacer les raccourcis avec ces mots. Par exemple, remplacer le mot-clé « salut » par « bonjour » fera dire « je venais dire bonjour » au lieu de « je venais dire salut » dans le chat, et déclenchera le geste.">
-		Remplacer par :
-	</text>
-	<line_editor left="310" name="replace_editor"
-	     tool_tip="Remplacer les raccourcis avec ces mots. Par exemple, remplacer le mot-clé « salut » par « bonjour » fera dire « je venais dire bonjour » au lieu de « je venais dire salut » dans le chat, et déclenchera le geste"
-	     width="120" />
-	<text name="key_label">
-		Raccourci :
-	</text>
-	<combo_box label="Aucun" name="modifier_combo" width="55" />
-	<combo_box label="Aucun" name="key_combo" width="55" />
-	<text name="library_label">
-		Bibliothèque :
-	</text>
-	<text name="steps_label">
-		Étapes :
-	</text>
-	<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" />
-	<button label="Supprimer" name="delete_btn" />
-	<text name="help_label">
-		Toutes les étapes ont lieu
-simultanément, sauf si vous
-ajoutez des pauses.
-	</text>
-	<radio_group name="animation_trigger_type">
-		<radio_item name="start">
-			Commencer
-		</radio_item>
-		<radio_item name="stop">
-			Stop
-		</radio_item>
-	</radio_group>
-	<check_box label="jusqu&apos;à la fin des animations" name="wait_anim_check" />
-	<check_box label="temps en secondes" name="wait_time_check" />
-	<line_editor left_delta="130" name="wait_time_editor" />
-	<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" width="86" />
-	<button label="Enregistrer" name="save_btn" width="86" left_delta="96"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="gesture_preview">
+	<string name="stop_txt">
+		Stop
+	</string>
+	<string name="preview_txt">
+		Prévisualiser
+	</string>
+	<string name="none_text">
+		-- Aucune --
+	</string>
+	<text name="desc_label">
+		Description:
+	</text>
+	<text name="trigger_label">
+		Déclencheur:
+	</text>
+	<text name="replace_text"
+	     tool_tip="Remplacer les raccourcis avec ces mots. Par exemple, remplacer le mot-clé « salut » par « bonjour » fera dire « je venais dire bonjour » au lieu de « je venais dire salut » dans le chat, et déclenchera le geste.">
+		Remplacer par:
+	</text>
+	<line_editor left="310" name="replace_editor"
+	     tool_tip="Remplacer les raccourcis avec ces mots. Par exemple, remplacer le mot-clé « salut » par « bonjour » fera dire « je venais dire bonjour » au lieu de « je venais dire salut » dans le chat, et déclenchera le geste"
+	     width="120"/>
+	<text name="key_label">
+		Raccourci:
+	</text>
+	<combo_box label="Aucun" name="modifier_combo" width="55" />
+	<combo_box label="Aucun" name="key_combo" width="55" />
+	<text name="library_label">
+		Bibliothèque:
+	</text>
+	<text name="steps_label">
+		Étapes:
+	</text>
+	<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"/>
+	<button label="Supprimer" name="delete_btn"/>
+	<text name="help_label">
+		Toutes les étapes sont
+simultanées, sauf si vous
+ajoutez des pauses.
+	</text>
+	<radio_group name="animation_trigger_type">
+		<radio_item name="start">
+			Commencer
+		</radio_item>
+		<radio_item name="stop">
+			Stop
+		</radio_item>
+	</radio_group>
+	<check_box label="jusqu'à la fin des animations" name="wait_anim_check"/>
+	<check_box label="temps en secondes" name="wait_time_check"/>
+	<line_editor left_delta="130" name="wait_time_editor"/>
+	<check_box label="Actifs" name="active_check"
+	     tool_tip="Les gestes actifs peuvent être déclenchés en saisissant leurs raccourcis dans le chat ou en appuyant sur les raccourcis. Les gestes deviennent généralement inactifs lorsqu'il y a un conflit entre les raccourcis."/>
+	<button label="Prévisualiser" name="preview_btn" width="86"/>
+	<button label="Enregistrer" name="save_btn" width="86" left_delta="96"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
index 5e7d7b86a..42b84ecdb 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_notecard.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview notecard" title="Remarque :">
-	<button label="Enregistrer" label_selected="Enregistrer" name="Save" />
-	<text type="string" length="1" name="desc txt">
-		Description :
-	</text>
-	<text_editor type="string" length="1" name="Notecard Editor">
-		Chargement...
-	</text_editor>
-	<string name="no_object">
-		Impossible de trouver l&apos;objet contenant cette note.
-	</string>
-	<string name="not_allowed">
-		Vous n&apos;êtes pas autorisé à afficher cette note.
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview notecard" title="Remarque:">
+	<button label="Enregistrer" label_selected="Enregistrer" name="Save"/>
+	<text name="desc txt">
+		Description:
+	</text>
+	<text_editor name="Notecard Editor">
+		Chargement...
+	</text_editor>
+	<string name="no_object">
+		Impossible de trouver l'objet contenant cette note.
+	</string>
+	<string name="not_allowed">
+		Vous n'êtes pas autorisé(e) à afficher cette note.
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_notecard_keep_discard.xml b/indra/newview/skins/default/xui/fr/floater_preview_notecard_keep_discard.xml
index f7c864614..210c59f35 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_notecard_keep_discard.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_notecard_keep_discard.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview_notecard">
-	<text_editor type="string" length="1" name="Notecard Editor">
-		Chargement..
-	</text_editor>
-	<text type="string" length="1" name="desc txt">
-		Description :
-	</text>
-	<button label="Garder" label_selected="Garder" name="Keep" />
-	<button label="Jeter" label_selected="Jeter" name="Discard" />
-	<string name="no_object">
-		Impossible de trouver l&apos;objet contenant cette note.
-	</string>
-	<string name="not_allowed">
-		Vous n&apos;êtes pas autorisé à afficher cette note.
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview_notecard">
+	<text_editor name="Notecard Editor">
+		Chargement...
+	</text_editor>
+	<text name="desc txt">
+		Description:
+	</text>
+	<button label="Garder" label_selected="Garder" name="Keep"/>
+	<button label="Jeter" label_selected="Jeter" name="Discard"/>
+	<string name="no_object">
+		Impossible de trouver l'objet contenant cette note.
+	</string>
+	<string name="not_allowed">
+		Vous n'êtes pas autorisé(e) à afficher cette note.
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
index e55ca1a58..a7f65b31e 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_sound.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview_sound">
-	<text type="string" length="1" name="desc txt">
-		Description :
-	</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="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"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview_sound">
+	<text name="desc">
+		Description:
+	</text>
+	<button label="Jouer dans le monde" label_selected="Jouer dans le monde"
+	     name="Sound play btn"
+	     tool_tip="Jouer ce son qui sera entendu par les avatars dans le &#x22;range&#x22;" width="138" left_delta="-142"/>
+	<button label="Jouer localement" label_selected="Jouer localement"
+	     name="Sound audition btn"
+	     tool_tip="Jouer ce son en &#xE9;tant le seul à l'entendre." width="125" left="162"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
index 33c5b51b2..4aa5fd295 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_texture.xml
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview_texture">
-	<text type="string" length="1" name="desc txt">
-		Description :
-	</text>
-	<button label="Garder" label_selected="Garder" name="Keep" />
-	<button label="Jeter" label_selected="Jeter" name="Discard" />
-	<button label="Copier vers l&apos;inventaire"
-	     label_selected="Copier vers l&apos;inventaire" name="Copy To Inventory" />
-	<text type="string" length="1" name="dimensions">
-		Dimensions : [WIDTH] x [HEIGHT]
-	</text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview_texture">
+	<text name="desc txt">
+		Description:
+	</text>
+	<button label="Garder" label_selected="Garder" name="Keep"/>
+	<button label="Jeter" label_selected="Jeter" name="Discard"/>
+	<button label="Copier vers l'inventaire" label_selected="Copier vers l'inventaire" name="Copy To Inventory"/>
+	<text name="dimensions">
+		Dimensions: [WIDTH] x [HEIGHT]
+	</text>
+</floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/fr/floater_preview_url.xml b/indra/newview/skins/default/xui/fr/floater_preview_url.xml
index 2a412e04b..68d7d7b67 100644
--- a/indra/newview/skins/default/xui/fr/floater_preview_url.xml
+++ b/indra/newview/skins/default/xui/fr/floater_preview_url.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="url_preview" title="Informations sur le lieu" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="url_preview" title="Informations sur le lieu" />
diff --git a/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml b/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
index d8668dcf8..266d50f58 100644
--- a/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/fr/floater_price_for_listing.xml
@@ -1,19 +1,19 @@
-<?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.
-	</text>
-	<text name="price_text" width="133">
-		Coût de l&apos;annonce (L$) :
-	</text>
-	<line_editor left="155" name="price_edit" />
-	<button label="Fixer le prix" name="set_price_btn"/>
-	<button label="Annuler" name="cancel_btn"/>
-</floater>
+<?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.
+	</text>
+	<text name="price_text" width="133">
+		Coût de l'annonce ([CURRENCY]) :
+	</text>
+	<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/indra/newview/skins/default/xui/fr/floater_profile.xml b/indra/newview/skins/default/xui/fr/floater_profile.xml
index c04e5a8e9..a293ba30b 100644
--- a/indra/newview/skins/default/xui/fr/floater_profile.xml
+++ b/indra/newview/skins/default/xui/fr/floater_profile.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="avatarinfo" title="Profil" width="460">
-	<panel name="Panel Avatar" width="470" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="avatarinfo" title="Profil" width="460">
+	<panel name="Panel Avatar" width="470"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_region_info.xml b/indra/newview/skins/default/xui/fr/floater_region_info.xml
index d69f212b8..be36b41f2 100644
--- a/indra/newview/skins/default/xui/fr/floater_region_info.xml
+++ b/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 et domaine"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="regioninfo" title="Région et domaine"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
index 628f308f8..f15600d53 100644
--- a/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/fr/floater_report_abuse.xml
@@ -1,183 +1,183 @@
-<?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>
-	<text name="reporter_field">
-		Loremipsum Dolorsitamut
-	</text>
-	<text name="sim_title">
-		Région :
-	</text>
-	<text name="sim_field">
-		Nom de la région
-	</text>
-	<text name="pos_title">
-		Position :
-	</text>
-	<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_item name="Select_category">
-			Sélectionnez une catégorie
-		</combo_item>
-		<combo_item name="Age__Age_play">
-			Âge &gt; « Age play »
-		</combo_item>
-		<combo_item name="Age__Adult_resident_on_Teen_Second_Life">
-			Âge &gt; Résident adulte sur Second Life pour adolescents
-		</combo_item>
-		<combo_item name="Age__Underage_resident_outside_of_Teen_Second_Life">
-			Âge &gt; Resident mineur en dehors de Teen Second Life
-		</combo_item>
-		<combo_item name="Assault__Combat_sandbox___unsafe_area">
-			Assaut &gt; Bac à sable utilisé pour des combats/zone non sécurisée
-		</combo_item>
-		<combo_item name="Assault__Safe_area">
-			Assaut &gt; Zone sécurisée
-		</combo_item>
-		<combo_item name="Assault__Weapons_testing_sandbox">
-			Assaut &gt; Bac à sable pour tests d&apos;armes à feu
-		</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__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
-		</combo_item>
-		<combo_item name="Disclosure__Second_Life_information_chat_IMs">
-			Divulgation &gt; Informations sur Second Life/chat/IM
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
-			Trouble de la paix &gt; Utilisation inadéquate des ressources de la région
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
-			Trouble de la paix &gt; Nombre d&apos;objets scriptés excessif
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Object_littering">
-			Trouble de la paix &gt; Abandon d&apos;objets
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Repetitive_spam">
-			Trouble de la paix &gt; Spam à répétition
-		</combo_item>
-		<combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
-			Trouble de la paix &gt; Spam à caractère commercial
-		</combo_item>
-		<combo_item name="Fraud__L$">
-			Fraude &gt; L$
-		</combo_item>
-		<combo_item name="Fraud__Land">
-			Fraude &gt; Terrain
-		</combo_item>
-		<combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
-			Fraude &gt; Vente pyramidale ou lettre-chaîne
-		</combo_item>
-		<combo_item name="Fraud__US$">
-			Fraude &gt; US$
-		</combo_item>
-		<combo_item name="Harassment__Advert_farms___visual_spam">
-			Harcèlement &gt; Spam visuel
-		</combo_item>
-		<combo_item name="Harassment__Defaming_individuals_or_groups">
-			Harcèlement &gt; Diffamation envers des individus ou des groupes
-		</combo_item>
-		<combo_item name="Harassment__Impeding_movement">
-			Harcèlement &gt; Immobilisation
-		</combo_item>
-		<combo_item name="Harassment__Sexual_harassment">
-			Harcèlement &gt;  Harcèlement sexuel
-		</combo_item>
-		<combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
-			Harcèlement &gt; Incitation à enfreindre les Conditions d&apos;utilisation
-		</combo_item>
-		<combo_item name="Harassment__Verbal_abuse">
-			Harcèlement &gt; Abus verbal
-		</combo_item>
-		<combo_item name="Indecency__Broadly_offensive_content_or_conduct">
-			Indécence &gt; Contenu ou comportement offensifs
-		</combo_item>
-		<combo_item name="Indecency__Inappropriate_avatar_name">
-			Indécence &gt; Nom d&apos;avatar inapproprié
-		</combo_item>
-		<combo_item name="Indecency__Mature_content_in_PG_region">
-			Indécence &gt; Contenu ou conduite inappropriés dans une région PG
-		</combo_item>
-		<combo_item name="Indecency__Inappropriate_content_in_Mature_region">
-			Indécence &gt; Contenu ou conduite inappropriés dans une région Mature
-		</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 droits
-		</combo_item>
-		<combo_item name="Intolerance">
-			Intolérance
-		</combo_item>
-		<combo_item name="Land__Abuse_of_sandbox_resources">
-			Terrain &gt; Utilisation abusive des ressources du bac à sable
-		</combo_item>
-		<combo_item name="Land__Encroachment__Objects_textures">
-			Terrain &gt; Empiètement &gt; Objets/textures
-		</combo_item>
-		<combo_item name="Land__Encroachment__Particles">
-			Terrain &gt; Empiètement &gt; Particules
-		</combo_item>
-		<combo_item name="Land__Encroachment__Trees_plants">
-			Terrain &gt; Empiètement &gt; Arbres/plantes
-		</combo_item>
-		<combo_item name="Wagering_gambling">
-			Paris/jeux d&apos;argent
-		</combo_item>
-		<combo_item name="Other">
-			Autre
-		</combo_item>
-	</combo_box>
-	<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"/>
-	<text name="abuser_name_title2">
-		Indiquez où l&apos;infraction a eu lieu :
-	</text>
-	<text name="sum_title">
-		Récapitulatif :
-	</text>
-	<text name="dscr_title">
-		Détails :
-	</text>
-	<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. 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="Annuler" label_selected="Annuler" name="cancel_btn"/>
-	<button label="Signaler une infraction" label_selected="Signaler une infraction" name="send_btn"/>
-</floater>
+<?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'écran" name="screen_check"/>
+	<text name="reporter_title" width="60">
+		Déposant:
+	</text>
+	<text name="reporter_field">
+		Loremipsum Dolorsitamut
+	</text>
+	<text name="sim_title">
+		Région:
+	</text>
+	<text name="sim_field">
+		Nom de la région
+	</text>
+	<text name="pos_title">
+		Position:
+	</text>
+	<text name="pos_field">
+		{128.1, 128.1, 15.4}
+	</text>
+	<text name="select_object_label">
+		Cliquer sur le bouton puis l'objet:
+	</text>
+	<button label="" label_selected="" name="pick_btn" tool_tip="Le sélecteur d'objet vous permet d'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_item name="Select_category">
+			Sélectionner une catégorie
+		</combo_item>
+		<combo_item name="Age__Age_play">
+			Âge &gt; « Age play »
+		</combo_item>
+		<combo_item name="Age__Adult_resident_on_Teen_Second_Life">
+			Âge &gt; Résident adulte sur Second Life pour adolescents
+		</combo_item>
+		<combo_item name="Age__Underage_resident_outside_of_Teen_Second_Life">
+			Âge &gt; Resident mineur en dehors de Teen Second Life
+		</combo_item>
+		<combo_item name="Assault__Combat_sandbox___unsafe_area">
+			Assaut &gt; Bac à sable utilisé pour des combats/zone non sécurisée
+		</combo_item>
+		<combo_item name="Assault__Safe_area">
+			Assaut &gt; Zone sécurisée
+		</combo_item>
+		<combo_item name="Assault__Weapons_testing_sandbox">
+			Assaut &gt; Bac à sable pour tests d'armes à feu
+		</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__Real_world_information">
+			Divulgation &gt; Informations sur la vie réelle
+		</combo_item>
+		<combo_item name="Disclosure__Remotely_monitoring chat">
+			Divulgation &gt; Écoute d'un chat à distance
+		</combo_item>
+		<combo_item name="Disclosure__Second_Life_information_chat_IMs">
+			Divulgation &gt; Informations sur Second Life/chat/IM
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
+			Trouble de la paix &gt; Utilisation inadéquate des ressources de la région
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
+			Trouble de la paix &gt; Nombre d'objets scriptés excessif
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Object_littering">
+			Trouble de la paix &gt; Abandon d'objets
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Repetitive_spam">
+			Trouble de la paix &gt; Spam à répétition
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
+			Trouble de la paix &gt; Spam à caractère commercial
+		</combo_item>
+		<combo_item name="Fraud__L$">
+			Fraude &gt; L$
+		</combo_item>
+		<combo_item name="Fraud__Land">
+			Fraude &gt; Terrain
+		</combo_item>
+		<combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
+			Fraude &gt; Vente pyramidale ou lettre-chaîne
+		</combo_item>
+		<combo_item name="Fraud__US$">
+			Fraude &gt; US$
+		</combo_item>
+		<combo_item name="Harassment__Advert_farms___visual_spam">
+			Harcèlement &gt; Spam visuel
+		</combo_item>
+		<combo_item name="Harassment__Defaming_individuals_or_groups">
+			Harcèlement &gt; Diffamation envers des individus ou des groupes
+		</combo_item>
+		<combo_item name="Harassment__Impeding_movement">
+			Harcèlement &gt; Immobilisation
+		</combo_item>
+		<combo_item name="Harassment__Sexual_harassment">
+			Harcèlement &gt;  Harcèlement sexuel
+		</combo_item>
+		<combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
+			Harcèlement &gt; Incitation à enfreindre les Conditions d'utilisation
+		</combo_item>
+		<combo_item name="Harassment__Verbal_abuse">
+			Harcèlement &gt; Abus verbal
+		</combo_item>
+		<combo_item name="Indecency__Broadly_offensive_content_or_conduct">
+			Indécence &gt; Contenu ou comportement offensifs
+		</combo_item>
+		<combo_item name="Indecency__Inappropriate_avatar_name">
+			Indécence &gt; Nom d'avatar inapproprié
+		</combo_item>
+		<combo_item name="Indecency__Mature_content_in_PG_region">
+			Indécence &gt; Contenu ou conduite inappropriés dans une région PG
+		</combo_item>
+		<combo_item name="Indecency__Inappropriate_content_in_Mature_region">
+			Indécence &gt; Contenu ou conduite inappropriés dans une région Mature
+		</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 droits
+		</combo_item>
+		<combo_item name="Intolerance">
+			Intolérance
+		</combo_item>
+		<combo_item name="Land__Abuse_of_sandbox_resources">
+			Terrain &gt; Utilisation abusive des ressources du bac à sable
+		</combo_item>
+		<combo_item name="Land__Encroachment__Objects_textures">
+			Terrain &gt; Empiètement &gt; Objets/textures
+		</combo_item>
+		<combo_item name="Land__Encroachment__Particles">
+			Terrain &gt; Empiètement &gt; Particules
+		</combo_item>
+		<combo_item name="Land__Encroachment__Trees_plants">
+			Terrain &gt; Empiètement &gt; Arbres/plantes
+		</combo_item>
+		<combo_item name="Wagering_gambling">
+			Paris/jeux d'argent
+		</combo_item>
+		<combo_item name="Other">
+			Autre
+		</combo_item>
+	</combo_box>
+	<text name="abuser_name_title">
+		Nom du contrevenant:
+	</text>
+	<button label="Choisir le résident" label_selected="" name="select_abuser" tool_tip="Sélectionner 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="Cocher cette case si vous ne connaissez pas le nom du contrevenant"/>
+	<text name="abuser_name_title2">
+		Indiquez où l'infraction a eu lieu:
+	</text>
+	<text name="sum_title">
+		Récapitulatif:
+	</text>
+	<text name="dscr_title">
+		Détails:
+	</text>
+	<text name="bug_aviso">
+		Indiquez la date, le lieu, la nature de l'infraction, ainsi que
+tout chat ou IM relatif à l&apos;infraction, en étant aussi précis
+que possible. Pensez à indiquer un objet si possible.
+	</text>
+	<text bottom_delta="-16" name="incomplete_title">
+		Remarque: les rapports incomplets ne feront pas l'objet d'une
+enquête.
+	</text>
+	<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/indra/newview/skins/default/xui/fr/floater_report_bug.xml b/indra/newview/skins/default/xui/fr/floater_report_bug.xml
index 80a42f14b..c11ae70c2 100644
--- a/indra/newview/skins/default/xui/fr/floater_report_bug.xml
+++ b/indra/newview/skins/default/xui/fr/floater_report_bug.xml
@@ -1,108 +1,108 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="bug_reporter" title="Signaler un bug">
-	<text name="reporter_title">
-		Signalant :
-	</text>
-	<text name="sim_title">
-		Sim :
-	</text>
-	<text name="pos_title">
-		Position :
-	</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 name="object_name">
-		Consetetur Sadipscing
-	</text>
-	<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"/>
-	<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_item name="Selectcategory">
-			Sélectionnez une catégorie
-		</combo_item>
-		<combo_item name="Building">
-			Construire
-		</combo_item>
-		<combo_item name="Character">
-			Personnage
-		</combo_item>
-		<combo_item name="Chat/IM">
-			Chat/IM
-		</combo_item>
-		<combo_item name="Documentation">
-			Documentation
-		</combo_item>
-		<combo_item name="Exploit">
-			Exploit
-		</combo_item>
-		<combo_item name="Graphics">
-			Graphiques
-		</combo_item>
-		<combo_item name="Inventory">
-			Inventaire
-		</combo_item>
-		<combo_item name="Lag">
-			Lag
-		</combo_item>
-		<combo_item name="MissingContent">
-			Contenu manquant
-		</combo_item>
-		<combo_item name="LindenDollars(L$)">
-			Dollar Linden (L$)
-		</combo_item>
-		<combo_item name="Permissions">
-			Autorisations
-		</combo_item>
-		<combo_item name="Physics">
-			Propriétés physiques
-		</combo_item>
-		<combo_item name="Script">
-			Script
-		</combo_item>
-		<combo_item name="Sound">
-			Son
-		</combo_item>
-		<combo_item name="Stipends">
-			Subsides
-		</combo_item>
-		<combo_item name="Userinterface">
-			Interface utilisateur
-		</combo_item>
-		<combo_item name="Miscellaneous">
-			Divers
-		</combo_item>
-	</combo_box>
-	<text name="sum_title">
-		Récapitulatif :
-	</text>
-	<text name="dscr_title">
-		Détails (soyez aussi précis que possible) :
-	</text>
-	<text_editor name="details_edit">
-		Étapes pour reproduire le bug :
-
-Résultats observés :
-
-Résultats attendus :
-	</text_editor>
-	<text name="bug_aviso">
-		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"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="bug_reporter" title="Signaler un bug">
+	<text name="reporter_title">
+		Signalant:
+	</text>
+	<text name="sim_title">
+		Sim:
+	</text>
+	<text name="pos_title">
+		Position:
+	</text>
+	<text name="select_object_label">
+		Cliquer sur le bouton puis l'objet:
+	</text>
+	<button label="" label_selected="" name="pick_btn" tool_tip="Le sélecteur d'objet vous permet d'identifier un objet comme sujet du rapport."/>
+	<text name="object_name_label">
+		Nom:
+	</text>
+	<text name="object_name">
+		Consetetur Sadipscing
+	</text>
+	<text name="owner_name_label">
+		Propriétaire :
+	</text>
+	<check_box label="Inclure une capture d'é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_item name="Selectcategory">
+			Sélectionner une catégorie
+		</combo_item>
+		<combo_item name="Building">
+			Construire
+		</combo_item>
+		<combo_item name="Character">
+			Personnage
+		</combo_item>
+		<combo_item name="Chat/IM">
+			Chat/IM
+		</combo_item>
+		<combo_item name="Documentation">
+			Documentation
+		</combo_item>
+		<combo_item name="Exploit">
+			Exploit
+		</combo_item>
+		<combo_item name="Graphics">
+			Graphiques
+		</combo_item>
+		<combo_item name="Inventory">
+			Inventaire
+		</combo_item>
+		<combo_item name="Lag">
+			Lag
+		</combo_item>
+		<combo_item name="MissingContent">
+			Contenu manquant
+		</combo_item>
+		<combo_item name="LindenDollars(L$)">
+			Dollar Linden (L$)
+		</combo_item>
+		<combo_item name="Permissions">
+			Autorisations
+		</combo_item>
+		<combo_item name="Physics">
+			Propriétés physiques
+		</combo_item>
+		<combo_item name="Script">
+			Script
+		</combo_item>
+		<combo_item name="Sound">
+			Son
+		</combo_item>
+		<combo_item name="Stipends">
+			Subsides
+		</combo_item>
+		<combo_item name="Userinterface">
+			Interface utilisateur
+		</combo_item>
+		<combo_item name="Miscellaneous">
+			Divers
+		</combo_item>
+	</combo_box>
+	<text name="sum_title">
+		Récapitulatif:
+	</text>
+	<text name="dscr_title">
+		Détails (soyez aussi précis que possible):
+	</text>
+	<text_editor name="details_edit">
+		Étapes pour reproduire le bug:
+
+Résultats observés:
+
+Résultats attendus:
+	</text_editor>
+	<text name="bug_aviso">
+		Remarque : les rapports incomplets ne feront pas l'objet d'une enquête.
+Si ce bug vous permet de faire quelque chose que vous ne devriez pas pouvoir faire, surtout s'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"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_script_debug.xml b/indra/newview/skins/default/xui/fr/floater_script_debug.xml
index 3664222fd..c6e838ec2 100644
--- a/indra/newview/skins/default/xui/fr/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_debug.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater name="script debug floater" title="Erreurs/alertes de scripts">
-	<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="Erreurs/alertes de scripts">
+	<tab_container name="Preview Tabs">
+		<floater label="Script" name="all_scripts" title="[All scripts]"/>
+	</tab_container>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_script_ed_panel.xml b/indra/newview/skins/default/xui/fr/floater_script_ed_panel.xml
index 3f9c4b82c..34d5f05b1 100644
--- a/indra/newview/skins/default/xui/fr/floater_script_ed_panel.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_ed_panel.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="script panel">
-	<button label="Enregistrer" label_selected="Enregistrer" name="Save_btn" />
-	<text_editor type="string" length="1" name="Script Editor">
-		Chargement...
-	</text_editor>
-	<combo_box label="Insérer..." name="Insert..." />
-	<menu_bar name="script_menu">
-		<menu name="File">
-			<menu_item_call label="Enregistrer" name="Save" />
-			<menu_item_call label="Annuler tous les changements" name="Revert All Changes" />
-		</menu>
-		<menu name="Edit">
-			<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_separator label="-----------" name="separator2" />
-			<menu_item_call label="Tout sélectionner" name="Select All" />
-			<menu_item_call label="Désélectionner" name="Deselect" />
-			<menu_item_separator label="-----------" name="separator3" />
-			<menu_item_call label="Rechercher/Remplacer..." name="Search / Replace..." />
-		</menu>
-		<menu name="Help">
-			<menu_item_call label="Aide..." name="Help..." />
-			<menu_item_call label="Aide du Wiki sur le LSL..." name="LSL Wiki Help..." />
-		</menu>
-	</menu_bar>
-	<string name="loading">
-		Chargement...
-	</string>
-	<string name="can_not_view">
-		Vous n&apos;êtes pas autorisé à afficher ce script.
-	</string>
-	<string name="public_objects_can_not_run">
-		Les objets publics ne peuvent pas exécuter de scripts
-	</string>
-	<string name="script_running">
-		Exécution en cours
-	</string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="script panel">
+	<button label="Enregistrer" label_selected="Enregistrer" name="Save_btn"/>
+	<text_editor name="Script Editor">
+		Chargement...
+	</text_editor>
+	<combo_box label="Insérer" name="Insert..."/>
+	<menu_bar name="script_menu">
+		<menu name="File">
+			<menu_item_call label="Enregistrer" name="Save"/>
+			<menu_item_call label="Annuler tous les changements" name="Revert All Changes"/>
+		</menu>
+		<menu name="Edit">
+			<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_separator label="-----------" name="separator2"/>
+			<menu_item_call label="Tout sélectionner" name="Select All"/>
+			<menu_item_call label="Désélectionner" name="Deselect"/>
+			<menu_item_separator label="-----------" name="separator3"/>
+			<menu_item_call label="Rechercher/Remplacer" name="Search / Replace..."/>
+		</menu>
+		<menu name="Help">
+			<menu_item_call label="Aide" name="Help..."/>
+			<menu_item_call label="Aide du Wiki sur le LSL" name="LSL Wiki Help..."/>
+		</menu>
+	</menu_bar>
+	<string name="loading">
+		Chargement...
+	</string>
+	<string name="can_not_view">
+		Vous n&apos;êtes pas autorisé à afficher ce script.
+	</string>
+	<string name="public_objects_can_not_run">
+		Les objets publics ne peuvent pas exécuter de scripts.
+	</string>
+	<string name="script_running">
+		Exécution en cours...
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_script_preview.xml b/indra/newview/skins/default/xui/fr/floater_script_preview.xml
index 4b77d6b4c..f0396db99 100644
--- a/indra/newview/skins/default/xui/fr/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_preview.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="preview lsl text" title="Script : Script de rotation">
-	<text type="string" length="1" name="desc txt">
-		Description :
-	</text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="preview lsl text" title="Script: Script de rotation">
+	<text type="string" length="1" name="desc txt">
+		Description:
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_script_queue.xml b/indra/newview/skins/default/xui/fr/floater_script_queue.xml
index 55487f75d..4471881ee 100644
--- a/indra/newview/skins/default/xui/fr/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_queue.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="queue" title="Réinitialiser progression">
-	<button label="Fermer" label_selected="Fermer" name="close" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="queue" title="Réinitialiser progression">
+	<button label="Fermer" label_selected="Fermer" name="close"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_script_search.xml b/indra/newview/skins/default/xui/fr/floater_script_search.xml
index 1c20c9c34..58ba2f8b2 100644
--- a/indra/newview/skins/default/xui/fr/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/fr/floater_script_search.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="script search" title="Recherche de scripts" width="320">
-	<check_box label="Non sensible à la casse" name="case_text"  left="75"/>
-	<button label="Rechercher" label_selected="Rechercher" name="search_btn" width="96"/>
-	<button label="Remplacer" label_selected="Remplacer" name="replace_btn" left="111" width="96"/>
-	<button label="Tout remplacer" label_selected="Tout remplacer" name="replace_all_btn" left="212" width="96"/>
-	<text type="string" length="1" name="txt" width="65">
-		Rechercher
-	</text>
-	<text type="string" length="1" name="txt2" width="65">
-		Remplacer
-	</text>
-	<line_editor left="75" name="search_text" width="240" />
-	<line_editor left="75" name="replace_text" width="240" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="script search" title="Recherche de scripts" width="320">
+	<check_box label="Non sensible à la casse" name="case_text" left="75"/>
+	<button label="Rechercher" label_selected="Rechercher" name="search_btn" width="96"/>
+	<button label="Remplacer" label_selected="Remplacer" name="replace_btn" left="111" width="96"/>
+	<button label="Tout remplacer" label_selected="Tout remplacer" name="replace_all_btn" left="212" width="96"/>
+	<text name="txt" width="65">
+		Rechercher
+	</text>
+	<text name="txt2" width="65">
+		Remplacer
+	</text>
+	<line_editor left="75" name="search_text" width="240"/>
+	<line_editor left="75" name="replace_text" width="240"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_select_key.xml b/indra/newview/skins/default/xui/fr/floater_select_key.xml
index 0dc47df72..d5f30dcf4 100644
--- a/indra/newview/skins/default/xui/fr/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/fr/floater_select_key.xml
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container">
-	<button label="Annuler" label_selected="Annuler" name="Cancel" />
-	<text name="Save item as:">
-		Appuyer sur une touche pour choisir
-	</text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container">
+	<button label="Annuler" label_selected="Annuler" name="Cancel" />
+	<text name="Save item as:">
+		Appuyez sur une touche pour choisir.
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_sell_land.xml b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
index cf394643b..f0d257906 100644
--- a/indra/newview/skins/default/xui/fr/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/fr/floater_sell_land.xml
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="sell land" title="Vendre terrain">
-	<text name="info_parcel_label">
-		Parcelle :
-	</text>
-	<text name="info_parcel">
-		PARCEL NAME
-	</text>
-	<text name="info_size_label">
-		Taille :
-	</text>
-	<text name="info_size">
-		[AREA] m²
-	</text>
-	<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>
-	<text name="price_text">
-		Fixez un prix convenable pour ce terrain.
-	</text>
-	<text name="price_ld">
-		L$
-	</text>
-	<text name="price_per_m">
-		([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.
-	</text>
-	<combo_box name="sell_to" bottom_delta="-32">
-		<combo_item name="--selectone--">
-			-- Sélectionnez --
-		</combo_item>
-		<combo_item name="Anyone">
-			N&apos;importe qui
-		</combo_item>
-		<combo_item name="Specificuser:">
-			Acheteur spécifique :
-		</combo_item>
-	</combo_box>
-	<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.
-	</text>
-	<radio_group name="sell_objects" right="430" bottom_delta="-54">
-		<radio_item name="no">
-			Non, rester le propriétaire des objets
-		</radio_item>
-		<radio_item name="yes">
-			Oui, vendre les objets avec le terrain
-		</radio_item>
-	</radio_group>
-	<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" width="165"/>
-	<button label="Annuler" name="cancel_btn"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="sell land" title="Vendre terrain">
+	<text name="info_parcel_label">
+		Parcelle:
+	</text>
+	<text name="info_parcel">
+		PARCEL NAME
+	</text>
+	<text name="info_size_label">
+		Taille:
+	</text>
+	<text name="info_size">
+		[AREA] m²
+	</text>
+	<text name="info_action" bottom_delta="-60">
+		Pour vendre cette
+parcelle:
+	</text>
+	<icon bottom_delta="-86" name="step_price" />
+	<text name="price_label">
+		Prix de vente:
+	</text>
+	<text name="price_text">
+		Fixer un prix convenable pour ce terrain.
+	</text>
+	<text name="price_ld">
+		[CURRENCY]
+	</text>
+	<text name="price_per_m">
+		([PER_METER] [CURRENCY] par mètre carré)
+	</text>
+	<text name="sell_to_label">
+		Vos acheteurs:
+	</text>
+	<text name="sell_to_text">
+		Vendre votre terrain à n'importe qui ou uniquement à un acheteur
+spécifique.
+	</text>
+	<combo_box name="sell_to" bottom_delta="-32">
+		<combo_item name="--selectone--">
+			-- Sélectionnez --
+		</combo_item>
+		<combo_item name="Anyone">
+			N'importe qui
+		</combo_item>
+		<combo_item name="Specificuser:">
+			Acheteur spécifique:
+		</combo_item>
+	</combo_box>
+	<button label="Sélectionner" name="sell_to_select_agent" width="100"/>
+	<text name="sell_objects_label">
+		Vente des objets avec ce terrain?
+	</text>
+	<text name="sell_objects_text">
+		Les objets transférables se trouvant sur la parcelle changeront
+de propriétaire.
+	</text>
+	<radio_group name="sell_objects" right="430" bottom_delta="-54">
+		<radio_item name="no">
+			Non, rester le propriétaire des objets.
+		</radio_item>
+		<radio_item name="yes">
+			Oui, vendre les objets avec le terrain.
+		</radio_item>
+	</radio_group>
+	<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" width="165"/>
+	<button label="Annuler" name="cancel_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
index 30183340f..e0242f40b 100644
--- a/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/fr/floater_settings_debug.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="settings_debug" title="Paramétrages du mode Debug">
-	<combo_box name="boolean_combo">
-		<combo_item name="TRUE">
-			TRUE
-		</combo_item>
-		<combo_item name="FALSE">
-			FALSE
-		</combo_item>
-	</combo_box>
-	<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" />
-	<spinner label="x" name="val_spinner_4" />
-	<button label="Paramètres par défaut" name="default_btn" />
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="settings_debug" title="Paramétrages du mode Debug">
+	<combo_box name="boolean_combo">
+		<combo_item name="TRUE">
+			VRAI
+		</combo_item>
+		<combo_item name="FALSE">
+			FAUX
+		</combo_item>
+	</combo_box>
+	<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"/>
+	<spinner label="x" name="val_spinner_4"/>
+	<button label="Paramètres par défaut" name="default_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_sim_release_message.xml b/indra/newview/skins/default/xui/fr/floater_sim_release_message.xml
index dc1e4eaa4..4babe6f33 100644
--- a/indra/newview/skins/default/xui/fr/floater_sim_release_message.xml
+++ b/indra/newview/skins/default/xui/fr/floater_sim_release_message.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floaterreleasemessage" title="Arrivée dans la région">
-	<button label="Fermer" name="close_btn" />
-	<string name="in-world_help_title">
-		Aide dans le Monde
-	</string>
-	<string name="in-world_help_url">
-		http://www.secondlife.com/app/support/inworld.html
-	</string>
-	<string name="additional_help_title">
-		Aide supplémentaire
-	</string>
-	<string name="additional_help_url">
-		http://www.secondlife.com/app/support/support.html
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floaterreleasemessage" title="Arrivée dans la région">
+	<button label="Fermer" name="close_btn" />
+	<string name="in-world_help_title">
+		Aide dans le Monde
+	</string>
+	<string name="in-world_help_url">
+		http://www.secondlife.com/app/support/inworld.html
+	</string>
+	<string name="additional_help_title">
+		Aide supplémentaire
+	</string>
+	<string name="additional_help_url">
+		http://www.secondlife.com/app/support/support.html
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_skin_preview_template.xml b/indra/newview/skins/default/xui/fr/floater_skin_preview_template.xml
index 44397458d..09678bd48 100644
--- a/indra/newview/skins/default/xui/fr/floater_skin_preview_template.xml
+++ b/indra/newview/skins/default/xui/fr/floater_skin_preview_template.xml
@@ -1,34 +1,34 @@
-<?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."/>
-	<panel name="panel_littletoolbar">
-		<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"/>
-		<text_editor name="Chat History Editor">
-			Texte
-		</text_editor>
-	</panel>
-	<panel name="panel_focused_floater">
-		<text name="titlebar_focused">
-			Mise au point
-		</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"/>
-				<text_editor name="Chat History Editor">
-					Texte du chat
-				</text_editor>
-			</panel>
-			<panel label="Pas de mise au point" name="test_2"/>
-		</tab_container>
-	</panel>
-</multi_floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<multi_floater name="floater_chatterbox">
+	<icon label="Voler" label_selected="Atterrir" name="" tool_tip="Début du vol. Utilisez E/C ou PgHaut/PgBas pour voler vers le haut et vers le bas."/>
+	<panel name="panel_littletoolbar">
+		<button name="chat_btn" tool_tip="Affiche la barre de chat. (Entrée)"/>
+		<flyout_button label="Communiquer" name="communicate_btn" tool_tip="Communiquez avec vos ami(e)s et vos groupes."/>
+		<button label="Voler" label_selected="Atterrir" name="fly_btn" tool_tip="Début du vol. Utilisez E/C ou PgHaut/PgBas 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"/>
+		<text_editor name="Chat History Editor">
+			Texte
+		</text_editor>
+	</panel>
+	<panel name="panel_focused_floater">
+		<text name="titlebar_focused">
+			Mise au point
+		</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"/>
+				<text_editor name="Chat History Editor">
+					Texte du chat
+				</text_editor>
+			</panel>
+			<panel label="Pas de mise au point" name="test_2"/>
+		</tab_container>
+	</panel>
+</multi_floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_snapshot.xml b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
index 4351a1a78..bf01fd79e 100644
--- a/indra/newview/skins/default/xui/fr/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/fr/floater_snapshot.xml
@@ -1,137 +1,142 @@
-<?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>
-	<radio_group label="Type de photo" name="snapshot_type_radio" width="228">
-		<radio_item name="postcard">
-			Envoyer par e-mail
-		</radio_item>
-		<radio_item name="texture">
-			Enregistrer dans votre inventaire ([AMOUNT] 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"/>
-	<text name="type_label2">
-		Taille
-	</text>
-	<text name="format_label">
-		Format
-	</text>
-	<combo_box label="Résolution" name="postcard_size_combo">
-		<combo_item name="640x480">
-			640 x 480
-		</combo_item>
-		<combo_item name="800x600">
-			800 x 600
-		</combo_item>
-		<combo_item name="1024x768">
-			1024 x 768
-		</combo_item>
-		<combo_item name="CurrentWindow">
-			Fenêtre actuelle
-		</combo_item>
-		<combo_item name="Custom">
-			Personnaliser
-		</combo_item>
-	</combo_box>
-	<combo_box label="Résolution" name="texture_size_combo">
-		<combo_item name="CurrentWindow">
-			Fenêtre actuelle
-		</combo_item>
-		<combo_item name="Small(128x128)">
-			Petite (128 x 128)
-		</combo_item>
-		<combo_item name="Medium(256x256)">
-			Moyenne (256 x 256)
-		</combo_item>
-		<combo_item name="Large(512x512)">
-			Grande (512 x 512)
-		</combo_item>
-		<combo_item name="Custom">
-			Personnaliser
-		</combo_item>
-	</combo_box>
-	<combo_box label="Résolution" name="local_size_combo">
-		<combo_item name="CurrentWindow">
-			Fenêtre actuelle
-		</combo_item>
-		<combo_item name="320x240">
-			320 x 240
-		</combo_item>
-		<combo_item name="640x480">
-			640 x 480
-		</combo_item>
-		<combo_item name="800x600">
-			800 x 600
-		</combo_item>
-		<combo_item name="1024x768">
-			1024 x 768
-		</combo_item>
-		<combo_item name="1280x1024">
-			1280 x 1024
-		</combo_item>
-		<combo_item name="1600x1200">
-			1600 x 1200
-		</combo_item>
-		<combo_item name="Custom">
-			Personnaliser
-		</combo_item>
-	</combo_box>
-	<combo_box label="Format" 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="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>
-	<combo_box label="Couches de l&apos;image" name="layer_types">
-		<combo_item name="Colors">
-			Couleurs
-		</combo_item>
-		<combo_item name="Depth">
-			Profondeur
-		</combo_item>
-		<combo_item name="ObjectMattes">
-			Matte des objets
-		</combo_item>
-	</combo_box>
-	<text name="file_size_label">
-		Taille du fichier : [SIZE] Ko
-	</text>
-	<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 ([AMOUNT] 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>
-		<flyout_button_item name="saveas_item">
-			Enregistrer sous...
-		</flyout_button_item>
-	</flyout_button>
-	<button label="Annuler" name="discard_btn" left="133" width="72" />
-	<string name="unknown">
-		inconnu
-	</string>
-</floater>
+<?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>
+	<radio_group label="Type de photo" name="snapshot_type_radio" width="228">
+		<radio_item name="postcard">
+			Envoyez par e-mail
+		</radio_item>
+		<radio_item name="texture">
+			Enregistrez dans votre inventaire ([UPLOADFEE])
+		</radio_item>
+		<radio_item name="local">
+			Enregistrez 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"/>
+	<text name="type_label2">
+		Taille
+	</text>
+	<text name="format_label">
+		Format
+	</text>
+	<combo_box label="Résolution" name="postcard_size_combo">
+		<combo_item name="640x480">
+			640x480
+		</combo_item>
+		<combo_item name="800x600">
+			800x600
+		</combo_item>
+		<combo_item name="1024x768">
+			1024x768
+		</combo_item>
+		<combo_item name="CurrentWindow">
+			Fenêtre actuelle
+		</combo_item>
+		<combo_item name="Custom">
+			Personnaliser
+		</combo_item>
+	</combo_box>
+	<combo_box label="Résolution" name="texture_size_combo">
+		<combo_item name="CurrentWindow">
+			Fenêtre actuelle
+		</combo_item>
+		<combo_item name="Small(128x128)">
+			Petite (128x128)
+		</combo_item>
+		<combo_item name="Medium(256x256)">
+			Moyenne (256x256)
+		</combo_item>
+		<combo_item name="Large(512x512)">
+			Grande (512x512)
+		</combo_item>
+		<combo_item name="Custom">
+			Personnaliser
+		</combo_item>
+	</combo_box>
+	<combo_box label="Résolution" name="local_size_combo">
+		<combo_item name="CurrentWindow">
+			Fenêtre actuelle
+		</combo_item>
+		<combo_item name="320x240">
+			320x240
+		</combo_item>
+		<combo_item name="640x480">
+			640x480
+		</combo_item>
+		<combo_item name="800x600">
+			800x600
+		</combo_item>
+		<combo_item name="1024x768">
+			1024x768
+		</combo_item>
+		<combo_item name="1280x1024">
+			1280x1024
+		</combo_item>
+		<combo_item name="1600x1200">
+			1600x1200
+		</combo_item>
+		<combo_item name="Custom">
+			Personnaliser
+		</combo_item>
+	</combo_box>
+	<combo_box label="Format" 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="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">
+		Capturez:
+	</text>
+	<combo_box label="Couches de l'image" name="layer_types">
+		<combo_item name="Colors">
+			Couleurs
+		</combo_item>
+		<combo_item name="Depth">
+			Profondeur
+		</combo_item>
+		<combo_item name="ObjectMattes">
+			Matte des objets
+		</combo_item>
+	</combo_box>
+	<text name="file_size_label">
+		Taille du fichier: [SIZE] Ko
+	</text>
+	<check_box label="Voir l'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'é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 ([UPLOADFEE])" name="upload_btn" width="118"/>
+	<button label="Envoyer" name="send_btn" width="118"/>
+	<flyout_button label="Enregistrer" name="save_btn" tool_tip="Enregistre l'image dans un fichier" width="118">
+		<flyout_button_item name="save_item">
+			Enregistrer
+		</flyout_button_item>
+		<flyout_button_item name="saveas_item">
+			Enregistrer sous
+		</flyout_button_item>
+	</flyout_button>
+	<button label="Annuler" name="discard_btn" left="133" width="72" />
+	<check_box bottom_delta="-20" follows="left|top" control_name="TemporaryUpload" enabled="true"
+             initial_value="false" label="Image Temporaire (Gratuit)" left="10"
+             name="temp_check" tooltip="Comme toute image temporaire elle disparaitra à votre deconnection." />
+	<string name="unknown">
+		inconnu
+	</string>
+</floater>
+
+
diff --git a/indra/newview/skins/default/xui/fr/floater_sound_preview.xml b/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
index 199a6b846..f6afc40a4 100644
--- a/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/fr/floater_sound_preview.xml
@@ -1,28 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Sound Preview" title="sound.wav">
-	<text name="name_label">
-		Nom :
-	</text>
-	<text name="description_label">
-		Description :
-	</text>
-	<button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
-	<button label="Importer ([AMOUNT] L$)" label_selected="Charger ([AMOUNT] L$)" name="ok_btn"/>
-	<text name="text">
-		Débit (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>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Sound Preview" title="sound.wav">
+	<text name="name_label">
+		Nom:
+	</text>
+	<text name="description_label">
+		Description:
+	</text>
+	<button label="Annuler" label_selected="Annuler" name="cancel_btn"/>
+	<button label="Importer ([UPLOADFEE])" label_selected="Charger ([UPLOADFEE])" name="ok_btn"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_statistics.xml b/indra/newview/skins/default/xui/fr/floater_statistics.xml
index 0768c3ace..632589d55 100644
--- a/indra/newview/skins/default/xui/fr/floater_statistics.xml
+++ b/indra/newview/skins/default/xui/fr/floater_statistics.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="stats floater" title="Statistiques"/>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="stats floater" title="Statistiques"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_telehub.xml b/indra/newview/skins/default/xui/fr/floater_telehub.xml
index e6201785b..30bc86684 100644
--- a/indra/newview/skins/default/xui/fr/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/fr/floater_telehub.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<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>
-	<text name="status_text_not_connected">
-		Aucun téléhub connecté.
-	</text>
-	<text name="help_text_connected">
-		Pour supprimer, cliquez sur Déconnecter.
-	</text>
-	<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" 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.
-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.
-	</text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="telehub" title="Téléhub" min_height="310" height="310">
+	<text name="status_text_connected">
+		Téléhub connecté à l'objet [OBJECT]
+	</text>
+	<text name="status_text_not_connected">
+		Aucun téléhub connecté
+	</text>
+	<text name="help_text_connected">
+		Pour supprimer, cliquez sur Déconnecter
+	</text>
+	<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" width="122"/>
+	<button label="Déconnecter" name="disconnect_btn" left="142" width="98"/>
+	<text name="spawn_points_text" width="230">
+		Points d'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'objet et cliquez sur Ajouter pour
+indiquer la position. Vous pourrez ensuite
+déplacer ou supprimer l'objet.
+Les positions sont relatives au centre du téléhub.
+Sélectionnez l'élément dans la liste pour afficher
+sa position dans le Monde.
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_test.xml b/indra/newview/skins/default/xui/fr/floater_test.xml
index 78dc45f02..923c39692 100644
--- a/indra/newview/skins/default/xui/fr/floater_test.xml
+++ b/indra/newview/skins/default/xui/fr/floater_test.xml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Test" title="Test" />
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Test" title="Test" />
diff --git a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
index 2a234a37c..b04a5c4d1 100644
--- a/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
@@ -1,24 +1,24 @@
-<?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 length="1" name="Multiple" type="string">
-		Multiple
-	</text>
-	<text length="1" name="unknown" type="string">
-		Dimensions : [DIMENSIONS]
-	</text>
-	<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" 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>
-</floater>
+<?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 name="Multiple">
+		Multiple
+	</text>
+	<text name="unknown">
+		Dimensions: [DIMENSIONS]
+	</text>
+	<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="Saisir votre recherche ici" name="inventory search editor"/>
+	<check_box label="Appliquer immédiatement" name="apply_immediate_check" />
+	<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>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml
index dd0ab6fc5..41e840d6d 100644
--- a/indra/newview/skins/default/xui/fr/floater_tools.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tools.xml
@@ -1,650 +1,640 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="toolbox floater" title="" short_title="Construire">
-	<button label="" label_selected="" name="button focus" tool_tip="Mise au point"/>
-	<button label="" label_selected="" name="button move" tool_tip="Déplacer"/>
-	<button label="" label_selected="" name="button edit" tool_tip="Modifier"/>
-	<button label="" label_selected="" name="button create" tool_tip="Créer"/>
-	<button label="" label_selected="" name="button land" tool_tip="Terrain"/>
-	<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"/>
-	<text name="text ruler mode">
-		Axe :
-	</text>
-	<combo_box name="combobox grid mode">
-		<combo_item name="World">
-			Monde
-		</combo_item>
-		<combo_item name="Local">
-			Local
-		</combo_item>
-		<combo_item name="Reference">
-			Référence
-		</combo_item>
-	</combo_box>
-	<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="Utiliser la grille" name="checkbox snap to grid"/>
-	<button label="Options..." label_selected="Options..." name="Options..."/>
-	<text name="text status">
-		Glissez pour déplacer, Maj-glissez pour copier.
-	</text>
-	<button label="" label_selected="" name="ToolCube" tool_tip="Cube"/>
-	<button label="" label_selected="" name="ToolPrism" tool_tip="Prisme droit"/>
-	<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"/>
-	<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="Copier la sélection" name="checkbox copy selection"/>
-	<check_box label="Centrer" name="checkbox copy centers"/>
-	<check_box label="Pivoter" name="checkbox copy rotates"/>
-	<check_box label="Sélectionner le terrain" name="radio select land"/>
-	<check_box label="Aplatir" name="radio flatten"/>
-	<check_box label="Élever" name="radio raise"/>
-	<check_box label="Abaisser" name="radio lower"/>
-	<check_box label="Lisser" name="radio smooth"/>
-	<check_box label="Bosseler" name="radio noise"/>
-	<check_box label="Annuler modification" name="radio revert"/>
-	<button label="Appliquer" label_selected="Appliquer" name="button apply to selection" tool_tip="Modifier le terrain sélectionné" left="176"/>
-	<text name="Bulldozer:">
-		Bulldozer :
-	</text>
-	<text name="Dozer Size:">
-		Taille
-	</text>
-	<text name="Strength:">
-		Force
-	</text>
-	<text name="obj_count">
-		Objets sélectionnés : [COUNT]
-	</text>
-	<text name="prim_count">
-		Prims : [COUNT]
-	</text>
-	<tab_container name="Object Info Tabs">
-		<panel label="Général" name="General">
-			<text name="Name:">
-				Nom :
-			</text>
-			<text name="Description:">
-				Description :
-			</text>
-			<text name="Creator:">
-				Créateur :
-			</text>
-			<text name="Creator Name">
-				Thrax Linden
-			</text>
-			<button label="Profil" label_selected="Profil" name="button creator profile"/>
-			<text name="Owner:">
-				Propriétaire :
-			</text>
-
-		    <button label="Profil" label_selected="Profil" name="button last owner profile"/>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-				font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-				mouse_opaque="true" name="Last Owner:" v_pad="0" width="78">
-				Dernier Proprio:
-			</text>
-
-			<text name="Owner Name">
-				Thrax Linden
-			</text>
-			<button label="Profil" label_selected="Profil" name="button owner profile"/>
-			<text name="Group:">
-				Groupe :
-			</text>
-			<text name="Group Name Proxy">
-				Les Lindens
-			</text>
-			<button label="Définir..." label_selected="Définir..." name="button set group"/>
-
-			<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
-			    height="16" label="Voir" label_selected="Open" left_delta="30"
-			    mouse_opaque="true" name="button open group" scale_image="TRUE" width="48" />
-
-			<text name="Permissions:">
-				Droits :
-			</text>
-			<text name="perm_modify">
-				Vous pouvez modifier cet objet.
-			</text>
-			<check_box label="Partager avec le groupe" name="checkbox share with group" tool_tip="Autorisez tous les membres du groupe choisi à utiliser et à partager vos droits pour cet objet. Pour activer les restrictions de rôles, vous devez d&apos;abord cliquer sur Transférer."/>
-			<string name="text deed continued">
-				Transférer...
-			</string>
-			<string name="text deed">
-				Transférer
-			</string>
-			<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="Cost">
-				Prix : L$
-			</text>
-			<radio_group name="sale type">
-				<radio_item name="Original">
-					Original
-				</radio_item>
-				<radio_item name="Copy">
-					Copie
-				</radio_item>
-				<radio_item name="Contents">
-					Contenus
-				</radio_item>
-			</radio_group>
-			<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" left_delta="66" name="checkbox next owner can copy"/>
-			<check_box label="Revendre/Donner" name="checkbox next owner can transfer"/>
-			<text name="label click action">
-				Action du clic-gauche :
-			</text>
-			<combo_box name="clickaction" width="178">
-				<combo_item name="Touch/grab(default)">
-					Toucher/attraper (défaut)
-				</combo_item>
-				<combo_item name="Sitonobject">
-					S&apos;asseoir sur l&apos;objet
-				</combo_item>
-				<combo_item name="Buyobject">
-					Acheter l&apos;objet
-				</combo_item>
-				<combo_item name="Payobject">
-					Payer l&apos;objet
-				</combo_item>
-				<combo_item name="Open">
-					Ouvrir
-				</combo_item>
-				<combo_item name="Play">
-					Jouer le média de la parcelle
-				</combo_item>
-				<combo_item name="Opemmedia">
-					Ouvrir le média de la parcelle
-				</combo_item>
-			</combo_box>
-
-			<button bottom="-338" follows="top|right" font="SansSerifSmall" halign="center"
-				height="20" label="Copier la Clef" label_selected="Copy Key" left="172"
-				mouse_opaque="true" name="button cpy_key" scale_image="TRUE"
-				tool_tip="Copie la clef dans le presse papier."
-				width="80" />
-
-			<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>
-			<string name="text modify info 1">
-				Vous pouvez modifier cet objet.
-			</string>
-			<string name="text modify info 2">
-				Vous pouvez modifier ces objets.
-			</string>
-			<string name="text modify info 3">
-				Vous ne pouvez pas modifier cet objet.
-			</string>
-			<string name="text modify info 4">
-				Vous ne pouvez pas modifier ces objets.
-			</string>
-			<string name="text modify warning">
-				Sélectionnez l&apos;objet en entier.
-			</string>
-			<string name="Cost Default">
-				Prix :           L$
-			</string>
-			<string name="Cost Total">
-				Prix total :  L$
-			</string>
-			<string name="Cost Per Unit">
-				Prix par :     L$
-			</string>
-			<string name="Cost Mixed">
-				Prix mixte
-			</string>
-			<string name="Sale Mixed">
-				Vente mixte
-			</string>
-		</panel>
-		<panel label="Objet" name="Object">
-			<text name="select_single">
-				paramètres.
-			</text>
-			<text name="edit_object">
-				  
-			</text>
-			<button bottom="-26" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="18" label="Lier" left="10" mouse_opaque="true" name="link_obj"  enabled="true"
-			     tool_tip="He come to town..."  width="50" />
-			<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="18" label="Delier" left_delta="50" mouse_opaque="true" name="unlink_obj"  enabled="true"
-			     tool_tip="Unlinks linkset."  width="50" />
-			<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"/>
-			<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"/>
-			<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"/>
-			<text name="label material">
-				Matériau
-			</text>
-			<combo_box name="material">
-				<combo_item name="Stone">
-					Pierre
-				</combo_item>
-				<combo_item name="Metal">
-					Métal
-				</combo_item>
-				<combo_item name="Glass">
-					Verre
-				</combo_item>
-				<combo_item name="Wood">
-					Bois
-				</combo_item>
-				<combo_item name="Flesh">
-					Chair
-				</combo_item>
-				<combo_item name="Plastic">
-					Plastique
-				</combo_item>
-				<combo_item name="Rubber">
-					Caoutchouc
-				</combo_item>
-			</combo_box>
-			<text name="label basetype">
-				Type de construction
-			</text>
-			<combo_box name="comboBaseType">
-				<combo_item name="Box">
-					Boîte
-				</combo_item>
-				<combo_item name="Cylinder">
-					Cylindre
-				</combo_item>
-				<combo_item name="Prism">
-					Prisme
-				</combo_item>
-				<combo_item name="Sphere">
-					Sphère
-				</combo_item>
-				<combo_item name="Torus">
-					Tore
-				</combo_item>
-				<combo_item name="Tube">
-					Tube
-				</combo_item>
-				<combo_item name="Ring">
-					Anneau
-				</combo_item>
-				<combo_item name="Sculpted">
-					Sculptie
-				</combo_item>
-			</combo_box>
-			<text name="text cut">
-				Début et fin de découpe
-			</text>
-			<spinner label="D" name="cut begin"/>
-			<spinner label="F" name="cut end"/>
-			<text name="text hollow">
-				Creux
-			</text>
-			<text name="text skew">
-				Biais
-			</text>
-			<text name="Hollow Shape">
-				Forme du creux
-			</text>
-			<combo_box name="hole">
-				<combo_item name="Default">
-					Défaut
-				</combo_item>
-				<combo_item name="Circle">
-					Cercle
-				</combo_item>
-				<combo_item name="Square">
-					Carré
-				</combo_item>
-				<combo_item name="Triangle">
-					Triangle
-				</combo_item>
-			</combo_box>
-			<text name="text twist">
-				Début et fin de vrille
-			</text>
-			<spinner label="D" name="Twist Begin"/>
-			<spinner label="F" name="Twist End"/>
-			<text name="scale_taper">
-				Biseautage
-			</text>
-			<text name="scale_hole">
-				Taille du trou
-			</text>
-			<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"/>
-			<text name="advanced_cut">
-				Début et fin de découpe du profilé
-			</text>
-			<text name="advanced_dimple">
-				Début et fin du creux
-			</text>
-			<text name="advanced_slice">
-				Début et fin de la tranche
-			</text>
-			<spinner label="D" name="Path Limit Begin"/>
-			<spinner label="F" name="Path Limit End"/>
-			<text name="text taper2">
-				Biseautage
-			</text>
-			<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="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 raccord
-			</text>
-			<combo_box name="sculpt type control">
-				<combo_item name="None">
-					(aucun)
-				</combo_item>
-				<combo_item name="Sphere">
-					Sphère
-				</combo_item>
-				<combo_item name="Torus">
-					Tore
-				</combo_item>
-				<combo_item name="Plane">
-					Plan
-				</combo_item>
-				<combo_item name="Cylinder">
-					Cylindre
-				</combo_item>
-			</combo_box>
-		</panel>
-		<panel label="Attributs" name="Features">
-			<text name="select_single">
-				Sélectionnez un prim pour modifier les attributs.
-			</text>
-			<text name="edit_object">
-				Modifier les attributs de l&apos;objet :
-			</text>
-			<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="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"/>
-			<text name="color trans" width="88">
-				Transparence
-			</text>
-			<text name="glow label">
-				Rayonnement
-			</text>
-			<check_box label="Lumineux" name="checkbox fullbright"/>
-			<text name="tex gen">
-				Application
-			</text>
-			<combo_box name="combobox texgen">
-				<combo_item name="Default">
-					Défaut
-				</combo_item>
-				<combo_item name="Planar">
-					Planar
-				</combo_item>
-			</combo_box>
-			<text name="label shininess">
-				Brillance
-			</text>
-			<combo_box name="combobox shininess">
-				<combo_item name="None">
-					Aucune
-				</combo_item>
-				<combo_item name="Low">
-					Faible
-				</combo_item>
-				<combo_item name="Medium">
-					Moyenne
-				</combo_item>
-				<combo_item name="High">
-					Élevée
-				</combo_item>
-			</combo_box>
-			<text name="label bumpiness">
-				Relief
-			</text>
-			<combo_box name="combobox bumpiness">
-				<combo_item name="None">
-					Aucun
-				</combo_item>
-				<combo_item name="Brightness">
-					Luminosité
-				</combo_item>
-				<combo_item name="Darkness">
-					Obscurité
-				</combo_item>
-				<combo_item name="woodgrain">
-					Aggloméré
-				</combo_item>
-				<combo_item name="bark">
-					Écorce
-				</combo_item>
-				<combo_item name="bricks">
-					Briques
-				</combo_item>
-				<combo_item name="checker">
-					Damier
-				</combo_item>
-				<combo_item name="concrete">
-					Béton
-				</combo_item>
-				<combo_item name="crustytile">
-					Carrelage
-				</combo_item>
-				<combo_item name="cutstone">
-					Pierre de taille
-				</combo_item>
-				<combo_item name="discs">
-					Disques
-				</combo_item>
-				<combo_item name="gravel">
-					Gravier
-				</combo_item>
-				<combo_item name="petridish">
-					Boîte de Petri
-				</combo_item>
-				<combo_item name="siding">
-					Lattes
-				</combo_item>
-				<combo_item name="stonetile">
-					Carreaux
-				</combo_item>
-				<combo_item name="stucco">
-					Stuc
-				</combo_item>
-				<combo_item name="suction">
-					Ventouses
-				</combo_item>
-				<combo_item name="weave">
-					Tissage
-				</combo_item>
-			</combo_box>
-			<text name="tex scale">
-				Répétitions par face
-			</text>
-			<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>
-			<spinner left="122" name="TexRot" width="58"/>
-			<string name="string repeats per meter">
-				Répétitions au mètre
-			</string>
-			<string name="string repeats per face">
-				Répétitions par face
-			</string>
-			<text name="rpt" width="160">
-				Répétitions au mètre
-			</text>
-			<spinner left="122" name="rptctrl" width="58"/>
-			<button label="Appliquer" label_selected="Appliquer" left_delta="68" name="button apply" width="75"/>
-			<text name="tex offset">
-				Décalage
-			</text>
-			<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" left="150" name="button align"/>
-		</panel>
-		<panel label="Contenu" name="Contents">
-			<button label="Nouveau script" label_selected="Nouveau script..." name="button new script"/>
-			<button label="Permissions" name="button permissions"/>
-		</panel>
-	</tab_container>
-	<panel name="land info panel">
-		<text name="label_parcel_info">
-			Informations sur la parcelle
-		</text>
-		<text name="label_area_price">
-			Prix : [PRICE] L$ pour [AREA] m².
-		</text>
-		<text name="label_area">
-			Surface : [AREA] m²
-		</text>
-		<button label="À propos du terrain..." label_selected="À propos du terrain..." name="button about land" width="142"/>
-		<check_box label="Afficher les propriétaires" name="checkbox show owners" tool_tip="Colorie les parcelles en fonction de leur propriétaire"/>
-		<button label="?" label_selected="?" name="button show owners help" left_delta="154"/>
-		<text name="label_parcel_modify">
-			Modifier la parcelle
-		</text>
-		<button label="Diviser..." label_selected="Diviser..." name="button subdivide land" width="142"/>
-		<button label="Fusionner..." label_selected="Fusionner..." name="button join land" width="142"/>
-		<text name="label_parcel_trans">
-			Transactions
-		</text>
-		<button label="Acheter le terrain..." label_selected="Acheter le terrain..." name="button buy land" width="142"/>
-		<button label="Abandonner le terrain..." label_selected="Abandonner le terrain..." name="button abandon land" width="142"/>
-	</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 faites glisser.
-	</string>
-	<string name="status_move">
-		Glissez pour déplacer, Maj-glissez pour copier.
-	</string>
-	<string name="status_modifyland">
-		Cliquez et maintenez pour modifier le terrain.
-	</string>
-	<string name="status_camera">
-		Cliquez et faites glisser pour changer l&apos;affichage.
-	</string>
-	<string name="status_grab">
-		Glisser pour déplacer, Ctrl pour soulever, Crtl-Maj pour pivoter.
-	</string>
-	<string name="status_place">
-		Cliquez pour construire.
-	</string>
-	<string name="status_selectland">
-		Cliquez et faites glisser pour sélectionner le terrain.
-	</string>
-	<string name="grid_screen_text">
-		Écran
-	</string>
-	<string name="grid_local_text">
-		Local
-	</string>
-	<string name="grid_world_text">
-		Monde
-	</string>
-	<string name="grid_reference_text">
-		Référence
-	</string>
-	<string name="grid_attachment_text">
-		Pièce-jointe
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="toolbox floater" title="" short_title="Construire">
+	<button label="" label_selected="" name="button focus" tool_tip="Mise au point"/>
+	<button label="" label_selected="" name="button move" tool_tip="Déplacer"/>
+	<button label="" label_selected="" name="button edit" tool_tip="Modifier"/>
+	<button label="" label_selected="" name="button create" tool_tip="Créer"/>
+	<button label="" label_selected="" name="button land" tool_tip="Terrain"/>
+	<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"/>
+	<text name="text ruler mode">
+		Axe:
+	</text>
+	<combo_box name="combobox grid mode">
+		<combo_item name="World">
+			Monde
+		</combo_item>
+		<combo_item name="Local">
+			Local
+		</combo_item>
+		<combo_item name="Reference">
+			Référence
+		</combo_item>
+	</combo_box>
+	<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="Utiliser la grille" name="checkbox snap to grid"/>
+	<button label="Options" label_selected="Options" name="Options"/>
+	<text name="text status">
+		Glissez pour déplacer, Maj-glissez pour copier.
+	</text>
+	<button name="ToolCube" tool_tip="Cube"/>
+	<button name="ToolPrism" tool_tip="Prisme droit"/>
+	<button name="ToolPyramid" tool_tip="Pyramide"/>
+	<button name="ToolTetrahedron" tool_tip="Tétraèdre"/>
+	<button name="ToolCylinder" tool_tip="Cylindre"/>
+	<button name="ToolHemiCylinder" tool_tip="Demi-cylindre"/>
+	<button name="ToolCone" tool_tip="Cône"/>
+	<button name="ToolHemiCone" tool_tip="Demi-cône"/>
+	<button name="ToolSphere" tool_tip="Sphère"/>
+	<button name="ToolHemiSphere" tool_tip="Demi-sphère"/>
+	<button name="ToolTorus" tool_tip="Tore"/>
+	<button name="ToolTube" tool_tip="Tube"/>
+	<button name="ToolRing" tool_tip="Anneau"/>
+	<button name="ToolTree" tool_tip="Arbre"/>
+	<button name="ToolGrass" tool_tip="Herbe"/>
+	<check_box label="Maintenir l'outil sélectionné" name="checkbox sticky"/>
+	<check_box label="Copier la sélection" name="checkbox copy selection"/>
+	<check_box label="Centrer" name="checkbox copy centers"/>
+	<check_box label="Pivoter" name="checkbox copy rotates"/>
+	<check_box label="Sélectionner le terrain" name="radio select land"/>
+	<check_box label="Aplatir" name="radio flatten"/>
+	<check_box label="Élever" name="radio raise"/>
+	<check_box label="Abaisser" name="radio lower"/>
+	<check_box label="Lisser" name="radio smooth"/>
+	<check_box label="Bosseler" name="radio noise"/>
+	<check_box label="Annuler modification" name="radio revert"/>
+	<button label="Appliquer" label_selected="Appliquer" name="button apply to selection" tool_tip="Modifier le terrain sélectionné" left="176"/>
+	<text name="Bulldozer:">
+		Bulldozer:
+	</text>
+	<text name="Dozer Size:">
+		Taille
+	</text>
+	<text name="Strength:">
+		Force
+	</text>
+	<text name="obj_count">
+		Objets sélectionnés: [COUNT]
+	</text>
+	<text name="prim_count">
+		Prims: [COUNT]
+	</text>
+	<tab_container name="Object Info Tabs">
+		<panel label="Général" name="General">
+			<text name="Name:">
+				Nom:
+			</text>
+			<text name="Description:">
+				Description:
+			</text>
+			<text name="Creator:">
+				Créateur:
+			</text>
+			<text name="Creator Name">
+				Thrax Linden
+			</text>
+			<button label="Profil" label_selected="Profil" name="button creator profile"/>
+			<text name="Owner:">
+				Propriétaire:
+			</text>
+
+		    <button label="Profil" label_selected="Profil" name="button last owner profile"/>
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+				bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+				font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+				mouse_opaque="true" name="Last Owner:" v_pad="0" width="78">
+				Dernier Proprio :
+			</text>
+
+			<text name="Owner Name">
+				Thrax Linden
+			</text>
+			<button label="Profil" label_selected="Profil" name="button owner profile"/>
+			<text name="Group:">
+				Groupe:
+			</text>
+			<text name="Group Name Proxy">
+				Les Lindens
+			</text>
+			<button label="Définir" label_selected="Définir" name="button set group"/>
+			<button label="Voir" name="button open group"/>
+			<text name="Permissions:">
+				Droits:
+			</text>
+			<text name="perm_modify">
+				Vous pouvez modifier cet objet.
+			</text>
+			<check_box label="Partager avec le groupe" name="checkbox share with group" tool_tip="Autorise tous les membres du groupe choisi à utiliser et à partager vos droits pour cet objet. Pour activer les restrictions de rôles, vous devez d&apos;abord cliquer sur Transférer."/>
+			<string name="text deed continued">
+				Transférer
+			</string>
+			<string name="text deed">
+				Transférer
+			</string>
+			<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="Affiche l&apos;objet dans les résultats de recherche"/>
+			<check_box label="À vendre" name="checkbox for sale"/>
+			<text name="Cost">
+				Prix : [CURRENCY]
+			</text>
+			<radio_group name="sale type">
+				<radio_item name="Original">
+					Original
+				</radio_item>
+				<radio_item name="Copy">
+					Copie
+				</radio_item>
+				<radio_item name="Contents">
+					Contenus
+				</radio_item>
+			</radio_group>
+			<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" left_delta="66" name="checkbox next owner can copy"/>
+			<check_box label="Revendre/Donner" name="checkbox next owner can transfer"/>
+			<text name="label click action">
+				Action du clic-gauche :
+			</text>
+			<combo_box name="clickaction" width="178">
+				<combo_item name="Touch/grab(default)">
+					Toucher/attraper (défaut)
+				</combo_item>
+				<combo_item name="Sitonobject">
+					S&apos;asseoir sur l&apos;objet
+				</combo_item>
+				<combo_item name="Buyobject">
+					Acheter l&apos;objet
+				</combo_item>
+				<combo_item name="Payobject">
+					Payer l&apos;objet
+				</combo_item>
+				<combo_item name="Open">
+					Ouvrir
+				</combo_item>
+				<combo_item name="Play">
+					Jouer le média de la parcelle
+				</combo_item>
+				<combo_item name="Opemmedia">
+					Ouvrir le média de la parcelle
+				</combo_item>
+			</combo_box>
+			<button bottom="-338" label="Copier la Clef" tool_tip="Copie la clef dans le presse-papier." width="80"/>
+			<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>
+			<string name="text modify info 1">
+				Vous pouvez modifier cet objet.
+			</string>
+			<string name="text modify info 2">
+				Vous pouvez modifier ces objets.
+			</string>
+			<string name="text modify info 3">
+				Vous ne pouvez pas modifier cet objet.
+			</string>
+			<string name="text modify info 4">
+				Vous ne pouvez pas modifier ces objets.
+			</string>
+			<string name="text modify warning">
+				Sélectionnez l'objet en entier.
+			</string>
+			<string name="Cost Default">
+				Prix:           [CURRENCY]
+			</string>
+			<string name="Cost Total">
+				Prix total:  [CURRENCY]
+			</string>
+			<string name="Cost Per Unit">
+				Prix par:     [CURRENCY]
+			</string>
+			<string name="Cost Mixed">
+				Prix mixte
+			</string>
+			<string name="Sale Mixed">
+				Vente mixte
+			</string>
+		</panel>
+		<panel label="Objet" name="Object">
+			<text name="select_single">
+				
+			</text>
+			<text name="edit_object">
+				
+			</text>
+			<button bottom="-26" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="18" label="Lier" left="10" mouse_opaque="true" name="link_obj"  enabled="true"
+			     tool_tip=""  width="50" />
+			<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
+			     height="18" label="Delier" left_delta="50" mouse_opaque="true" name="unlink_obj"  enabled="true"
+			     tool_tip="Unlinks linkset."  width="50" />
+			<check_box label="Verrouillé" name="checkbox locked" tool_tip="Empêche l'objet d'ê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'objet d'être poussé et affecté par la gravité"/>
+			<check_box label="Temporaire" name="Temporary Checkbox Ctrl" tool_tip="L'objet est supprimé 2 mn après sa création."/>
+			<check_box label="Fantôme" name="Phantom Checkbox Ctrl" tool_tip="Permet à l'objet de ne pas entrer en collision avec d'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"/>
+			<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"/>
+			<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"/>
+			<text name="label material">
+				Matériau
+			</text>
+			<combo_box name="material">
+				<combo_item name="Stone">
+					Pierre
+				</combo_item>
+				<combo_item name="Metal">
+					Métal
+				</combo_item>
+				<combo_item name="Glass">
+					Verre
+				</combo_item>
+				<combo_item name="Wood">
+					Bois
+				</combo_item>
+				<combo_item name="Flesh">
+					Chair
+				</combo_item>
+				<combo_item name="Plastic">
+					Plastique
+				</combo_item>
+				<combo_item name="Rubber">
+					Caoutchouc
+				</combo_item>
+			</combo_box>
+			<text name="label basetype">
+				Type de construction
+			</text>
+			<combo_box name="comboBaseType">
+				<combo_item name="Box">
+					Boîte
+				</combo_item>
+				<combo_item name="Cylinder">
+					Cylindre
+				</combo_item>
+				<combo_item name="Prism">
+					Prisme
+				</combo_item>
+				<combo_item name="Sphere">
+					Sphère
+				</combo_item>
+				<combo_item name="Torus">
+					Tore
+				</combo_item>
+				<combo_item name="Tube">
+					Tube
+				</combo_item>
+				<combo_item name="Ring">
+					Anneau
+				</combo_item>
+				<combo_item name="Sculpted">
+					Sculptie
+				</combo_item>
+			</combo_box>
+			<text name="text cut">
+				Début et fin de découpe
+			</text>
+			<spinner label="D" name="cut begin"/>
+			<spinner label="F" name="cut end"/>
+			<text name="text hollow">
+				Creux
+			</text>
+			<text name="text skew">
+				Biais
+			</text>
+			<text name="Hollow Shape">
+				Forme du creux
+			</text>
+			<combo_box name="hole">
+				<combo_item name="Default">
+					Défaut
+				</combo_item>
+				<combo_item name="Circle">
+					Cercle
+				</combo_item>
+				<combo_item name="Square">
+					Carré
+				</combo_item>
+				<combo_item name="Triangle">
+					Triangle
+				</combo_item>
+			</combo_box>
+			<text name="text twist">
+				Début et fin de vrille
+			</text>
+			<spinner label="D" name="Twist Begin"/>
+			<spinner label="F" name="Twist End"/>
+			<text name="scale_taper">
+				Biseautage
+			</text>
+			<text name="scale_hole">
+				Taille du trou
+			</text>
+			<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"/>
+			<text name="advanced_cut">
+				Début et fin de découpe du profilé
+			</text>
+			<text name="advanced_dimple">
+				Début et fin du creux
+			</text>
+			<text name="advanced_slice">
+				Début et fin de la tranche
+			</text>
+			<spinner label="D" name="Path Limit Begin"/>
+			<spinner label="F" name="Path Limit End"/>
+			<text name="text taper2">
+				Biseautage
+			</text>
+			<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="Texture du sculptie" name="sculpt texture control" tool_tip="Cliquez pour sélectionner une image"/>
+			<check_box label="Miroir" name="sculpt mirror control" tool_tip="Retourne le sculptie le long de l'axe des X."/>
+			<check_box label="A l'envers" name="sculpt invert control" tool_tip="Inverse les valeurs normales d'un sculptie et le fait apparaître à l'envers."/>
+			<text name="label sculpt type">
+				Type de raccord
+			</text>
+			<combo_box name="sculpt type control">
+				<combo_item name="None">
+					(aucun)
+				</combo_item>
+				<combo_item name="Sphere">
+					Sphère
+				</combo_item>
+				<combo_item name="Torus">
+					Tore
+				</combo_item>
+				<combo_item name="Plane">
+					Plan
+				</combo_item>
+				<combo_item name="Cylinder">
+					Cylindre
+				</combo_item>
+			</combo_box>
+		</panel>
+		<panel label="Attributs" name="Features">
+			<text name="select_single">
+				Sélectionnez un prim pour modifier les attributs.
+			</text>
+			<text name="edit_object">
+				Modifiez les attributs de l'objet:
+			</text>
+			<check_box label="Flexibilité" name="Flexible1D Checkbox Ctrl" tool_tip="Donne à l'objet de la souplesse sur l'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'émettre de la lumière"/>
+			<text name="label color">
+				Couleur
+			</text>
+			<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="Cliquez pour ouvrir le sélecteur de couleurs"/>
+			<text name="color trans" width="88">
+				Transparence
+			</text>
+			<text name="glow label">
+				Rayonnement
+			</text>
+			<check_box label="Lumineux" name="checkbox fullbright"/>
+			<text name="tex gen">
+				Application
+			</text>
+			<combo_box name="combobox texgen">
+				<combo_item name="Default">
+					Défaut
+				</combo_item>
+				<combo_item name="Planar">
+					Planar
+				</combo_item>
+			</combo_box>
+			<text name="label shininess">
+				Brillance
+			</text>
+			<combo_box name="combobox shininess">
+				<combo_item name="None">
+					Aucune
+				</combo_item>
+				<combo_item name="Low">
+					Faible
+				</combo_item>
+				<combo_item name="Medium">
+					Moyenne
+				</combo_item>
+				<combo_item name="High">
+					Élevée
+				</combo_item>
+			</combo_box>
+			<text name="label bumpiness">
+				Relief
+			</text>
+			<combo_box name="combobox bumpiness">
+				<combo_item name="None">
+					Aucun
+				</combo_item>
+				<combo_item name="Brightness">
+					Luminosité
+				</combo_item>
+				<combo_item name="Darkness">
+					Obscurité
+				</combo_item>
+				<combo_item name="woodgrain">
+					Aggloméré
+				</combo_item>
+				<combo_item name="bark">
+					Écorce
+				</combo_item>
+				<combo_item name="bricks">
+					Briques
+				</combo_item>
+				<combo_item name="checker">
+					Damier
+				</combo_item>
+				<combo_item name="concrete">
+					Béton
+				</combo_item>
+				<combo_item name="crustytile">
+					Carrelage
+				</combo_item>
+				<combo_item name="cutstone">
+					Pierre de taille
+				</combo_item>
+				<combo_item name="discs">
+					Disques
+				</combo_item>
+				<combo_item name="gravel">
+					Gravier
+				</combo_item>
+				<combo_item name="petridish">
+					Boîte de Petri
+				</combo_item>
+				<combo_item name="siding">
+					Lattes
+				</combo_item>
+				<combo_item name="stonetile">
+					Carreaux
+				</combo_item>
+				<combo_item name="stucco">
+					Stuc
+				</combo_item>
+				<combo_item name="suction">
+					Ventouses
+				</combo_item>
+				<combo_item name="weave">
+					Tissage
+				</combo_item>
+			</combo_box>
+			<text name="tex scale">
+				Répétitions par face
+			</text>
+			<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>
+			<spinner left="122" name="TexRot" width="58"/>
+			<string name="string repeats per meter">
+				Répétitions au mètre
+			</string>
+			<string name="string repeats per face">
+				Répétitions par face
+			</string>
+			<text name="rpt" width="160">
+				Répétitions au mètre
+			</text>
+			<spinner left="122" name="rptctrl" width="58"/>
+			<button label="Appliquer" label_selected="Appliquer" left_delta="68" name="button apply" width="75"/>
+			<text name="tex offset">
+				Décalage
+			</text>
+			<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" left="150" name="button align"/>
+		</panel>
+		<panel label="Contenu" name="Contents">
+			<button label="Nouveau script" label_selected="Nouveau script" name="button new script"/>
+			<button label="Permissions" name="button permissions"/>
+		</panel>
+	</tab_container>
+	<panel name="land info panel">
+		<text name="label_parcel_info">
+			Informations sur la parcelle
+		</text>
+		<text name="label_area_price">
+			Prix : [PRICE][CURRENCY] pour [AREA] m².
+		</text>
+		<text name="label_area">
+			Surface : [AREA] m²
+		</text>
+		<button label="A propos du terrain" label_selected="A propos du terrain" name="button about land" width="142"/>
+		<check_box label="Afficher les propriétaires" name="checkbox show owners" tool_tip="Colorie les parcelles en fonction de leur propriétaire"/>
+		<button label="?" label_selected="?" name="button show owners help" left_delta="154"/>
+		<text name="label_parcel_modify">
+			Modifier la parcelle
+		</text>
+		<button label="Diviser" label_selected="Diviser" name="button subdivide land" width="142"/>
+		<button label="Fusionner" label_selected="Fusionner" name="button join land" width="142"/>
+		<text name="label_parcel_trans">
+			Transactions
+		</text>
+		<button label="Acheter le terrain" label_selected="Acheter le terrain" name="button buy land" width="142"/>
+		<button label="Abandonner le terrain" label_selected="Abandonner le terrain" name="button abandon land" width="142"/>
+	</panel>
+	<string name="status_rotate">
+		Pour faire tourner l'objet, faîtes glisser les bandes de couleur.
+	</string>
+	<string name="status_scale">
+		Pour étirer le côté sélectionné, cliquez et faites glisser.
+	</string>
+	<string name="status_move">
+		Glissez pour déplacer, Maj-glissez pour copier.
+	</string>
+	<string name="status_modifyland">
+		Cliquez et maintenez pour modifier le terrain.
+	</string>
+	<string name="status_camera">
+		Cliquez et faites glisser pour changer l'affichage.
+	</string>
+	<string name="status_grab">
+		Glissez pour déplacer, Ctrl pour soulever, Crtl-Maj pour pivoter.
+	</string>
+	<string name="status_place">
+		Cliquez pour construire.
+	</string>
+	<string name="status_selectland">
+		Cliquez et faites glisser pour sélectionner le terrain.
+	</string>
+	<string name="grid_screen_text">
+		Écran
+	</string>
+	<string name="grid_local_text">
+		Local
+	</string>
+	<string name="grid_world_text">
+		Monde
+	</string>
+	<string name="grid_reference_text">
+		Référence
+	</string>
+	<string name="grid_attachment_text">
+		Pièce-jointe
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_top_objects.xml b/indra/newview/skins/default/xui/fr/floater_top_objects.xml
index 69a3d0cd1..3c327606b 100644
--- a/indra/newview/skins/default/xui/fr/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/fr/floater_top_objects.xml
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="top_objects" title="en cours de chargement...">
-	<text name="title_text">
-		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="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"/>
-	<text name="obj_name_text">
-		Objet :
-	</text>
-	<button label="Filtre" name="filter_object_btn"/>
-	<text name="owner_name_text">
-		Propriétaire :
-	</text>
-	<button label="Filtre" name="filter_owner_btn"/>
-	<button label="Renvoyer" name="return_selected_btn"/>
-	<button label="Tout renvoyer" name="return_all_btn"/>
-	<button label="Désactiver" name="disable_selected_btn"/>
-	<button label="Tout désactiver" name="disable_all_btn"/>
-	<button label="Rafraîchir" name="refresh_btn"/>
-	<string name="top_scripts_title">
-		Scripts principaux
-	</string>
-	<string name="top_scripts_text">
-		[COUNT] scripts prenant un total de [TIME] ms
-	</string>
-	<string name="scripts_score_label">
-		Heure
-	</string>
-	<string name="scripts_mono_time_label">
-		Heure Mono
-	</string>
-	<string name="top_colliders_title">
-		Collisions les plus consommatrices
-	</string>
-	<string name="top_colliders_text">
-		[COUNT] collisions les plus consommatrices
-	</string>
-	<string name="colliders_score_label">
-		Score
-	</string>
-	<string name="none_descriptor">
-		Aucun résultat.
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="top_objects" title="En cours de chargement">
+	<text name="title_text">
+		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="Lieu" name="location"/>
+		<column label="Heure" name="time"/>
+		<column label="Heure Mono" name="mono_time"/>
+	</scroll_list>
+	<text name="id_text">
+		ID de l'objet:
+	</text>
+	<button label="Afficher balise" name="show_beacon_btn"/>
+	<text name="obj_name_text">
+		Objet:
+	</text>
+	<button label="Filtre" name="filter_object_btn"/>
+	<text name="owner_name_text">
+		Propriétaire:
+	</text>
+	<button label="Filtre" name="filter_owner_btn"/>
+	<button label="Renvoyer" name="return_selected_btn"/>
+	<button label="Tout renvoyer" name="return_all_btn"/>
+	<button label="Désactiver" name="disable_selected_btn"/>
+	<button label="Tout désactiver" name="disable_all_btn"/>
+	<button label="Rafraîchir" name="refresh_btn"/>
+	<string name="top_scripts_title">
+		Scripts principaux
+	</string>
+	<string name="top_scripts_text">
+		[COUNT] scripts prenant un total de [TIME] ms
+	</string>
+	<string name="scripts_score_label">
+		Heure
+	</string>
+	<string name="scripts_mono_time_label">
+		Heure Mono
+	</string>
+	<string name="top_colliders_title">
+		Collisions les plus consommatrices
+	</string>
+	<string name="top_colliders_text">
+		[COUNT] collisions les plus consommatrices
+	</string>
+	<string name="colliders_score_label">
+		Score
+	</string>
+	<string name="none_descriptor">
+		Aucun résultat
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_tos.xml b/indra/newview/skins/default/xui/fr/floater_tos.xml
index b77838d92..4191c3511 100644
--- a/indra/newview/skins/default/xui/fr/floater_tos.xml
+++ b/indra/newview/skins/default/xui/fr/floater_tos.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container" title=" ">
-	<button label="Continuer" label_selected="Continuer" name="Continue" />
-	<button label="Annuler" label_selected="Annuler" name="Cancel" />
-	<radio_group name="tos_agreement">
-		<radio_item name="radio_disagree">
-			Je n&apos;accepte pas les Conditions Générales d&apos;Utilisation
-		</radio_item>
-		<radio_item name="radio_agree">
-			J&apos;accepte les Conditions Générales d&apos;Utilisation
-		</radio_item>
-	</radio_group>
-	<text name="tos_title">
-		Acceptation des Conditions Générales d&apos;Utilisation
-	</text>
-	<check_box label="J&apos;accepte les Conditions d&apos;utilisation" name="agree_chk" />
-	<text name="tos_heading">
-		Veuillez lire attentivement les Conditions d&apos;utilisation suivantes. Pour continuer à utiliser
-Second Life, vous devez accepter ces conditions.
-	</text>
-	<text_editor name="tos_text">
-		TOS_TEXT
-	</text_editor>
-	<text name="real_url">
-		http://secondlife.com/app/tos/
-	</text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container" title="">
+	<button label="Continuer" label_selected="Continuer" name="Continue"/>
+	<button label="Annuler" label_selected="Annuler" name="Cancel"/>
+	<radio_group name="tos_agreement">
+		<radio_item name="radio_disagree">
+			Je n'accepte pas les Conditions Générales d'Utilisation.
+		</radio_item>
+		<radio_item name="radio_agree">
+			J'accepte les Conditions Générales d'Utilisation.
+		</radio_item>
+	</radio_group>
+	<text name="tos_title">
+		Acceptation des Conditions Générales d'Utilisation.
+	</text>
+	<check_box label="J'accepte les Conditions d'utilisation" name="agree_chk"/>
+	<text name="tos_heading">
+		Veuillez lire attentivement les Conditions d'utilisation suivantes. Pour continuer à utiliser
+Second Life, vous devez accepter ces conditions.
+	</text>
+	<text_editor name="tos_text">
+		TOS_TEXT
+	</text_editor>
+	<text name="real_url">
+		http://secondlife.com/app/tos/
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_url_entry.xml b/indra/newview/skins/default/xui/fr/floater_url_entry.xml
index 6a9073169..f902a6fee 100644
--- a/indra/newview/skins/default/xui/fr/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/fr/floater_url_entry.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="url_entry">
-	<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...
-	</text>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="url_entry">
+	<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...
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_wizard.xml b/indra/newview/skins/default/xui/fr/floater_voice_wizard.xml
index cd1e32f13..1e3a960a1 100644
--- a/indra/newview/skins/default/xui/fr/floater_voice_wizard.xml
+++ b/indra/newview/skins/default/xui/fr/floater_voice_wizard.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_voice_wizard" title="Paramétrage de la voix">
-	<panel name="content_panel">
-		<button label="Précédente" name="back_btn" />
-		<button label="Suivante" name="next_btn" />
-		<button label="Terminer" name="ok_btn" />
-		<button label="Annuler" name="cancel_btn" />
-	</panel>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floater_voice_wizard" title="Paramétrage de la voix">
+	<panel name="content_panel">
+		<button label="Précédente" name="back_btn" />
+		<button label="Suivante" name="next_btn" />
+		<button label="Terminer" name="ok_btn" />
+		<button label="Annuler" name="cancel_btn" />
+	</panel>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_water.xml b/indra/newview/skins/default/xui/fr/floater_water.xml
index 9b77c2450..d2c308602 100644
--- a/indra/newview/skins/default/xui/fr/floater_water.xml
+++ b/indra/newview/skins/default/xui/fr/floater_water.xml
@@ -1,89 +1,89 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Water Floater" title="Éditeur d&apos;eau avancé">
-	<text name="KeyFramePresetsText">
-		Préréglages eau :
-	</text>
-	<button label="Nouveau" label_selected="Nouveau" name="WaterNewPreset" />
-	<button label="Enregistrer" label_selected="Enregistrer" name="WaterSavePreset" width="75" left_delta="75"/>
-	<button label="Supprimer" label_selected="Supprimer" name="WaterDeletePreset" left_delta="80"/>
-	<tab_container name="Water Tabs">
-		<panel label="Paramètres" name="Settings">
-			<text name="BHText">
-				Couleur du brouillard
-dans l&apos;eau
-			</text>
-			<button label="?" name="WaterFogColorHelp" />
-			<color_swatch name="WaterFogColor" left="75" tool_tip="Cliquer pour ouvrir le sélecteur de couleurs" />
-			<text name="WaterFogDensText">
-				Densité du brouillard
-			</text>
-			<button label="?" name="WaterFogDensityHelp" />
-			<text name="WaterUnderWaterFogModText">
-				Brouillard sous-marin
-			</text>
-			<button label="?" name="WaterUnderWaterFogModHelp" />
-			<text name="BDensText">
-				Échelle des vaguelettes
-			</text>
-			<button label="?" name="WaterNormalScaleHelp" />
-			<text name="BHText2">
-				1
-			</text>
-			<text name="BHText3">
-				2
-			</text>
-			<text name="BHText4">
-				3
-			</text>
-			<text name="HDText">
-				Échelle Fresnel
-			</text>
-			<button label="?" name="WaterFresnelScaleHelp" />
-			<text name="FresnelOffsetText">
-				Décalage Fresnel
-			</text>
-			<button label="?" name="WaterFresnelOffsetHelp" />
-			<text name="DensMultText">
-				Réfraction au dessus
-			</text>
-			<button label="?" name="WaterScaleAboveHelp" />
-			<text name="WaterScaleBelowText">
-				Réfraction en dessous
-			</text>
-			<button label="?" name="WaterScaleBelowHelp" />
-			<text name="MaxAltText">
-				Multiplicateur de flou
-			</text>
-			<button label="?" name="WaterBlurMultiplierHelp" />
-		</panel>
-		<panel label="Image" name="Waves">
-			<text name="BHText">
-				Direction grande vague
-			</text>
-			<button label="?" name="WaterWave1Help" />
-			<text name="WaterWave1DirXText">
-				X
-			</text>
-			<text name="WaterWave1DirYText">
-				Y
-			</text>
-			<text name="BHText2">
-				Direction petite vague
-			</text>
-			<button label="?" name="WaterWave2Help" />
-			<text name="WaterWave2DirXText">
-				X
-			</text>
-			<text name="WaterWave2DirYText">
-				Y
-			</text>
-			<text name="BHText3">
-				Normal Map
-			</text>
-			<button label="?" name="WaterNormalMapHelp" />
-		</panel>
-	</tab_container>
-	<string name="WLDefaultWaterNames">
-		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="Water Floater" title="Éditeur d'eau avancé">
+	<text name="KeyFramePresetsText">
+		Préréglages eau:
+	</text>
+	<button label="Nouveau" label_selected="Nouveau" name="WaterNewPreset" />
+	<button label="Enregistrer" label_selected="Enregistrer" name="WaterSavePreset" width="75" left_delta="75"/>
+	<button label="Supprimer" label_selected="Supprimer" name="WaterDeletePreset" left_delta="80"/>
+	<tab_container name="Water Tabs">
+		<panel label="Paramètres" name="Settings">
+			<text name="BHText">
+				Couleur du brouillard
+dans l'eau
+			</text>
+			<button label="?" name="WaterFogColorHelp" />
+			<color_swatch name="WaterFogColor" left="75" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" />
+			<text name="WaterFogDensText">
+				Densité du brouillard
+			</text>
+			<button label="?" name="WaterFogDensityHelp" />
+			<text name="WaterUnderWaterFogModText">
+				Brouillard sous-marin
+			</text>
+			<button label="?" name="WaterUnderWaterFogModHelp" />
+			<text name="BDensText">
+				Échelle des vaguelettes
+			</text>
+			<button label="?" name="WaterNormalScaleHelp" />
+			<text name="BHText2">
+				1
+			</text>
+			<text name="BHText3">
+				2
+			</text>
+			<text name="BHText4">
+				3
+			</text>
+			<text name="HDText">
+				Échelle Fresnel
+			</text>
+			<button label="?" name="WaterFresnelScaleHelp" />
+			<text name="FresnelOffsetText">
+				Décalage Fresnel
+			</text>
+			<button label="?" name="WaterFresnelOffsetHelp" />
+			<text name="DensMultText">
+				Réfraction au dessus
+			</text>
+			<button label="?" name="WaterScaleAboveHelp" />
+			<text name="WaterScaleBelowText">
+				Réfraction en dessous
+			</text>
+			<button label="?" name="WaterScaleBelowHelp" />
+			<text name="MaxAltText">
+				Multiplicateur de flou
+			</text>
+			<button label="?" name="WaterBlurMultiplierHelp" />
+		</panel>
+		<panel label="Image" name="Waves">
+			<text name="BHText">
+				Direction grande vague
+			</text>
+			<button label="?" name="WaterWave1Help" />
+			<text name="WaterWave1DirXText">
+				X
+			</text>
+			<text name="WaterWave1DirYText">
+				Y
+			</text>
+			<text name="BHText2">
+				Direction petite vague
+			</text>
+			<button label="?" name="WaterWave2Help" />
+			<text name="WaterWave2DirXText">
+				X
+			</text>
+			<text name="WaterWave2DirYText">
+				Y
+			</text>
+			<text name="BHText3">
+				Normal Map
+			</text>
+			<button label="?" name="WaterNormalMapHelp" />
+		</panel>
+	</tab_container>
+	<string name="WLDefaultWaterNames">
+		Default:Glassy:Pond:Murky:Second Plague:SNAKE!!!:Valdez
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/fr/floater_wearable_save_as.xml
index a5bc87d95..538aa1401 100644
--- a/indra/newview/skins/default/xui/fr/floater_wearable_save_as.xml
+++ b/indra/newview/skins/default/xui/fr/floater_wearable_save_as.xml
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="modal container">
-	<button label="Enregistrer" label_selected="Enregistrer" name="Save" />
-	<button label="Annuler" label_selected="Annuler" name="Cancel" />
-	<text type="string" length="1" name="Save item as:">
-		Enregistrer l&apos;objet sous :
-	</text>
-	<line_editor name="name ed">
-		Nouveau [DESC]
-	</line_editor>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="modal container">
+	<button label="Enregistrer" label_selected="Enregistrer" name="Save" />
+	<button label="Annuler" label_selected="Annuler" name="Cancel" />
+	<text type="string" length="1" name="Save item as:">
+		Enregistrez l'objet sous:
+	</text>
+	<line_editor name="name ed">
+		Nouveau [DESC]
+	</line_editor>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
index d1a62dc6b..a81fda747 100644
--- a/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/fr/floater_windlight_options.xml
@@ -1,190 +1,190 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="WindLight floater" title="Éditeur de ciel avancé" width="706">
-	<text name="KeyFramePresetsText">
-		Préréglages ciel :
-	</text>
-	<button label="Nouveau" label_selected="Nouveau" name="WLNewPreset" />
-	<button label="Enregistrer" label_selected="Enregistrer" name="WLSavePreset" width="75" left_delta="75"/>
-	<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" width="706">
-		<panel label="Atmosphère" name="Atmosphere">
-			<text name="BHText">
-				Bleu de l&apos;horizon
-			</text>
-			<button label="?" name="WLBlueHorizonHelp" />
-			<text name="BHText2">
-				R
-			</text>
-			<text name="BHText3">
-				V
-			</text>
-			<text name="BHText4">
-				B
-			</text>
-			<text name="BHText5">
-				I
-			</text>
-			<text name="BDensText">
-				Quantité de brume
-			</text>
-			<button label="?" name="WLHazeHorizonHelp" />
-			<text name="BDensText2">
-				Densité du bleu
-			</text>
-			<button label="?" name="WLBlueDensityHelp" />
-			<text name="BHText6">
-				R
-			</text>
-			<text name="BHText7">
-				V
-			</text>
-			<text name="BHText8">
-				B
-			</text>
-			<text name="BHText9">
-				I
-			</text>
-			<text name="HDText">
-				Densité de la brume
-			</text>
-			<button label="?" name="WLHazeDensityHelp" />
-			<text name="DensMultText">
-				Multiplicateur de densité
-			</text>
-			<button label="?" name="WLDensityMultHelp" />
-			<text name="WLDistanceMultText">
-				Multiplicateur de distance
-			</text>
-			<button label="?" name="WLDistanceMultHelp" />
-			<text name="MaxAltText">
-				Altitude maximum
-			</text>
-			<button label="?" name="WLMaxAltitudeHelp" />
-		</panel>
-		<panel label="Éclairage" name="Lighting">
-			<text name="SLCText">
-				Couleur soleil/lune
-			</text>
-			<button label="?" name="WLSunlightColorHelp" />
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				V
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="TODText">
-				Position soleil/lune
-			</text>
-			<button label="?" name="WLTimeOfDayHelp" />
-			<text name="WLAmbientText">
-				Éclairage ambiant
-			</text>
-			<button label="?" name="WLAmbientHelp" />
-			<text name="BHText5">
-				R
-			</text>
-			<text name="BHText6">
-				V
-			</text>
-			<text name="BHText7">
-				B
-			</text>
-			<text name="BHText8">
-				I
-			</text>
-			<text name="WLEastAngleText">
-				Angle du levant
-			</text>
-			<button label="?" name="WLEastAngleHelp" />
-			<text name="SunGlowText">
-				Rayonnement du soleil
-			</text>
-			<button label="?" name="WLSunGlowHelp" />
-			<slider label="Netteté " name="WLGlowB" />
-			<slider label="Taille    " name="WLGlowR" />
-			<text name="SceneGammaText">
-				Gamma de la scène
-			</text>
-			<button label="?" name="WLSceneGammaHelp" />
-			<text name="WLStarText">
-				Éclat des étoiles
-			</text>
-			<button label="?" name="WLStarBrightnessHelp" />
-		</panel>
-		<panel label="Nuages" name="Clouds">
-			<text name="WLCloudColorText">
-				Couleur des nuages
-			</text>
-			<button label="?" name="WLCloudColorHelp" />
-			<text name="BHText">
-				R
-			</text>
-			<text name="BHText2">
-				V
-			</text>
-			<text name="BHText3">
-				B
-			</text>
-			<text name="BHText4">
-				I
-			</text>
-			<text name="WLCloudColorText2">
-				Nuages XY/densité
-			</text>
-			<button label="?" name="WLCloudDensityHelp" />
-			<text name="BHText5">
-				X
-			</text>
-			<text name="BHText6">
-				Y
-			</text>
-			<text name="BHText7">
-				D
-			</text>
-			<text name="WLCloudCoverageText">
-				Couverture nuageuse
-			</text>
-			<button label="?" name="WLCloudCoverageHelp" left="407"/>
-			<text name="WLCloudScaleText">
-				Altitude des nuages
-			</text>
-			<button label="?" name="WLCloudScaleHelp" left="407"/>
-			<text name="WLCloudDetailText">
-				Détails nuages (XY/densité)
-			</text>
-			<button label="?" name="WLCloudDetailHelp" left="407" bottom_delta="-2" />
-			<text name="BHText8">
-				X
-			</text>
-			<text name="BHText9">
-				Y
-			</text>
-			<text name="BHText10">
-				D
-			</text>
-			<text name="WLCloudScrollXText">
-				Direction et vitesse X
-			</text>
-			<button label="?" name="WLCloudScrollXHelp" />
-			<check_box label="Verrouiller" name="WLCloudLockX" />
-			<text name="WLCloudScrollYText">
-				Direction et vitesse Y
-			</text>
-			<button label="?" name="WLCloudScrollYHelp" />
-			<check_box label="Verrouiller" name="WLCloudLockY" />
-			<check_box label="Nuages classiques" 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&apos;s Delight:Sheer Sensuality
-	</string>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="WindLight floater" title="Éditeur de ciel avancé" width="706">
+	<text name="KeyFramePresetsText">
+		Préréglages ciel:
+	</text>
+	<button label="Nouveau" label_selected="Nouveau" name="WLNewPreset" />
+	<button label="Enregistrer" label_selected="Enregistrer" name="WLSavePreset" width="75" left_delta="75"/>
+	<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" width="706">
+		<panel label="Atmosphère" name="Atmosphere">
+			<text name="BHText">
+				Bleu de l'horizon
+			</text>
+			<button label="?" name="WLBlueHorizonHelp" />
+			<text name="BHText2">
+				R
+			</text>
+			<text name="BHText3">
+				V
+			</text>
+			<text name="BHText4">
+				B
+			</text>
+			<text name="BHText5">
+				I
+			</text>
+			<text name="BDensText">
+				Quantité de brume
+			</text>
+			<button label="?" name="WLHazeHorizonHelp" />
+			<text name="BDensText2">
+				Densité du bleu
+			</text>
+			<button label="?" name="WLBlueDensityHelp" />
+			<text name="BHText6">
+				R
+			</text>
+			<text name="BHText7">
+				V
+			</text>
+			<text name="BHText8">
+				B
+			</text>
+			<text name="BHText9">
+				I
+			</text>
+			<text name="HDText">
+				Densité de la brume
+			</text>
+			<button label="?" name="WLHazeDensityHelp" />
+			<text name="DensMultText">
+				Multiplicateur de densité
+			</text>
+			<button label="?" name="WLDensityMultHelp" />
+			<text name="WLDistanceMultText">
+				Multiplicateur de distance
+			</text>
+			<button label="?" name="WLDistanceMultHelp" />
+			<text name="MaxAltText">
+				Altitude maximum
+			</text>
+			<button label="?" name="WLMaxAltitudeHelp" />
+		</panel>
+		<panel label="Éclairage" name="Lighting">
+			<text name="SLCText">
+				Couleur soleil/lune
+			</text>
+			<button label="?" name="WLSunlightColorHelp" />
+			<text name="BHText">
+				R
+			</text>
+			<text name="BHText2">
+				V
+			</text>
+			<text name="BHText3">
+				B
+			</text>
+			<text name="BHText4">
+				I
+			</text>
+			<text name="TODText">
+				Position soleil/lune
+			</text>
+			<button label="?" name="WLTimeOfDayHelp" />
+			<text name="WLAmbientText">
+				Éclairage ambiant
+			</text>
+			<button label="?" name="WLAmbientHelp" />
+			<text name="BHText5">
+				R
+			</text>
+			<text name="BHText6">
+				V
+			</text>
+			<text name="BHText7">
+				B
+			</text>
+			<text name="BHText8">
+				I
+			</text>
+			<text name="WLEastAngleText">
+				Angle du levant
+			</text>
+			<button label="?" name="WLEastAngleHelp" />
+			<text name="SunGlowText">
+				Rayonnement du soleil
+			</text>
+			<button label="?" name="WLSunGlowHelp" />
+			<slider label="Netteté " name="WLGlowB" />
+			<slider label="Taille    " name="WLGlowR" />
+			<text name="SceneGammaText">
+				Gamma de la scène
+			</text>
+			<button label="?" name="WLSceneGammaHelp" />
+			<text name="WLStarText">
+				Éclat des étoiles
+			</text>
+			<button label="?" name="WLStarBrightnessHelp" />
+		</panel>
+		<panel label="Nuages" name="Clouds">
+			<text name="WLCloudColorText">
+				Couleur des nuages
+			</text>
+			<button label="?" name="WLCloudColorHelp" />
+			<text name="BHText">
+				R
+			</text>
+			<text name="BHText2">
+				V
+			</text>
+			<text name="BHText3">
+				B
+			</text>
+			<text name="BHText4">
+				I
+			</text>
+			<text name="WLCloudColorText2">
+				Nuages XY/densité
+			</text>
+			<button label="?" name="WLCloudDensityHelp" />
+			<text name="BHText5">
+				X
+			</text>
+			<text name="BHText6">
+				Y
+			</text>
+			<text name="BHText7">
+				D
+			</text>
+			<text name="WLCloudCoverageText">
+				Couverture nuageuse
+			</text>
+			<button label="?" name="WLCloudCoverageHelp" left="407"/>
+			<text name="WLCloudScaleText">
+				Altitude des nuages
+			</text>
+			<button label="?" name="WLCloudScaleHelp" left="407"/>
+			<text name="WLCloudDetailText">
+				Détails nuages (XY/densité)
+			</text>
+			<button label="?" name="WLCloudDetailHelp" left="407" bottom_delta="-2" />
+			<text name="BHText8">
+				X
+			</text>
+			<text name="BHText9">
+				Y
+			</text>
+			<text name="BHText10">
+				D
+			</text>
+			<text name="WLCloudScrollXText">
+				Direction et vitesse X
+			</text>
+			<button label="?" name="WLCloudScrollXHelp" />
+			<check_box label="Verrouiller" name="WLCloudLockX" />
+			<text name="WLCloudScrollYText">
+				Direction et vitesse Y
+			</text>
+			<button label="?" name="WLCloudScrollYHelp" />
+			<check_box label="Verrouiller" name="WLCloudLockY" />
+			<check_box label="Nuages classiques" 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&apos;s Delight:Sheer Sensuality
+	</string>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_world_map.xml b/indra/newview/skins/default/xui/fr/floater_world_map.xml
index 0fe1e5375..5d7b5773c 100644
--- a/indra/newview/skins/default/xui/fr/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/fr/floater_world_map.xml
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="worldmap" title="Carte du monde">
-	<panel name="objects_mapview" width="953" />
-	<icon left="973" name="self" />
-	<text name="you_label">
-		Vous
-	</text>
-	<icon left="1033" name="home"/>
-	<text name="home_label">
-		Domicile
-	</text>
-	<icon left="973" name="square2"/>
-	<text name="auction_label">
-		Terrain aux enchères
-	</text>
-	<icon left="1105" name="square"/>
-	<text name="land_for_sale_label">
-		Terrain à vendre
-	</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"/>
-	<check_box label="Résident" name="people_chk"/>
-	<icon left="973" name="infohub"/>
-	<check_box label="Infohub" name="infohub_chk"/>
-	<icon left="973" name="telehub"/>
-	<check_box label="Téléhub" name="telehubchk"/>
-	<icon left="973" name="landforsale"/>
-	<check_box label="Terrain à vendre" name="land_for_sale_chk"/>
-	<text name="events_label" left="1099">
-		Événements :
-	</text>
-	<icon left="1121" name="event"/>
-	<check_box label="Général" name="event_chk"/>
-	<icon left="1121" name="events_mature_icon"/>
-	<check_box label="Modéré" name="event_mature_chk"/>
-	<icon left="1121" name="events_adult_icon"/>
-	<check_box label="Adulte" name="event_adult_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">
-		<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"/>
-	<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"/>
-	</scroll_list>
-	<text left="973" name="location_label">
-		Position :
-	</text>
-	<spinner left="1078" name="spin x" tool_tip="Coordonnées des X du lieu à afficher sur la carte"/>
-	<spinner name="spin y" tool_tip="Coordonnées des Y du lieu à afficher sur la carte"/>
-	<spinner 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 ma position" label_selected="Afficher ma position" name="Show My Location" tool_tip="Centrer la carte sur la position de votre avatar" width="165"/>
-	<button label="Copier la SLURL dans le presse-papiers" left="-270" name="copy_slurl" tool_tip="Copier l&apos;adresse SLURL de la position actuelle pour l&apos;utiliser sur le Web." width="262"/>
-	<slider label="Zoom" left="-270" name="zoom slider"/>
-</floater>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="worldmap" title="Carte du monde">
+	<panel name="objects_mapview" width="953" />
+	<icon left="973" name="self" />
+	<text name="you_label">
+		Vous
+	</text>
+	<icon left="1033" name="home"/>
+	<text name="home_label">
+		Domicile
+	</text>
+	<icon left="973" name="square2"/>
+	<text name="auction_label">
+		Terrain aux enchères
+	</text>
+	<icon left="1105" name="square"/>
+	<text name="land_for_sale_label">
+		Terrain à vendre
+	</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"/>
+	<check_box label="Résident" name="people_chk"/>
+	<icon left="973" name="infohub"/>
+	<check_box label="Infohub" name="infohub_chk"/>
+	<icon left="973" name="telehub"/>
+	<check_box label="Téléhub" name="telehubchk"/>
+	<icon left="973" name="landforsale"/>
+	<check_box label="Terrain à vendre" name="land_for_sale_chk"/>
+	<text name="events_label" left="1099">
+		Événements:
+	</text>
+	<icon left="1121" name="event"/>
+	<check_box label="Général" name="event_chk"/>
+	<icon left="1121" name="events_mature_icon"/>
+	<check_box label="Modéré" name="event_mature_chk"/>
+	<icon left="1121" name="events_adult_icon"/>
+	<check_box label="Adulte" name="event_adult_chk"/>
+	<icon left="973" name="avatar_icon"/>
+	<combo_box label="Amis connectés" name="friend combo" tool_tip="Ami(e)(s) à afficher sur la carte" width="232">
+		<combo_item name="none_selected">
+			Ami(e)s connecté(e)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">
+		<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'une région" width="155"/>
+	<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"/>
+	</scroll_list>
+	<text left="973" name="location_label">
+		Position :
+	</text>
+	<spinner left="1078" name="spin x" tool_tip="Coordonnées des X du lieu à afficher sur la carte"/>
+	<spinner name="spin y" tool_tip="Coordonnées des Y du lieu à afficher sur la carte"/>
+	<spinner 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="Vous téléporte à l&apos;endroit sélectionné"/>
+	<button label="Afficher la destination" label_selected="Afficher la destination" name="Show Destination" tool_tip="Centre 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 ma position" label_selected="Afficher ma position" name="Show My Location" tool_tip="Centre la carte sur la position de votre avatar" width="165"/>
+	<button label="Copier la SLURL dans le presse-papiers" left="-270" name="copy_slurl" tool_tip="Copie l&apos;adresse SLURL de la position actuelle pour l&apos;utiliser sur le Web." width="262"/>
+	<slider label="Zoom" left="-270" name="zoom slider"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/fr/fonts.xml b/indra/newview/skins/default/xui/fr/fonts.xml
index cccb45b97..021372d6f 100644
--- a/indra/newview/skins/default/xui/fr/fonts.xml
+++ b/indra/newview/skins/default/xui/fr/fonts.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<fonts>
-
-  <font name="OverrideTest"
-	comment="Name of font to test overriding">
-    <file>timesbd.ttf</file>
-  </font>
-
-</fonts>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<fonts>
+
+  <font name="OverrideTest"
+	comment="Name of font to test overriding">
+    <file>timesbd.ttf</file>
+  </font>
+
+</fonts>
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml
index 3dc0c4447..4f1d8f4a4 100644
--- a/indra/newview/skins/default/xui/fr/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml
@@ -1,85 +1,75 @@
-<?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 label="Nouveaux habits" name="New Clothes">
-		<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 débardeur" name="New Undershirt"/>
-		<menu_item_call label="Nouveau caleçon" name="New Underpants"/>
-		<menu_item_call label="Nouveau masque alpha" name="New Alpha Mask"/>
-		<menu_item_call label="Nouveau tatouage" name="New Tattoo"/>
-		<menu_item_call label="Nouvelles propriétés physiques" name="New Physics"/>
-	</menu>
-	<menu label="Nouvelles parties du corps" 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>
-	<menu_item_call bottom_delta="-18" height="18" label="Ajouter" left="0" mouse_opaque="true"
-	     name="Object Add" width="128">
-		<on_click filter="" function="Inventory.DoToSelected" userdata="wear_add" />
-	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" label="Faire un Lien" left="0" mouse_opaque="true"
-	     name="Paste As Link" width="128">
-		<on_click filter="" function="Inventory.DoToSelected" userdata="paste_link" />
-	</menu_item_call>
-	<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="Remplacer la tenue actuelle" name="Replace Outfit"/>
-	<menu_item_call label="Ajouter à la tenue actuelle" name="Add To Outfit"/>
-	<menu_item_call label="Enlever de la tenue actuelle" name="Remove From Outfit"/>
-	<menu_item_call label="Trouver l'original" name="Find Original"/>
-	<menu_item_call label="Purger l'objet" name="Purge Item"/>
-	<menu_item_call label="Restaurer l'objet" name="Restore Item"/>
-	<menu_item_call label="Ouvrir" name="Open"/>
-	<menu_item_call label="Ouvrir l'original" name="Open Original"/>
-	<menu_item_call label="Propriétés" name="Properties"/>
-	<menu_item_call label="Renommer" name="Rename"/>
-	<menu_item_call label="Copier l'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="Coller comme lien" name="Paste As Link"/>
-	<menu_item_call label="Supprimer" name="Remove Link"/>
-	<menu_item_call label="Supprimer" name="Delete"/>
-	<menu_item_call label="Supprimer le dossier système" name="Delete System Folder"/>
-	<menu_item_call label="Enlever l&apos;ensemble" name="Take Off Items"/>
-	<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="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="Proposer une téléportation..." 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="Remettre dans le dernier emplacement" name="Restore to Last Position"/>
-	<menu_item_call label="Porter" name="Wearable And Object Wear"/>
-	<menu label="Attacher à" name="Attach To"/>
-	<menu label="Attacher au HUD " name="Attach To HUD"/>
-	<menu_item_call label="Éditer" name="Wearable Edit"/>
-	<menu_item_call label="Ajouter" name="Wearable Add"/>
-	<menu_item_call label="Enlever" name="Take Off"/>
-	<menu_item_call label="--aucune option--" name="--no options--"/>
-</menu>
+<?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="Nouvelle gesture" name="New Gesture"/>
+	<menu name="New Clothes">
+		<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 Tee-shirt" 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>
+	<menu_item_call bottom_delta="-18" height="18" label="Ajouter" left="0" name="Object Add" width="128">
+		<on_click function="Inventory.DoToSelected" userdata="wear_add" />
+	</menu_item_call>
+	<menu_item_call bottom_delta="-18" height="18" label="Faire un Lien" left="0" name="Paste As Link" width="128">
+		<on_click filter="" function="Inventory.DoToSelected" userdata="paste_link" />
+	</menu_item_call>
+	<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'objet" name="Purge Item"/>
+	<menu_item_call label="Restaurer l'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'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="Enlever l'ensemble" name="Take Off Items"/>
+	<menu_item_call label="Ajouter à l'ensemble" name="Add To Outfit"/>
+	<menu_item_call label="Remplacer l'ensemble" name="Replace Outfit"/>
+	<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="Remettre au dernier emplacement" name="Restore to Last Position"/>
+	<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="Éditer" name="Wearable Edit"/>
+	<menu_item_call label="Porter" name="Wearable Wear"/>
+	<menu_item_call label="Enlever" name="Take Off"/>
+	<menu_item_call label="--aucune option--" name="--no options--"/>
+  <menu_item_call bottom_delta="-18" height="18" label="Porter l'ensemble" left="0" name="Wear Items" width="128">
+    <on_click filter="" function="Inventory.DoToSelected" userdata="wearitems" />
+  </menu_item_call>
+</menu>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/fr/menu_login.xml b/indra/newview/skins/default/xui/fr/menu_login.xml
index 0e40f7045..18de07242 100644
--- a/indra/newview/skins/default/xui/fr/menu_login.xml
+++ b/indra/newview/skins/default/xui/fr/menu_login.xml
@@ -1,33 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
-     height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true"
-     tear_off="false" width="802">
-	<menu bottom="273" create_jump_keys="true" drop_shadow="true" enabled="true"
-	     height="263" label="Fichier" left="0" mouse_opaque="false" name="File"
-	     opaque="true" tear_off="false" width="243">
-		<menu_item_call bottom="-29" enabled="true" height="19" label="Quitter" left="0"
-		     mouse_opaque="true" name="Quit" shortcut="control|Q" width="260">
-			<on_click function="File.Quit" userdata="" />
-		</menu_item_call>
-	</menu>
-	<menu bottom="97" create_jump_keys="true" drop_shadow="true" enabled="true"
-	     height="439" label="Édition" left="38" mouse_opaque="false" name="Edit"
-	     opaque="true" tear_off="false" width="153">
-		<menu_item_call bottom="-29" enabled="true" height="19" label="Pr&#xE9;ferences" left="0"
-		     mouse_opaque="true" name="Preferences..." shortcut="control|P" width="153">
-			<on_click function="ShowFloater" userdata="preferences" />
-		</menu_item_call>
-	</menu>
-	<menu bottom="219" create_jump_keys="true" drop_shadow="true" enabled="true"
-	     height="317" label="Aide" left="80" mouse_opaque="false" name="Help"
-	     opaque="true" tear_off="false" width="166">
-		<menu_item_call bottom="-29" enabled="true" height="19" label="Aide de Second Life" left="0"
-		     mouse_opaque="true" name="Second Life Help" shortcut="F1" width="166">
-			<on_click function="ShowFloater" userdata="help f1" />
-		</menu_item_call>
-		<menu_item_call bottom="-48" enabled="true" height="19" label="À propos de Singularity" left="0"
-		     mouse_opaque="true" name="About Second Life..." width="166">
-			<on_click function="ShowFloater" userdata="about" />
-		</menu_item_call>
-	</menu>
-</menu_bar>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu_bar name="Login Menu">
+	<menu name="File" label="Fichier">
+		<menu_item_call name="Quit" label="Quitter">
+			<on_click function="File.Quit" userdata="" />
+		</menu_item_call>
+	</menu>
+	<menu name="Edit" label="Edition">
+		<menu_item_call name="Preferences..." label="Pr&#xE9;f&#xE9;rences">
+			<on_click function="ShowFloater" userdata="preferences" />
+		</menu_item_call>
+	</menu>
+	<menu name="Help" label="Aide">
+		<menu_item_call name="Second Life Help" label="Aide de Second Life">
+			<on_click function="ShowFloater" userdata="help f1" />
+		</menu_item_call>
+		<menu_item_call name="About Second Life..." label="A propos de Singularity">
+			<on_click function="ShowFloater" userdata="about" />
+		</menu_item_call>
+	</menu>
+</menu_bar>
diff --git a/indra/newview/skins/default/xui/fr/menu_mini_map.xml b/indra/newview/skins/default/xui/fr/menu_mini_map.xml
index d117e69eb..8ce2419fc 100644
--- a/indra/newview/skins/default/xui/fr/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/fr/menu_mini_map.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<menu name="popup">
-	<menu_item_call label="Zoom rapproché" name="Zoom Close"/>
-	<menu_item_call label="Zoom moyen" name="Zoom Medium"/>
-	<menu_item_call label="Zoom éloigné" name="Zoom Far"/>
-	<menu_item_call label="Arrêter de suivre" name="Stop Tracking"/>
-	<menu_item_call label="Profil" name="Profile"/>
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<menu name="popup">
+	<menu_item_call label="Zoom rapproché" name="Zoom Close"/>
+	<menu_item_call label="Zoom moyen" name="Zoom Medium"/>
+	<menu_item_call label="Zoom éloigné" name="Zoom Far"/>
+	<menu_item_call label="Arrêter de suivre" name="Stop Tracking"/>
+	<menu_item_call label="Profil" name="Profile"/>
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_pie_attachment.xml b/indra/newview/skins/default/xui/fr/menu_pie_attachment.xml
index 21bc03146..a370d5154 100644
--- a/indra/newview/skins/default/xui/fr/menu_pie_attachment.xml
+++ b/indra/newview/skins/default/xui/fr/menu_pie_attachment.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<pie_menu name="Attachment Pie">
-	<menu_item_call label="Profil" name="Profile..."/>
-	<menu_item_call label="Lâcher" name="Drop"/>
-	<menu_item_call label="Groupes" name="Groups..."/>
-	<menu_item_call label="Toucher" name="Attachment Object Touch">
-		<on_enable userdata="Toucher" name="EnableTouch"/>
-	</menu_item_call>
-	<menu_item_call label="Me lever" name="Stand Up"/>
-	<menu_item_call label="Détacher" name="Detach"/>
-	<menu_item_call label="Amis" name="Friends..."/>
-	<menu_item_call label="Gestures" name="Gestures..."/>
-	<menu_item_call label="Apparence" name="Appearance..."/>
-	<menu_item_call label="Modifier" name="Edit..."/>
-</pie_menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<pie_menu name="Attachment Pie">
+	<menu_item_call label="Profil" name="Profile..."/>
+	<menu_item_call label="Lâcher" name="Drop"/>
+	<menu_item_call label="Groupes" name="Groups..."/>
+	<menu_item_call label="Toucher" name="Attachment Object Touch">
+		<on_enable userdata="Toucher" name="EnableTouch"/>
+	</menu_item_call>
+	<menu_item_call label="Me lever" name="Stand Up"/>
+	<menu_item_call label="Détacher" name="Detach"/>
+	<menu_item_call label="Amis" name="Friends..."/>
+	<menu_item_call label="Gestures" name="Gestures..."/>
+	<menu_item_call label="Apparence" name="Appearance..."/>
+	<menu_item_call label="Modifier" name="Edit..."/>
+</pie_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_pie_avatar.xml b/indra/newview/skins/default/xui/fr/menu_pie_avatar.xml
index be0bac92b..115ca4e0a 100644
--- a/indra/newview/skins/default/xui/fr/menu_pie_avatar.xml
+++ b/indra/newview/skins/default/xui/fr/menu_pie_avatar.xml
@@ -1,18 +1,18 @@
-<?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(mute)" name="Avatar Mute"/>
-	<menu_item_call label="Aller" name="Go To"/>
-	<menu_item_call label="Signaler" name="abuse"/>
-	<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="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 un IM" name="Send IM..."/>
-</pie_menu>
+<?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(mute)" name="Avatar Mute"/>
+	<menu_item_call label="Aller" name="Go To"/>
+	<menu_item_call label="Signaler" name="abuse"/>
+	<menu_item_call label="Devenir ami(e)s" 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="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 un IM" name="Send IM..."/>
+</pie_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_pie_land.xml b/indra/newview/skins/default/xui/fr/menu_pie_land.xml
index 798cea014..918912d35 100644
--- a/indra/newview/skins/default/xui/fr/menu_pie_land.xml
+++ b/indra/newview/skins/default/xui/fr/menu_pie_land.xml
@@ -1,10 +1,10 @@
-<?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 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>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<pie_menu name="Land Pie">
+	<menu_item_call label="A 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'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/indra/newview/skins/default/xui/fr/menu_pie_object.xml b/indra/newview/skins/default/xui/fr/menu_pie_object.xml
index 0a2cdf953..523cad674 100644
--- a/indra/newview/skins/default/xui/fr/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/fr/menu_pie_object.xml
@@ -1,102 +1,100 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <pie_menu name="Object Pie">
-	<menu_item_call enabled="false" label="Ouvrir" mouse_opaque="true" name="Open">
+	<menu_item_call label="Ouvrir" name="Open">
 		<on_click function="Object.Open" />
 		<on_enable function="Object.EnableOpen" />
 	</menu_item_call>
-	<menu_item_call enabled="false" label="Créer" mouse_opaque="true" name="Create">
+	<menu_item_call label="Créer" name="Create">
 		<on_click function="Object.Build" />
 		<on_enable function="EnableEdit" />
 	</menu_item_call>
-	<menu_item_call enabled="false" label="Toucher" mouse_opaque="true" name="Object Touch">
+	<menu_item_call label="Toucher" name="Object Touch">
 		<on_click function="Object.Touch" />
-		<on_enable function="Object.EnableTouch" userdata="Toucher" name="EnableTouch"/>
+		<on_enable function="Object.EnableTouch" userdata="Touch" name="EnableTouch"/>
 	</menu_item_call>
-	<menu_item_call enabled="false" label="M&apos;asseoir,Me lever" mouse_opaque="true" name="Object Sit">
+	<menu_item_call label="M'asseoir/Me lever" name="Object Sit">
 		<on_click function="Object.SitOrStand" />
-		<on_enable function="Object.EnableSitOrStand" userdata="M&apos;asseoir,Me lever" name="EnableSitOrStand"/>
+		<on_enable function="Object.EnableSitOrStand" userdata="M'asseoir,Me lever" name="EnableSitOrStand"/>
 	</menu_item_call>
-	<menu_item_call enabled="false" label="Prendre" mouse_opaque="true" name="Pie Object Take">
+	<menu_item_call label="Prendre" name="Pie Object Take">
 		<on_click function="Tools.BuyOrTake" />
 		<on_enable function="Tools.EnableBuyOrTake" userdata="Acheter,Prendre" name="EnableBuyOrTake"/>
 	</menu_item_call>
-	<menu_item_call enabled="false" label="Payer" mouse_opaque="true" name="Pay...">
+	<menu_item_call label="Payer" name="Pay...">
 		<on_click function="PayObject" />
 		<on_enable function="EnablePayObject" />
 	</menu_item_call>
 	<pie_menu label="Plus &gt;" name="More &gt;">
-		<menu_item_call enabled="false" label="Supprimer" mouse_opaque="true" name="Delete">
+		<menu_item_call label="Supprimer" name="Delete">
 			<on_click function="Object.Delete" />
 			<on_enable function="Object.EnableDelete" />
 		</menu_item_call>
-		<menu_item_call enabled="false" label="Porter" mouse_opaque="true" name="Wear">
+		<menu_item_call label="Porter" name="Wear">
 			<on_click function="Object.AttachToAvatar" />
 			<on_enable function="Object.EnableWear" />
 		</menu_item_call>
-		<menu_item_call enabled="false" label="Prendre une copie" mouse_opaque="true" name="Take Copy">
+		<menu_item_call label="Prendre une copie" name="Take Copy">
 			<on_click function="Tools.TakeCopy" />
 			<on_enable function="Tools.EnableTakeCopy" />
 		</menu_item_call>
 		<pie_menu label="Attacher le HUD &gt;" name="Object Attach HUD" />
 		<pie_menu label="Attacher &gt;" name="Object Attach" />
-		<menu_item_call enabled="false" label="Retourner" mouse_opaque="true" name="Return...">
+		<menu_item_call label="Retourner" name="Return...">
 			<on_click function="Object.Return" />
 			<on_enable function="Object.EnableReturn" />
 		</menu_item_call>
 		<pie_menu label="Plus &gt;" name="Rate Menu">
 			<menu_item_separator />
 			<pie_menu label="Outils &gt;" name="Rate Menu">
-				<menu_item_call enabled="false" label="Detruire" mouse_opaque="true" name="Destroy">
+				<menu_item_call label="Detruire" name="Destroy">
 					<on_click function="Object.Destroy" />
 					<on_enable function="Object.EnableDestroy" />
 				</menu_item_call>
-				<menu_item_call enabled="false" label="Eclater" mouse_opaque="true" name="Explode">
+				<menu_item_call label="Eclater" name="Explode">
 					<on_click function="Object.Explode" />
 					<on_enable function="Object.EnableExplode" />
 				</menu_item_call>
-				<menu_item_call enabled="true" hidden="false" label="Mesurer" mouse_opaque="true" name="Measure">
+				<menu_item_call label="Mesurer" name="Measure">
 					<on_click function="Object.Measure" />
 				</menu_item_call>
-				<menu_item_call enabled="true" hidden="false" label="Données" mouse_opaque="true" name="Data">
+				<menu_item_call label="Données" name="Data">
 					<on_click function="Object.Data" />
 				</menu_item_call>
-				<menu_item_call enabled="false" hidden="false" label="S. Compte" mouse_opaque="true" name="ScriptCount">
+				<menu_item_call label="S. Compte" name="ScriptCount">
 					<on_click function="Object.ScriptCount" />
 					<on_visible function="Object.VisibleScriptCount" />
 				</menu_item_call>
-				<menu_item_call bottom="-487" enabled="false" height="19" label="Ré-init.Scripts"
-					left="0" mouse_opaque="true" name="Reset Scripts" width="250">
+				<menu_item_call label="Ré-init.Scripts" name="Reset Scripts" width="250">
 					<on_click function="Tools.SelectedScriptAction" userdata="reset" />
 					<on_enable function="EditableSelected" />
 				</menu_item_call>
-				<menu_item_call enabled="false" hidden="false" label="Exporter" mouse_opaque="true" name="Export">
+				<menu_item_call label="Exporter" name="Export">
 						<on_click function="Object.Export" />
 						<on_enable function="Object.EnableExport" />
 				</menu_item_call>				
 			</pie_menu>
-			<menu_item_call enabled="false" label="Ignorer(mute)" mouse_opaque="true" name="Object Mute">
+			<menu_item_call label="Ignorer(mute)" name="Object Mute">
 				<on_click function="Object.Mute" />
 				<on_enable function="Object.EnableMute" />
 			</menu_item_call>
-			<menu_item_call enabled="true" label="Inspecter" mouse_opaque="true" name="Object Inspect">
+			<menu_item_call label="Inspecter" name="Object Inspect">
 				<on_click function="Object.Inspect" />
 				<on_enable function="Object.EnableInspect" />
 			</menu_item_call>
-			<menu_item_call enabled="true" label="Derender" mouse_opaque="true" name="Derender">
+			<menu_item_call label="Derender" name="Derender">
 				<on_click function="Object.DERENDER" />
 			</menu_item_call>
-			<menu_item_call enabled="false" label="Signaler" mouse_opaque="true"
-			     name="Report Abuse...">
+			<menu_item_call label="Signaler" name="Report Abuse...">
 				<on_click function="Object.ReportAbuse" />
 				<on_enable function="Object.EnableReportAbuse" />
 			</menu_item_call>
 		</pie_menu>
-		<menu_item_call enabled="false" label="Acheter" mouse_opaque="true" name="Buy...">
+		<menu_item_call enabled="false" label="Acheter..." name="Buy...">
 			<on_click function="Object.Buy" />
 			<on_enable function="Object.EnableBuy" />
 		</menu_item_call>
 	</pie_menu>
-	<menu_item_call enabled="false" label="Editer" mouse_opaque="true" name="Edit...">
+	<menu_item_call enabled="false" label="Editer..." name="Edit...">
 		<on_click function="Object.Edit" />
 		<on_enable function="EnableEdit" />
 	</menu_item_call>
diff --git a/indra/newview/skins/default/xui/fr/menu_pie_self.xml b/indra/newview/skins/default/xui/fr/menu_pie_self.xml
index f1d662cc2..15b20e94a 100644
--- a/indra/newview/skins/default/xui/fr/menu_pie_self.xml
+++ b/indra/newview/skins/default/xui/fr/menu_pie_self.xml
@@ -1,38 +1,37 @@
-<?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..." />
-	<menu_item_call label="Aller" name="Go..." />
-	<menu_item_call label="Me lever" name="Stand Up" />
-	<menu_item_call label="Amis" name="Friends..." />
-	<menu_item_call label="Gestures" name="Gestures..." />
-     <pie_menu label="Outils &gt;" name="Tools &gt;">
-	  <menu_item_call label="Animations" name="Anims..."/>
-	  <menu_item_call label="Script Compte" name="ScriptCount"/>
-       <menu_item_call label="Debug" name="Debug Layers"/>
-       <menu_item_call label="Copie UUID" mouse_opaque="true" name="CopyUUID"/>
-     </pie_menu>
-	<pie_menu label="Enlever &gt;" name="Take Off &gt;">
-		<pie_menu label="Habits &gt;" name="Clothes &gt;">
-			<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" />
-			<pie_menu label="Plus &gt;" name="More &gt;">
-				<menu_item_call label="Tee Shirt" name="Self Undershirt" />
-				<menu_item_call label="Tous les habits" name="All Clothes" />
-				<menu_item_call label="Culotte" name="Self Underpants" />
-			</pie_menu>
-		<menu_item_call label="Jupe" name="Skirt" />
-		</pie_menu>
-		<pie_menu label="HUD &gt;" name="Object Detach HUD"/>
-		<menu_item_separator />
-		<pie_menu label="Detacher &gt;" name="Object Detach"/>
-		<menu_item_separator />
-		<menu_item_call label="Detacher Tout" name="Detach All"/>
-      	</pie_menu>
-	<menu_item_call label="Apparence" name="Appearance..." />
-     </pie_menu>
-
+<?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..." />
+	<menu_item_call label="Aller" name="Go..." />
+	<menu_item_call label="Me lever" name="Stand Up" />
+	<menu_item_call label="Amis" name="Friends..." />
+	<menu_item_call label="Gestures" name="Gestures..." />
+	<pie_menu label="Outils &gt;" name="Tools &gt;">
+		<menu_item_call label="Animations" name="Anims..."/>
+		<menu_item_call label="Script Compte" name="ScriptCount"/>
+		<menu_item_call label="Debug" name="Debug Layers"/>
+		<menu_item_call label="Copie UUID" name="CopyUUID"/>
+    </pie_menu>
+	<pie_menu label="Enlever &gt;" name="Take Off &gt;">
+		<pie_menu label="Habits &gt;" name="Clothes &gt;">
+			<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" />
+			<pie_menu label="Plus &gt;" name="More &gt;">
+				<menu_item_call label="Tee Shirt" name="Self Undershirt" />
+				<menu_item_call label="Tous les habits" name="All Clothes" />
+				<menu_item_call label="Culotte" name="Self Underpants" />
+			</pie_menu>
+		<menu_item_call label="Jupe" name="Skirt" />
+		</pie_menu>
+		<pie_menu label="HUD &gt;" name="Object Detach HUD"/>
+		<menu_item_separator />
+		<pie_menu label="D&#xE9;tacher &gt;" name="Object Detach"/>
+		<menu_item_separator />
+		<menu_item_call label="D&#xE9;tacher Tout" name="Detach All"/>
+    </pie_menu>
+	<menu_item_call label="Apparence" name="Appearance..." />
+</pie_menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_slurl.xml b/indra/newview/skins/default/xui/fr/menu_slurl.xml
index ebd042a38..8d1bf5e57 100644
--- a/indra/newview/skins/default/xui/fr/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/fr/menu_slurl.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu name="Popup">
-	<menu_item_call label="À propos de l&apos;URL" name="about_url" />
-	<menu_item_call label="Téléporter vers l&apos;URL" name="teleport_to_url" />
-	<menu_item_call label="Voir sur la carte" name="show_on_map" />
-</menu>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<menu name="Popup">
+	<menu_item_call label="A propos de l'URL" name="about_url" />
+	<menu_item_call label="Téléporter vers l'URL" name="teleport_to_url" />
+	<menu_item_call label="Voir sur la carte" name="show_on_map" />
+</menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml
index 565a8ca5e..269556d0b 100644
--- a/indra/newview/skins/default/xui/fr/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml
@@ -1,278 +1,274 @@
-<?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 enabled="true" label="Import  d&apos;image ([UPLOADFEE])..."
-        mouse_opaque="true" name="Upload Image" shortcut="control|U" >
-		<on_click function="File.UploadImage" userdata="" />
-		<on_enable function="File.EnableUpload" />
-    </menu_item_call>
-    <menu_item_call label="Import de son ([UPLOADFEE])..." name="Upload Sound"
-        mouse_opaque="true" enabled="true" >
-        <on_click function="File.UploadSound" userdata="" />
-        <on_enable function="File.EnableUpload" />
-    </menu_item_call>
-    <menu_item_call label="Import d&apos;animation ([UPLOADFEE])..." name="Upload Animation"
-        mouse_opaque="true" enabled="true"  >
-        <on_click function="File.UploadAnim" userdata="" />
-        <on_enable function="File.EnableUpload" />
-    </menu_item_call>
-    <menu_item_call label="Import  multiples ([UPLOADFEE] par fichier)..." name="Bulk Upload"
-        mouse_opaque="true" enabled="true" >
-        <on_click function="File.UploadBulk" userdata="" />
-    </menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="Import XML" mouse_opaque="true" name="Import">
-		<on_click function="Object.Import" />
-		<on_enable function="Object.EnableImport" />
-	</menu_item_call>
-	<menu_item_call enabled="false" hidden="false" label="Import avec textures" mouse_opaque="true" name="Import2">
-		<on_click function="Object.ImportUpload" />
-		<on_enable function="Object.EnableImport" />
-	</menu_item_call>
-    <menu_item_separator enabled="true" label="-----------" mouse_opaque="true" name="separator" />
-    <menu_item_call enabled="true" label="Définir les droits par défaut " 
-        mouse_opaque="true" name="perm prefs" >
-        <on_click function="ShowFloater" userdata="perm prefs" />
-    </menu_item_call>
-		<menu_item_separator bottom="-121" enabled="true" height="8" label="-----------" left="0"
-		     mouse_opaque="true" name="separator2" width="243" />
-		<menu_item_call bottom="-140" enabled="true" height="19" label="Enregistrer la texture sur le disque dur" left="0"
-		     mouse_opaque="true" name="Save Preview As..." width="243">
-			<on_click function="File.SavePreview" userdata="" />
-			<on_enable function="File.EnableSaveAs" />
-		</menu_item_call>
-		<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="separator3"/>
-		<menu_item_call label="Prendre une photo" name="Take Snapshot"/>
-		<menu_item_call label="Enregistrer la photo sur le disque dur" 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">
-		<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">
-			<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="Tee Shirt" 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="Gestures" 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="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_check label="Inventaire" name="Inventory"/>
-		<menu_item_check label="Intervenants actifs" name="Active Speakers"/>
-		<menu_item_check label="Liste des ignorés - Mute" name="Mute List"/>
-		<menu_item_check label="Historique des TP" name="Teleport History"/>
-		<menu_item_check label="Filtre Médias" name="Media Filter"/>
-		<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="Recherche par Zone" name="Area Search"/>
-		<menu_item_check label="Limites des parcelles" name="Property Lines"/>
-		<menu_item_check label="Barrières d&apos;interdiction d&apos;accès" name="Banlines"/>
-		<menu_item_check label="Propriétaires" 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="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 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">
-		<menu_item_call label="Chat" name="Chat"/>
-		<menu_item_check label="Toujours courir" name="Always Run"/>
-		<menu_item_call label="s'asseoir au sol" name="Sit on Ground" shortcut="control|alt|S"/>
-		<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 - Landmark" 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 bottom="-186" enabled="true" height="19" label="Faux Absent (on off)" left="0"
-     		mouse_opaque="true" name="Fake Away Status" width="185">
-      		<on_click function="World.FakeAway" userdata=""/>
-    	</menu_item_call>
-
-
-		<menu_item_call bottom="-186" enabled="true" height="19" label="Absent(e)-Away" left="0"
-		     mouse_opaque="true" name="Set Away" width="185">
-			<on_click function="World.SetAway" userdata=""/>
-		</menu_item_call>
-		<menu_item_call bottom="-205" enabled="true" height="19" label="OQP-Busy" left="0"
-		     mouse_opaque="true" name="Set Busy" width="185">
-			<on_click function="World.SetBusy" userdata=""/>
-		</menu_item_call>
-
-		<menu_item_call label="Arrêter d&apos;animer mon avatar" name="Stop Animating My Avatar"/>
-		<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="Midi" 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="Editeur d&apos;environnement" name="Environment Editor"/>
-            <menu_item_call label="Editeur du jour" name="Day Cycle Editor"/>
-	        <menu_item_call label="Effets supplémentaires" name="Post-Processing Effects"/>
-		</menu>
-	</menu>
-	<menu label="Outils" name="Tools">
-		<menu label="Sélectionner un outil" name="Select Tool">
-			<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 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 label="Selection parties liées" name="Select Linked Parts">
-		<menu_item_call label="Select Suivante" name="Select Next Part"/>		
-		<menu_item_call label="Select Precedente"	name="Select Previous Part"/>
-		<menu_item_call label="Inclure Suivante" name="Include Next Part"/>
-		<menu_item_call label="Inclure Precedente" name="Include Previous Part"/>
-            </menu>
-		<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">
-			<on_enable userdata="Acheter,Prendre" name="EnableBuyOrTake"/>
-		</menu_item_call>
-		<menu_item_call label="Prendre une copie" name="Take Copy"/>
-		<menu_item_call label="Retourner l'objet" name="Return..."/>
-		<menu_item_call label="Remplacer l&apos;objet dans le contenu de l&apos;objet" name="Save Object Back to Object Contents"/>
-		<menu_item_call label="Admin Suppr. (fonction pour les open grids)" name="Admin Delete" shortcut="control|alt|shift|Del"/>		
-        <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_item_call label="Supprimer les Scripts dans la sélection" name="Remove Scripts in Selection"/>
-	</menu>
-	<menu label="Aide" name="Help">
-		<menu_item_call label="Aide de Snowglobe/Second Life" name="Second Life Help"/>
-		<menu_item_call label="Tutoriel" 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...">
-			<on_click name="ScriptingPortal_url" userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal/fr" />
-		</menu_item_call>
-		<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="Ouvrir un JIRA..." name="Public Issue Tracker..."/>
-			<menu_item_call label="Comment utiliser JIRA ?" name="Publc Issue Tracker Help...">
-				<on_click name="PublicIssueTrackerHelp_url" userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker/fr" />
-			</menu_item_call>
-			<menu_item_separator label="-----------" name="separator7"/>
-			<menu_item_call label="Comment signaler des bugs ?" name="Bug Reporing 101...">
-				<on_click name="BugReporting101_url" userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101/fr"/>
-			</menu_item_call>
-			<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 Singularity..." name="About Second Life..."/>
-	</menu>
-</menu_bar>
-</menu></menu>
+<?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="Import  d'image ([UPLOADFEE])" name="Upload Image">
+		<on_click function="File.UploadImage" userdata="" />
+		<on_enable function="File.EnableUpload" />
+    </menu_item_call>
+    <menu_item_call label="Import de son ([UPLOADFEE])" name="Upload Sound">
+        <on_click function="File.UploadSound" userdata="" />
+        <on_enable function="File.EnableUpload" />
+    </menu_item_call>
+    <menu_item_call label="Import d'animation ([UPLOADFEE])" name="Upload Animation">
+        <on_click function="File.UploadAnim" userdata="" />
+        <on_enable function="File.EnableUpload" />
+    </menu_item_call>
+    <menu_item_call label="Import  multiples ([UPLOADFEE] par fichier)" name="Bulk Upload">
+        <on_click function="File.UploadBulk" userdata="" />
+    </menu_item_call>
+	<menu_item_call label="Import XML" name="Import">
+		<on_click function="Object.Import" />
+		<on_enable function="Object.EnableImport" />
+	</menu_item_call>
+	<menu_item_call label="Import avec textures" name="Import2">
+		<on_click function="Object.ImportUpload" />
+		<on_enable function="Object.EnableImport" />
+	</menu_item_call>
+    <menu_item_separator label="-----------" name="separator" />
+    <menu_item_call label="Définir les droits par défaut " name="perm prefs" >
+        <on_click function="ShowFloater" userdata="perm prefs" />
+    </menu_item_call>
+		<menu_item_separator label="-----------" name="separator2"/>
+		<menu_item_call label="Enregistrer la texture sur le disque dur" name="Save Preview As...">
+			<on_click function="File.SavePreview" userdata="" />
+			<on_enable function="File.EnableSaveAs" />
+		</menu_item_call>
+		<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="separator3"/>
+		<menu_item_call label="Prendre une photo" name="Take Snapshot"/>
+		<menu_item_call label="Enregistrer la photo sur le disque dur" 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">
+		<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'objet" name="Attach Object"/>
+		<menu label="Détacher l'objet" name="Detach Object"/>
+		<menu label="Enlever mes habits" name="Take Off Clothing">
+			<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="Tee Shirt" 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="Gestures" name="Gestures..."/>
+		<menu_item_call label="Profil" name="Profile..."/>
+		<menu_item_call label="Apparence" name="Appearance..."/>
+		<menu_item_call label="Display Name - Nom en 'Rab'" name="Display Name..."/>
+		<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&#xE9;f&#xE9;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="Vue au joystick" name="Joystick Flycam"/>
+		<menu_item_call label="Réinitialiser l'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'outils" name="Toolbar"/>
+		<menu_item_check label="Chat local" name="Chat History"/>
+		<menu_item_check label="Communiquer" name="Instant Message"/>
+		<menu_item_check label="Inventaire" name="Inventory"/>
+		<menu_item_check label="Intervenants actifs" name="Active Speakers"/>
+		<menu_item_check label="Liste des ignorés - Mute" name="Mute List"/>
+		<menu_item_check label="Historique des TP" name="Teleport History"/>
+		<menu_item_check label="Filtre Médias" name="Media Filter"/>
+		<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="Recherche par Zone" name="Area Search"/>
+		<menu_item_check label="Limites des parcelles" name="Property Lines"/>
+		<menu_item_check label="Barrières d'interdiction d'accès" name="Banlines"/>
+		<menu_item_check label="Propriétaires" name="Land Owners"/>
+		<menu_item_separator label="-----------" name="separator4"/>
+		<menu label="Infobulles" name="Hover Tips">
+			<menu_item_check label="Afficher 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="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 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'interface par défaut" name="Set UI Size to Default"/>
+	</menu>
+	<menu label="Monde" name="World">
+		<menu_item_call label="Chat" name="Chat"/>
+		<menu_item_check label="Toujours courir" name="Always Run"/>
+		<menu_item_call label="S'asseoir au sol" name="Sit on Ground" shortcut="control|alt|S"/>
+		<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 - Landmark" 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 bottom="-186" enabled="true" height="19" label="Faux Absent (on/off)" left="0"
+     		mouse_opaque="true" name="Fake Away Status" width="185">
+      		<on_click function="World.FakeAway" userdata=""/>
+    	</menu_item_call>
+
+
+		<menu_item_call bottom="-186" enabled="true" height="19" label="Absent(e)-Away" left="0"
+		     mouse_opaque="true" name="Set Away" width="185">
+			<on_click function="World.SetAway" userdata=""/>
+		</menu_item_call>
+		<menu_item_call bottom="-205" enabled="true" height="19" label="OQP-Busy" left="0"
+		     mouse_opaque="true" name="Set Busy" width="185">
+			<on_click function="World.SetBusy" userdata=""/>
+		</menu_item_call>
+
+		<menu_item_call label="Arrêter d'animer mon avatar" name="Stop Animating My Avatar"/>
+		<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 [CURRENCY]" 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="Midi" 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="Editeur d&apos;environnement" name="Environment Editor"/>
+            <menu_item_call label="Editeur du jour" name="Day Cycle Editor"/>
+	        <menu_item_call label="Effets supplémentaires" name="Post-Processing Effects"/>
+		</menu>
+	</menu>
+	<menu label="Outils" name="Tools">
+		<menu label="Sélectionner un outil" name="Select Tool">
+			<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 en entourant" name="Select By Surrounding"/>
+		<menu_item_check label="Montrer les contours de la sélection" name="Show Selection Outlines" />
+			<on_click function="Tools.ShowSelectionHighlights" userdata="" />
+			<on_check control="RenderHighlightSelections" />
+		<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 label="Sélection parties liées" name="Select Linked Parts">
+		<menu_item_call label="Sélection Suivante" name="Select Next Part"/>		
+		<menu_item_call label="Sélection Precedente" name="Select Previous Part"/>
+		<menu_item_call label="Inclure Suivante" name="Include Next Part"/>
+		<menu_item_call label="Inclure Precedente" name="Include Previous Part"/>
+            </menu>
+		<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'objet" name="Menu Object Take">
+			<on_enable userdata="Acheter,Prendre" name="EnableBuyOrTake"/>
+		</menu_item_call>
+		<menu_item_call label="Prendre une copie" name="Take Copy"/>
+		<menu_item_call label="Retourner l'objet" name="Return..."/>
+		<menu_item_call label="Remplacer l'objet dans le contenu de l'objet" name="Save Object Back to Object Contents"/>
+		<menu_item_call label="Admin Suppr.(fonction pour les open grids)" name="Admin Delete" shortcut="control|alt|shift|Del"/>		
+        <menu_item_separator label="-----------" name="separator6"/>
+		<menu_item_call label="Afficher la fenêtre d'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_item_call label="Supprimer les scripts dans la sélection" name="Remove Scripts in Selection"/>
+	</menu>
+	<menu label="Aide" name="Help">
+		<menu_item_call label="Aide de Snowglobe/Second Life" name="Second Life Help"/>
+		<menu_item_call label="Tutoriel" 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...">
+			<on_click name="ScriptingPortal_url" userdata="WebLaunchLSLWiki,http://wiki.secondlife.com/wiki/LSL_Portal/fr" />
+		</menu_item_call>
+		<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="Ouvrir un JIRA" name="Public Issue Tracker..."/>
+			<menu_item_call label="Comment utiliser le JIRA" name="Publc Issue Tracker Help...">
+				<on_click name="PublicIssueTrackerHelp_url" userdata="WebLaunchPublicIssueHelp,http://wiki.secondlife.com/wiki/Issue_tracker/fr" />
+			</menu_item_call>
+			<menu_item_separator label="-----------" name="separator7"/>
+			<menu_item_call label="Comment signaler des bugs" name="Bug Reporing 101">
+				<on_click name="BugReporting101_url" userdata="WebLaunchBugReport101,http://wiki.secondlife.com/wiki/Bug_Reporting_101/fr"/>
+			</menu_item_call>
+			<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="A propos de Singularity" name="About Second Life..."/>
+	</menu>
+</menu_bar>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/fr/mime_types.xml b/indra/newview/skins/default/xui/fr/mime_types.xml
index 322887fb7..fe5d0197a 100644
--- a/indra/newview/skins/default/xui/fr/mime_types.xml
+++ b/indra/newview/skins/default/xui/fr/mime_types.xml
@@ -1,230 +1,230 @@
-<?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">
-			Cette parcelle propose du contenu multimédia
-		</tooltip>
-		<playtip name="web_playtip">
-			Afficher le contenu web
-		</playtip>
-	</widgetset>
-	<widgetset name="movie">
-		<label name="movie_label">
-			Film
-		</label>
-		<tooltip name="movie_tooltip">
-			Vous pouvez jouer un film ici
-		</tooltip>
-		<playtip name="movie_playtip">
-			Jouer le film
-		</playtip>
-	</widgetset>
-	<widgetset name="none">
-		<label name="none_label">
-			Aucun contenu
-		</label>
-		<tooltip name="none_tooltip">
-			Aucun média ici
-		</tooltip>
-	</widgetset>
-	<widgetset name="image">
-		<label name="image_label">
-			Image
-		</label>
-		<tooltip name="image_tooltip">
-			Cette parcelle contient une image
-		</tooltip>
-		<playtip name="image_playtip">
-			Afficher l&apos;image qui se trouve ici
-		</playtip>
-	</widgetset>
-	<widgetset name="audio">
-		<label name="audio_label">
-			Audio
-		</label>
-		<tooltip name="audio_tooltip">
-			Cette parcelle propose du contenu audio
-		</tooltip>
-		<playtip name="audio_playtip">
-			Jouer le contenu audio qui se trouve ici
-		</playtip>
-	</widgetset>
-	<scheme name="rtsp">
-		<label name="rtsp_label">
-			Flux en temps réel
-		</label>
-	</scheme>
-	<mimetype name="blank">
-		<label name="blank_label">
-			- Aucun -
-		</label>
-	</mimetype>
-	<mimetype name="none/none">
-		<label name="none/none_label">
-			- Aucun -
-		</label>
-	</mimetype>
-	<mimetype name="audio/*">
-		<label name="audio2_label">
-			Audio
-		</label>
-	</mimetype>
-	<mimetype name="video/*">
-		<label name="video2_label">
-			Vidéo
-		</label>
-	</mimetype>
-	<mimetype name="image/*">
-		<label name="image2_label">
-			Image
-		</label>
-	</mimetype>
-	<mimetype name="video/vnd.secondlife.qt.legacy">
-		<label name="vnd.secondlife.qt.legacy_label">
-			Film (Quicktime)
-		</label>
-	</mimetype>
-	<mimetype name="application/javascript">
-		<label name="application/javascript_label">
-			Javascript
-		</label>
-	</mimetype>
-	<mimetype name="application/ogg">
-		<label name="application/ogg_label">
-			Audio/Vidéo Ogg
-		</label>
-	</mimetype>
-	<mimetype name="application/pdf">
-		<label name="application/pdf_label">
-			Document PDF
-		</label>
-	</mimetype>
-	<mimetype name="application/postscript">
-		<label name="application/postscript_label">
-			Document Postscript
-		</label>
-	</mimetype>
-	<mimetype name="application/rtf">
-		<label name="application/rtf_label">
-			Format RTF
-		</label>
-	</mimetype>
-	<mimetype name="application/smil">
-		<label name="application/smil_label">
-			SMIL (Synchronized Multimedia Integration Language)
-		</label>
-	</mimetype>
-	<mimetype name="application/xhtml+xml">
-		<label name="application/xhtml+xml_label">
-			Page 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">
-			Audio (MIDI)
-		</label>
-	</mimetype>
-	<mimetype name="audio/mpeg">
-		<label name="audio/mpeg_label">
-			Audio (MP3)
-		</label>
-	</mimetype>
-	<mimetype name="audio/x-aiff">
-		<label name="audio/x-aiff_label">
-			Audio (AIFF)
-		</label>
-	</mimetype>
-	<mimetype name="audio/x-wav">
-		<label name="audio/x-wav_label">
-			Audio (WAV)
-		</label>
-	</mimetype>
-	<mimetype name="image/bmp">
-		<label name="image/bmp_label">
-			Image (BMP)
-		</label>
-	</mimetype>
-	<mimetype name="image/gif">
-		<label name="image/gif_label">
-			Image (GIF)
-		</label>
-	</mimetype>
-	<mimetype name="image/jpeg">
-		<label name="image/jpeg_label">
-			Image (JPEG)
-		</label>
-	</mimetype>
-	<mimetype name="image/png">
-		<label name="image/png_label">
-			Image (PNG)
-		</label>
-	</mimetype>
-	<mimetype name="image/svg+xml">
-		<label name="image/svg+xml_label">
-			Image (SVG)
-		</label>
-	</mimetype>
-	<mimetype name="image/tiff">
-		<label name="image/tiff_label">
-			Image (TIFF)
-		</label>
-	</mimetype>
-	<mimetype name="text/html">
-		<label name="text/html_label">
-			Page web
-		</label>
-	</mimetype>
-	<mimetype name="text/plain">
-		<label name="text/plain_label">
-			Texte
-		</label>
-	</mimetype>
-	<mimetype name="text/xml">
-		<label name="text/xml_label">
-			XML
-		</label>
-	</mimetype>
-	<mimetype name="video/mpeg">
-		<label name="video/mpeg_label">
-			Film (MPEG)
-		</label>
-	</mimetype>
-	<mimetype name="video/mp4">
-		<label name="video/mp4_label">
-			Film (MP4)
-		</label>
-	</mimetype>
-	<mimetype name="video/quicktime">
-		<label name="video/quicktime_label">
-			Film (Quicktime)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-ms-asf">
-		<label name="video/x-ms-asf_label">
-			Film (Windows Media ASF)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-ms-wmv">
-		<label name="video/x-ms-wmv_label">
-			Film (Windows Media WMV)
-		</label>
-	</mimetype>
-	<mimetype name="video/x-msvideo">
-		<label name="video/x-msvideo_label">
-			Film (AVI)
-		</label>
-	</mimetype>
-</mimetypes>
+<?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">
+			Cette parcelle propose du contenu multimédia
+		</tooltip>
+		<playtip name="web_playtip">
+			Afficher le contenu web
+		</playtip>
+	</widgetset>
+	<widgetset name="movie">
+		<label name="movie_label">
+			Film
+		</label>
+		<tooltip name="movie_tooltip">
+			Jouer un film ici
+		</tooltip>
+		<playtip name="movie_playtip">
+			Jouer le film
+		</playtip>
+	</widgetset>
+	<widgetset name="none">
+		<label name="none_label">
+			Aucun contenu
+		</label>
+		<tooltip name="none_tooltip">
+			Aucun média ici
+		</tooltip>
+	</widgetset>
+	<widgetset name="image">
+		<label name="image_label">
+			Image
+		</label>
+		<tooltip name="image_tooltip">
+			Cette parcelle contient une image
+		</tooltip>
+		<playtip name="image_playtip">
+			Afficher l&apos;image qui se trouve ici
+		</playtip>
+	</widgetset>
+	<widgetset name="audio">
+		<label name="audio_label">
+			Audio
+		</label>
+		<tooltip name="audio_tooltip">
+			Cette parcelle propose du contenu audio
+		</tooltip>
+		<playtip name="audio_playtip">
+			Jouer le contenu audio qui se trouve ici
+		</playtip>
+	</widgetset>
+	<scheme name="rtsp">
+		<label name="rtsp_label">
+			Flux en temps réel
+		</label>
+	</scheme>
+	<mimetype name="blank">
+		<label name="blank_label">
+			- Aucun -
+		</label>
+	</mimetype>
+	<mimetype name="none/none">
+		<label name="none/none_label">
+			- Aucun -
+		</label>
+	</mimetype>
+	<mimetype name="audio/*">
+		<label name="audio2_label">
+			Audio
+		</label>
+	</mimetype>
+	<mimetype name="video/*">
+		<label name="video2_label">
+			Vidéo
+		</label>
+	</mimetype>
+	<mimetype name="image/*">
+		<label name="image2_label">
+			Image
+		</label>
+	</mimetype>
+	<mimetype name="video/vnd.secondlife.qt.legacy">
+		<label name="vnd.secondlife.qt.legacy_label">
+			Film (Quicktime)
+		</label>
+	</mimetype>
+	<mimetype name="application/javascript">
+		<label name="application/javascript_label">
+			Javascript
+		</label>
+	</mimetype>
+	<mimetype name="application/ogg">
+		<label name="application/ogg_label">
+			Audio/Vidéo Ogg
+		</label>
+	</mimetype>
+	<mimetype name="application/pdf">
+		<label name="application/pdf_label">
+			Document PDF
+		</label>
+	</mimetype>
+	<mimetype name="application/postscript">
+		<label name="application/postscript_label">
+			Document Postscript
+		</label>
+	</mimetype>
+	<mimetype name="application/rtf">
+		<label name="application/rtf_label">
+			Format RTF
+		</label>
+	</mimetype>
+	<mimetype name="application/smil">
+		<label name="application/smil_label">
+			SMIL (Synchronized Multimedia Integration Language)
+		</label>
+	</mimetype>
+	<mimetype name="application/xhtml+xml">
+		<label name="application/xhtml+xml_label">
+			Page 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">
+			Audio (MIDI)
+		</label>
+	</mimetype>
+	<mimetype name="audio/mpeg">
+		<label name="audio/mpeg_label">
+			Audio (MP3)
+		</label>
+	</mimetype>
+	<mimetype name="audio/x-aiff">
+		<label name="audio/x-aiff_label">
+			Audio (AIFF)
+		</label>
+	</mimetype>
+	<mimetype name="audio/x-wav">
+		<label name="audio/x-wav_label">
+			Audio (WAV)
+		</label>
+	</mimetype>
+	<mimetype name="image/bmp">
+		<label name="image/bmp_label">
+			Image (BMP)
+		</label>
+	</mimetype>
+	<mimetype name="image/gif">
+		<label name="image/gif_label">
+			Image (GIF)
+		</label>
+	</mimetype>
+	<mimetype name="image/jpeg">
+		<label name="image/jpeg_label">
+			Image (JPEG)
+		</label>
+	</mimetype>
+	<mimetype name="image/png">
+		<label name="image/png_label">
+			Image (PNG)
+		</label>
+	</mimetype>
+	<mimetype name="image/svg+xml">
+		<label name="image/svg+xml_label">
+			Image (SVG)
+		</label>
+	</mimetype>
+	<mimetype name="image/tiff">
+		<label name="image/tiff_label">
+			Image (TIFF)
+		</label>
+	</mimetype>
+	<mimetype name="text/html">
+		<label name="text/html_label">
+			Page web
+		</label>
+	</mimetype>
+	<mimetype name="text/plain">
+		<label name="text/plain_label">
+			Texte
+		</label>
+	</mimetype>
+	<mimetype name="text/xml">
+		<label name="text/xml_label">
+			XML
+		</label>
+	</mimetype>
+	<mimetype name="video/mpeg">
+		<label name="video/mpeg_label">
+			Film (MPEG)
+		</label>
+	</mimetype>
+	<mimetype name="video/mp4">
+		<label name="video/mp4_label">
+			Film (MP4)
+		</label>
+	</mimetype>
+	<mimetype name="video/quicktime">
+		<label name="video/quicktime_label">
+			Film (Quicktime)
+		</label>
+	</mimetype>
+	<mimetype name="video/x-ms-asf">
+		<label name="video/x-ms-asf_label">
+			Film (Windows Media ASF)
+		</label>
+	</mimetype>
+	<mimetype name="video/x-ms-wmv">
+		<label name="video/x-ms-wmv_label">
+			Film (Windows Media WMV)
+		</label>
+	</mimetype>
+	<mimetype name="video/x-msvideo">
+		<label name="video/x-msvideo_label">
+			Film (AVI)
+		</label>
+	</mimetype>
+</mimetypes>
diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml
index 49e91acaf..7cdb9bb2f 100644
--- a/indra/newview/skins/default/xui/fr/notifications.xml
+++ b/indra/newview/skins/default/xui/fr/notifications.xml
@@ -1,3009 +1,3208 @@
-<?xml version="1.0" encoding="utf-8"?>
-<notifications>
-	<global name="skipnexttime">
-		Ne plus afficher
-	</global>
-	<global name="alwayschoose">
-		Toujours choisir cette option
-	</global>
-  <template name="okbutton">
-    <form>
-      <button
-       name="OK"
-       text="$yestext"/>
-    </form>
-  </template>
-
-  <template name="okignore">
-    <form>
-      <button
-       name="OK"
-       text="$yestext"/>
-      <ignore text="$ignoretext"/>
-    </form>
-  </template>
-
-  <template name="okcancelbuttons">
-    <form>
-      <button
-       name="OK"
-       text="$yestext"/>
-      <button
-       name="Cancel"
-       text="$notext"/>
-    </form>
-  </template>
-
-  <template name="okcancelignore">
-    <form>
-      <button
-       name="OK"
-       text="$yestext"/>
-      <button
-       name="Cancel"
-       text="$notext"/>
-      <ignore text="$ignoretext"/>
-    </form>
-  </template>
-
-  <template name="okhelpbuttons">
-    <form>
-      <button
-       name="OK"
-       text="$yestext"/>
-      <button
-       name="Help"
-       text="$helptext"/>
-    </form>
-  </template>
-
-  <template name="yesnocancelbuttons">
-    <form>
-      <button
-       name="Yes"
-       text="$yestext"/>
-      <button
-       name="No"
-       text="$notext"/>
-      <button
-       name="Cancel"
-       text="$canceltext"/>
-    </form>
-  </template>
-	<notification functor="GenericAcknowledge" label="Message d&apos;alerte inconnu" name="MissingAlert">
-		Votre version de Second Life ne peut afficher ce message d&apos;erreur.
-
-Détails de l&apos;erreur : L&apos;alerte, appelée &apos;[_NAME]&apos; est introuvable dans notifications.xml.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="FloaterNotFound">
-		Erreur floater : impossible de trouver les contrôles suivants :
-
-[CONTROLS]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="TutorialNotFound">
-		Aucun didacticiel n&apos;est disponible actuellement.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="GenericAlert">
-		[MESSAGE]
-	</notification>
-	<notification name="GenericAlertYesCancel">
-		[MESSAGE]
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Oui"/>
-	</notification>
-	<notification name="BadInstallation">
-		Une erreur est survenue lors de la mise à jour de Second Life. Veuillez télécharger la dernière version depuis PheonixViewer.com.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="LoginFailedNoNetwork">
-		Erreur réseau : impossible d&apos;établir une connexion. 
-&apos;[DIAGNOSTIC]&apos;
-Veuillez vérifier votre connexion.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MessageTemplateNotFound">
-		Le modèle de message [PATH] est introuvable.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="WearableSave">
-		Enregistrer les changements dans la partie du corps/les habits actuels ?
-		<usetemplate canceltext="Cancel" name="yesnocancelbuttons" notext="Ne pas enregistrer" yestext="Enregistrer"/>
-	</notification>
-	<notification name="CompileQueueSaveText">
-		Une erreur est survenue lors du chargement du texte pour un script, suite au problème suivant : [REASON]. Veuillez réessayer ultérieurement.
-	</notification>
-	<notification name="CompileQueueSaveBytecode">
-		Une erreur est survenue lors du chargement du script compilé, suite au problème suivant : [REASON]. Veuillez réessayer ultérieurement.
-	</notification>
-	<notification name="WriteAnimationFail">
-		Une erreur est survenue lors de l&apos;écriture des données d&apos;animation. Veuillez réessayer ultérieurement.
-	</notification>
-	<notification name="UploadAuctionSnapshotFail">
-		Un problème est survenu lors du chargement du script compilé, suite au problème suivant : [REASON]
-	</notification>
-	<notification name="UnableToViewContentsMoreThanOne">
-		Impossible d&apos;afficher les contenus de plus d&apos;un objet à la fois.
-Veuillez ne sélectionner qu&apos;un seul objet.
-	</notification>
-	<notification name="SaveClothingBodyChanges">
-		Enregistrer tous les changements dans les habits/parties du corps ?
-		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Ne pas enregistrer" yestext="Tout enregistrer"/>
-	</notification>
-	<notification name="GrantModifyRights">
-		Lorsque vous accordez des droits d&apos;édition à un autre résident, vous lui permettez de changer, supprimer ou prendre n&apos;importe lequel de vos objets dans le Monde. Réfléchissez bien avant d&apos;accorder ces droits.
-Souhaitez-vous accorder des droits d&apos;édition à [NAME] ?
-		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="GrantModifyRightsMultiple">
-		Lorsque vous accordez des droits d&apos;édition à un autre résident, vous lui permettez de changer n&apos;importe lequel de vos objets dans le Monde. Réfléchissez bien avant d&apos;accorder ces droits.
-Souhaitez-vous accorder des droits d&apos;édition aux résidents selectionnés ?
-		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="RevokeModifyRights">
-		Souhaitez-vous retirer les droits d&apos;édition à [NAME] ?
-		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="RevokeModifyRightsMultiple">
-		Souhaitez-vous retirer les droits d&apos;édition aux résidents selectionnés ?
-		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="UnableToCreateGroup">
-		Impossible de créer le groupe.
-[MESSAGE]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PanelGroupApply">
-		[NEEDS_APPLY_MESSAGE]
-[WANT_APPLY_MESSAGE]
-		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Ignorer les modifications" yestext="Enregistrer les modifications"/>
-	</notification>
-	<notification name="MustSpecifyGroupNoticeSubject">
-		Pour envoyer une notice au groupe, vous devez indiquer un sujet.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="AddGroupOwnerWarning">
-		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 ?
-		<usetemplate ignoretext="Lorsque vous donnez à des membres du groupe le rôle de « propriétaire »" name="okcancelignore" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="AssignDangerousActionWarning">
-		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.
-
-Ajouter ce pouvoir à « [ROLE_NAME] » ?
-		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="AssignDangerousAbilityWarning">
-		Vous êtes sur le point d&apos;ajouter le pouvoir « [ACTION_NAME] » au rôle « [ROLE_NAME] ».
-
- *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 ce pouvoir à « [ROLE_NAME] » ?
-		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="ClickPublishHelpLand">
-		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.
-	</notification>
-	<notification name="ClickSoundHelpLand">
-		La musique et le média ne peuvent être utilisés que sur cette parcelle. Les options Son et Voix peuvent être limités à la parcelle ou seront entendus par les résidents en dehors de la parcelle, en fonction de leur catégorie d&apos;accès. Souhaitez-vous en savoir plus sur le paramétrage de ces options ?
-		<url name="url">
-			http://wiki.secondlife.com/wiki/M%C3%A9dias_sur_la_parcelle_(KB)
-		</url>
-		<usetemplate name="okcancelbuttons" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
-	</notification>
-	<notification name="ClickSearchHelpAll">
-		Les résultats de recherche sont organisés en fonction de l&apos;onglet dans lequel vous vous trouvez, votre catégorie d&apos;accès, la catégorie choisie, ainsi que d&apos;autres facteurs. Pour plus de détails, veuillez consulter les pages d&apos;aide.
-		<url name="url">
-			http://wiki.secondlife.com/wiki/FAQ_sur_la_recherche_(KB)
-		</url>
-		<usetemplate name="okcancelbuttons" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
-	</notification>
-	<notification name="ClickPublishHelpLandDisabled">
-		Cette parcelle ne peut pas apparaître dans la recherche car elle est dans une région où cela n&apos;est pas autorisé.
-	</notification>
-	<notification name="ClickPublishHelpAvatar">
-		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.
-	</notification>
-	<notification name="ClickPartnerHelpAvatar">
-		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 ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Aller sur cette page"/>
-	</notification>
-	<notification name="ClickUploadHelpPermissions">
-		Il est possible que vos droits par défaut ne fonctionnent pas dans les anciennes régions.
-	</notification>
-	<notification name="ClickWebProfileHelpAvatar">
-		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.
-	</notification>
-	<notification name="JoinGroupCanAfford">
-		Rejoindre ce groupe coûte [COST] L$.
-Voulez-vous continuer ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Rejoindre"/>
-	</notification>
-	<notification name="JoinGroupCannotAfford">
-		Rejoindre ce groupe coûte [COST] L$.
-Vous n&apos;avez pas suffisamment de L$ pour rejoindre ce groupe.
-	</notification>
-	<notification name="LandBuyPass">
-		Pour [COST] L$ vous pouvez pénétrer sur ce terrain ([PARCEL_NAME]) et y rester [TIME] heures. Acheter un pass ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="SalePriceRestriction">
-		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.
-	</notification>
-	<notification name="ConfirmLandSaleChange">
-		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].
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmLandSaleToAnyoneChange">
-		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].
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ReturnObjectsDeededToGroup">
-		Ê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* Tous les objets non transférables cédés au groupe seront supprimés !
-
-Objets : [N]
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ReturnObjectsOwnedByUser">
-		Etes-vous certain de vouloir renvoyer tous les objets que [NAME] possède sur cette parcelle dans son inventaire ?
-
-Objets : [N]
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ReturnObjectsOwnedBySelf">
-		Êtes-vous certain de vouloir renvoyer tous les objets que vous possédez sur cette parcelle dans votre inventaire ?
-
-Objets : [N]
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ReturnObjectsNotOwnedBySelf">
-		Ê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* Tous les objets non transférables cédés au groupe seront supprimés !
-
-Objets : [N]
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ReturnObjectsNotOwnedByUser">
-		Ê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* Tous les objets non transférables cédés au groupe seront supprimés !
-
-Objets : [N]
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ReturnAllTopObjects">
-		Êtes-vous certain de vouloir renvoyer tous les objets de la liste dans l&apos;inventaire de leur propriétaire ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="DisableAllTopObjects">
-		Êtes-vous certain de vouloir désactiver tous les objets dans cette région ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ReturnObjectsNotOwnedByGroup">
-		Renvoyer les objets de cette parcelle qui ne sont pas partagés avec le groupe [NAME] à leur propriétaire ?
-
-Objets : [N]
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="UnableToDisableOutsideScripts">
-		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.
-	</notification>
-	<notification name="MustBeInParcel">
-		Pour définir le point d&apos;atterrissage, vous devez vous trouver à l&apos;intérieur de la parcelle.
-	</notification>
-	<notification name="PromptRecipientEmail">
-		Veuillez saisir une adresse e-mail valide pour le(s) destinataire(s).
-	</notification>
-	<notification name="PromptSelfEmail">
-		Veuillez saisir votre adresse e-mail.
-	</notification>
-	<notification name="PromptMissingSubjMsg">
-		Envoyer la photo avec le sujet ou le message par défaut ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ErrorProcessingSnapshot">
-		Erreur dans le traitement des données de la photo
-	</notification>
-	<notification name="ErrorEncodingSnapshot">
-		Erreur d&apos;encodage de la photo.
-	</notification>
-	<notification name="ErrorUploadingPostcard">
-		Une erreur est survenue lors du chargement du script compilé, suite au problème suivant : [REASON]
-	</notification>
-	<notification name="ErrorUploadingReportScreenshot">
-		Une erreur est survenue lors du chargement de la capture d&apos;écran destinée au rapport, suite au problème suivant : [REASON]
-	</notification>
-	<notification name="MustAgreeToLogIn">
-		Pour vous connecter à [SECOND_LIFE], vous devez accepter les Conditions d&apos;utilisation.
-	</notification>
-	<notification name="CouldNotPutOnOutfit">
-		Impossible de mettre cet ensemble.
-Ce dossier ne contient pas d&apos;habits, de parties du corps ni de pièces jointes.
-	</notification>
-	<notification name="CannotWearTrash">
-		Vous ne pouvez pas porter d&apos;habits ni de parties du corps se trouvant dans la corbeille.
-	</notification>
-	<notification name="CannotWearInfoNotComplete">
-		Vous ne pouvez pas porter cet article car il n&apos;a pas encore été chargé. Veuillez réessayer dans une minute.
-	</notification>
-	<notification name="MustHaveAccountToLogIn">
-		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 ?
-		<usetemplate name="okcancelbuttons" notext="Réessayer" yestext="Créer un compte"/>
-	</notification>
-	<notification name="AddClassified">
-		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.
-		<usetemplate ignoretext="Lors de l&apos;ajout d&apos;une nouvelle petite annonce" name="okcancelignore" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="DeleteClassified">
-		Supprimer l&apos;annonce [NAME] ?
-Une fois payés, les frais ne sont pas remboursables.
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ClassifiedSave">
-		Enregistrer les changements dans l&apos;annonce [NAME] ?
-		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Ne pas enregistrer" yestext="Enregistrer"/>
-	</notification>
-	<notification name="DeleteAvatarPick">
-		Supprimer le favori [PICK] ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="PromptGoToEventsPage">
-		Aller à la page web de [SECOND_LIFE] réservée aux événements ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="SelectProposalToView">
-		Veuillez sélectionner une proposition.
-	</notification>
-	<notification name="SelectHistoryItemToView">
-		Veuillez sélectionner un historique.
-	</notification>
-	<notification name="ResetShowNextTimeDialogs">
-		Souhaitez-vous réactiver tous les pop-ups que vous aviez désactivés ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="SkipShowNextTimeDialogs">
-		Voulez-vous désactiver tous les pop-ups qui peuvent être évités ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="CacheWillClear">
-		Le cache sera vidé après le redémarrage de [SECOND_LIFE].
-	</notification>
-	<notification name="CacheWillBeMoved">
-		Le cache sera déplacé après le redémarrage de [SECOND_LIFE].
-Remarque : cela videra le cache.
-	</notification>
-	<notification name="ChangeConnectionPort">
-		Les paramètres du port prendront effet après le redémarrage de [SECOND_LIFE].
-	</notification>
-	<notification name="ChangeSkin">
-		Le nouveau thème apparaîtra après le redémarrage de [SECOND_LIFE].
-	</notification>
-	<notification name="GoToAuctionPage">
-		Aller à la page web de [SECOND_LIFE] pour voir le détail des enchères ou enchérir ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="SaveChanges">
-		Enregistrer les changements ?
-		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Ne pas enregistrer" yestext="Enregistrer"/>
-	</notification>
-	<notification name="GestureSaveFailedTooManySteps">
-		L&apos;enregistrement du geste a échoué.
-Il y a trop d&apos;étapes dans ce geste.
-Essayez d&apos;en supprimer quelques-unes.
-	</notification>
-	<notification name="GestureSaveFailedTryAgain">
-		L&apos;enregistrement du geste a échoué. Veuillez réessayer dans une minute.
-	</notification>
-	<notification name="GestureSaveFailedObjectNotFound">
-		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é.
-	</notification>
-	<notification name="GestureSaveFailedReason">
-		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.
-	</notification>
-	<notification name="SaveNotecardFailObjectNotFound">
-		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é.
-	</notification>
-	<notification name="SaveNotecardFailReason">
-		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.
-	</notification>
-	<notification name="ScriptCannotUndo">
-		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.)
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="SaveScriptFailReason">
-		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.
-	</notification>
-	<notification name="SaveScriptFailObjectNotFound">
-		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é.
-	</notification>
-	<notification name="SaveBytecodeFailReason">
-		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.
-	</notification>
-	<notification name="CouldNotStartStopScript">
-		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é.
-	</notification>
-	<notification name="CannotDownloadFile">
-		Impossible de télécharger le fichier
-	</notification>
-	<notification name="CannotWriteFile">
-		Impossible d&apos;écrire le fichier [[FILE]]
-	</notification>
-	<notification name="UnsupportedHardware">
-		Avertissement : vous n&apos;avez pas la configuration système requise pour utiliser Second Life. Si vous continuez à utiliser Second Life, votre performance risque d&apos;être moindre. Malheureusement, nous n&apos;offrons aucune assistance pour les problèmes de configuration système.
-
-MINSPECS
-Voulez-vous visiter [_URL] pour plus d&apos;informations ?
-		<url name="url" option="0">
-			http://secondlife.com/support/sysreqs.php?lang=fr
-		</url>
-		<usetemplate ignoretext="Lors de la détection de matériel non pris en charge" name="okcancelignore" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="UnknownGPU">
-		Votre système contient une carte graphique que nous ne connaissons pas actuellement.
-Cela est souvent le cas avec le nouveau materiel qui n&apos;a pas encore été testé.
-Vous pourrez probablement utiliser Second Life sans problème, mais vous devrez peut-être ajuster les paramètres de vos graphiques.
-(Menu Édition &gt; Préférences &gt; Graphiques).
-		<form name="form">
-			<ignore name="ignore" text="Lors de la détection d&apos;une carte graphique inconnue"/>
-		</form>
-	</notification>
-	<notification name="DisplaySettingsNoShaders">
-		[SECOND_LIFE] a planté lors de l&apos;initialisation des drivers graphiques.
-La qualité des graphiques sera paramétrée sur Faible pour éviter certaines erreurs de driver fréquentes.
-Certaines fonctionnalités graphiques seront donc désactivées.
-Nous vous recommandons de mettre à jour les drivers de votre carte graphique.
-La qualité des graphiques peut être augmentée à la section Préférences &gt; Graphiques
-	</notification>
-	<notification name="RegionNoTerraforming">
-		Le terraformage est interdit dans la région [REGION].
-	</notification>
-	<notification name="CannotCopyWarning">
-		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 ?
-		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="CannotGiveItem">
-		Impossible de donner l&apos;objet de l&apos;inventaire.
-	</notification>
-	<notification name="TransactionCancelled">
-		Transaction annulée.
-	</notification>
-	<notification name="TooManyItems">
-		Impossible de donner plus de 42 objets au cours d&apos;un seul transfert d&apos;inventaire.
-	</notification>
-	<notification name="NoItems">
-		Vous n&apos;êtes pas autorisé à transférer les objets sélectionnés.
-	</notification>
-	<notification name="CannotCopyCountItems">
-		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 ?
-		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="CannotGiveCategory">
-		Vous n&apos;êtes pas autorisé à transférer le dossier sélectionné.
-	</notification>
-	<notification name="FreezeAvatar">
-		Geler cet avatar ?
-Il ou elle ne pourra temporairement plus bouger, chatter, ou interagir dans le Monde.
-		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Dégeler" yestext="Geler"/>
-	</notification>
-	<notification name="FreezeAvatarFullname">
-		Geler [AVATAR_NAME] ?
-Il ou elle ne pourra temporairement plus bouger, chatter, ou interagir dans le Monde.
-		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Dégeler" yestext="Geler"/>
-	</notification>
-	<notification name="EjectAvatarFullname">
-		Expulser [AVATAR_NAME] de votre terrain ?
-		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Expulser et bannir" yestext="Expulser"/>
-	</notification>
-	<notification name="EjectAvatarNoBan">
-		Expulser cet avatar de votre terrain ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Expulser"/>
-	</notification>
-	<notification name="EjectAvatarFullnameNoBan">
-		Expulser [AVATAR_NAME] de votre terrain ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Expulser"/>
-	</notification>
-	<notification name="AcquireErrorTooManyObjects">
-		Erreur d&apos;acquisition : trop d&apos;objets sélectionnés.
-	</notification>
-	<notification name="AcquireErrorObjectSpan">
-		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.
-	</notification>
-	<notification name="PromptGoToCurrencyPage">
-		[EXTRA]
-
-Aller sur [URL] pour obtenir des informations sur l&apos;achat de devises ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="UnableToLinkObjects">
-		Impossible de lier ces [COUNT] objets.
-Vous pouvez lier un maximum de [MAX] objets.
-	</notification>
-	<notification name="CannotLinkIncompleteSet">
-		Vous ne pouvez lier que des ensembles d&apos;objets complets et vous devez choisir un minimum de deux objets.
-	</notification>
-	<notification name="CannotLinkModify">
-		Impossible de lier car vous n&apos;avez pas le droit 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é.
-	</notification>
-	<notification name="CannotLinkDifferentOwners">
-		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.
-	</notification>
-	<notification name="NoFileExtension">
-		Pas d&apos;extension pour le fichier suivant : &apos;[FILE]&apos;
-
-Assurez-vous que le fichier a l&apos;extension correcte.
-	</notification>
-	<notification name="InvalidFileExtension">
-		Extension de fichier [EXTENSION] invalide
-[VALIDS] attendu
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="CannotUploadSoundFile">
-		Impossible de lire le fichier son chargé :
-[FILE]
-	</notification>
-	<notification name="SoundFileNotRIFF">
-		Il semble que le fichier ne soit pas un fichier RIFF WAVE :
-[FILE]
-	</notification>
-	<notification name="SoundFileNotPCM">
-		Il semble que le fichier ne soit pas un fichier audio PCM WAVE :
-[FILE]
-	</notification>
-	<notification name="SoundFileInvalidChannelCount">
-		Le fichier contient un nombre de canaux invalide (doit être mono ou stéréo) :
-[FILE]
-	</notification>
-	<notification name="SoundFileInvalidSampleRate">
-		Le fichier ne semble pas être pris en charge (doit être 44,1 k) :
-[FILE]
-	</notification>
-	<notification name="SoundFileInvalidWordSize">
-		Le fichier ne semble pas être pris en charge (doit faire 8 ou 16 bit) :
-[FILE]
-	</notification>
-	<notification name="SoundFileInvalidHeader">
-		Impossible de trouver les données dans l&apos;en-tête WAV :
-[FILE]
-	</notification>
-	<notification name="SoundFileInvalidTooLong">
-		Le fichier audio est trop long (10 secondes maximum) :
-[FILE]
-	</notification>
-	<notification name="ProblemWithFile">
-		Problème avec le fichier [FILE] :
-
-[ERROR]
-	</notification>
-	<notification name="CannotOpenTemporarySoundFile">
-		Impossible d&apos;ouvrir le fichier son compressé temporaire : [FILE]
-	</notification>
-	<notification name="UnknownVorbisEncodeFailure">
-		Échec d&apos;encodage Vorbis inconnu sur : [FILE]
-	</notification>
-	<notification name="CannotEncodeFile">
-		Impossible d&apos;encoder le fichier : [FILE]
-	</notification>
-	<notification name="CorruptResourceFile">
-		Fichier ressource corrompu : [FILE]
-	</notification>
-	<notification name="UnknownResourceFileVersion">
-		Version de fichier ressource Linden inconnu : [FILE]
-	</notification>
-	<notification name="UnableToCreateOutputFile">
-		Impossible de créer le fichier de sortie : [FILE]
-	</notification>
-	<notification name="DoNotSupportBulkAnimationUpload">
-		Actuellement, nous ne prenons pas en charge le chargement de lots de fichiers d&apos;animation.
-	</notification>
-	<notification name="CannotUploadReason">
-		Impossible de charger [FILE] suite au problème suivant : [REASON]
-Veuillez réessayer ultérieurement.
-	</notification>
-	<notification name="CannotCreateLandmarkNotOwner">
-		Vous ne pouvez pas créer de repère ici car le propriétaire du terrain ne l&apos;autorise pas.
-	</notification>
-	<notification name="CannotRecompileSelectObjectsNoScripts">
-		Impossible d&apos;effectuer les recompilations.
-Sélectionnez un objet avec un script.
-	</notification>
-	<notification name="CannotRecompileSelectObjectsNoPermission">
-		Impossible d&apos;effectuer les recompilations.
-
-Sélectionnez des objets qui ont des scripts et que vous pouvez modifier.
-	</notification>
-	<notification name="CannotResetSelectObjectsNoScripts">
-		Impossible d&apos;effectuer la réinitialisation.
-
-Veuillez sélectionner des objets avec des scripts.
-	</notification>
-	<notification name="CannotResetSelectObjectsNoPermission">
-		Impossible d&apos;effectuer la réinitialisation.
-
-Sélectionnez des objets qui ont des scripts et que vous pouvez modifier.
-	</notification>
-	<notification name="CannotSetRunningSelectObjectsNoScripts">
-		Impossible de définir les scripts sur « exécution ».
-
-Veuillez sélectionner des objets avec des scripts.
-	</notification>
-	<notification name="CannotSetRunningNotSelectObjectsNoScripts">
-		Impossible de définir les scripts sur « non-exécution ».
-
-Veuillez sélectionner des objets avec des scripts.
-	</notification>
-	<notification name="NoFrontmostFloater">
-		Aucun floater frontmost à sauvegarder.
-	</notification>
-	<notification name="SeachFilteredOnShortWords">
-		Votre requête a été modifiée et les mots trops courts ont été supprimés.
-
-Recherche effectuée : [FINALQUERY]
-	</notification>
-	<notification name="SeachFilteredOnShortWordsEmpty">
-		Vos termes de recherche étaient trop courts et aucune recherche n&apos;a été effectuée.
-	</notification>
-	<notification name="CouldNotTeleportReason">
-		Impossible de téléporter.
-[REASON]
-	</notification>
-	<notification name="invalid_tport">
-		Nous avons rencontré des problèmes en essayant de vous téléporter. Vous devrez peut-être vous reconnecter avant de pouvoir être téléporté. Si vous continuez à recevoir ce message, veuillez consulter le Support à la page suivante :
-www.secondlife.com/support
-	</notification>
-	<notification name="invalid_region_handoff">
-		Nous avons rencontré des problèmes en essayant de vous téléporter. Vous devrez peut-être vous reconnecter avant de pouvoir être téléporté. Si vous continuez à recevoir ce message, veuillez consulter le Support à la page suivante :
-www.secondlife.com/support
-	</notification>
-	<notification name="blocked_tport">
-		Désolé, la téléportation est bloquée actuellement. Veuillez réessayer dans un moment.
-Si vous ne parvenez toujours pas à être téléporté, déconnectez-vous puis reconnectez-vous pour résoudre le problème.
-	</notification>
-	<notification name="nolandmark_tport">
-		Désolé, le système n&apos;a pas réussi à localiser la destination de votre repère.
-	</notification>
-	<notification name="timeout_tport">
-		Désolé, la connexion vers votre lieu de téléportation n&apos;a pas abouti.
-Veuillez réessayer dans un moment.
-	</notification>
-	<notification name="noaccess_tport">
-		Désolé, vous n&apos;avez pas accès à cette destination.
-	</notification>
-	<notification name="missing_attach_tport">
-		Vos pieces-jointes ne sont pas encore arrivées. Attendez quelques secondes de plus ou déconnectez-vous puis reconnectez-vous avant d&apos;essayer de vous téléporter.
-	</notification>
-	<notification name="too_many_uploads_tport">
-		Le trafic vers cette région est bouché en ce moment. Votre téléportation ne pourra pas avoir lieu immédiatement. Veuillez réessayer dans quelques minutes ou bien aller dans une zone moins fréquentée.
-	</notification>
-	<notification name="expired_tport">
-		Désolé, votre demande de téléportation n&apos;a pas abouti assez rapidement. Veuillez réessayer dans quelques minutes.
-	</notification>
-	<notification name="expired_region_handoff">
-		Désolé, votre demande pour passer dans une autre région n&apos;a pas abouti assez rapidement. Veuillez réessayer dans quelques minutes.
-	</notification>
-	<notification name="no_host">
-		Impossible de trouver la destination de la téléportation. Il est possible que cette destination soit temporairement indisponible ou qu&apos;elle n&apos;existe plus. Veuillez réessayer dans quelques minutes.
-	</notification>
-	<notification name="no_inventory_host">
-		L&apos;inventaire est temporairement indisponible.
-	</notification>
-	<notification name="CannotSetLandOwnerNothingSelected">
-		Impossible de définir le propriétaire foncier :
-aucune parcelle sélectionnée.
-	</notification>
-	<notification name="CannotSetLandOwnerMultipleRegions">
-		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.
-	</notification>
-	<notification name="ForceOwnerAuctionWarning">
-		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 ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="CannotContentifyNothingSelected">
-		Problème :
-Aucune parcelle sélectionnée.
-	</notification>
-	<notification name="CannotContentifyNoRegion">
-		Problème :
-Aucune région sélectionnée.
-	</notification>
-	<notification name="CannotReleaseLandNothingSelected">
-		Impossible d&apos;abandonner le terrain :
-aucune parcelle sélectionnée.
-	</notification>
-	<notification name="CannotReleaseLandNoRegion">
-		Impossible d&apos;abandonner le terrain :
-la région est introuvable.
-	</notification>
-	<notification name="CannotBuyLandNothingSelected">
-		Impossible d&apos;acheter le terrain :
-aucune parcelle sélectionnée.
-	</notification>
-	<notification name="CannotBuyLandNoRegion">
-		Impossible d&apos;acheter le terrain :
-la région dans laquelle il est situé est introuvable.
-	</notification>
-	<notification name="CannotCloseFloaterBuyLand">
-		Vous ne pouvez pas fermer la fenêtre Acheter le terrain avant que Second Life n&apos;estime le montant de cette transaction.
-	</notification>
-	<notification name="CannotDeedLandNothingSelected">
-		Cession du terrain impossible :
-aucune parcelle sélectionnée.
-	</notification>
-	<notification name="CannotDeedLandNoGroup">
-		Cession du terrain impossible :
-aucun groupe sélectionné.
-	</notification>
-	<notification name="CannotDeedLandNoRegion">
-		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.
-	</notification>
-	<notification name="CannotDeedLandMultipleSelected">
-		Cession du terrain impossible :
-plusieurs parcelles sélectionnées.
-
-Essayez de ne sélectionner qu&apos;une seule parcelle.
-	</notification>
-	<notification name="ParcelCanPlayMedia">
-		Cette parcelle propose des flux média.
-Pour jouer des flux média, il faut avoir une connexion internet rapide.
-
-Jouer les flux média lorsqu&apos;ils sont disponibles ?
-(Vous pourrez modifier cette option ultérieurement sous Préférences &gt; Audio et vidéo.)
-		<usetemplate name="okcancelbuttons" notext="Désactiver" yestext="Jouer le média"/>
-	</notification>
-	<notification name="CannotDeedLandWaitingForServer">
-		Cession du terrain impossible :
-rapport de propriété sur le point d&apos;être envoyé par le serveur.
-
-Merci de réessayer.
-	</notification>
-	<notification name="CannotDeedLandNoTransfer">
-		Cession du terrain impossible :
-la cession de terrain est interdite dans la région [REGION].
-	</notification>
-	<notification name="CannotReleaseLandWatingForServer">
-		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.
-	</notification>
-	<notification name="CannotReleaseLandSelected">
-		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.
-	</notification>
-	<notification name="CannotReleaseLandDontOwn">
-		Impossible d&apos;abandonner le terrain :
-vous n&apos;avez pas le droit de libérer cette parcelle.
-Les parcelles qui vous appartiennent sont en vert.
-	</notification>
-	<notification name="CannotReleaseLandRegionNotFound">
-		Impossible d&apos;abandonner le terrain :
-la région dans laquelle il est situé est introuvable.
-
-Veuillez utiliser Aide &gt; Signaler un bug pour signaler le problème.
-	</notification>
-	<notification name="CannotReleaseLandNoTransfer">
-		Impossible d&apos;abandonner le terrain :
-le transfert de terrain est interdit dans la région [REGION].
-	</notification>
-	<notification name="CannotReleaseLandPartialSelection">
-		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.
-	</notification>
-	<notification name="ReleaseLandWarning">
-		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 ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="CannotDivideLandNothingSelected">
-		Division du terrain impossible :
-
-aucune parcelle sélectionnée.
-	</notification>
-	<notification name="CannotDivideLandPartialSelection">
-		Division du terrain impossible :
-
-Toute la parcelle est sélectionnée.
-Sélectionnez une partie de la parcelle uniquement.
-	</notification>
-	<notification name="LandDivideWarning">
-		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 ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="CannotDivideLandNoRegion">
-		Division du terrain impossible :
-la région dans laquelle il est situé est introuvable.
-
-Veuillez utiliser Aide &gt; Signaler un bug pour signaler le problème.
-	</notification>
-	<notification name="CannotJoinLandNoRegion">
-		Impossible de fusionner le terrain :
-la région dans laquelle il est situé est introuvable.
-
-Veuillez utiliser Aide &gt; Signaler un bug pour signaler le problème.
-	</notification>
-	<notification name="CannotJoinLandNothingSelected">
-		Impossible de fusionner le terrain :
-aucune parcelle sélectionnée.
-	</notification>
-	<notification name="CannotJoinLandEntireParcelSelected">
-		Impossible de fusionner le terrain :
-vous avez sélectionné une seule parcelle.
-
-Sélectionnez le terrain sur les deux parcelles.
-	</notification>
-	<notification name="CannotJoinLandSelection">
-		Impossible de fusionner le terrain :
-vous devez sélectionner au moins deux parcelles.
-
-Sélectionnez le terrain sur les deux parcelles.
-	</notification>
-	<notification name="JoinLandWarning">
-		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 ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ShowOwnersHelp">
-		Afficher les propriétaires :
-La couleur des parcelles indique le type de propriété.
-
-Vert = votre terrain
-Turquoise = le terrain de votre groupe
-Rouge = appartenant à d&apos;autres
-Jaune = en vente
-Mauve = aux enchères
-Gris = public
-	</notification>
-	<notification name="ConfirmNotecardSave">
-		Cette note doit être sauvegardée avant que l&apos;objet ne puisse être copié ou visualisé. Enregistrer la note ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmItemCopy">
-		Copier cet objet dans votre inventaire ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Copier"/>
-	</notification>
-	<notification name="ResolutionSwitchFail">
-		Échec du changement de résolution (à [RESX], de [RESY])
-	</notification>
-	<notification name="ErrorUndefinedGrasses">
-		Erreur : herbes non identifiées : [SPECIES]
-	</notification>
-	<notification name="ErrorUndefinedTrees">
-		Erreur : arbres non identifiés : [SPECIES]
-	</notification>
-	<notification name="CannotSaveWearableOutOfSpace">
-		Impossible de sauvegarder [NAME]. Pour pouvoir sauvegarder ce fichier, vous devez d&apos;abord libérer de la mémoire sur votre ordinateur.
-	</notification>
-	<notification name="CannotSaveToAssetStore">
-		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 Aide | Signaler un bug dans le menu déroulant en indiquant les détails de votre connexion.
-	</notification>
-	<notification name="YouHaveBeenLoggedOut">
-		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].
-		<usetemplate name="okcancelbuttons" notext="Quitter" yestext="Afficher IM et chat"/>
-	</notification>
-	<notification name="OnlyOfficerCanBuyLand">
-		Impossible d&apos;acheter du terrain pour le groupe :
-Vous n&apos;avez pas le droit d&apos;acheter de terrain pour votre groupe.
-	</notification>
-	<notification label="Devenir amis" name="AddFriend">
-		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) ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification label="Devenir amis" name="AddFriendWithMessage">
-		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) ?
-		<form name="form">
-			<input name="message" type="text">
-				Voulez-vous être mon ami(e) ?
-			</input>
-			<button name="Offer" text="OK"/>
-			<button name="Cancel" text="Annuler"/>
-		</form>
-	</notification>
-	<notification name="RemoveFromFriends">
-		Voulez-vous supprimer [NAME] de votre liste d&apos;amis ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="RemoveMultipleFromFriends">
-		Voulez-vous supprimer plusieurs résidents de votre liste d&apos;amis ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="GodDeleteAllScriptedPublicObjectsByUser">
-		Ê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 ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="GodDeleteAllScriptedObjectsByUser">
-		Êtes-vous certain de vouloir supprimer tous les objets scriptés appartenant à ** [AVATAR_NAME] ** sur tous les terrains de cette région ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="GodDeleteAllObjectsByUser">
-		Êtes-vous certain de vouloir supprimer tous les objets (scriptés ou pas) appartenant à ** [AVATAR_NAME] ** sur tous les terrains de cette région ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="BlankClassifiedName">
-		Vous devez choisir un nom pour votre petite annonce.
-	</notification>
-	<notification name="MinClassifiedPrice">
-		Le coût de l&apos;annonce doit être de [MIN_PRICE] L$ minimum.
-
-Veuillez saisir un montant plus élevé.
-	</notification>
-	<notification name="ConfirmObjectDeleteLock">
-		Au moins un des objets que vous avez sélectionnés est verrouillé.
-
-Êtes-vous certain de vouloir supprimer ces objets ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteNoCopy">
-		Au moins un des objets que vous avez sélectionnés n&apos;est pas copiable.
-
-Êtes-vous certain de vouloir supprimer ces objets ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteNoOwn">
-		Au moins un des objets que vous avez sélectionnés ne vous appartient pas.
-
-Êtes-vous certain de vouloir supprimer ces objets ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteLockNoCopy">
-		Au moins un des objets est verrouillé.
-Au moins un des objets n&apos;est pas copiable.
-
-Êtes-vous certain de vouloir supprimer ces objets ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteLockNoOwn">
-		Au moins un des objets est verrouillé.
-Au moins un des objets ne vous appartient pas.
-
-Êtes-vous certain de vouloir supprimer ces objets ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
-		Au moins un des objets n&apos;est pas copiable.
-Au moins un des objets ne vous appartient pas.
-
-Êtes-vous certain de vouloir supprimer ces objets ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
-		Au moins un des objets est verrouillé.
-Au moins un des objets n&apos;est pas copiable.
-Au moins un des objets ne vous appartient pas.
-
-Êtes-vous certain de vouloir supprimer ces objets ?
-		<usetemplate name="okcancelbuttons" notext="annuler" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectTakeLock">
-		Au moins un des objets est verrouillé.
-
-Êtes-vous certain de vouloir prendre ces objets ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectTakeNoOwn">
-		Vous n&apos;êtes pas le propriétaire de tous les objets que vous prenez.
-Si vous continuez, les droits accordés au prochain propriétaire seront activés et vous risquez de ne plus pouvoir modifier ou copier les objets.
-
-Êtes-vous certain de vouloir prendre ces objets ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmObjectTakeLockNoOwn">
-		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 droits accordés au prochain propriétaire seront activés 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 ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="CantBuyLandAcrossMultipleRegions">
-		Impossible d&apos;acheter le terrain car la sélection couvre plusieurs régions.
-
-Veuillez sélectionner une zone plus petite et réessayer.
-	</notification>
-	<notification name="DeedLandToGroup">
-		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] ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="DeedLandToGroupWithContribution">
-		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 [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.
-
-Céder ces [AREA] m² de terrain au groupe [GROUP_NAME] ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="DisplaySetToSafe">
-		Les paramètres d&apos;affichage sont au niveau le plus sûr, comme vous l&apos;aviez indiqué.
-	</notification>
-	<notification name="DisplaySetToRecommended">
-		Vos paramètres d&apos;affichage ont été réglés avec une marge de sécurité en fonction de votre configuration système.
-	</notification>
-	<notification name="ErrorMessage">
-		[ERROR_MESSAGE]
-	</notification>
-	<notification name="AvatarMoved">
-		L&apos;emplacement [TYPE] n&apos;est pas disponible actuellement. [HELP]
-Vous avez été déplacé dans une région voisine.
-	</notification>
-	<notification name="ClothingLoading">
-		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.
-		<form name="form">
-			<ignore name="ignore" text="Lorsque les habits prennent longtemps à télécharger"/>
-		</form>
-	</notification>
-	<notification name="FirstRun">
-		L&apos;installation de [SECOND_LIFE] est terminée.
-
-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 ?
-		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Nouveau compte..."/>
-	</notification>
-	<notification name="LoginPacketNeverReceived">
-		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.
-		<form name="form">
-			<button name="OK" text="OK"/>
-			<button name="Help" text="Aide"/>
-			<button name="Teleport" text="Téléporter"/>
-		</form>
-	</notification>
-	<notification name="WelcomeChooseSex">
-		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.
-		<usetemplate name="okcancelbuttons" notext="Femme" yestext="Homme"/>
-	</notification>
-	<notification name="NotEnoughCurrency">
-		[NAME] [PRICE] L$ Vous n&apos;avez pas suffisamment de L$ pour faire cela.
-	</notification>
-	<notification name="GrantedModifyRights">
-		Vous avez reçu le droit de modifier les objets de [NAME].
-	</notification>
-	<notification name="RevokedModifyRights">
-		Vous n&apos;avez plus le droit de modifier les objets de [NAME].
-	</notification>
-	<notification name="FlushMapVisibilityCaches">
-		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.)
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="BuyOneObjectOnly">
-		Impossible d&apos;acheter plus d&apos;un objet à  la fois.  Veuillez ne sélectionner qu&apos;un seul objet.
-	</notification>
-	<notification name="OnlyCopyContentsOfSingleItem">
-		Impossible de copier les contenus de plus d&apos;un objet à la fois.
-Veuillez ne sélectionner qu&apos;un seul objet.
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="KickUsersFromRegion">
-		Téléporter tous les résidents de cette région chez eux ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="EstateObjectReturn">
-		Etes-vous certain de vouloir renvoyer les objets appartenant à [USER_NAME] ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="InvalidTerrainBitDepth">
-		Impossible de definir les textures de la région :
-La texture du terrain [TEXTURE_NUM] a une profondeur invalide ([TEXTURE_BIT_DEPTH]).
-
-Remplacer la texture [TEXTURE_NUM] avec une image de 24 bits, 512 X 512, ou plus petite, puis cliquez à nouveau sur Appliquer.
-	</notification>
-	<notification name="InvalidTerrainSize">
-		Impossible de definir les textures de la région :
-La texture du terrain [TEXTURE_NUM] est trop volumineuse ([TEXTURE_SIZE_X] X [TEXTURE_SIZE_Y]).
-
-Remplacer la texture [TEXTURE_NUM] avec une image de 24 bits, 512 X 512, ou plus petite, puis cliquez à nouveau sur Appliquer.
-	</notification>
-	<notification name="RawUploadStarted">
-		Le chargement a commencé. Cela va prendre une à deux minutes,
-suivant votre vitesse de connexion.
-	</notification>
-	<notification name="ConfirmBakeTerrain">
-		Etes-vous sûr(e) de vouloir figer le relief actuel, en faire le point central des limites d&apos;élévation/abaissement de relief et la valeur par défaut du bouton Annuler modification ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="MaxAllowedAgentOnRegion">
-		Vous ne pouvez pas autoriser plus de [MAX_AGENTS] résidents.
-	</notification>
-	<notification name="MaxBannedAgentsOnRegion">
-		Vous ne pouvez pas bannir plus de [MAX_BANNED] résidents.
-	</notification>
-	<notification name="MaxAgentOnRegionBatch">
-		Echec lors de la tentative d&apos;ajout de [NUM_ADDED] agents :
-Dépasse la limite fixée à [MAX_AGENTS] [LIST_TYPE] de [NUM_EXCESS].
-	</notification>
-	<notification name="MaxAllowedGroupsOnRegion">
-		Vous ne pouvez pas avoir plus que [MAX_GROUPS] groupes autorisés.
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Figer"/>
-	</notification>
-	<notification name="MaxManagersOnRegion">
-		Vous ne pouvez avoir que [MAX_MANAGER] gérants de domaine.
-	</notification>
-	<notification name="OwnerCanNotBeDenied">
-		Impossible d&apos;ajouter le propriétaire du domaine à la liste des résidents bannis.
-	</notification>
-	<notification name="CanNotChangeAppearanceUntilLoaded">
-		Impossible de changer d&apos;apparence jusqu&apos;à ce que les habits et la silhouette soient chargés.
-	</notification>
-	<notification name="ClassifiedMustBeAlphanumeric">
-		Le nom de votre petite annonce doit commencer par un chiffre ou une lettre (A à Z). La ponctuation n&apos;est pas autorisée.
-	</notification>
-	<notification name="CantSetBuyObject">
-		Cet objet n&apos;est pas à vendre.
-Veuillez choisir un objet à vendre et réessayer.
-	</notification>
-	<notification name="FinishedRawDownload">
-		Chargement du fichier de terrain raw effectué vers :
-[DOWNLOAD_PATH].
-	</notification>
-	<notification name="DownloadWindowsMandatory">
-		Une nouvelle version de [SECOND_LIFE] est disponible.
-[MESSAGE]
-Pour utiliser [SECOND_LIFE] vous devez télécharger cette mise à jour.
-		<usetemplate name="okcancelbuttons" notext="Quitter" yestext="Télécharger"/>
-	</notification>
-	<notification name="DownloadWindows">
-		Une mise à jour de [SECOND_LIFE] est disponible.
-[MESSAGE]
-Cette mise à jour n&apos;est pas requise mais si vous voulez une meilleure performance et plus de stabilité, nous vous recommandons de l&apos;installer.
-		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Télécharger"/>
-	</notification>
-	<notification name="DownloadWindowsReleaseForDownload">
-		Une mise à jour de [SECOND_LIFE] est disponible.
-[MESSAGE]
-Cette mise à jour n&apos;est pas requise mais si vous voulez une meilleure performance et plus de stabilité, nous vous recommandons de l&apos;installer.
-		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Télécharger"/>
-	</notification>
-	<notification name="DownloadMacMandatory">
-		Une nouvelle version de [SECOND_LIFE] est disponible.
-[MESSAGE]
-Pour utiliser [SECOND_LIFE] vous devez télécharger cette mise à jour.
-
-Télécharger vers le dossier Applications ?
-		<usetemplate name="okcancelbuttons" notext="Quitter" yestext="Télécharger"/>
-	</notification>
-	<notification name="DownloadMac">
-		Une mise à jour de [SECOND_LIFE] est disponible.
-[MESSAGE]
-Cette mise à jour n&apos;est pas requise mais si vous voulez une meilleure performance et plus de stabilité, nous vous recommandons de l&apos;installer.
-
-Télécharger vers le dossier Applications ?
-		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Télécharger"/>
-	</notification>
-	<notification name="DownloadMacReleaseForDownload">
-		Une mise à jour de [SECOND_LIFE] est disponible.
-[MESSAGE]
-Cette mise à jour n&apos;est pas requise mais si vous voulez une meilleure performance et plus de stabilité, nous vous recommandons de l&apos;installer.
-
-Télécharger vers le dossier Applications ?
-		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Télécharger"/>
-	</notification>
-	<notification name="DeedObjectToGroup">
-		Si vous cédez cet objet, le groupe :
-* recevra les L$ versés pour l&apos;objet ;
-		<usetemplate ignoretext="Lors de la cession d&apos;objets au groupe" name="okcancelignore" notext="Annuler" yestext="Céder"/>
-	</notification>
-	<notification name="WebLaunchExternalTarget">
-		Ouvrir votre navigateur web système pour afficher ce contenu ?
-		<usetemplate ignoretext="Lors de l&apos;ouverture de votre navigateur système pour afficher une page web" name="okcancelignore" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="WebLaunchJoinNow">
-		Aller sur www.secondlife.com pour gérer votre compte ?
-		<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour gérer votre compte" name="okcancelignore" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="WebLaunchBugReport101">
-		Pour apprendre à signaler correctement des bugs, consultez le Wiki de [SECOND_LIFE].
-		<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter le Wiki et apprendre à signaler des bugs" name="okcancelignore" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="WebLaunchSecurityIssues">
-		Pour apprendre à signaler un problème de sécurité, consultez le Wiki de [SECOND_LIFE].
-		<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter la page Wiki sur les problèmes de sécurité." name="okcancelignore" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="WebLaunchQAWiki">
-		Consultez le Wiki sur l&apos;Assurance Qualité de [SECOND_LIFE].
-		<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter la page Wiki sur l&apos;Assurance Qualité." name="okcancelignore" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="WebLaunchPublicIssue">
-		Pour signaler des bugs et autres problèmes, utilisez le JIRA de [SECOND_LIFE].
-		<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter le JIRA" name="okcancelignore" notext="Annuler" yestext="Aller sur cette page"/>
-	</notification>
-	<notification name="WebLaunchPublicIssueHelp">
-		Pour apprendre à utiliser JIRA, consultez le Wiki de [SECOND_LIFE].
-		<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter la page Wiki sur le JIRA" name="okcancelignore" notext="Annuler" yestext="Aller sur cette page"/>
-	</notification>
-	<notification name="WebLaunchSupportWiki">
-		Visitez le blog officiel des Lindens pour les dernières nouvelles et informations.
-		<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter le blog" name="okcancelignore" notext="Annuler" yestext="Aller à la page"/>
-	</notification>
-	<notification name="WebLaunchLSLGuide">
-		Consulter le Guide guide pour l&apos;écriture de scripts pour obtenir de l&apos;aide ?
-		<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour voir le Guide pour l&apos;écriture de scripts" name="okcancelignore" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="WebLaunchLSLWiki">
-		Consulter le Wiki LSL pour de l&apos;aide sur les scripts ?
-		<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter le Guide sur l&apos;écriture de scripts" name="okcancelignore" notext="Annuler" yestext="Aller à la page"/>
-	</notification>
-	<notification name="ReturnToOwner">
-		Ê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 !
-		<usetemplate ignoretext="Lors du renvoi d&apos;objets à leurs propriétaires" name="okcancelignore" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="GroupLeaveConfirmMember">
-		Vous êtes actuellement membre du groupe [GROUP].
-Quitter le groupe ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmKick">
-		Souhaitez-vous vraiment éjecter tous les utilisateurs de la grille ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Éjecter tous"/>
-	</notification>
-	<notification name="MuteLinden">
-		Désolé, vous ne pouvez pas ignorer un Linden.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="CannotStartAuctionAlreadyForSale">
-		Vous ne pouvez pas démarrer des enchères sur une parcelle déjà en vente.  Si vous êtes certain de vouloir démarrer des enchères, mettez fin à la vente.
-	</notification>
-	<notification label="Échec de la fonction Ignorer les objets par nom" name="MuteByNameFailed">
-		Vous ignorez déjà ce résident.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="RemoveItemWarn">
-		Si vous supprimez des contenus, vous risquez d&apos;endommager l&apos;objet. Souhaitez-vous supprimer cet objet ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="CantOfferCallingCard">
-		Impossible d&apos;offrir une carte de visite actuellement. Veuillez réessayer dans un moment.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="CantOfferFriendship">
-		Impossible de proposer votre amitié actuellement. Veuillez réessayer dans un moment.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="BusyModeSet">
-		Mode occupé activé.
-Les chats et les messages instantanés ne s&apos;afficheront pas. Vous répondrez aux messages instantanés en utilisant la réponse automatique que vous avez créée. Toutes les propositions de téléportation seront refusées. Tous objets envoyés iront dans la corbeille.
-		<usetemplate ignoretext="Lors de l&apos;utilisation du mode Occupé" name="okignore" yestext="OK"/>
-	</notification>
-	<notification name="JoinedTooManyGroupsMember">
-		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]
-		<usetemplate name="okcancelbuttons" notext="Refuser" yestext="Rejoindre"/>
-	</notification>
-	<notification name="KickUser">
-		Éjecter cet utilisateur avec quel message ?
-		<form name="form">
-			<input name="message" type="text">
-				Un administrateur vous a déconnecté.
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Annuler"/>
-		</form>
-	</notification>
-	<notification name="KickAllUsers">
-		Éjecter tous les résidents actuellement en ligne avec quel message ?
-		<form name="form">
-			<input name="message" type="text">
-				Un administrateur vous a déconnecté.
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Annuler"/>
-		</form>
-	</notification>
-	<notification name="FreezeUser">
-		Geler cet utilisateur avec quel message ?
-		<form name="form">
-			<input name="message" type="text">
-				Vous avez été gelé. Vous ne pouvez ni bouger ni chatter. Un administrateur va vous envoyer un message instantané (IM).
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Annuler"/>
-		</form>
-	</notification>
-	<notification name="UnFreezeUser">
-		Dégeler cet utilisateur avec quel message ?
-		<form name="form">
-			<input name="message" type="text">
-				Vous n&apos;êtes plus gelé.
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Annuler"/>
-		</form>
-	</notification>
-	<notification name="OfferTeleport">
-		Proposez une téléportation avec le message suivant ?
-		<form name="form">
-			<input name="message" type="text">
-				On se rejoint à [REGION] ?
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Annuler"/>
-		</form>
-	</notification>
-	<notification name="OfferTeleportFromGod">
-		Demander au résident de venir vous rejoindre ?
-		<form name="form">
-			<input name="message" type="text">
-				On se rejoint à [REGION] ?
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Annuler"/>
-		</form>
-	</notification>
-	<notification name="TeleportFromLandmark">
-		Êtes-vous certain de vouloir être téléporté ?
-		<usetemplate ignoretext="Lors de la téléportation depuis un repère de l&apos;inventaire" name="okcancelignore" notext="Annuler" yestext="Téléporter"/>
-	</notification>
-	<notification label="Envoyer un message à tout le monde dans votre domaine" name="MessageEstate">
-		Saisissez un message court qui sera envoyé à tous les résidents se trouvant actuellement sur votre domaine.
-		<form name="form">
-			<input name="message" type="text"/>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Annuler"/>
-		</form>
-	</notification>
-	<notification label="Modifier un domaine Linden" name="ChangeLindenEstate">
-		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 ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification label="Modifier l&apos;accès à un domaine Linden" name="ChangeLindenAccess">
-		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.
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification label="Choisir le domaine" name="EstateAllowedAgentAdd">
-		Ajouter à la liste des résidents autorisés uniquement pour ce domaine ou pour [ALL_ESTATES] ?
-		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
-	</notification>
-	<notification label="Choisir le domaine" name="EstateAllowedAgentRemove">
-		Supprimer de la liste des résidents autorisés uniquement pour ce domaine ou pour [ALL_ESTATES] ?
-		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
-	</notification>
-	<notification label="Choisir le domaine" name="EstateAllowedGroupAdd">
-		Ajouter à la liste des groupes autorisés uniquement pour ce domaine ou pour [ALL_ESTATES] ?
-		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
-	</notification>
-	<notification label="Choisir le domaine" name="EstateAllowedGroupRemove">
-		Supprimer de la liste des groupes autorisés uniquement pour ce domaine ou pour [ALL_ESTATES] ?
-		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
-	</notification>
-	<notification label="Choisir le domaine" name="EstateBannedAgentAdd">
-		Refuser l&apos;accès à ce domaine uniquement ou à [ALL_ESTATES] ?
-		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
-	</notification>
-	<notification label="Choisir le domaine" name="EstateBannedAgentRemove">
-		Supprimer ce résident de la liste des résidents bannis pour ce domaine uniquement ou pour [ALL_ESTATES] ?
-		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
-	</notification>
-	<notification label="Choisir le domaine" name="EstateManagerAdd">
-		Ajouter un gérant de domaine pour ce domaine uniquement ou pour [ALL_ESTATES] ?
-		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
-	</notification>
-	<notification label="Choisir le domaine" name="EstateManagerRemove">
-		Supprimer le gérant de domaine pour ce domaine uniquement ou pour [ALL_ESTATES] ?
-		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
-	</notification>
-	<notification label="Confirmer" name="EstateKickUser">
-		Éjecter [EVIL_USER] de ce domaine ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="EstateChangeCovenant">
-		Êtes-vous certain de vouloir modifier le règlement du domaine ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="RegionEntryAccessBlocked">
-		Votre catégorie d&apos;accès ne vous autorise pas à pénétrer dans cette région. Cela vient peut-être du fait qu&apos;il manquait des informations pour valider votre âge.
-
-Vérifiez que vous avez la toute dernière version du client et consultez les pages d&apos;aide pour savoir comment accéder aux zones ayant ce niveau d&apos;accès.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="RegionEntryAccessBlocked_KB">
-		Votre catégorie d&apos;accès ne vous permet pas de pénétrer dans cette région.
-
-Souhaitez-vous en savoir plus sur les différentes catégories d&apos;accès ?
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pr%C3%A9sentation_des_cat%C3%A9gories_de_contenu_(KB)
-		</url>
-		<usetemplate ignoretext="Lorsque l&apos;accès à une région est bloqué à cause de la catégorie d&apos;accès" name="okcancelignore" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
-	</notification>
-	<notification name="RegionEntryAccessBlocked_Notify">
-		Votre catégorie d&apos;accès ne vous permet pas de pénétrer dans cette région.
-	</notification>
-	<notification name="RegionEntryAccessBlocked_Change">
-		Votre catégorie d&apos;accès ne vous permet pas de pénétrer dans cette région.
-
-En cliquant sur Modifier les préférences, vous pourrez changer votre catégorie d&apos;accès et pénétrer dans la région. À partir de maintenant, vous pouvez rechercher et accéder au contenu [REGIONMATURITY]. Vous pouvez modifier ce paramètre à partir du menu Édition &gt; Préférences... &gt; Général.
-	<form name="form">
-      <button
-       name="OK"
-       text="Modifier les Préférences"/>
-      <button
-       default="true"
-       name="Cancel"
-       text="Fermer"/>
-       <ignore name="ignore" text="Lorsque l&apos;accès à une région est bloqué à cause des préférences concernant la catégorie d&apos;accès"/>
-    </form>
-	</notification>
-	<notification name="LandClaimAccessBlocked">
-		Votre catégorie d&apos;accès ne vous permet pas de réclamer cette région. Cela vient peut-être du fait qu&apos;il manquait des informations pour valider votre âge.
-
-Vérifiez que vous avez la toute dernière version du client et consultez les pages d&apos;aide pour savoir comment accéder aux zones ayant ce niveau d&apos;accès.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="LandClaimAccessBlocked_KB">
-		Votre catégorie d&apos;accès ne vous permet pas de réclamer cette région.
-
-Souhaitez-vous en savoir plus sur les différentes catégories d&apos;accès ?
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pr%C3%A9sentation_des_cat%C3%A9gories_de_contenu_(KB)
-		</url>
-		<usetemplate ignoretext="Lorsqu&apos;une région ne peut pas être réclamée à cause de la catégorie d&apos;accès" name="okcancelignore" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
-	</notification>
-	<notification name="LandClaimAccessBlocked_Notify">
-		Votre catégorie d&apos;accès ne vous autorise pas à réclamer cette région.
-	</notification>
-	<notification name="LandClaimAccessBlocked_Change">
-		Votre catégorie d&apos;accès ne vous permet pas de réclamer cette région.
-
-En cliquant sur Modifier les préférences, vous pourrez changer votre catégorie d&apos;accès et pénétrer dans la région. À partir de maintenant, vous pouvez rechercher et accéder au contenu [REGIONMATURITY]. Vous pouvez modifier ce paramètre à partir du menu Édition &gt; Préférences... &gt; Général.
-		<usetemplate ignoretext="Lorsqu&apos;une région ne peut pas être réclamée à cause des préférences concernant la catégorie d&apos;accès" name="okcancelignore" notext="Fermer" yestext="Modifier les Préférences"/>
-	</notification>
-	<notification name="LandBuyAccessBlocked">
-		Votre catégorie d&apos;accès ne vous permet pas d&apos;acheter cette région. Cela vient peut-être du fait qu&apos;il manquait des informations pour valider votre âge.
-
-Vérifiez que vous avez la toute dernière version du client et consultez les pages d&apos;aide pour savoir comment accéder aux zones ayant ce niveau d&apos;accès.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="LandBuyAccessBlocked_KB">
-		Votre catégorie d&apos;accès ne vous permet pas d&apos;acheter cette région.
-
-Souhaitez-vous en savoir plus sur les différentes catégories d&apos;accès ?
-		<url name="url">
-			http://wiki.secondlife.com/wiki/Pr%C3%A9sentation_des_cat%C3%A9gories_de_contenu_(KB)
-		</url>
-		<usetemplate ignoretext="Lorsqu&apos;une région ne peut pas être achetée à cause de la catégorie d&apos;accès" name="okcancelignore" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
-	</notification>
-	<notification name="LandBuyAccessBlocked_Notify">
-		Votre catégorie d&apos;accès ne vous permet pas d&apos;acheter cette région.
-	</notification>
-	<notification name="LandBuyAccessBlocked_Change">
-		Votre catégorie d&apos;accès ne vous autorise pas à acheter cette région.
-
-En cliquant sur Modifier les préférences, vous pourrez changer votre catégorie d&apos;accès et pénétrer dans la région. À partir de maintenant, vous pouvez rechercher et accéder au contenu [REGIONMATURITY]. Vous pouvez modifier ce paramètre à partir du menu Édition &gt; Préférences... &gt; Général.
-		<usetemplate ignoretext="Lorsqu&apos;une région ne peut pas être achetée à cause des préférences concernant la catégorie d&apos;accès" name="okcancelignore" notext="Fermer" yestext="Modifier les Préférences"/>
-	</notification>
-	<notification name="TooManyPrimsSelected">
-		&quot;Vous avez sélectionné trop de prims. Veuillez sélectionner au maximum [MAX_PRIM_COUNT] prims et réessayer.&quot;
-	</notification>
-	<notification name="ProblemImportingEstateCovenant">
-		Problème lors de l&apos;importation du règlement du domaine.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="ProblemAddingEstateManager">
-		Problèmes lors de l&apos;ajout d&apos;un nouveau gérant de domaine. Il est possible qu&apos;au moins un des domaines ait une liste de gérants complète.
-	</notification>
-	<notification name="ProblemAddingEstateGeneric">
-		Problème lors de l&apos;ajout à la liste de ce domaine. Il est possible qu&apos;au moins un des domaines ait une liste complète.
-	</notification>
-	<notification name="UnableToLoadNotecardAsset">
-		Impossible de charger les données de la note actuellement.
-	</notification>
-	<notification name="NotAllowedToViewNotecard">
-		Permissions pour afficher la note insuffisantes.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MissingNotecardAssetID">
-		Les références de la note ne se trouvent pas dans la base de données.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="PublishClassified">
-		Rappel : les frais pour passer des petites annonces ne sont pas remboursables.
-
-Publier cette petite annonce maintenant pour [AMOUNT] L$ ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="SetClassifiedMature">
-		Cette petite annonce contient-elle du contenu Mature ?
-		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="SetGroupMature">
-		Ce groupe contient-il du contenu Mature ?
-		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification label="Confirmer le redémarrage" name="ConfirmRestart">
-		Souhaitez-vous vraiment redémarrer cette région dans 2 minutes ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification label="Envoyer un message à la région" name="MessageRegion">
-		Saisissez une message qui sera envoyé à tous les résidents présents dans cette région.
-		<form name="form">
-			<input name="message" type="text"/>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Annuler"/>
-		</form>
-	</notification>
-	<notification label="Interdire le terraformage" name="HelpRegionBlockTerraform">
-		Si vous cochez cette case, les propriétaires ne pourront plus terraformer leur terrain, quel que soit le paramétrage individuel des parcelles.
-
-Valeur par défaut : désactivé
-	</notification>
-	<notification label="Interdire le vol" name="HelpRegionBlockFly">
-		Si vous cochez cette case, les résidents ne pourront plus voler dans cette région, quel que soit le paramétrage individuel des parcelles.
-
-Valeur par défaut : désactivé
-	</notification>
-	<notification label="Modifications groupées des droits relatifs au contenu" name="HelpBulkPermission">
-		L&apos;outil Modifications groupées des droits vous permet de modifier rapidement et simultanément les droits dans les contenus des objets séléctionnés. Notez toutefois que vous paramétrez uniquement les droits des objets dans les Contenus des objets sélectionnés, et non les droits sur les objets eux-mêmes.  
-
-Notez aussi que les droits ne s&apos;appliquent pas aux contenus imbriqués dans les objets contenus. Votre requête ne porte que sur les objets de premier niveau.
-
-Vous pouvez sélectionner quels types d&apos;objets modifier à la section Types de contenu. Les photos sont incluses quand vous sélectionnez Textures.
-
-* Cet outil ne vous permettra de changer que les droits des objets que vous êtes autorisés à modifier.
-* Vous ne pouvez pas accorder de droits que vous n&apos;avez pas au prochain propriétaire.
-* Les droits accordés au prochain propriétaire de sont que des requêtes. Si un objet ne peut recevoir tous les nouveaux droits, aucun de ses droits ne changera.
-
-Lorsque vous êtes prêt à modifier tous les droits, cliquez sur Appliquer et attendez de voir s&apos;afficher les résultats.
-
-Si vous fermez la fenêtre des modifications groupées alors que les droits sont en train d&apos;être modifiés, vous suspendez l&apos;opération.
-	</notification>
-	<notification label="Autoriser les dégâts" name="HelpRegionAllowDamage">
-		Si vous cochez cette case, les résidents peuvent subir des dégâts dans toute la région quel que soit le paramétrage individuel des parcelles. Si la case n&apos;est pas cochée, les propriétaires sont libres d&apos;activer ou non cette option sur leur parcelle.
-
-Valeur par défaut : désactivé
-	</notification>
-	<notification label="Nombre maximum d&apos;avatars" name="HelpRegionAgentLimit">
-		Définit le nombre maximum d&apos;avatars autorisés dans cette région.
-La performance peut varier en fonction du nombre d&apos;avatars présents.
-
-Valeur par défaut : 40
-	</notification>
-	<notification label="Bonus objet" name="HelpRegionObjectBonus">
-		Le bonus objet est le multiplicateur de prims autorisées 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 prims. S&apos;il est de 2, chaque parcelle peut contenir 234 prims, ou deux fois plus, et ainsi de suite. Le nombre maximum de prims autorisées 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.
-
-Valeur par défaut : 1.0
-	</notification>
-	<notification label="Accès" name="HelpRegionMaturity">
-		Définit la catégorie d&apos;accès de la région, telle qu&apos;affichée dans la barre de menu en haut du client et dans les infobulles de la carte lorsque vous passez votre curseur au-dessus de cette région. Ce paramètre affecte aussi l&apos;accès à cette région et les résultats de recherche. Les autres résidents ne peuvent pénétrer que dans les régions ou n&apos;afficher que les résultats de recherche ayant la même catégorie d&apos;accès que celle indiquée dans leurs Préférences.
-
-Ce changement n&apos;apparaîtra pas immédiatement sur la carte.
-	</notification>
-	<notification label="Interdire les bousculades" name="HelpRegionRestrictPushObject">
-		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 d&apos;autres résidents ou par le propriétaire de la parcelle.
-(Bousculer fait référence à la fonction LSL llPushObjet().)
-
-Valeur par défaut : désactivé
-	</notification>
-	<notification label="Fusionner/Diviser des parcelles" name="HelpParcelChanges">
-		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 ils ont les pouvoirs nécessaires.
-   Si cette case est cochée :
- * Tous les propriétaires peuvent fusionner ou diviser leurs parcelles.
- * Pour les parcelles appartenant à un groupe, les membres avec les pouvoirs nécessaires peuvent fusionner ou diviser les parcelles.
-
-Valeur par défaut : activée
-	</notification>
-	<notification label="Ne pas afficher dans la recherche" name="HelpRegionSearch">
-		Si vous cochez cette option, les propriétaires ne pourront pas faire apparaître leurs parcelles dans les résultats de recherche.
-Valeur par défaut : désactivé
-	</notification>
-	<notification label="Catégorie de la région modifiée" name="RegionMaturityChange">
-		La catégorie d&apos;accès de cette région a été mise à jour.
-Ce changement n&apos;apparaîtra pas immédiatement sur la carte.
-	</notification>
-	<notification label="Revente de terrain" name="HelpRegionLandResell">
-		Les propriétaires et gérants de domaine peuvent vendre n&apos;importe quel terrain appartenant au propriétaire du domaine.
-Si cette option n&apos;est pas cochée, les propriétaires ne peuvent pas revendre leur parcelle.
-Si cette option est cochée, les propriétaires sont libres de revendre leur parcelle.
-
-Valeur par défaut : désactivé
-	</notification>
-	<notification label="Désactiver les scripts" name="HelpRegionDisableScripts">
-		Lorsque la performance d&apos;une région est faible, cela peut venir d&apos;un script. Ouvrez la section Statistiques (Ctrl-Maj-1) et vérifiez le FPS Physique (Physics FPS) de la section Simulateur.
-Si le FPS est en dessous de 45, ouvrez la section Time située en fin de liste. Si le Script Time est au dessus de 25ms, cliquez sur le bouton Afficher les objets scriptés les plus consommateurs. Vous verrez le nom et l&apos;emplacement des scripts éventuellement à 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 le temps d&apos;arriver à l&apos;endroit su script en cause. Une fois sur place, assurez-vous que le script est bien à l&apos;origine du problème. Pour cela, vous devrez peut-être contacter le propriétaire du script ou bien supprimer ou renvoyer l&apos;objet.
-Décochez la case Désactiver le script, puis cliquez sur Appliquer pour réactiver tous les scripts dans la région.
-
-Valeur par défaut : désactivé
-	</notification>
-	<notification label="Désactiver les collisions" name="HelpRegionDisableCollisions">
-		Des objets physiques peuvent fortement réduire les performances d&apos;une région.
-Ouvrez la barre de statistiques (Ctrl-Maj-1) et vérifiez le FPS Physique (Physics FPS) de la section Simulateur.
-Si le FPS est en dessous de 45, ouvrez la section Time située en fin de liste. Si le Script Time est au dessus de 25ms, cliquez sur le bouton Afficher les collisions les plus consommatrices.
-Vous verrez le nom et l&apos;emplacement des objets physiques éventuellement à l&apos;origine du problème.
-
-Si vous décochez la case Désactiver les collisions et que vous cliquez sur Appliquer, toutes les collisions entre objets seront désactivées. Vous pourrez avoir besoin de cette fonction le temps d&apos;arriver à l&apos;emplacement des objets en cause. Une fois sur place, vérifiez que l&apos;&apos;objet est bien responsable du problème (entre-t-il sans cesse en collision avec d&apos;autres objets ?) Pour cela, vous devrez peut-être contacter le propriétaire de l&apos;objet ou bien supprimer ou renvoyer l&apos;objet.
-Décochez la case Désactiver les collisions, puis cliquez sur le bouton Appliquer pour réactiver les collisions dans la région.
-
-Valeur par défaut : désactivé
-	</notification>
-	<notification label="Désactiver la physique" name="HelpRegionDisablePhysics">
-		L&apos;option Désactiver la physique est similaire à l&apos;option Désactiver les collisions sauf qu&apos;elle englobe tous les effets liés à la physique. Cela signifie que les objets n&apos;entreront plus en collision et que les avatars ne pourront plus bouger.
-
-Vous ne devriez utiliser cette option que lorsque l&apos;option Désactiver les collisions n&apos;améliore pas sufisamment la performance de la région pour résoudre un problème de physique ou trouver les objets entrant en collision.
-
-Une fois que vous avez fini, n&apos;oubliez pas de réactiver les propriétés physiques sinon les avatars ne pourront pas bouger.
-
-Valeur par défaut : désactivé
-	</notification>
-	<notification label="Afficher les collisions les plus consommatrices" name="HelpRegionTopColliders">
-		Montre une liste des objets générant le plus de collisions avec d&apos;autres objets. Ces objets peuvent ralentir les performances de votre région. Sélectionnez Affichage &gt; Statistiques et regardez sous Simulator &gt; Time &gt; Sim Time (Physics) pour voir si le temps du moteur physique est au dessus de 20 ms.
-	</notification>
-	<notification label="Afficher les objets scriptés les plus consommateurs" name="HelpRegionTopScripts">
-		Dresse une liste des objets dont les scripts consomment le plus de ressources. Ces objets peuvent ralentir la performance de votre région.
-Sélectionnez Affichage &gt; Statistiques et regardez sous Simulator &gt; Time &gt; Script Time pour voir si le temps des scripts est au dessus de 25 ms.
-	</notification>
-	<notification label="Redémarrer la région" name="HelpRegionRestart">
-		Redémarre le serveur en charge de la région après deux minutes d&apos;avertissement. 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 de la région ne permet pas de résoudre la plupart des problèmes de performance. Les redémarrages ne doivent avoir lieu qu&apos;en dernier recours.
-	</notification>
-	<notification label="Niveau de l&apos;eau" name="HelpRegionWaterHeight">
-		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.
-
-
-Valeur par défaut : 20
-	</notification>
-	<notification label="Surélévation du terrain" name="HelpRegionTerrainRaise">
-		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.
-
-Valeur par défaut : 4
-	</notification>
-	<notification label="Abaisser le terrain" name="HelpRegionTerrainLower">
-		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.
-
-Valeur par défaut : -4
-	</notification>
-	<notification label="Charger le terrain au format RAW" name="HelpRegionUploadRaw">
-		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.
-
-Le chargement peut prendre jusqu&apos;à 45 secondes. Veuillez noter que le chargement d&apos;un fichier terrain ne déplacera pas les objets qui se trouvent sur le terrain, mais seulement le terrain et les droits associés aux parcelles. Certains objets risquent d&apos;aller sous la terre.
-
-Pour en savoir plus sur la modification de la hauteur des terrains d&apos;une région, consultez l&apos;Aide F1.
-	</notification>
-	<notification label="Télécharger le terrain au format RAW" name="HelpRegionDownloadRaw">
-		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 certains droits relatifs à 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 en savoir plus sur la modification de la hauteur des terrains d&apos;une région, consultez l&apos;Aide F1.
-	</notification>
-	<notification label="Utiliser le soleil du domaine" name="HelpRegionUseEstateSun">
-		Si vous cochez cette case, la position du soleil dans cette région sera la même que dans le reste du domaine.
-
-Valeur par défaut : activé
-	</notification>
-	<notification label="Soleil fixe" name="HelpRegionFixedSun">
-		Si vous cochez cette case, la position du soleil se fixe sur celle du curseur Phase et le soleil arrête de bouger.
-
-Valeur par défaut : désactivé
-	</notification>
-	<notification label="Figer le terrain" name="HelpRegionBakeTerrain">
-		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.
-	</notification>
-	<notification label="Gérants du domaine" name="HelpEstateEstateManager">
-		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.
-
-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.
-	</notification>
-	<notification label="Utiliser le temps universel" name="HelpEstateUseGlobalTime">
-		Cette case permet au soleil de votre domaine de suivre la position du soleil sur les domaines Linden du continent.
-
-Valeur par défaut : activé
-	</notification>
-	<notification label="Soleil fixe" name="HelpEstateFixedSun">
-		Si vous cochez cette case, la position du soleil se fixe sur celle du curseur Phase et le soleil arrête de bouger.
-	</notification>
-	<notification label="Accès public" name="HelpEstateExternallyVisible">
-		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.
-
-Valeur par défaut : activé
-	</notification>
-	<notification label="Autoriser la téléportation directe" name="HelpEstateAllowDirectTeleport">
-		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.
-
-Valeur par défaut : désactivé
-	</notification>
-	<notification label="Autoriser l&apos;accès" name="HelpEstateAllowResident">
-		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.
-	</notification>
-	<notification label="Autoriser l&apos;accès de groupe" name="HelpEstateAllowGroup">
-		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.
-	</notification>
-	<notification label="Adresse e-mail où signaler une infraction" name="HelpEstateAbuseEmailAddress">
-		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.
-	</notification>
-	<notification label="Refuser l&apos;accès" name="HelpEstateBanResident">
-		Les résidents figurant sur cette liste ne peuvent pas pénétrer sur votre domaine, quels que soient les autres paramètres.
-	</notification>
-	<notification label="Autoriser les chats vocaux" name="HelpEstateVoiceChat">
-		Les parcelles de ce domaine peuvent avoir leurs propres canaux vocaux, ce qui permet aux résidents de communiquer avec leurs voisins.
-
-Valeur par défaut : désactivé
-	</notification>
-	<notification label="Versions de voix non compatibles" name="VoiceVersionMismatch">
-		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.
-	</notification>
-	<notification label="Règlement du domaine" name="HelpEstateCovenant">
-		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.
-
-Un règlement sert à communiquer des règles, des lignes directrices ou informations culturelles, ou simplement à expliquer vos attentes à un acheteur potentiel. Il peut s&apos;agir de régulations concernant la construction, les options de paiement ou tout autre information que vous souhaitez faire passer au résident avant que l&apos;achat n&apos;ait lieu.
-
-L&apos;acheteur est tenu  d&apos;accepter le règlement en cochant une case avant de pouvoir finaliser l&apos;achat. Les règlements, lorsqu&apos;ils existent, apparaissent toujours dans la boîte de dialogue À propos du terrain.
-	</notification>
-	<notification label="Impossible d&apos;acheter des objets" name="BuyObjectOneOwner">
-		Impossible d&apos;acheter simultanément des objets de propriétaires différents.
-Veuillez ne sélectionner qu&apos;un seul objet.
-	</notification>
-	<notification label="Impossible d&apos;acheter des contenus" name="BuyContentsOneOnly">
-		Impossible d&apos;acheter les contenus de plus d&apos;un objet à la fois.
-Veuillez ne sélectionner qu&apos;un seul objet.
-	</notification>
-	<notification label="Impossible d&apos;acheter des contenus" name="BuyContentsOneOwner">
-		Impossible d&apos;acheter simultanément des objets de propriétaires différents.
-Veuillez ne sélectionner qu&apos;un seul objet.
-	</notification>
-	<notification name="BuyOriginal">
-		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]
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="BuyOriginalNoOwner">
-		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]
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="BuyCopy">
-		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]
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="BuyCopyNoOwner">
-		Acheter une copie pour [PRICE] L$ ?
-L&apos;objet sera copié dans votre inventaire.
-Vous pourrez :
- Modifier : [MODIFYPERM]
- Copier : [COPYPERM]
- Revendre ou donner : [RESELLPERM]
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="BuyContents">
-		Acheter des contenus pour [PRICE] L$ à [OWNER] ?
-Ils seront copiés dans votre inventaire.
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="BuyContentsNoOwner">
-		Acheter des contenus pour [PRICE] L$ ?
-Ils seront copiés dans votre inventaire.
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmPurchase">
-		Suite à cette transaction, vous allez :
-[ACTION]
-
-Êtes-vous certain de vouloir effectuer cette transaction ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmPurchasePassword" type="password">
-		Suite à cette transaction, vous allez :
-[ACTION]
-
-Êtes-vous certain de vouloir effectuer cette transaction ?
-Veuillez saisir à nouveau votre mot de passe et cliquer sur OK.
-		<form name="form">
-			<button name="ConfirmPurchase" text="OK"/>
-			<button name="Cancel" text="Annuler"/>
-		</form>
-	</notification>
-	<notification name="SetPickLocation">
-		Remarque :
-vous avez mis à jour l&apos;emplacement de ce favori mais les autres détails resteront inchangés.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="MoveInventoryFromObject">
-		Vous avez sélectionné des objets non copiables.
-Ces objets seront déplacés dans votre inventaire et non pas copiés.
-
-Déplacer les objets de l&apos;inventaire ?
-		<usetemplate ignoretext="Lors du transfert d&apos;un inventaire non copiable depuis des objets" name="okcancelignore" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="MoveInventoryFromScriptedObject">
-		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.
-L&apos;objet les contenant est scripté, déplacer ces objets peut causer des problèmes au niveau du script.
-
-Déplacer les objets de l&apos;inventaire ?
-		<usetemplate ignoretext="Lors du transfert d&apos;un inventaire non copiable depuis des objets scriptés" name="okcancelignore" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ClickActionNotPayable">
-		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().
-		<form name="form">
-			<ignore name="ignore" text="Lors du paramétrage de la fonction Payer sur des objets sans événement monétaire"/>
-		</form>
-	</notification>
-	<notification name="OpenObjectCannotCopy">
-		Vous n&apos;êtes autorisé à copier aucun élément dans cet objet.
-	</notification>
-	<notification name="WebLaunchAccountHistory">
-		Aller sur le site de Second Life pour consulter l&apos;historique de votre compte ?
-		<usetemplate ignoretext="Lors du chargement de la page web contenant l&apos;historique de votre compte" name="okcancelignore" notext="Annuler" yestext="Aller sur cette page"/>
-	</notification>
-	<notification name="ClickOpenF1Help">
-		Visiter les pages d&apos;aide de Second Life ?
-		<usetemplate ignoretext="Lors de la visite des pages d&apos;aide de Second Life" name="okcancelignore" notext="Annuler" yestext="Aller"/>
-	</notification>
-	<notification name="ConfirmQuit">
-		Êtes-vous certain de vouloir quitter ?
-		<usetemplate ignoretext="Lorsque vous quittez Second Life" name="okcancelignore" notext="Continuer" yestext="Quitter"/>
-	</notification>
-	<notification name="HelpReportAbuseEmailLL">
-		Utilisez cet outil pour signaler des infractions aux Conditions d&apos;utilisation et aux Règles de la communauté. Voir :
-
-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 :
-
-http://secondlife.com/support/incidentreport.php
-	</notification>
-	<notification name="HelpReportAbuseEmailEO">
-		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 la région dans laquelle vous êtes a choisi de recevoir et de s&apos;occuper de tous les rapports envoyés à partir de cette région. Linden Lab n&apos;enquêtera pas sur les rapports que vous envoyez à partir de cet endroit.
-
-Le propriétaire de la région traitera les rapports en fonction des règles de cette région, comme indiqué dans le réglement du domaine.
-(Les réglements sont visibles à partir du menu Monde &gt; À propos du terrain.)
-
-La résolution de ce rapport ne s&apos;applique qu&apos;à cette région ; L&apos;accès aux autres endroits de Second Life 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.
-	</notification>
-	<notification name="HelpReportBug">
-		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.
-	</notification>
-	<notification name="HelpReportAbuseSelectCategory">
-		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.
-	</notification>
-	<notification name="HelpReportBugSelectCategory">
-		Veuillez choisir une catégorie pour ce bug.
-Le choix d&apos;une catégorie nous permet de traiter les bugs plus rapidement.
-	</notification>
-	<notification name="HelpReportAbuseAbuserNameEmpty">
-		Veuillez saisir le nom du contrevenant.
-Lorsque nous avons le nom du contrevenant, nous sommes en mesure de traiter les rapports plus rapidement.
-	</notification>
-	<notification name="HelpReportAbuseAbuserLocationEmpty">
-		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.
-	</notification>
-	<notification name="HelpReportAbuseSummaryEmpty">
-		Veuillez saisir un récapitulatif de l&apos;infraction.
-Les récapitulatifs précis nous permettent de traiter les rapports plus rapidement.
-	</notification>
-	<notification name="HelpReportBugSummaryEmpty">
-		Veuillez saisir un récapitulatif du bug.
-Les récapitulatifs précis nous permettent de résoudre les bugs plus rapidement.
-	</notification>
-	<notification name="HelpReportAbuseDetailsEmpty">
-		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.
-	</notification>
-	<notification name="HelpReportBugDetailsEmpty">
-		Veuillez saisir une description détaillée du bug.
-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.
-	</notification>
-	<notification name="HelpReportAbuseContainsCopyright">
-		Cher résident,
-
-Il semble que vous souhaitiez reporter une infraction à des droits de propriété intellectuelle. Pour signaler correctement cette infraction :
-
-(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 droits 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.
-
-(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.
-
-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 droits.
-
-Merci,
-
-Linden Lab
-	</notification>
-	<notification name="FailedRequirementsCheck">
-		Les composantes requises suivantes ne se trouvent pas dans [FLOATER]:
-[COMPONENTS]
-	</notification>
-	<notification label="Remplacer la pièce-jointe existante" name="ReplaceAttachment">
-		Vous avez déjà un objet sur cette partie du corps.
-Voulez-vous le remplacer par l&apos;objet sélectionné ?
-		<form name="form">
-			<ignore name="ignore" save_option="true" text="Lors du remplacement de pièces-jointes existantes"/>
-			<button ignore="Remplacer automatiquement" name="Yes" text="OK"/>
-			<button ignore="Ne jamais remplacer" name="No" text="Annuler"/>
-		</form>
-	</notification>
-	<notification label="Réponse si occupé(e)" name="BusyModePay">
-		Vous êtes en mode occupé et vous ne recevrez donc aucun objet en échange de ce paiement.
-
-Souhaitez-vous quitter le mode occupé avant de terminer cette transaction ?
-		<form name="form">
-			<ignore name="ignore" save_option="true" text="Lorsque vous envoyez de l&apos;argent à une personne en mode Occupé"/>
-			<button ignore="Toujours quitter le mode occupé" name="Yes" text="OK"/>
-			<button ignore="Ne jamais quitter le mode occupé" name="No" text="Annuler"/>
-		</form>
-	</notification>
-	<notification name="ConfirmEmptyTrash">
-		Êtes-vous certain de vouloir supprimer le contenu de votre corbeille de manière permanente  ?
-		<usetemplate ignoretext="Lorsque vous videz la corbeille de l&apos;inventaire" name="okcancelignore" notext="Annuler" yestext="OK"/>
-	</notification>
-	<notification name="ConfirmClearBrowserCache">
-		Êtes-vous certain de vouloir vider le cache de votre navigateur ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Oui"/>
-	</notification>
-	<notification name="ConfirmClearCookies">
-		Êtes-vous certain de vouloir supprimer vos cookies ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Oui"/>
-	</notification>
-	<notification name="ConfirmClearMediaUrlList">
-		Êtes-vous certain de vouloir supprimer la liste des URL enregistrées ?
-		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Oui"/>
-	</notification>
-	<notification name="ConfirmEmptyLostAndFound">
-		Êtes-vous certain de vouloir supprimer le contenu de votre dossier Objets trouvés de manière permanente ?
-		<usetemplate ignoretext="Losque vous videz le dossier Objets trouvés dans votre inventaire" name="okcancelignore" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="CopySLURL">
-		La SLURL suivante a été copiée dans votre presse-papiers :
- [SLURL]
-
-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.
-		<form name="form">
-			<ignore name="ignore" text="Lorsque vous copiez une SLURL dans votre presse-papier"/>
-		</form>
-	</notification>
-	<notification name="GraphicsPreferencesHelp">
-		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 :
-
-Effets : active ou désactive les différents types de shaders pixels.
-
-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 influent sur la manière dont le client rend les avatars.
-
-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 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.
-
-Sources lumineuses : définit les types de lumières que vous souhaitez faire apparaître.
-
-Rendu du terrain : définit le niveau de détail que vous souhaitez utiliser dans la texture du terrain.
-	</notification>
-	<notification name="WLSavePresetAlert">
-		Voulez-vous écraser l&apos;option précédemment enregistrée ?
-		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="WLDeletePresetAlert">
-		Voulez-vous supprimer [SKY] ?
-		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="WLNoEditDefault">
-		Vous ne pouvez pas éditer ou supprimer un préréglage par défaut.
-	</notification>
-	<notification name="WLMissingSky">
-		Une dossier semble manquer au Cycle du jour : [SKY].
-	</notification>
-	<notification name="PPSaveEffectAlert">
-		Certains effets post-traitement existent. Voulez-vous quand même écraser ce fichier ?
-		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="HelpEditSky">
-		Pour créer et sauvegarder plusieurs ciels, utilisez les curseurs WindLight.
-	</notification>
-	<notification name="HelpEditDayCycle">
-		Choisissez quel ciel apparaît au cours de la journée.
-	</notification>
-	<notification name="EnvSettingsHelpButton">
-		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 dans le client, utilisez le curseur Heure de la journée.
-
-Le curseur Couverture nuageuse permet de contrôler le nombre de nuages dans le ciel.
-
-L&apos;option Couleur de l&apos;eau vous permet de modifier la couleur de l&apos;eau grâce au sélecteur de couleurs.
-
-Le curseur Brouillard dans l&apos;eau permet de contrôler la densité du brouillard sous l&apos;eau.
-
-Pour synchroniser l&apos;heure du jour sur celle de la région, cliquez sur Utiliser heure domaine.
-
-En cliquant sur le bouton Ciel Avancé, vous aurez accès à tous les réglages relatifs au ciel.
-
-En cliquant sur le bouton Eau Avancée, vous aurez accès à tous les réglages relatifs à l&apos;eau.
-	</notification>
-	<notification name="HelpDayCycle">
-		L&apos;éditeur du cycle du jour vous permet de contrôler le ciel au cours du cycle jour/nuit de second Life. C&apos;est ce même cycle qui est contrôlé par le curseur Heure de la journée dans l&apos;éditeur d&apos;environnement basique.
-
-L&apos;éditeur du jour fonctionne grâce au réglage d&apos;images-clés. Ces images-clés sont représentées par les marques grises sur la ligne du temps et ont des préréglages qui leurs sont associées. Au cours de la journée et de la nuit, le ciel WindLight s&apos;anime en passant d&apos;une clé à l&apos;autre.
-
-La flèche jaune au dessus de la ligne du temps représente votre vue actuelle, basée sur l&apos;heure de la journée. Cliquez et faites glisser pour voir l&apos;animation au cours de votre journée. Ajoutez ou supprimez des clés en appuyant sur les boutons Ajouter clé ou Supprimer clé, à droite de la ligne du temps.
-
-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 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.
-	</notification>
-	<notification name="HelpBlueHorizon">
-		Utilisez les curseurs Rouge/Vert/Bleu (RVB) pour ajuster la couleur du ciel. Pour déplacer les trois curseurs en même temps, utilisez le curseur Intensité.
-	</notification>
-	<notification name="HelpHazeHorizon">
-		Le paramètre Quantité de brume est l&apos;un des plus utiles pour ajuster l&apos;exposition lumineuse de la scène.
-Il permet de simuler de nombreux paramètres d&apos;exposition, tels que les voiles blancs créés par le soleil ou des lumières plus foncées.
-	</notification>
-	<notification name="HelpBlueDensity">
-		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).
-	</notification>
-	<notification name="HelpHazeDensity">
-		Le paramètre Densité de la brume permet de contrôler le niveau de brume grisâtre dans l&apos;atmosphère. Ce paramètre est utile pour simuler les scènes dans lesquelles il y a beaucoup de fumée et de substances polluantes émises par l&apos;homme. Il est également utile pour simuler le brouillard et la brume.
-	</notification>
-	<notification name="HelpDensityMult">
-		Utilisez le Multiplicateur de densité pour modifier la densité atmosphérique générale. Une valeur basse donne l&apos;impression d&apos;un air « léger » alors qu&apos;une valeur élevée donne l&apos;impression d&apos;un air « lourd » et enfumé.
-	</notification>
-	<notification name="HelpDistanceMult">
-		Ajuste la distance perçue par WindLight.
-La valeur zéro désactive l&apos;influence de WindLight sur le terrain et les objets.
-Les valeurs supérieures à 1 simulent des distances plus importantes pour des effets atmosphériques plus épais.
-	</notification>
-	<notification name="HelpMaxAltitude">
-		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.
-	</notification>
-	<notification name="HelpSunlightColor">
-		Ajuste la couleur et l&apos;intensité de la lumière directe de la scène.
-	</notification>
-	<notification name="HelpSunAmbient">
-		Ajuste la couleur et l&apos;intensité de la lumière atmosphérique ambiante.
-	</notification>
-	<notification name="HelpSunGlow">
-		Le curseur Taille contrôle la taille du soleil.
-Le curseur Netteté permet de rendre le soleil plus ou moins flou dans le ciel.
-	</notification>
-	<notification name="HelpSceneGamma">
-		Ajuste la distribution de clair et de foncé sur l&apos;écran.
-	</notification>
-	<notification name="HelpStarBrightness">
-		Vous permet de contrôler l&apos;intensité des étoiles dans le ciel.
-	</notification>
-	<notification name="HelpTimeOfDay">
-		Contrôle la position du soleil dans le ciel.
-Même chose que l&apos;élévation.
-	</notification>
-	<notification name="HelpEastAngle">
-		Contrôle la position du soleil dans le ciel.
-Même chose que l&apos;azimut.
-	</notification>
-	<notification name="HelpCloudColor">
-		Modifie la couleur des nuages. Il est recommandé de laisser les nuages en blanc mais vous pouvez aussi faire preuve de créativité...
-	</notification>
-	<notification name="HelpCloudDetail">
-		Contrôle le détail de l&apos;image placée sur l&apos;image du nuage principal. X et Y contrôlent sa position. D (Densité) permet de rendre les nuages plus ou moins pleins ou plus ou moins fracturés.
-	</notification>
-	<notification name="HelpCloudDensity">
-		Vous permet de contrôler la position des nuages avec les curseurs X et Y ainsi que leur densité avec le curseur D.
-	</notification>
-	<notification name="HelpCloudCoverage">
-		Contrôle la surface du ciel couverte par les nuages.
-	</notification>
-	<notification name="HelpCloudScale">
-		Contrôle l&apos;échelle de l&apos;image des nuages sur le dôme du ciel.
-	</notification>
-	<notification name="HelpCloudScrollX">
-		Contrôle la vitesse des nuages sur l&apos;axe des X.
-	</notification>
-	<notification name="HelpCloudScrollY">
-		Contrôle la vitesse des nuages sur l&apos;axe des Y.
-	</notification>
-	<notification name="HelpClassicClouds">
-		Cochez cette option pour utiliser les anciens nuages de Second Life en plus des nuages WindLight.
-	</notification>
-	<notification name="HelpWaterFogColor">
-		Permet de sélectionner la couleur du brouillard sous l&apos;eau.
-	</notification>
-	<notification name="HelpWaterFogDensity">
-		Contrôle la densité du brouillard sous l&apos;eau, ainsi que votre visibilité.
-	</notification>
-	<notification name="HelpUnderWaterFogMod">
-		Modifie l&apos;effet créé par l&apos;option Densité du brouillard pour contrôler votre visibilité quand votre avatar est sous l&apos;eau.
-	</notification>
-	<notification name="HelpWaterGlow">
-		Contrôle l&apos;éclat de l&apos;eau à la surface.
-	</notification>
-	<notification name="HelpWaterNormalScale">
-		Contrôle l&apos;échelle des trois vaguelettes qui forment l&apos;eau.
-	</notification>
-	<notification name="HelpWaterFresnelScale">
-		Contrôle la quantité de lumière réfléchie à des angles différents.
-	</notification>
-	<notification name="HelpWaterFresnelOffset">
-		Contrôle l&apos;intensité de la lumière réfléchie.
-	</notification>
-	<notification name="HelpWaterScaleAbove">
-		Contrôle la quantité de lumière réfractée lorsque votre avatar regarde au dessus de l&apos;eau.
-	</notification>
-	<notification name="HelpWaterScaleBelow">
-		Contrôle la quantité de lumière réfractée lorsque votre avatar est sous l&apos;eau.
-	</notification>
-	<notification name="HelpWaterBlurMultiplier">
-		Contrôle le mélange reflets/vagues.
-	</notification>
-	<notification name="HelpWaterNormalMap">
-		Contrôle quelle normal map est posée sur l&apos;eau pour déterminer la réflection/réfraction.
-	</notification>
-	<notification name="HelpWaterWave1">
-		Contrôle dans quelle direction et à quelle vitesse la version grande échelle de la normal map se déplace sur l&apos;axe des X et l&apos;axe des Y.
-	</notification>
-	<notification name="HelpWaterWave2">
-		Contrôle dans quelle direction et à quelle vitesse la version grande échelle de la normal map se déplace sur l&apos;axe des X et l&apos;axe des Y.
-	</notification>
-	<notification name="NewSkyPreset">
-		Nommez le nouveau ciel.
-		<form name="form">
-			<input name="message" type="text">
-				Nouveau préréglage
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Annuler"/>
-		</form>
-	</notification>
-	<notification name="ExistsSkyPresetAlert">
-		Ce préréglage existe déjà !
-	</notification>
-	<notification name="NewWaterPreset">
-		Nommez ce nouveau préréglage d&apos;eau.
-		<form name="form">
-			<input name="message" type="text">
-				Nouveau préréglage
-			</input>
-			<button name="OK" text="OK"/>
-			<button name="Cancel" text="Annuler"/>
-		</form>
-	</notification>
-	<notification name="ExistsWaterPresetAlert">
-		Ce préréglage existe déjà !
-	</notification>
-	<notification name="WaterNoEditDefault">
-		Vous ne pouvez pas éditer ou supprimer un préréglage par défaut.
-	</notification>
-	<notification name="ChatterBoxSessionStartError">
-		Impossible de démarrer une nouvelle session de chat avec [RECIPIENT].
-[REASON]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="ChatterBoxSessionEventError">
-		[EVENT]
-[REASON]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="ForceCloseChatterBoxSession">
-		Vous devez terminer votre session de chat avec [NAME].
-[REASON]
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="Cannot_Purchase_an_Attachment">
-		Les objets qui font partie d&apos;une pièce-jointe ne peuvent pas être achetés.
-	</notification>
-	<notification label="À propos des requêtes pour les autorisations de débit" name="DebitPermissionDetails">
-		Accepter cette requête donne au script l&apos;autorisation de prélever des dollars Linden (L$) sur votre compte de manière continue. Pour révoquer cette autorisation, le propriétaire de l&apos;objet doit supprimer l&apos;objet ou bien réinitialiser les scripts dans l&apos;objet.
-		<usetemplate name="okbutton" yestext="OK"/>
-	</notification>
-	<notification name="AutoWearNewClothing">
-		Voulez-vous automatiquement porter l&apos;habit que vous créez ?
-		<usetemplate ignoretext="Porter automatiquement" name="okcancelignore" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="NotAgeVerified">
-		Pour que vous puissiez accéder à cette parcelle, votre âge doit être vérifié.
-Voulez-vous aller sur le site de Second Life pour vérifier votre âge ?
-
-[_URL]
-		<url name="url" option="0">
-			https://secondlife.com/account/verification.php?lang=fr
-		</url>
-		<usetemplate ignoretext="Avertir si l&apos;âge n&apos;a pas été vérifié" name="okcancelignore" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="Cannot enter parcel: no payment info on file">
-		Avant de pouvoir pénétrer sur cette parcelle, vous devez enregistrer vos informations de paiement.
-Voulez-vous aller sur le site de Second Life pour enregistrer ces informations ?
-
-[_URL]
-		<url name="url" option="0">
-			https://secondlife.com/account/index.php?lang=fr
-		</url>
-		<usetemplate ignoretext="Avertir si les informations de paiement ne sont pas fournies" name="okcancelignore" notext="Non" yestext="Oui"/>
-	</notification>
-	<notification name="MissingString">
-		The string [STRING_NAME] is missing from strings.xml
-	</notification>
-	<notification name="SystemMessageTip">
-		[MESSAGE]
-	</notification>
-	<notification name="Cancelled">
-		Annulé
-	</notification>
-	<notification name="CancelledSit">
-		Action annulée
-	</notification>
-	<notification name="CancelledAttach">
-		Attachement annulé
-	</notification>
-	<notification name="ReplacedMissingWearable">
-		Habits et parties du corps manquants remplacés par les éléments par défaut.
-	</notification>
-	<notification name="GroupNotice">
-		Sujet : [SUBJECT], Message : [MESSAGE]
-	</notification>
-	<notification name="FriendOnline">
-		[NAME] est connecté(e)
-	</notification>
-	<notification name="FriendOffline">
-		[NAME] est déconnecté(e)
-	</notification>
-	<notification name="AddSelfFriend">
-		Vous ne pouvez pas devenir ami avec vous-même.
-	</notification>
-	<notification name="UploadingAuctionSnapshot">
-		Importation de photos SL et Web en cours
-(prend environ 5 minutes…)
-	</notification>
-	<notification name="UploadPayment">
-		Le chargement a coûté [AMOUNT] L$.
-	</notification>
-	<notification name="UploadWebSnapshotDone">
-		Photo Web importée
-	</notification>
-	<notification name="UploadSnapshotDone">
-		Photo SL importée
-	</notification>
-	<notification name="TerrainDownloaded">
-		Fichier terrain.raw téléchargé
-	</notification>
-	<notification name="GestureMissing">
-		Geste [NAME] absent de la base de données.
-	</notification>
-	<notification name="UnableToLoadGesture">
-		Impossible de charger le geste [NAME].
-Merci de réessayer.
-	</notification>
-	<notification name="LandmarkMissing">
-		Repère absent de la base de données.
-	</notification>
-	<notification name="UnableToLoadLandmark">
-		Impossible de charger le repère. Merci de réessayer.
-	</notification>
-	<notification name="CapsKeyOn">
-		La touche Verr.maj est activée.
-Ce mode modifie le mot de passe que vous saisissez, vous devriez le quitter.
-	</notification>
-	<notification name="NotecardMissing">
-		Note absente de la base de données.
-	</notification>
-	<notification name="NotecardNoPermissions">
-		Permissions insuffisantes pour voir la note.
-	</notification>
-	<notification name="RezItemNoPermissions">
-		Permissions insuffisantes pour rezzer l&apos;objet.
-	</notification>
-	<notification name="UnableToLoadNotecard">
-		Impossible de lire les données de la note actuellement.
-	</notification>
-	<notification name="ScriptMissing">
-		Script absent de la base de données.
-	</notification>
-	<notification name="ScriptNoPermissions">
-		Permissions insuffisantes pour voir le script.
-	</notification>
-	<notification name="UnableToLoadScript">
-		Impossible de charger le script. Merci de réessayer.
-	</notification>
-	<notification name="IncompleteInventory">
-		Tous les éléments que vous souhaitez transférer ne sont pas encore disponibles sur le serveur.
-Merci d&apos;essayer à nouveau dans une minute.
-	</notification>
-	<notification name="CannotModifyProtectedCategories">
-		Vous ne pouvez pas modifier de catégories protégées.
-	</notification>
-	<notification name="CannotRemoveProtectedCategories">
-		Vous ne pouvez pas supprimer de catégories protégées.
-	</notification>
-	<notification name="OfferedCard">
-		Vous avez offert votre carte de visite à [NAME]
-	</notification>
-	<notification name="UnableToBuyWhileDownloading">
-		Achat impossible durant le chargement de l&apos;objet.
-Merci de réessayer.
-	</notification>
-	<notification name="UnableToLinkWhileDownloading">
-		Impossible de lier durant le chargement de l&apos;objet.
-Merci de réessayer.
-	</notification>
-	<notification name="CannotBuyObjectsFromDifferentOwners">
-		Impossible d&apos;acheter simultanément des objets de propriétaires différents. Veuillez sélectionner un seul objet.
-	</notification>
-	<notification name="ObjectNotForSale">
-		Cet objet ne semble pas à vendre.
-	</notification>
-	<notification name="EnteringGodMode">
-		Activation du mode divin : niveau [LEVEL]
-	</notification>
-	<notification name="LeavingGodMode">
-		Désactivation du mode divin : niveau [LEVEL]
-	</notification>
-	<notification name="CopyFailed">
-		Copie impossible, droits insuffisants.
-	</notification>
-	<notification name="InventoryAccepted">
-		[NAME] a accepté votre envoi.
-	</notification>
-	<notification name="InventoryDeclined">
-		[NAME] a refusé votre envoi.
-	</notification>
-	<notification name="ObjectMessage">
-		[NAME]: [MESSAGE]
-	</notification>
-	<notification name="CallingCardAccepted">
-		Votre carte de visite a été acceptée.
-	</notification>
-	<notification name="CallingCardDeclined">
-		Votre carte de visite a été refusée.
-	</notification>
-	<notification name="TeleportToLandmark">
-		A présent que vous êtes sur le continent, vous pouvez voyager par téléportation (vers [NAME] par exemple). Cliquez sur le bouton Inventaire en bas à droite de l&apos;écran puis sélectionnez le dossier Repères (Landmarks).
-Choisissez un repère, double-cliquez dessus et cliquez sur Téléporter.
-	</notification>
-	<notification name="TeleportToPerson">
-		A présent que vous êtes sur le continent, vous pouvez contacter des résidents (tel [NAME] par exemple). Cliquez sur le bouton Inventaire en bas à droite de l&apos;écran puis sélectionnez le dossier Cartes de visite (Calling Cards).
-Choisissez en une, double-cliquez dessus et cliquez sur Message Instantané.
-	</notification>
-	<notification name="CantSelectLandFromMultipleRegions">
-		Vous ne pouvez pas sélectionner de terrain en dehors des limites du serveur.
-Veuillez sélectionner un terrain plus petit.
-	</notification>
-	<notification name="SearchWordBanned">
-		Certains termes de votre recherche ont été exclus car ils ne correspondaient pas aux standards fixés dans les Règles communautaires.
-	</notification>
-	<notification name="NoContentToSearch">
-		Veuillez sélectionner au moins un type de contenu à rechercher (PG, Mature ou Adulte)
-	</notification>
-	<notification name="GroupVote">
-		[NAME] a proposé un vote pour :
-[MESSAGE]
-		<form name="form">
-			<button name="VoteNow" text="Voter"/>
-			<button name="Later" text="Plus tard"/>
-		</form>
-	</notification>
-	<notification name="SystemMessage">
-		[MESSAGE]
-	</notification>
-	<notification name="EventNotification">
-		Avis d&apos;événement :
-
-[NAME]
-[DATE]
-		<form name="form">
-			<button name="Teleport" text="Téléporter"/>
-			<button name="Description" text="Description"/>
-			<button name="Cancel" text="Annuler"/>
-		</form>
-	</notification>
-	<notification name="TransferObjectsHighlighted">
-		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.
-		<form name="form">
-			<button name="Done" text="Transfert effectué"/>
-		</form>
-	</notification>
-	<notification name="DeactivatedGesturesTrigger">
-		Gestes désactivés ayant le même mot-clé :
-[NAMES]
-	</notification>
-	<notification name="NoQuickTime">
-		Le logiciel Apple QuickTime ne semble pas installé sur votre système.
-Pour voir les vidéos sur les terrains qui le permettent, allez sur le site de QuickTime (http://www.apple.com/fr/quicktime/download) et installez le lecteur QuickTime.
-	</notification>
-	<notification name="OwnedObjectsReturned">
-		Les objets que vous possédez sur la parcelle de terrain sélectionnée ont été renvoyés dans votre inventaire.
-	</notification>
-	<notification name="OtherObjectsReturned">
-		Les objets que vous possédez sur la parcelle de terrain appartenant à [NAME] ont été renvoyés dans votre inventaire.
-	</notification>
-	<notification name="OtherObjectsReturned2">
-		Les objets sur la parcelle appartenant à « [NAME] » ont étés renvoyés à leur propriétaire.
-	</notification>
-	<notification name="GroupObjectsReturned">
-		Les objets sélectionnés sur la parcelle de terrain partagée avec le groupe [GROUPNAME] ont été renvoyés dans l&apos;inventaire de leur propriétaire.
-Les objets donnés transférables ont étés renvoyés à leur propriétaire.
-Les objets non transférables donnés au groupe ont étés supprimés.
-	</notification>
-	<notification name="UnOwnedObjectsReturned">
-		Les objets sélectionnés sur la parcelle et qui ne sont pas à vous ont été rendus à leurs propriétaires.
-	</notification>
-	<notification name="NotSafe">
-		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.
-	</notification>
-	<notification name="NoFly">
-		Le vol est interdit sur ce terrain (« pas de vol »).
-Vous ne pouvez pas voler ici.
-	</notification>
-	<notification name="PushRestricted">
-		Les bousculades sont interdites sur ce terrain.
-Vous ne pouvez pas pousser les autres à moins que vous soyez propriétaire de ce terrain.
-	</notification>
-	<notification name="NoVoice">
-		La voix est désactivée sur ce terrain.
-	</notification>
-	<notification name="NoBuild">
-		Le mode construction sur ce terrain est désactivé (« pas de construction »).
-Vous ne pouvez pas créer d&apos;objets ici.
-	</notification>
-	<notification name="ScriptsStopped">
-		Un administrateur a temporairement stoppé les scripts dans cette région.
-	</notification>
-	<notification name="ScriptsNotRunning">
-		Aucun script ne fonctionne dans cette région.
-	</notification>
-	<notification name="NoOutsideScripts">
-		Les scripts externes sont désactivés sur ce terrain (« pas de scripts externes »).
-Aucun script n&apos;est exécuté à part ceux du propriétaire du terrain.
-	</notification>
-	<notification name="ClaimPublicLand">
-		Vous ne pouvez réclamer qu&apos;un terrain public dans la région où vous vous trouvez actuellement.
-	</notification>
-	<notification name="RegionTPAccessBlocked">
-		Votre catégorie d&apos;accès ne vous autorise pas à pénétrer dans cette région. Vous devez sans doute procéder à la vérification de votre âge ou installer une version plus récente du client.
-
-Pour savoir comment accéder aux zones ayant un tel niveau d&apos;accès, veuillez consulter les pages d&apos;aide.
-	</notification>
-	<notification name="URBannedFromRegion">
-		Vous avez été banni de cette région.
-	</notification>
-	<notification name="NoTeenGridAccess">
-		Votre compte ne peut pas se connecter à cette région du Teen grid.
-	</notification>
-	<notification name="NoHelpIslandTP">
-		Vous ne pouvez pas retourner sur Help Island.
-Pour répéter le didacticiel, veuillez aller sur Help Island Public.
-	</notification>
-	<notification name="ImproperPaymentStatus">
-		Vous n&apos;avez pas le statut de paiement approprié pour pénétrer dans cette région.
-	</notification>
-	<notification name="MustGetAgeRegion">
-		Pour pouvoir pénétrer dans cette région, vous devez avoir procédé à la vérification de votre âge.
-	</notification>
-	<notification name="MustGetAgeParcel">
-		Pour pouvoir pénétrer sur cette parcelle, vous devez avoir procédé à la vérification de votre âge.
-	</notification>
-	<notification name="NoDestRegion">
-		Région de destination introuvable.
-	</notification>
-	<notification name="NotAllowedInDest">
-		Vous n&apos;êtes pas autorisé dans cette région.
-	</notification>
-	<notification name="RegionParcelBan">
-		Impossible de traverser une parcelle bannie. Veuillez trouver une autre solution.
-	</notification>
-	<notification name="TelehubRedirect">
-		Vous avez été redirigé vers un téléhub.
-	</notification>
-	<notification name="CouldntTPCloser">
-		Il n&apos;a pas été possible de vous téléporter vers une destination plus proche.
-	</notification>
-	<notification name="TPCancelled">
-		Téléportation annulée.
-	</notification>
-	<notification name="FullRegionTryAgain">
-		La région dans laquelle vous essayez de pénétrer est pleine actuellement.
-Veuillez réessayer dans quelques minutes.
-	</notification>
-	<notification name="GeneralFailure">
-		Panne générale.
-	</notification>
-	<notification name="RoutedWrongRegion">
-		Dirigé vers la mauvaise région. Merci de réessayer.
-	</notification>
-	<notification name="NoValidAgentID">
-		ID agent non valide.
-	</notification>
-	<notification name="NoValidSession">
-		ID de session non valide.
-	</notification>
-	<notification name="NoValidCircuit">
-		Aucun code de circuit valide.
-	</notification>
-	<notification name="NoValidTimestamp">
-		Timestamp non valide.
-	</notification>
-	<notification name="NoPendingConnection">
-		Impossible de créer la connexion en attente.
-	</notification>
-	<notification name="InternalUsherError">
-		Erreur interne lors de la tentative de connexion.
-	</notification>
-	<notification name="NoGoodTPDestination">
-		Impossible de trouver un lieu de téléportation valide dans cette région.
-	</notification>
-	<notification name="InternalErrorRegionResolver">
-		Une erreur interne est survenue lors de la résolution des coodonnées de la région.
-	</notification>
-	<notification name="NoValidLanding">
-		Impossible de trouver un point d&apos;atterrissage valide.
-	</notification>
-	<notification name="NoValidParcel">
-		Aucune parcelle valide n&apos;a été trouvée.
-	</notification>
-	<notification name="ObjectGiveItem">
-		Un objet appelé [OBJECTFROMNAME] appartenant à [NAME] vous a donné : [OBJECTTYPE] appelé(e) [OBJECTNAME].
-		<form name="form">
-			<button name="Keep" text="Garder"/>
-			<button name="Discard" text="Jeter"/>
-			<button name="Mute" text="mute ignore"/>
-		</form>
-	</notification>
-	<notification name="ObjectGiveItemUnknownUser">
-		L&apos;objet [OBJECTFROMNAME] appartenant à un utilisateur inconnu vous a donné un(e) [OBJECTTYPE] nommé(e) [OBJECTNAME].
-		<form name="form">
-			<button name="Keep" text="Garder"/>
-			<button name="Discard" text="Jeter"/>
-			<button name="Mute" text="mute ignore"/>
-		</form>
-	</notification>
-	<notification name="UserGiveItem">
-		[NAME] vous a donné un(e) [OBJECTTYPE] nommé(e) [OBJECTNAME].
-		<form name="form">
-			<button name="Keep" text="Garder"/>
-			<button name="Discard" text="Jeter"/>
-			<button name="Mute" text="mute ignore"/>
-		</form>
-	</notification>
-	<notification name="GodMessage">
-		[NAME]
-[MESSAGE]
-	</notification>
-	<notification name="JoinGroup">
-		[MESSAGE]
-		<form name="form">
-			<button name="Join" text="Rejoindre"/>
-			<button name="Decline" text="Refuser"/>
-			<button name="Info" text="Infos"/>
-		</form>
-	</notification>
-	<notification name="TeleportOffered">
-		[NAME] vous propose de le/la rejoindre par téléportation :
-
-[MESSAGE]
-		<form name="form">
-			<button name="Teleport" text="Téléporter"/>
-			<button name="Cancel" text="Annuler"/>
-		</form>
-	</notification>
-	<notification name="GotoURL">
-		[MESSAGE]
-[URL]
-		<form name="form">
-			<button name="Later" text="Plus tard"/>
-			<button name="GoNow..." text="Y aller maintenant..."/>
-		</form>
-	</notification>
-	<notification name="OfferFriendship">
-		[NAME] vous demande de devenir son ami(e).
-
-[MESSAGE]
-
-(Par défaut, vous pourrez voir lorsque vous êtes tous deux connectés.)
-		<form name="form">
-			<button name="Accept" text="Accepter"/>
-			<button name="Decline" text="Refuser"/>
-		</form>
-	</notification>
-	<notification name="OfferFriendshipNoMessage">
-		[NAME] vous demande de devenir son ami.
-
-(Par défaut, vous pourrez voir quand vous êtes tous deux connectés)
-		<form name="form">
-			<button name="Accept" text="Accepter"/>
-			<button name="Decline" text="Refuser"/>
-		</form>
-	</notification>
-	<notification name="FriendshipAccepted">
-		[NAME] a accepté votre amitié.
-	</notification>
-	<notification name="FriendshipDeclined">
-		[NAME] a refusé votre amitié.
-	</notification>
-	<notification name="OfferCallingCard">
-		[NAME] vous offre sa carte de visite.
-Cela ajoute un marque-page dans votre inventaire, ce qui vous permet d&apos;envoyer rapidement un IM à ce résident.
-		<form name="form">
-			<button name="Accept" text="Accepter"/>
-			<button name="Decline" text="Refuser"/>
-		</form>
-	</notification>
-	<notification name="RegionRestartMinutes">
-		La région va redémarrer dans [MINUTES] minutes.
-Si vous restez dans cette région, vous serez déconnecté(e).
-	</notification>
-	<notification name="RegionRestartSeconds">
-		La région va redémarrer dans [SECONDS] secondes.
-Si vous restez dans cette région, vous serez déconnecté(e).
-	</notification>
-	<notification name="LoadWebPage">
-		Charger cette page web [URL] ?
-
-[MESSAGE]
-
-Venant de l&apos;objet : [OBJECTNAME], appartenant à : [NAME]?
-		<form name="form">
-			<button name="Gotopage" text="Charger"/>
-			<button name="Cancel" text="Annuler"/>
-		</form>
-	</notification>
-	<notification name="FailedToFindWearableUnnamed">
-		La recherche du [TYPE] dans la base de données a échoué.
-	</notification>
-	<notification name="FailedToFindWearable">
-		La recherche du [TYPE] nommé(e) [DESC] dans la base de données a échoué.
-	</notification>
-	<notification name="InvalidWearable">
-		L&apos;objet que vous essayez de porter utilise une fonctionnalité que le client ne peut lire.  Pour porter cet objet, veuillez télécharger une mise à jour du client.
-	</notification>
-	<notification name="ScriptQuestion">
-		&apos;[OBJECTNAME]&apos;, un objet appartenant à &apos;[NAME]&apos;, aimerait :
-
-[QUESTIONS]
-Acceptez-vous ?
-		<form name="form">
-			<button name="Yes" text="Oui"/>
-			<button name="No" text="Non"/>
-			<button name="Mute" text="mute ignore"/>
-		</form>
-	</notification>
-	<notification name="ScriptQuestionCaution">
-		[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.
-
-Accepter cette requête ?
-		<form name="form">
-			<button name="Grant" text="Accepter"/>
-			<button name="Deny" text="Refuser"/>
-			<button name="Details" text="Détails..."/>
-		</form>
-	</notification>
-	<notification name="ScriptDialog">
-		&apos;[TITLE]&apos; de [NAME]
-[MESSAGE]
-		<form name="form">
-			<button name="Ignore" text="Ignorer"/>
-		</form>
-	</notification>
-	<notification name="ScriptDialogGroup">
-		&apos;[TITLE]&apos; de [GROUPNAME]
-[MESSAGE]
-		<form name="form">
-			<button name="Ignore" text="Ignorer"/>
-		</form>
-	</notification>
-	<notification name="FirstBalanceIncrease">
-		Vous venez de recevoir [AMOUNT] L$.
-Des objets et des utilisateurs peuvent vous donner des L$.
-Votre solde est affiché dans le coin supérieur droit de votre écran.
-	</notification>
-	<notification name="FirstBalanceDecrease">
-		Vous venez de payer [AMOUNT] L$.
-Votre solde est affiché dans le coin supérieur droit de votre écran.
-	</notification>
-	<notification name="FirstSit">
-		Vous êtes assis(e).
-Utilisez les touches de direction (ou AWSD) pour changer la vue.
-Pour vous lever, cliquez sur le bouton Me lever.
-	</notification>
-	<notification name="FirstMap">
-		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.
-	</notification>
-	<notification name="FirstBuild">
-		Vous pouvez construire des objets dans certaines zones de [SECOND_LIFE].
-Utilisez les outils en haut à gauche pour construire et gardez la touche Ctrl ou Alt enfoncée pour passer rapidement d&apos;un outil à l&apos;autre.
-Appuyez sur la touche Esc pour arrêter de construire.
-	</notification>
-	<notification name="FirstLeftClickNoHit">
-		Un clic gauche permet d&apos;interagir avec certains objets.
-Si le pointeur de la souris se transforme en main, vous pouvez interagir avec l&apos;objet.
-Un clic droit fait toujours apparaître un menu des choses que vous pouvez faire.
-	</notification>
-	<notification name="FirstTeleport">
-		Cette région n&apos;autorise pas la téléportation de point à point. Vous avez donc été transporté au téléhub le plus proche.
-Votre destination est marquée par une grande balise.
-Suivez la flèche rouge vers la balise ou cliquez sur la flèche pour faire disparaître la balise.
-	</notification>
-	<notification name="FirstOverrideKeys">
-		Vos mouvements sont maintenant pris en charge par un objet.
-Essayez les flèches de votre clavier ou AWSD pour voir à quoi elles servent.
-Certains objets (comme les armes) nécessitent l&apos;activation du mode Vue subjective pour être utilisés.
-Pour cela, appuyez sur la touche M.
-	</notification>
-	<notification name="FirstAppearance">
-		Vous êtes en train d&apos;éditer votre apparence.
-Pour tourner et zoomer, utilisez les flèches de direction.
-Lorsque vous avez terminé, appuyez sur Enregistrer tout pour sauvegarder votre apparence et sortir.
-Vous pouvez modifier votre apparence aussi souvent que vous le souhaitez.
-	</notification>
-	<notification name="FirstInventory">
-		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 note, double-cliquez dessus.
-	</notification>
-	<notification name="FirstSandbox">
-		Cette région est un bac à sable.
-Les objets que vous construisez ici peuvent être supprimés quand vous partez. Les bacs à sable sont nettoyés régulièrement, veuillez lire les informations en haut de l&apos;écran à côté du nom de la région.
-
-Les régions bacs à sable sont rares et sont signalées par des panneaux.
-	</notification>
-	<notification name="FirstFlexible">
-		Cet objet est flexible.
-Les objets flexibles ne peuvent pas avoir de propriétés physiques et doivent rester fantômes jusqu&apos;à ce que la case Fantôme soit décochée.
-	</notification>
-	<notification name="FirstDebugMenus">
-		Vous avez activé le menu Avancé.
-Ce menu contient des fonctionnalités utiles pour les développeurs qui travaillent sur Second Life.
-Pour activer/désactiver ce menu sous Windows, appuyez sur Ctrl-Alt-D. Sur un Mac, appuyez sur Cmd-Opt-Maj-D
-	</notification>
-	<notification name="FirstSculptedPrim">
-		Vous êtes en train d&apos;éditer un sculptie.
-Pour modifier la forme d&apos;un sculptie, vous devez utiliser une texture spécifique.
-Vous trouverez des textures dans la bibliothèque de votre inventaire.
-	</notification>
-	<notification name="FirstMedia">
-		Vous avez lancé la lecture d&apos;un média. Dans le menu Préférences, à l&apos;onglet Audio et vidéo, vous pouvez choisir de lire automatiquement les médias. Notez que cela peut être risqué lorsque les médias viennent de sites que vous ne connaissez pas.
-	</notification>
-	<notification name="MaxListSelectMessage">
-		Vous ne pouvez sélectionner que [MAX_SELECT] objets maximum dans cette liste.
-	</notification>
-	<notification name="VoiceInviteP2P">
-		[NAME] vous invite à un chat vocal.
-Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignorer cette personne, cliquez sur Ignorer.
-		<form name="form">
-			<button name="Accept" text="Accepter"/>
-			<button name="Decline" text="Refuser"/>
-			<button name="Mute" text="mute ignore"/>
-		</form>
-	</notification>
-	<notification name="AutoUnmuteByIM">
-		[NAME] a reçu un message instantané et n&apos;est donc plus ignoré.
-	</notification>
-	<notification name="AutoUnmuteByMoney">
-		[NAME] a reçu de l&apos;argent et n&apos;est donc plus ignoré.
-	</notification>
-	<notification name="AutoUnmuteByInventory">
-		[NAME] a reçu un inventaire et n&apos;est donc plus ignoré.
-	</notification>
-	<notification name="VoiceInviteGroup">
-		[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.
-		<form name="form">
-			<button name="Accept" text="Accepter"/>
-			<button name="Decline" text="Refuser"/>
-			<button name="Mute" text="mute ignore"/>
-		</form>
-	</notification>
-	<notification name="VoiceInviteAdHoc">
-		[NAME] a rejoint un chat vocal avec conférence.
-Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignorer cet utilisateur, cliquez sur Ignorer.
-		<form name="form">
-			<button name="Accept" text="Accepter"/>
-			<button name="Decline" text="Refuser"/>
-			<button name="Mute" text="mute ignore"/>
-		</form>
-	</notification>
-	<notification name="InviteAdHoc">
-		[NAME] vous invite à un chat conférence.
-Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignorer cet utilisateur, cliquez sur Ignorer.
-		<form name="form">
-			<button name="Accept" text="Accepter"/>
-			<button name="Decline" text="Refuser"/>
-			<button name="Mute" text="mute ignore"/>
-		</form>
-	</notification>
-	<notification name="VoiceChannelFull">
-		L&apos;appel auquel vous essayez de participer, [VOICE_CHANNEL_NAME], a atteint le nombre maximum de participants. Veuillez réessayer ultérieurement.
-	</notification>
-	<notification name="ProximalVoiceChannelFull">
-		Nous sommes désolés. Le nombre maximum de conversations vocales a été atteint dans cette zone. Veuillez trouver un autre endroit pour discuter.
-	</notification>
-	<notification name="VoiceChannelDisconnected">
-		Vous avez été déconnecté(e) de [VOICE_CHANNEL_NAME]. Vous allez maintenant être reconnecté au chat vocal spatial.
-	</notification>
-	<notification name="VoiceChannelDisconnectedP2P">
-		[VOICE_CHANNEL_NAME] a mis fin à l&apos;appel. Vous allez maintenant être reconnecté au chat vocal spatial.
-	</notification>
-	<notification name="P2PCallDeclined">
-		[VOICE_CHANNEL_NAME] a refusé votre appel. Vous allez maintenant être reconnecté au chat vocal spatial.
-	</notification>
-	<notification name="P2PCallNoAnswer">
-		[VOICE_CHANNEL_NAME] ne peut pas prendre votre appel. Vous allez maintenant être reconnecté au chat vocal spatial.
-	</notification>
-	<notification name="VoiceChannelJoinFailed">
-		Echec de la connexion avec [VOICE_CHANNEL_NAME], veuillez réessayer ultérieurement. Vous allez maintenant être reconnecté au chat vocal spatial.
-	</notification>
-	<notification name="VoiceLoginRetry">
-		Nous sommes en train de créer un canal vocal pour vous. Veuillez patienter quelques instants.
-	</notification>
-	<notification name="Cannot enter parcel: not a group member">
-		Vous ne pouvez pas pénétrer sur ce terrain car vous n&apos;êtes pas membre du groupe adéquat.
-	</notification>
-	<notification name="Cannot enter parcel: banned">
-		Vous ne pouvez pas pénétrer sur ce terrain car l&apos;accès vous y est interdit.
-	</notification>
-	<notification name="Cannot enter parcel: not on access list">
-		Vous ne pouvez pas pénétrer sur ce terrain car vous n&apos;avez pas les droits d&apos;accès requis.
-	</notification>
-	<notification name="VoiceNotAllowed">
-		Vous n&apos;êtes pas autorisé à vous connecter au chat vocal pour [VOICE_CHANNEL_NAME].
-	</notification>
-	<notification name="VoiceCallGenericError">
-		Une erreur est survenue pendant la connexion au chat vocal pour [VOICE_CHANNEL_NAME]. Veuillez réessayer ultérieurement.
-	</notification>
-	<notification name="ServerVersionChanged">
-		La région dans laquelle vous avez pénétré utilise une version de simulateur différente. C'est ballot, mais c'est la vie !
-	</notification>
-	<notification name="UnableToOpenCommandURL">
-		L&apos;URL sur laquelle vous avez cliqué ne peut pas être ouverte dans ce navigateur.
-	</notification>
-	<global name="UnsupportedCPU">
-		- Votre processeur ne remplit pas les conditions minimum requises.
-	</global>
-	<global name="UnsupportedGLRequirements">
-		Vous semblez ne pas avoir le matériel requis pour utiliser Second Life. Second Life requiert une carte graphique OpenGL avec une prise en charge du multitexturing. Si vous avez une telle carte, assurez-vous que vous avez aussi les drivers les plus récents pour la carte, ainsi que les service packs et les patchs pour votre système d&apos;exploitation.
-
-Si vous avez toujours des problèmes, veuillez consulter la page suivante : http://www.secondlife.com/support
-	</global>
-	<global name="UnsupportedCPUAmount">
-		796
-	</global>
-	<global name="UnsupportedRAMAmount">
-		510
-	</global>
-	<global name="UnsupportedGPU">
-		- Votre carte graphique ne remplit pas les conditions minimum requises.
-	</global>
-	<global name="UnsupportedRAM">
-		- Votre mémoire système ne remplit pas les conditions minimum requises.
-	</global>
-	<global name="PermYes">
-		Oui
-	</global>
-	<global name="PermNo">
-		Non
-	</global>
-</notifications>
+<?xml version="1.0" encoding="utf-8"?>
+<notifications>
+	<global name="skipnexttime">
+		Ne plus afficher
+	</global>
+	<global name="alwayschoose">
+		Toujours choisir cette option
+	</global>
+  <template name="okbutton">
+    <form>
+      <button
+       name="OK"
+       text="$yestext"/>
+    </form>
+  </template>
+
+  <template name="okignore">
+    <form>
+      <button
+       name="OK"
+       text="$yestext"/>
+      <ignore text="$ignoretext"/>
+    </form>
+  </template>
+
+  <template name="okcancelbuttons">
+    <form>
+      <button
+       name="OK"
+       text="$yestext"/>
+      <button
+       name="Cancel"
+       text="$notext"/>
+    </form>
+  </template>
+
+  <template name="okcancelignore">
+    <form>
+      <button
+       name="OK"
+       text="$yestext"/>
+      <button
+       name="Cancel"
+       text="$notext"/>
+      <ignore text="$ignoretext"/>
+    </form>
+  </template>
+
+  <template name="okhelpbuttons">
+    <form>
+      <button
+       name="OK"
+       text="$yestext"/>
+      <button
+       name="Help"
+       text="$helptext"/>
+    </form>
+  </template>
+
+  <template name="yesnocancelbuttons">
+    <form>
+      <button
+       name="Yes"
+       text="$yestext"/>
+      <button
+       name="No"
+       text="$notext"/>
+      <button
+       name="Cancel"
+       text="$canceltext"/>
+    </form>
+  </template>
+
+  <notification
+   icon="alert.tga"
+   name="MediaAlert"
+   type="alert">
+Le propriétaire de cette parcelle vous propose 'jouer' l'URL suivante en mode [TYPE] :
+
+[URL]
+
+Vous pouvez choisir de permettre ou refuser:
+
+[DOMAIN]
+
+"Permettre" et "Refuser" s'appliquent pour la session, "Blacklist" "Whitelist" sont définitifs.
+   <form name="form">
+    <button
+	 index="0"
+	 name="Allow"
+	 text="Permettre"/>
+	<button
+	 index="1"
+	 name="Deny"
+	 text="Refuser"/>
+	<button
+	 index="2"
+	 name="Blacklist"
+	 text="Blacklist"/>
+	<button
+	 index="3"
+	 name="Whitelist"
+	 text="Whitelist"/>
+   </form>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="MediaListed"
+   type="alert">
+Media/audio URLs pour [DOMAIN] now [LISTED]
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="MediaBlocked"
+   type="notifytip">
+Media/audio sont bloqués pour [DOMAIN]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MediaFiltersCleared"
+   type="alertmodal">
+Filtres medias ont été reinitialisés
+  </notification>
+	<notification functor="GenericAcknowledge" label="Message d'alerte inconnu" name="MissingAlert">
+		Votre version de Second Life ne peut afficher ce message d'erreur.
+
+Détails de l'erreur: L'alerte, appelée '[_NAME]' est introuvable dans notifications.xml.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="FloaterNotFound">
+		Erreur floater: impossible de trouver les contrôles suivants :
+
+[CONTROLS]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TutorialNotFound">
+		Aucun didacticiel n'est disponible actuellement.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="GenericAlert">
+		[MESSAGE]
+	</notification>
+	<notification name="GenericAlertYesCancel">
+		[MESSAGE]
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Oui"/>
+	</notification>
+	<notification name="BadInstallation">
+		Une erreur est survenue lors de la mise à jour de Singularity. Veuillez télécharger la dernière version depuis singularityviewer.org
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="LoginFailedNoNetwork">
+		Erreur réseau : impossible d'établir une connexion. 
+'[DIAGNOSTIC]'
+Veuillez vérifier votre connexion.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MessageTemplateNotFound">
+		Le modèle de message [PATH] est introuvable.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="WearableSave">
+		Enregistrer les changements dans la partie du corps/les habits actuels?
+		<usetemplate canceltext="Cancel" name="yesnocancelbuttons" notext="Ne pas enregistrer" yestext="Enregistrer"/>
+	</notification>
+	<notification name="CompileQueueSaveText">
+		Une erreur est survenue lors du chargement du texte pour un script, suite au problème suivant: [REASON]. Veuillez réessayer ultérieurement.
+	</notification>
+	<notification name="CompileQueueSaveBytecode">
+		Une erreur est survenue lors du chargement du script compilé, suite au problème suivant: [REASON]. Veuillez réessayer ultérieurement.
+	</notification>
+	<notification name="WriteAnimationFail">
+		Une erreur est survenue lors de l'écriture des données d'animation. Veuillez réessayer ultérieurement.
+	</notification>
+	<notification name="UploadAuctionSnapshotFail">
+		Un problème est survenu lors du chargement du script compilé, suite au problème suivant: [REASON]
+	</notification>
+	<notification name="UnableToViewContentsMoreThanOne">
+		Impossible d&apos;afficher les contenus de plus d'un objet à la fois.
+Veuillez ne sélectionner qu&apos;un seul objet.
+	</notification>
+	<notification name="SaveClothingBodyChanges">
+		Enregistrer tous les changements dans les habits/parties du corps ?
+		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Ne pas enregistrer" yestext="Tout enregistrer"/>
+	</notification>
+	<notification name="GrantModifyRights">
+		Lorsque vous accordez des droits d'édition à un autre résident, vous lui permettez de changer, supprimer ou prendre n'importe lequel de vos objets dans le Monde. Réfléchissez bien avant d'accorder ces droits.
+Souhaitez-vous accorder des droits d'édition à [NAME]?
+		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="GrantModifyRightsMultiple">
+		Lorsque vous accordez des droits d'édition à un autre résident, vous lui permettez de changer n'importe lequel de vos objets dans le Monde. Réfléchissez bien avant d'accorder ces droits.
+Souhaitez-vous accorder des droits d'édition aux résidents selectionnés ?
+		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="RevokeModifyRights">
+		Souhaitez-vous retirer les droits d'édition à [NAME]?
+		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="RevokeModifyRightsMultiple">
+		Souhaitez-vous retirer les droits d'édition aux résidents selectionnés?
+		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="UnableToCreateGroup">
+		Impossible de créer le groupe.
+[MESSAGE]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PanelGroupApply">
+		[NEEDS_APPLY_MESSAGE]
+[WANT_APPLY_MESSAGE]
+		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Ignorer les modifications" yestext="Enregistrer les modifications"/>
+	</notification>
+	<notification name="MustSpecifyGroupNoticeSubject">
+		Pour envoyer une notice au groupe, vous devez indiquer un sujet.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="AddGroupOwnerWarning">
+		Vous êtes sur le point d'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.
+Etes-vous certain(e) de vouloir continuer ?
+		<usetemplate ignoretext="Lorsque vous donnez à des membres du groupe le rôle de « propriétaire »" name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="AssignDangerousActionWarning">
+		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'un propriétaire. Assurez-vous de bien comprendre ce que vous faites avant d&apos;attribuer ce pouvoir.
+
+Ajouter ce pouvoir à « [ROLE_NAME] » ?
+		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="AssignDangerousAbilityWarning">
+		Vous êtes sur le point d'ajouter le pouvoir « [ACTION_NAME] » au rôle « [ROLE_NAME] ».
+
+ *Avertissement*
+ Tout membre de ce rôle avec ce pouvoir peut s&apos;attribuer à lui-même, ainsi qu'à tout autre membre, tous les pouvoirs, et accéder potentiellement à des pouvoirs proches de ceux d'un propriétaire.
+
+Ajouter ce pouvoir à « [ROLE_NAME] » ?
+		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="ClickPublishHelpLand">
+		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.
+	</notification>
+	<notification name="ClickSoundHelpLand">
+		La musique et le média ne peuvent être utilisés que sur cette parcelle. Les options Son et Voix peuvent être limités à la parcelle ou seront entendus par les résidents en dehors de la parcelle, en fonction de leur catégorie d'accès. Souhaitez-vous en savoir plus sur le paramétrage de ces options?
+		<url name="url">
+			http://wiki.secondlife.com/wiki/M%C3%A9dias_sur_la_parcelle_(KB)
+		</url>
+		<usetemplate name="okcancelbuttons" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
+	</notification>
+	<notification name="ClickSearchHelpAll">
+		Les résultats de recherche sont organisés en fonction de l&apos;onglet dans lequel vous vous trouvez, votre catégorie d&apos;accès, la catégorie choisie, ainsi que d&apos;autres facteurs. Pour plus de détails, veuillez consulter les pages d'aide.
+		<url name="url">
+			http://wiki.secondlife.com/wiki/FAQ_sur_la_recherche_(KB)
+		</url>
+		<usetemplate name="okcancelbuttons" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
+	</notification>
+	<notification name="ClickPublishHelpLandDisabled">
+		Cette parcelle ne peut pas apparaître dans la recherche car elle est dans une région où cela n&apos;est pas autorisé.
+	</notification>
+	<notification name="ClickPublishHelpAvatar">
+		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.
+	</notification>
+	<notification name="ClickPartnerHelpAvatar">
+		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?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Aller sur cette page"/>
+	</notification>
+	<notification name="ClickUploadHelpPermissions">
+		Il est possible que vos droits par défaut ne fonctionnent pas dans les anciennes régions.
+	</notification>
+	<notification name="ClickWebProfileHelpAvatar">
+		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'URL que vous avez définie en regardant votre profil.
+	</notification>
+	<notification name="JoinGroupCanAfford">
+		Rejoindre ce groupe coûte [COST] L$.
+Voulez-vous continuer ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Rejoindre"/>
+	</notification>
+	<notification name="JoinGroupCannotAfford">
+		Rejoindre ce groupe coûte [COST] L$.
+Vous n&apos;avez pas suffisamment de L$ pour rejoindre ce groupe.
+	</notification>
+	<notification name="LandBuyPass">
+		Pour [COST] L$ vous pouvez pénétrer sur ce terrain ([PARCEL_NAME]) et y rester [TIME] heures. Acheter un pass ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="SalePriceRestriction">
+		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.
+	</notification>
+	<notification name="ConfirmLandSaleChange">
+		Le terrain sélectionné, de [LAND_SIZE] m², est mis en vente.
+Votre prix de vente sera de [SALE_PRICE] [CURRENCY] et la vente sera disponible à [NAME].
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmLandSaleToAnyoneChange">
+		Attention : en cliquant sur Vendre à n'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] [CURRENCY] et la vente sera disponible à [NAME].
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ReturnObjectsDeededToGroup">
+		Etes-vous certain(e) de vouloir renvoyer tous les objets partagés par le groupe [NAME] sur cette parcelle dans l'inventaire du propriétaire précédent?
+
+*Avertissement* Tous les objets non transférables cédés au groupe seront supprimés!
+
+Objets: [N]
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ReturnObjectsOwnedByUser">
+		Etes-vous certain(e) de vouloir renvoyer tous les objets que [NAME] possède sur cette parcelle dans son inventaire?
+
+Objets: [N]
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ReturnObjectsOwnedBySelf">
+		Etes-vous certain(e) de vouloir renvoyer tous les objets que vous possédez sur cette parcelle dans votre inventaire?
+
+Objets: [N]
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ReturnObjectsNotOwnedBySelf">
+		Etes-vous certain(e) de vouloir renvoyer tous les objets que vous ne possédez pas sur cette parcelle dans l'inventaire de leurs propriétaires ?
+Les objets transférables cédés à un groupe seront renvoyés aux propriétaires précédents.
+
+*Avertissement* Tous les objets non transférables cédés au groupe seront supprimés!
+
+Objets: [N]
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ReturnObjectsNotOwnedByUser">
+		Etes-vous certain(e) de vouloir renvoyer tous les objets que [NAME] ne possède pas sur cette parcelle dans l'inventaire de leurs propriétaires ?
+Les objets transférables cédés à un groupe seront renvoyés aux propriétaires précédents.
+
+*Avertissement* Tous les objets non transférables cédés au groupe seront supprimés!
+
+Objets: [N]
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ReturnAllTopObjects">
+		Etes-vous certain(e) de vouloir renvoyer tous les objets de la liste dans l'inventaire de leurs propriétaires?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="DisableAllTopObjects">
+		Etes-vous certain(e) de vouloir désactiver tous les objets dans cette région?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ReturnObjectsNotOwnedByGroup">
+		Renvoyer les objets de cette parcelle qui ne sont pas partagés avec le groupe [NAME] à leurs propriétaires?
+
+Objets: [N]
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="UnableToDisableOutsideScripts">
+		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.
+	</notification>
+	<notification name="MustBeInParcel">
+		Pour définir le point d&apos;atterrissage, vous devez vous trouver à l'intérieur de la parcelle.
+	</notification>
+	<notification name="PromptRecipientEmail">
+		Veuillez saisir une adresse e-mail valide pour le(s) destinataire(s).
+	</notification>
+	<notification name="PromptSelfEmail">
+		Veuillez saisir votre adresse e-mail.
+	</notification>
+	<notification name="PromptMissingSubjMsg">
+		Envoyer la photo avec le sujet ou le message par défaut.
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ErrorProcessingSnapshot">
+		Erreur dans le traitement des données de la photo
+	</notification>
+	<notification name="ErrorEncodingSnapshot">
+		Erreur d&apos;encodage de la photo.
+	</notification>
+	<notification name="ErrorUploadingPostcard">
+		Une erreur est survenue lors du chargement du script compilé, suite au problème suivant: [REASON]
+	</notification>
+	<notification name="ErrorUploadingReportScreenshot">
+		Une erreur est survenue lors du chargement de la capture d'écran destinée au rapport, suite au problème suivant: [REASON]
+	</notification>
+	<notification name="MustAgreeToLogIn">
+		Pour vous connecter à [SECOND_LIFE], vous devez accepter les Conditions d'utilisation.
+	</notification>
+	<notification name="CouldNotPutOnOutfit">
+		Impossible de mettre cet ensemble.
+Ce dossier ne contient pas d&apos;habits, de parties du corps ni de pièces jointes.
+	</notification>
+	<notification name="CannotWearTrash">
+		Vous ne pouvez pas porter d&apos;habits ni de parties du corps se trouvant dans la corbeille.
+	</notification>
+	<notification name="CannotWearInfoNotComplete">
+		Vous ne pouvez pas porter cet article car il n&apos;a pas encore été chargé. Veuillez réessayer dans une minute.
+	</notification>
+	<notification name="MustHaveAccountToLogIn">
+		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 ?
+		<usetemplate name="okcancelbuttons" notext="Réessayer" yestext="Créer un compte"/>
+	</notification>
+	<notification name="AddClassified">
+		Les petites annonces sont publiées dans 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.
+		<usetemplate ignoretext="Lors de l&apos;ajout d&apos;une nouvelle petite annonce" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="DeleteClassified">
+		Supprimer l&apos;annonce [NAME] 
+Une fois payés, les frais ne sont pas remboursables.
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ClassifiedSave">
+		Enregistrer les changements dans l&apos;annonce [NAME] 
+		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Ne pas enregistrer" yestext="Enregistrer"/>
+	</notification>
+	<notification name="DeleteAvatarPick">
+		Supprimer le favori [PICK] 
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="PromptGoToEventsPage">
+		Aller à la page web de [SECOND_LIFE] réservée aux événements.
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="SelectProposalToView">
+		Sélectionner une proposition.
+	</notification>
+	<notification name="SelectHistoryItemToView">
+		Sélectionner un historique.
+	</notification>
+	<notification name="ResetShowNextTimeDialogs">
+		Voulez-vous réactiver tous les pop-ups précedemment désactivés ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="SkipShowNextTimeDialogs">
+		Voulez-vous désactiver tous les pop-ups qui peuvent être évités ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="CacheWillClear">
+		Le cache sera vidé après le redémarrage de [SECOND_LIFE].
+	</notification>
+	<notification name="CacheWillBeMoved">
+		Le cache sera déplacé après le redémarrage de [SECOND_LIFE].
+Remarque : cela videra le cache.
+	</notification>
+	<notification name="ChangeConnectionPort">
+		Les paramètres du port prendront effet après le redémarrage de [SECOND_LIFE].
+	</notification>
+	<notification name="ChangeSkin">
+		Le nouveau thème apparaîtra après le redémarrage de [SECOND_LIFE].
+	</notification>
+	<notification name="GoToAuctionPage">
+		Aller à la page web de [SECOND_LIFE] pour voir le détail des enchères ou enchérir.
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="SaveChanges">
+		Enregistrer les changements
+		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Ne pas enregistrer" yestext="Enregistrer"/>
+	</notification>
+	<notification name="GestureSaveFailedTooManySteps">
+		L&apos;enregistrement du geste a échoué.
+Il y a trop d&apos;étapes dans ce geste.
+Essayez d&apos;en supprimer quelques-unes.
+	</notification>
+	<notification name="GestureSaveFailedTryAgain">
+		L&apos;enregistrement du geste a échoué. Veuillez réessayer dans une minute.
+	</notification>
+	<notification name="GestureSaveFailedObjectNotFound">
+		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é.
+	</notification>
+	<notification name="GestureSaveFailedReason">
+		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.
+	</notification>
+	<notification name="SaveNotecardFailObjectNotFound">
+		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é.
+	</notification>
+	<notification name="SaveNotecardFailReason">
+		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.
+	</notification>
+	<notification name="ScriptCannotUndo">
+		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.)
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="SaveScriptFailReason">
+		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.
+	</notification>
+	<notification name="SaveScriptFailObjectNotFound">
+		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é.
+	</notification>
+	<notification name="SaveBytecodeFailReason">
+		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.
+	</notification>
+	<notification name="CouldNotStartStopScript">
+		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é.
+	</notification>
+	<notification name="CannotDownloadFile">
+		Impossible de télécharger le fichier
+	</notification>
+	<notification name="CannotWriteFile">
+		Impossible d&apos;écrire le fichier [[FILE]]
+	</notification>
+	<notification name="UnsupportedHardware">
+		Avertissement : vous n&apos;avez pas la configuration système requise pour utiliser Second Life. Si vous continuez à utiliser Second Life, votre performance risque d&apos;être moindre. Malheureusement, nous n&apos;offrons aucune assistance pour les problèmes de configuration système.
+
+MINSPECS
+Voulez-vous visiter [_URL] pour plus d&apos;informations ?
+		<url name="url" option="0">
+			http://secondlife.com/support/sysreqs.php?lang=fr
+		</url>
+		<usetemplate ignoretext="Lors de la détection de matériel non pris en charge" name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="UnknownGPU">
+		Votre système contient une carte graphique que nous ne connaissons pas actuellement.
+Cela est souvent le cas avec le nouveau materiel qui n&apos;a pas encore été testé.
+Vous pourrez probablement utiliser Second Life sans problème, mais vous devrez peut-être ajuster les paramètres de vos graphiques.
+(Menu Édition &gt; Préférences &gt; Graphiques).
+		<form name="form">
+			<ignore name="ignore" text="Lors de la détection d&apos;une carte graphique inconnue"/>
+		</form>
+	</notification>
+	<notification name="DisplaySettingsNoShaders">
+		[SECOND_LIFE] a planté lors de l&apos;initialisation des drivers graphiques.
+La qualité des graphiques sera paramétrée sur Faible pour éviter certaines erreurs de driver fréquentes.
+Certaines fonctionnalités graphiques seront donc désactivées.
+Nous vous recommandons de mettre à jour les drivers de votre carte graphique.
+La qualité des graphiques peut être augmentée à la section Préférences &gt; Graphiques.
+	</notification>
+	<notification name="RegionNoTerraforming">
+		Le terraformage est interdit dans la région [REGION].
+	</notification>
+	<notification name="CannotCopyWarning">
+		Vous n&apos;êtes pas autorisé(e) à copier cet objet et il disparaîtra de votre inventaire si vous le donnez. Souhaitez-vous vraiment offrir cet objet ?
+		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="CannotGiveItem">
+		Impossible de donner l&apos;objet de l&apos;inventaire.
+	</notification>
+	<notification name="TransactionCancelled">
+		Transaction annulée.
+	</notification>
+	<notification name="TooManyItems">
+		Impossible de donner plus de 42 objets au cours d&apos;un seul transfert d&apos;inventaire.
+	</notification>
+	<notification name="NoItems">
+		Vous n&apos;êtes pas autorisé(e) à transférer les objets sélectionnés.
+	</notification>
+	<notification name="CannotCopyCountItems">
+		Vous n&apos;êtes pas autorisé(e) à copier [COUNT] des objets sélectionnés. Ces objets disparaîtront de votre inventaire.
+Souhaitez-vous vraiment donner ces objets ?
+		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="CannotGiveCategory">
+		Vous n&apos;êtes pas autorisé(e) à transférer le dossier sélectionné.
+	</notification>
+	<notification name="FreezeAvatar">
+		Geler cet avatar
+Il ou elle ne pourra temporairement plus bouger, chatter, ou interagir dans le Monde.
+		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Dégeler" yestext="Geler"/>
+	</notification>
+	<notification name="FreezeAvatarFullname">
+		Geler [AVATAR_NAME] 
+Il ou elle ne pourra temporairement plus bouger, chatter, ou interagir dans le Monde.
+		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Dégeler" yestext="Geler"/>
+	</notification>
+	<notification name="EjectAvatarFullname">
+		Expulser [AVATAR_NAME] de votre terrain 
+		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Expulser et bannir" yestext="Expulser"/>
+	</notification>
+	<notification name="EjectAvatarNoBan">
+		Expulser cet avatar de votre terrain 
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Expulser"/>
+	</notification>
+	<notification name="EjectAvatarFullnameNoBan">
+		Expulser [AVATAR_NAME] de votre terrain 
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Expulser"/>
+	</notification>
+	<notification name="AcquireErrorTooManyObjects">
+		Erreur d&apos;acquisition : trop d&apos;objets sélectionnés.
+	</notification>
+	<notification name="AcquireErrorObjectSpan">
+		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.
+	</notification>
+	<notification name="PromptGoToCurrencyPage">
+		[EXTRA]
+
+Aller sur [URL] pour obtenir des informations sur l&apos;achat de devises 
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="UnableToLinkObjects">
+		Impossible de lier ces [COUNT] objets.
+Vous pouvez lier un maximum de [MAX] objets.
+	</notification>
+	<notification name="CannotLinkIncompleteSet">
+		Vous ne pouvez lier que des ensembles d&apos;objets complets et vous devez choisir un minimum de deux objets.
+	</notification>
+	<notification name="CannotLinkModify">
+		Impossible de lier car vous n&apos;avez pas le droit 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é.
+	</notification>
+	<notification name="CannotLinkDifferentOwners">
+		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.
+	</notification>
+	<notification name="NoFileExtension">
+		Pas d&apos;extension pour le fichier suivant : &apos;[FILE]&apos;
+
+Assurez-vous que le fichier a l&apos;extension correcte.
+	</notification>
+	<notification name="InvalidFileExtension">
+		Extension de fichier [EXTENSION] invalide
+[VALIDS] attendu
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="CannotUploadSoundFile">
+		Impossible de lire le fichier son chargé :
+[FILE]
+	</notification>
+	<notification name="SoundFileNotRIFF">
+		Il semble que le fichier ne soit pas un fichier RIFF WAVE :
+[FILE]
+	</notification>
+	<notification name="SoundFileNotPCM">
+		Il semble que le fichier ne soit pas un fichier audio PCM WAVE :
+[FILE]
+	</notification>
+	<notification name="SoundFileInvalidChannelCount">
+		Le fichier contient un nombre de canaux invalide (doit être mono ou stéréo) :
+[FILE]
+	</notification>
+	<notification name="SoundFileInvalidSampleRate">
+		Le fichier ne semble pas être pris en charge (doit être 44,1 k) :
+[FILE]
+	</notification>
+	<notification name="SoundFileInvalidWordSize">
+		Le fichier ne semble pas être pris en charge (doit faire 8 ou 16 bits) :
+[FILE]
+	</notification>
+	<notification name="SoundFileInvalidHeader">
+		Impossible de trouver les données dans l&apos;en-tête WAV :
+[FILE]
+	</notification>
+	<notification name="SoundFileInvalidTooLong">
+		Le fichier audio est trop long (10 secondes maximum) :
+[FILE]
+	</notification>
+	<notification name="ProblemWithFile">
+		Problème avec le fichier [FILE] :
+
+[ERROR]
+	</notification>
+	<notification name="CannotOpenTemporarySoundFile">
+		Impossible d&apos;ouvrir le fichier son compressé temporaire : [FILE]
+	</notification>
+	<notification name="UnknownVorbisEncodeFailure">
+		Echec d&apos;encodage Vorbis inconnu sur : [FILE]
+	</notification>
+	<notification name="CannotEncodeFile">
+		Impossible d&apos;encoder le fichier : [FILE]
+	</notification>
+	<notification name="CorruptResourceFile">
+		Fichier ressource corrompu : [FILE]
+	</notification>
+	<notification name="UnknownResourceFileVersion">
+		Version de fichier ressource Linden inconnu : [FILE]
+	</notification>
+	<notification name="UnableToCreateOutputFile">
+		Impossible de créer le fichier de sortie : [FILE]
+	</notification>
+	<notification name="DoNotSupportBulkAnimationUpload">
+		Nous ne prenons pas en charge le chargement de lots de fichiers d&apos;animation. (Chaque animation ayant ses propres réglages)
+	</notification>
+	<notification name="CannotUploadReason">
+		Impossible de charger [FILE] suite au problème suivant : [REASON]
+Veuillez réessayer ultérieurement.
+	</notification>
+	<notification name="CannotCreateLandmarkNotOwner">
+		Vous ne pouvez pas créer de repère ici car le propriétaire du terrain ne l&apos;autorise pas.
+	</notification>
+	<notification name="CannotRecompileSelectObjectsNoScripts">
+		Impossible d&apos;effectuer les recompilations.
+Sélectionnez un objet avec un script.
+	</notification>
+	<notification name="CannotRecompileSelectObjectsNoPermission">
+		Impossible d&apos;effectuer les recompilations.
+
+Sélectionnez des objets qui ont des scripts et que vous pouvez modifier.
+	</notification>
+	<notification name="CannotResetSelectObjectsNoScripts">
+		Impossible d&apos;effectuer la réinitialisation.
+
+Veuillez sélectionner des objets avec des scripts.
+	</notification>
+	<notification name="CannotResetSelectObjectsNoPermission">
+		Impossible d&apos;effectuer la réinitialisation.
+
+Sélectionnez des objets qui ont des scripts et que vous pouvez modifier.
+	</notification>
+	<notification name="CannotSetRunningSelectObjectsNoScripts">
+		Impossible de définir les scripts sur « exécution ».
+
+Veuillez sélectionner des objets avec des scripts.
+	</notification>
+	<notification name="CannotSetRunningNotSelectObjectsNoScripts">
+		Impossible de définir les scripts sur « non-exécution ».
+
+Veuillez sélectionner des objets avec des scripts.
+	</notification>
+	<notification name="NoFrontmostFloater">
+		Aucun floater frontmost à sauvegarder.
+	</notification>
+	<notification name="SeachFilteredOnShortWords">
+		Votre requête a été modifiée et les mots trops courts ont été supprimés.
+
+Recherche effectuée : [FINALQUERY]
+	</notification>
+	<notification name="SeachFilteredOnShortWordsEmpty">
+		Vos termes de recherche étaient trop courts et aucune recherche n&apos;a été effectuée.
+	</notification>
+	<notification name="CouldNotTeleportReason">
+		Impossible de téléporter.
+[REASON]
+	</notification>
+	<notification name="invalid_tport">
+		Nous avons rencontré des problèmes en essayant de vous téléporter. Vous devrez peut-être vous reconnecter avant de pouvoir être téléporté. Si vous continuez à recevoir ce message, veuillez consulter le Support à la page suivante :
+www.secondlife.com/support
+	</notification>
+	<notification name="invalid_region_handoff">
+		Nous avons rencontré des problèmes en essayant de vous téléporter. Vous devrez peut-être vous reconnecter avant de pouvoir être téléporté. Si vous continuez à recevoir ce message, veuillez consulter le Support à la page suivante :
+www.secondlife.com/support
+	</notification>
+	<notification name="blocked_tport">
+		Désolé, la téléportation est bloquée actuellement. Veuillez réessayer dans un moment.
+Si vous ne parvenez toujours pas à être téléporté, déconnectez-vous puis reconnectez-vous pour résoudre le problème.
+	</notification>
+	<notification name="nolandmark_tport">
+		Désolé, le système n&apos;a pas réussi à localiser la destination de votre repère.
+	</notification>
+	<notification name="timeout_tport">
+		Désolé, la connexion vers votre lieu de téléportation n&apos;a pas abouti.
+Veuillez réessayer dans un moment.
+	</notification>
+	<notification name="noaccess_tport">
+		Désolé, vous n&apos;avez pas accès à cette destination.
+	</notification>
+	<notification name="missing_attach_tport">
+		Vos pieces-jointes ne sont pas encore arrivées. Attendez quelques secondes ou déconnectez-vous puis reconnectez-vous avant d&apos;essayer de vous téléporter.
+	</notification>
+	<notification name="too_many_uploads_tport">
+		Le trafic vers cette région est bouché en ce moment. Votre téléportation ne pourra pas avoir lieu immédiatement. Veuillez réessayer dans quelques minutes ou bien aller dans une zone moins fréquentée.
+	</notification>
+	<notification name="expired_tport">
+		Désolé, votre demande de téléportation n&apos;a pas abouti assez rapidement. Veuillez réessayer dans quelques minutes.
+	</notification>
+	<notification name="expired_region_handoff">
+		Désolé, votre demande pour passer dans une autre région n&apos;a pas abouti assez rapidement. Veuillez réessayer dans quelques minutes.
+	</notification>
+	<notification name="no_host">
+		Impossible de trouver la destination de la téléportation. Il est possible que cette destination soit temporairement indisponible ou qu&apos;elle n&apos;existe plus. Veuillez réessayer dans quelques minutes.
+	</notification>
+	<notification name="no_inventory_host">
+		L&apos;inventaire est temporairement indisponible.
+	</notification>
+	<notification name="CannotSetLandOwnerNothingSelected">
+		Impossible de définir le propriétaire foncier :
+aucune parcelle sélectionnée.
+	</notification>
+	<notification name="CannotSetLandOwnerMultipleRegions">
+		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.
+	</notification>
+	<notification name="ForceOwnerAuctionWarning">
+		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 ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="CannotContentifyNothingSelected">
+		Problème :
+Aucune parcelle sélectionnée.
+	</notification>
+	<notification name="CannotContentifyNoRegion">
+		Problème :
+Aucune région sélectionnée.
+	</notification>
+	<notification name="CannotReleaseLandNothingSelected">
+		Impossible d&apos;abandonner le terrain :
+aucune parcelle sélectionnée.
+	</notification>
+	<notification name="CannotReleaseLandNoRegion">
+		Impossible d&apos;abandonner le terrain :
+la région est introuvable.
+	</notification>
+	<notification name="CannotBuyLandNothingSelected">
+		Impossible d&apos;acheter le terrain :
+aucune parcelle sélectionnée.
+	</notification>
+	<notification name="CannotBuyLandNoRegion">
+		Impossible d&apos;acheter le terrain :
+la région dans laquelle il est situé est introuvable.
+	</notification>
+	<notification name="CannotCloseFloaterBuyLand">
+		Vous ne pouvez pas fermer la fenêtre 'Acheter le terrain' avant que Second Life n&apos;estime le montant de cette transaction.
+	</notification>
+	<notification name="CannotDeedLandNothingSelected">
+		Cession du terrain impossible :
+aucune parcelle sélectionnée.
+	</notification>
+	<notification name="CannotDeedLandNoGroup">
+		Cession du terrain impossible :
+aucun groupe sélectionné.
+	</notification>
+	<notification name="CannotDeedLandNoRegion">
+		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.
+	</notification>
+	<notification name="CannotDeedLandMultipleSelected">
+		Cession du terrain impossible :
+plusieurs parcelles sélectionnées.
+
+Essayez de ne sélectionner qu&apos;une seule parcelle.
+	</notification>
+	<notification name="ParcelCanPlayMedia">
+		Cette parcelle propose des flux média.
+Pour jouer des flux média, il faut avoir une connexion internet rapide.
+
+Jouer les flux média lorsqu&apos;ils sont disponibles ?
+(Vous pourrez modifier cette option ultérieurement sous Préférences &gt; Audio et vidéo.)
+		<usetemplate name="okcancelbuttons" notext="Désactiver" yestext="Jouer le média"/>
+	</notification>
+	<notification name="CannotDeedLandWaitingForServer">
+		Cession du terrain impossible :
+rapport de propriété sur le point d&apos;être envoyé par le serveur.
+
+Merci de réessayer.
+	</notification>
+	<notification name="CannotDeedLandNoTransfer">
+		Cession du terrain impossible :
+la cession de terrain est interdite dans la région [REGION].
+	</notification>
+	<notification name="CannotReleaseLandWatingForServer">
+		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.
+	</notification>
+	<notification name="CannotReleaseLandSelected">
+		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.
+	</notification>
+	<notification name="CannotReleaseLandDontOwn">
+		Impossible d&apos;abandonner le terrain :
+vous n&apos;avez pas le droit de libérer cette parcelle.
+Les parcelles qui vous appartiennent sont en vert.
+	</notification>
+	<notification name="CannotReleaseLandRegionNotFound">
+		Impossible d&apos;abandonner le terrain :
+la région dans laquelle il est situé est introuvable.
+
+Veuillez utiliser Aide &gt; Signaler un bug pour signaler le problème.
+	</notification>
+	<notification name="CannotReleaseLandNoTransfer">
+		Impossible d&apos;abandonner le terrain :
+le transfert de terrain est interdit dans la région [REGION].
+	</notification>
+	<notification name="CannotReleaseLandPartialSelection">
+		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.
+	</notification>
+	<notification name="ReleaseLandWarning">
+		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 
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="CannotDivideLandNothingSelected">
+		Division du terrain impossible :
+
+aucune parcelle sélectionnée.
+	</notification>
+	<notification name="CannotDivideLandPartialSelection">
+		Division du terrain impossible :
+
+Toute la parcelle est sélectionnée.
+Sélectionnez une partie de la parcelle uniquement.
+	</notification>
+	<notification name="LandDivideWarning">
+		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 
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="CannotDivideLandNoRegion">
+		Division du terrain impossible :
+la région dans laquelle il est situé est introuvable.
+
+Veuillez utiliser Aide &gt; Signaler un bug pour signaler le problème.
+	</notification>
+	<notification name="CannotJoinLandNoRegion">
+		Impossible de fusionner le terrain :
+la région dans laquelle il est situé est introuvable.
+
+Veuillez utiliser Aide &gt; Signaler un bug pour signaler le problème.
+	</notification>
+	<notification name="CannotJoinLandNothingSelected">
+		Impossible de fusionner le terrain :
+aucune parcelle sélectionnée.
+	</notification>
+	<notification name="CannotJoinLandEntireParcelSelected">
+		Impossible de fusionner le terrain :
+vous avez sélectionné une seule parcelle.
+
+Sélectionnez le terrain sur les deux parcelles.
+	</notification>
+	<notification name="CannotJoinLandSelection">
+		Impossible de fusionner le terrain :
+vous devez sélectionner au moins deux parcelles.
+
+Sélectionnez le terrain sur les deux parcelles.
+	</notification>
+	<notification name="JoinLandWarning">
+		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 
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ShowOwnersHelp">
+		Afficher les propriétaires :
+La couleur des parcelles indique le type de propriété.
+
+Vert = votre terrain
+Turquoise = le terrain de votre groupe
+Rouge = appartenant à d&apos;autres
+Jaune = en vente
+Mauve = aux enchères
+Gris = public
+	</notification>
+	<notification name="ConfirmNotecardSave">
+		Cette note doit être sauvegardée avant que l&apos;objet ne puisse être copié ou visualisé. Enregistrer la note.
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmItemCopy">
+		Copier cet objet dans votre inventaire.
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Copier"/>
+	</notification>
+	<notification name="ResolutionSwitchFail">
+		Echec du changement de résolution (à [RESX], de [RESY])
+	</notification>
+	<notification name="ErrorUndefinedGrasses">
+		Erreur : herbes non identifiées : [SPECIES]
+	</notification>
+	<notification name="ErrorUndefinedTrees">
+		Erreur : arbres non identifiés : [SPECIES]
+	</notification>
+	<notification name="CannotSaveWearableOutOfSpace">
+		Impossible de sauvegarder [NAME]. Pour pouvoir sauvegarder ce fichier, vous devez d&apos;abord libérer de la mémoire sur votre ordinateur.
+	</notification>
+	<notification name="CannotSaveToAssetStore">
+		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 Aide | Signaler un bug dans le menu déroulant en indiquant les détails de votre connexion.
+	</notification>
+	<notification name="YouHaveBeenLoggedOut">
+		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].
+		<usetemplate name="okcancelbuttons" notext="Quitter" yestext="Afficher IM et chat"/>
+	</notification>
+	<notification name="OnlyOfficerCanBuyLand">
+		Impossible d&apos;acheter du terrain pour le groupe :
+Vous n&apos;avez pas le droit d&apos;acheter de terrain pour votre groupe.
+	</notification>
+	<notification label="Devenir amis" name="AddFriend">
+		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).
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification label="Devenir amis" name="AddFriendWithMessage">
+		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).
+		<form name="form">
+			<input name="message" type="text">
+				Restons en contact, si vous le voulez bien ?
+			</input>
+			<button name="Offer" text="OK"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification name="RemoveFromFriends">
+		Voulez-vous supprimer [NAME] de votre liste d&apos;amis ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="RemoveMultipleFromFriends">
+		Voulez-vous supprimer plusieurs résidents de votre liste d&apos;amis ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="GodDeleteAllScriptedPublicObjectsByUser">
+		Etes-vous certain(e) de vouloir supprimer tous les objets scriptés appartenant à ** [AVATAR_NAME] ** sur tous les terrains des autres résidents dans cette région ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="GodDeleteAllScriptedObjectsByUser">
+		Etes-vous certain(e) de vouloir supprimer tous les objets scriptés appartenant à ** [AVATAR_NAME] ** sur tous les terrains de cette région ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="GodDeleteAllObjectsByUser">
+		Êtes-vous certain(e) de vouloir supprimer tous les objets (scriptés ou pas) appartenant à ** [AVATAR_NAME] ** sur tous les terrains de cette région ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="BlankClassifiedName">
+		Vous devez choisir un nom pour votre petite annonce.
+	</notification>
+	<notification name="MinClassifiedPrice">
+		Le coût de l&apos;annonce doit être de [MIN_PRICE] L$ minimum.
+
+Veuillez saisir un montant plus élevé.
+	</notification>
+	<notification name="ConfirmObjectDeleteLock">
+		Au moins un des objets que vous avez sélectionnés est verrouillé.
+
+Êtes-vous certain(e) de vouloir supprimer ces objets ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteNoCopy">
+		Au moins un des objets que vous avez sélectionnés n&apos;est pas copiable.
+
+Êtes-vous certain(e) de vouloir supprimer ces objets ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteNoOwn">
+		Au moins un des objets que vous avez sélectionnés ne vous appartient pas.
+
+Êtes-vous certain(e) de vouloir supprimer ces objets ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteLockNoCopy">
+		Au moins un des objets est verrouillé.
+Au moins un des objets n&apos;est pas copiable.
+
+Êtes-vous certain(e) de vouloir supprimer ces objets ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteLockNoOwn">
+		Au moins un des objets est verrouillé.
+Au moins un des objets ne vous appartient pas.
+
+Êtes-vous certain(e) de vouloir supprimer ces objets ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
+		Au moins un des objets n&apos;est pas copiable.
+Au moins un des objets ne vous appartient pas.
+
+Etes-vous certain(e) de vouloir supprimer ces objets ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
+		Au moins un des objets est verrouillé.
+Au moins un des objets n&apos;est pas copiable.
+Au moins un des objets ne vous appartient pas.
+
+Etes-vous certain(e) de vouloir supprimer ces objets ?
+		<usetemplate name="okcancelbuttons" notext="annuler" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmObjectTakeLock">
+		Au moins un des objets est verrouillé.
+
+Etes-vous certain(e) de vouloir prendre ces objets ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmObjectTakeNoOwn">
+		Vous n&apos;êtes pas le propriétaire de tous les objets que vous prenez.
+Si vous continuez, les droits accordés au prochain propriétaire seront activés et vous risquez de ne plus pouvoir modifier ou copier les objets.
+
+Etes-vous certain(e) de vouloir prendre ces objets ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmObjectTakeLockNoOwn">
+		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 droits accordés au prochain propriétaire seront activés et vous risquez de ne plus pouvoir modifier ou copier les objets.
+Par contre, vous pouvez prendre les objets sélectionnés.
+
+Etes-vous certain(e) de vouloir prendre ces objets ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="CantBuyLandAcrossMultipleRegions">
+		Impossible d&apos;acheter le terrain car la sélection couvre plusieurs régions.
+
+Veuillez sélectionner une zone plus petite et réessayer.
+	</notification>
+	<notification name="DeedLandToGroup">
+		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] ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="DeedLandToGroupWithContribution">
+		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 [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.
+
+Céder ces [AREA] m² de terrain au groupe [GROUP_NAME] ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="DisplaySetToSafe">
+		Les paramètres d&apos;affichage sont au niveau le plus sûr, comme vous l&apos;aviez indiqué.
+	</notification>
+	<notification name="DisplaySetToRecommended">
+		Vos paramètres d&apos;affichage ont été réglés avec une marge de sécurité en fonction de votre configuration système.
+	</notification>
+	<notification name="ErrorMessage">
+		[ERROR_MESSAGE]
+	</notification>
+	<notification name="AvatarMoved">
+		L&apos;emplacement [TYPE] n&apos;est pas disponible actuellement. [HELP]
+Vous avez été déplacé(e) dans une région voisine.
+	</notification>
+	<notification name="ClothingLoading">
+		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.
+		<form name="form">
+			<ignore name="ignore" text="Lorsque les habits prennent longtemps à télécharger"/>
+		</form>
+	</notification>
+	<notification name="FirstRun">
+		L&apos;installation de [SECOND_LIFE] est terminée.
+
+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 ?
+		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Nouveau compte"/>
+	</notification>
+	<notification name="LoginPacketNeverReceived">
+		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.
+		<form name="form">
+			<button name="OK" text="OK"/>
+			<button name="Help" text="Aide"/>
+			<button name="Teleport" text="Téléporter"/>
+		</form>
+	</notification>
+	<notification name="WelcomeChooseSex">
+		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.
+		<usetemplate name="okcancelbuttons" notext="Femme" yestext="Homme"/>
+	</notification>
+	<notification name="NotEnoughCurrency">
+		[NAME] [PRICE] L$ Vous n&apos;avez pas suffisamment de L$ pour faire cela.
+	</notification>
+	<notification name="GrantedModifyRights">
+		Vous avez reçu le droit de modifier les objets de [NAME].
+	</notification>
+	<notification name="RevokedModifyRights">
+		Vous n&apos;avez plus le droit de modifier les objets de [NAME].
+	</notification>
+	<notification name="FlushMapVisibilityCaches">
+		Cela videra le cache cartographique de cette région.
+Ce n&apos;est vraiment utile que pour faire du débugage.
+(En production, attendez 5 minutes. Les cartes seront mises à jour après reconnexion.)
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="BuyOneObjectOnly">
+		Impossible d&apos;acheter plus d&apos;un objet à  la fois. Veuillez ne sélectionner qu&apos;un seul objet.
+	</notification>
+	<notification name="OnlyCopyContentsOfSingleItem">
+		Impossible de copier les contenus de plus d&apos;un objet à la fois.
+Veuillez ne sélectionner qu&apos;un seul objet.
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="KickUsersFromRegion">
+		Téléporter tous les résidents de cette région chez eux ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="EstateObjectReturn">
+		Etes-vous certain(e) de vouloir renvoyer les objets appartenant à [USER_NAME] ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="InvalidTerrainBitDepth">
+		Impossible de definir les textures de la région :
+La texture du terrain [TEXTURE_NUM] a une profondeur invalide ([TEXTURE_BIT_DEPTH]).
+
+Remplacer la texture [TEXTURE_NUM] avec une image de 24 bits, 512 X 512, ou plus petite, puis cliquez à nouveau sur Appliquer.
+	</notification>
+	<notification name="InvalidTerrainSize">
+		Impossible de definir les textures de la région :
+La texture du terrain [TEXTURE_NUM] est trop volumineuse ([TEXTURE_SIZE_X] X [TEXTURE_SIZE_Y]).
+
+Remplacer la texture [TEXTURE_NUM] avec une image de 24 bits, 512 X 512, ou plus petite, puis cliquez à nouveau sur Appliquer.
+	</notification>
+	<notification name="RawUploadStarted">
+		Le chargement a commencé. Cela va prendre une à deux minutes,
+suivant votre vitesse de connexion.
+	</notification>
+	<notification name="ConfirmBakeTerrain">
+		Etes-vous sûr(e) de vouloir figer le relief actuel, en faire le point central des limites d&apos;élévation/abaissement de relief et la valeur par défaut du bouton Annuler modification ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="MaxAllowedAgentOnRegion">
+		Vous ne pouvez pas autoriser plus de [MAX_AGENTS] résidents.
+	</notification>
+	<notification name="MaxBannedAgentsOnRegion">
+		Vous ne pouvez pas bannir plus de [MAX_BANNED] résidents.
+	</notification>
+	<notification name="MaxAgentOnRegionBatch">
+		Echec lors de la tentative d&apos;ajout de [NUM_ADDED] agents :
+Dépasse la limite fixée à [MAX_AGENTS] [LIST_TYPE] de [NUM_EXCESS].
+	</notification>
+	<notification name="MaxAllowedGroupsOnRegion">
+		Vous ne pouvez pas avoir plus que [MAX_GROUPS] groupes autorisés.
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Figer"/>
+	</notification>
+	<notification name="MaxManagersOnRegion">
+		Vous ne pouvez avoir que [MAX_MANAGER] gérants de domaine.
+	</notification>
+	<notification name="OwnerCanNotBeDenied">
+		Impossible d&apos;ajouter le propriétaire du domaine à la liste des résidents bannis.
+	</notification>
+	<notification name="CanNotChangeAppearanceUntilLoaded">
+		Impossible de changer d&apos;apparence jusqu&apos;à ce que les habits et la silhouette soient chargés.
+	</notification>
+	<notification name="ClassifiedMustBeAlphanumeric">
+		Le nom de votre petite annonce doit commencer par un chiffre ou une lettre (A à Z). La ponctuation n&apos;est pas autorisée.
+	</notification>
+	<notification name="CantSetBuyObject">
+		Cet objet n&apos;est pas à vendre.
+Veuillez choisir un objet à vendre et réessayer.
+	</notification>
+	<notification name="FinishedRawDownload">
+		Chargement du fichier de terrain raw effectué vers :
+[DOWNLOAD_PATH].
+	</notification>
+	<notification name="DownloadWindowsMandatory">
+		Une nouvelle version de [SECOND_LIFE] est disponible.
+[MESSAGE]
+Pour utiliser [SECOND_LIFE] vous devez télécharger cette mise à jour.
+		<usetemplate name="okcancelbuttons" notext="Quitter" yestext="Télécharger"/>
+	</notification>
+	<notification name="DownloadWindows">
+		Une mise à jour de [SECOND_LIFE] est disponible.
+[MESSAGE]
+Cette mise à jour n&apos;est pas requise mais si vous voulez une meilleure performance et plus de stabilité, nous vous recommandons de l&apos;installer.
+		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Télécharger"/>
+	</notification>
+	<notification name="DownloadWindowsReleaseForDownload">
+		Une mise à jour de [SECOND_LIFE] est disponible.
+[MESSAGE]
+Cette mise à jour n&apos;est pas requise mais si vous voulez une meilleure performance et plus de stabilité, nous vous recommandons de l&apos;installer.
+		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Télécharger"/>
+	</notification>
+	<notification name="DownloadMacMandatory">
+		Une nouvelle version de [SECOND_LIFE] est disponible.
+[MESSAGE]
+Pour utiliser [SECOND_LIFE] vous devez télécharger cette mise à jour.
+
+Télécharger vers le dossier Applications ?
+		<usetemplate name="okcancelbuttons" notext="Quitter" yestext="Télécharger"/>
+	</notification>
+	<notification name="DownloadMac">
+		Une mise à jour de [SECOND_LIFE] est disponible.
+[MESSAGE]
+Cette mise à jour n&apos;est pas requise mais si vous voulez une meilleure performance et plus de stabilité, nous vous recommandons de l&apos;installer.
+
+Télécharger vers le dossier Applications ?
+		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Télécharger"/>
+	</notification>
+	<notification name="DownloadMacReleaseForDownload">
+		Une mise à jour de [SECOND_LIFE] est disponible.
+[MESSAGE]
+Cette mise à jour n&apos;est pas requise mais si vous voulez une meilleure performance et plus de stabilité, nous vous recommandons de l&apos;installer.
+
+Télécharger vers le dossier Applications ?
+		<usetemplate name="okcancelbuttons" notext="Continuer" yestext="Télécharger"/>
+	</notification>
+	<notification name="DeedObjectToGroup">
+		Si vous cédez cet objet, le groupe :
+* recevra les L$ versés pour l&apos;objet ;
+		<usetemplate ignoretext="Lors de la cession d&apos;objets au groupe" name="okcancelignore" notext="Annuler" yestext="Céder"/>
+	</notification>
+	<notification name="WebLaunchExternalTarget">
+		Ouvrir votre navigateur web système pour afficher ce contenu ?
+		<usetemplate ignoretext="Lors de l&apos;ouverture de votre navigateur système pour afficher une page web" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchJoinNow">
+		Aller sur www.secondlife.com pour gérer votre compte ?
+		<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour gérer votre compte" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchBugReport101">
+		Pour apprendre à signaler correctement des bugs, consultez le Wiki de [SECOND_LIFE].
+		<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter le Wiki et apprendre à signaler des bugs" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchSecurityIssues">
+		Pour apprendre à signaler un problème de sécurité, consultez le Wiki de [SECOND_LIFE].
+		<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter la page Wiki sur les problèmes de sécurité." name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchQAWiki">
+		Consultez le Wiki sur l&apos;Assurance Qualité de [SECOND_LIFE].
+		<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter la page Wiki sur l&apos;Assurance Qualité." name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchPublicIssue">
+		Pour signaler des bugs et autres problèmes, utilisez le JIRA de [SECOND_LIFE].
+		<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter le JIRA" name="okcancelignore" notext="Annuler" yestext="Aller sur cette page"/>
+	</notification>
+	<notification name="WebLaunchPublicIssueHelp">
+		Pour apprendre à utiliser JIRA, consultez le Wiki de [SECOND_LIFE].
+		<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter la page Wiki sur le JIRA" name="okcancelignore" notext="Annuler" yestext="Aller sur cette page"/>
+	</notification>
+	<notification name="WebLaunchSupportWiki">
+		Visitez le blog officiel des Lindens pour les dernières nouvelles et informations.
+		<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter le blog" name="okcancelignore" notext="Annuler" yestext="Aller à la page"/>
+	</notification>
+	<notification name="WebLaunchLSLGuide">
+		Consulter le Guide guide pour l&apos;écriture de scripts pour obtenir de l&apos;aide.
+		<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour voir le Guide pour l&apos;écriture de scripts" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchLSLWiki">
+		Consulter le Wiki LSL pour de l&apos;aide sur les scripts.
+		<usetemplate ignoretext="Lors de l&apos;ouverture du navigateur web pour consulter le Guide sur l&apos;écriture de scripts" name="okcancelignore" notext="Annuler" yestext="Aller à la page"/>
+	</notification>
+	<notification name="ReturnToOwner">
+	Etes-vous certain(e) 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 !
+		<usetemplate ignoretext="Lors du renvoi d&apos;objets à leurs propriétaires" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="GroupLeaveConfirmMember">
+		Vous êtes actuellement membre du groupe [GROUP].
+Quitter le groupe ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmKick">
+		Souhaitez-vous vraiment éjecter tous les utilisateurs de la grille ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Éjecter tous"/>
+	</notification>
+	<notification name="MuteLinden">
+		Désolé, vous ne pouvez pas ignorer un Linden.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="CannotStartAuctionAlreadyForSale">
+		Vous ne pouvez pas démarrer des enchères sur une parcelle déjà en vente. Si vous êtes certain(e) de vouloir démarrer des enchères, mettez fin à la vente.
+	</notification>
+	<notification label="Échec de la fonction Ignorer les objets par nom" name="MuteByNameFailed">
+		Vous ignorez déjà ce résident.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="RemoveItemWarn">
+		Si vous supprimez des contenus, vous risquez d&apos;endommager l&apos;objet. Souhaitez-vous supprimer cet objet ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="CantOfferCallingCard">
+		Impossible d&apos;offrir une carte de visite actuellement. Veuillez réessayer dans un moment.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="CantOfferFriendship">
+		Impossible de proposer votre amitié actuellement. Veuillez réessayer dans un moment.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="BusyModeSet">
+		Mode occupé activé.
+Les chats et les messages instantanés ne s&apos;afficheront pas. Vous répondrez aux messages instantanés en utilisant la réponse automatique que vous avez créée. Toutes les propositions de téléportation seront refusées. Tous objets envoyés iront dans la corbeille.
+		<usetemplate ignoretext="Lors de l&apos;utilisation du mode Occupé" name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="JoinedTooManyGroupsMember">
+		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]
+		<usetemplate name="okcancelbuttons" notext="Refuser" yestext="Rejoindre"/>
+	</notification>
+	<notification name="KickUser">
+		Éjecter cet utilisateur avec quel message ?
+		<form name="form">
+			<input name="message" type="text">
+				Un administrateur vous a déconnecté.
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification name="KickAllUsers">
+		Éjecter tous les résidents actuellement en ligne avec quel message ?
+		<form name="form">
+			<input name="message" type="text">
+				Un administrateur vous a déconnecté.
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification name="FreezeUser">
+		Geler cet utilisateur avec quel message ?
+		<form name="form">
+			<input name="message" type="text">
+				Vous avez été gelé. Vous ne pouvez ni bouger ni chatter. Un administrateur va vous envoyer un message instantané (IM).
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification name="UnFreezeUser">
+		Dégeler cet utilisateur avec quel message ?
+		<form name="form">
+			<input name="message" type="text">
+				Vous n&apos;êtes plus gelé.
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification name="OfferTeleport">
+		Proposez une téléportation avec le message suivant :
+		<form name="form">
+			<input name="message" type="text">
+				On se rejoint à [REGION] ?
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification name="OfferTeleportFromGod">
+		Demander au résident de venir vous rejoindre avec le messages suivant :
+		<form name="form">
+			<input name="message" type="text">
+				On se rejoint à [REGION] ?
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification name="TeleportFromLandmark">
+		Etes-vous certain(e) de vouloir être téléporté ?
+		<usetemplate ignoretext="Lors de la téléportation depuis un repère de l&apos;inventaire" name="okcancelignore" notext="Annuler" yestext="Téléporter"/>
+	</notification>
+	<notification label="Envoyer un message à tout le monde dans votre domaine" name="MessageEstate">
+		Saisissez un message court qui sera envoyé à tous les résidents se trouvant actuellement sur votre domaine.
+		<form name="form">
+			<input name="message" type="text"/>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification label="Modifier un domaine Linden" name="ChangeLindenEstate">
+		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 ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification label="Modifier l&apos;accès à un domaine Linden" name="ChangeLindenAccess">
+		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.
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification label="Choisir le domaine" name="EstateAllowedAgentAdd">
+		Ajouter à la liste des résidents autorisés uniquement pour ce domaine ou pour [ALL_ESTATES] ?
+		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
+	</notification>
+	<notification label="Choisir le domaine" name="EstateAllowedAgentRemove">
+		Supprimer de la liste des résidents autorisés uniquement pour ce domaine ou pour [ALL_ESTATES] ?
+		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
+	</notification>
+	<notification label="Choisir le domaine" name="EstateAllowedGroupAdd">
+		Ajouter à la liste des groupes autorisés uniquement pour ce domaine ou pour [ALL_ESTATES] ?
+		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
+	</notification>
+	<notification label="Choisir le domaine" name="EstateAllowedGroupRemove">
+		Supprimer de la liste des groupes autorisés uniquement pour ce domaine ou pour [ALL_ESTATES] ?
+		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
+	</notification>
+	<notification label="Choisir le domaine" name="EstateBannedAgentAdd">
+		Refuser l&apos;accès à ce domaine uniquement ou à [ALL_ESTATES] ?
+		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
+	</notification>
+	<notification label="Choisir le domaine" name="EstateBannedAgentRemove">
+		Supprimer ce résident de la liste des résidents bannis pour ce domaine uniquement ou pour [ALL_ESTATES] ?
+		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
+	</notification>
+	<notification label="Choisir le domaine" name="EstateManagerAdd">
+		Ajouter un gérant de domaine pour ce domaine uniquement ou pour [ALL_ESTATES] ?
+		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
+	</notification>
+	<notification label="Choisir le domaine" name="EstateManagerRemove">
+		Supprimer le gérant de domaine pour ce domaine uniquement ou pour [ALL_ESTATES] ?
+		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Tous les domaines" yestext="Ce domaine"/>
+	</notification>
+	<notification label="Confirmer" name="EstateKickUser">
+		Ejecter [EVIL_USER] de ce domaine ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="EstateChangeCovenant">
+		Etes-vous certain(e) de vouloir modifier le règlement du domaine ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="RegionEntryAccessBlocked">
+		Votre catégorie d&apos;accès ne vous autorise pas à pénétrer dans cette région. Cela vient peut-être du fait qu&apos;il manquait des informations pour valider votre âge.
+
+Vérifiez que vous avez la toute dernière version du client et consultez les pages d&apos;aide pour savoir comment accéder aux zones ayant ce niveau d&apos;accès.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_KB">
+		Votre catégorie d&apos;accès ne vous permet pas de pénétrer dans cette région.
+
+Souhaitez-vous en savoir plus sur les différentes catégories d&apos;accès ?
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pr%C3%A9sentation_des_cat%C3%A9gories_de_contenu_(KB)
+		</url>
+		<usetemplate ignoretext="Lorsque l&apos;accès à une région est bloqué à cause de la catégorie d&apos;accès" name="okcancelignore" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_Notify">
+		Votre catégorie d&apos;accès ne vous permet pas de pénétrer dans cette région.
+	</notification>
+	<notification name="RegionEntryAccessBlocked_Change">
+		Votre catégorie d&apos;accès ne vous permet pas de pénétrer dans cette région.
+
+En cliquant sur Modifier les préférences, vous pourrez changer votre catégorie d&apos;accès et pénétrer dans la région. À partir de maintenant, vous pouvez rechercher et accéder au contenu [REGIONMATURITY]. Vous pouvez modifier ce paramètre à partir du menu Édition &gt; Préférences... &gt; Général.
+	<form name="form">
+      <button
+       name="OK"
+       text="Modifier les Préférences"/>
+      <button
+       default="true"
+       name="Cancel"
+       text="Fermer"/>
+       <ignore name="ignore" text="Lorsque l&apos;accès à une région est bloqué à cause des préférences concernant la catégorie d&apos;accès"/>
+    </form>
+	</notification>
+	<notification name="LandClaimAccessBlocked">
+		Votre catégorie d&apos;accès ne vous permet pas de réclamer cette région. Cela vient peut-être du fait qu&apos;il manquait des informations pour valider votre âge.
+
+Vérifiez que vous avez la toute dernière version du client et consultez les pages d&apos;aide pour savoir comment accéder aux zones ayant ce niveau d&apos;accès.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="LandClaimAccessBlocked_KB">
+		Votre catégorie d&apos;accès ne vous permet pas de réclamer cette région.
+
+Souhaitez-vous en savoir plus sur les différentes catégories d&apos;accès ?
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pr%C3%A9sentation_des_cat%C3%A9gories_de_contenu_(KB)
+		</url>
+		<usetemplate ignoretext="Lorsqu&apos;une région ne peut pas être réclamée à cause de la catégorie d&apos;accès" name="okcancelignore" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
+	</notification>
+	<notification name="LandClaimAccessBlocked_Notify">
+		Votre catégorie d&apos;accès ne vous autorise pas à réclamer cette région.
+	</notification>
+	<notification name="LandClaimAccessBlocked_Change">
+		Votre catégorie d&apos;accès ne vous permet pas de réclamer cette région.
+
+En cliquant sur Modifier les préférences, vous pourrez changer votre catégorie d&apos;accès et pénétrer dans la région. À partir de maintenant, vous pouvez rechercher et accéder au contenu [REGIONMATURITY]. Vous pouvez modifier ce paramètre à partir du menu Édition &gt; Préférences... &gt; Général.
+		<usetemplate ignoretext="Lorsqu&apos;une région ne peut pas être réclamée à cause des préférences concernant la catégorie d&apos;accès" name="okcancelignore" notext="Fermer" yestext="Modifier les Préférences"/>
+	</notification>
+	<notification name="LandBuyAccessBlocked">
+		Votre catégorie d&apos;accès ne vous permet pas d&apos;acheter cette région. Cela vient peut-être du fait qu&apos;il manquait des informations pour valider votre âge.
+
+Vérifiez que vous avez la toute dernière version du client et consultez les pages d&apos;aide pour savoir comment accéder aux zones ayant ce niveau d&apos;accès.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="LandBuyAccessBlocked_KB">
+		Votre catégorie d&apos;accès ne vous permet pas d&apos;acheter cette région.
+
+Souhaitez-vous en savoir plus sur les différentes catégories d&apos;accès ?
+		<url name="url">
+			http://wiki.secondlife.com/wiki/Pr%C3%A9sentation_des_cat%C3%A9gories_de_contenu_(KB)
+		</url>
+		<usetemplate ignoretext="Lorsqu&apos;une région ne peut pas être achetée à cause de la catégorie d&apos;accès" name="okcancelignore" notext="Fermer" yestext="Consulter les pages d&apos;aide"/>
+	</notification>
+	<notification name="LandBuyAccessBlocked_Notify">
+		Votre catégorie d&apos;accès ne vous permet pas d&apos;acheter cette région.
+	</notification>
+	<notification name="LandBuyAccessBlocked_Change">
+		Votre catégorie d&apos;accès ne vous autorise pas à acheter cette région.
+
+En cliquant sur Modifier les préférences, vous pourrez changer votre catégorie d&apos;accès et pénétrer dans la région. À partir de maintenant, vous pouvez rechercher et accéder au contenu [REGIONMATURITY]. Vous pouvez modifier ce paramètre à partir du menu Édition &gt; Préférences... &gt; Général.
+		<usetemplate ignoretext="Lorsqu&apos;une région ne peut pas être achetée à cause des préférences concernant la catégorie d&apos;accès" name="okcancelignore" notext="Fermer" yestext="Modifier les Préférences"/>
+	</notification>
+	<notification name="TooManyPrimsSelected">
+		&quot;Vous avez sélectionné trop de prims. Veuillez sélectionner au maximum [MAX_PRIM_COUNT] prims et réessayer.&quot;
+	</notification>
+	<notification name="ProblemImportingEstateCovenant">
+		Problème lors de l&apos;importation du règlement du domaine.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="ProblemAddingEstateManager">
+		Problèmes lors de l&apos;ajout d&apos;un nouveau gérant de domaine. Il est possible qu&apos;au moins un des domaines ait une liste de gérants complète.
+	</notification>
+	<notification name="ProblemAddingEstateGeneric">
+		Problème lors de l&apos;ajout à la liste de ce domaine. Il est possible qu&apos;au moins un des domaines ait une liste complète.
+	</notification>
+	<notification name="UnableToLoadNotecardAsset">
+		Impossible de charger les données de la note actuellement.
+	</notification>
+	<notification name="NotAllowedToViewNotecard">
+		Permissions insuffisantes pour afficher la note.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MissingNotecardAssetID">
+		Les références de la note ne se trouvent pas dans la base de données.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PublishClassified">
+		Rappel : les frais pour passer des petites annonces ne sont pas remboursables.
+
+Publier cette petite annonce maintenant pour [AMOUNT] L$ ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="SetClassifiedMature">
+		Cette petite annonce contient-elle du contenu Mature ?
+		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="SetGroupMature">
+		Ce groupe contient-il du contenu Mature ?
+		<usetemplate canceltext="Annuler" name="yesnocancelbuttons" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification label="Confirmer le redémarrage" name="ConfirmRestart">
+		Souhaitez-vous vraiment redémarrer cette région dans 2 minutes ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification label="Envoyer un message à la région" name="MessageRegion">
+		Saisissez une message qui sera envoyé à tous les résidents présents dans cette région.
+		<form name="form">
+			<input name="message" type="text"/>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification label="Interdire le terraformage" name="HelpRegionBlockTerraform">
+		Si vous cochez cette case, les propriétaires ne pourront plus terraformer leur terrain, quel que soit le paramétrage individuel des parcelles.
+
+Valeur par défaut : désactivé
+	</notification>
+	<notification label="Interdire le vol" name="HelpRegionBlockFly">
+		Si vous cochez cette case, les résidents ne pourront plus voler dans cette région, quel que soit le paramétrage individuel des parcelles.
+
+Valeur par défaut : désactivé
+	</notification>
+	<notification label="Modifications groupées des droits relatifs au contenu" name="HelpBulkPermission">
+		L&apos;outil Modifications groupées des droits vous permet de modifier rapidement et simultanément les droits dans les contenus des objets séléctionnés. Notez toutefois que vous paramétrez uniquement les droits des objets dans les Contenus des objets sélectionnés, et non les droits sur les objets eux-mêmes.  
+
+Notez aussi que les droits ne s&apos;appliquent pas aux contenus imbriqués dans les objets contenus. Votre requête ne porte que sur les objets de premier niveau.
+
+Vous pouvez sélectionner quels types d&apos;objets modifier à la section Types de contenu. Les photos sont incluses quand vous sélectionnez Textures.
+
+* Cet outil ne vous permettra de changer que les droits des objets que vous êtes autorisé(e) à modifier.
+* Vous ne pouvez pas accorder de droits que vous n&apos;avez pas au prochain propriétaire.
+* Les droits accordés au prochain propriétaire de sont que des requêtes. Si un objet ne peut recevoir tous les nouveaux droits, aucun de ses droits ne changera.
+
+Lorsque vous êtes prêt à modifier tous les droits, cliquez sur Appliquer et attendez de voir s&apos;afficher les résultats.
+
+Si vous fermez la fenêtre des modifications groupées alors que les droits sont en train d&apos;être modifiés, vous suspendez l&apos;opération.
+	</notification>
+	<notification label="Autoriser les dégâts" name="HelpRegionAllowDamage">
+		Si vous cochez cette case, les résidents peuvent subir des dégâts dans toute la région quel que soit le paramétrage individuel des parcelles. Si la case n&apos;est pas cochée, les propriétaires sont libres d&apos;activer ou non cette option sur leur parcelle.
+
+Valeur par défaut : désactivé
+	</notification>
+	<notification label="Nombre maximum d&apos;avatars" name="HelpRegionAgentLimit">
+		Définit le nombre maximum d&apos;avatars autorisés dans cette région.
+La performance peut varier en fonction du nombre d&apos;avatars présents.
+
+Valeur par défaut : 40
+	</notification>
+	<notification label="Bonus objet" name="HelpRegionObjectBonus">
+		Le bonus objet est le multiplicateur de prims autorisées 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 prims. S&apos;il est de 2, chaque parcelle peut contenir 234 prims, ou deux fois plus, et ainsi de suite. Le nombre maximum de prims autorisées 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.
+
+Valeur par défaut : 1.0
+	</notification>
+	<notification label="Accès" name="HelpRegionMaturity">
+		Définit la catégorie d&apos;accès de la région, telle qu&apos;affichée dans la barre de menu en haut du client et dans les infobulles de la carte lorsque vous passez votre curseur au-dessus de cette région. Ce paramètre affecte aussi l&apos;accès à cette région et les résultats de recherche. Les autres résidents ne peuvent pénétrer que dans les régions ou n&apos;afficher que les résultats de recherche ayant la même catégorie d&apos;accès que celle indiquée dans leurs Préférences.
+
+Ce changement n&apos;apparaîtra pas immédiatement sur la carte.
+	</notification>
+	<notification label="Interdire les bousculades" name="HelpRegionRestrictPushObject">
+		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 d&apos;autres résidents ou par le propriétaire de la parcelle.
+(Bousculer fait référence à la fonction LSL llPushObjet().)
+
+Valeur par défaut : désactivé
+	</notification>
+	<notification label="Fusionner/Diviser des parcelles" name="HelpParcelChanges">
+		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 ils ont les pouvoirs nécessaires.
+   Si cette case est cochée :
+ * Tous les propriétaires peuvent fusionner ou diviser leurs parcelles.
+ * Pour les parcelles appartenant à un groupe, les membres avec les pouvoirs nécessaires peuvent fusionner ou diviser les parcelles.
+
+Valeur par défaut : activée
+	</notification>
+	<notification label="Ne pas afficher dans la recherche" name="HelpRegionSearch">
+		Si vous cochez cette option, les propriétaires ne pourront pas faire apparaître leurs parcelles dans les résultats de recherche.
+Valeur par défaut : désactivé
+	</notification>
+	<notification label="Catégorie de la région modifiée" name="RegionMaturityChange">
+		La catégorie d&apos;accès de cette région a été mise à jour.
+Ce changement n&apos;apparaîtra pas immédiatement sur la carte.
+	</notification>
+	<notification label="Revente de terrain" name="HelpRegionLandResell">
+		Les propriétaires et gérants de domaine peuvent vendre n&apos;importe quel terrain appartenant au propriétaire du domaine.
+Si cette option n&apos;est pas cochée, les propriétaires ne peuvent pas revendre leur parcelle.
+Si cette option est cochée, les propriétaires sont libres de revendre leur parcelle.
+
+Valeur par défaut : désactivé
+	</notification>
+	<notification label="Désactiver les scripts" name="HelpRegionDisableScripts">
+		Lorsque la performance d&apos;une région est faible, cela peut venir d&apos;un script. Ouvrez la section Statistiques (Ctrl-Maj-1) et vérifiez le FPS Physique (Physics FPS) de la section Simulateur.
+Si le FPS est en dessous de 45, ouvrez la section Time située en fin de liste. Si le Script Time est au dessus de 25ms, cliquez sur le bouton Afficher les objets scriptés les plus consommateurs. Vous verrez le nom et l&apos;emplacement des scripts éventuellement à 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 le temps d&apos;arriver à l&apos;endroit su script en cause. Une fois sur place, assurez-vous que le script est bien à l&apos;origine du problème. Pour cela, vous devrez peut-être contacter le propriétaire du script ou bien supprimer ou renvoyer l&apos;objet.
+Décochez la case Désactiver le script, puis cliquez sur Appliquer pour réactiver tous les scripts dans la région.
+
+Valeur par défaut : désactivé
+	</notification>
+	<notification label="Désactiver les collisions" name="HelpRegionDisableCollisions">
+		Des objets physiques peuvent fortement réduire les performances d&apos;une région.
+Ouvrez la barre de statistiques (Ctrl-Maj-1) et vérifiez le FPS Physique (Physics FPS) de la section Simulateur.
+Si le FPS est en dessous de 45, ouvrez la section Time située en fin de liste. Si le Script Time est au dessus de 25ms, cliquez sur le bouton Afficher les collisions les plus consommatrices.
+Vous verrez le nom et l&apos;emplacement des objets physiques éventuellement à l&apos;origine du problème.
+
+Si vous décochez la case Désactiver les collisions et que vous cliquez sur Appliquer, toutes les collisions entre objets seront désactivées. Vous pourrez avoir besoin de cette fonction le temps d&apos;arriver à l&apos;emplacement des objets en cause. Une fois sur place, vérifiez que l&apos;&apos;objet est bien responsable du problème (entre-t-il sans cesse en collision avec d&apos;autres objets ?) Pour cela, vous devrez peut-être contacter le propriétaire de l&apos;objet ou bien supprimer ou renvoyer l&apos;objet.
+Décochez la case Désactiver les collisions, puis cliquez sur le bouton Appliquer pour réactiver les collisions dans la région.
+
+Valeur par défaut : désactivé
+	</notification>
+	<notification label="Désactiver la physique" name="HelpRegionDisablePhysics">
+		L&apos;option Désactiver la physique est similaire à l&apos;option Désactiver les collisions sauf qu&apos;elle englobe tous les effets liés à la physique. Cela signifie que les objets n&apos;entreront plus en collision et que les avatars ne pourront plus bouger.
+
+Vous ne devriez utiliser cette option que lorsque l&apos;option Désactiver les collisions n&apos;améliore pas sufisamment la performance de la région pour résoudre un problème de physique ou trouver les objets entrant en collision.
+
+Une fois que vous avez fini, n&apos;oubliez pas de réactiver les propriétés physiques sinon les avatars ne pourront pas bouger.
+
+Valeur par défaut : désactivé
+	</notification>
+	<notification label="Afficher les collisions les plus consommatrices" name="HelpRegionTopColliders">
+		Montre une liste des objets générant le plus de collisions avec d&apos;autres objets. Ces objets peuvent ralentir les performances de votre région. Sélectionnez Affichage &gt; Statistiques et regardez sous Simulator &gt; Time &gt; Sim Time (Physics) pour voir si le temps du moteur physique est au dessus de 20 ms.
+	</notification>
+	<notification label="Afficher les objets scriptés les plus consommateurs" name="HelpRegionTopScripts">
+		Dresse une liste des objets dont les scripts consomment le plus de ressources. Ces objets peuvent ralentir la performance de votre région.
+Sélectionnez Affichage &gt; Statistiques et regardez sous Simulator &gt; Time &gt; Script Time pour voir si le temps des scripts est au dessus de 25 ms.
+	</notification>
+	<notification label="Redémarrer la région" name="HelpRegionRestart">
+		Redémarre le serveur en charge de la région après deux minutes d&apos;avertissement. 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 de la région ne permet pas de résoudre la plupart des problèmes de performance. Les redémarrages ne doivent avoir lieu qu&apos;en dernier recours.
+	</notification>
+	<notification label="Niveau de l&apos;eau" name="HelpRegionWaterHeight">
+		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.
+
+
+Valeur par défaut : 20
+	</notification>
+	<notification label="Surélévation du terrain" name="HelpRegionTerrainRaise">
+		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.
+
+Valeur par défaut : 4
+	</notification>
+	<notification label="Abaisser le terrain" name="HelpRegionTerrainLower">
+		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.
+
+Valeur par défaut : -4
+	</notification>
+	<notification label="Charger le terrain au format RAW" name="HelpRegionUploadRaw">
+		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.
+
+Le chargement peut prendre jusqu&apos;à 45 secondes. Veuillez noter que le chargement d&apos;un fichier terrain ne déplacera pas les objets qui se trouvent sur le terrain, mais seulement le terrain et les droits associés aux parcelles. Certains objets risquent d&apos;aller sous la terre.
+
+Pour en savoir plus sur la modification de la hauteur des terrains d&apos;une région, consultez l&apos;Aide F1.
+	</notification>
+	<notification label="Télécharger le terrain au format RAW" name="HelpRegionDownloadRaw">
+		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 certains droits relatifs à 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 en savoir plus sur la modification de la hauteur des terrains d&apos;une région, consultez l&apos;Aide F1.
+	</notification>
+	<notification label="Utiliser le soleil du domaine" name="HelpRegionUseEstateSun">
+		Si vous cochez cette case, la position du soleil dans cette région sera la même que dans le reste du domaine.
+
+Valeur par défaut : activé
+	</notification>
+	<notification label="Soleil fixe" name="HelpRegionFixedSun">
+		Si vous cochez cette case, la position du soleil se fixe sur celle du curseur Phase et le soleil arrête de bouger.
+
+Valeur par défaut : désactivé
+	</notification>
+	<notification label="Figer le terrain" name="HelpRegionBakeTerrain">
+		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.
+	</notification>
+	<notification label="Gérants du domaine" name="HelpEstateEstateManager">
+		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.
+
+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.
+	</notification>
+	<notification label="Utiliser le temps universel" name="HelpEstateUseGlobalTime">
+		Cette case permet au soleil de votre domaine de suivre la position du soleil sur les domaines Linden du continent.
+
+Valeur par défaut : activé
+	</notification>
+	<notification label="Soleil fixe" name="HelpEstateFixedSun">
+		Si vous cochez cette case, la position du soleil se fixe sur celle du curseur Phase et le soleil arrête de bouger.
+	</notification>
+	<notification label="Accès public" name="HelpEstateExternallyVisible">
+		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.
+
+Valeur par défaut : activé
+	</notification>
+	<notification label="Autoriser la téléportation directe" name="HelpEstateAllowDirectTeleport">
+		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.
+
+Valeur par défaut : désactivé
+	</notification>
+	<notification label="Autoriser l&apos;accès" name="HelpEstateAllowResident">
+		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.
+	</notification>
+	<notification label="Autoriser l&apos;accès de groupe" name="HelpEstateAllowGroup">
+		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.
+	</notification>
+	<notification label="Adresse e-mail où signaler une infraction" name="HelpEstateAbuseEmailAddress">
+		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.
+	</notification>
+	<notification label="Refuser l&apos;accès" name="HelpEstateBanResident">
+		Les résidents figurant sur cette liste ne peuvent pas pénétrer sur votre domaine, quels que soient les autres paramètres.
+	</notification>
+	<notification label="Autoriser les chats vocaux" name="HelpEstateVoiceChat">
+		Les parcelles de ce domaine peuvent avoir leurs propres canaux vocaux, ce qui permet aux résidents de communiquer avec leurs voisins.
+
+Valeur par défaut : désactivé
+	</notification>
+	<notification label="Versions de voix non compatibles" name="VoiceVersionMismatch">
+		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.
+	</notification>
+	<notification label="Règlement du domaine" name="HelpEstateCovenant">
+		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.
+
+Un règlement sert à communiquer des règles, des lignes directrices ou informations culturelles, ou simplement à expliquer vos attentes à un acheteur potentiel. Il peut s&apos;agir de régulations concernant la construction, les options de paiement ou tout autre information que vous souhaitez faire passer au résident avant que l&apos;achat n&apos;ait lieu.
+
+L&apos;acheteur est tenu  d&apos;accepter le règlement en cochant une case avant de pouvoir finaliser l&apos;achat. Les règlements, lorsqu&apos;ils existent, apparaissent toujours dans la boîte de dialogue À propos du terrain.
+	</notification>
+	<notification label="Impossible d&apos;acheter des objets" name="BuyObjectOneOwner">
+		Impossible d&apos;acheter simultanément des objets de propriétaires différents.
+Veuillez ne sélectionner qu&apos;un seul objet.
+	</notification>
+	<notification label="Impossible d&apos;acheter des contenus" name="BuyContentsOneOnly">
+		Impossible d&apos;acheter les contenus de plus d&apos;un objet à la fois.
+Veuillez ne sélectionner qu&apos;un seul objet.
+	</notification>
+	<notification label="Impossible d&apos;acheter des contenus" name="BuyContentsOneOwner">
+		Impossible d&apos;acheter simultanément des objets de propriétaires différents.
+Veuillez ne sélectionner qu&apos;un seul objet.
+	</notification>
+	<notification name="BuyOriginal">
+		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]
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="BuyOriginalNoOwner">
+		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]
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="BuyCopy">
+		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]
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="BuyCopyNoOwner">
+		Acheter une copie pour [PRICE] L$ ?
+L&apos;objet sera copié dans votre inventaire.
+Vous pourrez :
+ Modifier : [MODIFYPERM]
+ Copier : [COPYPERM]
+ Revendre ou donner : [RESELLPERM]
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="BuyContents">
+		Acheter des contenus pour [PRICE] L$ à [OWNER] ?
+Ils seront copiés dans votre inventaire.
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="BuyContentsNoOwner">
+		Acheter des contenus pour [PRICE] L$ ?
+Ils seront copiés dans votre inventaire.
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmPurchase">
+		Suite à cette transaction, vous allez :
+[ACTION]
+
+Etes-vous certain(e) de vouloir effectuer cette transaction ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmPurchasePassword" type="password">
+		Suite à cette transaction, vous allez :
+[ACTION]
+
+Etes-vous certain(e) de vouloir effectuer cette transaction ?
+Veuillez saisir à nouveau votre mot de passe et cliquez sur OK.
+		<form name="form">
+			<button name="ConfirmPurchase" text="OK"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification name="SetPickLocation">
+		Remarque :
+vous avez mis à jour l&apos;emplacement de ce favori mais les autres détails resteront inchangés.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MoveInventoryFromObject">
+		Vous avez sélectionné des objets non copiables.
+Ces objets seront déplacés dans votre inventaire et non pas copiés.
+
+Déplacer les objets de l&apos;inventaire ?
+		<usetemplate ignoretext="Lors du transfert d&apos;un inventaire non copiable depuis des objets" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="MoveInventoryFromScriptedObject">
+		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.
+L&apos;objet les contenant est scripté, déplacer ces objets peut causer des problèmes au niveau du script.
+
+Déplacer les objets de l&apos;inventaire ?
+		<usetemplate ignoretext="Lors du transfert d&apos;un inventaire non copiable depuis des objets scriptés" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ClickActionNotPayable">
+		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().
+		<form name="form">
+			<ignore name="ignore" text="Lors du paramétrage de la fonction Payer sur des objets sans événement monétaire"/>
+		</form>
+	</notification>
+	<notification name="OpenObjectCannotCopy">
+		Vous n&apos;êtes autorisé(e) à copier aucun élément dans cet objet.
+	</notification>
+	<notification name="WebLaunchAccountHistory">
+		Aller sur le site de Second Life pour consulter l&apos;historique de votre compte.
+		<usetemplate ignoretext="Lors du chargement de la page web contenant l&apos;historique de votre compte" name="okcancelignore" notext="Annuler" yestext="Aller sur cette page"/>
+	</notification>
+	<notification name="ClickOpenF1Help">
+		Visiter les pages d&apos;aide de Second Life.
+		<usetemplate ignoretext="Lors de la visite des pages d&apos;aide de Second Life" name="okcancelignore" notext="Annuler" yestext="Aller"/>
+	</notification>
+	<notification name="ConfirmQuit">
+		Etes-vous certain(e) de vouloir quitter ?
+		<usetemplate ignoretext="Lorsque vous quittez Second Life" name="okcancelignore" notext="Continuer" yestext="Quitter"/>
+	</notification>
+	<notification name="HelpReportAbuseEmailLL">
+		Utilisez cet outil pour signaler des infractions aux Conditions d&apos;utilisation et aux Règles de la communauté. Voir :
+
+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 :
+
+http://secondlife.com/support/incidentreport.php
+	</notification>
+	<notification name="HelpReportAbuseEmailEO">
+		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 la région dans laquelle vous êtes a choisi de recevoir et de s&apos;occuper de tous les rapports envoyés à partir de cette région. Linden Lab n&apos;enquêtera pas sur les rapports que vous envoyez à partir de cet endroit.
+
+Le propriétaire de la région traitera les rapports en fonction des règles de cette région, comme indiqué dans le réglement du domaine.
+(Les réglements sont visibles à partir du menu Monde &gt; À propos du terrain.)
+
+La résolution de ce rapport ne s&apos;applique qu&apos;à cette région ; L&apos;accès aux autres endroits de Second Life 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.
+	</notification>
+	<notification name="HelpReportBug">
+		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.
+	</notification>
+	<notification name="HelpReportAbuseSelectCategory">
+		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.
+	</notification>
+	<notification name="HelpReportBugSelectCategory">
+		Veuillez choisir une catégorie pour ce bug.
+Le choix d&apos;une catégorie nous permet de traiter les bugs plus rapidement.
+	</notification>
+	<notification name="HelpReportAbuseAbuserNameEmpty">
+		Veuillez saisir le nom du contrevenant.
+Lorsque nous avons le nom du contrevenant, nous sommes en mesure de traiter les rapports plus rapidement.
+	</notification>
+	<notification name="HelpReportAbuseAbuserLocationEmpty">
+		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.
+	</notification>
+	<notification name="HelpReportAbuseSummaryEmpty">
+		Veuillez saisir un récapitulatif de l&apos;infraction.
+Les récapitulatifs précis nous permettent de traiter les rapports plus rapidement.
+	</notification>
+	<notification name="HelpReportBugSummaryEmpty">
+		Veuillez saisir un récapitulatif du bug.
+Les récapitulatifs précis nous permettent de résoudre les bugs plus rapidement.
+	</notification>
+	<notification name="HelpReportAbuseDetailsEmpty">
+		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.
+	</notification>
+	<notification name="HelpReportBugDetailsEmpty">
+		Veuillez saisir une description détaillée du bug.
+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.
+	</notification>
+	<notification name="HelpReportAbuseContainsCopyright">
+		Cher résident,
+
+Il semble que vous souhaitiez reporter une infraction à des droits de propriété intellectuelle. Pour signaler correctement cette infraction :
+
+(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 droits 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.
+
+(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.
+
+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 droits.
+
+Merci,
+
+Linden Lab
+	</notification>
+	<notification name="FailedRequirementsCheck">
+		Les composantes requises suivantes ne se trouvent pas dans [FLOATER]:
+[COMPONENTS]
+	</notification>
+	<notification label="Remplacer la pièce-jointe existante" name="ReplaceAttachment">
+		Vous avez déjà un objet sur cette partie du corps.
+Voulez-vous le remplacer par l&apos;objet sélectionné ?
+		<form name="form">
+			<ignore name="ignore" save_option="true" text="Lors du remplacement de pièces-jointes existantes"/>
+			<button ignore="Remplacer automatiquement" name="Yes" text="OK"/>
+			<button ignore="Ne jamais remplacer" name="No" text="Annuler"/>
+		</form>
+	</notification>
+	<notification label="Réponse si occupé(e)" name="BusyModePay">
+		Vous êtes en mode occupé et vous ne recevrez donc aucun objet en échange de ce paiement.
+
+Souhaitez-vous quitter le mode occupé avant de terminer cette transaction ?
+		<form name="form">
+			<ignore name="ignore" save_option="true" text="Lorsque vous envoyez de l&apos;argent à une personne en mode Occupé"/>
+			<button ignore="Toujours quitter le mode occupé" name="Yes" text="OK"/>
+			<button ignore="Ne jamais quitter le mode occupé" name="No" text="Annuler"/>
+		</form>
+	</notification>
+	<notification name="ConfirmEmptyTrash">
+		Etes-vous certain(e) de vouloir supprimer le contenu de votre corbeille de manière permanente  ?
+		<usetemplate ignoretext="Lorsque vous videz la corbeille de l&apos;inventaire" name="okcancelignore" notext="Annuler" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmClearBrowserCache">
+		Etes-vous certain(e) de vouloir vider le cache de votre navigateur ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Oui"/>
+	</notification>
+	<notification name="ConfirmClearCookies">
+		Etes-vous certain(e) de vouloir supprimer vos cookies ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Oui"/>
+	</notification>
+	<notification name="ConfirmClearMediaUrlList">
+		Etes-vous certain(e) de vouloir supprimer la liste des URL enregistrées ?
+		<usetemplate name="okcancelbuttons" notext="Annuler" yestext="Oui"/>
+	</notification>
+	<notification name="ConfirmEmptyLostAndFound">
+		Etes-vous certain(e) de vouloir supprimer le contenu de votre dossier Objets trouvés de manière permanente ?
+		<usetemplate ignoretext="Losque vous videz le dossier Objets trouvés dans votre inventaire" name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="CopySLURL">
+		La SLURL suivante a été copiée dans votre presse-papiers :
+ [SLURL]
+
+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.
+		<form name="form">
+			<ignore name="ignore" text="Lorsque vous copiez une SLURL dans votre presse-papier"/>
+		</form>
+	</notification>
+	<notification name="GraphicsPreferencesHelp">
+		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 :
+
+Effets : active ou désactive les différents types de shaders pixels.
+
+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 influent sur la manière dont le client rend les avatars.
+
+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 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.
+
+Sources lumineuses : définit les types de lumières que vous souhaitez faire apparaître.
+
+Rendu du terrain : définit le niveau de détail que vous souhaitez utiliser dans la texture du terrain.
+	</notification>
+	<notification name="WLSavePresetAlert">
+		Voulez-vous écraser l&apos;option précédemment enregistrée ?
+		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="WLDeletePresetAlert">
+		Voulez-vous supprimer [SKY] ?
+		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="WLNoEditDefault">
+		Vous ne pouvez pas éditer ou supprimer un préréglage par défaut.
+	</notification>
+	<notification name="WLMissingSky">
+		Une dossier semble manquer au Cycle du jour : [SKY].
+	</notification>
+	<notification name="PPSaveEffectAlert">
+		Certains effets post-traitement existent. Voulez-vous quand même écraser ce fichier ?
+		<usetemplate name="okcancelbuttons" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="HelpEditSky">
+		Pour créer et sauvegarder plusieurs ciels, utilisez les curseurs WindLight.
+	</notification>
+	<notification name="HelpEditDayCycle">
+		Choisissez quel ciel apparaît au cours de la journée.
+	</notification>
+	<notification name="EnvSettingsHelpButton">
+		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 dans le client, utilisez le curseur Heure de la journée.
+
+Le curseur Couverture nuageuse permet de contrôler le nombre de nuages dans le ciel.
+
+L&apos;option Couleur de l&apos;eau vous permet de modifier la couleur de l&apos;eau grâce au sélecteur de couleurs.
+
+Le curseur Brouillard dans l&apos;eau permet de contrôler la densité du brouillard sous l&apos;eau.
+
+Pour synchroniser l&apos;heure du jour sur celle de la région, cliquez sur Utiliser heure domaine.
+
+En cliquant sur le bouton Ciel Avancé, vous aurez accès à tous les réglages relatifs au ciel.
+
+En cliquant sur le bouton Eau Avancée, vous aurez accès à tous les réglages relatifs à l&apos;eau.
+	</notification>
+	<notification name="HelpDayCycle">
+		L&apos;éditeur du cycle du jour vous permet de contrôler le ciel au cours du cycle jour/nuit de second Life. C&apos;est ce même cycle qui est contrôlé par le curseur Heure de la journée dans l&apos;éditeur d&apos;environnement basique.
+
+L&apos;éditeur du jour fonctionne grâce au réglage d&apos;images-clés. Ces images-clés sont représentées par les marques grises sur la ligne du temps et ont des préréglages qui leurs sont associées. Au cours de la journée et de la nuit, le ciel WindLight s&apos;anime en passant d&apos;une clé à l&apos;autre.
+
+La flèche jaune au dessus de la ligne du temps représente votre vue actuelle, basée sur l&apos;heure de la journée. Cliquez et faites glisser pour voir l&apos;animation au cours de votre journée. Ajoutez ou supprimez des clés en appuyant sur les boutons Ajouter clé ou Supprimer clé, à droite de la ligne du temps.
+
+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 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.
+	</notification>
+	<notification name="HelpBlueHorizon">
+		Utilisez les curseurs Rouge/Vert/Bleu (RVB) pour ajuster la couleur du ciel. Pour déplacer les trois curseurs en même temps, utilisez le curseur Intensité.
+	</notification>
+	<notification name="HelpHazeHorizon">
+		Le paramètre Quantité de brume est l&apos;un des plus utiles pour ajuster l&apos;exposition lumineuse de la scène.
+Il permet de simuler de nombreux paramètres d&apos;exposition, tels que les voiles blancs créés par le soleil ou des lumières plus foncées.
+	</notification>
+	<notification name="HelpBlueDensity">
+		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).
+	</notification>
+	<notification name="HelpHazeDensity">
+		Le paramètre Densité de la brume permet de contrôler le niveau de brume grisâtre dans l&apos;atmosphère. Ce paramètre est utile pour simuler les scènes dans lesquelles il y a beaucoup de fumée et de substances polluantes émises par l&apos;homme. Il est également utile pour simuler le brouillard et la brume.
+	</notification>
+	<notification name="HelpDensityMult">
+		Utilisez le Multiplicateur de densité pour modifier la densité atmosphérique générale. Une valeur basse donne l&apos;impression d&apos;un air « léger » alors qu&apos;une valeur élevée donne l&apos;impression d&apos;un air « lourd » et enfumé.
+	</notification>
+	<notification name="HelpDistanceMult">
+		Ajuste la distance perçue par WindLight.
+La valeur zéro désactive l&apos;influence de WindLight sur le terrain et les objets.
+Les valeurs supérieures à 1 simulent des distances plus importantes pour des effets atmosphériques plus épais.
+	</notification>
+	<notification name="HelpMaxAltitude">
+		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.
+	</notification>
+	<notification name="HelpSunlightColor">
+		Ajuste la couleur et l&apos;intensité de la lumière directe de la scène.
+	</notification>
+	<notification name="HelpSunAmbient">
+		Ajuste la couleur et l&apos;intensité de la lumière atmosphérique ambiante.
+	</notification>
+	<notification name="HelpSunGlow">
+		Le curseur Taille contrôle la taille du soleil.
+Le curseur Netteté permet de rendre le soleil plus ou moins flou dans le ciel.
+	</notification>
+	<notification name="HelpSceneGamma">
+		Ajuste la distribution de clair et de foncé sur l&apos;écran.
+	</notification>
+	<notification name="HelpStarBrightness">
+		Vous permet de contrôler l&apos;intensité des étoiles dans le ciel.
+	</notification>
+	<notification name="HelpTimeOfDay">
+		Contrôle la position du soleil dans le ciel.
+Même chose que l&apos;élévation.
+	</notification>
+	<notification name="HelpEastAngle">
+		Contrôle la position du soleil dans le ciel.
+Même chose que l&apos;azimut.
+	</notification>
+	<notification name="HelpCloudColor">
+		Modifie la couleur des nuages. Il est recommandé de laisser les nuages en blanc mais vous pouvez aussi faire preuve de créativité.
+	</notification>
+	<notification name="HelpCloudDetail">
+		Contrôle le détail de l&apos;image placée sur l&apos;image du nuage principal. X et Y contrôlent sa position. D (Densité) permet de rendre les nuages plus ou moins pleins ou plus ou moins fracturés.
+	</notification>
+	<notification name="HelpCloudDensity">
+		Vous permet de contrôler la position des nuages avec les curseurs X et Y ainsi que leur densité avec le curseur D.
+	</notification>
+	<notification name="HelpCloudCoverage">
+		Contrôle la surface du ciel couverte par les nuages.
+	</notification>
+	<notification name="HelpCloudScale">
+		Contrôle l&apos;échelle de l&apos;image des nuages sur le dôme du ciel.
+	</notification>
+	<notification name="HelpCloudScrollX">
+		Contrôle la vitesse des nuages sur l&apos;axe des X.
+	</notification>
+	<notification name="HelpCloudScrollY">
+		Contrôle la vitesse des nuages sur l&apos;axe des Y.
+	</notification>
+	<notification name="HelpClassicClouds">
+		Cochez cette option pour utiliser les anciens nuages de Second Life en plus des nuages WindLight.
+	</notification>
+	<notification name="HelpWaterFogColor">
+		Permet de sélectionner la couleur du brouillard sous l&apos;eau.
+	</notification>
+	<notification name="HelpWaterFogDensity">
+		Contrôle la densité du brouillard sous l&apos;eau, ainsi que votre visibilité.
+	</notification>
+	<notification name="HelpUnderWaterFogMod">
+		Modifie l&apos;effet créé par l&apos;option Densité du brouillard pour contrôler votre visibilité quand votre avatar est sous l&apos;eau.
+	</notification>
+	<notification name="HelpWaterGlow">
+		Contrôle l&apos;éclat de l&apos;eau à la surface.
+	</notification>
+	<notification name="HelpWaterNormalScale">
+		Contrôle l&apos;échelle des trois vaguelettes qui forment l&apos;eau.
+	</notification>
+	<notification name="HelpWaterFresnelScale">
+		Contrôle la quantité de lumière réfléchie à des angles différents.
+	</notification>
+	<notification name="HelpWaterFresnelOffset">
+		Contrôle l&apos;intensité de la lumière réfléchie.
+	</notification>
+	<notification name="HelpWaterScaleAbove">
+		Contrôle la quantité de lumière réfractée lorsque votre avatar regarde au dessus de l&apos;eau.
+	</notification>
+	<notification name="HelpWaterScaleBelow">
+		Contrôle la quantité de lumière réfractée lorsque votre avatar est sous l&apos;eau.
+	</notification>
+	<notification name="HelpWaterBlurMultiplier">
+		Contrôle le mélange reflets/vagues.
+	</notification>
+	<notification name="HelpWaterNormalMap">
+		Contrôle quelle normal map est posée sur l&apos;eau pour déterminer la réflection/réfraction.
+	</notification>
+	<notification name="HelpWaterWave1">
+		Contrôle dans quelle direction et à quelle vitesse la version grande échelle de la normal map se déplace sur l&apos;axe des X et l&apos;axe des Y.
+	</notification>
+	<notification name="HelpWaterWave2">
+		Contrôle dans quelle direction et à quelle vitesse la version grande échelle de la normal map se déplace sur l&apos;axe des X et l&apos;axe des Y.
+	</notification>
+	<notification name="NewSkyPreset">
+		Nommez le nouveau ciel.
+		<form name="form">
+			<input name="message" type="text">
+				Nouveau préréglage
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification name="ExistsSkyPresetAlert">
+		Ce préréglage existe déjà !
+	</notification>
+	<notification name="NewWaterPreset">
+		Nommez ce nouveau préréglage d&apos;eau.
+		<form name="form">
+			<input name="message" type="text">
+				Nouveau préréglage
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification name="ExistsWaterPresetAlert">
+		Ce préréglage existe déjà !
+	</notification>
+	<notification name="WaterNoEditDefault">
+		Vous ne pouvez pas éditer ou supprimer un préréglage par défaut.
+	</notification>
+	<notification name="ChatterBoxSessionStartError">
+		Impossible de démarrer une nouvelle session de chat avec [RECIPIENT].
+[REASON]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="ChatterBoxSessionEventError">
+		[EVENT]
+[REASON]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="ForceCloseChatterBoxSession">
+		Vous devez terminer votre session de chat avec [NAME].
+[REASON]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="Cannot_Purchase_an_Attachment">
+		Les objets qui font partie d&apos;une pièce-jointe ne peuvent pas être achetés.
+	</notification>
+	<notification label="À propos des requêtes pour les autorisations de débit" name="DebitPermissionDetails">
+		Accepter cette requête donne au script l&apos;autorisation de prélever des dollars Linden (L$) sur votre compte de manière continue. Pour révoquer cette autorisation, le propriétaire de l&apos;objet doit supprimer l&apos;objet ou bien réinitialiser les scripts dans l&apos;objet.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="AutoWearNewClothing">
+		Voulez-vous automatiquement porter l&apos;habit que vous créez ?
+		<usetemplate ignoretext="Porter automatiquement" name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="NotAgeVerified">
+		Pour que vous puissiez accéder à cette parcelle, votre âge doit être vérifié.
+Voulez-vous aller sur le site de Second Life pour vérifier votre âge ?
+
+[_URL]
+		<url name="url" option="0">
+			https://secondlife.com/account/verification.php?lang=fr
+		</url>
+		<usetemplate ignoretext="Avertir si l&apos;âge n&apos;a pas été vérifié" name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="Cannot enter parcel: no payment info on file">
+		Avant de pouvoir pénétrer sur cette parcelle, vous devez enregistrer vos informations de paiement.
+Voulez-vous aller sur le site de Second Life pour enregistrer ces informations ?
+
+[_URL]
+		<url name="url" option="0">
+			https://secondlife.com/account/index.php?lang=fr
+		</url>
+		<usetemplate ignoretext="Avertir si les informations de paiement ne sont pas fournies" name="okcancelignore" notext="Non" yestext="Oui"/>
+	</notification>
+	<notification name="MissingString">
+		The string [STRING_NAME] is missing from strings.xml
+	</notification>
+	<notification name="SystemMessageTip">
+		[MESSAGE]
+	</notification>
+	<notification name="Cancelled">
+		Annulé
+	</notification>
+	<notification name="CancelledSit">
+		Action annulée
+	</notification>
+	<notification name="CancelledAttach">
+		Attachement annulé
+	</notification>
+	<notification name="ReplacedMissingWearable">
+		Habits et parties du corps manquants remplacés par les éléments par défaut.
+	</notification>
+	<notification name="GroupNotice">
+		Sujet : [SUBJECT], Message : [MESSAGE]
+	</notification>
+	<notification name="FriendOnline">
+		[NAME] est connecté(e)
+	</notification>
+	<notification name="FriendOffline">
+		[NAME] est déconnecté(e)
+	</notification>
+	<notification name="AddSelfFriend">
+		Vous ne pouvez pas devenir ami avec vous-même.
+	</notification>
+	<notification name="UploadingAuctionSnapshot">
+		Importation de photos SL et Web en cours
+(prend environ 5 minutes…)
+	</notification>
+	<notification name="UploadPayment">
+		Le chargement a coûté [AMOUNT] L$.
+	</notification>
+	<notification name="UploadWebSnapshotDone">
+		Photo Web importée
+	</notification>
+	<notification name="UploadSnapshotDone">
+		Photo SL importée
+	</notification>
+	<notification name="TerrainDownloaded">
+		Fichier terrain.raw téléchargé
+	</notification>
+	<notification name="GestureMissing">
+		Geste [NAME] absent de la base de données.
+	</notification>
+	<notification name="UnableToLoadGesture">
+		Impossible de charger le geste [NAME].
+Merci de réessayer.
+	</notification>
+	<notification name="LandmarkMissing">
+		Repère absent de la base de données.
+	</notification>
+	<notification name="UnableToLoadLandmark">
+		Impossible de charger le repère. Merci de réessayer.
+	</notification>
+	<notification name="CapsKeyOn">
+		La touche Verr.maj est activée.
+Ce mode modifie le mot de passe que vous saisissez, vous devriez le quitter.
+	</notification>
+	<notification name="NotecardMissing">
+		Note absente de la base de données.
+	</notification>
+	<notification name="NotecardNoPermissions">
+		Permissions insuffisantes pour voir la note.
+	</notification>
+	<notification name="RezItemNoPermissions">
+		Permissions insuffisantes pour rezzer l&apos;objet.
+	</notification>
+	<notification name="UnableToLoadNotecard">
+		Impossible de lire les données de la note actuellement.
+	</notification>
+	<notification name="ScriptMissing">
+		Script absent de la base de données.
+	</notification>
+	<notification name="ScriptNoPermissions">
+		Permissions insuffisantes pour voir le script.
+	</notification>
+	<notification name="UnableToLoadScript">
+		Impossible de charger le script. Merci de réessayer.
+	</notification>
+	<notification name="IncompleteInventory">
+		Tous les éléments que vous souhaitez transférer ne sont pas encore disponibles sur le serveur.
+Merci d&apos;essayer à nouveau dans une minute.
+	</notification>
+	<notification name="CannotModifyProtectedCategories">
+		Vous ne pouvez pas modifier de catégories protégées.
+	</notification>
+	<notification name="CannotRemoveProtectedCategories">
+		Vous ne pouvez pas supprimer de catégories protégées.
+	</notification>
+	<notification name="OfferedCard">
+		Vous avez offert votre carte de visite à [NAME].
+	</notification>
+	<notification name="UnableToBuyWhileDownloading">
+		Achat impossible durant le chargement de l&apos;objet.
+Merci de réessayer.
+	</notification>
+	<notification name="UnableToLinkWhileDownloading">
+		Impossible de lier durant le chargement de l&apos;objet.
+Merci de réessayer.
+	</notification>
+	<notification name="CannotBuyObjectsFromDifferentOwners">
+		Impossible d&apos;acheter simultanément des objets de propriétaires différents. Veuillez sélectionner un seul objet.
+	</notification>
+	<notification name="ObjectNotForSale">
+		Cet objet ne semble pas à vendre.
+	</notification>
+	<notification name="EnteringGodMode">
+		Activation du mode divin : niveau [LEVEL]
+	</notification>
+	<notification name="LeavingGodMode">
+		Désactivation du mode divin : niveau [LEVEL]
+	</notification>
+	<notification name="CopyFailed">
+		Copie impossible, droits insuffisants.
+	</notification>
+	<notification name="InventoryAccepted">
+		[NAME] a accepté votre envoi.
+	</notification>
+	<notification name="InventoryDeclined">
+		[NAME] a refusé votre envoi.
+	</notification>
+	<notification name="ObjectMessage">
+		[NAME]: [MESSAGE]
+	</notification>
+	<notification name="CallingCardAccepted">
+		Votre carte de visite a été acceptée.
+	</notification>
+	<notification name="CallingCardDeclined">
+		Votre carte de visite a été refusée.
+	</notification>
+	<notification name="TeleportToLandmark">
+		A présent que vous êtes sur le continent, vous pouvez voyager par téléportation (vers [NAME] par exemple). Cliquez sur le bouton Inventaire en bas à droite de l&apos;écran puis sélectionnez le dossier Repères (Landmarks).
+Choisissez un repère, double-cliquez dessus et cliquez sur Téléporter.
+	</notification>
+	<notification name="TeleportToPerson">
+		A présent que vous êtes sur le continent, vous pouvez contacter des résidents (tel [NAME] par exemple). Cliquez sur le bouton Inventaire en bas à droite de l&apos;écran puis sélectionnez le dossier Cartes de visite (Calling Cards).
+Choisissez en une, double-cliquez dessus et cliquez sur Message Instantané.
+	</notification>
+	<notification name="CantSelectLandFromMultipleRegions">
+		Vous ne pouvez pas sélectionner de terrain en dehors des limites du serveur.
+Veuillez sélectionner un terrain plus petit.
+	</notification>
+	<notification name="SearchWordBanned">
+		Certains termes de votre recherche ont été exclus car ils ne correspondaient pas aux standards fixés dans les Règles communautaires.
+	</notification>
+	<notification name="NoContentToSearch">
+		Veuillez sélectionner au moins un type de contenu à rechercher (PG, Mature ou Adulte)
+	</notification>
+	<notification name="GroupVote">
+		[NAME] a proposé un vote pour :
+[MESSAGE]
+		<form name="form">
+			<button name="VoteNow" text="Voter"/>
+			<button name="Later" text="Plus tard"/>
+		</form>
+	</notification>
+	<notification name="SystemMessage">
+		[MESSAGE]
+	</notification>
+	<notification name="EventNotification">
+		Avis d&apos;événement :
+
+[NAME]
+[DATE]
+		<form name="form">
+			<button name="Teleport" text="Téléporter"/>
+			<button name="Description" text="Description"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification name="TransferObjectsHighlighted">
+		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.
+		<form name="form">
+			<button name="Done" text="Transfert effectué"/>
+		</form>
+	</notification>
+	<notification name="DeactivatedGesturesTrigger">
+		Gestes désactivés ayant le même mot-clé :
+[NAMES]
+	</notification>
+	<notification name="NoQuickTime">
+		Le logiciel Apple QuickTime ne semble pas installé sur votre système.
+Pour voir les vidéos sur les terrains qui le permettent, allez sur le site de QuickTime (http://www.apple.com/fr/quicktime/download) et installez le lecteur QuickTime.
+	</notification>
+	<notification name="OwnedObjectsReturned">
+		Les objets que vous possédez sur la parcelle de terrain sélectionnée ont été renvoyés dans votre inventaire.
+	</notification>
+	<notification name="OtherObjectsReturned">
+		Les objets que vous possédez sur la parcelle de terrain appartenant à [NAME] ont été renvoyés dans votre inventaire.
+	</notification>
+	<notification name="OtherObjectsReturned2">
+		Les objets sur la parcelle appartenant à « [NAME] » ont étés renvoyés à leur propriétaire.
+	</notification>
+	<notification name="GroupObjectsReturned">
+		Les objets sélectionnés sur la parcelle de terrain partagée avec le groupe [GROUPNAME] ont été renvoyés dans l&apos;inventaire de leur propriétaire.
+Les objets donnés transférables ont étés renvoyés à leur propriétaire.
+Les objets non transférables donnés au groupe ont étés supprimés.
+	</notification>
+	<notification name="UnOwnedObjectsReturned">
+		Les objets sélectionnés sur la parcelle et qui ne sont pas à vous ont été rendus à leurs propriétaires.
+	</notification>
+	<notification name="NotSafe">
+		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.
+	</notification>
+	<notification name="NoFly">
+		Le vol est interdit sur ce terrain (« pas de vol »).
+Vous ne pouvez pas voler ici.
+	</notification>
+	<notification name="PushRestricted">
+		Les bousculades sont interdites sur ce terrain.
+Vous ne pouvez pas pousser les autres à moins que vous soyez propriétaire de ce terrain.
+	</notification>
+	<notification name="NoVoice">
+		La voix est désactivée sur ce terrain.
+	</notification>
+	<notification name="NoBuild">
+		Le mode construction sur ce terrain est désactivé (« pas de construction »).
+Vous ne pouvez pas créer d&apos;objets ici.
+	</notification>
+	<notification name="ScriptsStopped">
+		Un administrateur a temporairement stoppé les scripts dans cette région.
+	</notification>
+	<notification name="ScriptsNotRunning">
+		Aucun script ne fonctionne dans cette région.
+	</notification>
+	<notification name="NoOutsideScripts">
+		Les scripts externes sont désactivés sur ce terrain (« pas de scripts externes »).
+Aucun script n&apos;est exécuté à part ceux du propriétaire du terrain.
+	</notification>
+	<notification name="ClaimPublicLand">
+		Vous ne pouvez réclamer qu&apos;un terrain public dans la région où vous vous trouvez actuellement.
+	</notification>
+	<notification name="RegionTPAccessBlocked">
+		Votre catégorie d&apos;accès ne vous autorise pas à pénétrer dans cette région. Vous devez sans doute procéder à la vérification de votre âge ou installer une version plus récente du client.
+
+Pour savoir comment accéder aux zones ayant un tel niveau d&apos;accès, veuillez consulter les pages d&apos;aide.
+	</notification>
+	<notification name="URBannedFromRegion">
+		Vous avez été banni de cette région.
+	</notification>
+	<notification name="NoTeenGridAccess">
+		Votre compte ne peut pas se connecter à cette région du Teen grid.
+	</notification>
+	<notification name="NoHelpIslandTP">
+		Vous ne pouvez pas retourner sur Help Island.
+Pour répéter le didacticiel, veuillez aller sur Help Island Public.
+	</notification>
+	<notification name="ImproperPaymentStatus">
+		Vous n&apos;avez pas le statut de paiement approprié pour pénétrer dans cette région.
+	</notification>
+	<notification name="MustGetAgeRegion">
+		Pour pouvoir pénétrer dans cette région, vous devez avoir procédé à la vérification de votre âge.
+	</notification>
+	<notification name="MustGetAgeParcel">
+		Pour pouvoir pénétrer sur cette parcelle, vous devez avoir procédé à la vérification de votre âge.
+	</notification>
+	<notification name="NoDestRegion">
+		Région de destination introuvable.
+	</notification>
+	<notification name="NotAllowedInDest">
+		Vous n&apos;êtes pas autorisé(e) dans cette région.
+	</notification>
+	<notification name="RegionParcelBan">
+		Impossible de traverser une parcelle bannie. Veuillez trouver une autre solution.
+	</notification>
+	<notification name="TelehubRedirect">
+		Vous avez été redirigé vers un téléhub.
+	</notification>
+	<notification name="CouldntTPCloser">
+		Il n&apos;a pas été possible de vous téléporter vers une destination plus proche.
+	</notification>
+	<notification name="TPCancelled">
+		Téléportation annulée.
+	</notification>
+	<notification name="FullRegionTryAgain">
+		La région dans laquelle vous essayez de pénétrer est pleine actuellement.
+Veuillez réessayer dans quelques minutes.
+	</notification>
+	<notification name="GeneralFailure">
+		Panne générale.
+	</notification>
+	<notification name="RoutedWrongRegion">
+		Dirigé vers la mauvaise région. Merci de réessayer.
+	</notification>
+	<notification name="NoValidAgentID">
+		ID agent non valide.
+	</notification>
+	<notification name="NoValidSession">
+		ID de session non valide.
+	</notification>
+	<notification name="NoValidCircuit">
+		Aucun code de circuit valide.
+	</notification>
+	<notification name="NoValidTimestamp">
+		Timestamp non valide.
+	</notification>
+	<notification name="NoPendingConnection">
+		Impossible de créer la connexion en attente.
+	</notification>
+	<notification name="InternalUsherError">
+		Erreur interne lors de la tentative de connexion.
+	</notification>
+	<notification name="NoGoodTPDestination">
+		Impossible de trouver un lieu de téléportation valide dans cette région.
+	</notification>
+	<notification name="InternalErrorRegionResolver">
+		Une erreur interne est survenue lors de la résolution des coodonnées de la région.
+	</notification>
+	<notification name="NoValidLanding">
+		Impossible de trouver un point d&apos;atterrissage valide.
+	</notification>
+	<notification name="NoValidParcel">
+		Aucune parcelle valide n&apos;a été trouvée.
+	</notification>
+	<notification name="ObjectGiveItem">
+		Un objet appelé [OBJECTFROMNAME] appartenant à [NAME] vous a donné : [OBJECTTYPE] appelé(e) [OBJECTNAME].
+		<form name="form">
+			<button name="Keep" text="Garder"/>
+			<button name="Discard" text="Jeter"/>
+			<button name="Mute" text="mute ignore"/>
+		</form>
+	</notification>
+	<notification name="ObjectGiveItemUnknownUser">
+		L&apos;objet [OBJECTFROMNAME] appartenant à un utilisateur inconnu vous a donné un(e) [OBJECTTYPE] nommé(e) [OBJECTNAME].
+		<form name="form">
+			<button name="Keep" text="Garder"/>
+			<button name="Discard" text="Jeter"/>
+			<button name="Mute" text="mute ignore"/>
+		</form>
+	</notification>
+	<notification name="UserGiveItem">
+		[NAME] vous a donné un(e) [OBJECTTYPE] nommé(e) [OBJECTNAME].
+		<form name="form">
+			<button name="Keep" text="Garder"/>
+			<button name="Discard" text="Jeter"/>
+			<button name="Mute" text="mute ignore"/>
+		</form>
+	</notification>
+	<notification name="GodMessage">
+		[NAME]
+[MESSAGE]
+	</notification>
+	<notification name="JoinGroup">
+		[MESSAGE]
+		<form name="form">
+			<button name="Join" text="Rejoindre"/>
+			<button name="Decline" text="Refuser"/>
+			<button name="Info" text="Infos"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered">
+		[NAME] vous propose de le/la rejoindre par téléportation :
+
+[MESSAGE]
+		<form name="form">
+			<button name="Teleport" text="Téléporter"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification name="GotoURL">
+		[MESSAGE]
+[URL]
+		<form name="form">
+			<button name="Later" text="Plus tard"/>
+			<button name="GoNow..." text="Y aller maintenant"/>
+		</form>
+	</notification>
+	<notification name="OfferFriendship">
+		[NAME] vous demande de devenir son ami(e).
+
+[MESSAGE]
+
+(Par défaut, vous pourrez voir lorsque vous êtes les deux connecté(e)s.)
+		<form name="form">
+			<button name="Accept" text="Accepter"/>
+			<button name="Decline" text="Refuser"/>
+		</form>
+	</notification>
+	<notification name="OfferFriendshipNoMessage">
+		[NAME] vous demande de devenir son ami.
+
+(Par défaut, vous pourrez voir quand vous êtes les deux connecté(e)s).
+		<form name="form">
+			<button name="Accept" text="Accepter"/>
+			<button name="Decline" text="Refuser"/>
+		</form>
+	</notification>
+	<notification name="FriendshipAccepted">
+		[NAME] a accepté votre amitié.
+	</notification>
+	<notification name="FriendshipDeclined">
+		[NAME] a refusé votre amitié.
+	</notification>
+	<notification name="OfferCallingCard">
+		[NAME] vous offre sa carte de visite.
+Cela ajoute un marque-page dans votre inventaire, ce qui vous permet d&apos;envoyer rapidement un IM à ce résident.
+		<form name="form">
+			<button name="Accept" text="Accepter"/>
+			<button name="Decline" text="Refuser"/>
+		</form>
+	</notification>
+	<notification name="RegionRestartMinutes">
+		La région va redémarrer dans [MINUTES] minutes.
+Si vous restez dans cette région, vous serez déconnecté(e).
+	</notification>
+	<notification name="RegionRestartSeconds">
+		La région va redémarrer dans [SECONDS] secondes.
+Si vous restez dans cette région, vous serez déconnecté(e).
+	</notification>
+	<notification name="LoadWebPage">
+		Charger cette page web [URL] ?
+
+[MESSAGE]
+
+Venant de l&apos;objet : [OBJECTNAME], appartenant à : [NAME]?
+		<form name="form">
+			<button name="Gotopage" text="Charger"/>
+			<button name="Cancel" text="Annuler"/>
+		</form>
+	</notification>
+	<notification name="FailedToFindWearableUnnamed">
+		La recherche du [TYPE] dans la base de données a échoué.
+	</notification>
+	<notification name="FailedToFindWearable">
+		La recherche du [TYPE] nommé(e) [DESC] dans la base de données a échoué.
+	</notification>
+	<notification name="InvalidWearable">
+		L&apos;objet que vous essayez de porter utilise une fonctionnalité que le client ne peut lire. Pour porter cet objet, veuillez télécharger une mise à jour du client.
+	</notification>
+	<notification name="ScriptQuestion">
+		&apos;[OBJECTNAME]&apos;, un objet appartenant à &apos;[NAME]&apos;, aimerait :
+
+[QUESTIONS]
+Acceptez-vous ?
+		<form name="form">
+			<button name="Yes" text="Oui"/>
+			<button name="No" text="Non"/>
+			<button name="Mute" text="mute ignore"/>
+		</form>
+	</notification>
+	<notification name="ScriptQuestionCaution">
+		[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.
+
+Accepter cette requête ?
+		<form name="form">
+			<button name="Grant" text="Accepter"/>
+			<button name="Deny" text="Refuser"/>
+			<button name="Details" text="Détails"/>
+		</form>
+	</notification>
+	<notification name="ScriptDialog">
+		&apos;[TITLE]&apos; de [NAME]
+[MESSAGE]
+		<form name="form">
+			<button name="Ignore" text="Ignorer"/>
+		</form>
+	</notification>
+	<notification name="ScriptDialogGroup">
+		&apos;[TITLE]&apos; de [GROUPNAME]
+[MESSAGE]
+		<form name="form">
+			<button name="Ignore" text="Ignorer"/>
+		</form>
+	</notification>
+	<notification name="FirstBalanceIncrease">
+		Vous venez de recevoir [AMOUNT] L$.
+Des objets et des utilisateurs peuvent vous donner des L$.
+Votre solde est affiché dans le coin supérieur droit de votre écran.
+	</notification>
+	<notification name="FirstBalanceDecrease">
+		Vous venez de payer [AMOUNT] L$.
+Votre solde est affiché dans le coin supérieur droit de votre écran.
+	</notification>
+	<notification name="FirstSit">
+		Vous êtes assis(e).
+Utilisez les touches de direction (ou AWSD) pour changer la vue.
+Pour vous lever, cliquez sur le bouton Me lever.
+	</notification>
+	<notification name="FirstMap">
+		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.
+	</notification>
+	<notification name="FirstBuild">
+		Vous pouvez construire des objets dans certaines zones de [SECOND_LIFE].
+Utilisez les outils en haut à gauche pour construire et gardez la touche Ctrl ou Alt enfoncée pour passer rapidement d&apos;un outil à l&apos;autre.
+Appuyez sur la touche Esc pour arrêter de construire.
+	</notification>
+	<notification name="FirstLeftClickNoHit">
+		Un clic gauche permet d&apos;interagir avec certains objets.
+Si le pointeur de la souris se transforme en main, vous pouvez interagir avec l&apos;objet.
+Un clic droit fait toujours apparaître un menu des choses que vous pouvez faire.
+	</notification>
+	<notification name="FirstTeleport">
+		Cette région n&apos;autorise pas la téléportation de point à point. Vous avez donc été transporté au téléhub le plus proche.
+Votre destination est marquée par une grande balise.
+Suivez la flèche rouge vers la balise ou cliquez sur la flèche pour faire disparaître la balise.
+	</notification>
+	<notification name="FirstOverrideKeys">
+		Vos mouvements sont maintenant pris en charge par un objet.
+Essayez les flèches de votre clavier ou AWSD pour voir à quoi elles servent.
+Certains objets (comme les armes) nécessitent l&apos;activation du mode Vue subjective pour être utilisés.
+Pour cela, appuyez sur la touche M.
+	</notification>
+	<notification name="FirstAppearance">
+		Vous êtes en train d&apos;éditer votre apparence.
+Pour tourner et zoomer, utilisez les flèches de direction.
+Lorsque vous avez terminé, appuyez sur Enregistrer tout pour sauvegarder votre apparence et sortir.
+Vous pouvez modifier votre apparence aussi souvent que vous le souhaitez.
+	</notification>
+	<notification name="FirstInventory">
+		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 note, double-cliquez dessus.
+	</notification>
+	<notification name="FirstSandbox">
+		Cette région est un bac à sable.
+Les objets que vous construisez ici peuvent être supprimés quand vous partez. Les bacs à sable sont nettoyés régulièrement, veuillez lire les informations en haut de l&apos;écran à côté du nom de la région.
+
+Les régions bacs à sable sont rares et sont signalées par des panneaux.
+	</notification>
+	<notification name="FirstFlexible">
+		Cet objet est flexible.
+Les objets flexibles ne peuvent pas avoir de propriétés physiques et doivent rester fantômes jusqu&apos;à ce que la case Fantôme soit décochée.
+	</notification>
+	<notification name="FirstDebugMenus">
+		Vous avez activé le menu Avancé.
+Ce menu contient des fonctionnalités utiles pour les développeurs qui travaillent sur Second Life.
+Pour activer/désactiver ce menu sous Windows, appuyez sur Ctrl-Alt-D. Sur un Mac, appuyez sur Cmd-Opt-Maj-D
+	</notification>
+	<notification name="FirstSculptedPrim">
+		Vous êtes en train d&apos;éditer un sculptie.
+Pour modifier la forme d&apos;un sculptie, vous devez utiliser une texture spécifique.
+Vous trouverez des textures dans la bibliothèque de votre inventaire.
+	</notification>
+	<notification name="FirstMedia">
+		Vous avez lancé la lecture d&apos;un média. Dans le menu Préférences, à l&apos;onglet Audio et vidéo, vous pouvez choisir de lire automatiquement les médias. Notez que cela peut être risqué lorsque les médias viennent de sites que vous ne connaissez pas.
+	</notification>
+	<notification name="MaxListSelectMessage">
+		Vous ne pouvez sélectionner que [MAX_SELECT] objets maximum dans cette liste.
+	</notification>
+	<notification name="VoiceInviteP2P">
+		[NAME] vous invite à un chat vocal.
+Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignorer cette personne, cliquez sur Ignorer.
+		<form name="form">
+			<button name="Accept" text="Accepter"/>
+			<button name="Decline" text="Refuser"/>
+			<button name="Mute" text="mute ignore"/>
+		</form>
+	</notification>
+	<notification name="AutoUnmuteByIM">
+		[NAME] a reçu un message instantané et n&apos;est donc plus ignoré.
+	</notification>
+	<notification name="AutoUnmuteByMoney">
+		[NAME] a reçu de l&apos;argent et n&apos;est donc plus ignoré.
+	</notification>
+	<notification name="AutoUnmuteByInventory">
+		[NAME] a reçu un inventaire et n&apos;est donc plus ignoré.
+	</notification>
+	<notification name="VoiceInviteGroup">
+		[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.
+		<form name="form">
+			<button name="Accept" text="Accepter"/>
+			<button name="Decline" text="Refuser"/>
+			<button name="Mute" text="mute ignore"/>
+		</form>
+	</notification>
+	<notification name="VoiceInviteAdHoc">
+		[NAME] a rejoint un chat vocal avec conférence.
+Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignorer cet utilisateur, cliquez sur Ignorer.
+		<form name="form">
+			<button name="Accept" text="Accepter"/>
+			<button name="Decline" text="Refuser"/>
+			<button name="Mute" text="mute ignore"/>
+		</form>
+	</notification>
+	<notification name="InviteAdHoc">
+		[NAME] vous invite à un chat conférence.
+Pour y participer, cliquez sur Accepter. Sinon, cliquez sur Refuser. Pour ignorer cet utilisateur, cliquez sur Ignorer.
+		<form name="form">
+			<button name="Accept" text="Accepter"/>
+			<button name="Decline" text="Refuser"/>
+			<button name="Mute" text="mute ignore"/>
+		</form>
+	</notification>
+	<notification name="VoiceChannelFull">
+		L&apos;appel auquel vous essayez de participer, [VOICE_CHANNEL_NAME], a atteint le nombre maximum de participants. Veuillez réessayer ultérieurement.
+	</notification>
+	<notification name="ProximalVoiceChannelFull">
+		Nous sommes désolés. Le nombre maximum de conversations vocales a été atteint dans cette zone. Veuillez trouver un autre endroit pour discuter.
+	</notification>
+	<notification name="VoiceChannelDisconnected">
+		Vous avez été déconnecté(e) de [VOICE_CHANNEL_NAME]. Vous allez maintenant être reconnecté au chat vocal spatial.
+	</notification>
+	<notification name="VoiceChannelDisconnectedP2P">
+		[VOICE_CHANNEL_NAME] a mis fin à l&apos;appel. Vous allez maintenant être reconnecté au chat vocal spatial.
+	</notification>
+	<notification name="P2PCallDeclined">
+		[VOICE_CHANNEL_NAME] a refusé votre appel. Vous allez maintenant être reconnecté au chat vocal spatial.
+	</notification>
+	<notification name="P2PCallNoAnswer">
+		[VOICE_CHANNEL_NAME] ne peut pas prendre votre appel. Vous allez maintenant être reconnecté au chat vocal spatial.
+	</notification>
+	<notification name="VoiceChannelJoinFailed">
+		Echec de la connexion avec [VOICE_CHANNEL_NAME], veuillez réessayer ultérieurement. Vous allez maintenant être reconnecté au chat vocal spatial.
+	</notification>
+	<notification name="VoiceLoginRetry">
+		Nous sommes en train de créer un canal vocal pour vous. Veuillez patienter quelques instants.
+	</notification>
+	<notification name="Cannot enter parcel: not a group member">
+		Vous ne pouvez pas pénétrer sur ce terrain car vous n&apos;êtes pas membre du groupe adéquat.
+	</notification>
+	<notification name="Cannot enter parcel: banned">
+		Vous ne pouvez pas pénétrer sur ce terrain car l&apos;accès vous y est interdit.
+	</notification>
+	<notification name="Cannot enter parcel: not on access list">
+		Vous ne pouvez pas pénétrer sur ce terrain car vous n&apos;avez pas les droits d&apos;accès requis.
+	</notification>
+	<notification name="VoiceNotAllowed">
+		Vous n&apos;êtes pas autorisé(e) à vous connecter au chat vocal pour [VOICE_CHANNEL_NAME].
+	</notification>
+	<notification name="VoiceCallGenericError">
+		Une erreur est survenue pendant la connexion au chat vocal pour [VOICE_CHANNEL_NAME]. Veuillez réessayer ultérieurement.
+	</notification>
+	<notification name="ServerVersionChanged">
+		La région dans laquelle vous avez pénétré utilise une version de simulateur différente. C'est ballot, mais c'est la vie !
+	</notification>
+	<notification name="UnableToOpenCommandURL">
+		L&apos;URL sur laquelle vous avez cliqué ne peut pas être ouverte dans ce navigateur.
+	</notification>
+	<global name="UnsupportedCPU">
+		- Votre processeur ne remplit pas les conditions minimum requises.
+	</global>
+	<global name="UnsupportedGLRequirements">
+		Vous semblez ne pas avoir le matériel requis pour utiliser Second Life. Second Life requiert une carte graphique OpenGL avec une prise en charge du multitexturing. Si vous avez une telle carte, assurez-vous que vous avez aussi les drivers les plus récents pour la carte, ainsi que les service packs et les patchs pour votre système d&apos;exploitation.
+
+Si vous avez toujours des problèmes, veuillez consulter la page suivante : http://www.secondlife.com/support
+	</global>
+	<global name="UnsupportedCPUAmount">
+		796
+	</global>
+	<global name="UnsupportedRAMAmount">
+		510
+	</global>
+	<global name="UnsupportedGPU">
+		- Votre carte graphique ne remplit pas les conditions minimum requises.
+	</global>
+	<global name="UnsupportedRAM">
+		- Votre mémoire système ne remplit pas les conditions minimum requises.
+	</global>
+	<global name="PermYes">
+		Oui
+	</global>
+	<global name="PermNo">
+		Non
+	</global>
+
+
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameSuccess"
+   type="alert">
+    Salut [DISPLAY_NAME] !
+
+    Comme dans la vraie vie, cela demande du temps pour s&#x27;habituer &#xE0; un nouveau nom. Accordez quelques jours  pour mettre &#xE0; jour votre nom dans les objets, scripts, recherche, etc... [http://wiki.secondlife.com/wiki/Setting_your_display_name].
+  </notification>
+
+  <notification
+ icon="alertmodal.tga"
+ name="SetDisplayNameBlocked"
+ type="alert">
+    vous ne pouvez pas changer votre display name. Si vous pensez qu&#x27;il s'agit d'une erreur veuillez contacter le support.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameFailedLength"
+   type="alertmodal">
+    Ce nom est trop long, vous avez droit &#xE0; un maximum de [LENGTH] caract&#xE8;res.
+
+    Essayez un nom plus court.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameFailedGeneric"
+   type="alertmodal">
+    Une erreur est survenue, veuillez essayer plus tard.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="SetDisplayNameMismatch"
+   type="alertmodal">
+    Ce display n&#x27;est pas valide, recommencez.
+  </notification>
+
+  <!-- *NOTE: This should never happen -->
+  <notification
+   icon="alertmodal.tga"
+   name="AgentDisplayNameUpdateThresholdExceeded"
+   type="alertmodal">
+    Vous devez attendre avant de changer de display name.
+
+    Voir http://wiki.secondlife.com/wiki/Setting_your_display_name
+
+    Veuillez essayer plus tard.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="AgentDisplayNameSetBlocked"
+   type="alertmodal">
+    Ce display contient un ou des mots bannis.
+
+    Essayez un nom diff&#xE9;rent.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+ name="AgentDisplayNameSetInvalidUnicode"
+ type="alertmodal">
+    Ce display contient des caract&#xE8;res invalides.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+ name="AgentDisplayNameSetOnlyPunctuation"
+ type="alertmodal">
+    votre display name doit contenir des lettres autres que de la simple ponctuation.
+  </notification>
+
+  <notification
+ icon="notifytip.tga"
+ name="DisplayNameUpdate"
+ type="notifytip">
+    [OLD_NAME] ([SLID]) est maintenant connu(e) comme [NEW_NAME].
+  </notification>
+
+
+  <notification
+  icon="alertmodal.tga"
+  label="All settings reset"
+  name="ResetSettingsComplete"
+  type="alertmodal">
+    Les Réglages on été reinitialisés. Vous devez vous reconnecter.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   label="Reinitialiser les réglages"
+   name="ResetSystemSettingsPrompt"
+   type="alertmodal">
+        Reinitialiser vos settings peux être utile si vous rencontrez des problèmes, néanmoins vous devrez refaire tous vos réglages.
+
+    Désirez vous poursuivre ?
+    <form>
+      <button
+       index="0"
+       name="all"
+       text="OK"/>
+      <button
+       default="true"
+       index="3"
+       name="cancel"
+       text="Non"/>
+    </form>
+  </notification>
+
+
+  <notification
+    icon="alertmodal.tga"
+    label="Reinitialiser les réglages"
+    name="ResetAllSettingsPrompt"
+    type="alertmodal">
+    Reinitialiser vos settings peux être utile si vous rencontrez des problèmes, néanmoins vous devrez refaire tous vos réglages.
+
+    quel type de setting désirez vous re initialiser ?
+    <form>
+      <button
+       index="0"
+       name="all"
+       text="Tous"/>
+      <button
+       index="1"
+       name="system"
+       text="Système"/>
+      <button
+       index="2"
+       name="user"
+       text="Utilisateur"/>
+      <button
+       default="true"
+       index="3"
+       name="cancel"
+       text="Non"/>
+    </form>
+  </notification>
+
+
+  </notifications>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/fr/notify.xml b/indra/newview/skins/default/xui/fr/notify.xml
index 128e4bd95..5c1c09223 100644
--- a/indra/newview/skins/default/xui/fr/notify.xml
+++ b/indra/newview/skins/default/xui/fr/notify.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<notifications>
-</notifications>
-<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<notifications>
+</notifications>
+<!-- This file is no longer used. Please see notifications.xml and make your changes there. -->
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/fr/panel_audio.xml b/indra/newview/skins/default/xui/fr/panel_audio.xml
index eac3c7219..4c4688d60 100644
--- a/indra/newview/skins/default/xui/fr/panel_audio.xml
+++ b/indra/newview/skins/default/xui/fr/panel_audio.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Audio et vidéo" name="Media panel">
-	<slider label="Général" 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>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Audio et vidéo" name="Media panel">
+	<slider label="Général" 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/indra/newview/skins/default/xui/fr/panel_audio_device.xml b/indra/newview/skins/default/xui/fr/panel_audio_device.xml
index a9540d834..0ca727c0d 100644
--- a/indra/newview/skins/default/xui/fr/panel_audio_device.xml
+++ b/indra/newview/skins/default/xui/fr/panel_audio_device.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="device_settings">
-	<text name="Audio Devices">
-		Matériel audio
-	</text>
-	<text name="Input device (microphone):">
-		Périphérique d&apos;entrée (micro) :
-	</text>
-	<text name="Output device (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, parlez dans le micro.
-	</text_editor>
-	<volume_slider name="mic_volume_slider" tool_tip="Réglez le volume avec ce curseur."/>
-	<text name="wait_text">
-		Veuillez patienter
-	</text>
-	<string name="default_text">
-		Défaut
-	</string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="device_settings">
+	<text name="Audio Devices">
+		Matériel audio
+	</text>
+	<text name="Input device (microphone):">
+		Périphérique d'entrée (micro):
+	</text>
+	<text name="Output device (speakers):">
+		Périphérique de sortie (haut-parleurs):
+	</text>
+	<text name="Input level:">
+		Volume d'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, parlez dans le micro.
+	</text_editor>
+	<volume_slider name="mic_volume_slider" tool_tip="Réglez le volume avec ce curseur."/>
+	<text name="wait_text">
+		Veuillez patienter...
+	</text>
+	<string name="default_text">
+		Défaut
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_avatar.xml b/indra/newview/skins/default/xui/fr/panel_avatar.xml
index 3cb25dc79..c35c01571 100644
--- a/indra/newview/skins/default/xui/fr/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_avatar.xml
@@ -1,230 +1,230 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="Panel Avatar" width="470">
-	<tab_container name="tab" width="459">
-		<panel label="2ème vie" name="2nd Life" width="458">
-			<string name="CaptionTextAcctInfo">
-				[ACCTTYPE]
-[PAYMENTINFO]
-[AGEVERIFICATION]
-			</string>
-			<string name="AcctTypeResident">
-				Résident
-			</string>
-			<string name="AcctTypeTrial">
-				Essai
-			</string>
-			<string name="AcctTypeCharterMember">
-				Membre originaire
-			</string>
-			<string name="AcctTypeEmployee">
-				Employé(e) de Linden Lab
-			</string>
-			<string name="PaymentInfoUsed">
-				Infos de paiement utilisées
-			</string>
-			<string name="PaymentInfoOnFile">
-				Infos de paiement enregistrées
-			</string>
-			<string name="NoPaymentInfoOnFile">
-				Aucune info de paiement
-			</string>
-			<string name="AgeVerified">
-				Âge vérifié
-			</string>
-			<string name="NotAgeVerified">
-				Âge non vérifié
-			</string>
-			<text name="Name:">
-				Nom :
-			</text>
-			<text name="online_yes" width="151">
-				Actuellement connecté(e)
-			</text>
-			<text name="label">
-				Né(e) le :
-			</text>
-			<line_editor name="born" width="161" />
-			<text name="label2">
-				Compte :
-			</text>
-			<view_border name="acct_border" width="161" />
-			<text name="acct" width="161" />
-			<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" width="161">
-				[NAME]
-			</line_editor>
-			<text name="Photo:">
-				Photo :
-			</text>
-			<texture_picker label="" name="img" tool_tip="Cliquez pour sélectionner une image"/>
-			<text name="Groups:">
-				Groupes :
-			</text>
-			<scroll_list name="groups" width="361" />
-			<text name="About:">
-				À propos :
-			</text>
-			<text name="(500 chars)">
-				(500 car.)
-			</text>
-			<text_editor name="about" width="361"/>
-			<text name="Give item:" height="20" bottom="-397">
-				Donner des 
-objets :
-			</text>
-			<view_border name="drop_target_rect" width="449" />
-			<view_border name="drop_target_rect_vis" width="361" />
-			<text name="Give inventory" tool_tip="Mettez les objets de l&apos;inventaire ici pour les donner à cette personne." width="361">
-				Faire glisser 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..." left_delta="117" width="150"/>
-			<button label="Devenir amis" label_selected="Devenir amis..." name="Add Friend..." left_delta="167"/>
-			<button label="Payer" label_selected="Payer" name="Pay..."/>
-                        <button bottom_delta="0" font="SansSerif" halign="center" label="IM" label_selected="IM" left_delta="80" name="Instant Message..." tool_tip="Instant Message (IM)" width="70"/>
-			<button bottom_delta="0" font="SansSerif" halign="center" label="Mute/Ignorer" label_selected="Mute" left_delta="85" name="Mute" tool_tip="ATTENTION VOUS ALLEZ MUTE LA PERSONNE" width="110"/>
-			<button bottom_delta="0" font="SansSerif" halign="center" label="Invit. Groupe" label_selected="Invit. Groupe" left_delta="120" name="GroupInvite_Button" width="130"/>
-
-		</panel>
-		<panel label="Web" name="WebProfile" width="458">
-		  <line_editor name="url_edit" width="440" />
-			<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 de la page d'accueil
-				</flyout_button_item>
-			</flyout_button>
-			<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."/>
-			<web_browser name="profile_html" width="440" />
-		</panel>
-		<panel label="Intérêts" name="Interests" width="458">
-			<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"/>
-			<line_editor name="want_to_edit" width="360" />
-			<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éle" left_delta="-160" name="schk3"/>
-			<check_box label="Scripter" name="schk4"/>
-			<check_box label="Customisation d'avatars" left_delta="160" name="schk5"/>
-			<line_editor name="skills_edit" width="360" />
-			<text left="2" name="Languages:">
-				Langues :
-			</text>
-			<line_editor name="languages_edit" width="360" />
-		</panel>
-		<panel label="Favoris" name="Picks" width="458">
-			<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..." width="85"/>
-			<tab_container name="picks tab" width="452" />
-			<text name="loading_text">
-				Chargement...
-			</text>
-		</panel>
-		<panel label="Annonces" name="Classified" width="458">
-			<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..." width="85"/>
-			<tab_container name="classified tab" width="452" />
-			<text name="loading_text">
-				Chargement...
-			</text>
-		</panel>
-		<panel label="1ère vie" name="1st Life" width="458">
-			<text name="Photo:">
-				Photo :
-			</text>
-			<texture_picker label="" name="img" tool_tip="Cliquez pour sélectionner une photo"/>
-			<text name="Info:">
-				Infos :
-			</text>
-			<text name="(250 chars)">
-				(250 car.)
-			</text>
-			<text_editor name="about" width="370" />
-		</panel>
-		<panel label="Mes notes" name="My Notes" width="458">
-			<string name="Loading">
-				Chargement...
-			</string>
-			<text name="label" width="452">
-				Dans cet espace, vous pouvez enregistrer vos remarques au sujet de ce 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" width="430"/>
-
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="10"
-			     mouse_opaque="true" name="key_label" v_pad="0" width="95">
-				Clef-Key:
-			</text>
-			<name_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
-			     border_thickness="1" bottom_delta="1" enabled="false" follows="left|top"
-			     font="SansSerifSmall" height="18" is_unicode="false" left_delta="95"
-			     max_length="48" mouse_opaque="false" name="avatar_key"
-			     text_readonly_color="1, 1, 1, 1" width="250" />
-
-		</panel>
-	</tab_container>
-	<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
-n&apos;êtes pas ami avec cette personne.
-	</string>
-	<string name="ShowOnMapFriendOffline">
-		Voir sur la carte.
-    Ceci n&apos;est pas possible car le résident
-    en question n&apos;est pas connecté.
-	</string>
-	<string name="ShowOnMapFriendOnline">
-		Voir sur la carte.
-	</string>
-	<string name="TeleportGod">
-		Téléporter le résident là où vous êtes de force.
-	</string>
-	<string name="TeleportPrelude">
-		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...
-	</string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="Panel Avatar" width="470">
+	<tab_container name="tab" width="459">
+		<panel label="2ème vie" name="2nd Life" width="458">
+			<string name="CaptionTextAcctInfo">
+				[ACCTTYPE]
+[PAYMENTINFO]
+[AGEVERIFICATION]
+			</string>
+			<string name="AcctTypeResident">
+				Résident
+			</string>
+			<string name="AcctTypeTrial">
+				Essai
+			</string>
+			<string name="AcctTypeCharterMember">
+				Membre originaire
+			</string>
+			<string name="AcctTypeEmployee">
+				Employé(e) de Linden Lab
+			</string>
+			<string name="PaymentInfoUsed">
+				Infos de paiement utilisées
+			</string>
+			<string name="PaymentInfoOnFile">
+				Infos de paiement enregistrées
+			</string>
+			<string name="NoPaymentInfoOnFile">
+				Aucune info de paiement
+			</string>
+			<string name="AgeVerified">
+				Âge vérifié
+			</string>
+			<string name="NotAgeVerified">
+				Âge non vérifié
+			</string>
+			<text name="Name:">
+				Nom:
+			</text>
+			<text name="online_yes" width="151">
+				Actuellement connecté(e)
+			</text>
+			<text name="label">
+				Né(e) le:
+			</text>
+			<line_editor name="born" width="161" />
+			<text name="label2">
+				Compte:
+			</text>
+			<view_border name="acct_border" width="161" />
+			<text name="acct" width="161" />
+			<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" width="161">
+				[NAME]
+			</line_editor>
+			<text name="Photo:">
+				Photo:
+			</text>
+			<texture_picker label="" name="img" tool_tip="Cliquez pour sélectionner une image"/>
+			<text name="Groups:">
+				Groupes:
+			</text>
+			<scroll_list name="groups" width="361" />
+			<text name="About:">
+				À propos:
+			</text>
+			<text name="(500 chars)">
+				(500 car.)
+			</text>
+			<text_editor name="about" width="361"/>
+			<text name="Give item:" height="20" bottom="-397">
+				Donner des 
+objets :
+			</text>
+			<view_border name="drop_target_rect" width="449" />
+			<view_border name="drop_target_rect_vis" width="361" />
+			<text name="Give inventory" tool_tip="Mettez les objets de l&apos;inventaire ici pour les donner à cette personne." width="361">
+				Faire glisser 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'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..." left_delta="117" width="150"/>
+			<button label="Devenir amis" label_selected="Devenir amis" name="Add Friend..." left_delta="167"/>
+			<button label="Payer" label_selected="Payer" name="Pay..."/>
+			<button label="IM" label_selected="IM" left_delta="80" name="Instant Message..." tool_tip="Message instantané (IM)" width="70"/>
+			<button label="Mute/Ignorer" label_selected="Mute" left_delta="85" name="Mute" tool_tip="ATTENTION VOUS ALLEZ MUTER LA PERSONNE" width="110"/>
+			<button label="Invit. Groupe" label_selected="Invit. Groupe" left_delta="120" name="GroupInvite_Button" width="130"/>
+
+		</panel>
+		<panel label="Web" name="WebProfile" width="458">
+		  <line_editor name="url_edit" width="440" />
+			<flyout_button label="Charger" label_selected="Charger" name="load" tool_tip="Charge 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 de la page d'accueil
+				</flyout_button_item>
+			</flyout_button>
+			<button label="?" label_selected="?" name="web_profile_help"/>
+			<check_box label="Charger directement la page web" name="auto_load" tool_tip="Charge automatiquement toutes les pages web des profils sans demander au préalable."/>
+			<web_browser name="profile_html" width="440" />
+		</panel>
+		<panel label="Intérêts" name="Interests" width="458">
+			<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"/>
+			<line_editor name="want_to_edit" width="360" />
+			<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'événements" name="schk2"/>
+			<check_box label="Modèle" left_delta="-160" name="schk3"/>
+			<check_box label="Scripter" name="schk4"/>
+			<check_box label="Customiser des avatars" left_delta="160" name="schk5"/>
+			<line_editor name="skills_edit" width="360"/>
+			<text left="2" name="Languages:">
+				Langues :
+			</text>
+			<line_editor name="languages_edit" width="360"/>
+		</panel>
+		<panel label="Favoris" name="Picks" width="458">
+			<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..." width="85"/>
+			<tab_container name="picks tab" width="452" />
+			<text name="loading_text">
+				Chargement...
+			</text>
+		</panel>
+		<panel label="Annonces" name="Classified" width="458">
+			<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..." width="85"/>
+			<tab_container name="classified tab" width="452" />
+			<text name="loading_text">
+				Chargement...
+			</text>
+		</panel>
+		<panel label="1ère vie" name="1st Life" width="458">
+			<text name="Photo:">
+				Photo:
+			</text>
+			<texture_picker label="" name="img" tool_tip="Cliquer pour sélectionner une photo"/>
+			<text name="Info:">
+				Infos:
+			</text>
+			<text name="(250 chars)">
+				(250 car.)
+			</text>
+			<text_editor name="about" width="370" />
+		</panel>
+		<panel label="Mes notes" name="My Notes" width="458">
+			<string name="Loading">
+				Chargement...
+			</string>
+			<text name="label" width="452">
+				Dans cet espace, vous pouvez enregistrer vos remarques au sujet de ce 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" width="430"/>
+
+			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
+			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="10"
+			     mouse_opaque="true" name="key_label" v_pad="0" width="95">
+				Clef-Key :
+			</text>
+			<name_editor bevel_style="in" bg_readonly_color="0, 0, 0, 0" border_style="line"
+			     border_thickness="1" bottom_delta="1" enabled="false" follows="left|top"
+			     font="SansSerifSmall" height="18" is_unicode="false" left_delta="95"
+			     max_length="48" mouse_opaque="false" name="avatar_key"
+			     text_readonly_color="1, 1, 1, 1" width="250" />
+
+		</panel>
+	</tab_container>
+	<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êche le résident de bouger et de chatter."/>
+	<button label="Dégeler" label_selected="Dégeler" name="Unfreeze" tool_tip="Dégèle le résident"/>
+	<button label="Admin" label_selected="Admin" name="csr_btn" tool_tip="Permet de contacter le Service Clientèle pour ce résident"/>
+	<string name="ShowOnMapNonFriend">
+		Voir sur la carte.
+Ceci n&apos;est pas possible car vous
+n&apos;êtes pas ami(e) avec cette personne.
+	</string>
+	<string name="ShowOnMapFriendOffline">
+		Voir sur la carte.
+    Ceci n'est pas possible car le résident
+    en question n&apos;est pas connecté.
+	</string>
+	<string name="ShowOnMapFriendOnline">
+		Voir sur la carte.
+	</string>
+	<string name="TeleportGod">
+		Téléporter le résident là où vous êtes, de force.
+	</string>
+	<string name="TeleportPrelude">
+		Proposer au résident d'être téléporté là où vous êtes.
+Ceci n'est pas possible tant que vous êtes sur l'île d'orientation.
+	</string>
+	<string name="TeleportNormal">
+		Offrir au résident d'être téléporté là où vous êtes.
+	</string>
+	<string name="Loading">
+		Chargement...
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_classified.xml b/indra/newview/skins/default/xui/fr/panel_avatar_classified.xml
index 39925acf9..79871a23d 100644
--- a/indra/newview/skins/default/xui/fr/panel_avatar_classified.xml
+++ b/indra/newview/skins/default/xui/fr/panel_avatar_classified.xml
@@ -1,37 +1,37 @@
-<?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"/>
-	<combo_box label="" name="classified_mature_check">
-		<combo_item name="select_mature">
-			- Type de public -
-		</combo_item>
-		<combo_item name="mature">
-			Contenu Mature
-		</combo_item>
-		<combo_item name="pg">
-			Contenu PG
-		</combo_item>
-	</combo_box>
-	<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.">
-		Clics :
-	</text>
-	<button label="Publier..." name="classified_update_btn"/>
-	<check_box label="Publier chaque semaine" name="auto_renew_check"/>
-	<string name="ad_placed_paid">
-		Annonce passée le : [DATE]. Prix : [AMT] L$.
-	</string>
-	<string name="update_txt">
-		Mise à jour
-	</string>
-	<string name="publish_txt">
-		Publier...
-	</string>
-</panel>
+<?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"/>
+	<combo_box label="" name="classified_mature_check">
+		<combo_item name="select_mature">
+			- Type de public -
+		</combo_item>
+		<combo_item name="mature">
+			Contenu Mature
+		</combo_item>
+		<combo_item name="pg">
+			Contenu PG
+		</combo_item>
+	</combo_box>
+	<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'annonce.">
+		Clics :
+	</text>
+	<button label="Publier" name="classified_update_btn"/>
+	<check_box label="Publier chaque semaine" name="auto_renew_check"/>
+	<string name="ad_placed_paid">
+		Annonce passée le : [DATE]. Prix: [AMT][CURRENCY].
+	</string>
+	<string name="update_txt">
+		Mise à jour
+	</string>
+	<string name="publish_txt">
+		Publier
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_avatar_pick.xml b/indra/newview/skins/default/xui/fr/panel_avatar_pick.xml
index 9c19e19cc..04efbc6cb 100644
--- a/indra/newview/skins/default/xui/fr/panel_avatar_pick.xml
+++ b/indra/newview/skins/default/xui/fr/panel_avatar_pick.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Pick" title="Favori">
-	<button label="Définir position" name="set_location_btn" left="200"/>
-	<button label="Téléporter" name="pick_teleport_btn" width="80"/>
-	<button bottom_delta="0" halign="center" label="Voir sur la carte" name="pick_map_btn" width="110" left="90" />
-	<text name="sort_order_text">
-		Trier :
-	</text>
-	<check_box label="Activé" name="enabled_check" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="Pick" title="Favori">
+	<button label="Définir position" name="set_location_btn" left="200"/>
+	<button label="Téléporter" name="pick_teleport_btn" width="80"/>
+	<button bottom_delta="0" halign="center" label="Voir sur la carte" name="pick_map_btn" width="110" left="90"/>
+	<text name="sort_order_text">
+		Trier:
+	</text>
+	<check_box label="Activé" name="enabled_check"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_chat_bar.xml b/indra/newview/skins/default/xui/fr/panel_chat_bar.xml
index 91e9d1c9d..36dd3d1e5 100644
--- a/indra/newview/skins/default/xui/fr/panel_chat_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_chat_bar.xml
@@ -1,21 +1,20 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="chat_bar">
-	<panel/>
-	<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="whisper_item">
-			Chuchoter
-		</flyout_button_item>
-	</flyout_button>
-	<combo_box label="Gestures" name="Gesture"/>
-	<string name="gesture_label">
-		Gestures
-	</string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="chat_bar">
+	<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="whisper_item">
+			Chuchoter
+		</flyout_button_item>
+	</flyout_button>
+	<combo_box label="Gestures" name="Gesture"/>
+	<string name="gesture_label">
+		Gestures
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_classified.xml b/indra/newview/skins/default/xui/fr/panel_classified.xml
index 68af597a7..fad0c9cdf 100644
--- a/indra/newview/skins/default/xui/fr/panel_classified.xml
+++ b/indra/newview/skins/default/xui/fr/panel_classified.xml
@@ -1,31 +1,31 @@
-<?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"/>
-	<combo_box name="classified_mature_check" width="190">
-		<combo_item name="select_mature">
-			- Type de public -
-		</combo_item>
-		<combo_item name="mature">
-			Contenu Mature
-		</combo_item>
-		<combo_item name="pg">
-			Contenu PG
-		</combo_item>
-	</combo_box>
-	<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 le : [DATE]. Prix : [AMT] L$.
-	</string>
-	<string name="update_txt">
-		Mise à jour
-	</string>
-	<string name="publish_txt">
-		Publier...
-	</string>
-</panel>
+<?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"/>
+	<combo_box name="classified_mature_check" width="190">
+		<combo_item name="select_mature">
+			- Type de public -
+		</combo_item>
+		<combo_item name="mature">
+			Contenu Mature
+		</combo_item>
+		<combo_item name="pg">
+			Contenu PG
+		</combo_item>
+	</combo_box>
+	<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 le : [DATE]. Prix : [AMT][CURRENCY].
+	</string>
+	<string name="update_txt">
+		Mise à jour
+	</string>
+	<string name="publish_txt">
+		Publier
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_event.xml b/indra/newview/skins/default/xui/fr/panel_event.xml
index b0a2b522b..8956a6648 100644
--- a/indra/newview/skins/default/xui/fr/panel_event.xml
+++ b/indra/newview/skins/default/xui/fr/panel_event.xml
@@ -1,70 +1,70 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="Event" title="Événement">
-	<text name="event_name_label">
-		Nom :
-	</text>
-	<text name="event_name">
-		(aucun)
-	</text>
-	<text name="event_category_label">
-		Type :
-	</text>
-	<text name="event_category">
-		(aucun)
-	</text>
-	<text name="event_mature_label">
-		Contenu Mature :
-	</text>
-	<text name="event_mature_yes">
-		Oui
-	</text>
-	<text name="event_mature_no">
-		Non
-	</text>
-	<text name="event_date_label">
-		Date :
-	</text>
-	<text name="event_date">
-		(aucune)
-	</text>
-	<text name="event_duration_label">
-		Durée :
-	</text>
-	<text name="event_duration">
-		(aucune)
-	</text>
-	<text name="event_runby_label">
-		Organisé par :
-	</text>
-	<text name="event_runby">
-		(personne)
-	</text>
-	<text name="event_location_label">
-		Lieu :
-	</text>
-	<text name="event_location">
-		(aucun)
-	</text>
-	<text name="event_cover_label">
-		Prix :
-	</text>
-	<text name="event_cover">
-		(aucun)
-	</text>
-	<text name="event_desc_label">
-		Description :
-	</text>
-	<button label="Téléporter" name="teleport_btn"/>
-	<button label="Voir sur la carte" name="map_btn"/>
-	<button label="Prévenir" name="notify_btn"/>
-	<button label="Créer un événement..." name="create_event_btn"/>
-	<string name="none">
-		aucun
-	</string>
-	<string name="notify">
-		Prévenir
-	</string>
-	<string name="dont_notify">
-		Ne pas prévenir
-	</string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="Event" title="Evénement">
+	<text name="event_name_label">
+		Nom :
+	</text>
+	<text name="event_name">
+		(aucun)
+	</text>
+	<text name="event_category_label">
+		Type :
+	</text>
+	<text name="event_category">
+		(aucun)
+	</text>
+	<text name="event_mature_label">
+		Contenu Mature :
+	</text>
+	<text name="event_mature_yes">
+		Oui
+	</text>
+	<text name="event_mature_no">
+		Non
+	</text>
+	<text name="event_date_label">
+		Date :
+	</text>
+	<text name="event_date">
+		(aucune)
+	</text>
+	<text name="event_duration_label">
+		Durée :
+	</text>
+	<text name="event_duration">
+		(aucune)
+	</text>
+	<text name="event_runby_label">
+		Organisé par :
+	</text>
+	<text name="event_runby">
+		(personne)
+	</text>
+	<text name="event_location_label">
+		Lieu :
+	</text>
+	<text name="event_location">
+		(aucun)
+	</text>
+	<text name="event_cover_label">
+		Prix :
+	</text>
+	<text name="event_cover">
+		(aucun)
+	</text>
+	<text name="event_desc_label">
+		Description :
+	</text>
+	<button label="Téléporter" name="teleport_btn"/>
+	<button label="Voir sur la carte" name="map_btn"/>
+	<button label="Prévenir" name="notify_btn"/>
+	<button label="Créer un événement" name="create_event_btn"/>
+	<string name="none">
+		aucun
+	</string>
+	<string name="notify">
+		Prévenir
+	</string>
+	<string name="dont_notify">
+		Ne pas prévenir
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_friends.xml b/indra/newview/skins/default/xui/fr/panel_friends.xml
index 27c3f3050..69cfaf1a8 100644
--- a/indra/newview/skins/default/xui/fr/panel_friends.xml
+++ b/indra/newview/skins/default/xui/fr/panel_friends.xml
@@ -1,27 +1,29 @@
-<?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="Votre ami voit si vous êtes connecté(e)"/>
-		<column name="icon_visible_map" tool_tip="Votre ami peut vous situer sur la carte"/>
-		<column name="icon_edit_mine" tool_tip="Votre ami peut modifier, supprimer ou prendre vos objets"/>
-		<column name="icon_edit_theirs" tool_tip="Vous pouvez modifier les objets de cet ami"/>
-	</scroll_list>
-	<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" 
-		name="friends" width="130">
-		Rechercher un(e) ami(e) :
-	</text-->
-	<search_editor bottom_delta="-40" enabled="true" follows="left|top" font="SansSerif"
-		height="18" left_delta="0" name="buddy_search_lineedit" label="Rechercher une(e) ami(e)"
-		tool_tip="Rechercher une(e) ami(e) dans la liste de noms" width="160" />
-	<button label="IM/Appel" name="im_btn" tool_tip="Envoyez un IM à ce résident"/>
-	<button label="Profil" name="profile_btn" tool_tip="Consultez le profil de ce résident (photos, 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 ce résident de votre liste d&apos;amis"/>
-	<button label="Ajouter" name="add_btn" tool_tip="Demandez à un résident de devenir votre ami"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="friends">
+	<string name="Multiple">
+		Ami(e)s multiples
+	</string>
+	<scroll_list name="friend_list" tool_tip="Pour sélectionner plusieurs ami(e)s, 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="Votre ami(e) voit si vous êtes connecté(e)."/>
+		<column name="icon_visible_map" tool_tip="Votre ami(e) peut vous situer sur la carte."/>
+		<column name="icon_edit_mine" tool_tip="Votre ami(e) peut modifier, supprimer ou prendre vos objets."/>
+		<column image="ff_visible_online_button.tga" name="icon_visible_online_theirs" tool_tip="Vous pouvez voir si votre ami(e) est connecté(e)." width="20"/>
+   		<column image="ff_visible_map_button.tga" name="icon_visible_map_theirs" tool_tip="Vous pouvez localiser votre ami(e) sur la carte." width="20"/>
+		<column name="icon_edit_theirs" tool_tip="Vous pouvez modifier les objets de cet(te) ami(e)"/>
+	</scroll_list>
+	<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" 
+		name="friends" width="130">
+		Rechercher un(e) ami(e) :
+	</text-->
+	<search_editor bottom_delta="-40" enabled="true" follows="left|top" font="SansSerif"
+		height="18" left_delta="0" name="buddy_search_lineedit" label="Rechercher un(e) ami(e)"
+		tool_tip="Recherchez un(e) ami(e) dans la liste de noms." width="160" />
+	<button label="IM/Appel" name="im_btn" tool_tip="Envoyez un IM à ce résident."/>
+	<button label="Profil" name="profile_btn" tool_tip="Consultez le profil de ce résident (photos, groupes et autres infos)."/>
+	<button label="Téléporter" name="offer_teleport_btn" tool_tip="Proposez à cet ami(e) d'être téléporté(e) là où vous êtes."/>
+	<button label="Payer" name="pay_btn" tool_tip="Donnez des [CURRENCY] à cet(te) ami(e)."/>
+	<button label="Supprimer" name="remove_btn" tool_tip="Supprimez ce résident de votre liste d'amis."/>
+	<button label="Ajouter" name="add_btn" tool_tip="Demandez à un résident de devenir votre ami(e)."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group.xml b/indra/newview/skins/default/xui/fr/panel_group.xml
index 697efedf5..de9a70cfa 100644
--- a/indra/newview/skins/default/xui/fr/panel_group.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<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 enregistrer les modifications ?
-	</text>
-	<button label="Appliquer" label_selected="Appliquer" name="btn_apply" />
-	<button label="Annuler" label_selected="Annuler" name="btn_cancel" />
-	<button label="OK" label_selected="OK" name="btn_ok" />
-	<button label="Rafraîchir" label_selected="Rafraîchir" name="btn_refresh" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="GroupInfo" title="Profil du groupe">
+	<text name="default_needs_apply_text">
+		Certains changements n'ont pas été appliqués sur cet onglet.
+	</text>
+	<text name="want_apply_text">
+		Voulez-vous enregistrer les modifications?
+	</text>
+	<button label="Appliquer" label_selected="Appliquer" name="btn_apply"/>
+	<button label="Annuler" label_selected="Annuler" name="btn_cancel"/>
+	<button label="OK" label_selected="OK" name="btn_ok"/>
+	<button label="Rafraîchir" label_selected="Rafraîchir" name="btn_refresh"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_finder.xml b/indra/newview/skins/default/xui/fr/panel_group_finder.xml
index 0d36bd8dc..77d2235b7 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_finder.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_finder.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="GroupInfoFinder" title="Recherche d&apos;infos sur le 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 enregistrer les modifications ?
-	</text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="GroupInfoFinder" title="Recherche d'infos sur le groupe">
+	<text name="default_needs_apply_text">
+		Certains changements n'ont pas été appliqués sur cet onglet.
+	</text>
+	<text name="want_apply_text">
+		Voulez-vous enregistrer les modifications?
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_general.xml b/indra/newview/skins/default/xui/fr/panel_group_general.xml
index 2b983ced8..2b67a90fe 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_general.xml
@@ -1,76 +1,117 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Général" name="general_tab">
-	<string name="help_text">
-		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.
-	</string>
-	<string name="group_info_unchanged">
-		Le profil du groupe a changé.
-	</string>
-	<button label="?" label_selected="?" name="help_button"/>
-	<line_editor label="Saisissez le nom du groupe ici" name="group_name_editor"/>
-	<text name="group_name">
-		Saisissez le nom du groupe ici
-	</text>
-	<text name="prepend_founded_by">
-		Fondé par
-	</text>
-	<text left_delta="54" name="founder_name">
-		(en attente)
-	</text>
-	<text name="group_charter_label">
-		Charte du groupe
-	</text>
-	<texture_picker label="Logo du groupe" name="insignia" tool_tip="Cliquez pour sélectionner une image"/>
-	<text_editor name="charter">
-		Indiquez ici la charte de votre groupe
-	</text_editor>
-	<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 name="text_owners_and_visible_members">
-		Propriétaires et membres visibles
-	</text>
-	<text name="text_owners_are_shown_in_bold">
-		(Les propriétaires apparaissent en gras)
-	</text>
-	<name_list name="visible_members">
-		<column label="Nom du membre" name="name" relwidth="0.40"/>
-		<column label="Titre" name="title" relwidth="0.25"/>
-		<column label="Dernière connexion" name="online" relwidth="0.35"/>
-	</name_list>
-	<text name="text_group_preferences">
-		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="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."/>
-		<combo_box name="group_mature_check" tool_tip="Indique si les informations sur votre groupe sont classées Mature." width="195">
-			<combo_item name="select_mature">
-				- Type de public -
-			</combo_item>
-			<combo_item name="mature">
-				Contenu Mature
-			</combo_item>
-			<combo_item name="pg">
-				Contenu PG
-			</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."/>
-		</panel>
-		<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>
-	<string name="incomplete_member_data_str">
-		Extraction des données du résident en cours
-	</string>
-	<string 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é.
-	</string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="0" follows="all" height="466" label="General" left="1"
+     mouse_opaque="true" name="general_tab" select="true" width="418">
+	<string name="help_text">
+		L'onglet G&#xE9;n&#xE9;ral contient les infos g&#xE9;n&#xE9;rales et les pr&#xE9;f&#xE9;rences du groupe ainsi que la liste des propri&#xE9;taires et des membres visibles.
+	</string>
+	<string name="group_info_unchanged">
+		Le profil du groupe a chang&#xE9;.
+	</string>
+	<button label="?" label_selected="?" name="help_button"/>
+	<line_editor label="Saisir le nom du groupe ici" name="group_name_editor"/>
+	<text name="group_name">
+		Saisissez le nom du groupe ici:
+	</text>
+	<text font="SansSerifSmall" name="prepend_founded_by">
+		Fond&#xE9; par
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-6" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="63"
+	     mouse_opaque="true" name="founder_name" v_pad="0" width="200">
+		(en attente)
+	</text>
+	<text font="SansSerifSmall" name="group_key_text" follows="left|top" left="7" bottom="-50">
+		Clef:
+	</text>
+      <name_editor bevel_style="in" border_style="line"
+			     border_thickness="1" bottom="-55" enabled="false" follows="left|top"
+			     font="SansSerifSmall" height="16" is_unicode="false" left_delta="65"
+			     max_length="254" mouse_opaque="false" name="group_key"
+			     width="256" />
+	<text bottom_delta="-20" font="SansSerifSmall" halign="left" height="16"
+	     name="group_charter_label" right="410" width="265">
+		Charte du groupe
+	</text>
+	<texture_picker bottom_delta="-129" follows="left|top" height="144"
+	      label="Logo du groupe" left="7"
+	     mouse_opaque="true" name="insignia" tool_tip="Cliquez pour changer le Logo"
+	     width="128" />
+	<text_editor bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-14" drop_shadow_visible="false" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="144"
+	     hide_scrollbar="true" max_length="511" mouse_opaque="true" name="charter"
+	     right="410" v_pad="0"
+	     width="265" word_wrap="true" spell_check="true">
+		Indiquez ici la charte de votre groupe :
+	</text_editor>
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="22" label="Join ([CURRENCY]0)" label_selected="Join ([CURRENCY]0)" left="7"
+	     mouse_opaque="true" name="join_button" width="128" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="22" label="Detailed View" label_selected="Detailed View"
+	     left_delta="0" mouse_opaque="true" name="info_button" width="128" />
+	<text bottom_delta="-16" font="SansSerif" name="text_owners_and_visible_members">
+		Propri&#xE9;taires et membres visibles
+	</text>
+	<text bottom_delta="-16" font="SansSerifSmall" left_delta="0"
+	     name="text_owners_are_shown_in_bold">
+		(Les propri&#xE9;taires apparaissent en gras)
+	</text>
+	<name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-88"
+	     column_padding="0" draw_border="true" draw_heading="true"
+	     follows="left|top" heading_font="SansSerifSmall" heading_height="14"
+	     height="80" left="7" mouse_opaque="true" multi_select="false"
+	     name="visible_members" width="404">
+		<column label="Nom" name="name" relwidth="0.45" />
+		<column label="Titre" name="title" relwidth="0.30" />
+		<column label="Derni&#xE8;re Co" name="online" relwidth="0.25" />
+	</name_list>
+	<text bottom_delta="-10" font="SansSerif" name="text_group_preferences">
+		Pr&#xE9;f&#xE9;rences
+	</text>
+	<panel bottom_delta="-94" name="preferences_container" width="404">
+		<check_box bottom="-17" label="Afficher dans la recherche" left="4" name="show_in_group_list" radio_style="false"
+		     tool_tip="Affiche ce groupe dans les r&#xE9;sultats de recherche." width="95" />
+		<check_box bottom_delta="-16" label="Inscription libre" left="4" name="open_enrollement" tool_tip="Indique si une invitation est n&#xE9;cessaire pour devenir membre."
+		     width="95"/>
+		<check_box bottom_delta="-16" follows="left|top" label="Frais d'inscription:[CURRENCY]" left_delta="16"
+		     name="check_enrollment_fee" tool_tip="Indique s'il y a des frais d'inscription."
+		     width="95"/>
+		<spinner bottom_delta="2" label_width="10" name="spin_enrollment_fee" right_delta="170"
+		     tool_tip="Si la case Frais d'inscription est coch&#xE9;e, cela signifie qu'il faut payer des frais pour devenir membre."
+		     width="65"/>
+		<text bottom_delta="-12" left="4" font="SansSerifSmall" name="content_rating">
+				Type de Public
+		</text>
+		<combo_box bottom_delta="-25" left="6"
+			name="group_mature_check" tool_tip="Indique si les informations sur votre groupe sont class&#xE9;es Mature."
+			width="130">
+			<combo_item name="select_mature">
+				- Select Mature -
+			</combo_item>
+			<combo_item name="mature">
+				Mature
+			</combo_item>
+			<combo_item name="pg">
+				PG
+			</combo_item>
+		</combo_box>
+
+		<check_box bottom="-17" left="225" label="Recevoir les notices" name="receive_notices" tool_tip="Cochez pour recevoir les notices envoy&#xE9;es au groupe. D&#xE9;cochez si ce groupe envoie des spams." width="95"/>
+		<check_box label="Recevoir le chat" name="receive_chat" tool_tip="Cochez si vous d&#xE9;sirez recevoir les IM/Chat du groupe."/>
+		<check_box label="Afficher dans mon profil" name="list_groups_in_profile" tool_tip="Affiche ou cache le groupe dans son profil"/>
+		<text bottom_delta="-10" name="active_title_label">
+			Mon Titre Actif
+		</text>
+		<combo_box name="active_title"/>
+	</panel>
+	<string name="incomplete_member_data_str">
+		Extraction des donn&#xE9;es du r&#xE9;sident en cours...
+	</string>
+	<string name="confirm_group_create_str">
+		La cr&#xE9;ation de ce groupe coûte [GROUPCREATEFEE]. 
+Etes-vous sûr(e) des chez sûr mais vraimeeeeent SUR de vouloir d&#xE9;penser [GROUPCREATEFEE] pour cr&#xE9;er ce groupe?
+Sachez que si personne ne rejoint ce groupe sous 48h, il sera d&#xE9;mantel&#xE9; et ne pourra plus être utilis&#xE9;.
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_invite.xml b/indra/newview/skins/default/xui/fr/panel_group_invite.xml
index 4cb0b8867..936e85457 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_invite.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_invite.xml
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Inviter un résident" name="invite_panel">
-	<text name="help_text">
-		Vous pouvez inviter plusieurs résidents
-à la fois. Cliquez d&apos;abord sur
-Choisir un résident.
-	</text>
-	<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>
-		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 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>
-	<string name="loading">
-		(en cours de chargement...)
-	</string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Inviter un résident" name="invite_panel">
+	<text name="help_text">
+		Vous pouvez inviter plusieurs résidents
+à la fois. Cliquez d&apos;abord sur
+Choisir un résident.
+	</text>
+	<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>
+		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 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>
+	<string name="loading">
+		en cours de chargement...
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
index 551d11d58..7963b3979 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_land_money.xml
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Terrain et L$" name="land_money_tab">
-	<string name="help_text">
-		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 Planification, Détails et Ventes correspondent aux finances du groupe.
-	</string>
-	<button label="?" name="help_button"/>
-	<string name="cant_view_group_land_text">
-		Vous n&apos;avez pas la permission de voir quel terrain possède ce groupe.
-	</string>
-	<string name="cant_view_group_accounting_text">
-		Vous n&apos;avez pas la permission d&apos;accéder aux informations
-financières de ce groupe.
-	</string>
-	<string name="loading_txt">
-		Chargement...
-	</string>
-	<text name="group_land_heading">
-		Terrain du groupe
-	</text>
-	<scroll_list name="group_parcel_list">
-		<column label="Parcelle" name="name"/>
-		<column label="Région" name="location"/>
-		<column label="Type" name="type"/>
-		<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"/>
-	<text name="total_contributed_land_label">
-		Total des contributions :
-	</text>
-	<text name="total_contributed_land_value">
-		[AREA] m²
-	</text>
-	<text name="total_land_in_use_label">
-		Superficie déjà utilisée :
-	</text>
-	<text name="total_land_in_use_value">
-		[AREA] m²
-	</text>
-	<text name="land_available_label">
-		Superficie disponible :
-	</text>
-	<text name="land_available_value">
-		[AREA] m²
-	</text>
-	<text name="your_contribution_label">
-		Votre contribution :
-	</text>
-	<string name="land_contrib_error">
-		Impossible de définir votre don de terre.
-	</string>
-	<text name="your_contribution_max_value">
-		m² ([AMOUNT] max.)
-	</text>
-	<text name="group_over_limit_text">
-		Une contribution supplémentaire du groupe est requise pour prendre en
-charge le terrain utilisé.
-	</text>
-	<text name="group_money_heading">
-		Finances
-	</text>
-	<tab_container name="group_money_tab_container">
-		<panel label="Planification" name="group_money_planning_tab">
-			<text_editor name="group_money_planning_text">
-				Calcul en cours...
-			</text_editor>
-		</panel>
-		<panel label="Détails" name="group_money_details_tab">
-			<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"/>
-		</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"/>
-		</panel>
-	</tab_container>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Terrain et [CURRENCY]" name="land_money_tab">
+	<string name="help_text">
+		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 Planification, Détails et Ventes correspondent aux finances du groupe.
+	</string>
+	<button label="?" name="help_button"/>
+	<string name="cant_view_group_land_text">
+		Vous n'avez pas la permission de voir quel terrain possède ce groupe.
+	</string>
+	<string name="cant_view_group_accounting_text">
+		Vous n'avez pas la permission d'accéder aux informations
+financières de ce groupe.
+	</string>
+	<string name="loading_txt">
+		Chargement
+	</string>
+	<text name="group_land_heading">
+		Terrain du groupe
+	</text>
+	<scroll_list name="group_parcel_list">
+		<column label="Parcelle" name="name"/>
+		<column label="Région" name="location"/>
+		<column label="Type" name="type"/>
+		<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"/>
+	<text name="total_contributed_land_label">
+		Total des contributions:
+	</text>
+	<text name="total_contributed_land_value">
+		[AREA] m²
+	</text>
+	<text name="total_land_in_use_label">
+		Superficie déjà utilisée:
+	</text>
+	<text name="total_land_in_use_value">
+		[AREA] m²
+	</text>
+	<text name="land_available_label">
+		Superficie disponible:
+	</text>
+	<text name="land_available_value">
+		[AREA] m²
+	</text>
+	<text name="your_contribution_label">
+		Votre contribution:
+	</text>
+	<string name="land_contrib_error">
+		Impossible de définir votre don de terre.
+	</string>
+	<text name="your_contribution_max_value">
+		m² ([AMOUNT] max.)
+	</text>
+	<text name="group_over_limit_text">
+		Une contribution supplémentaire du groupe est requise pour prendre en
+charge le terrain utilisé.
+	</text>
+	<text name="group_money_heading">
+		Finances
+	</text>
+	<tab_container name="group_money_tab_container">
+		<panel label="Planification" name="group_money_planning_tab">
+			<text_editor name="group_money_planning_text">
+				Calcul en cours
+			</text_editor>
+		</panel>
+		<panel label="Détails" name="group_money_details_tab">
+			<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"/>
+		</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"/>
+		</panel>
+	</tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_notices.xml b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
index 7ed6a46cc..1b9bf05eb 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_notices.xml
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Notices" name="notices_tab">
-	<text name="help_text">
-		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 notice
-	</text>
-	<button label="?" label_selected="?" name="help_button"/>
-	<text name="lbl">
-		Anciennes notices du groupe
-	</text>
-	<text name="lbl2">
-		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"/>
-	</scroll_list>
-	<text name="notice_list_none_found">
-		Aucun résultat.
-	</text>
-	<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 notice
-		</text>
-		<text name="lbl2">
-			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 bottom_delta="-79" name="lbl3" left="20">
-			Sujet :
-		</text>
-		<line_editor name="create_subject" width="331" left_delta="61"/>
-		<text name="lbl4" left="20">
-			Message :
-		</text>
-		<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="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 notice" name="panel_view_past_notice">
-		<text name="lbl">
-			Détails
-		</text>
-		<text name="lbl2">
-			Pour envoyer une nouvelle notice, cliquez sur Créer une notice ci-dessus.
-		</text>
-		<text name="lbl3">
-			Sujet :
-		</text>
-		<text name="lbl4">
-			Message :
-		</text>
-		<button bottom_delta="-24" font="SansSerif" halign="center" height="20"
-		     label="Ouvrir" label_selected="Ouvrir" left="7"
-		     mouse_opaque="true" name="open_attachment" width="110" />
-		<line_editor left="128" name="view_inventory_name" width="256"/>
-	</panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Notices" name="notices_tab">
+	<text name="help_text">
+		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 notice
+	</text>
+	<button label="?" label_selected="?" name="help_button"/>
+	<text name="lbl">
+		Anciennes notices du groupe
+	</text>
+	<text name="lbl2">
+		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"/>
+	</scroll_list>
+	<text name="notice_list_none_found">
+		Aucun résultat
+	</text>
+	<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 notice
+		</text>
+		<text name="lbl2">
+			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 bottom_delta="-79" name="lbl3" left="20">
+			Sujet :
+		</text>
+		<line_editor name="create_subject" width="331" left_delta="61"/>
+		<text name="lbl4" left="20">
+			Message :
+		</text>
+		<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="185" left_delta="74"/>
+		<button label="Supprimer pièce-jointe" label_selected="Supprimer pièce-jointe" left="274" name="remove_attachment" width="145"/>
+		<button label="Envoyer la notice" label_selected="Envoyer la notice" left="274" name="send_notice" width="145"/>
+		<panel name="drop_target2" tool_tip="Pour joindre un objet de l&apos;inventaire à la notice, le faire 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, le faire 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 notice" name="panel_view_past_notice">
+		<text name="lbl">
+			Détails
+		</text>
+		<text name="lbl2">
+			Pour envoyer une nouvelle notice, cliquez sur Créer une notice ci-dessus.
+		</text>
+		<text name="lbl3">
+			Sujet :
+		</text>
+		<text name="lbl4">
+			Message :
+		</text>
+		<button bottom_delta="-24" font="SansSerif" halign="center" height="20"
+		     label="Ouvrir" label_selected="Ouvrir" left="7"
+		     mouse_opaque="true" name="open_attachment" width="110" />
+		<line_editor left="128" name="view_inventory_name" width="256"/>
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_roles.xml b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
index 008402db3..62c14250c 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_roles.xml
@@ -1,160 +1,277 @@
-<?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 enregistrer les modifications ?
-	</text>
-	<text name="cant_delete_role">
-		Les Rôles Tout le monde et Propriétaires sont spéciaux et ne peuvent être supprimés.
-	</text>
-	<button label="?" name="help_button"/>
-	<panel name="members_header">
-		<text name="static">
-			Membres
-		</text>
-		<text name="static2">
-			Les rôles de chaque membre peuvent être personnalisés, ce qui permet une
-meilleure organisation du groupe.
-		</text>
-	</panel>
-	<panel name="roles_header">
-		<text name="static">
-			Rôles
-		</text>
-		<text name="role_properties_modifiable">
-			Sélectionnez un rôle ci-dessous. Vous pouvez modifier le nom, la
-description et le titre du membre.
-		</text>
-		<text name="role_properties_not_modifiable">
-			Sélectionnez un rôle ci-dessous pour en connaître les propriétés, les
-membres et les pouvoirs.
-		</text>
-		<text bottom_delta="-28" name="role_actions_modifiable">
-			Vous pouvez aussi assigner des pouvoirs au rôle.
-		</text>
-		<text name="role_actions_not_modifiable">
-			Vous pouvez afficher mais non modifier les pouvoirs assignés.
-		</text>
-	</panel>
-	<panel name="actions_header">
-		<text name="static">
-			Pouvoirs
-		</text>
-		<text name="static2">
-			Vous pouvez afficher la description du pouvoir et voir à quels rôles ou à
-quels membres ces pouvoirs sont assignés.
-		</text>
-	</panel>
-	<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 un 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 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" 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"/>
-			<text name="help_text">
-				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 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" 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">
-				Les pouvoirs déterminent les facultés de chaque membre dans le groupe.
-			</text>
-		</panel>
-	</tab_container>
-	<panel name="members_footer">
-		<text name="static">
-			Rôles assignés
-		</text>
-		<text name="static2">
-			Pouvoirs attribués
-		</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="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">
-		<text name="static">
-			Nom
-		</text>
-		<text name="static2">
-			Description
-		</text>
-		<line_editor name="role_name">
-			Employés
-		</line_editor>
-		<text name="static3">
-			Titre
-		</text>
-		<line_editor name="role_title">
-			(en attente)
-		</line_editor>
-		<text_editor name="role_description">
-			(en attente)
-		</text_editor>
-		<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.">
-			Pouvoirs attribués
-		</text>
-		<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">
-		<text name="static">
-			Description
-		</text>
-		<text_editor name="action_description">
-			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 ce pouvoir
-		</text>
-		<text name="static3">
-			Membres avec ce pouvoir
-		</text>
-	</panel>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="0" height="466" label="Membres &amp; R&#xF4;les" left="1"
+     name="roles_tab" width="418">
+	<string name="default_needs_apply_text">
+		Certains changements n&apos;ont pas &#xE9;t&#xE9; appliqu&#xE9;s sur ce sous-onglet.
+	</string>
+	<string name="want_apply_text">
+		Voulez-vous enregistrer les modifications ?
+	</string>
+	<string name="help_text" />
+	<button bottom="-24" font="SansSerif" halign="center" height="16" label="?" left="391"
+	     name="help_button" width="20" />
+	<panel border="false" bottom="-24" height="24" left="7" name="members_header"
+	     visible="true" width="380">
+		<text bottom_delta="-20" font="SansSerifBig" halign="left" height="16" left="0"
+		     name="static" width="150">
+			Membres &amp; R&#xF4;les
+		</text>
+		<text bottom_delta="-36" font="SansSerifSmall" halign="left" height="32" left="0"
+		     name="static2" width="400">
+			Les r&#xF4;les de chaque membre peuvent &#xEA;tre personnalis&#xE9;s, ce qui permet une
+meilleure organisation du groupe.
+		</text>
+	</panel>
+	<panel border="false" bottom_delta="0" height="24" left="7" name="roles_header"
+	     visible="false" width="380">
+		<text bottom_delta="-20" font="SansSerifBig" halign="left" height="16" left="0"
+		     name="static" width="100">
+			R&#xF4;les
+		</text>
+		<text bottom_delta="-20" font="SansSerifSmall" halign="left" height="16" left="0"
+		     name="role_properties_modifiable" visible="false" width="394">
+			S&#xE9;lectionner un r&#xF4;le ci-dessous. Vous pouvez modifier le nom, la
+description et le titre du membre.
+		</text>
+		<text bottom_delta="0" font="SansSerifSmall" halign="left" height="16" left="0"
+		     name="role_properties_not_modifiable" visible="true" width="394">
+			S&#xE9;lectionner un r&#xF4;le ci-dessous.
+		</text>
+		<text bottom_delta="-14" font="SansSerifSmall" halign="left" height="16" left="0"
+		     name="role_actions_modifiable" visible="false" width="394">
+			
+		</text>
+		<text bottom_delta="0" font="SansSerifSmall" halign="left" height="16" left="0"
+		     name="role_actions_not_modifiable" visible="true" width="394">
+			
+		</text>
+	</panel>
+	<panel border="false" bottom_delta="-20" height="24" left="7" name="actions_header"
+	     visible="false" width="380">
+		<text bottom_delta="0" font="SansSerifBig" halign="left" height="16" left="0"
+		     name="static" width="200">
+			Pouvoirs
+		</text>
+		<text bottom_delta="-36" font="SansSerifSmall" halign="left" height="32" left="0"
+		     name="static2" width="394">
+			Vous pouvez afficher la description du pouvoir et voir &#xE0; quels rôles ou &#xE0;
+quels membres ces pouvoirs sont assign&#xE9;s.
+		</text>
+	</panel>
+	<tab_container border="false" bottom_delta="-190" height="180" left="6"
+	     name="roles_tab_container" tab_position="top" width="406">
+		<panel border="true" bottom="0" height="164" label="Membres" left="1"
+		     name="members_sub_tab" select="true" tool_tip="Membres" width="406">
+			<line_editor bevel_style="in" border_style="line"
+			     border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
+			     height="16" is_unicode="false" left="4" max_length="63" mouse_opaque="true"
+			     name="search_text" width="100" />
+			<button bottom_delta="-2" font="SansSerifSmall" halign="center" height="20"
+			     label="Chercher" left_delta="105" name="search_button" width="60" />
+			<button bottom_delta="0" enabled="false" font="SansSerifSmall" halign="center"
+			     height="20" label="Tout Voir" left_delta="65" name="show_all_button"
+			     width="80" />
+			<name_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-121"
+			     column_padding="0" draw_border="true" draw_heading="true"
+			     heading_font="SansSerifSmall"
+			     heading_height="14" height="120" left="4" multi_select="true"
+			     name="member_list" width="396">
+				<column label="Nom du Membre" name="name" width="136" />
+				<column label="Surface donn&#xE9;e" name="donated" width="136" />
+				<column label="Derni&#xE8;re Co" name="online" width="116" />
+			</name_list>
+			<button bottom_delta="-20" font="SansSerif" halign="center" height="19"
+			     label="Inviter un Membre " left="4" name="member_invite" width="146" />
+			<button bottom_delta="0" font="SansSerif" halign="center" height="19"
+			     label="Ejecter du Groupe" left="-153" name="member_eject" width="146" />
+			<string name="help_text">
+			Vous pouvez ajouter ou supprimer les r&#xF4;les assign&#xE9;s aux membres.
+Pour s&#xE9;lectionner plusieurs membres, cliquez sur leurs noms en maintenant la touche Ctrl enfonc&#xE9;e.
+			</string>
+			<icon image_name="inv_folder_plain_closed.tga" name="power_folder_icon" width="16" height="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG -->
+		</panel>
+		<panel border="true" bottom="0" height="164" label="R&#xF4;les"
+		     left="1" name="roles_sub_tab" width="398">
+			<line_editor bevel_style="in" border_style="line"
+			     border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
+			     height="16" is_unicode="false" left="4" max_length="63" mouse_opaque="true"
+			     name="search_text" width="100" />
+			<button bottom_delta="-2" font="SansSerifSmall" halign="center" height="20"
+			     label="Chercher" left_delta="105" name="search_button" width="60" />
+			<button bottom_delta="0" enabled="false" font="SansSerifSmall" halign="center"
+			     height="20" label="Tout Voir" left_delta="65" name="show_all_button"
+			     width="80" />
+			<scroll_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-120"
+			     column_padding="0" draw_border="true" draw_heading="true" enabled="true"
+			     follows="left|top"
+			     heading_font="SansSerifSmall" heading_height="14" height="120" left="4"
+			     mouse_opaque="true" multi_select="false" name="role_list" width="396">
+				<column label="Nom du R&#xF4;le" name="name" width="126" />
+				<column label="Titre" name="title" width="186" />
+				<column label="Membres" name="members" width="76" />
+			</scroll_list>
+			<button bottom_delta="-21" font="SansSerif" halign="center" height="19"
+			     label="Nouveau R&#xF4;le..." left="4" name="role_create" width="146" />
+			<button bottom_delta="0" font="SansSerif" halign="center" height="19"
+			     label="Supprimer le R&#xF4;le" left="-153" name="role_delete" width="146" />
+			<string name="help_text">
+				Chaque r&#xF4;le poss&#xE8;de un titre et des pouvoirs. Un membre peut avoir plusieurs r&#xF4;les mais il ne peut y avoir que 10 r&#xF4;les dans un groupe, Visiteur et Propri&#xE9;taire inclus.
+			</string>
+			<string name="cant_delete_role">
+				Les &apos;Everyone&apos; t &apos;Owners&apos; sont des r&#xF4;les sp&#xE9;ciaux qui ne peuvent &#xEA;tre supprim&#xE9;s.
+			</string>
+			<icon height="16" image_name="inv_folder_plain_closed.tga" name="power_folder_icon"
+			     width="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG -->
+			<icon height="16" image_name="checkbox_enabled_true.tga" name="power_all_have_icon"
+			     width="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG -->
+			<icon height="16" image_name="checkbox_enabled_false.tga" name="power_partial_icon"
+			     width="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG -->
+		</panel>
+		<panel border="true" bottom="0"
+		     height="164" label="Pouvoirs" left="1" name="actions_sub_tab" width="398">
+			<line_editor bevel_style="in" border_style="line"
+			     border_thickness="1" bottom="143" follows="left|top" font="SansSerifSmall"
+			     height="16" is_unicode="false" left="6" max_length="63" mouse_opaque="true"
+			     name="search_text" width="100" />
+			<button bottom_delta="-2" font="SansSerifSmall" halign="center" height="20"
+			     label="Chercher" left_delta="105" name="search_button" width="60" />
+			<button bottom_delta="0" enabled="false" font="SansSerifSmall" halign="center"
+			     height="20" label="Tout Voir" left_delta="65" name="show_all_button"
+			     width="80" />
+			<scroll_list allow_calling_card_drop="false" background_visible="true" bottom_delta="-134"
+			     column_padding="0" draw_border="true" draw_heading="false"
+			     draw_stripes="false"
+			     follows="left|top" height="134" left="6"
+			     mouse_opaque="true" multi_select="true" name="action_list"
+			     search_column="1" tool_tip=""
+			     width="392">
+				<column label="" name="icon" width="18" />
+				<column label="" name="action" width="356" />
+			</scroll_list>
+			<string name="help_text">
+				Permet aux membres de ce r&#xF4;le des actions sp&#xE9;cifiques. Les possibilit&#xE9;s sont vari&#xE9;es.
+			</string>
+			<icon image_name="inv_folder_plain_closed.tga" name="power_folder_icon" width="16" height="16" visible="false"/> <!-- Hiding this until we can figure out why it's not showing up in the right place. -BG -->
+		</panel>
+	</tab_container>
+	<panel border="false" bottom_delta="-235" height="215" left="7" name="members_footer"
+	     select="true" visible="true" width="406">
+		<text bottom_delta="0" font="SansSerif" halign="left" height="16" left="0"
+		     name="static" width="100">
+			R&#xF4;les assign&#xE9;s
+		</text>
+		<text bottom_delta="0" font="SansSerif" halign="left" height="16" left="150"
+		     name="static2" width="150">
+			Pouvoirs attribu&#xE9;s
+		</text>
+		<scroll_list bottom_delta="-199" draw_border="true" draw_heading="false"
+		     draw_stripes="false" enabled="false" height="198" left="0"
+		     multi_select="false" name="member_assigned_roles" width="145">
+			<column label="" name="checkbox" width="18" />
+			<column label="" name="role" width="109" />
+		</scroll_list>
+		<scroll_list bottom_delta="0" draw_border="true" draw_heading="false" draw_stripes="false"
+		     enabled="false" height="198" left="150" multi_select="false"
+		     name="member_allowed_actions"
+		     tool_tip="Pour plus de d&#xE9;tails, voir l'onglet &#x22;Pouvoirs&#x22;."
+		     width="254">
+			<column label="" name="icon" width="14" />
+			<column label="" name="action" width="224" />
+		</scroll_list>
+	</panel>
+	<panel border="false" bottom_delta="0" height="215" left="7" name="roles_footer"
+	     visible="false" width="406">
+		<text bottom_delta="0" font="SansSerif" halign="left" height="16" left="0"
+		     name="static" width="100">
+			Nom
+		</text>
+		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+		     bottom_delta="0" drop_shadow_visible="false" font="SansSerif" halign="left"
+		     height="16" left="150" name="static2"
+		     width="100">
+			Description
+		</text>
+		<line_editor bevel_style="in" bg_visible="false"
+		     border_drop_shadow_visible="false" border_style="line" border_thickness="1"
+		     border_visible="false" bottom_delta="-16" drop_shadow_visible="false"
+		     follows="left|top" font="SansSerifSmall" height="16" is_unicode="false"
+		     left="0" max_length="20" mouse_opaque="true" name="role_name"
+		     width="145" spell_check="true">
+			Employ&#xE9;s
+		</line_editor>
+		<text bottom_delta="-16" font="SansSerif" halign="left" height="16" left="0"
+		     name="static3" width="100">
+			Titre
+		</text>
+		<line_editor bevel_style="in" bg_visible="false" border_drop_shadow_visible="false"
+		     border_style="line" border_thickness="1" border_visible="false"
+		     bottom_delta="-16" drop_shadow_visible="false" follows="left|top"
+		     font="SansSerifSmall" height="16" is_unicode="false" left="0"
+		     max_length="20" mouse_opaque="true" name="role_title"
+		     width="145" spell_check="true">
+			(en attente)
+		</line_editor>
+		<text_editor bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+		     bottom_delta="0" drop_shadow_visible="false" font="SansSerifSmall"
+		     h_pad="0" halign="left" height="48" hide_scrollbar="true" left="150"
+		     max_length="254" name="role_description"
+		     v_pad="0" width="254"
+		     word_wrap="true" spell_check="true">
+			(en attente)
+		</text_editor>
+		<text bottom_delta="-26" font="SansSerif" halign="left" height="16" left="0"
+		     name="static4" width="120">
+			Membres assign&#xE9;s
+		</text>
+		<text bottom_delta="0" font="SansSerif" halign="left" height="16" left="150"
+		     name="static5"
+		     tool_tip=""
+		     width="240">
+			Pouvoirs attribu&#xE9;s
+		</text>
+		<name_list bottom_delta="-105" draw_border="true" draw_stripes="false" enabled="false"
+		     height="105" left="0" multi_select="false" name="role_assigned_members"
+		     width="145" />
+		<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+		     initial_value="false" label="Membres visibles" left="0"
+		     mouse_opaque="true" name="role_visible_in_list" radio_style="false"
+		     tool_tip="Définit si les membres de ce rôle sont visibles dans l'onglet Général pour les personnes externes."
+		     width="361" />
+		<scroll_list bottom_delta="0" draw_border="true" draw_heading="false" draw_stripes="false"
+		     height="125" left="150" multi_select="false" name="role_allowed_actions"
+		     search_column="2"
+		     tool_tip="Pour plus de d&#xE9;tails, voir l'onglet &#x22;Pouvoirs&#x22;."
+		     width="254">
+			<column label="" name="icon" width="2" />
+			<column label="" name="checkbox" width="16" />
+			<column label="" name="action" width="220" />
+		</scroll_list>
+	</panel>
+	<panel border="false" bottom_delta="0" height="215" left="7" name="actions_footer"
+	     visible="false" width="406">
+		<text bottom_delta="0" font="SansSerif" halign="left" height="16" left="0"
+		     name="static" width="100">
+			Description
+		</text>
+		<text_editor bevel_style="in" bottom_delta="-48"
+		     enabled="false" font="SansSerifSmall" h_pad="0" halign="left" height="48"
+		     hide_scrollbar="true" left="0" max_length="512" name="action_description"
+		     v_pad="0" width="404" word_wrap="true">
+			Ce pouvoir permet d&apos;expulser des membres du groupe. Seul un propri&#xE9;taire peut expulser un autre propri&#xE9;taire.
+		</text_editor>
+		<text bottom_delta="-26" font="SansSerif" halign="left" height="16" left="0"
+		     name="static2" width="145">
+			R&#xF4;les avec ce pouvoir :
+		</text>
+		<text bottom_delta="0" font="SansSerif" halign="left" height="16" left="150"
+		     name="static3" width="200">
+			Membres avec ce pouvoir :
+		</text>
+		<scroll_list bottom_delta="-125" draw_border="true" enabled="false" height="125" left="0"
+		     multi_select="false" name="action_roles" width="145" />
+		<name_list background_opaque="true" background_visible="true" bg_alpha_color="blue"
+		     bg_opaque_color="grey" bottom_delta="0" draw_border="true" enabled="false"
+		     height="125" left="150" multi_select="false" name="action_members"
+		     width="254" />
+	</panel>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_group_voting.xml b/indra/newview/skins/default/xui/fr/panel_group_voting.xml
index 9f6fb8cb4..5edc184e7 100644
--- a/indra/newview/skins/default/xui/fr/panel_group_voting.xml
+++ b/indra/newview/skins/default/xui/fr/panel_group_voting.xml
@@ -1,112 +1,227 @@
-<?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"/>
-	<text name="proposal_header">
-		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 en cours
-	</text>
-	<string name="proposals_header_view_inst">
-		Double-cliquez sur la proposition pour laquelle vous aimeriez voter
-ou cliquez sur Créer proposition pour créer une nouvelle proposition.
-	</string>
-	<text name="proposals_header_create_txt">
-		Créer une proposition
-	</text>
-	<string name="proposals_header_create_inst">
-		Saisissez une description. Vous pouvez changer le quorum, la durée
-et la majorité requise pour que la proposition soit adoptée.
-	</string>
-	<text name="proposals_header_vote_txt">
-		Vote sur la proposition
-	</text>
-	<string name="proposals_header_vote_inst">
-		Pour voter, cliquez sur les boutons Oui ou Non,
-ou abstenez-vous en cliquant sur M&apos;abstenir.
-	</string>
-	<string name="proposals_header_voted_inst">
-		Vous avez voté : [VOTE]
-	</string>
-	<text name="empty_proposal_txt">
-		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.
-	</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"/>
-	<text name="quorum_lbl">
-		Quorum :
-	</text>
-	<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 du vote (en nombre de jours)."/>
-	<text name="duration_text">
-		jours
-	</text>
-	<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 :
-	</text>
-	<text name="end_lbl">
-		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" 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"/>
-	<string name="proposals_submit_yes_txt">
-		Soumission du Oui en cours...
-	</string>
-	<string name="proposals_submit_no_txt">
-		Soumission du Non en cours...
-	</string>
-	<string name="proposals_submit_abstain_txt">
-		Soumission de l&apos;abstention en cours...
-	</string>
-	<string name="proposals_submit_new_txt">
-		Soumission de la nouvelle proposition en cours...
-	</string>
-	<string name="vote_recorded">
-		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 seule fois sur une proposition.
-	</string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="0" follows="all" height="466" label="Propositions" left="1"
+     mouse_opaque="true" name="voting_tab" width="418">
+	<string name="help_text">
+		Les propositions de groupe permettent d&apos;en savoir plus sur les objectifs du groupe ou de donner son avis sur un sujet.
+	</string>
+	<panel background_opaque="true" background_visible="true" bevel_style="in"
+	     bg_alpha_color="blue" border="true"
+	     bottom_delta="-225" follows="left|top" height="170" left="7"
+	     mouse_opaque="false" name="open_proposals_container" width="404" />
+	<panel background_opaque="true" background_visible="true" bevel_style="in"
+	     bg_alpha_color="blue" border="true" bottom="7"
+	     follows="left|top" height="175" left="7" mouse_opaque="false"
+	     name="voting_history_container" width="404" />
+	<button bottom="-24" font="SansSerif" halign="center" height="16" label="?" left="391"
+	     name="help_button" width="20" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="446" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifBig" h_pad="0" halign="left" height="16" left="7"
+	     mouse_opaque="false" name="proposal_header" v_pad="0" width="363">
+		Proposition de Groupe
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-36" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="32" left="7"
+	     mouse_opaque="false" name="proposal_instructions" v_pad="0" width="380">
+		Double clic pour voter ou cliquer Cr&#xE9;er une proposition.
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+	     mouse_opaque="false" name="proposal_lbl" v_pad="0" visible="true"
+	     width="396">
+		Description
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
+	     mouse_opaque="false" name="proposal_voting_lbl" v_pad="0" visible="true"
+	     width="396">
+		Proposition                                                      Fin du vote                      Vot&#xE9;e ?
+	</text>
+	<scroll_list bottom_delta="-121" column_padding="5" column_widths="200,120,40"
+	     draw_border="true" height="120" left="11" mouse_opaque="true"
+	     multi_select="false" name="proposals" width="396" />
+	<button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"
+	     height="20" label="Cr&#xE9;er une proposition" label_selected="Cr&#xE9;er une proposition"
+	     left_delta="-0" mouse_opaque="true" name="btn_proposal" width="160" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="20" label="Voir une proposition" label_selected="Voir une proposition" left="247"
+	     mouse_opaque="true" name="btn_view_proposal_item" width="160" />
+	<text_editor background_visible="true" bg_visible="false" border_drop_shadow_visible="false"
+	     border_visible="false" bottom="300" drop_shadow_visible="false"
+	     embedded_items="false" follows="left|top" font="SansSerif" height="90"
+	     is_unicode="false" left="11" max_length="254" mouse_opaque="true"
+	     name="proposal_text" width="289" word_wrap="true" spell_check="true" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="20" label="Voir la Liste" label_selected="Voir la Liste" left="304"
+	     mouse_opaque="true" name="btn_view_proposal_list" width="101" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="right" height="20" left="8"
+	     mouse_opaque="false" name="quorum_lbl" v_pad="0" width="65">
+		Quorum:
+	</text>
+	<spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="20"
+	     increment="1" initial_val="0" left="78" max_val="138" min_val="1"
+	     mouse_opaque="true" name="quorum" text_disabled_color="orange"
+	     tool_tip=""
+	     width="54" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-0" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="60"
+	     mouse_opaque="false" name="quorum_text" v_pad="0" width="300">
+		Au moins [MEMBERS] membres doivent voter.
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="right" height="20" left="8"
+	     mouse_opaque="false" name="duration_lbl" v_pad="0" width="65">
+		Dur&#xE9;e:
+	</text>
+	<spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="20"
+	     increment="1" initial_val="7" left_delta="70" max_val="30" min_val="1"
+	     mouse_opaque="true" name="duration"
+	     tool_tip="" width="45" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="52"
+	     mouse_opaque="false" name="duration_text" v_pad="0" width="300">
+		Jours
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="right" height="20" left="210"
+	     mouse_opaque="false" name="majority_lbl" v_pad="0" visible="false"
+	     width="65" />
+	<radio_group bottom_delta="72" draw_border="false" follows="left|top" height="60" left="300"
+	     mouse_opaque="true" name="majority"
+	     text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
+	     tool_tip="" width="107">
+		Majorit&#xE9; simple
+		Majorit&#xE9; des 2/3
+		Unanimit&#xE9;
+	</radio_group>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-72" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
+	     mouse_opaque="false" name="start_lbl" v_pad="0" width="70">
+		D&#xE9;but:
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="75"
+	     mouse_opaque="false" name="start_date" v_pad="0" width="200" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
+	     mouse_opaque="false" name="end_lbl" v_pad="0" width="70">
+		Fin :
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="75"
+	     mouse_opaque="false" name="end_date" v_pad="0" width="200" />
+	<button bottom="-218" follows="left|top" font="SansSerif" halign="center" height="20"
+	     label="Soumettre" label_selected="Soumettre" left="200"
+	     mouse_opaque="true" name="btn_submit" width="120" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="20" label="Effacer" label_selected="Effacer" left_delta="128"
+	     mouse_opaque="true" name="btn_cancel" width="75" />
+	<button bottom="-218" follows="top" font="SansSerif" halign="center" height="20"
+	     label="Oui" label_selected="Oui" left="200" mouse_opaque="true"
+	     name="btn_yes" width="63" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="20" label="Non" label_selected="Non" left_delta="70"
+	     mouse_opaque="true" name="btn_no" width="63" />
+	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
+	     height="20" label="M&apos;abstenir" label_selected="M&apos;abstenir" left_delta="70"
+	     mouse_opaque="true" name="btn_abstain" width="63" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-240" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifBig" h_pad="0" halign="left" height="10" left="12"
+	     mouse_opaque="false" name="txt" v_pad="0" width="363">
+		Historique
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-28" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+	     mouse_opaque="false" name="instructions" v_pad="0" width="400">
+		Double clic sur un ancien vote ou s&#xE9;lectionnez en un pour voir les r&#xE9;sultats.
+	</text>
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-296" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+	     mouse_opaque="false" name="history_list_lbl" text_wrap="true" v_pad="0"
+	     width="396">
+		Ancien vote                                                      Fin du vote
+	</text>
+	<scroll_list background_visible="true" bottom_delta="-132" column_padding="5"
+	     column_widths="220,120" draw_border="true" follows="left|top" height="126"
+	     left="10" mouse_opaque="true" multi_select="false" name="history_list"
+	     width="396" />
+	<button bottom_delta="-25" follows="top" font="SansSerif" halign="center" height="20"
+	     label="Voir" label_selected="Voir" left="287" mouse_opaque="true"
+	     name="btn_view_history_item" width="120" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="157" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="right" height="10" left="10"
+	     mouse_opaque="false" name="vote_text_lbl" v_pad="0" width="70">
+		R&#xE9;sultats :
+	</text>
+	<text_editor bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-132" drop_shadow_visible="false" embedded_items="false"
+	     follows="left|top" font="SansSerif" h_pad="0" height="126"
+	     hide_scrollbar="true" is_unicode="false" left="10" max_length="1024"
+	     mouse_opaque="true" name="vote_text"
+	     text_wrap="true" v_pad="0"
+	     width="396" word_wrap="false" />
+	<button bottom_delta="-25" follows="top" font="SansSerif" halign="center" height="20"
+	     label="Liste" label_selected="Liste" left="287" mouse_opaque="true"
+	     name="btn_view_history_list" width="120" />
+	<string name="proposals_header_view_txt">
+		Proposition de Groupe
+	</string>
+	<string name="proposals_header_view_inst">
+		Double clic pour voter ou cliquez Cr&#xE9;er une proposition.
+	</string>
+	<string name="proposals_header_create_txt">
+		Cr&#xE9;er une proposition
+	</string>
+	<string name="proposals_header_create_inst">
+		Saisir une description. Vous pouvez changer le quorum, la dur&#xE9;e
+et la majorit&#xE9; requise pour que la proposition soit adopt&#xE9;e.
+	</string>
+	<string name="proposals_header_vote_txt">
+		Vote sur la proposition
+	</string>
+	<string name="proposals_header_vote_inst">
+		Pour voter, cliquez sur les boutons Oui ou Non,
+ou abstenez-vous en cliquant sur M&apos;abstenir.
+	</string>
+	<string name="proposals_header_voted_inst">
+		Vous avez vot&#xE9;: [VOTE]
+	</string>
+	<string name="empty_proposal_txt">
+		La proposition que vous essayez de cr&#xE9;er est vide. Veuillez saisir une description avant de cr&#xE9;er la proposition.
+	</string>
+	<string name="proposals_submit_yes_txt">
+		Soumission du Oh oui je le veux en cours...
+	</string>
+	<string name="proposals_submit_no_txt">
+		Soumission du Non j&apos;veux po en cours...
+	</string>
+	<string name="proposals_submit_abstain_txt">
+		Soumission de l&apos;abstention en cours...
+	</string>
+	<string name="proposals_submit_new_txt">
+		Soumission de la nouvelle proposition en cours...
+	</string>
+	<string name="vote_recorded">
+		Votre vote a bien &#xE9;t&#xE9; re&#xE7;u.
+	</string>
+	<string name="vote_previously_recorded">
+		Vous avez d&#xE9;jà vot&#xE9;. Vous ne pouvez voter qu&apos;une seule fois par proposition.
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_groups.xml b/indra/newview/skins/default/xui/fr/panel_groups.xml
index 8f8b738a6..7b39c8ad9 100644
--- a/indra/newview/skins/default/xui/fr/panel_groups.xml
+++ b/indra/newview/skins/default/xui/fr/panel_groups.xml
@@ -1,18 +1,51 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="groups">
-	<scroll_list bottom="50" name="group list"/>
-	<text bottom="16" height="32" name="groupdesc" width="268">
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-371" height="300" left="280" mouse_opaque="true"
+     name="groups" width="350">
+	<scroll_list background_visible="true" bottom="45" column_padding="0" draw_border="true"
+	     draw_heading="true" draw_stripes="true" enabled="true"
+	     follows="left|top|right|bottom" left="10" mouse_opaque="true"
+	     multi_select="false" name="group list" tab_stop="true" top="-10"
+	     width="240">
+		<column dynamicwidth="true" label="Nom" name="name" tool_tip="Nom" />
+    <column image_overlay="ff_visible_online.tga" name="is_listed_group"
+		    tool_tip="Groupe visible sur le profil." width="20" />
+    <column image_overlay="icn_chat_overlay.tga" name="is_chattable_group"
+		    tool_tip="Recevoir le chat de groupe" width="20" />
+    <column image_overlay="smicon_warn.tga" name="is_notice_group"
+        tool_tip="Recevoir les notices" width="20" />
+	</scroll_list>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="22" drop_shadow_visible="true" enabled="true" follows="left|bottom"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+	     mouse_opaque="false" name="groupdesc" v_pad="0" width="248">
 		Le groupe actif est en italique.
 	</text>
-	<text bottom="3" name="groupcount">
-		Vous appartenez à [COUNT] groupes ([MAX] max).
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="5" drop_shadow_visible="true" enabled="true" follows="left|bottom"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
+	     mouse_opaque="false" name="groupcount" v_pad="0" width="248">
+		Vous appartenez &#xE0; [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="Inviter" name="Invite..."/>
-	<button label="Titres" name="Titles..."/>
+	<pad bottom="-7" height="0" left="-90" width="1" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="IM/Appel" left_delta="0" name="IM"
+	     tool_tip="Ouvrir une session de messagerie instantan&#xE9;e" width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Info" name="Info" width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Activer" name="Activate" width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Quitter" name="Leave" width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Cr&#xE9;er" name="Create" width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Rechercher" name="Search..." width="80" />
+  	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Inviter" name="Invite..." width="80" />
+	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
+	     label="Titres" name="Titles..." width="80" />
+  <string name="none">
+		Aucun
+  </string>
 </panel>
+
diff --git a/indra/newview/skins/default/xui/fr/panel_land_covenant.xml b/indra/newview/skins/default/xui/fr/panel_land_covenant.xml
index 6732a9c4e..122d589a6 100644
--- a/indra/newview/skins/default/xui/fr/panel_land_covenant.xml
+++ b/indra/newview/skins/default/xui/fr/panel_land_covenant.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Covenant" title="Règlement">
-	<text name="region_name_lbl">
-		Région :
-	</text>
-	<text name="region_name_text">
-		(inconnue)
-	</text>
-	<text name="estate_name_lbl">
-		Domaine :
-	</text>
-	<text name="estate_name_text">
-		(inconnu)
-	</text>
-	<text name="estate_owner_lbl">
-		Propriétaire :
-	</text>
-	<text name="estate_owner_text">
-		(inconnu)
-	</text>
-	<text name="resellable_clause">
-		Le terrain acheté dans cette région peut être revendu ou pas.
-	</text>
-	<text name="changeable_clause">
-		Le terrain acheté dans cette région peut être fusionné/divisé ou pas.
-	</text>
-	<text name="can_resell">
-		Le terrain acheté dans cette région peut être revendu.
-	</text>
-	<text name="can_not_resell">
-		Le terrain acheté dans cette région ne peut pas être revendu.
-	</text>
-	<text name="can_change">
-		Le terrain acheté dans cette région peut être fusionné ou divisé.
-	</text>
-	<text name="can_not_change">
-		Le terrain acheté dans cette région ne peut pas être fusionné ou divisé.
-	</text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="Covenant" title="Règlement">
+	<text name="region_name_lbl">
+		Région :
+	</text>
+	<text name="region_name_text">
+		(inconnue)
+	</text>
+	<text name="estate_name_lbl">
+		Domaine :
+	</text>
+	<text name="estate_name_text">
+		(inconnu)
+	</text>
+	<text name="estate_owner_lbl">
+		Propriétaire :
+	</text>
+	<text name="estate_owner_text">
+		(inconnu)
+	</text>
+	<text name="resellable_clause">
+		Le terrain acheté dans cette région peut être revendu ou pas.
+	</text>
+	<text name="changeable_clause">
+		Le terrain acheté dans cette région peut être fusionné/divisé ou pas.
+	</text>
+	<text name="can_resell">
+		Le terrain acheté dans cette région peut être revendu.
+	</text>
+	<text name="can_not_resell">
+		Le terrain acheté dans cette région ne peut pas être revendu.
+	</text>
+	<text name="can_change">
+		Le terrain acheté dans cette région peut être fusionné ou divisé.
+	</text>
+	<text name="can_not_change">
+		Le terrain acheté dans cette région ne peut pas être fusionné ou divisé.
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_login.xml b/indra/newview/skins/default/xui/fr/panel_login.xml
index 2307df303..39353c470 100644
--- a/indra/newview/skins/default/xui/fr/panel_login.xml
+++ b/indra/newview/skins/default/xui/fr/panel_login.xml
@@ -1,70 +1,53 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="0" follows="left|top|right|bottom" height="600" left="0"
-     mouse_opaque="true" name="panel_login" width="800">
-	<web_browser border_visible="false" bottom="0" follows="top|left|bottom|right" left="0"
-	     name="login_html" right="-1"
-	     start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody bgcolor=%22#000000%22 text=%22ffffff%22%3E%3Ch1%3E%3Ctt%3Eloading...%3C/tt%3E%3C/h1%3E %3C/body%3E %3C/html%3E"
-	     top="-1" />
-	<string name="real_url">
-		http://secondlife.com/app/login/
-	</string>
-	<string name="forgot_password_url">
-		http://secondlife.com/account/request.php
-	</string>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="54" drop_shadow_visible="true" follows="left|bottom"
-	     font="SansSerif" h_pad="0" halign="left" height="16"
-	     left="32" mouse_opaque="true" name="name_label" v_pad="0" width="120">
-		Nom :
-	</text>
-	<text name="password_text">
-		Mot de passe :
-	</text>
-	<text name="start_location_text">
-    Lieu d'arrivée :
-  </text>
-	<combo_box name="start_location_combo">
-		<combo_item name="MyHome">
-			Domicile
-		</combo_item>
-		<combo_item name="MyLastLocation">
-			Dernier emplacement
-		</combo_item>
-		<combo_item name="&lt;Typeregionname&gt;">
-			&lt;Choisir région&gt;
-		</combo_item>
-		<combo_item name="Typeregionname">
-			&lt;Nom de la région&gt;
-		</combo_item>
-	</combo_box>
-	<check_box bottom="10" control_name="RememberName"
-         follows="left|bottom" font="SansSerifSmall" height="16"
-	     initial_value="true" label="Mémoriser le nom"
-	     left="28" mouse_opaque="true" name="remember_name_check" width="158" />
-	<check_box label="Mémoriser Mot de Passe" name="remember_check"/>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="54" drop_shadow_visible="true" follows="left|bottom"
-	     font="SansSerif" h_pad="0" halign="left" height="16"
-	     left="339" mouse_opaque="true" name="grids_combo_text" v_pad="0" width="120">
-		Grille :
-	</text>
-	<combo_box allow_text_entry="false" bottom_delta="-24" follows="left|bottom" height="20"
-	     left="339" mouse_opaque="true" name="grids_combo" width="120" />
-	<button name="grids_btn" label="Choix de Grille"
-	    bottom_delta="-20" left_delta="10" height="16" width="100"
-	    follows="left|bottom" font="SansSerifSmall" halign="center"
-	    mouse_opaque="true" scale_image="TRUE" />
-	<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="Connexion" 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="create_new_account_text">
-		Créer un compte
-	</text>
-	<text name="forgot_password_text">
-		Nom ou mot de passe oublié ?
-	</text>
-</panel>
+<panel name="panel_login">
+	<web_browser name="login_html" />
+	<string name="real_url">
+		http://secondlife.com/app/login/
+	</string>
+	<string name="forgot_password_url">
+		http://secondlife.com/account/request.php
+	</string>
+	<text left="32" name="name_label" width="120">
+		Nom:
+	</text>
+	<text name="password_text">
+		Mot de passe:
+	</text>
+	<text name="start_location_text">
+		Lieu d'arrivée:
+	</text>
+	<combo_box name="start_location_combo">
+		<combo_item name="MyHome">
+			Domicile
+		</combo_item>
+		<combo_item name="MyLastLocation">
+			Dernier emplacement
+		</combo_item>
+		<combo_item name="&lt;Typeregionname&gt;">
+			&lt;Choisir région&gt;
+		</combo_item>
+		<combo_item name="Typeregionname">
+			&lt;Nom de la région&gt;
+		</combo_item>
+	</combo_box>
+	<check_box bottom="10" label="Mémoriser le nom" left="28" name="remember_name_check" width="158"/>
+	<check_box label="Mémoriser mot de passe" name="remember_check"/>
+	<text bottom="54" left="339" name="grids_combo_text" width="120">
+		Grille:
+	</text>
+	<combo_box bottom_delta="-24" left="339" name="grids_combo" width="120" />
+	<button name="grids_btn" label="Choix de Grille" bottom_delta="-20" left_delta="10" width="100"/>
+	<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="Connexion" 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="create_new_account_text">
+		Créer un compte
+	</text>
+	<text name="forgot_password_text">
+		Nom ou mot de passe oublié?
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_master_volume.xml b/indra/newview/skins/default/xui/fr/panel_master_volume.xml
index 3cb855875..d95a68884 100644
--- a/indra/newview/skins/default/xui/fr/panel_master_volume.xml
+++ b/indra/newview/skins/default/xui/fr/panel_master_volume.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="master_volume">
-	<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>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="master_volume">
+	<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'aide de ce curseur."/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_media_controls.xml b/indra/newview/skins/default/xui/fr/panel_media_controls.xml
index 72b3ade29..52c4a852d 100644
--- a/indra/newview/skins/default/xui/fr/panel_media_controls.xml
+++ b/indra/newview/skins/default/xui/fr/panel_media_controls.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="media_controls">
-	<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 média en pause"/>
-	<button name="media_stop" tool_tip="Arrêtez le flux 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>
-	<string name="stop_label">
-		Stop
-	</string>
-	<string name="pause_label">
-		Mettre en pause
-	</string>
-	<string name="default_tooltip_label">
-		Aucun média spécifié
-	</string>
-	<string name="media_hidden_label">
-		(URL cachée par le propriétaire de la parcelle)
-	</string>
-	<string name="media_icon_tooltip_web">
-		Cet endroit propose du contenu Web. Cliquez sur Jouer pour afficher le contenu web.
-	</string>
-	<string name="media_icon_tooltip_movie">
-		Cet endroit propose du contenu vidéo. Cliquez sur Jouer pour lire la vidéo.
-	</string>
-	<string name="media_play_tooltip">
-		Affichez le contenu web.
-	</string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="media_controls">
+	<icon name="music_icon" tool_tip="Joue le flux musical"/>
+	<button name="music_play" tool_tip="Joue le flux musical"/>
+	<button name="music_pause" tool_tip="Met le flux musical en pause"/>
+	<button name="music_stop" tool_tip="Arrête le flux musical"/>
+	<icon name="media_icon" tool_tip="Joue le flux musical"/>
+	<button name="media_play" tool_tip="Joue le flux musical"/>
+	<button name="media_pause" tool_tip="Met le flux média en pause"/>
+	<button name="media_stop" tool_tip="Arrête le flux média"/>
+	<volume_slider name="volume_slider" tool_tip="Volume principal"/>
+	<button name="mute_master" tool_tip="Coupe le volume principal"/>
+	<button name="expand" tool_tip="Ajuste les niveaux de volume individuels"/>
+	<string name="play_label">
+		Jouer
+	</string>
+	<string name="stop_label">
+		Stop
+	</string>
+	<string name="pause_label">
+		Mettre en pause
+	</string>
+	<string name="default_tooltip_label">
+		Aucun média spécifié
+	</string>
+	<string name="media_hidden_label">
+		(URL cachée par le propriétaire de la parcelle)
+	</string>
+	<string name="media_icon_tooltip_web">
+		Cet endroit propose du contenu Web. Cliquez sur Jouer pour afficher le contenu web.
+	</string>
+	<string name="media_icon_tooltip_movie">
+		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.
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_media_remote.xml b/indra/newview/skins/default/xui/fr/panel_media_remote.xml
index d2ee33a91..3e860855f 100644
--- a/indra/newview/skins/default/xui/fr/panel_media_remote.xml
+++ b/indra/newview/skins/default/xui/fr/panel_media_remote.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="music_remote">
-	<text length="1" name="text" type="string">
-		Vidéo
-	</text>
-	<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>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="music_remote">
+	<text length="1" name="text" type="string">
+		Vidéo
+	</text>
+	<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/indra/newview/skins/default/xui/fr/panel_media_remote_expanded.xml b/indra/newview/skins/default/xui/fr/panel_media_remote_expanded.xml
index 947cffba6..8463da166 100644
--- a/indra/newview/skins/default/xui/fr/panel_media_remote_expanded.xml
+++ b/indra/newview/skins/default/xui/fr/panel_media_remote_expanded.xml
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="media_remote">
-	<panel label="Audio et vidéo" name="Volume Panel"/>
-	<string name="play_label">
-		Jouer
-	</string>
-	<string name="stop_label">
-		Stop
-	</string>
-	<string name="pause_label">
-		Pauser
-	</string>
-	<string name="default_tooltip_label">
-		Aucun média spécifié
-	</string>
-	<string name="media_hidden_label">
-		(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.
-	</string>
-	<string name="media_icon_tooltip_movie">
-		Il y a du contenu vidéo à cet endroit. Cliquez sur Jouer pour lire la vidéo.
-	</string>
-	<string name="media_play_tooltip">
-		Afficher le contenu web qui se trouve ici.
-	</string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="media_remote">
+	<panel label="Audio et vidéo" name="Volume Panel"/>
+	<string name="play_label">
+		Jouer
+	</string>
+	<string name="stop_label">
+		Stop
+	</string>
+	<string name="pause_label">
+		Pauser
+	</string>
+	<string name="default_tooltip_label">
+		Aucun média spécifié
+	</string>
+	<string name="media_hidden_label">
+		(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 &#x22;Jouer&#x22; pour afficher le contenu web.
+	</string>
+	<string name="media_icon_tooltip_movie">
+		Il y a du contenu vidéo à cet endroit. Cliquez sur &#x22;Jouer&#x22; pour lire la vidéo.
+	</string>
+	<string name="media_play_tooltip">
+		Affichez le contenu web qui se trouve ici.
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_mini_map.xml b/indra/newview/skins/default/xui/fr/panel_mini_map.xml
index f97b5ca9f..d2084826e 100644
--- a/indra/newview/skins/default/xui/fr/panel_mini_map.xml
+++ b/indra/newview/skins/default/xui/fr/panel_mini_map.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Mini-carte" name="mini_mapview">
-	<text name="n_label">
-		N
-	</text>
-	<text name="e_label">
-		E
-	</text>
-	<text name="s_label">
-		S
-	</text>
-	<text name="w_label">
-		O
-	</text>
-	<text name="ne_label">
-		NE
-	</text>
-	<text name="se_label">
-		SE
-	</text>
-	<text name="sw_label">
-		SO
-	</text>
-	<text name="nw_label">
-		NO
-	</text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Mini-carte" name="mini_mapview">
+	<text name="n_label">
+		N
+	</text>
+	<text name="e_label">
+		E
+	</text>
+	<text name="s_label">
+		S
+	</text>
+	<text name="w_label">
+		O
+	</text>
+	<text name="ne_label">
+		NE
+	</text>
+	<text name="se_label">
+		SE
+	</text>
+	<text name="sw_label">
+		SO
+	</text>
+	<text name="nw_label">
+		NO
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml b/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml
index 5beb71981..82cad706d 100644
--- a/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml
+++ b/indra/newview/skins/default/xui/fr/panel_notifications_channel.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="notifications_panel">
-	<layout_stack name="stack1">
-		<scroll_list name="notifications_list">
-			<column label="Nom" name="name"/>
-			<column label="Contenu" name="content"/>
-			<column label="Date" name="date"/>
-		</scroll_list>
-		<scroll_list name="notification_rejects_list">
-			<column label="Nom" name="name"/>
-			<column label="Contenu" name="content"/>
-			<column label="Date" name="date"/>
-		</scroll_list>
-	</layout_stack>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="notifications_panel">
+	<layout_stack name="stack1">
+		<scroll_list name="notifications_list">
+			<column label="Nom" name="name"/>
+			<column label="Contenu" name="content"/>
+			<column label="Date" name="date"/>
+		</scroll_list>
+		<scroll_list name="notification_rejects_list">
+			<column label="Nom" name="name"/>
+			<column label="Contenu" name="content"/>
+			<column label="Date" name="date"/>
+		</scroll_list>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_overlaybar.xml b/indra/newview/skins/default/xui/fr/panel_overlaybar.xml
index e94bf0704..adbd7ac8a 100644
--- a/indra/newview/skins/default/xui/fr/panel_overlaybar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_overlaybar.xml
@@ -1,27 +1,24 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="overlay">
-	<layout_stack name="overlay_layout_panel">
-		<layout_panel min_width="410" name="main_panel" 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="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="Flycam" label_selected="Flycam" name="Flycam" tool_tip="Votre caméra est contrôlée par le joystick, cliquez ici pour la libérer."/>
-					<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."/>
-					<button label="IM Reçu" label_selected="IM Reçu" left="0"
-					     name="New IM" scale_image="true"
-					     tool_tip="Im En attente."
-					     width="150" />
-				</layout_panel>
-				<layout_panel name="chat_bar"/>
-			</layout_stack>
-		</layout_panel>
-		<layout_panel min_width="220" name="media_remote_container" width="220"/>
-		<layout_panel min_width="138" name="voice_remote_container" width="140"/>
-	</layout_stack>
-</panel>
-
-
-
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="overlay">
+	<layout_stack name="overlay_layout_panel">
+		<layout_panel min_width="410" name="main_panel" 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="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="Flycam" label_selected="Flycam" name="Flycam" tool_tip="Votre caméra est contrôlée par le joystick, cliquez ici pour la libérer."/>
+					<button label="Vue subjective" label_selected="Vue subjective" name="Mouselook" tool_tip="Utilisez la souris pour diriger votre vue. Si vous avez une arme, vous pouvez tirer en cliquant."/>
+					<button label="Me lever" label_selected="Me lever" name="Stand Up" tool_tip="Cliquez ici pour vous lever."/>
+					<button label="IM Reçu" label_selected="IM Reçu" left="0"
+					     name="New IM" scale_image="true"
+					     tool_tip="Im en attente."
+					     width="150" />
+				</layout_panel>
+				<layout_panel name="chat_bar"/>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel min_width="220" name="media_remote_container" width="220"/>
+		<layout_panel min_width="138" name="voice_remote_container" width="140"/>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_place.xml b/indra/newview/skins/default/xui/fr/panel_place.xml
index 17d463fbd..2d9a45753 100644
--- a/indra/newview/skins/default/xui/fr/panel_place.xml
+++ b/indra/newview/skins/default/xui/fr/panel_place.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="Place" title="Emplacement">
-	<text name="name_label">
-		Nom :
-	</text>
-	<text name="description_label">
-		Description :
-	</text>
-	<text name="information_label"/>
-	<text left="20" name="info_editor" width="420"/>
-	<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" width="115"/>
-	<button label="Enchères..." name="auction_btn"/>
-	<string name="traffic_text">
-		Trafic : [TRAFFIC]. 
-	</string>
-	<string name="area_text">
-		Surface : [AREA] m². 
-	</string>
-	<string name="forsale_text">
-		En vente pour [PRICE] L$.
-	</string>
-	<string name="auction_text">
-		Enchère : [ID]
-	</string>
-	<string name="server_update_text">
-		Les informations sur le lieu ne sont pas disponibles sans mise à jour du serveur.
-	</string>
-	<string name="server_error_text">
-		Aucune information sur ce lieu n&apos;est disponible actuellement, veuillez réessayer ultérieurement.
-	</string>
-	<string name="server_forbidden_text">
-		Les informations sur ce lieu ne sont pas disponibles car l&apos;accès y est restreint. Veuillez vérifier vos droits avec le propriétaire de la parcelle.
-	</string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="Place" title="Emplacement">
+	<text name="name_label">
+		Nom:
+	</text>
+	<text name="description_label">
+		Description:
+	</text>
+	<text name="information_label"/>
+	<text left="20" name="info_editor" width="420"/>
+	<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" width="115"/>
+	<button label="Enchères" name="auction_btn"/>
+	<string name="traffic_text">
+		Trafic: [TRAFFIC]
+	</string>
+	<string name="area_text">
+		Surface: [AREA] m².
+	</string>
+	<string name="forsale_text">
+		En vente pour [PRICE][CURRENCY].
+	</string>
+	<string name="auction_text">
+		Enchère: [ID]
+	</string>
+	<string name="server_update_text">
+		Les informations sur ce lieu ne sont pas disponibles sans mise à jour du serveur.
+	</string>
+	<string name="server_error_text">
+		Aucune information sur ce lieu n'est disponible actuellement, veuillez réessayer ultérieurement.
+	</string>
+	<string name="server_forbidden_text">
+		Les informations sur ce lieu ne sont pas disponibles car l&apos;accès y est restreint. Veuillez vérifier vos droits avec le propriétaire de la parcelle.
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_place_small.xml b/indra/newview/skins/default/xui/fr/panel_place_small.xml
index bc245221b..01364c0af 100644
--- a/indra/newview/skins/default/xui/fr/panel_place_small.xml
+++ b/indra/newview/skins/default/xui/fr/panel_place_small.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="Place" title="Lieu">
-	<text name="name_label">
-		Nom :
-	</text>
-	<text name="description_label">
-		Description :
-	</text>
-	<text name="information_label"/>
-	<text left="20" name="info_editor" width="420"/>
-	<text name="land_type_label">
-		Type de terrain :
-	</text>
-	<text left="113" name="land_type_display" width="338" />
-	<text name="location_label">
-		Lieu :
-	</text>
-	<text left="113" name="location_editor" width="338"/>
-	<button label="Téléporter" name="teleport_btn"/>
-	<button label="Voir sur la carte" name="map_btn" width="115"/>
-	<button label="Enchères..." name="auction_btn"/>
-	<string name="traffic_text">
-		Trafic : [TRAFFIC]. 
-	</string>
-	<string name="area_text">
-		Surface : [AREA] m². 
-	</string>
-	<string name="forsale_text">
-		En vente pour [PRICE] L$.
-	</string>
-	<string name="auction_text">
-		Enchère : [ID]
-	</string>
-	<string name="server_update_text">
-		Les informations sur le lieu ne sont pas disponibles sans mise à jour du serveur.
-	</string>
-	<string name="server_error_text">
-		Aucune information sur ce lieu n&apos;est disponible actuellement, veuillez réessayer ultérieurement.
-	</string>
-	<string name="server_forbidden_text">
-		Les informations sur ce lieu ne sont pas disponibles car l&apos;accès y est restreint. Veuillez vérifier vos droits avec le propriétaire de la parcelle.
-	</string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="Place" title="Lieu">
+	<text name="name_label">
+		Nom:
+	</text>
+	<text name="description_label">
+		Description:
+	</text>
+	<text name="information_label"/>
+	<text left="20" name="info_editor" width="420"/>
+	<text name="land_type_label">
+		Type de terrain:
+	</text>
+	<text left="113" name="land_type_display" width="338" />
+	<text name="location_label">
+		Lieu:
+	</text>
+	<text left="113" name="location_editor" width="338"/>
+	<button label="Téléporter" name="teleport_btn"/>
+	<button label="Voir sur la carte" name="map_btn" width="115"/>
+	<button label="Enchères" name="auction_btn"/>
+	<string name="traffic_text">
+		Trafic: [TRAFFIC]
+	</string>
+	<string name="area_text">
+		Surface: [AREA] m².
+	</string>
+	<string name="forsale_text">
+		En vente pour [PRICE][CURRENCY].
+	</string>
+	<string name="auction_text">
+		Enchère: [ID]
+	</string>
+	<string name="server_update_text">
+		Les informations sur ce lieu ne sont pas disponibles sans mise à jour du serveur.
+	</string>
+	<string name="server_error_text">
+		Aucune information sur ce lieu n'est disponible actuellement, veuillez réessayer ultérieurement.
+	</string>
+	<string name="server_forbidden_text">
+		Les informations sur ce lieu ne sont pas disponibles car l'accès y est restreint. Veuillez vérifier vos droits avec le propriétaire de la parcelle.
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
new file mode 100644
index 000000000..d75c736c8
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_chat.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel top="20" left="10" height="400" width="517" border="true" label="Chat Avanc&#xE9;" name="ascsys">
+  <tab_container label="Advanced Chat" bottom="0" height="440" width="497" left="0" name="Ascent Chat" tab_position="top">
+     <panel border="true" left="1" bottom="-408" height="408" width="500" label="Chat/IM" name="Chat/IM">
+
+      <check_box bottom_delta="-25" left="10" follows="top" initial_value="false" control_name="WoLfVerticalIMTabs" 
+        label="IMs verticaux (n&#xE9;cessite une d&#xE9;co/reco)" name="use_vertical_ims_check"/>
+      <check_box bottom_delta="-20" follows="left|top" initial_value="false" control_name="AscentInstantMessageAnnounceIncoming"
+        label="Annonce les IMs entrants" tool_tip="" name="quickstart_im_check"/>
+      <check_box bottom_delta="-20" follows="left|top" control_name="AscentHideTypingNotification" initial_value="false"
+        label="Ne pas envoyer &#x22;[Machin Truc] is typing...&#x22; dans les IMs" tool_tip="" name="hide_typing_check"/>
+      <check_box bottom_delta="-20" follows="left|top" control_name="OptionShowGroupNameInChatIM" initial_value="false"
+        label="Montrer le nom du groupe dans le chat" tool_tip="" name="append_group_name_check"/>
+      <check_box bottom_delta="-25" left_delta="-5" follows="left|top" control_name="PlayTypingSound" initial_value="true"
+        label="Jouer le son typique pour le chat local" tool_tip="" name="play_typing_sound_check"/>
+      <check_box bottom_delta="-20" follows="left|top" control_name="HideNotificationsInChat" initial_value="false"
+        label="Ne pas afficher les notifs. de log dans le chat" name="hide_notifications_in_chat_check"/>
+      <check_box bottom="-120" left="10" control_name="AscentAllowMUpose" initial_value="false"
+        label="Permet d'utiliser &#x22;/me&#x22; aussi bien que &#x22;:&#x22; pour les &#x22;emotes&#x22;" tool_tip="" name="allow_mu_pose_check"/>
+      <check_box bottom_delta="-20" follows="left|top" control_name="AscentAutoCloseOOC"
+        label="Ajoute automatiquement les fins des commentaires OOC (RP mode)" tool_tip="Ajoute automatiquement &#x22;))&#x22; &#xE0; chaque message commen&#xE7;ant par &#x22;((&#x22;, et vice-versa." name="close_ooc_check"/>
+<text bottom_delta="-15" follows="left|top" name="objects_link_text_box3">Active un lien qui montre le nom du propri&#xE9;taire dans l'historique du chat pour :</text>
+       <radio_group bottom_delta="-26" control_name="LinksForChattingObjects" tool_tip="Enables a link to show you the owner of the speaking object."
+        follows="top" height="20" left="20" name="objects_link" width="350">
+        <radio_item bottom_delta="0" left_delta="5" name="no_object" width="48">Aucun objet</radio_item>
+        <radio_item bottom_delta="0" left_delta="45" name="others_objects" width="48">Les objets des autres</radio_item>
+        <radio_item bottom_delta="0" left_delta="65" name="anyones_objects" width="48">Tous les objets</radio_item>
+      </radio_group>
+
+      <text bottom_delta="-18" left="10" follows="top" name="time_format_text_box">Type d'heure :</text>
+      <combo_box bottom_delta="-5" left="90" follows="top" height="18" tool_tip="" name="time_format_combobox" width="130">
+        <combo_item name="24hours" value="default">Horloge 24/H</combo_item>
+        <combo_item name="12hours" value="default">Horloge 12/H</combo_item>
+      </combo_box>
+      <check_box bottom_delta="0" left="240" follows="top" control_name="SecondsInChatAndIMs" initial_value="false" label="Secondes dans les Chat/IMs" name="seconds_in_chat_and_ims_check"/>
+      <text bottom_delta="-18" left="10" follows="top" name="date_format_text_box">Type de date :</text>
+      <combo_box bottom_delta="-5" left="90" follows="top" height="18" name="date_format_combobox" width="130">
+        <combo_item name="year_first" value="default">AAAA-MM-JJ</combo_item>
+        <combo_item name="day_first" value="default">JJ/MM/AAAA</combo_item>
+        <combo_item name="month_first" value="default">MM/JJ/AAA</combo_item>
+      </combo_box>
+      <!-- Auto-responder -->
+      <view_border bottom="-420" left="5" height="190" bevel_style="none" border_thickness="1" name="GraphicsBorder" width="485"/>
+      <check_box bottom_delta="168" left="10" follows="top" initial_value="false" label="Activer le R&#xE9;pondeur Automatique"
+        name="AscentInstantMessageResponseAnyone" tool_tip=""/>
+	  <check_box bottom_delta="-20" follows="left|top" initial_value="false"
+		label="Auto-r&#xE9;ponse aux 'non-friends'" name="AscentInstantMessageResponseFriends" tool_tip=""/>
+	  <check_box bottom_delta="-20" follows="left|top" initial_value="false" 
+		label="Auto-r&#xE9;ponse aux personnes 'muted'" name="AscentInstantMessageResponseMuted" tool_tip=""/>
+      <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Envoyer d&#xE8;s que l'on commence &#xE0; vous &#xE9;crire" name="AscentInstantMessageShowOnTyping"/>
+      <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Ne pas montrer les IMs auxquels vous avez r&#xE9;pondu" name="AscentInstantMessageShowResponded"/>
+      <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Auto-r&#xE9;ponse &#xE0; chaque message" name="AscentInstantMessageResponseRepeat"/>
+      <check_box bottom_delta="-20" follows="left|top" initial_value="false" label="Joindre un objet &#xE0; la r&#xE9;ponse" name="AscentInstantMessageResponseItem" tool_tip="Glissez l'objet dans la fen&#xEA;tre de r&#xE9;ponse."/>
+	  <text bottom_delta="120" left_delta="280" follows="left|top" height="18" name="text_box1">Texte de la r&#xE9;ponse :</text>
+      <text_editor bottom_delta="-110" follows="left|top" height="110" max_length="1100" name="im_response" width="200" word_wrap="true" spell_check="true"/>
+      <text bottom_delta="-25" follows="left|top" height="18" name="text_box2">
+#f Pr&#xE9;nom, #l Nom, 
+#t Dur&#xE9;e, #r SLURL,
+#i Dur&#xE9;e de 'l'IDLE'. (ex. "5 mins")
+      </text>
+    </panel>
+
+    <panel border="true" left="1" bottom="-408" height="408" width="500" label="Spam" name="Spam">
+      <check_box left="10" bottom_delta="-25" follows="top" font="SansSerifSmall"
+        label="Activer le blocage de spam du chat" tool_tip="" name="AscChatSpamBlock" control_name="SGBlockChatSpam"/>
+      <spinner left_delta="20" height="18" width="120" follows="top" decimal_digits="0" increment="1" initial_val="10" min_val="2" max_val="100"
+        label="Nombre" label_width="70" tool_tip="(Default: 10)" name="AscChatSpamCount" control_name="SGChatSpamCount"/>
+      <spinner height="18" width="120" follows="left|top" decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
+        label="Dur&#xE9;e" label_width="70" name="AscChatSpamTime" control_name="SGChatSpamTime" tool_tip="(Default: 1.0)"/>
+      <text bottom_delta="0" left_delta="130" height="16" follows="top" name="" width="100">secondes</text>
+      <check_box left_delta="-150" height="16" follows="top" label="Activer le blocage du spam de dialogue" tool_tip="" name="AscDialogSpamBlock" control_name="SGBlockDialogSpam"/>
+      <check_box height="16" follows="left|top" label="Dur&#xE9;e" tool_tip="" name="AscCardSpamBlock" control_name="SGBlockCardSpam"/>
+      <spinner left_delta="20" height="18" width="120" follows="top" decimal_digits="0" increment="1" initial_val="4" min_val="2" max_val="100"
+        label="Nombre" label_width="70" name="AscSpamCount" control_name="SGSpamCount" tool_tip="(Default: 4)"/>
+      <spinner height="18" width="120" follows="left|top" decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
+        label="Dur&#xE9;e" label_width="70" name="AscSpamTime" control_name="SGSpamTime" tool_tip="(Default: 1.0)"/>
+      <text bottom_delta="0" left_delta="130" height="16" follows="top" name="">secondes</text>
+    </panel>
+
+    <panel border="true" bottom="-580" height="525" label="Options de Texte" left="1" name="TextOptions" width="418">
+      <check_box bottom="-25" left="12" height="16" label="Montre les 'fot de frap' ou suppos&#xE9;es telles en ROUGE" name="SpellDisplay" control_name="SpellDisplay"/>
+      <text bottom_delta="-24" follows="left|top" height="16" name="EmSpell_txt1">Langage courant (dictionnaire) :</text>
+      <combo_box bottom_delta="-20" follows="left|top" height="20" name="SpellBase" width="250" control_name="SpellBase"/>
+      <text bottom_delta="-24" follows="left|top" height="20" name="EmSpell_txt3">T&#xE9;l&#xE9;charger les langues (dictionnaires) :</text>
+      <combo_box bottom_delta="-20" follows="left|top" height="20" name="EmSpell_Avail" width="250" control_name="EmSpell_Avail"/>
+      <button bottom_delta="0" left_delta="255" follows="left|top" height="20" label="Installer" name="EmSpell_Add" tool_tip="" width="80"/>
+      <button bottom_delta="-22" left="12" follows="top" height="20" label="T&#xE9;l&#xE9;charger +++" name="EmSpell_GetMore" tool_tip="Obtenez plus de dictionnaires en ligne" width="250"/>
+      <text bottom_delta="-24" follows="left|top" height="20" name="EmSpell_txt2">Langues additionnelles (dictionnaires) :</text>
+      <combo_box bottom_delta="-20" follows="left|top" height="20" name="EmSpell_Installed" width="250" control_name="EmSpell_Installed" tool_tip=""/>
+      <button bottom_delta="0" left_delta="255" follows="left|top" height="20" label="Supprimer" name="EmSpell_Remove" tool_tip="" width="80"/>
+      <button bottom_delta="-20" left="12" follows="top" height="20" label="Editer un dictionnaire" name="EmSpell_EditCustom" width="250"/>
+      <text bottom_delta="-24" follows="left|top" height="20" name="EmSpell_txt4">
+Clic droit sur le mot mal &#xE9;crit et choisir son remplacement.
+      </text>
+
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-16" follows="top" height="0" left="5" name="CmdDivisor" width="356"/>
+
+      <check_box bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16"
+        label="Mettre en valeur les messages si l'un deux contient les termes suivants :" name="KeywordsOn" width="270"/>
+      <text bottom_delta="-20" follows="top" height="20" left="12" name="keyword_txt1">(s&#xE9;par&#xE9;s par des virgules)</text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" left_delta="5" max_length="500" name="KeywordsList" width="300"/>
+      <text bottom_delta="-24" follows="top" height="20" left_delta="15" name="EmKeyw">Est trouv&#xE9; dans :</text>
+      <check_box bottom_delta="3" follows="top" height="16" left_delta="100" label="Chat local" name="KeywordsInChat"/>
+      <check_box bottom_delta="-15" follows="left|top" height="16" label="IMs" name="KeywordsInIM"/>
+      <check_box bottom_delta="-24" follows="top" height="16" label="Mettre en valeur le message avec cette couleur :" left_delta="-110" name="KeywordsChangeColor"/>
+      <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-16" can_apply_immediately="true" color="1, 1, 1, 1" follows="left|top" height="35" left_delta="270" name="KeywordsColor" tool_tip="Click to open Color Picker" width="50"/>
+      <check_box bottom_delta="-10" follows="top" height="16" left_delta="-210" label="Jouer cette alerte sonore : (UUID)" name="KeywordsPlaySound"/>
+      <line_editor bottom_delta="-20" follows="left|top" bevel_style="in" border_style="line" border_thickness="1" height="20" left_delta="-5" max_length="36" name="KeywordsSound" width="300"/>
+    </panel>
+
+  </tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml
index 8b180cb3f..a29a0228b 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_system.xml
@@ -1,321 +1,347 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom"
-  border="true" label="System" name="ascsys" enabled="true" mouse_opaque="true">
-  <tab_container label="Singularity System" bottom="0" height="440" width="497" left="0"
-    name="Ascent System" tab_min_width="70" tab_position="top">
-
-    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-      follows="left|top|right|bottom" label="General" name="User Interface">
-      <check_box bottom_delta="-25" control_name="DoubleClickTeleport" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Activer le TP avec le double-clic" left="10"
-        tool_tip="Double-clic sur un objet/personne pour vous y TP dessus."
-        mouse_opaque="true" name="double_click_teleport_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="OptionRotateCamAfterLocalTP" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="R&#xE9;initialiser la cam&#xE9;ra apr&#xE8;s le TP" left="20"
-        tool_tip="Centre la cam&#xE9;ra derri&#xE8;re vous apr&#xE8;s un TP."
-        mouse_opaque="true" name="center_after_teleport_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="OptionOffsetTPByAgentHeight" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Compenser la cible du TP" left="20"
-        tool_tip="Essaye de cibler le TP pour que vos pieds atterrissent au point vis&#xE9;."
-        mouse_opaque="true" name="offset_teleport_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="PreviewAnimInWorld" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Preview animations on the avatar - Test temporaire d&#x27;une animation" left="10"
-        tool_tip="L&#x27;animation est jou&#xE9;e avec votre avatar avant d&#x27;&#xEA;tre t&#xE9;l&#xE9;charg&#xE9;e."
-        mouse_opaque="true" name="preview_anim_in_world_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="SaveScriptsAsMono" enabled="false"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Enregistrer les scripts syst&#xE9;matiquement en Mono" left="10"
-        tool_tip="Compile les scripts en Mono quand cela est possible."
-        mouse_opaque="true" name="save_scripts_as_mono_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentAlwaysRezInGroup" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Rezzer les objets avec le groupe du terrain quand cela est possible" left="10"
-        tool_tip="Rez les objets avec le m&#xEA;me groupe que le terrain, ind&#xE9;pendamment de votre tag actif."
-        mouse_opaque="true" name="always_rez_in_group_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentBuildAlwaysEnabled" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Toujours montrer le bouton construire activ&#xE9;" left="10"
-        tool_tip="Permet d&#x27;acc&#xE9;der &#xE0; au bouton construire en permanence, sans pour autant avoir le droit de construire."
-        mouse_opaque="true" name="always_build_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentFlyAlwaysEnabled" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Toujours permettre le mode vol (Fly)" left="10"
-        tool_tip="Permet de voler quelque soient les droits de la sim, &#xE0; vos risques et p&#xE9;rils."
-        mouse_opaque="true" name="always_fly_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentDisableMinZoomDist" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="D&#xE9;sactiver la distance minimum de la cam&#xE9;ra" left="10"
-        tool_tip="La cam&#xE9;ra zoome de tr&#xE9;s pr&#xE8;s."
-        mouse_opaque="true" name="disable_camera_zoom_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Activer les fonctions Power User - &#xE0; vos risques et p&#xE9;rils !" left="10"
-        tool_tip="Ajoute des fonctions consid&#xE9;r&#xE9;es trop dangereuses pour une utilisation normale. Ces fonctions peuvent faire des ravages si employ&#xE9;es improprement."
-        mouse_opaque="true" name="power_user_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Confirmer les fonctions Power User" left="20"
-        tool_tip="Confirme les fonctions Power User . A vos risques et p&#xE9;rils. Ascent devs n'est pas responsable de cette utilisation."
-        mouse_opaque="true" name="power_user_confirm_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentUseSystemFolder" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Activer l&#x27;Ascent System Inventory (Red&#xE9;marrage n&#xE9;cessaire)" left="10"
-        tool_tip="Cr&#xE9;e un nouveau dossier dans l&#x27;inventaire afin de stocker les fichiers de settings et les assets non permanents."
-        mouse_opaque="true" name="system_folder_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentSystemTemporary" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Les t&#xE9;l&#xE9;chargements temporaires vont dans le dossier : System Inventory &#x3E; Assets" left="20"
-        tool_tip="Place les t&#xE9;l&#xE9;chargements temporaires dans le dossier : System Inventory &#x3E; Assets ce qui permet de les retrouver plus ais&#xE9;ment."
-        mouse_opaque="true" name="temp_in_system_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="FetchInventoryOnLogin" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Pr&#xE9;charger l&#x27;inventaire &#xE0; la connection" left="10"
-        tool_tip="R&#xE9;duit l&#x27;attente lors de votre recherche initiale dans l&#x27;inventaire."
-        mouse_opaque="true" name="fetch_inventory_on_login_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="WindEnabled" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Activer les effets de vent" left="10"
-        mouse_opaque="true" name="enable_wind" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="CloudsEnabled" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Activer les nuages" left="10"
-        mouse_opaque="true" name="enable_clouds" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" left_delta="10"  control_name="SkyUseClassicClouds" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Activer les nuages classiques" left="10"
-        mouse_opaque="true" name="enable_classic_clouds" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" left_delta="-10" control_name="SpeedRez" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Activer le rezz rapide par rapport &#xE0; une distance progressive" left="10"
-        mouse_opaque="true" name="speed_rez_check" radio_style="false"
-        tool_tip="Active, cette fonction charge progressivement les textures du plus pr&#xE8;s au plus loin."
-        width="400" />
-      <spinner bottom_delta="-20" control_name="SpeedRezInterval" enabled="true" decimal_digits="0"
-        follows="left|top" font="SansSerifSmall" height="16" left="30" width="230"
-        label="Intervalle distance/affichage:" label_width="180"
-        max_val="60" min_val="5" initial_val="20" increment="5"
-        mouse_opaque="true" name="speed_rez_interval" />
-      <text type="string" length="1" bottom_delta="0" left_delta="235" bg_visible="false"
-        border_visible="false" border_drop_shadow_visible="false"
-        drop_shadow_visible="true" enabled="true" follows="left|top"
-        font="SansSerifSmall" h_pad="0" halign="left" height="16"
-        mouse_opaque="true" name="speed_rez_seconds" v_pad="0" width="100">
-secondes
-      </text>
-    </panel>
-
-    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Command Line"
-      left="1" mouse_opaque="true" name="Command Line" width="418">
-      <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Activer l'usage de la barre de chat comme ligne de commande" left="10"
-        mouse_opaque="true" name="chat_cmd_toggle" radio_style="false" width="270"
-        control_name="AscentCmdLine"/>
-      <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16" left_delta="10"
-        name="cmd_line_text_2" width="512">
-Tp &#224; travers la sim (usage: cmd x y z)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLinePos" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_3" width="512">
-Tp au sol (usage: cmd)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineGround" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_4" width="512">
-Tp en altitude (usage: cmd z)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineHeight" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_5" width="512">
-Tp "ET" retourner maison ! (usage: cmd)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineTeleportHome" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_6" width="512">
-Rezzer une plateforme (usage: cmd 0 - 30)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineRezPlatform" width="200"/>
-      <slider bottom_delta="-22" left_delta="0" name="AscentPlatformSize" control_name="AscentPlatformSize"
-        decimal_digits="1" enabled="true" follows="left|top" height="18" increment="0.5"
-        initial_val="5" label="Dimensions:" label_width="75" max_val="30" min_val="5"
-        mouse_opaque="true" show_text="true" width="205" auto_resize="false" tool_tip="How big do you want the platform to appear to be?"/>
-      <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_8" width="512">
-Calculette (usage: cmd 2 + 2)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineCalc" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_15" width="512">
-Vider l&apos;historique du chat (usage: cmd)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="Clears the Chat History to prevent lag effects from chat spammers."
-        name="AscentCmdLineClearChat" width="200"/>
-      <!-- Column Split -->
-      <view_border bevel_style="none" border_thickness="1" bottom_delta="-5" follows="top|left" height="295"
-        left="230" name="CmdDivisor" width="0"/>
-      <text bottom_delta="277" follows="left|top" font="SansSerifSmall" height="16" left_delta="10"
-        name="cmd_line_text_9" width="512">
-Changer le "Draw Distance" (usage: cmd metres)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineDrawDistance" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_10" width="512">
-Tp &#224; la position de la cam (usage: cmd)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdTeleportToCam" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_11" width="512">
-Avoir un nom avec la clef (usage: cmd clef)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineKeyToName" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_12" width="512">
-Tp un avatar avec la clef (usage: cmd clef)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineOfferTp" width="200"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_7" width="512">
-Tp sur une sim x (usage: cmd nomdelasim)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="" name="AscentCmdLineMapTo" width="200"/>
-      <check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Utiliser la meme position entre les sims" left_delta="0" mouse_opaque="true"
-        name="map_to_keep_pos" radio_style="false" width="270"
-        control_name="AscentMapToKeepPos"/>
-      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
-        name="cmd_line_text_13" width="512">
-Se tp vers un avatar (usage: cmd nom)
-      </text>
-      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
-        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
-        tool_tip="Cette syntaxe permet les noms partiels."
-        name="AscentCmdLineTP2" width="200"/>
-    </panel>
-
-    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-      follows="left|top|right|bottom" label="Security" name="Security">
-      <check_box bottom_delta="-25" control_name="BroadcastViewerEffects" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="Emettre les effets du viewer (Exclut les rayons)" left="10"
-        mouse_opaque="true" name="broadcast_viewer_effects" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="DisablePointAtAndBeam" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
-        label="D&#xE9;sactiver le &#x22;Pointer vers&#x22; &#xE0; l&#x22;&#xE9;dition d&#x27;un objet" left="10"
-        tool_tip="Masque le pointeur sur l&#x27;objet  &#xE9;dit&#xE9;"
-        mouse_opaque="true" name="disable_point_at_and_beams_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="PrivateLookAt" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Ne pas &#x22;Regarder vers&#x22;" left="10"
-        tool_tip="Supprime les mouvements de t&#xEA;te, et le &#x22;Regarder vers&#x22; pour soi m&#xEA;me."
-        mouse_opaque="true" name="private_look_at_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="AscentShowLookAt" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="Voir quand les autres &#x22;Regardent vers&#x22;" left="10"
-        tool_tip="Montre ou les autres regardent."
-        mouse_opaque="true" name="show_look_at_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="RevokePermsOnStandUp" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="En vous levant, r&#xE9;voquez les permissions pour l&#x27;objet sur lequel votre avatar &#xE9;tait assis" left="10"
-        tool_tip="Evite que l&#x27;objet garde le controle par exemple pour les animations."
-        mouse_opaque="true" name="revoke_perms_on_stand_up_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" control_name="DisableClickSit" enabled="true"
-        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-        label="D&#xE9;sactive le &#x22;Click to sit&#x22; automatique" left="10"
-        tool_tip="D&#xE9;sactive llSitTarget, vous devrez s&#xE9;lectionner vous m&#xEA;me la fonction &#x22;sit&#x22; sur l&#x27;objet."
-        mouse_opaque="true" name="disable_click_sit_check" radio_style="false"
-        width="400" />
-      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Affiche les changements de d&#xE9;comptes de scripts de la r&#xE9;gion" left_delta="0"
-        mouse_opaque="true" name="totalscriptjumps" radio_style="false" width="270"
-        control_name="AscentDisplayTotalScriptJumps"
-        tool_tip="D&#xE9;pendant du seuil que vous choisissez dans la fen&#xEA;tre &#xE0; droite."/>
-      <spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16" increment="1"
-        label="" label_width="0" digits="4" left_delta="325" max_val="9999"
-        min_val="1" mouse_opaque="true" name="ScriptJumpCount" width="50" control_name="Ascentnumscriptdiff"
-        tool_tip="Threshold for the script jump message [Default: 100]"/>
-    </panel>
-
-    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
-      follows="left|top|right|bottom" label="Building" name="Building">
-      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-        bottom_delta="-19" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
-        h_pad="0" halign="left" height="10" left_delta="30" mouse_opaque="false"
-        name="text_box6" v_pad="0" width="150">
-Point de Pivot
-      </text>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
-        label="X pos" label_width="40" left="10" mouse_opaque="true" max_val="256"
-        min_val="-256" name="X pos" width="120" control_name="AscentBuildPrefs_PivotX"/>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
-        label="Y pos" label_width="40" left_delta="0" mouse_opaque="true" max_val="256"
-        min_val="-256" name="Y pos" width="120" control_name="AscentBuildPrefs_PivotY"/>
-      <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
-        label="Z pos" label_width="40" left_delta="0" mouse_opaque="true" max_val="256"
-        min_val="-256" name="Z pos" width="120" control_name="AscentBuildPrefs_PivotZ"/>
-      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        label="Valeurs en pour&#xE7;entages" left_delta="-5" mouse_opaque="true"
-        tool_tip="Default settings are Percentages and every axis set at 50"
-        name="EmPivotPercToggle" radio_style="false" width="100" control_name="AscentBuildPrefs_PivotIsPercent"/>
-      <check_box bottom_delta="60" enabled="false" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="true" label="Active les &#x22;Highlights&#x22; sur les prims s&#xE9;lectionn&#xE9;s" left_delta="140"
-        mouse_opaque="true" name="EmBuildPrefsRenderHighlight_toggle" control_name="AscentRenderHighlightSelections"
-        radio_style="false" width="270"/>
-      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-        initial_value="false" label="Axer sur le Root Prim" left_delta="0"
-        mouse_opaque="true" tool_tip="Par d&#xE9;faut le centre de la totalit&#xE9; du build est l&#x27;axe."
-        name="EmBuildPrefsActualRoot_toggle" control_name="AscentBuildPrefs_ActualRoot"
-        radio_style="false" width="270"/>
-    </panel>
-
-  </tab_container>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom"
+  border="true" label="Syst&#xE8;me" name="ascsys" enabled="true" mouse_opaque="true">
+  <tab_container label="Singularity System" bottom="0" height="440" width="497" left="0"
+    name="Ascent System" tab_min_width="70" tab_position="top">
+
+    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
+      follows="left|top|right|bottom" label="G&#xE9;n&#xE9;ral" name="User Interface">
+      <check_box bottom_delta="-25" control_name="DoubleClickTeleport" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Activer le TP avec le double-clic" left="10"
+        tool_tip="Activer le TP sur un objet/une personne avec le double-clic"
+        mouse_opaque="true" name="double_click_teleport_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="OptionRotateCamAfterLocalTP" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="R&#xE9;initialiser la cam&#xE9;ra apr&#xE8;s le TP" left="20"
+        tool_tip="Centre la cam&#xE9;ra derri&#xE8;re vous apr&#xE8;s un TP."
+        mouse_opaque="true" name="center_after_teleport_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="OptionOffsetTPByAgentHeight" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Compenser la cible du TP" left="20"
+        tool_tip="Essaye de cibler le TP pour que vos pieds atterrissent au point vis&#xE9;"
+        mouse_opaque="true" name="offset_teleport_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="PreviewAnimInWorld" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Preview animations on the avatar - Test temporaire d&#x27;une animation" left="10"
+        tool_tip="L&#x27;animation est jou&#xE9;e avec votre avatar avant d&#x27;&#xEA;tre t&#xE9;l&#xE9;charg&#xE9;e."
+        mouse_opaque="true" name="preview_anim_in_world_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="SaveScriptsAsMono" enabled="false"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Enregistrer les scripts syst&#xE9;matiquement en Mono" left="10"
+        tool_tip="Compile les scripts en Mono quand cela est possible."
+        mouse_opaque="true" name="save_scripts_as_mono_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentAlwaysRezInGroup" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Rezzer les objets avec le groupe du terrain quand cela est possible" left="10"
+        tool_tip="Rez les objets avec le m&#xEA;me groupe que le terrain, ind&#xE9;pendamment de votre tag actif."
+        mouse_opaque="true" name="always_rez_in_group_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentBuildAlwaysEnabled" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Toujours montrer le bouton construire activ&#xE9;" left="10"
+        tool_tip="Permet d&#x27;acc&#xE9;der &#xE0; au bouton construire en permanence, sans pour autant avoir le droit de construire."
+        mouse_opaque="true" name="always_build_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentFlyAlwaysEnabled" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Toujours permettre le mode vol (Fly)" left="10"
+        tool_tip="Permet de voler quelques soient les droits de la sim, &#xE0; vos risques et p&#xE9;rils."
+        mouse_opaque="true" name="always_fly_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentDisableMinZoomDist" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="D&#xE9;sactiver la distance minimum de la cam&#xE9;ra" left="10"
+        tool_tip="La cam&#xE9;ra zoome de tr&#xE9;s pr&#xE8;s."
+        mouse_opaque="true" name="disable_camera_zoom_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Activer les fonctions Power User - &#xE0; vos risques et p&#xE9;rils !" left="10"
+        tool_tip="Ajoute des fonctions consid&#xE9;r&#xE9;es trop dangereuses pour une utilisation normale. Ces fonctions peuvent faire des ravages si employ&#xE9;es improprement."
+        mouse_opaque="true" name="power_user_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Confirmer les fonctions Power User" left="20"
+        tool_tip="Confirme les fonctions Power User. A vos risques et p&#xE9;rils. Singularity n'est pas responsable de cette utilisation."
+        mouse_opaque="true" name="power_user_confirm_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentUseSystemFolder" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Activer l&#x27;Ascent System Inventory (Red&#xE9;marrage n&#xE9;cessaire)" left="10"
+        tool_tip="Cr&#xE9;e un nouveau dossier dans l&#x27;inventaire afin de stocker les fichiers de settings et les assets non permanents."
+        mouse_opaque="true" name="system_folder_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentSystemTemporary" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Les t&#xE9;l&#xE9;chargements temporaires vont dans le dossier : System Inventory &#x3E; Assets" left="20"
+        tool_tip="Place les t&#xE9;l&#xE9;chargements temporaires dans le dossier : System Inventory &#x3E; Assets ce qui permet de les retrouver plus ais&#xE9;ment"
+        mouse_opaque="true" name="temp_in_system_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="FetchInventoryOnLogin" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Pr&#xE9;charger l&#x27;inventaire &#xE0; la connection" left="10"
+        tool_tip="R&#xE9;duit l&#x27;attente lors de votre recherche initiale dans l&#x27;inventaire"
+        mouse_opaque="true" name="fetch_inventory_on_login_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="WindEnabled" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Activer les effets de vent" left="10"
+        mouse_opaque="true" name="enable_wind" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="CloudsEnabled" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Activer les nuages" left="10"
+        mouse_opaque="true" name="enable_clouds" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" left_delta="10"  control_name="SkyUseClassicClouds" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Activer les nuages classiques" left="10"
+        mouse_opaque="true" name="enable_classic_clouds" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" left_delta="-10" control_name="SpeedRez" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Activer le rezz rapide par rapport &#xE0; une distance progressive" left="10"
+        mouse_opaque="true" name="speed_rez_check" radio_style="false"
+        tool_tip="Active, cette fonction charge progressivement les textures du plus pr&#xE8;s au plus loin"
+        width="400" />
+      <spinner bottom_delta="-20" control_name="SpeedRezInterval" enabled="true" decimal_digits="0"
+        follows="left|top" font="SansSerifSmall" height="16" left="30" width="230"
+        label="Intervalle distance/affichage:" label_width="180"
+        max_val="60" min_val="5" initial_val="20" increment="5"
+        mouse_opaque="true" name="speed_rez_interval" />
+      <text type="string" length="1" bottom_delta="0" left_delta="235" bg_visible="false"
+        border_visible="false" border_drop_shadow_visible="false"
+        drop_shadow_visible="true" enabled="true" follows="left|top"
+        font="SansSerifSmall" h_pad="0" halign="left" height="16"
+        mouse_opaque="true" name="speed_rez_seconds" v_pad="0" width="100">
+secondes
+      </text>
+    </panel>
+
+    <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Commandes Texte"
+      left="1" mouse_opaque="true" name="Command Line" width="418">
+      <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        initial_value="false" label="Activer l'usage de la barre de chat comme ligne de commande" left="10"
+        mouse_opaque="true" name="chat_cmd_toggle" radio_style="false" width="270"
+        control_name="AscentCmdLine"/>
+      <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16" left_delta="10"
+        name="cmd_line_text_2" width="512">
+Tp &#224; travers la sim (usage: cmd x y z)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLinePos" width="200"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_3" width="512">
+Tp au sol (usage: cmd)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLineGround" width="200"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_4" width="512">
+Tp en altitude (usage: cmd z)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLineHeight" width="200"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_5" width="512">
+Tp &#x22;ET, rentrer maison !&#x22; (usage: cmd)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLineTeleportHome" width="200"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_6" width="512">
+Rezzer une plateforme (usage: cmd 0 - 30)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLineRezPlatform" width="200"/>
+      <slider bottom_delta="-22" left_delta="0" name="AscentPlatformSize" control_name="AscentPlatformSize"
+        decimal_digits="1" enabled="true" follows="left|top" height="18" increment="0.5"
+        initial_val="5" label="Dimensions:" label_width="75" max_val="30" min_val="5"
+        mouse_opaque="true" show_text="true" width="205" auto_resize="false" tool_tip="Quelle taille voulez-vous ?"/>
+      <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_8" width="512">
+Calculette (usage: cmd 2 + 2)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLineCalc" width="200"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_15" width="512">
+Vider l&apos;historique du chat (usage: cmd)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="Clears the Chat History to prevent lag effects from chat spammers."
+        name="AscentCmdLineClearChat" width="200"/>
+      <!-- Column Split -->
+      <view_border bevel_style="none" border_thickness="1" bottom_delta="-5" follows="top|left" height="295"
+        left="230" name="CmdDivisor" width="0"/>
+      <text bottom_delta="277" follows="left|top" font="SansSerifSmall" height="16" left_delta="10"
+        name="cmd_line_text_9" width="512">
+Changer le "Draw Distance" (usage: cmd metres)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLineDrawDistance" width="200"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_10" width="512">
+Tp &#224; la position de la cam (usage: cmd)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdTeleportToCam" width="200"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_11" width="512">
+Avoir un nom avec la clef (usage: cmd clef)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLineKeyToName" width="200"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_12" width="512">
+Tp un avatar avec la clef (usage: cmd clef)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLineOfferTp" width="200"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_7" width="512">
+Tp sur une sim x (usage: cmd nomdelasim)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="" name="AscentCmdLineMapTo" width="200"/>
+      <check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        initial_value="false" label="Utiliser la meme position entre les sims" left_delta="0" mouse_opaque="true"
+        name="map_to_keep_pos" radio_style="false" width="270"
+        control_name="AscentMapToKeepPos"/>
+      <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
+        name="cmd_line_text_13" width="512">
+Se tp vers un avatar (usage: cmd nom)
+      </text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
+        font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
+        tool_tip="Cette syntaxe permet les noms partiels."
+        name="AscentCmdLineTP2" width="200"/>
+      <text bottom_delta="-18" follows="top" height="16" name="cmd_line_text_14">Active/d&#xE9;sactive le faux absent (usage: cmd)</text>
+      <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="top" height="20" max_length="256" name="SinguCmdLineAway" width="200"/>
+
+    </panel>
+
+    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
+      follows="left|top|right|bottom" label="S&#xE9;curit&#xE9;" name="Security">
+      <check_box bottom_delta="-25" control_name="BroadcastViewerEffects" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="Emettre les effets du viewer (Excluant les rayons)" left="10"
+        mouse_opaque="true" name="broadcast_viewer_effects" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="DisablePointAtAndBeam" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+        label="D&#xE9;sactiver le &#x22;Pointer vers&#x22; &#xE0; l&#x22;&#xE9;dition d&#x27;un objet" left="10"
+        tool_tip="Masque le pointeur sur l&#x27;objet  &#xE9;dit&#xE9;"
+        mouse_opaque="true" name="disable_point_at_and_beams_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="PrivateLookAt" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Ne pas &#x22;Regarder vers&#x22;" left="10"
+        tool_tip="Supprime les mouvements de t&#xEA;te, et le &#x22;Regarder vers&#x22; pour soi-m&#xEA;me"
+        mouse_opaque="true" name="private_look_at_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="AscentShowLookAt" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="Voir quand les autres &#x22;Regardent vers&#x22;" left="10"
+        tool_tip="Montre o&#xF9; les autres regardent."
+        mouse_opaque="true" name="show_look_at_check" radio_style="false"
+        width="400" />
+       <check_box bottom_delta="-20" control_name="QuietSnapshotsToDisk" 
+       follows="top" initial_value="false" 
+       label="Prendre discr&#xE8;tement un photo, sur votre disque dur" 
+       tool_tip="Permet de prendre une photo en mode &#x22;espionnage&#x22;, sans bruit d&#x27;appareil, ni mouvement de cam&#xE9;ra, ni gesture. (Uniquement vers le disque dur)." 
+       name="quiet_snapshots_check"/>
+       <check_box bottom_delta="-20" control_name="RevokePermsOnStandUp" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="En vous levant, annule les permissions que l&#x27;objet a sur votre avatar" left="10"
+        tool_tip="Evite que l&#x27;objet garde le contr&#xF4;le de votre avatar, comme par exemple les animations."
+        mouse_opaque="true" name="revoke_perms_on_stand_up_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" control_name="DisableClickSit" enabled="true"
+        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
+        label="D&#xE9;sactive le &#x22;Click to sit&#x22; automatique" left="10"
+        tool_tip="D&#xE9;sactive llSitTarget. Vous devrez s&#xE9;lectionner vous m&#xEA;me la fonction &#x22;sit&#x22; sur l&#x27;objet."
+        mouse_opaque="true" name="disable_click_sit_check" radio_style="false"
+        width="400" />
+      <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+        initial_value="false" label="Affiche les changements de d&#xE9;comptes de scripts de la r&#xE9;gion." left_delta="0"
+        mouse_opaque="true" name="totalscriptjumps" radio_style="false" width="270"
+        control_name="AscentDisplayTotalScriptJumps"
+        tool_tip="D&#xE9;pendant du seuil que vous choisissez dans la fen&#xEA;tre &#xE0; droite."/>
+      <spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16" increment="1"
+        label="" label_width="0" digits="4" left_delta="325" max_val="9999"
+        min_val="1" mouse_opaque="true" name="ScriptJumpCount" width="50" control_name="Ascentnumscriptdiff"
+        tool_tip="Threshold for the script jump message [Default: 100]"/>
+    </panel>
+
+    <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true" follows="left|top|right|bottom" label="Build/Cr&#xE9;ation" name="Building">
+
+
+      <text bottom_delta="-19" follows="top" height="10" left_delta="30" name="text_box6">Point de Pivot</text>
+      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="X pos" label_width="40" left="10" max_val="256" min_val="-256" name="X pos" width="120" control_name="AscentBuildPrefs_PivotX"/>
+      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="Y pos" label_width="40" max_val="256" min_val="-256" name="Y pos" width="120" control_name="AscentBuildPrefs_PivotY"/>
+      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="Z pos" label_width="40" max_val="256" min_val="-256" name="Z pos" width="120" control_name="AscentBuildPrefs_PivotZ"/>
+      <check_box bottom_delta="-20" follows="top" label="Valeurs en pour&#xE7;entages" left_delta="-5" tool_tip="Default settings are Percentages and every axis set at 50" name="EmPivotPercToggle" control_name="AscentBuildPrefs_PivotIsPercent"/>
+      <check_box bottom_delta="60" follows="top" label="Active les &#x22;Highlights&#x22; sur les prims s&#xE9;lectionn&#xE9;s" left_delta="140" name="EmBuildPrefsRenderHighlight_toggle" control_name="RenderHighlightSelections"/>
+	  <check_box bottom_delta="-20" follows="top" initial_value="false" label="Axe sur le Root Prim" tool_tip="Default behaviour is to show the axis on the center of mass of a linkset. If enabled, the axis will be shown on the root prim of the linkset instead." name="EmBuildPrefsActualRoot_toggle" control_name="AscentBuildPrefs_ActualRoot"/>
+      <view_border bevel_style="none" border_thickness="1" bottom="-180" follows="top" height="70" left="5" name="NextOwnerBorder" width="130"/>
+      <text bottom_delta="60" follows="top" height="10" left_delta="10" name="text_box7">Permissions:</text>
+        <check_box follows="top" height="16" initial_value="false" label="Copy " tool_tip="Next owner can make copies of creations" name="next_owner_copy" control_name="NextOwnerCopy"/>
+        <check_box follows="top" height="16" initial_value="false" label="Modify " tool_tip="Next owner can edit creations" name="next_owner_modify" control_name="NextOwnerModify"/>
+        <check_box follows="top" height="16" initial_value="true" label="Transfer " tool_tip="Next owner can give(or sell) creations" name="next_owner_transfer" control_name="NextOwnerTransfer"/>
+      <texture_picker allow_no_texture="false" bottom="-190" can_apply_immediately="true" default_image_name="Default" follows="top" height="80" label="     Texture" left="155" name="texture control" control_name="EmeraldBuildPrefs_Texture" tool_tip="Click to choose a texture" width="64"/>
+      <check_box bottom="-131" left_delta="75" follows="top" height="16" label="Phantom" name="EmPhantomToggle" control_name="EmeraldBuildPrefs_Phantom"/>
+      <check_box follows="top" height="16" label="Physical" name="EmPhysicalToggle" control_name="EmeraldBuildPrefs_Physical"/>
+      <check_box follows="top" height="16" label="Temporaire" name="EmTemporaryToggle" control_name="EmeraldBuildPrefs_Temporary"/>
+      <combo_box bottom="-190" left_delta="6" follows="top" height="18" name="material" width="64" control_name="BuildPrefs_Material">
+        <combo_item name="Stone" value="Stone">Stone</combo_item>
+        <combo_item name="Metal" value="Metal">Metal</combo_item>
+        <combo_item name="Glass" value="Glass">Glass</combo_item>
+        <combo_item name="Wood" value="Wood">Wood</combo_item>
+        <combo_item name="Flesh" value="Flesh">Flesh</combo_item>
+        <combo_item name="Plastic" value="Plastic">Plastic</combo_item>
+        <combo_item name="Rubber" value="Rubber">Rubber</combo_item>
+      </combo_box>
+      <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-190" can_apply_immediately="true" color="1, 1, 1, 1" follows="top" height="80" label="    Couleur" left_delta="76" name="colorswatch" tool_tip="Click to open Color Picker" width="64" control_name="EmeraldBuildPrefs_Color"/>
+      <spinner bottom_delta="60" decimal_digits="0" follows="top" height="16" increment="1" label="Alpha" label_width="45" left_delta="70" max_val="100" min_val="0" name="alpha" width="97" control_name="EmeraldBuildPrefs_Alpha"/>
+      <spinner bottom_delta="-20" decimal_digits="2" follows="top" height="16" increment="0.05" label="Glow" label_width="45" max_val="1" min_val="0" name="glow" width="97" control_name="EmeraldBuildPrefs_Glow"/>
+      <check_box follows="top" height="16" label="Lumineux" name="EmFBToggle" control_name="EmeraldBuildPrefs_FullBright"/>
+      <text follows="top">Brillance</text>
+      <combo_box bottom_delta="-5" follows="top" left_delta="42" height="18" name="combobox shininess" tool_tip="Set the amount of shine for the object" width="62" control_name="EmeraldBuildPrefs_Shiny">
+        <combo_item name="None" value="None">None</combo_item>
+        <combo_item name="Low" value="Low">Low</combo_item>
+        <combo_item name="Medium" value="Medium">Medium</combo_item>
+        <combo_item name="High" value="High">High</combo_item>
+      </combo_box>
+      <check_box name="EmeraldBuildPrefsEmbedItem" left="5" bottom_delta="-15" follows="top" initial_value="false" label="Mettre un &#xE9;l&#xE9;ment dans l'object" control_name="EmeraldBuildPrefs_EmbedItem"/>
+       <view_border blevel_style="in" bottom_delta="-20" left="25" follows="top" height="16" name="build_item_drop_target_rect" width="140"/>
+        <text bottom_delta="0" left_delta="8" follows="top" height="16" name="Give inventory">Glissez l'&#xE9;l&#xE9;ment ICI</text>
+       <view_border blevel_style="in" bottom_delta="-35" left_delta="-8" follows="top" height="35" name="build_item_add_disp_rect" width="140"/>
+         <text bottom_delta="15" left_delta="0" follows="top" height="16" name="build_item_add_disp_rect_txt" halign="center" width="138">Currently set to:
+	       ITEM</text>
+       <spinner bottom="369" left="380" decimal_digits="5" follows="left|top" height="16" increment="0.0005" label="          X" label_width="40" max_val="10" min_val="0.0001" name="X size" width="110" control_name="BuildPrefs_Xsize"/>
+       <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.0005" label="          Y" label_width="40" max_val="10" min_val="0.0001" name="Y size" width="110" control_name="BuildPrefs_Ysize"/>
+       <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.0005" label="          Z" label_width="40" max_val="10" min_val="0.0001" name="Z size" width="110" control_name="BuildPrefs_Zsize"/>
+    </panel>
+
+  </tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml
new file mode 100644
index 000000000..6b5829e70
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_ascent_vanity.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel top="20" left="10" height="400" width="512" border="true" label="Vanity" name="ascvan">
+  <tab_container label="Singularity Vanity" bottom="0" height="440" width="497" name="Ascent Vanity" tab_min_width="90">
+    <panel border="true" left="1" bottom="-190" height="180" width="500" label="Principal" name="General">
+      <check_box bottom_delta="-25" control_name="AscentStoreSettingsPerAccount" follows="top" height="16" initial_value="true" label="Lorsque c'est possible, sauver le setting personnalisé par compte." left="10" tool_tip="Sauve le settings customis&#xE9; pour chaque alt." name="use_account_settings_check"/>
+      <check_box bottom_delta="-20" control_name="AscentDisableTeleportScreens" follows="top" height="16" initial_value="true" label="Masquer la barre de 'TP in progress'" tool_tip="Ceci permet de continuer des lire vos IMs durant le TP." name="disable_tp_screen_check"/>
+      <check_box bottom_delta="-20" control_name="OptionPlayTpSound" follows="top" height="16" initial_value="true" label="Jouer le son du TP pendant la transition inter sims" tool_tip="jouer le 'wooooooosssssssssh'." name="tp_sound_check"/>
+      <check_box bottom_delta="-20" control_name="AscentDisableLogoutScreens" follows="top" height="16" initial_value="true" label="Masquer l'&#xE9;cran du Login/Logout" tool_tip="" name="disable_logout_screen_check"/>
+      <check_box bottom_delta="-20" control_name="SGDisableChatAnimation" follows="top" height="16" initial_value="false" label="D&#xE9;sactiver les animations pour le chat local: dire, chuchoter, crier" tool_tip="" name="disable_chat_animation"/>
+    </panel>
+    <panel border="true" left="1" bottom="-190" height="180" width="500" label="Tags/Couleurs" name="TagsColors">
+      <!-- Client tag options -->
+      <check_box bottom_delta="-25" control_name="AscentUseTag" follows="top" height="16" initial_value="true" label="Activer les Fonctions des TAGs." left="10" tool_tip="CERTAINES FONCTIONS NE SONT PLUS ACTIVABLES SUITE AUX NOUVELLES MESURES DU LINDEN LAB." name="show_my_tag_check"/>
+      <combo_box follows="top" bottom_delta="-24" height="18" left_delta="24" max_chars="32" tool_tip="Fonction d&#xE9;sactiv&#xE9;e par Linden Lab" name="tag_spoofing_combobox" width="130">
+        <combo_item name="Singularity" value="f25263b7-6167-4f34-a4ef-af65213b2e39">Singularity</combo_item>
+      </combo_box>
+      <check_box bottom_delta="-23" control_name="AscentShowSelfTag" follows="top" height="16" initial_value="true" label="Fonction d&#xE9;sactiv&#xE9;e par Linden Lab" left_delta="-24" tool_tip="Le viewer utilis&#xE9; par les avatars ne peut plus &#xEA;tre visible depuis que Linden lab l&#x27;a d&#xE9;sactiv&#xE9;" name="show_self_tag_check"/>
+      <check_box bottom_delta="-20" control_name="AscentShowSelfTagColor" follows="top" height="16" initial_value="true" label="Afficher sa propre couleur custom " tool_tip="Vous seul la voyez." name="show_self_tag_color_check"/>
+      <check_box bottom_delta="-20" control_name="AscentShowFriendsTag" follows="top" height="16" initial_value="true" label="Afficher le tag (Friend)" tool_tip="Rajoute (friends) dans le tag quand vous voyez un(e) ami(e)." name="show_friend_tag_check"/>
+      <!-- End of Left Side -->
+      <check_box bottom_delta="87" control_name="AscentUseCustomTag" follows="top" height="16" initial_value="true" label="Choisir une couleur custom (Mode Local uniquement)" left_delta="205" tool_tip="Vous seul(e) la voyez." name="customize_own_tag_check"/>
+      <text bottom_delta="-17" left_delta="25" follows="top" height="10" name="custom_tag_label_text">Label :</text>
+      <line_editor bottom_delta="-6" follows="top" font="SansSerif" height="18" left_delta="35" name="custom_tag_label_box" tool_tip="" width="100"/>
+      <text bottom_delta="6" left_delta="110" follows="top" height="10" name="custom_tag_color_text">Couleur :</text>
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-22"        can_apply_immediately="false" color="1 1 1 1" follows="top" height="34" left_delta="35" name="custom_tag_color_swatch" control_name="AscentCustomTagColor" tool_tip="" width="30" />
+      <check_box bottom_delta="-8" control_name="AscentShowOthersTag" follows="top" height="16" initial_value="true" label="Fonction d&#xE9;sactiv&#xE9;e par Linden Lab" left_delta="-205" tool_tip="Le viewer utilis&#xE9; par les avatars ne peut plus &#xEA;tre visible depuis que Linden lab l&#x27;a d&#xE9;sactiv&#xE9;" name="show_other_tag_check"/>
+      <check_box bottom_delta="-20" control_name="AscentShowOthersTagColor" follows="top" height="16" initial_value="true" label="Afficher la couleur pour les autres avatars" left_delta="0" tool_tip="" name="show_client_tag_color_check"/>
+      <check_box bottom_delta="-20" control_name="AscentShowIdleTime" follows="top" height="16" initial_value="true" label="Afficher la dur&#xE9;e du 'IDLE'" tool_tip="Affiche le temps pendant lequel l'avatar est immobile." name="show_idle_time_check"/>
+      <check_box bottom_delta="-20" control_name="AscentUpdateTagsOnLoad" follows="top" height="16" initial_value="true" label="Chercher automatiquement les Mises &#xE0; Jour des Tags" left_delta="-205" tool_tip="" name="update_tags_check"/>
+      <button bottom_delta="0" control_name="ManualUpdate" name="update_clientdefs" follows="top" label="MAJ Manuelle" height="18" left_delta="340" width="110"/>
+      <!-- End of Client Tag settings -->
+      <text bottom_delta="-25" follows="top" height="10" left="20" name="effects_color_textbox">Couleurs de mes effets :</text>
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34" can_apply_immediately="true" color="1 1 1 1" control_name="EffectColor" follows="top" height="47" label="Effets" left_delta="138" name="effect_color_swatch" width="44"/>
+      <check_box bottom_delta="-20" control_name="AscentUseStatusColors" follows="top" height="16" initial_value="true" label="Activer les couleurs pour: Amis, Linden, etc..." left="10" tool_tip="" name="use_status_check"/>
+      <text bottom_delta="-20" follows="top" height="10" left_delta="10" name="friends_color_textbox">Choix des couleurs :
+(Radar, Tag, Minimap)</text>
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-34" can_apply_immediately="true" color="1 1 1 1" control_name="AscentFriendColor" follows="top" height="47" label="Amis" left_delta="138" name="friend_color_swatch" width="44" tool_tip=""/>
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="1 1 1 1" control_name="AscentEstateOwnerColor" follows="top" height="47" label="Estate" left_delta="54" name="estate_owner_color_swatch" width="44" tool_tip=""/>
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="0.6 0.6 1 1" control_name="AscentLindenColor" follows="top" height="47" label="Lindens" left_delta="54" name="linden_color_swatch" width="44" tool_tip=""/>
+      <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="0" can_apply_immediately="true" color="0.8 1 1 1" control_name="AscentMutedColor" follows="top" height="47" label="Mut&#xE9;" left_delta="54" name="muted_color_swatch" width="44" tool_tip=""/>
+    </panel>
+    <panel border="true" left="1" bottom="-190" height="180" width="500" label="Body Dyn. (Bouger les n&#xE9;n&#xE9;s)" name="Body Dynamics">
+      <check_box bottom_delta="-25" follows="top" height="16" label="Activer les &#x22;physics&#x22; des n&#xE9;n&#xE9;s voire du popotin des avatars ^^" left="10" name="EmBreastsToggle" control_name="EmeraldBreastPhysicsToggle" tool_tip=""/>
+      <slider bottom_delta="-20" left="10" name="EmeraldBoobMass" control_name="EmeraldBoobMass" decimal_digits="0" follows="top" height="18" increment="1" label="Masse :" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
+      <slider bottom_delta="-20" left_delta="0" name="EmeraldBoobHardness" control_name="EmeraldBoobHardness" decimal_digits="0" follows="top" height="18" increment="1" label="Rebond :" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
+      <slider bottom_delta="-20" name="EmeraldBoobVelMax" control_name="EmeraldBoobVelMax" decimal_digits="0" follows="top" height="18" increment="1" label="V&#xE9;locit&#xE9; max :" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
+      <slider bottom_delta="-20" name="EmeraldBoobFriction" control_name="EmeraldBoobFriction" decimal_digits="0" follows="top" height="18" increment="1" label="Friction :" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
+      <slider bottom_delta="-20" name="EmeraldBoobVelMin" control_name="EmeraldBoobVelMin" decimal_digits="0" follows="top" height="18" increment="1" label="V&#xE9;locit&#xE9; min :" label_width="100" max_val="100" min_val="1" can_edit_text="true" width="250"/>
+      <text bottom_delta="-20" height="15" left="10" name="av_mod_textbox" follows="top">Modifier l'offset de l'avatar</text>
+      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="X Modif." label_width="65" left_delta="5" max_val="0.15" min_val="-0.15" name="X Modifier" width="128" control_name="AscentAvatarXModifier" tool_tip=""/>
+      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.05" label="Y Modif." label_width="65" max_val="0.20" min_val="-0.20" name="Y Modifier" width="128" control_name="AscentAvatarYModifier" tool_tip=""/>
+      <spinner bottom_delta="-20" decimal_digits="5" follows="top" height="16" increment="0.1" label="Z Modif." label_width="65" max_val="5.0" min_val="-5.0" name="Z Modifier" width="128" control_name="AscentAvatarZModifier" tool_tip=""/>
+    </panel>
+  </tab_container>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml b/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml
index a4616193a..e68baf93d 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_audio.xml
@@ -1,30 +1,32 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Audio et vidéo" name="Media panel">
-	<text length="1" name="muting_text" type="string">
-		Volume :
-	</text>
-	<panel name="Volume Panel" width="249"/>
-	<check_box label="Couper le son" name="disable audio"/>
-	<text bottom="-189" name="streaming_prefs_text" width="150">
-		Médias et Audio :&#10;&#10;&#10;&#10;&#10;&#10;&#10;( Filtre de Sécurité des Médias )
-	</text>
-	<text name="audio_prefs_text">
-		 
-	</text>
-	<panel label="Volume" name="Volume Panel"/>
-	<check_box label="Couper le son lorsque la fenêtre est minimisée" name="mute_when_minimized"/>
-	<check_box bottom="-200" height="32" label="Jouer la musique disponible &#10;
-(Gourmand en bande passante)" name="streaming_music"/>
-	<check_box bottom_delta="-32" height="32" label="Jouer le média disponible &#10;
-(Gourmand en bande passante)" name="streaming_video"/>
-	<check_box bottom_delta="-32" label="Lire automatiquement le média" name="auto_streaming_video"/>
-	<slider label="Effet Doppler" label_width="115" name="Doppler Effect"/>
-	<slider label="Facteur d&apos;éloignement" label_width="115" name="Distance Factor"/>
-	<slider label="Facteur d&apos;atténuation" label_width="115" name="Rolloff Factor"/>
-	<spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
-	     enabled="true" follows="left|top" height="16" increment="10"
-	     initial_val="10" label="Alerte [CURRENCY]:" label_width="128" left="148"
-	     max_val="10000" min_val="0" mouse_opaque="true" name="currency_change_threshold"
-	     width="192" />
-	<spinner label="Alerte santé" name="Health Change Threshold"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Audio et vidéo" name="Media panel">
+	<text length="1" name="muting_text" type="string">
+		Volume :
+	</text>
+	<panel name="Volume Panel" width="249"/>
+	<check_box label="Couper le son" name="disable audio"/>
+	<text bottom="-187" name="streaming_prefs_text" width="150">
+		Médias et Audio :&#10;&#10;&#10;&#10;&#10;&#10;&#10;( Filtre de Sécurité des Médias )
+	</text>
+	<text name="audio_prefs_text">
+		 
+	</text>
+	<panel label="Volume" name="Volume Panel"/>
+	<check_box label="Couper le son lorsque la fenêtre est minimisée" name="mute_when_minimized"/>
+	<check_box bottom="-200" height="32" label="Jouer la musique disponible &#10;
+(Gourmand en bande passante)" name="streaming_music"/>
+	<check_box bottom_delta="-32" height="32" label="Jouer le média disponible &#10;
+(Gourmand en bande passante)" name="streaming_video"/>
+	<check_box bottom_delta="-32" label="Lire automatiquement le média" name="auto_streaming_video"/>
+	<check_box bottom_delta="-20" control_name="MediaEnableFilter" follows="top" height="16" initial_value="true" label="Demande la permission d'activer le média" name="streaming_video2"/>
+
+	<slider label="Effet Doppler" label_width="115" name="Doppler Effect"/>
+	<slider label="Facteur d&apos;éloignement" label_width="115" name="Distance Factor"/>
+	<slider label="Facteur d&apos;atténuation" label_width="115" name="Rolloff Factor"/>
+	<spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
+	     enabled="true" follows="left|top" height="16" increment="10"
+	     initial_val="10" label="Alerte [CURRENCY]:" label_width="128" left="148"
+	     max_val="10000" min_val="0" mouse_opaque="true" name="currency_change_threshold"
+	     width="192" />
+	<spinner label="Alerte santé" name="Health Change Threshold"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
index 3ed678e59..4b560d506 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_chat.xml
@@ -1,125 +1,125 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Chat écrit" name="chat">
-	<text length="1" name="text_box" type="string">
-		Taille de la police 
-du chat :
-	</text>
-	<radio_group name="chat_font_size">
-		<radio_item length="1" name="radio" type="string">
-			Petite
-		</radio_item>
-		<radio_item length="1" name="radio2" type="string">
-			Moyenne
-		</radio_item>
-		<radio_item length="1" name="radio3" type="string">
-			Grande
-		</radio_item>
-	</radio_group>
-	<text length="1" name="text_box2" type="string">
-		Couleur du chat :
-	</text>
-	<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 left="313" length="1" name="text_box4" type="string">
-		s
-	</text>
-	<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 length="1" name="text_box6" type="string">
-		Options du chat :
-	</text>
-	<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 length="1" name="text_box8" type="string">
-		Erreurs de script :
-	</text>
-	<check_box label="Afficher les erreurs dans le chat" name="script_errors_as_chat"/>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-410" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
-	     mouse_opaque="false" name="text_translate_chat" v_pad="0" width="128">
-		Traduire:
-	</text>
-
-
-	<combo_box name="translate_language_combobox" width="166">
-		<combo_item name="System Default Language">
-			Choix par défaut
-		</combo_item>
-		<combo_item length="1" name="English" type="string">
-			English (Anglais)
-		</combo_item>
-		<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 name="Italian">
-			Italiano (Italien) - Bêta
-		</combo_item>
-		<combo_item name="Hungarian">
-			Magyar (Hongrois) - Bêta
-		</combo_item>
-		<combo_item name="Dutch">
-			Nederlands (Néerlandais) - Bêta
-		</combo_item>
-		<combo_item name="Polish">
-			Polski (Polonais) - Bêta
-		</combo_item>
-		<combo_item name="Portugese">
-			Portugués (Portugais) - Bêta
-		</combo_item>
-		<combo_item name="Russian">
-			Ру��кий (Russe) - Bêta
-		</combo_item>
-		<combo_item name="Turkish">
-			Türkçe (Turc) - Bêta
-		</combo_item>
-		<combo_item name="Ukrainian">
-			Україн�ька (Ukrainien) - Bêta
-		</combo_item>
-		<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>
-	<text type="string" length="1" name="text_chat_language">
-		Langue de chat :
-	</text>
-	<text type="string" length="1" name="translate_chat" label="Traduire le Chat                             Choisissez votre langage :">
-	</text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Chat écrit" name="chat">
+	<text length="1" name="text_box" type="string">
+		Taille de la police 
+du chat :
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item length="1" name="radio" type="string">
+			Petite
+		</radio_item>
+		<radio_item length="1" name="radio2" type="string">
+			Moyenne
+		</radio_item>
+		<radio_item length="1" name="radio3" type="string">
+			Grande
+		</radio_item>
+	</radio_group>
+	<text length="1" name="text_box2" type="string">
+		Couleur du chat :
+	</text>
+	<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 left="313" length="1" name="text_box4" type="string">
+		s
+	</text>
+	<spinner left="335" name="max_chat_count"/>
+	<text left="397" length="1" name="text_box5" type="string" width="74">
+		ligne(s)
+	</text>
+	<slider label="Opacité" name="console_opacity"/>
+	<text length="1" name="text_box6" type="string">
+		Options du chat :
+	</text>
+	<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 length="1" name="text_box8" type="string">
+		Erreurs de script :
+	</text>
+	<check_box label="Afficher les erreurs dans le chat" name="script_errors_as_chat"/>
+	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom="-410" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="12"
+	     mouse_opaque="false" name="text_translate_chat" v_pad="0" width="128">
+		Traduire :
+	</text>
+
+
+	<combo_box name="translate_language_combobox" width="166">
+		<combo_item name="System Default Language">
+			Choix par défaut
+		</combo_item>
+		<combo_item length="1" name="English" type="string">
+			English (Anglais)
+		</combo_item>
+		<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 name="Italian">
+			Italiano (Italien) - Bêta
+		</combo_item>
+		<combo_item name="Hungarian">
+			Magyar (Hongrois) - Bêta
+		</combo_item>
+		<combo_item name="Dutch">
+			Nederlands (Néerlandais) - Bêta
+		</combo_item>
+		<combo_item name="Polish">
+			Polski (Polonais) - Bêta
+		</combo_item>
+		<combo_item name="Portugese">
+			Portugués (Portugais) - Bêta
+		</combo_item>
+		<combo_item name="Russian">
+			Ру��кий (Russe) - Bêta
+		</combo_item>
+		<combo_item name="Turkish">
+			Türkçe (Turc) - Bêta
+		</combo_item>
+		<combo_item name="Ukrainian">
+			Україн�ька (Ukrainien) - Bêta
+		</combo_item>
+		<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>
+	<text type="string" length="1" name="text_chat_language">
+		Langue de chat :
+	</text>
+	<text type="string" length="1" name="translate_chat" label="Traduire le Chat                             Choisissez votre langage :">
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
index 480eacc47..e2c528a48 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_general.xml
@@ -1,143 +1,148 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-409" height="408" label="General" left="102" name="general_panel" width="517">
-  <radio_group bottom="-44" height="40" left="109" name="default_start_location" width="280">
-    <radio_item bottom="-20" height="20" name="MyHome" tool_tip="Par défaut, choisir mon domicile comme lieu de départ.">Domicile</radio_item>
-    <radio_item bottom="-20" height="20" left="93" name="MyLastLocation" tool_tip="Par défaut, choisir mon dernier emplacement comme lieu de départ.">Dernier emplacement.</radio_item>
-  </radio_group>
-  <check_box bottom="-42" height="16" initial_value="true" label="Afficher le lieu de départ sur l&apos;écran de connexion" name="show_location_checkbox"/>
-	<combo_box bottom_delta="-27" follows="top" height="18" left="103" name="fade_out_combobox" width="111">
-		<combo_item name="Never" value="Never">Jamais</combo_item>
-		<combo_item name="Show Temporarily" value="Show Temporarily">Afficher temporairement</combo_item>
-		<combo_item name="Always" value="Always">Toujours</combo_item>
-	</combo_box>
-
-
-
-
-
-	<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"/>
-	<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>
-	<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="M&apos;avertir lorsque je dépense ou reçois des L$" name="notify_money_change_checkbox"/>
-	<text name="maturity_desired_label">
-		Catégories :
-	</text>
-	<text name="maturity_desired_prompt">
-		Je veux accéder au contenu classé :
-	</text>
-	<combo_box name="maturity_desired_combobox" left="340">
-		<combo_item name="Desired_Adult">
-			PG, Mature &#x26; Adult
-		</combo_item>
-		<combo_item name="Desired_Mature">
-			PG et Mature
-		</combo_item>
-		<combo_item name="Desired_PG">
-			PG uniquement
-		</combo_item>
-	</combo_box>
-	<text name="maturity_desired_textbox" left="340">
-		PG uniquement
-	</text>
-	<text length="1" name="start_location_textbox" type="string">
-		Lieu de départ :
-	</text>
-	<text length="1" name="show_names_textbox" type="string">
-		Afficher les noms :
-	</text>
-	<text bottom="-174" length="1" name="effects_color_textbox" type="string">
-		Couleur du faisceau 
-de sélection :
-	</text>
-	<text length="1" name="seconds_textbox" type="string">
-		secondes
-	</text>
-	<text length="1" name="crash_report_textbox" type="string">
-		Rapports de crash :
-	</text>
-	<text length="1" name="language_textbox" type="string">
-		Langue :
-	</text>
-	<text left_delta="313" length="1" name="language_textbox2" type="string">
-		(redémarrage requis)
-	</text>
-	<string name="region_name_prompt">
-		&lt;Saisissez le nom de la région&gt;
-	</string>
-	<combo_box name="crash_behavior_combobox" width="166">
-		<combo_item length="1" name="Askbeforesending" type="string">
-			Demander avant d&apos;envoyer
-		</combo_item>
-		<combo_item length="1" name="Alwayssend" type="string">
-			Toujours envoyer
-		</combo_item>
-		<combo_item length="1" name="Neversend" type="string">
-			Ne jamais envoyer
-		</combo_item>
-	</combo_box>
-	<combo_box name="language_combobox" width="166">
-		<combo_item name="System Default Language">
-			Choix par défaut
-		</combo_item>
-		<combo_item length="1" name="English" type="string">
-			English (Anglais)
-		</combo_item>
-		<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 name="Italian">
-			Italiano (Italien) - Bêta
-		</combo_item>
-		<combo_item name="Hungarian">
-			Magyar (Hongrois) - Bêta
-		</combo_item>
-		<combo_item name="Dutch">
-			Nederlands (Néerlandais) - Bêta
-		</combo_item>
-		<combo_item name="Polish">
-			Polski (Polonais) - Bêta
-		</combo_item>
-		<combo_item name="Portugese">
-			Portugués (Portugais) - Bêta
-		</combo_item>
-		<combo_item name="Russian">
-			Ру��кий (Russe) - Bêta
-		</combo_item>
-		<combo_item name="Turkish">
-			Türkçe (Turc) - Bêta
-		</combo_item>
-		<combo_item name="Ukrainian">
-			Україн�ька (Ukrainien) - Bêta
-		</combo_item>
-		<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."/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel border="true" bottom="-409" height="408" label="Général" left="102" name="general_panel" width="517">
+  <radio_group bottom="-44" height="40" left="109" name="default_start_location" width="280">
+    <radio_item bottom="-20" height="20" name="MyHome" tool_tip="Par défaut, choisit le domicile comme lieu de départ.">Domicile</radio_item>
+    <radio_item bottom="-20" height="20" left="93" name="MyLastLocation" tool_tip="Par défaut, choisit le dernier emplacement comme lieu de départ.">Dernier emplacement</radio_item>
+  </radio_group>
+  <check_box bottom="-42" height="16" initial_value="true" label="Afficher le lieu de départ sur l&apos;écran de connexion" name="show_location_checkbox"/>
+	<combo_box bottom_delta="-27" follows="top" height="18" left="103" name="fade_out_combobox" width="111">
+		<combo_item name="Never" value="Never">Jamais</combo_item>
+		<combo_item name="Show Temporarily" value="Show Temporarily">Afficher temporairement</combo_item>
+		<combo_item name="Always" value="Always">Toujours</combo_item>
+	</combo_box>
+
+	<combo_box bottom_delta="0" follows="top" height="18" left="220" name="namesystem_combobox" width="166">
+		<combo_item name="Old Names" value="Anciens Noms">Anciens Names</combo_item>
+		<combo_item name="Display Names (with Username)" value="Display Names (with Username)">Display Names(w/Username)</combo_item>
+		<combo_item name="Display Names only" value="Display Names only">Display Names only</combo_item>
+	</combo_box>
+
+
+
+	<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"/>
+	<color_swatch label="" name="effect_color_swatch" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/>
+	<text name="UI Size:">
+		Taille de l&apos;interface :
+	</text>
+	<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="M&apos;avertir lorsque je dépense ou reçois des L$" name="notify_money_change_checkbox"/>
+	<text name="maturity_desired_label">
+		Catégories :
+	</text>
+	<text name="maturity_desired_prompt">
+		Acc&#xE8;s au contenu classé :
+	</text>
+	<combo_box name="maturity_desired_combobox" left="340">
+		<combo_item name="Desired_Adult">
+			PG, Mature, Adulte
+		</combo_item>
+		<combo_item name="Desired_Mature">
+			PG et Mature
+		</combo_item>
+		<combo_item name="Desired_PG">
+			PG uniquement
+		</combo_item>
+	</combo_box>
+	<text name="maturity_desired_textbox" left="340">
+		PG uniquement
+	</text>
+	<text length="1" name="start_location_textbox" type="string">
+		Lieu de départ :
+	</text>
+	<text length="1" name="show_names_textbox" type="string">
+		Afficher les noms :
+	</text>
+	<text bottom="-174" length="1" name="effects_color_textbox" type="string">
+		Couleur du faisceau 
+de sélection :
+	</text>
+	<text length="1" name="seconds_textbox" type="string">
+		secondes
+	</text>
+	<text length="1" name="crash_report_textbox" type="string">
+		Rapports de crash :
+	</text>
+	<text length="1" name="language_textbox" type="string">
+		Langue :
+	</text>
+	<text left_delta="313" length="1" name="language_textbox2" type="string">
+		(redémarrage requis)
+	</text>
+	<string name="region_name_prompt">
+		&lt;Saisir le nom de la région&gt;
+	</string>
+	<combo_box name="crash_behavior_combobox" width="166">
+		<combo_item length="1" name="Askbeforesending" type="string">
+			Demander avant d&apos;envoyer
+		</combo_item>
+		<combo_item length="1" name="Alwayssend" type="string">
+			Toujours envoyer
+		</combo_item>
+		<combo_item length="1" name="Neversend" type="string">
+			Ne jamais envoyer
+		</combo_item>
+	</combo_box>
+	<combo_box name="language_combobox" width="166">
+		<combo_item name="System Default Language">
+			Choix par défaut
+		</combo_item>
+		<combo_item length="1" name="English" type="string">
+			English (Anglais)
+		</combo_item>
+		<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 name="Italian">
+			Italiano (Italien) - Bêta
+		</combo_item>
+		<combo_item name="Hungarian">
+			Magyar (Hongrois) - Bêta
+		</combo_item>
+		<combo_item name="Dutch">
+			Nederlands (Néerlandais) - Bêta
+		</combo_item>
+		<combo_item name="Polish">
+			Polski (Polonais) - Bêta
+		</combo_item>
+		<combo_item name="Portugese">
+			Portugués (Portugais) - Bêta
+		</combo_item>
+		<combo_item name="Russian">
+			Ру��кий (Russe) - Bêta
+		</combo_item>
+		<combo_item name="Turkish">
+			Türkçe (Turc) - Bêta
+		</combo_item>
+		<combo_item name="Ukrainian">
+			Україн�ька (Ukrainien) - Bêta
+		</combo_item>
+		<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 bottom="-385" height="16" initial_value="false" label="Partager la langue avec les objets" left="101" name="language_is_public" tool_tip="Cette option permet de faire connaître aux objets du Monde votre langue favorite."/>
+  <button bottom="-425" height="25" label="Re initialiser tous les Settings (réglages)" name="clear_settings" width="250" />
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index b843ef88b..1deaf0412 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -1,231 +1,232 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Graphiques" name="Display panel">
-	<button label="?" name="GraphicsPreferencesHelpButton"/>
-	<text_editor bottom="-56" height="40" left="25" name="FullScreenInfo" width="460">
-		Décochez cette option pour passer en mode plein écran.
-	</text_editor>
-	<text name="WindowSizeLabel">
-		Taille de la fenêtre :
-	</text>
-	<combo_box name="windowsize combo">
-		<combo_item name="640x480">
-			640 x 480
-		</combo_item>
-		<combo_item name="800x600">
-			800 x 600
-		</combo_item>
-		<combo_item name="720x480">
-			720 x 480 (NTSC)
-		</combo_item>
-		<combo_item name="768x576">
-			768 x 576 (PAL)
-		</combo_item>
-		<combo_item name="1024x768">
-			1024 x 768
-		</combo_item>
-	</combo_box>
-	<text name="DisplayResLabel" width="165">
-		Résolution de l&apos;affichage :
-	</text>
-	<text name="AspectRatioLabel1" tool_tip="largeur/hauteur">
-		Rapport hauteur/largeur :
-	</text>
-	<combo_box name="aspect_ratio" tool_tip="largeur/hauteur">
-		<combo_item length="1" name="4:3(StandardCRT)" type="string">
-			4:3 (Standard CRT)
-		</combo_item>
-		<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)
-		</combo_item>
-		<combo_item length="1" name="16:9(Widescreen)" type="string">
-			16:9 (plein écran)
-		</combo_item>
-	</combo_box>
-	<text length="1" name="text" type="string">
-		Résolution d&apos;affichage :
-	</text>
-	<text length="1" name="Fullscreen Aspect Ratio:" type="string">
-		Format de plein écran :
-	</text>
-	<text length="1" name="(width / height)" type="string">
-		(largeur / hauteur)
-	</text>
-	<text length="1" name="UI Size:" type="string">
-		Taille de l&apos;IU :
-	</text>
-	<text length="1" name="(meters, lower is faster)" type="string">
-		(mètres, moins = plus rapide)
-	</text>
-	<text length="1" name="text2" type="string">
-		Options d&apos;affichage :
-	</text>
-	<check_box label="Lancer Singularity 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 vue subjective" name="avfp"/>
-	<spinner label="Distance d&apos;affichage :" name="draw_distance"/>
-	<text name="HigherText">
-		Qualité et
-	</text>
-	<text name="QualityText">
-		Performance :
-	</text>
-	<text left="105" name="FasterText">
-		Plus rapide
-	</text>
-	<text name="ShadersPrefText">
-		Faible
-	</text>
-	<text name="ShadersPrefText2">
-		Moyen
-	</text>
-	<text name="ShadersPrefText3">
-		Élevé
-	</text>
-	<text name="ShadersPrefText4">
-		Ultra
-	</text>
-	<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="ShadersText">
-		Effets :
-	</text>
-	<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 bottom_delta="-17" control_name="RenderDeferred" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="true" label="Délissage" left_delta="0"
-	     mouse_opaque="true" name="RenderDeferred" radio_style="false"
-	     width="256" />
-<check_box bottom_delta="-17" control_name="RenderDeferredGI" enabled="true"
-      follows="left|top" font="SansSerifSmall" height="16"
-      initial_value="true" label="Illumination globale (Experimental)" left_delta="0"
-      mouse_opaque="true" name="RenderDeferredGI" radio_style="false"
-      width="256" />
-		<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-17" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-	     left="15" mouse_opaque="true" name="ReflectionDetailText" v_pad="0"
-	     width="128">
-		Reflets:
-	</text>
-	<combo_box bottom_delta="-20" control_name="RenderReflectionDetail" enabled = "true" follows="left|top" label="Reflection Detail"
-		 left_delta="-2" mouse_opaque="true" name="ReflectionDetailCombo" width="160" height="16">
-          <combo_item type="string" length="1" name="0">
-           Aucun
-           </combo_item>
-		<combo_item type="string" length="1" name="1">
-			Terrain et arbres
-		</combo_item>
-		<combo_item type="string" length="1" name="2">
-			Objets Statiques
-		</combo_item>
-		<combo_item type="string" length="1" name="3">
-			Avatars et objets
-		</combo_item>
-		<combo_item type="string" length="1" name="4">
-			Tout
-		</combo_item>
-	</combo_box>
-<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-      bottom_delta="-17" drop_shadow_visible="true" enabled="true" follows="left|top"
-      font="SansSerifSmall" h_pad="0" halign="left" height="12"
-      left="15" mouse_opaque="true" name="ShadowDetailText" v_pad="0"
-      width="128">
-    Ombres atténuées:
-  </text>
-  <combo_box bottom_delta="-20" control_name="RenderShadowDetail" enabled = "true" follows="left|top" label="Shadow Detail"
-   left_delta="-2" mouse_opaque="true" name="ShadowDetailCombo" width="160" height="16">
-    <combo_item type="string" length="1" name="0" value="0">
-      D&#xE9;sactiv&#xE9;
-    </combo_item>
-    <combo_item type="string" length="1" name="1" value="1">
-      Ombres solaires
-    </combo_item>
-    <combo_item type="string" length="1" name="2" value="2">
-      Ombres des projecteurs
-    </combo_item>
-  </combo_box>
-      <text name="AvatarRenderingText">
-		Rendu de l&apos;avatar :
-	</text>
-	<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="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 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>
-	<text name="ObjectMeshDetailText">
-		Faible
-	</text>
-	<text name="FlexibleMeshDetailText">
-		Faible
-	</text>
-	<text name="TreeMeshDetailText">
-		Faible
-	</text>
-	<text name="AvatarMeshDetailText">
-		Faible
-	</text>
-	<text name="TerrainMeshDetailText">
-		Faible
-	</text>
-	<text name="SkyMeshDetailText">
-		Faible
-	</text>
-	<text name="LightingDetailText">
-		Sources lumineuses :
-	</text>
-	<radio_group name="LightingDetailRadio">
-		<radio_item name="SunMoon">
-			Soleil et lune uniquement
-		</radio_item>
-		<radio_item name="LocalLights">
-			Lumières de proximité
-		</radio_item>
-	</radio_group>
-	<text left="380" name="TerrainDetailText">
-		Rendu du terrain :
-	</text>
-	<radio_group name="TerrainDetailRadio">
-		<radio_item name="0">
-			Faible
-		</radio_item>
-		<radio_item name="2">
-			É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"/>
-	<text name="resolution_format">
-		[RES_X] x [RES_Y]
-	</text>
-	<text name="aspect_ratio_text">
-		[NUM]:[DEN]
-	</text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Graphiques" name="Display panel">
+	<button label="?" name="GraphicsPreferencesHelpButton"/>
+	<text_editor bottom="-56" height="40" left="25" name="FullScreenInfo" width="460">
+		D&#xE9;cocher cette option pour passer en mode plein &#xE9;cran.
+	</text_editor>
+	<text name="WindowSizeLabel">
+		Taille de la fen&#xEA;tre :
+	</text>
+	<combo_box name="windowsize combo">
+		<combo_item name="640x480">
+			640 x 480
+		</combo_item>
+		<combo_item name="800x600">
+			800 x 600
+		</combo_item>
+		<combo_item name="720x480">
+			720 x 480 (NTSC)
+		</combo_item>
+		<combo_item name="768x576">
+			768 x 576 (PAL)
+		</combo_item>
+		<combo_item name="1024x768">
+			1024 x 768
+		</combo_item>
+	</combo_box>
+	<text name="DisplayResLabel" width="165">
+		R&#xE9;solution de l&apos;affichage :
+	</text>
+	<text name="AspectRatioLabel1" tool_tip="largeur/hauteur">
+		Rapport hauteur/largeur :
+	</text>
+	<combo_box name="aspect_ratio" tool_tip="largeur/hauteur">
+		<combo_item length="1" name="4:3(StandardCRT)" type="string">
+			4:3 (Standard CRT)
+		</combo_item>
+		<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 (&#xE9;cran large)
+		</combo_item>
+		<combo_item length="1" name="16:9(Widescreen)" type="string">
+			16:9 (plein &#xE9;cran)
+		</combo_item>
+	</combo_box>
+	<text length="1" name="text" type="string">
+		R&#xE9;solution d&apos;affichage :
+	</text>
+	<text length="1" name="Fullscreen Aspect Ratio:" type="string">
+		Format de plein &#xE9;cran :
+	</text>
+	<text length="1" name="(width / height)" type="string">
+		(largeur / hauteur)
+	</text>
+	<text length="1" name="UI Size:" type="string">
+		Taille de l&apos;IU :
+	</text>
+	<text length="1" name="(meters, lower is faster)" type="string">
+		(mètres, moins = plus rapide)
+	</text>
+	<text length="1" name="text2" type="string">
+		Options d&apos;affichage :
+	</text>
+	<check_box label="Lancer Singularity dans une fen&#xEA;tre (et non pas, PAR la fen&#xEA;tre)" name="windowed mode"/>
+	<check_box label="Auto-d&#xE9;tection du ratio" left="350" name="aspect_auto_detect"/>
+	<check_box label="Utiliser &#xE9;chelle de r&#xE9;solution ind&#xE9;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&#xE9; et
+	</text>
+	<text name="QualityText">
+		Performance :
+	</text>
+	<text left="105" name="FasterText">
+		Plus rapide
+	</text>
+	<text name="ShadersPrefText">
+		Faible
+	</text>
+	<text name="ShadersPrefText2">
+		Moyen
+	</text>
+	<text name="ShadersPrefText3">
+		Elev&#xE9;
+	</text>
+	<text name="ShadersPrefText4">
+		Ultra
+	</text>
+	<text bottom="-86" left="325" name="HigherText2">
+		Plus &#xE9;lev&#xE9;e
+	</text>
+	<text name="QualityText2" visible="false"/>
+	<check_box label="Personnaliser" left="395" name="CustomSettings"/>
+	<text name="ShadersText">
+		Effets :
+	</text>
+	<check_box label="Pla&#xE7;age de relief et brillance" name="BumpShiny"/>
+	<check_box label="Effets de base" name="BasicShaders" tool_tip="D&#xE9;sactiver cette option peut emp&#xEA;cher certains drivers de cartes graphiques de planter."/>
+	<check_box label="Effets atmosph&#xE9;riques" name="WindLightUseAtmosShaders"/>
+	<check_box bottom_delta="-17" control_name="RenderDeferred" enabled="true"
+	     follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="true" label="D&#xE9;lissage" left_delta="0"
+	     mouse_opaque="true" name="RenderDeferred" radio_style="false"
+	     width="256" />
+<check_box bottom_delta="-17" control_name="RenderDepthOfField"	initial_value="true" label="Profondeur de champ" left_delta="0" name="RenderDepthOfField"/>
+<check_box bottom_delta="-17" control_name="RenderDeferredGI" enabled="true"
+      follows="left|top" font="SansSerifSmall" height="16"
+      initial_value="true" label="Illumination globale (Experimental)" left_delta="0"
+      mouse_opaque="true" name="RenderDeferredGI" radio_style="false"
+      width="256" />
+		<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-17" drop_shadow_visible="true" enabled="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
+	     left="15" mouse_opaque="true" name="ReflectionDetailText" v_pad="0"
+	     width="128">
+		Reflets :
+	</text>
+	<combo_box bottom_delta="-20" control_name="RenderReflectionDetail" enabled = "true" follows="left|top" label="Reflection Detail"
+		 left_delta="-2" mouse_opaque="true" name="ReflectionDetailCombo" width="160" height="16">
+          <combo_item type="string" length="1" name="0">
+           Aucun
+           </combo_item>
+		<combo_item type="string" length="1" name="1">
+			Terrain et arbres
+		</combo_item>
+		<combo_item type="string" length="1" name="2">
+			Objets Statiques
+		</combo_item>
+		<combo_item type="string" length="1" name="3">
+			Avatars et objets
+		</combo_item>
+		<combo_item type="string" length="1" name="4">
+			Tout
+		</combo_item>
+	</combo_box>
+<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+      bottom_delta="-17" drop_shadow_visible="true" enabled="true" follows="left|top"
+      font="SansSerifSmall" h_pad="0" halign="left" height="12"
+      left="15" mouse_opaque="true" name="ShadowDetailText" v_pad="0"
+      width="128">
+    Ombres att&#xE9;nu&#xE9;es :
+  </text>
+  <combo_box bottom_delta="-20" control_name="RenderShadowDetail" enabled = "true" follows="left|top" label="Shadow Detail"
+   left_delta="-2" mouse_opaque="true" name="ShadowDetailCombo" width="160" height="16">
+    <combo_item type="string" length="1" name="0" value="0">
+      D&#xE9;sactiv&#xE9;
+    </combo_item>
+    <combo_item type="string" length="1" name="1" value="1">
+      Ombres solaires
+    </combo_item>
+    <combo_item type="string" length="1" name="2" value="2">
+      Ombres des projecteurs
+    </combo_item>
+  </combo_box>
+      <text name="AvatarRenderingText">
+		Rendu de l&apos;avatar :
+	</text>
+	<check_box label="Avatars &#xE9;loign&#xE9;s en 2D" name="AvatarImpostors"/>
+	<check_box label="Acc&#xE9;l&#xE9;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="Limite d&apos;affichage :" name="DrawDistance"/>
+	<slider label="Nombre de particules max. :" label_width="143" name="MaxParticleCount"/>
+	<slider label="Qualit&#xE9; post-traitement :" label_width="125" name="RenderPostProcess"/>
+	<text name="MeshDetailText">
+		D&#xE9;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>
+	<text name="ObjectMeshDetailText">
+		Faible
+	</text>
+	<text name="FlexibleMeshDetailText">
+		Faible
+	</text>
+	<text name="TreeMeshDetailText">
+		Faible
+	</text>
+	<text name="AvatarMeshDetailText">
+		Faible
+	</text>
+	<text name="TerrainMeshDetailText">
+		Faible
+	</text>
+	<text name="SkyMeshDetailText">
+		Faible
+	</text>
+	<text name="LightingDetailText">
+		Sources lumineuses :
+	</text>
+	<radio_group name="LightingDetailRadio">
+		<radio_item name="SunMoon">
+			Soleil et lune uniquement
+		</radio_item>
+		<radio_item name="LocalLights">
+			Lumi&#xE8;res de proximit&#xE9;
+		</radio_item>
+	</radio_group>
+	<text left="380" name="TerrainDetailText">
+		Rendu du terrain :
+	</text>
+	<radio_group name="TerrainDetailRadio">
+		<radio_item name="0">
+			Faible
+		</radio_item>
+		<radio_item name="2">
+			Elev&#xE9;
+		</radio_item>
+	</radio_group>
+	<button label="Param&#xE8;tres recommand&#xE9;s" name="Defaults"/>
+	<button label="Configuration du matériel" label_selected="Configuration du mat&#xE9;riel" name="GraphicsHardwareButton"/>
+	<text name="resolution_format">
+		[RES_X] x [RES_Y]
+	</text>
+	<text name="aspect_ratio_text">
+		[NUM]:[DEN]
+	</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_grids.xml b/indra/newview/skins/default/xui/fr/panel_preferences_grids.xml
index d7b34cce4..cda870b59 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_grids.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_grids.xml
@@ -1,242 +1,242 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel enabled="true" label="Grilles" name="Grids panel"
-		height="408" width="517" left="102"
-		follows="left|top|right|bottom" border="true" mouse_opaque="true">
-  <!-- Grid Selector -->
-  <text type="string" length="1" enabled="true" name="grid_selector_label"
-		height="10" width="100" left="12" bottom="-20"
-		h_pad="0" v_pad="0" halign="left"
-		font="SansSerifSmall"
-		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
-	    drop_shadow_visible="true" border_drop_shadow_visible="false">
-    Choisir une Grille:
-  </text>
-  <combo_box max_chars="20" allow_text_entry="false" name="grid_selector"
-		height="18" width="200" left="120" bottom_delta="-4"
-		follows="left|top" mouse_opaque="true" />
-  <button label="Default" label_selected="Default" enabled="true" name="btn_default"
-  height="18" width="75" left_delta="210" bottom_delta="0"
-  halign="center"
-  follows="left|top" scale_image="true"
-    font="SansSerifSmall" mouse_opaque="true" />
-  <text type="string" length="1" enabled="true" name="default_grid"
-  height="10" width="200" left_delta="80" bottom_delta="5"
-  h_pad="0" v_pad="0" halign="left"
-  font="SansSerifSmall"
-  follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
-    drop_shadow_visible="true" border_drop_shadow_visible="false">
-    ([DEFAULT])
-  </text>
-  <!-- Buttons -->
-  <button label="Supprimer" label_selected="Delete" enabled="true" name="btn_delete"
-		height="18" width="75" left="120" bottom_delta="-27"
-		halign="center"
-		follows="left|top" scale_image="true"
-	    font="SansSerifSmall" mouse_opaque="true" />
-  <button label="Ajouter" label_selected="Add" enabled="true" name="btn_add"
-		height="18" width="75" left_delta="78" bottom_delta="0"
-		halign="center"
-		follows="left|top" scale_image="true"
-	    font="SansSerifSmall" mouse_opaque="true" />
-  <button label="Copier" label_selected="Copy" enabled="true" name="btn_copy"
-		height="18" width="75" left_delta="78" bottom_delta="0"
-		halign="center"
-		follows="left|top" scale_image="true"
-	    font="SansSerifSmall" mouse_opaque="true" />
-  <!-- Advanced -->
-  <button label="Avancé" label_selected="Advanced" enabled="true" name="btn_advanced"
-		height="18" width="75" left_delta="78" bottom_delta="0"
-		halign="center"
-		follows="left|top" scale_image="true"
-	    font="SansSerifSmall" mouse_opaque="true" />
-  <!-- Login URI -->
-  <text type="string" length="1" enabled="true" name="loginuri_label"
-		height="10" width="100" left="12" bottom_delta="-32"
-		h_pad="0" v_pad="0" halign="left"
-		font="SansSerifSmall"
-		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
-	    drop_shadow_visible="true" border_drop_shadow_visible="false">
-    Login URL:
-  </text>
-  <line_editor max_length="254" enabled="true" name="loginuri"
-		handle_edit_keys_directly="true"
-		height="18" left="120" right="-12" bottom_delta="-4"
-		halign="right"
-		font="SansSerifSmall"
-		follows="left|top|right" border_visible="false" mouse_opaque="false"
-		drop_shadow_visible="true" border_drop_shadow_visible="false" />
-  <!--<button label="Get Grid Info" label_selected="Get Grid Info" enabled="true" name="btn_gridinfo"
-		height="18" width="100" left="120" bottom_delta="-22"
-		halign="center"
-		follows="left|top" scale_image="true"
-	    font="SansSerifSmall" mouse_opaque="true" />-->
-  <!-- Platform -->
-  <text type="string" length="1" enabled="true" name="platform_label"
-		height="10" width="100" left="12" bottom_delta="-32"
-		h_pad="0" v_pad="0" halign="left"
-		font="SansSerifSmall"
-		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
-	    drop_shadow_visible="true" border_drop_shadow_visible="false">
-    Plateforme:
-  </text>
-  <combo_box max_chars="20" allow_text_entry="false" name="platform"
-		height="18" width="200" left="120" bottom_delta="-4"
-		follows="left|top" mouse_opaque="true" />
-  <!-- Grid Name -->
-  <text type="string" length="1" enabled="true" name="gridname_label"
-		height="10" width="100" left="12" bottom_delta="-20"
-		h_pad="0" v_pad="0" halign="left"
-		font="SansSerifSmall"
-		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
-		drop_shadow_visible="true" border_drop_shadow_visible="false">
-    Nom:
-  </text>
-  <line_editor max_length="254" enabled="true" name="gridname"
-		handle_edit_keys_directly="true"
-		height="18" left="120" right="-12" bottom_delta="-4"
-		halign="right"
-		font="SansSerifSmall"
-		follows="left|top|right" border_visible="false" mouse_opaque="false"
-		drop_shadow_visible="true" border_drop_shadow_visible="false" />
-
-  <!-- Grid Message -->
-  <text type="string" length="1" enabled="true" name="gridmessage_label"
-		height="10" width="100" left="12" bottom_delta="-50"
-		h_pad="0" v_pad="0" halign="left"
-		font="SansSerifSmall"
-		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
-		drop_shadow_visible="true" border_drop_shadow_visible="false">
-    Infos:
-  </text>
-  <text_editor type="string" length="1" bottom="-185" embedded_items="false" enabled="true" follows="left|top|right"
-	     handle_edit_keys_directly="true" 
-       font="SansSerifSmall" height="50" left="120" right="-12" bottom_delta="-4" max_length="512"
-	     mouse_opaque="true" name="gridmessage" word_wrap="true" spell_check="true" />
-  
-  <!-- Advanced settings -->
-  
-  <!-- Grid Splash Page -->
-  <text type="string" length="1" enabled="true" name="loginpage_label"
-		height="10" width="100" left="12" bottom_delta="-22" visible="false"
-		h_pad="0" v_pad="0" halign="left"
-		font="SansSerifSmall"
-		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
-		drop_shadow_visible="true" border_drop_shadow_visible="false">
-    Page Splash :
-  </text>
-  <line_editor max_length="254" enabled="true" name="loginpage"
-		handle_edit_keys_directly="true" visible="false"
-		height="18" left="120" right="-12" bottom_delta="-4"
-		halign="right"
-		font="SansSerifSmall"
-		follows="left|top|right" border_visible="false" mouse_opaque="false"
-		drop_shadow_visible="true" border_drop_shadow_visible="false" />
-  <!-- Helper URI -->
-  <text type="string" length="1" enabled="true" name="helperuri_label"
-		height="10" width="100" left="12" bottom_delta="-20" visible="false"
-		h_pad="0" v_pad="0" halign="left"
-		font="SansSerifSmall"
-		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
-	    drop_shadow_visible="true" border_drop_shadow_visible="false">
-    Aide URL:
-  </text>
-  <line_editor max_length="254" enabled="true" name="helperuri"
-		handle_edit_keys_directly="true" visible="false"
-		height="18" left="120" right="-12" bottom_delta="-4"
-		halign="right"
-		font="SansSerifSmall"
-		follows="left|top|right" border_visible="false" mouse_opaque="false"
-		drop_shadow_visible="true" border_drop_shadow_visible="false" />
-  <!-- Web Site -->
-  <text type="string" length="1" enabled="true" name="website_label"
-  height="10" width="100" left="12" bottom_delta="-20" visible="false"
-  h_pad="0" v_pad="0" halign="left"
-  font="SansSerifSmall"
-  follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
-    drop_shadow_visible="true" border_drop_shadow_visible="false">
-    Site Web:
-  </text>
-  <line_editor max_length="254" enabled="true" name="website"
-  handle_edit_keys_directly="true" visible="false"
-  height="18" left="120" right="-12" bottom_delta="-4"
-  halign="right"
-  font="SansSerifSmall"
-  follows="left|top|right" border_visible="false" mouse_opaque="false"
-  drop_shadow_visible="true" border_drop_shadow_visible="false" />
-  <!-- Support URL -->
-  <text type="string" length="1" enabled="true" name="support_label"
-  height="10" width="100" left="12" bottom_delta="-20" visible="false"
-  h_pad="0" v_pad="0" halign="left"
-  font="SansSerifSmall"
-  follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
-    drop_shadow_visible="true" border_drop_shadow_visible="false">
-    Support URL:
-  </text>
-  <line_editor max_length="254" enabled="true" name="support"
-  handle_edit_keys_directly="true" visible="false"
-  height="18" left="120" right="-12" bottom_delta="-4"
-  halign="right"
-  font="SansSerifSmall"
-  follows="left|top|right" border_visible="false" mouse_opaque="false"
-  drop_shadow_visible="true" border_drop_shadow_visible="false" />
-  <!-- Account URL -->
-  <text type="string" length="1" enabled="true" name="register_label"
-  height="10" width="100" left="12" bottom_delta="-20" visible="false"
-  h_pad="0" v_pad="0" halign="left"
-  font="SansSerifSmall"
-  follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
-    drop_shadow_visible="true" border_drop_shadow_visible="false">
-    Compte URL:
-  </text>
-  <line_editor max_length="254" enabled="true" name="register"
-  handle_edit_keys_directly="true" visible="false"
-  height="18" left="120" right="-12" bottom_delta="-4"
-  halign="right"
-  font="SansSerifSmall"
-  follows="left|top|right" border_visible="false" mouse_opaque="false"
-  drop_shadow_visible="true" border_drop_shadow_visible="false" />
-  <!-- Password URL -->
-  <text type="string" length="1" enabled="true" name="password_label"
-  height="10" width="100" left="12" bottom_delta="-20" visible="false"
-  h_pad="0" v_pad="0" halign="left"
-  font="SansSerifSmall"
-  follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
-    drop_shadow_visible="true" border_drop_shadow_visible="false">
-    Mot de Passe URL:
-  </text>
-  <line_editor max_length="254" enabled="true" name="password"
-  handle_edit_keys_directly="true" visible="false"
-  height="18" left="120" right="-12" bottom_delta="-4"
-  halign="right"
-  font="SansSerifSmall"
-  follows="left|top|right" border_visible="false" mouse_opaque="false"
-  drop_shadow_visible="true" border_drop_shadow_visible="false" />
-  <!-- Search URL -->
-  <text type="string" length="1" enabled="true" name="search_label"
-  height="10" width="100" left="12" bottom_delta="-20" visible="false"
-  h_pad="0" v_pad="0" halign="left"
-  font="SansSerifSmall"
-  follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
-    drop_shadow_visible="true" border_drop_shadow_visible="false">
-    Recherche URL:
-  </text>
-  <line_editor max_length="254" enabled="true" name="search"
-  handle_edit_keys_directly="true" visible="false"
-  height="18" left="120" right="-12" bottom_delta="-4"
-  halign="right"
-  font="SansSerifSmall"
-  follows="left|top|right" border_visible="false" mouse_opaque="false"
-  drop_shadow_visible="true" border_drop_shadow_visible="false" />
-  <!-- Rendering Compatibility -->
-  <check_box enabled="true" radio_style="false"
-		label="Rendu de la Compatibilé" name="render_compat" visible="false"
-		height="18" left="115" bottom_delta="-35"
-		h_pad="0" v_pad="0" halign="left"
-		font="SansSerifSmall"
-		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
-		drop_shadow_visible="true" border_drop_shadow_visible="false" />
-  <button label="?" label_selected="?" enabled="true" name="btn_help_render_compat"
-		height="18" width="18" left_delta="160" bottom_delta="1" visible="false"
-		halign="center" follows="left|top"
-	    font="SansSerifSmall" mouse_opaque="true" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel enabled="true" label="Grilles" name="Grids panel"
+		height="408" width="517" left="102"
+		follows="left|top|right|bottom" border="true" mouse_opaque="true">
+  <!-- Grid Selector -->
+  <text type="string" length="1" enabled="true" name="grid_selector_label"
+		height="10" width="100" left="12" bottom="-20"
+		h_pad="0" v_pad="0" halign="left"
+		font="SansSerifSmall"
+		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+	    drop_shadow_visible="true" border_drop_shadow_visible="false">
+    Choisir une grille :
+  </text>
+  <combo_box max_chars="20" allow_text_entry="false" name="grid_selector"
+		height="18" width="200" left="120" bottom_delta="-4"
+		follows="left|top" mouse_opaque="true" />
+  <button label="Default" label_selected="Default" enabled="true" name="btn_default"
+  height="18" width="75" left_delta="210" bottom_delta="0"
+  halign="center"
+  follows="left|top" scale_image="true"
+    font="SansSerifSmall" mouse_opaque="true" />
+  <text type="string" length="1" enabled="true" name="default_grid"
+  height="10" width="200" left_delta="80" bottom_delta="5"
+  h_pad="0" v_pad="0" halign="left"
+  font="SansSerifSmall"
+  follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+    drop_shadow_visible="true" border_drop_shadow_visible="false">
+    ([DEFAULT])
+  </text>
+  <!-- Buttons -->
+  <button label="Supprimer" label_selected="Delete" enabled="true" name="btn_delete"
+		height="18" width="75" left="120" bottom_delta="-27"
+		halign="center"
+		follows="left|top" scale_image="true"
+	    font="SansSerifSmall" mouse_opaque="true" />
+  <button label="Ajouter" label_selected="Add" enabled="true" name="btn_add"
+		height="18" width="75" left_delta="78" bottom_delta="0"
+		halign="center"
+		follows="left|top" scale_image="true"
+	    font="SansSerifSmall" mouse_opaque="true" />
+  <button label="Copier" label_selected="Copy" enabled="true" name="btn_copy"
+		height="18" width="75" left_delta="78" bottom_delta="0"
+		halign="center"
+		follows="left|top" scale_image="true"
+	    font="SansSerifSmall" mouse_opaque="true" />
+  <!-- Advanced -->
+  <button label="Avancé" label_selected="Advanced" enabled="true" name="btn_advanced"
+		height="18" width="75" left_delta="78" bottom_delta="0"
+		halign="center"
+		follows="left|top" scale_image="true"
+	    font="SansSerifSmall" mouse_opaque="true" />
+  <!-- Login URI -->
+  <text type="string" length="1" enabled="true" name="loginuri_label"
+		height="10" width="100" left="12" bottom_delta="-32"
+		h_pad="0" v_pad="0" halign="left"
+		font="SansSerifSmall"
+		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+	    drop_shadow_visible="true" border_drop_shadow_visible="false">
+    Login URL :
+  </text>
+  <line_editor max_length="254" enabled="true" name="loginuri"
+		handle_edit_keys_directly="true"
+		height="18" left="120" right="-12" bottom_delta="-4"
+		halign="right"
+		font="SansSerifSmall"
+		follows="left|top|right" border_visible="false" mouse_opaque="false"
+		drop_shadow_visible="true" border_drop_shadow_visible="false" />
+  <!--<button label="Get Grid Info" label_selected="Get Grid Info" enabled="true" name="btn_gridinfo"
+		height="18" width="100" left="120" bottom_delta="-22"
+		halign="center"
+		follows="left|top" scale_image="true"
+	    font="SansSerifSmall" mouse_opaque="true" />-->
+  <!-- Platform -->
+  <text type="string" length="1" enabled="true" name="platform_label"
+		height="10" width="100" left="12" bottom_delta="-32"
+		h_pad="0" v_pad="0" halign="left"
+		font="SansSerifSmall"
+		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+	    drop_shadow_visible="true" border_drop_shadow_visible="false">
+    Plateforme :
+  </text>
+  <combo_box max_chars="20" allow_text_entry="false" name="platform"
+		height="18" width="200" left="120" bottom_delta="-4"
+		follows="left|top" mouse_opaque="true" />
+  <!-- Grid Name -->
+  <text type="string" length="1" enabled="true" name="gridname_label"
+		height="10" width="100" left="12" bottom_delta="-20"
+		h_pad="0" v_pad="0" halign="left"
+		font="SansSerifSmall"
+		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+		drop_shadow_visible="true" border_drop_shadow_visible="false">
+    Nom :
+  </text>
+  <line_editor max_length="254" enabled="true" name="gridname"
+		handle_edit_keys_directly="true"
+		height="18" left="120" right="-12" bottom_delta="-4"
+		halign="right"
+		font="SansSerifSmall"
+		follows="left|top|right" border_visible="false" mouse_opaque="false"
+		drop_shadow_visible="true" border_drop_shadow_visible="false" />
+
+  <!-- Grid Message -->
+  <text type="string" length="1" enabled="true" name="gridmessage_label"
+		height="10" width="100" left="12" bottom_delta="-50"
+		h_pad="0" v_pad="0" halign="left"
+		font="SansSerifSmall"
+		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+		drop_shadow_visible="true" border_drop_shadow_visible="false">
+    Infos :
+  </text>
+  <text_editor type="string" length="1" bottom="-185" embedded_items="false" enabled="true" follows="left|top|right"
+	     handle_edit_keys_directly="true" 
+       font="SansSerifSmall" height="50" left="120" right="-12" bottom_delta="-4" max_length="512"
+	     mouse_opaque="true" name="gridmessage" word_wrap="true" spell_check="true" />
+  
+  <!-- Advanced settings -->
+  
+  <!-- Grid Splash Page -->
+  <text type="string" length="1" enabled="true" name="loginpage_label"
+		height="10" width="100" left="12" bottom_delta="-22" visible="false"
+		h_pad="0" v_pad="0" halign="left"
+		font="SansSerifSmall"
+		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+		drop_shadow_visible="true" border_drop_shadow_visible="false">
+    Page Splash :
+  </text>
+  <line_editor max_length="254" enabled="true" name="loginpage"
+		handle_edit_keys_directly="true" visible="false"
+		height="18" left="120" right="-12" bottom_delta="-4"
+		halign="right"
+		font="SansSerifSmall"
+		follows="left|top|right" border_visible="false" mouse_opaque="false"
+		drop_shadow_visible="true" border_drop_shadow_visible="false" />
+  <!-- Helper URI -->
+  <text type="string" length="1" enabled="true" name="helperuri_label"
+		height="10" width="100" left="12" bottom_delta="-20" visible="false"
+		h_pad="0" v_pad="0" halign="left"
+		font="SansSerifSmall"
+		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+	    drop_shadow_visible="true" border_drop_shadow_visible="false">
+    Aide URL :
+  </text>
+  <line_editor max_length="254" enabled="true" name="helperuri"
+		handle_edit_keys_directly="true" visible="false"
+		height="18" left="120" right="-12" bottom_delta="-4"
+		halign="right"
+		font="SansSerifSmall"
+		follows="left|top|right" border_visible="false" mouse_opaque="false"
+		drop_shadow_visible="true" border_drop_shadow_visible="false" />
+  <!-- Web Site -->
+  <text type="string" length="1" enabled="true" name="website_label"
+  height="10" width="100" left="12" bottom_delta="-20" visible="false"
+  h_pad="0" v_pad="0" halign="left"
+  font="SansSerifSmall"
+  follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+    drop_shadow_visible="true" border_drop_shadow_visible="false">
+    Site Web :
+  </text>
+  <line_editor max_length="254" enabled="true" name="website"
+  handle_edit_keys_directly="true" visible="false"
+  height="18" left="120" right="-12" bottom_delta="-4"
+  halign="right"
+  font="SansSerifSmall"
+  follows="left|top|right" border_visible="false" mouse_opaque="false"
+  drop_shadow_visible="true" border_drop_shadow_visible="false" />
+  <!-- Support URL -->
+  <text type="string" length="1" enabled="true" name="support_label"
+  height="10" width="100" left="12" bottom_delta="-20" visible="false"
+  h_pad="0" v_pad="0" halign="left"
+  font="SansSerifSmall"
+  follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+    drop_shadow_visible="true" border_drop_shadow_visible="false">
+    Support URL :
+  </text>
+  <line_editor max_length="254" enabled="true" name="support"
+  handle_edit_keys_directly="true" visible="false"
+  height="18" left="120" right="-12" bottom_delta="-4"
+  halign="right"
+  font="SansSerifSmall"
+  follows="left|top|right" border_visible="false" mouse_opaque="false"
+  drop_shadow_visible="true" border_drop_shadow_visible="false" />
+  <!-- Account URL -->
+  <text type="string" length="1" enabled="true" name="register_label"
+  height="10" width="100" left="12" bottom_delta="-20" visible="false"
+  h_pad="0" v_pad="0" halign="left"
+  font="SansSerifSmall"
+  follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+    drop_shadow_visible="true" border_drop_shadow_visible="false">
+    Compte URL :
+  </text>
+  <line_editor max_length="254" enabled="true" name="register"
+  handle_edit_keys_directly="true" visible="false"
+  height="18" left="120" right="-12" bottom_delta="-4"
+  halign="right"
+  font="SansSerifSmall"
+  follows="left|top|right" border_visible="false" mouse_opaque="false"
+  drop_shadow_visible="true" border_drop_shadow_visible="false" />
+  <!-- Password URL -->
+  <text type="string" length="1" enabled="true" name="password_label"
+  height="10" width="100" left="12" bottom_delta="-20" visible="false"
+  h_pad="0" v_pad="0" halign="left"
+  font="SansSerifSmall"
+  follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+    drop_shadow_visible="true" border_drop_shadow_visible="false">
+    Mot de Passe URL :
+  </text>
+  <line_editor max_length="254" enabled="true" name="password"
+  handle_edit_keys_directly="true" visible="false"
+  height="18" left="120" right="-12" bottom_delta="-4"
+  halign="right"
+  font="SansSerifSmall"
+  follows="left|top|right" border_visible="false" mouse_opaque="false"
+  drop_shadow_visible="true" border_drop_shadow_visible="false" />
+  <!-- Search URL -->
+  <text type="string" length="1" enabled="true" name="search_label"
+  height="10" width="100" left="12" bottom_delta="-20" visible="false"
+  h_pad="0" v_pad="0" halign="left"
+  font="SansSerifSmall"
+  follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+    drop_shadow_visible="true" border_drop_shadow_visible="false">
+    Recherche URL :
+  </text>
+  <line_editor max_length="254" enabled="true" name="search"
+  handle_edit_keys_directly="true" visible="false"
+  height="18" left="120" right="-12" bottom_delta="-4"
+  halign="right"
+  font="SansSerifSmall"
+  follows="left|top|right" border_visible="false" mouse_opaque="false"
+  drop_shadow_visible="true" border_drop_shadow_visible="false" />
+  <!-- Rendering Compatibility -->
+  <check_box enabled="true" radio_style="false"
+		label="Rendu de la compatibilé" name="render_compat" visible="false"
+		height="18" left="115" bottom_delta="-35"
+		h_pad="0" v_pad="0" halign="left"
+		font="SansSerifSmall"
+		follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
+		drop_shadow_visible="true" border_drop_shadow_visible="false" />
+  <button label="?" label_selected="?" enabled="true" name="btn_help_render_compat"
+		height="18" width="18" left_delta="160" bottom_delta="1" visible="false"
+		halign="center" follows="left|top"
+	    font="SansSerifSmall" mouse_opaque="true" />
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_im.xml b/indra/newview/skins/default/xui/fr/panel_preferences_im.xml
index ce37bf310..6302a650d 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_im.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_im.xml
@@ -1,36 +1,33 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Communication" name="im">
-	<text length="1" name="text_box" type="string">
-		Mon statut en ligne :
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Communication" name="im">
+	<text name="text_box">
+		Mon statut en ligne:
+	</text>
+	<check_box label="Seuls mes ami(e)s et groupes voient quand je suis connecté(e)" name="online_visibility"/>
+	<text name="text_box2">
+		IM:
 	</text>
-	<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 les IM à mon adresse e-mail ([EMAIL])" name="send_im_to_email"/>
-	<check_box label="Afficher les IM dans la console du chat" name="include_im_in_chat_console"/>
-	<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 si occupé(e) :
-	</text>
-	<text name="text_box4">
-		Enregistrements :
-	</text>
-	<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"/>
-	<check_box bottom="-365" enabled="true" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Joindre la date dans le nom du fichier de log" left="148" mouse_opaque="true"
-	     name="logfile_name_datestamp" radio_style="false" width="237" />
-	<button label="Changer d&apos;emplacement" label_selected="Changer d&apos;emplacement" name="log_path_button" width="180"/>
-	<line_editor left="308" name="log_path_string" right="-20"/>
-	<text length="1" name="text_box2" type="string">
-		IM :
-	</text>
-</panel>
+	<string name="log_in_to_change">
+		Se connecter pour changer
+	</string>
+	<check_box label="Envoyer les IM à mon adresse e-mail ([EMAIL])" name="send_im_to_email"/>
+	<check_box label="Afficher les IM dans la console du chat" name="include_im_in_chat_console"/>
+	<check_box label="Afficher l'heure dans les IM" name="show_timestamps_check"/>
+	<check_box label="Me prévenir quand des ami(e)s se connectent" name="friends_online_notify_checkbox"/>
+	<text name="text_box3">
+		Réponse si occupé(e):
+	</text>
+	<text name="text_box4">
+		Enregistrements:
+	</text>
+	<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"/>
+	<check_box bottom="-365" label="Joindre la date dans le nom du fichier de log" left="148" name="logfile_name_datestamp" width="237"/>
+	<button label="Changer d'emplacement" label_selected="Changer d'emplacement" name="log_path_button" width="180"/>
+	<line_editor left="308" name="log_path_string" right="-20"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_input.xml b/indra/newview/skins/default/xui/fr/panel_preferences_input.xml
index c6b948238..f8cf533e5 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_input.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_input.xml
@@ -1,35 +1,31 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Contrôle caméra" name="Input panel">
-	<text length="1" name=" Mouselook Options:" type="string">
-		Vue subjective :
-	</text>
-	<text length="1" name=" Mouse Sensitivity:" type="string">
-		Sensibilité de la souris :
-	</text>
-	<check_box label="Inverser la souris" name="invert_mouse"/>
-	<text length="1" name=" Auto Fly Options:" type="string">
-		Vol automatique :
-	</text>
-	<check_box label="Voler/atterrir en appuyant sur la flèche du haut/bas" name="automatic_fly"/>
-	<text length="1" name=" Camera Options:" type="string">
-		Options de la caméra :
-	</text>
-	<text name="camera_fov_label">
-		Angle de vision :
-	</text>
-	<text name="Camera Follow Distance:">
-		Distance :
-	</text>
-	<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"/>
-	<check_box bottom_delta="-18" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-	     label="Lever l&apos;avatar au reset de la caméra" left="148" mouse_opaque="true"
-	     name="unsit_on_camera_reset" radio_style="false"
-	     tool_tip="Leve automatiquement l&apos;avatar quand vous pressez ESC ainsi la caméra permute en mode troisième personne" width="242" />
-        <text name="text2">
-		Affichage de l&apos;avatar :
-	</text>
-	<check_box label="Montrer l&apos;avatar en vue subjective" name="first_person_avatar_visible"/>
-	<button label="Configuration du joystick" name="joystick_setup_button" width="175"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Contrôle caméra" name="Input panel">
+	<text name=" Mouselook Options:">
+		Vue subjective:
+	</text>
+	<text name=" Mouse Sensitivity:">
+		Sensibilité de la souris:
+	</text>
+	<check_box label="Inverser la souris" name="invert_mouse"/>
+	<text name=" Auto Fly Options:">
+		Vol automatique:
+	</text>
+	<check_box label="Voler/atterrir en appuyant sur les fl&#xEA;ches haut/bas" name="automatic_fly"/>
+	<text name=" Camera Options:">
+		Options de la caméra:
+	</text>
+	<text name="camera_fov_label">
+		Angle de vision:
+	</text>
+	<text name="Camera Follow Distance:">
+		Distance:
+	</text>
+	<check_box label="Ajustement automatique en mode Edition" name="edit_camera_movement" tool_tip="Positionne automatiquement la caméra lors de l'entrée ou de la sortie du mode Edition."/>
+	<check_box label="Ajustement automatique en mode Edition d'apparence" name="appearance_camera_movement" tool_tip="Positionne automatiquement la caméra en mode Apparence de l'avatar."/>
+	<check_box bottom_delta="-18" label="Lever l&apos;avatar au reset de la caméra" left="148" name="unsit_on_camera_reset" tool_tip="L&#xE8;ve automatiquement l'avatar quand vous pressez ESC, ainsi la caméra permute en mode troisième personne" width="242"/>
+	<text name="text2">
+		Affichage de l'avatar:
+	</text>
+	<check_box label="Montrer l'avatar en vue subjective" name="first_person_avatar_visible"/>
+	<button label="Configuration du joystick" name="joystick_setup_button" width="175"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_network.xml b/indra/newview/skins/default/xui/fr/panel_preferences_network.xml
index b82f29882..3a7d51596 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_network.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_network.xml
@@ -1,23 +1,44 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Réseau" name="network">
-	<text length="1" name="text_box" type="string">
-		Bande passante maximale :
-	</text>
-	<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 :
-	</text>
-	<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"/>
-	<text name="cache_location_label">
-		Emplacement du cache :
-	</text>
-	<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>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Réseau" name="network">
+	<text name="text_box">
+		Bande passante maximale:
+	</text>
+	<text name="text_box2">
+		kbps (kilobits par seconde)
+	</text>
+	<text name="cache_size_label_l">
+		Taille de la mémoire cache:
+	</text>
+	<text name="text_box5">
+		Mo
+	</text>
+	<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="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"/>
+
+
+	<text bottom_delta="-24" height="10" left="12" name="socks5_auth_label">Proxy Http:</text>
+	<radio_group bottom_delta="-8" height="20" left="12" name="socks5_http_proxy_type" width="380" >
+		<radio_item left="100" name="None" width="50">aucun</radio_item>
+		<radio_item left="170" name="Socks" width="50">Socks</radio_item>
+		<radio_item left="250" name="Web" width="50">Web</radio_item>
+	</radio_group>
+	<check_box bottom_delta="-24" height="16" label="Activer SOCKS 5 Proxy" left="6" name="socks5_proxy_enabled" width="256"/>
+	<text bottom_delta="-26" height="10" left="12" name="socks5_host_label">H&#xF4;te Socks 5:</text>
+	<line_editor bottom_delta="-6" left="90" name="socks5_proxy_host" tool_tip="" width="311"/>
+	<spinner bottom_delta="-30" height="16" label="Numéro de port:" label_width="80" name="socks5_proxy_port" width="140"/>
+	<text bottom_delta="-20" height="10" left="12" name="socks5_auth_label2">Authentification:</text>
+	<radio_group bottom_delta="-6" name="socks5_auth" width="420">
+		<radio_item left_delta="80" name="None" tool_tip="">aucune</radio_item>
+		<radio_item left_delta="50" name="UserPass" tool_tip="">Nom/Mot de passe</radio_item>
+	</radio_group>
+	<text bottom_delta="-22" height="10" left="12" name="socks5_username_label">Nom:</text>
+	<line_editor bottom_delta="-8" left="90" name="socks5_proxy_username" width="311"/>
+	<text bottom_delta="-20" left="12" name="socks5_password_label">Mot de Passe:</text>
+	<line_editor bottom_delta="-8" left="90" name="socks5_proxy_password" width="311"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_popups.xml b/indra/newview/skins/default/xui/fr/panel_preferences_popups.xml
index a16895790..fa2cf677f 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_popups.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_popups.xml
@@ -1,25 +1,19 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Pop-ups" name="popups" title="Pop-ups">
-	<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 ce pop-up" name="enable_popup"/>
-	<text name="show_label">
-		Afficher ces pop-ups :
-	</text>
-	<button follows="top|left" height="20" label="Désactiver ce pop-up" left="15"
-	     name="skip_frst_btn"
-	     tool_tip=""
-	     width="175" />
-	<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 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>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Pop-ups" name="popups" title="Pop-ups">
+	<text name="dont_show_label">
+		Ne pas afficher ces pop-ups:
+	</text>
+	<button label="Activer ce pop-up" label_selected="Autoriser ce pop-up" name="enable_popup"/>
+	<button label="Activer tous les pop-ups" label_selected="Réinitialiser les dialogues 'Afficher la prochaine fois'" name="reset_dialogs_btn" tool_tip="Active tous les pop-ups et les notifications envoyées lors d'un premier usage." width="185"/>
+	<text name="show_label">
+		Afficher ces pop-ups:
+	</text>
+	<button label="Désactiver ce pop-up" left="15" name="skip_frst_btn" width="175"/>
+	<button label="Désactiver tous les pop-ups" name="skip_dialogs_btn" tool_tip="Désactive tous les pop-ups et les notifications envoyées lors d'un premier usage." width="185"/>
+	<text name="text_box2">
+		Offres de notes, textures et rep&#xE8;res:
+	</text>
+	<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'inventaire et sélectionner les objets reçus" name="show_in_inventory"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_skins.xml b/indra/newview/skins/default/xui/fr/panel_preferences_skins.xml
index 84463e5ac..7f54a0b90 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_skins.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_skins.xml
@@ -1,14 +1,35 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Thèmes" name="Skins panel">
-	<text name="muting_text">
-		Sélectionner un thème (redémarrage requis) :
-	</text>
-	<radio_group name="skin_selection">
-		<radio_item name="default">
-			Défaut
-		</radio_item>
-		<radio_item name="silver">
-			Argent
-		</radio_item>
-	</radio_group>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<!--
+<panel label="Th&#xE8;mes" name="Skins panel">
+	<text name="muting_text">
+		S&#xE9;lectionner un th&#xE8;me (red&#xE9;marrage requis) :
+	</text>
+	<radio_group name="skin_selection">
+		<radio_item name="default">
+			D&#xE9;faut
+		</radio_item>
+		<radio_item name="silver">
+			Argent
+		</radio_item>
+	</radio_group>
+</panel>
+-->
+<panel border="true" bottom="-409" height="408" label="Th&#xE8;mes" left="102" name="Skins panel" width="517">
+
+
+
+          <text bottom_delta="-20" follows="top" height="16" left="150" name="Skin_txt1">Choisir une Skin/Th&#xE8;me (red&#xE9;marrage requis)</text>
+          <combo_box bottom_delta="-20" left_delta="-50" follows="top" height="18" max_chars="200" name="custom_skin_combo" width="300" control_name="custom_skin_combo"/>
+          <text bottom_delta="-22" follows="top" height="16" left_delta="20" name="Skin_txt2">Primary Author</text>
+		<view_border blevel_style="in" bottom_delta="-18" follows="top" height="16" name="custom_box1" width="260"/>
+          <text bottom_delta="-0" follows="top" height="16" left_delta="3" name="custom_skin_author">skin author</text>
+          <text bottom_delta="-22" follows="top" height="16" left_delta="-3" name="Skin_txt3">Additional Authors</text>
+		<view_border blevel_style="in" bottom_delta="-18" follows="top" height="16" name="custom_box2" width="260"/>
+          <text bottom_delta="-0" follows="top" height="16" left_delta="3" name="custom_skin_ad_authors">additional skin authors</text>
+          <text bottom_delta="-22" follows="top" height="16" left_delta="-3" name="Skin_txt4">Skin folder</text>
+		<view_border blevel_style="in" bottom_delta="-18" follows="top" height="16" name="custom_box3" width="260"/>
+          <text bottom_delta="-0" follows="top" height="16" left_delta="3" name="custom_skin_folder">skin folder</text>
+  <button scale_image="true" image_selected="skin_thumbnail_default.png" image_unselected="skin_thumbnail_default.png" image_hover_selected="skin_thumbnail_default.png" image_hover_unselected="skin_thumbnail_default.png" bottom_delta="-150" default_image_name="None" follows="top" width="300" height="130" left_delta="-20" label="" name="custom_skin_preview" tool_tip="Skin Preview"/>
+          <text bottom_delta="-22" follows="top" height="16" left_delta="110" name="Skin_txt5">Additional info</text>
+		<text_editor bottom_delta="-100" enabled="false" follows="top" height="100" left_delta="-135" max_length="511" name="custom_skin_info" width="350" word_wrap="true"/>
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml b/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml
index 96b76941f..20c09a0ff 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_voice.xml
@@ -1,32 +1,30 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-409" height="408" label="Voice Chat" left="102" name="chat" width="517">
-	<text bottom_delta="-20" follows="left|top" left_delta="12" name="voice_unavailable">Le chat vocal n&apos;est pas disponible</text>
-	<check_box bottom_delta="0" follows="top" height="16" initial_value="false" label="Activer la voix" left="8" name="enable_voice_check"/>
-	<radio_group bottom_delta="-46" draw_border="false" follows="top" height="40" left_delta="20" name="ear_location" width="364">
-		<radio_item bottom="-19" height="16" left="3" name="0">Écouter depuis la position de la caméra.</radio_item>
-		<radio_item bottom="-35" height="16" name="1">Écouter depuis la position de l&apos;avatar.</radio_item>
-	</radio_group>
-	<text bottom_delta="-20" follows="top" height="16" name="push_to_talk_heading">Appuyer pour parler</text>
-	<text bottom_delta="-77" follows="top" height="65" left_delta="20" name="voice_chat_description">
-Ce mode vous permet de contrôler l&apos;ouverture du micro en mode bascule,
-cliquez sur la touche de contrôle ou le bouton Parler pour ouvrir et fermer le micro. 
-Si vous n&apos;êtes pas en mode bascule, le micro n&apos;est ouvert 
-que si vous cliquez et maintenez enfoncés la touche de contrôle ou le bouton Parler.
-	</text>
-	<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Utiliser Appuyer pour Parler en mode bascule" name="push_to_talk_toggle_check"/>
-	<text bottom_delta="-20" follows="top" height="16" left_delta="4" name="push_to_talk_label">Touche de contrôle :</text>
-	<line_editor bottom_delta="-20" follows="top" height="19" name="modifier_combo" width="280"/>
-	<button bottom_delta="-25" follows="top" height="20" label="Choisir la touche" name="set_voice_hotkey_button" width="115"/>
-	<button bottom_delta="0" follows="top" height="20" label="Molette de la souris" left_delta="120" name="set_voice_middlemouse_button" width="160"/>
-	<text bottom_delta="-25" follows="top" height="16" left="28" name="lip_sync_heading" width="445">Animation lèvres-parole</text>
-	<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Activer l&apos;animation des lèvres" left_delta="20" name="enable_lip_sync_check"/>
-	<text bottom_delta="-25" follows="top" height="16" left="28" name="privacy_heading">Options de confidentialité</text>
-	<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="N&apos;accepter que les appels de mes amis" left_delta="20" name="voice_call_friends_only_check"/>
-	<check_box bottom_delta="-18" follows="top" height="16" initial_value="false" label="Fermer le micro à la fin d&apos;un appel privé" name="auto_disengage_mic_check"/>
-	<button bottom_delta="-40" follows="top" height="20" label="Paramètres du matériel" left="28" mouse_opaque="true" name="device_settings_btn" width="155"/>
-	<text bottom_delta="-36" follows="top" height="35" left_delta="6" name="device_settings_text">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>
-</panel>
-
-
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel bottom="-409" height="408" label="Voice Chat" left="102" name="chat" width="517">
+	<text bottom_delta="-20" left_delta="12" name="voice_unavailable">Le chat vocal n'est pas disponible</text>
+	<check_box bottom_delta="0" label="Activer la voix" left="8" name="enable_voice_check"/>
+	<radio_group bottom_delta="-46" height="40" left_delta="20" name="ear_location" width="364">
+		<radio_item bottom="-19" left="3" name="0">Ecouter depuis la position de la caméra</radio_item>
+		<radio_item bottom="-35" name="1">Ecouter depuis la position de l'avatar</radio_item>
+	</radio_group>
+	<text bottom_delta="-20" name="push_to_talk_heading">Appuyer pour parler</text>
+	<text bottom_delta="-77" height="65" left_delta="20" name="voice_chat_description">
+Ce mode vous permet de contrôler l'ouverture du micro en mode bascule.
+Cliquez sur la touche de contrôle ou le bouton &#x22;Parler&#x22; pour ouvrir et fermer le micro. 
+Si vous n'êtes pas en mode bascule, le micro n'est ouvert que si vous cliquez et
+maintenez enfoncés la touche de contrôle ou appuyez sur le bouton &#x22;Parler&#x22;.
+	</text>
+	<check_box bottom_delta="-20" label="Utiliser &#x22;Appuyer pour Parler&#x22; en mode bascule" name="push_to_talk_toggle_check"/>
+	<text bottom_delta="-20" left_delta="4" name="push_to_talk_label">Touche de contrôle:</text>
+	<line_editor bottom_delta="-20" name="modifier_combo" width="280"/>
+	<button bottom_delta="-25" label="Choisir la touche" name="set_voice_hotkey_button" width="115"/>
+	<button bottom_delta="0" label="Molette de la souris" left_delta="120" name="set_voice_middlemouse_button" width="160"/>
+	<text bottom_delta="-25" left="28" name="lip_sync_heading" width="445">Animation en mode &#x22;voice&#x22;</text>
+	<check_box bottom_delta="-20" label="Activer l'animation des lèvres" left_delta="20" name="enable_lip_sync_check"/>
+	<text bottom_delta="-25" left="28" name="privacy_heading">Options de confidentialité</text>
+	<check_box bottom_delta="-20" label="N'accepter que les appels des amis" left_delta="20" name="voice_call_friends_only_check"/>
+	<check_box bottom_delta="-18" label="Fermer le micro à la fin d'un appel privé" name="auto_disengage_mic_check"/>
+	<button bottom_delta="-40" height="20" label="Paramètres du matériel" left="28" mouse_opaque="true" name="device_settings_btn" width="155"/>
+	<text bottom_delta="-36" height="35" left_delta="6" name="device_settings_text">Remarque : Si vous cliquez sur Paramètres du matériel,
+vous serez temporairement déconnecté(e) du Chat vocal.
+Tous les changements que vous faites seront immédiatement appliqués.</text>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_web.xml b/indra/newview/skins/default/xui/fr/panel_preferences_web.xml
index 47c401e2a..faf19dd49 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_web.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_web.xml
@@ -1,28 +1,26 @@
-<?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.">
-			Utiliser un navigateur web externe (Firefox, Safari, Internet Explorer)
+		<radio_item name="external" tool_tip="Utilisez le navigateur web du système pour l'aide, les liens web etc. Déconseillé en mode plein écran.">
+			Utiliser un navigateur web externe (Firefox, Safari, Opera, 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'aide, les liens etc. Ce navigateur s'ouvre dans une nouvelle fenêtre à l'intérieur de Singularity.">
 			Utiliser le navigateur web intégré
 		</radio_item>
 	</radio_group>
 	<text name="cache_size_label_l">
-		Cache du navigateur :
+		Cache du navigateur:
 	</text>
 	<button label="Vider" name="clear_cache"/>
 	<text name="cookie_label">
-		Cookies :
+		Cookies:
 	</text>
 	<check_box label="Accepter les cookies" name="cookies_enabled"/>
 	<text name="proxy_label">
-		Proxy web :
+		Proxy Web:
 	</text>
-	<check_box label="Activer le proxy web" name="web_proxy_enabled"/>
-	<text name="proxy_text_label">
-		Adresse :
-	</text>
-	<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"/>
+	<check_box label="Activer le Proxy Web" name="web_proxy_enabled"/>
+	<text bottom_delta="-25" follows="top" height="10" left="30" name="proxy_text_label">Adresse:</text>
+	<line_editor bottom_delta="-8" left="106" name="web_proxy_editor" tool_tip="Le nom ou adresse IP du proxy que vous souhaitez utiliser." width="300"/>
+	<spinner bottom_delta="-25" label="Numéro de port:" label_width="85" left="30" name="web_proxy_port" width="140"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
index f2ba297fd..861642295 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_covenant.xml
@@ -1,82 +1,81 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Règlement" name="Covenant">
-	<text name="estate_section_lbl">
-		Domaine :
-	</text>
-	<text bottom_delta="-19" name="estate_name_lbl">
-		Nom :
-	</text>
-	<text name="estate_name_text">
-		continent
-	</text>
-	<text bottom_delta="-19" name="estate_owner_lbl">
-		Propriétaire :
-	</text>
-	<text name="estate_owner_text">
-		(aucun)
-	</text>
-	<text name="estate_cov_lbl">
-		Règlement :
-	</text>
-	<text name="covenant_timestamp_text">
-		Dernière modification le mercredi 31 décembre 1969 16:00:00
-	</text>
-	<button label="?" name="covenant_help"/>
-	<text_editor bottom="-263" height="178" name="covenant_editor">
-		Il n&apos;y a aucun règlement pour ce domaine.
-	</text_editor>
-	<button label="Réinitialiser" name="reset_covenant"/>
-	<text name="covenant_help_text">
-		Les changements apportés au règlement apparaîtront sur toutes
-      les parcelles du domaine.
-	</text>
-	<text bottom_delta="-31" name="covenant_instructions">
-		Faire glisser une note pour changer le règlement de ce domaine.
-	</text>
-	<text name="region_section_lbl">
-		Région :
-	</text>
-	<text name="region_name_lbl">
-		Nom :
-	</text>
-	<text name="region_name_text">
-		leyla
-	</text>
-	<text name="region_landtype_lbl">
-		Type :
-	</text>
-	<text name="region_landtype_text">
-		Continent / Homestead
-	</text>
-	<text name="region_maturity_lbl">
-		Catégorie :
-	</text>
-	<text name="region_maturity_text">
-		Adult
-	</text>
-	<text name="resellable_lbl">
-		Revendre :
-	</text>
-	<text name="resellable_clause">
-		Le terrain dans cette région ne peut être revendu.
-	</text>
-	<text name="changeable_lbl">
-		Sous-diviser :
-	</text>
-	<text name="changeable_clause">
-		Le terrain dans cette région ne peut être fusionné/divisé.
-	</text>
-	<string name="can_resell">
-		Le terrain acheté dans cette région peut être revendu.
-	</string>
-	<string name="can_not_resell">
-		Le terrain acheté dans cette région ne peut pas être revendu.
-	</string>
-	<string name="can_change">
-		Le terrain acheté dans cette région peut être fusionné ou divisé.
-	</string>
-	<string name="can_not_change">
-		Le terrain acheté dans cette région ne peut pas être fusionné ou
-divisé.
-	</string>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Règlement" name="Covenant">
+	<text name="estate_section_lbl">
+		Domaine:
+	</text>
+	<text bottom_delta="-19" name="estate_name_lbl">
+		Nom:
+	</text>
+	<text name="estate_name_text">
+		continent
+	</text>
+	<text bottom_delta="-19" name="estate_owner_lbl">
+		Propriétaire:
+	</text>
+	<text name="estate_owner_text">
+		(aucun)
+	</text>
+	<text name="estate_cov_lbl">
+		Règlement:
+	</text>
+	<text name="covenant_timestamp_text">
+		Dernière modification le mercredi 31 décembre 1969 16:00:00
+	</text>
+	<button label="?" name="covenant_help"/>
+	<text_editor bottom="-263" height="178" name="covenant_editor">
+		Il n'y a aucun règlement pour ce domaine.
+	</text_editor>
+	<button label="Réinitialiser" name="reset_covenant"/>
+	<text name="covenant_help_text">
+		Les changements apportés au règlement apparaîtront sur toutes
+    les parcelles du domaine.
+	</text>
+	<text bottom_delta="-31" name="covenant_instructions">
+		Faire glisser une note pour changer le règlement de ce domaine.
+	</text>
+	<text name="region_section_lbl">
+		Région:
+	</text>
+	<text name="region_name_lbl">
+		Nom:
+	</text>
+	<text name="region_name_text">
+		leyla
+	</text>
+	<text name="region_landtype_lbl">
+		Type:
+	</text>
+	<text name="region_landtype_text">
+		Continent / Homestead
+	</text>
+	<text name="region_maturity_lbl">
+		Catégorie:
+	</text>
+	<text name="region_maturity_text">
+		Adulte
+	</text>
+	<text name="resellable_lbl">
+		Revendre:
+	</text>
+	<text name="resellable_clause">
+		Le terrain dans cette région ne peut être revendu.
+	</text>
+	<text name="changeable_lbl">
+		Sous-diviser:
+	</text>
+	<text name="changeable_clause">
+		Le terrain dans cette région ne peut être fusionné/divisé.
+	</text>
+	<string name="can_resell">
+		Le terrain acheté dans cette région peut être revendu.
+	</string>
+	<string name="can_not_resell">
+		Le terrain acheté dans cette région ne peut pas être revendu.
+	</string>
+	<string name="can_change">
+		Le terrain acheté dans cette région peut être fusionné ou divisé.
+	</string>
+	<string name="can_not_change">
+		Le terrain acheté dans cette région ne peut pas être fusionné ou divisé.
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_debug.xml b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
index 1338ab9e7..c23a9d755 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_debug.xml
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Débugger" name="Debug">
-	<text name="region_text_lbl">
-		Région :
-	</text>
-	<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 la physique" name="disable_physics_check" tool_tip="Désactiver tous les effets liés à la physique 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"/>
-	<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 collisions les plus consommatrices..." 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 scriptés les plus consommateurs..." 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>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Débugger" name="Debug">
+	<text name="region_text_lbl">
+		Région :
+	</text>
+	<text name="region_text">
+		(inconnue)
+	</text>
+	<check_box label="Désactiver les scripts" name="disable_scripts_check" tool_tip="Désactive 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ésactive les collisions entre non-avatars dans cette région"/>
+	<button label="?" name="disable_collisions_help"/>
+	<check_box label="Désactiver la physique" name="disable_physics_check" tool_tip="Désactive tous les effets liés à la physique 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'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"/>
+	<text name="options_text_lbl">
+		Options:
+	</text>
+	<check_box label="Ne renvoyer que les objets avec des scripts" name="return_scripts" tool_tip=""/>
+	<check_box label="Ne renvoyer que les objets sur le terrain de quelqu&apos;un d&apos;autre" name="return_other_land" tool_tip=""/>
+	<check_box label="Renvoyer les objets dans toutes les régions de ce domaine" name="return_estate_wide" tool_tip=""/>
+	<button label="Renvoyer" name="return_btn"/>
+	<button label="Afficher les collisions les plus consommatrices" 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 scriptés les plus consommateurs" 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émarre 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="Retarde le redémarrage de la région d'une heure" width="160"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_estate.xml b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
index 425f27379..d9b1d6021 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_estate.xml
@@ -1,78 +1,78 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Domaine" name="Estate">
-	<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" bottom_delta="-34">
-		Domaine :
-	</text>
-	<text name="estate_name">
-		(inconnu)
-	</text>
-	<text name="owner_text">
-		Propriétaire :
-	</text>
-	<text name="estate_owner">
-		(inconnu)
-	</text>
-	<text name="Only Allow">
-		Limiter l&apos;accès aux résidents qui :
-	</text>
-	<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"/>
-	<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"/>
-	<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"/>
-	<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"/>
-	<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"/>
-	<text name="ban_resident_label">
-		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="Éjecter le résident du domaine..." name="kick_user_from_estate_btn"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Domaine" name="Estate">
+	<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" bottom_delta="-34">
+		Domaine :
+	</text>
+	<text name="estate_name">
+		(inconnu)
+	</text>
+	<text name="owner_text">
+		Propriétaire :
+	</text>
+	<text name="estate_owner">
+		(inconnu)
+	</text>
+	<text name="Only Allow">
+		Limiter l'accès aux résidents qui:
+	</text>
+	<check_box label="Ont enregistré leurs infos de paiement" name="limit_payment" tool_tip="Bannit les résidents non identifés."/>
+	<check_box label="Ont fait vérifier leur âge" name="limit_age_verified" tool_tip="Bannit les résidents dont l'âge n'a pas été vérifié. Pour plus d'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'infraction:
+	</text>
+	<string name="email_unsupported">
+		Non pris en charge
+	</string>
+	<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'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'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"/>
+	<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"/>
+	<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"/>
+	<text name="ban_resident_label">
+		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="Éjecter le résident du domaine" name="kick_user_from_estate_btn"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_general.xml b/indra/newview/skins/default/xui/fr/panel_region_general.xml
index 6a8afd24e..d5efbeec8 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_general.xml
@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Région" name="General">
-	<text name="region_text_lbl">
-		Région :
-	</text>
-	<text name="region_text">
-		(inconnue)
-	</text>
-	<text name="version_channel_text_lbl">
-		Version :
-	</text>
-	<text name="version_channel_text">
-		(inconnu)
-	</text>
-	<text name="region_type_lbl">
-		Type :
-	</text>
-	<text name="region_type">
-		(inconnu)
-	</text>
-	<check_box label="Interdire 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 maximum d&apos;avatars" label_width="127" name="agent_limit_spin" width="190"/>
-	<button label="?" name="agent_limit_help"/>
-	<spinner label="Bonus objet" label_width="127" name="object_bonus_spin" width="190"/>
-	<button label="?" name="object_bonus_help"/>
-	<text label="Maturité" name="access_text">
-		Catégorie :
-	</text>
-	<combo_box label="Mature" name="access_combo">
-		<combo_item name="Adult">
-			Adult
-		</combo_item>
-		<combo_item name="Mature">
-			Mature
-		</combo_item>
-		<combo_item name="PG">
-			PG
-		</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"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel label="Région" name="General">
+	<text name="region_text_lbl">
+		Région :
+	</text>
+	<text name="region_text">
+		(inconnue)
+	</text>
+	<text name="version_channel_text_lbl">
+		Version :
+	</text>
+	<text name="version_channel_text">
+		(inconnu)
+	</text>
+	<text name="region_type_lbl">
+		Type :
+	</text>
+	<text name="region_type">
+		(inconnu)
+	</text>
+	<check_box label="Interdire 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="Affiche cette région et ses parcelles dans les résultats de recherche"/>
+	<button label="?" name="parcel_search_help"/>
+	<spinner label="Nombre max d&apos;avatars" label_width="127" name="agent_limit_spin" width="190"/>
+	<button label="?" name="agent_limit_help"/>
+	<spinner label="Bonus objet" label_width="127" name="object_bonus_spin" width="190"/>
+	<button label="?" name="object_bonus_help"/>
+	<text label="Maturité" name="access_text">
+		Catégorie :
+	</text>
+	<combo_box label="Mature" name="access_combo">
+		<combo_item name="Adult">
+			Adulte
+		</combo_item>
+		<combo_item name="Mature">
+			Mature
+		</combo_item>
+		<combo_item name="PG">
+			PG
+		</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"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
index 4d7652eb6..fc09ad14e 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_terrain.xml
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel label="Terrain" name="Terrain">
-	<text name="region_text_lbl">
-		Région :
-	</text>
-	<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 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>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Terrain" name="Terrain">
+	<text name="region_text_lbl">
+		Région:
+	</text>
+	<text name="region_text">
+		(inconnue)
+	</text>
+	<spinner label="Niveau de l'eau" name="water_height_spin"/>
+	<button label="?" name="water_height_help"/>
+	<spinner label="Limite d'élévation du &#10;terrain" name="terrain_raise_spin"/>
+	<button label="?" name="terrain_raise_help"/>
+	<spinner label="Limite d'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 du 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'élévation/abaissement"/>
+	<button label="?" name="bake_terrain_help"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_region_texture.xml b/indra/newview/skins/default/xui/fr/panel_region_texture.xml
index d31264678..ce86cda47 100644
--- a/indra/newview/skins/default/xui/fr/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/fr/panel_region_texture.xml
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Textures du sol" name="Textures">
-	<text name="region_text_lbl">
-		Région :
-	</text>
-	<text name="region_text">
-		(inconnue)
-	</text>
-	<text name="base_texture_text">
-		Textures de base (fichiers 128x128, 24 bit .tga)
-	</text>
-	<text name="height_text_lbl">
-		1 (faible)
-	</text>
-	<text name="height_text_lbl2">
-		2
-	</text>
-	<text name="height_text_lbl3">
-		3
-	</text>
-	<text name="height_text_lbl4">
-		4 (élevé)
-	</text>
-	<text name="detail_texture_text">
-		Textures du terrain (fichiers.tga 512 x 512, 24 bit requis)
-	</text>
-	<text name="height_text_lbl5">
-		Limites d&apos;élévation de texture
-	</text>
-	<text name="height_text_lbl6">
-		Sud-ouest
-	</text>
-	<text name="height_text_lbl7">
-		Nord-ouest
-	</text>
-	<text name="height_text_lbl8">
-		Sud-est
-	</text>
-	<text name="height_text_lbl9">
-		Nord-est
-	</text>
-	<text name="height_text_lbl10">
-		Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
-	</text>
-	<text name="height_text_lbl11">
-		En mètres, la valeur Bas correspond à la hauteur maximum de la texture n°1
-	</text>
-	<text name="height_text_lbl12">
-		et la valeur Haut correspond à la hauteur minimum de la texture n°4.
-	</text>
-	<text name="height_text_lbl13">
-		Nord-est
-	</text>
-	<spinner label="Bas" name="height_start_spin_0" />
-	<spinner label="Bas" name="height_start_spin_1" />
-	<spinner label="Bas" name="height_start_spin_2" />
-	<spinner label="Bas" name="height_start_spin_3" />
-	<spinner label="Haut" name="height_range_spin_0" />
-	<spinner label="Haut" name="height_range_spin_1" />
-	<spinner label="Haut" name="height_range_spin_2" />
-	<spinner label="Haut" name="height_range_spin_3" />
-	<text name="height_text_lbl14">
-		Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
-	</text>
-	<text name="height_text_lbl15">
-		En mètres, la valeur BASSE correspond à la hauteur MAXIMUM de la Texture #1,
-	</text>
-	<text name="height_text_lbl16">
-		et la valeur HAUTE correspond à la hauteur MINIMUM de la Texture #4.
-	</text>
-	<button label="Appliquer" name="apply_btn" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel label="Textures du sol" name="Textures">
+	<text name="region_text_lbl">
+		Région :
+	</text>
+	<text name="region_text">
+		(inconnue)
+	</text>
+	<text name="base_texture_text">
+		Textures de base (fichiers 128x128, 24 bits .tga)
+	</text>
+	<text name="height_text_lbl">
+		1 (faible)
+	</text>
+	<text name="height_text_lbl2">
+		2
+	</text>
+	<text name="height_text_lbl3">
+		3
+	</text>
+	<text name="height_text_lbl4">
+		4 (élevé)
+	</text>
+	<text name="detail_texture_text">
+		Textures du terrain (fichiers.tga 512 x 512, 24 bits requis)
+	</text>
+	<text name="height_text_lbl5">
+		Limites d&apos;élévation de texture
+	</text>
+	<text name="height_text_lbl6">
+		Sud-ouest
+	</text>
+	<text name="height_text_lbl7">
+		Nord-ouest
+	</text>
+	<text name="height_text_lbl8">
+		Sud-est
+	</text>
+	<text name="height_text_lbl9">
+		Nord-est
+	</text>
+	<text name="height_text_lbl10">
+		Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
+	</text>
+	<text name="height_text_lbl11">
+		En mètres, la valeur Bas correspond à la hauteur maximum de la texture n°1
+	</text>
+	<text name="height_text_lbl12">
+		et la valeur Haut correspond à la hauteur minimum de la texture n°4.
+	</text>
+	<text name="height_text_lbl13">
+		Nord-est
+	</text>
+	<spinner label="Bas" name="height_start_spin_0" />
+	<spinner label="Bas" name="height_start_spin_1" />
+	<spinner label="Bas" name="height_start_spin_2" />
+	<spinner label="Bas" name="height_start_spin_3" />
+	<spinner label="Haut" name="height_range_spin_0" />
+	<spinner label="Haut" name="height_range_spin_1" />
+	<spinner label="Haut" name="height_range_spin_2" />
+	<spinner label="Haut" name="height_range_spin_3" />
+	<text name="height_text_lbl14">
+		Ces valeurs représentent les limites de mélange pour les textures ci-dessus.
+	</text>
+	<text name="height_text_lbl15">
+		En mètres, la valeur BASSE correspond à la hauteur MAXIMUM de la Texture #1,
+	</text>
+	<text name="height_text_lbl16">
+		et la valeur HAUTE correspond à la hauteur MINIMUM de la Texture #4.
+	</text>
+	<button label="Appliquer" name="apply_btn" />
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml b/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
index a6ec93bef..722295f6c 100644
--- a/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/fr/panel_scrolling_param.xml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="LLScrollingPanelParam">
-	<text type="string" length="1" name="Loading...">
-		Chargement...
-	</text>
-	<text type="string" length="1" name="Loading...2">
-		Chargement...
-	</text>
-	<button label="" label_selected="" name="less" />
-	<button label="" label_selected="" name="more" />
-	<slider label="[DESC]" name="param slider" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="LLScrollingPanelParam">
+	<text type="string" length="1" name="Loading...">
+		Chargement...
+	</text>
+	<text type="string" length="1" name="Loading...2">
+		Chargement...
+	</text>
+	<button label="" label_selected="" name="less" />
+	<button label="" label_selected="" name="more" />
+	<slider label="[DESC]" name="param slider" />
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_speaker_controls.xml b/indra/newview/skins/default/xui/fr/panel_speaker_controls.xml
index 125fb1eda..f5274a82c 100644
--- a/indra/newview/skins/default/xui/fr/panel_speaker_controls.xml
+++ b/indra/newview/skins/default/xui/fr/panel_speaker_controls.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="active_speakers_panel">
-	<string name="moderator_label">
-		(Modérateur)
-	</string>
-	<layout_stack name="panels">
-		<layout_panel name="moderation_mode_panel">
-			<combo_box name="moderation_mode">
-				<combo_item name="OpenVoice">
-					Voix activées par défaut
-				</combo_item>
-				<combo_item name="ModeratedVoice">
-					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"/>
-			</scroll_list>
-			<panel name="speaker_controls">
-				<text name="resident_name">
-					Rumplstiltskin Califragilistic
-				</text>
-				<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">
-			<text name="moderator_controls_label">
-				Commandes de modération :
-			</text>
-			<check_box name="moderator_allow_voice">
-				Autoriser les chats vocaux
-			</check_box>
-			<check_box name="moderator_allow_text">
-				Autoriser les chats écrits
-			</check_box>
-		</layout_panel>
-	</layout_stack>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="active_speakers_panel">
+	<string name="moderator_label">
+		(Modérateur)
+	</string>
+	<layout_stack name="panels">
+		<layout_panel name="moderation_mode_panel">
+			<combo_box name="moderation_mode">
+				<combo_item name="OpenVoice">
+					Voix activée par défaut
+				</combo_item>
+				<combo_item name="ModeratedVoice">
+					Voix désactivée 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"/>
+			</scroll_list>
+			<panel name="speaker_controls">
+				<text name="resident_name">
+					Rumplstiltskin Califragilistic
+				</text>
+				<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">
+			<text name="moderator_controls_label">
+				Modération :
+			</text>
+			<check_box name="moderator_allow_voice">
+				Autoriser le chat vocal
+			</check_box>
+			<check_box name="moderator_allow_text">
+				Autoriser le chat écrit
+			</check_box>
+		</layout_panel>
+	</layout_stack>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_status_bar.xml b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
index 2e4c694ef..eef212fc8 100644
--- a/indra/newview/skins/default/xui/fr/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_status_bar.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="status">
-	<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 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 length="12" name="TimeText" tool_tip="Heure actuelle (Californie)" type="string">
-		midi
-	</text>
-	<string name="StatBarDaysOfWeek">
-		Sunday:Monday:Tuesday:Wednesday:Thursday:Friday:Saturday
-	</string>
-	<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 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="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>
-	<text name="bandwidth_tooltip">
-		Bande passante
-	</text>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<panel name="status">
+	<text name="ParcelNameText" tool_tip="Nom de la parcelle de terrain sur laquelle vous vous trouvez. Cliquez pour ouvrir la section &#x22;A propos du terrain&#x22;.">
+		Saisir le nom de la parcelle ici:
+	</text>
+	<text name="BalanceText" tool_tip="Solde du compte">
+		Chargement
+	</text>
+	<button name="buycurrency" tool_tip="Acheter des devises"/>
+	<text name="TimeText" tool_tip="Heure actuelle (Californie)">
+		midi
+	</text>
+	<string name="StatBarDaysOfWeek">
+		Dimanche:Lundi:Mardi:Mercredi:Jeudi:Vendredi:Samedi
+	</string>
+	<string name="StatBarMonthsOfYear">
+		Janvier:Février:Mars:Avril:Mai:Juin:Juillet:Août:Septembre:Octobre:Novembre:Décembre
+	</string>
+	<button name="scriptout" tool_tip="Alertes et erreurs de scripts"/>
+	<button name="health" tool_tip="Santé"/>
+	<text name="HealthText" tool_tip="Santé">
+		100%
+	</text>
+	<button name="fly" tool_tip="Vol interdit"/>
+	<button name="build" tool_tip="Construction interdite"/>
+	<button 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 name="restrictpush" tool_tip="Pas de bousculades"/>
+	<button name="status_no_voice" tool_tip="Voix non disponible ici"/>
+	<button 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"/>
+	<string name="packet_loss_tooltip">
+		Perte de paquets
+	</string>
+	<string name="bandwidth_tooltip">
+		Bande passante
+	</string>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_toolbar.xml b/indra/newview/skins/default/xui/fr/panel_toolbar.xml
index 80adabf48..5f35d29c5 100644
--- a/indra/newview/skins/default/xui/fr/panel_toolbar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_toolbar.xml
@@ -1,17 +1,17 @@
-<?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="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>
+<?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="Affiche la barre de chat.(Entrée)"/>
+		<flyout_button label="Communiquer" name="communicate_btn" tool_tip="Communiquez (valable pour les amis et groupes."/>
+		<button label="Voler" label_selected="Atterrir" name="fly_btn" tool_tip="Commencez à voler. Utilisez E/C ou PgHaut/PgBas 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 locale. (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/indra/newview/skins/default/xui/fr/panel_top_pick.xml b/indra/newview/skins/default/xui/fr/panel_top_pick.xml
index 4dfefb44b..90d2d62ed 100644
--- a/indra/newview/skins/default/xui/fr/panel_top_pick.xml
+++ b/indra/newview/skins/default/xui/fr/panel_top_pick.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="Pick" title="Choisir">
-	<button label="Définir" name="set_location_btn" />
-	<button label="Téléporter" name="pick_teleport_btn" />
-	<button label="Voir sur la carte" name="pick_map_btn" />
-	<text name="sort_order_text">
-		Trier :
-	</text>
-	<check_box label="Activé" name="enabled_check" />
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel name="Pick" title="Choisir">
+	<button label="Définir" name="set_location_btn" />
+	<button label="Téléporter" name="pick_teleport_btn" />
+	<button label="Voir sur la carte" name="pick_map_btn" />
+	<text name="sort_order_text">
+		Trier:
+	</text>
+	<check_box label="Activé" name="enabled_check" />
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_voice_controls.xml b/indra/newview/skins/default/xui/fr/panel_voice_controls.xml
index 628d64330..935d97b3a 100644
--- a/indra/newview/skins/default/xui/fr/panel_voice_controls.xml
+++ b/indra/newview/skins/default/xui/fr/panel_voice_controls.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<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="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 le petit cadenas pour laisser le micro constamment ouvert ou le fermer" />
-	<icon name="voice_volume" left_delta="50" />
-	<button name="show_channel" tool_tip="Cliquez pour afficher le canal vocal utilisé" left_delta="20"/>
-</panel>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<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="Affiche 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 le petit cadenas pour laisser le micro constamment ouvert ou fermé." />
+	<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/indra/newview/skins/default/xui/fr/panel_voice_enable.xml b/indra/newview/skins/default/xui/fr/panel_voice_enable.xml
index 97c477074..f585388c0 100644
--- a/indra/newview/skins/default/xui/fr/panel_voice_enable.xml
+++ b/indra/newview/skins/default/xui/fr/panel_voice_enable.xml
@@ -1,23 +1,23 @@
-<?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 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 ?
-	</text_editor>
-	<radio_group name="voice_enable">
-		<radio_item name="1">
-			Oui, continuer à utiliser le chat vocal.
-		</radio_item>
-		<radio_item name="0">
-			Non, désactiver le chat vocal.
-		</radio_item>
-	</radio_group>
-	<text_editor name="voice_intro_text3">
-		Vous pouvez activer le chat vocal à tout moment à partir de l&apos;onglet Chat Vocal, sous Préférences.
-	</text_editor>
-	<text_editor name="voice_intro_text4">
-		Pour configurer vos préférences de chat, cliquez sur le bouton Suivant. Pour continuer sur Second Life, cliquez sur Finir.
-	</text_editor>
-</panel>
+<?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 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 ?
+	</text_editor>
+	<radio_group name="voice_enable">
+		<radio_item name="1">
+			Oui, continuer à utiliser le chat vocal.
+		</radio_item>
+		<radio_item name="0">
+			Non, désactiver le chat vocal.
+		</radio_item>
+	</radio_group>
+	<text_editor name="voice_intro_text3">
+		Vous pouvez activer le chat vocal à tout moment à partir de l&apos;onglet Chat Vocal, sous Préférences.
+	</text_editor>
+	<text_editor name="voice_intro_text4">
+		Pour configurer vos préférences de chat, cliquez sur le bouton Suivant. Pour continuer sur Second Life, cliquez sur Finir.
+	</text_editor>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_voice_options.xml b/indra/newview/skins/default/xui/fr/panel_voice_options.xml
index be3331e2a..ed5413821 100644
--- a/indra/newview/skins/default/xui/fr/panel_voice_options.xml
+++ b/indra/newview/skins/default/xui/fr/panel_voice_options.xml
@@ -1,21 +1,21 @@
-<?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.
-	</text_editor>
-	<radio_group name="ear_location">
-		<radio_item name="0">
-			Écouter depuis la position de la caméra.
-		</radio_item>
-		<radio_item name="1">
-			É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="Attribuer une touche de contrôle" name="push_to_talk_toggle_check"/>
-	<text name="push_to_talk_label">
-		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"/>
-</panel>
+<?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 :
+	</text_editor>
+	<radio_group name="ear_location">
+		<radio_item name="0">
+			Écouter depuis la position de la caméra
+		</radio_item>
+		<radio_item name="1">
+			Écouter depuis la position de l&apos;avatar
+		</radio_item>
+	</radio_group>
+	<check_box label="N&apos;autoriser que mes ami(e)s à 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">
+		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"/>
+</panel>
diff --git a/indra/newview/skins/default/xui/fr/panel_voice_remote.xml b/indra/newview/skins/default/xui/fr/panel_voice_remote.xml
index 3c9776c5a..96e3032d5 100644
--- a/indra/newview/skins/default/xui/fr/panel_voice_remote.xml
+++ b/indra/newview/skins/default/xui/fr/panel_voice_remote.xml
@@ -1,5 +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>
+<?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/indra/newview/skins/default/xui/fr/panel_voice_remote_expanded.xml b/indra/newview/skins/default/xui/fr/panel_voice_remote_expanded.xml
index 83efac4db..c466bca72 100644
--- a/indra/newview/skins/default/xui/fr/panel_voice_remote_expanded.xml
+++ b/indra/newview/skins/default/xui/fr/panel_voice_remote_expanded.xml
@@ -1,5 +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>
+<?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/indra/newview/skins/default/xui/fr/role_actions.xml b/indra/newview/skins/default/xui/fr/role_actions.xml
index a2df59677..529a03d0d 100644
--- a/indra/newview/skins/default/xui/fr/role_actions.xml
+++ b/indra/newview/skins/default/xui/fr/role_actions.xml
@@ -1,201 +1,201 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<role_actions>
-	<action_set
-	     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 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 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="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, 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 &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 &gt; Rôles."
-		     name="role delete" value="5" />
-		<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="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="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 à 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="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 le profil public du groupe, sa charte et son logo."
-	     name="Group Identity">
-		<action
-		     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 groupe. Pour accéder au menu À propos du terrain, cliquez sur le nom de la parcelle en haut de l&apos;écran ou cliquez-droit sur le sol."
-	     name="Parcel Management">
-		<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="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="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-droit 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, son référencement dans la recherche et le lieu de téléportation."
-	     name="Parcel Identity">
-		<action
-		     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, 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 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 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 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="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="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 du groupe."
-	     name="Parcel Powers">
-		<action description="Toujours autoriser Modifier le terrain"
-		     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="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="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="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 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 du groupe et de geler ou d&apos;expulser des résidents."
-	     name="Parcel Access">
-		<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 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="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"
-		     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 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 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 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 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="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 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 au groupe à partir du menu Construire &gt; Modifier &gt; Général."
-		     name="object deed" value="36" />
-		<action
-		     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="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="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="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="Envoyez, recevez et consultez les notices du groupe."
-	     name="Notices">
-		<action description="Envoyer des notices"
-		     longdescription="Envoyez des notices à l&apos;onglet Notices."
-		     name="notices send" value="42" />
-		<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 du menu Profil du groupe &gt; Propositions."
-		     name="proposal start" value="44" />
-		<action description="Voter les 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 de gérer l&apos;accès aux sessions de chat écrit ou vocal du groupe."
-	     name="Chat">
-		<action description="Participer aux chats"
-		     longdescription="Participez aux chats du groupe."
-		     name="join group chat" />
-		<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 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>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<role_actions>
+	<action_set
+	     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 groupe en utilisant le bouton &#x22;Inviter un nouveau membre&#x22; à partir de l&apos;onglet Membres et rôles &gt; Membres."
+		     name="member invite" value="1" />
+		<action description="Expulser des membres du groupe"
+		     longdescription="Expulsez des membres de ce groupe en utilisant le bouton &#x22;Expulser un membre&#x22; à 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="Gérer l&apos;inscription et les frais d&apos;inscription"
+		     longdescription="Choississez l&apos;inscription libre permettant aux nouveaux membres de rejoindre le groupe sans invitation. 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, 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 &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 &gt; Rôles."
+		     name="role delete" value="5" />
+		<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="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="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 à 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="Modifier les pouvoirs d&apos;un rôle"
+		     longdescription="Attribuez et retire 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 le profil public du groupe, sa charte et son logo."
+	     name="Group Identity">
+		<action
+		     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 dans 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 groupe. Pour accéder au menu À propos du terrain, cliquez sur le nom de la parcelle en haut de l&apos;écran ou cliquez-droit sur le sol."
+	     name="Parcel Management">
+		<action description="Transférer et acheter des parcelles pour le groupe"
+		     longdescription="Transférez et achetez des parcelles pour le groupe à partir du menu A propos du terrain &gt; Général."
+		     name="land deed" value="12" />
+		<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="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-droit 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, son référencement dans la recherche et le lieu de téléportation."
+	     name="Parcel Identity">
+		<action
+		     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, 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 des téléportations"
+		     longdescription="Définissez le lieu d&apos;arrivée des téléportations et le routage à partir du menu A propos du terrain &gt; Options."
+		     name="land set landing point" value="19" />
+	</action_set>
+	<action_set
+	     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 la musique et les médias"
+		     longdescription="Changez la musique et les médias à partir du menu A propos du terrain &gt; Médias."
+		     name="land change media" value="20" />
+		<action description="Changer l&apos;option Modifier le terrain"
+		     longdescription="Changez l&apos;option Modifier le terrain à partir du menu A 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="Changer diverses options du terrain"
+		     longdescription="Changez diverses options de la parcelle à partir du menu A 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 du groupe."
+	     name="Parcel Powers">
+		<action description="Toujours autoriser Modifier le terrain"
+		     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="Vous pouvez voler sur une parcelle du groupe, même si l&apos;option est désactivée à partir du menu A propos du terrain &gt; Options."
+		     name="land allow fly" value="24" />
+		<action description="Toujours autoriser à créer des objets"
+		     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="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 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 du groupe et de geler ou d&apos;expulser des résidents."
+	     name="Parcel Access">
+		<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 A propos du terrain &gt; Accès."
+		     name="land manage allowed" value="29" />
+		<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 A propos du terrain &gt; Interdire."
+		     name="land manage banned" value="30" />
+		<action description="Vendre des pass"
+		     longdescription="Choisissez le prix et la durée des pass pour accéder à la parcelle à partir du menu A propos du terrain &gt; Accès."
+		     name="land manage passes" value="31" />
+		<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 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 transférés au groupe"
+		     longdescription="Vous pouvez renvoyer des objets appartenant au groupe à partir du menu A 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 du groupe à partir du menu A 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 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="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 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 au groupe à partir du menu Construire &gt; Modifier &gt; Général."
+		     name="object deed" value="36" />
+		<action
+		     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="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="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="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="Envoyez, recevez et consultez les notices du groupe."
+	     name="Notices">
+		<action description="Envoyer des notices"
+		     longdescription="Envoyez des notices à l&apos;onglet Notices."
+		     name="notices send" value="42" />
+		<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 du menu Profil du groupe &gt; Propositions."
+		     name="proposal start" value="44" />
+		<action description="Voter les 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 de gérer l&apos;accès aux sessions de chat écrit ou vocal du groupe."
+	     name="Chat">
+		<action description="Participer aux chats"
+		     longdescription="Participez aux chats du groupe."
+		     name="join group chat" />
+		<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 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/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml
index ef7fb8d30..37e4db0d6 100644
--- a/indra/newview/skins/default/xui/fr/strings.xml
+++ b/indra/newview/skins/default/xui/fr/strings.xml
@@ -1,749 +1,458 @@
-<?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 do not 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="hippo_label_free">gratuit</string>
-	<string name="hippo_label_week">semaine</string>
-	<string name="ProgressRestoring">
-		Restauration...
-	</string>
-	<string name="ProgressChangingResolution">
-		Changement de la résolution...
-	</string>
-	<string name="LoginInProgress">
-		La connexion à [APP_NAME] apparaît peut-être comme étant gelée. Veuillez patienter.
-	</string>
-	<string name="LoginAuthenticating">
-		Authentification en cours
-	</string>
-	<string name="LoginMaintenance">
-		Maintenance du compte en cours…
-	</string>
-	<string name="LoginAttempt">
-		La tentative de connexion précédente a échoué. Connexion, esssai [NUMBER]
-	</string>
-	<string name="LoginPrecaching">
-		Monde en cours de chargement PATIENCE…
-	</string>
-	<string name="LoginInitializingBrowser">
-		Navigateur Web incorporé en cours d&apos;initialisation…
-	</string>
-	<string name="LoginInitializingMultimedia">
-		Multimédia en cours d&apos;initialisation. Aimez vous Brahms ?…
-	</string>
-	<string name="LoginVerifyingCache">
-		Fichiers du cache en cours de vérification (peut prendre 60-90 s)ou pire...
-	</string>
-	<string name="LoginProcessingResponse">
-		Réponse en cours de traitement…
-	</string>
-	<string name="LoginInitializingWorld">
-		Monde en cours d&apos;initialisation…
-	</string>
-	<string name="LoginDecodingImages">
-		Décodage des images en cours, croisons les doigts...
-	</string>
-	<string name="LoginInitializingQuicktime">
-		Quicktime en cours d&apos;initialisation
-	</string>
-	<string name="LoginQuicktimeNotFound">
-		Quicktime introuvable, impossible de procéder à l&apos;initialisation.
-	</string>
-	<string name="LoginQuicktimeOK">
-		Initialisation de Quicktime réussie.
-	</string>
-	<string name="LoginWaitingForRegionHandshake">
-		Liaison avec la région en cours de création...
-	</string>
-	<string name="LoginConnectingToRegion">
-		Connexion avec la région en cours, avec un peu de chance ...
-	</string>
-	<string name="LoginDownloadingClothing">
-	<string name="Quit">
-		Quitter
-	</string>
-		Habits en cours de téléchargement, espérons le, vais je encore être tout(e) nu(e) ?
-	</string>
-	<string name="AgentLostConnection">
-		Il y a peut-être des problèmes techniques dans cette region. Veuillez vérifier votre connexion Internet.
-	</string>
-	<string name="YouHaveBeenDisconnected">
-		Vous avez été déconnecté de la région où vous étiez.
-	</string>
-	<string name="TooltipPerson">
-		Personne
-	</string>
-	<string name="TooltipNoName">
-		(pas de nom)
-	</string>
-	<string name="TooltipOwner">
-		Propriétaire :
-	</string>
-	<string name="TooltipPublic">
-		Public
-	</string>
-	<string name="TooltipIsGroup">
-		(Groupe)
-	</string>
-	<string name="TooltipFlagScript">
-		Script
-	</string>
-	<string name="TooltipFlagPhysics">
-		Propriétés physique
-	</string>
-	<string name="TooltipFlagTouch">
-		Toucher
-	</string>
-	<string name="TooltipFlagL$">
-		L$
-	</string>
-	<string name="TooltipFlagDropInventory">
-		Laisser tomber l&apos;inventaire
-	</string>
-	<string name="TooltipFlagPhantom">
-		Fantôme
-	</string>
-	<string name="TooltipFlagTemporary">
-		Temporaire
-	</string>
-	<string name="TooltipFlagRightClickMenu">
-		(cliquez-droit pour le menu)
-	</string>
-	<string name="TooltipFreeToCopy">
-		Copie autorisée
-	</string>
-	<string name="TooltipForSaleL$">
-		À vendre : [AMOUNT] L$
-	</string>
-	<string name="TooltipForSaleMsg">
-		À vendre : [MESSAGE]
-	</string>
-	<string name="TooltipFlagGroupBuild">
-		Contruction de groupe
-	</string>
-	<string name="TooltipFlagNoBuild">
-		Pas de construction
-	</string>
-	<string name="TooltipFlagNoEdit">
-		Contruction de groupe
-	</string>
-	<string name="TooltipFlagNotSafe">
-		Non sécurisé
-	</string>
-	<string name="TooltipFlagNoFly">
-		Interdiction de voler
-	</string>
-	<string name="TooltipFlagGroupScripts">
-		Scripts de groupe
-	</string>
-	<string name="TooltipFlagNoScripts">
-		Pas de scripts
-	</string>
-	<string name="TooltipLand">
-		Terrain :
-	</string>
-	<string name="TooltipMustSingleDrop">
-		Impossible de faire glisser plus d&apos;un objet ici
-	</string>
-	<string name="TooltipOutboxDragToWorld">
-		Impossible de rezzer des articles dans la boîte d&apos;envoi vendeur
-	</string>
-	<string name="TooltipOutboxNoTransfer">
-		Impossible de vendre ou de transférer un ou plusieurs de ces objets.
-	</string>
-	<string name="TooltipOutboxNotInInventory">
-		La boîte d&apos;envoi vendeur n&apos;accepte que les articles directement issus de votre inventaire.
-	</string>
-	<string name="TooltipOutboxWorn">
-		Impossible de placer des articles que vous portez dans votre boîte d&apos;envoi vendeur
-	</string>
-	<string name="TooltipOutboxCallingCard">
-		Impossible de placer des cartes de visite dans votre boîte d&apos;envoi vendeur
-	</string>
-	<string name="TooltipOutboxFolderLevels">
-		Il existe plus de 3 niveaux de dossiers imbriqués.
-	</string>
-	<string name="TooltipOutboxTooManyFolders">
-		Le dossier de niveau supérieur contient plus de 20 sous-dossiers.
-	</string>
-	<string name="TooltipOutboxTooManyObjects">
-		Le dossier de niveau supérieur contient plus de 200 articles.
-	</string>
-	<string name="TooltipDragOntoOwnChild">
-		Impossible de déplacer un dossier vers son enfant
-	</string>
-	<string name="TooltipDragOntoSelf">
-		Impossible de déplacer un dossier vers lui-même
-	</string>
-	<string name="RetrievingData">
-		En cours d&apos;extraction...
-	</string>
-	<string name="ReleaseNotes">
-		Notes de version
-	</string>
-	<string name="LoadingData">
-		Chargement..
-	</string>
-	<string name="AvatarNameNobody">
-		(personne)
-	</string>
-	<string name="AvatarNameWaiting">
-		(en attente)
-	</string>
-	<string name="AvatarNameHippos">
-		(hippos)
-	</string>
-	<string name="GroupNameNone">
-		(aucun)
-	</string>
-	<string name="AssetErrorNone">
-		Aucune erreur
-	</string>
-	<string name="AssetErrorRequestFailed">
-		Requête de l&apos;actif : échec
-	</string>
-	<string name="AssetErrorNonexistentFile">
-		Requête de l&apos;actif : fichier inexistant
-	</string>
-	<string name="AssetErrorNotInDatabase">
-		Requête de l&apos;actif : actif introuvable dans la base de données
-	</string>
-	<string name="AssetErrorEOF">
-		Fin du ficher
-	</string>
-	<string name="AssetErrorCannotOpenFile">
-		Impossible d&apos;ouvrir le fichier
-	</string>
-	<string name="AssetErrorFileNotFound">
-		Fichier introuvable
-	</string>
-	<string name="AssetErrorTCPTimeout">
-		Délai d&apos;attente du transfert du fichier dépassé
-	</string>
-	<string name="AssetErrorCircuitGone">
-		Disparition du circuit
-	</string>
-	<string name="AssetErrorPriceMismatch">
-		Il y a une différence de prix entre le client et le serveur
-	</string>
-	<string name="AssetErrorUnknownStatus">
-		Statut inconnu
-	</string>
-	<string name="AvatarEditingAppearance">
-		(Apparence en cours de modification)
-	</string>
-	<string name="AvatarAway">
-		Absent
-	</string>
-	<string name="AvatarBusy">
-		Occupé
-	</string>
-	<string name="AvatarMuted">
-		Ignoré - Mute
-	</string>
-	<string name="anim_express_afraid">
-		Effrayé
-	</string>
-	<string name="anim_express_anger">
-		En colère
-	</string>
-	<string name="anim_away">
-		Absent
-	</string>
-	<string name="anim_backflip">
-		Salto arrière
-	</string>
-	<string name="anim_express_laugh">
-		Rire en se tenant le ventre
-	</string>
-	<string name="anim_express_toothsmile">
-		Grand sourire
-	</string>
-	<string name="anim_blowkiss">
-		Envoyer un baiser
-	</string>
-	<string name="anim_express_bored">
-		Bailler d&apos;ennui
-	</string>
-	<string name="anim_bow">
-		S&apos;incliner
-	</string>
-	<string name="anim_clap">
-		Applaudir
-	</string>
-	<string name="anim_courtbow">
-		Révérence de cour
-	</string>
-	<string name="anim_express_cry">
-		Pleurer
-	</string>
-	<string name="anim_dance1">
-		Danse 1
-	</string>
-	<string name="anim_dance2">
-		Danse 2
-	</string>
-	<string name="anim_dance3">
-		Danse 3
-	</string>
-	<string name="anim_dance4">
-		Danse 4
-	</string>
-	<string name="anim_dance5">
-		Danse 5
-	</string>
-	<string name="anim_dance6">
-		Danse 6
-	</string>
-	<string name="anim_dance7">
-		Danse 7
-	</string>
-	<string name="anim_dance8">
-		Danse 8
-	</string>
-	<string name="anim_express_disdain">
-		Mépris
-	</string>
-	<string name="anim_drink">
-		Boire
-	</string>
-	<string name="anim_express_embarrased">
-		Gêne
-	</string>
-	<string name="anim_angry_fingerwag">
-		Désapprobation
-	</string>
-	<string name="anim_fist_pump">
-		Victoire
-	</string>
-	<string name="anim_yoga_float">
-		Yoga
-	</string>
-	<string name="anim_express_frown">
-		Froncer les sourcils
-	</string>
-	<string name="anim_impatient">
-		Impatient
-	</string>
-	<string name="anim_jumpforjoy">
-		Sauter de joie
-	</string>
-	<string name="anim_kissmybutt">
-		Va te faire voir !
-	</string>
-	<string name="anim_express_kiss">
-		Baiser
-	</string>
-	<string name="anim_laugh_short">
-		Rire
-	</string>
-	<string name="anim_musclebeach">
-		Montrer ses muscles
-	</string>
-	<string name="anim_no_unhappy">
-		Non (mécontent)
-	</string>
-	<string name="anim_no_head">
-		Non
-	</string>
-	<string name="anim_nyanya">
-		Na na na na nère
-	</string>
-	<string name="anim_punch_onetwo">
-		Gauche-droite
-	</string>
-	<string name="anim_express_open_mouth">
-		Bouche ouverte
-	</string>
-	<string name="anim_peace">
-		Paix
-	</string>
-	<string name="anim_point_you">
-		Montrer quelqu&apos;un du doigt
-	</string>
-	<string name="anim_point_me">
-		Se montrer du doigt
-	</string>
-	<string name="anim_punch_l">
-		Gauche
-	</string>
-	<string name="anim_punch_r">
-		Droite
-	</string>
-	<string name="anim_rps_countdown">
-		Compter (pierre-papier-ciseaux)
-	</string>
-	<string name="anim_rps_paper">
-		Papier (pierre-papier-ciseaux)
-	</string>
-	<string name="anim_rps_rock">
-		Pierre (pierre-papier-ciseaux)
-	</string>
-	<string name="anim_rps_scissors">
-		Ciseaux (pierre-papier-ciseaux)
-	</string>
-	<string name="anim_express_repulsed">
-		Dégoût
-	</string>
-	<string name="anim_kick_roundhouse_r">
-		Coup de pied circulaire
-	</string>
-	<string name="anim_express_sad">
-		Triste
-	</string>
-	<string name="anim_salute">
-		Salut
-	</string>
-	<string name="anim_shout">
-		Crier
-	</string>
-	<string name="anim_express_shrug">
-		Hausser les épaules
-	</string>
-	<string name="anim_express_smile">
-		Sourire
-	</string>
-	<string name="anim_smoke_idle">
-		Fumer, immobile
-	</string>
-	<string name="anim_smoke_inhale">
-		Fumer, prendre une bouffée
-	</string>
-	<string name="anim_smoke_throw_down">
-		Fumer, jeter son mégot
-	</string>
-	<string name="anim_express_surprise">
-		Surprise
-	</string>
-	<string name="anim_sword_strike_r">
-		Coup d&apos;épée
-	</string>
-	<string name="anim_angry_tantrum">
-		Caprice
-	</string>
-	<string name="anim_express_tongue_out">
-		Tirer la langue
-	</string>
-	<string name="anim_hello">
-		Faire signe
-	</string>
-	<string name="anim_whisper">
-		Chuchoter
-	</string>
-	<string name="anim_whistle">
-		Siffler
-	</string>
-	<string name="anim_express_wink">
-		Clin d&apos;Å“il
-	</string>
-	<string name="anim_wink_hollywood">
-		Clin d&apos;Å“il (Hollywood)
-	</string>
-	<string name="anim_express_worry">
-		Soucis
-	</string>
-	<string name="anim_yes_happy">
-		Oui (Joie)
-	</string>
-	<string name="anim_yes_head">
-		Oui
-	</string>
-	<string name="texture_loading">
-		Chargement...
-	</string>
-	<string name="worldmap_offline">
-		Hors ligne
-	</string>
-	<string name="Ok">
-		OK
-	</string>
-	<string name="whisper">
-		chuchote :
-	</string>
-	<string name="shout">
-		crie :
-	</string>
-	<string name="SIM_ACCESS_PG">
-		PG
-	</string>
-	<string name="SIM_ACCESS_MATURE">
-		Mature
-	</string>
-	<string name="SIM_ACCESS_ADULT">
-		Adult
-	</string>
-	<string name="SIM_ACCESS_DOWN">
-		Hors ligne
-	</string>
-	<string name="SIM_ACCESS_MIN">
-		Inconnu
-	</string>
-	<string name="land_type_unknown">
-		(inconnu)
-	</string>
-	<string name="covenant_never_modified">
-		Dernière modification : (jamais)
-	</string>
-	<string name="covenant_modified">
-		Dernière modification :
-	</string>
-	<string name="all_files">
-		Tous fichiers
-	</string>
-	<string name="sound_files">
-		Sons
-	</string>
-	<string name="animation_files">
-		Animations
-	</string>
-	<string name="image_files">
-		Images
-	</string>
-	<string name="save_file_verb">
-		Enregistrer
-	</string>
-	<string name="load_file_verb">
-		Charger
-	</string>
-	<string name="targa_image_files">
-		Images Targa
-	</string>
-	<string name="bitmap_image_files">
-		Images Bitmap
-	</string>
-	<string name="avi_movie_file">
-		Fichier de film AVI
-	</string>
-	<string name="xaf_animation_file">
-		Fichier d&apos;animation XAF
-	</string>
-	<string name="xml_file">
-		Fichier XML
-	</string>
-	<string name="raw_file">
-		Fichier RAW
-	</string>
-	<string name="compressed_image_files">
-		Images compressées
-	</string>
-	<string name="load_files">
-		Charger des fichiers
-	</string>
-	<string name="choose_the_directory">
-		Choisir le répertoire
-	</string>
-	<string name="AvatarSetNotAway">
-		Présent
-	</string>
-	<string name="AvatarSetAway">
-		Absent
-	</string>
-	<string name="AvatarSetNotBusy">
-		Pas occupé
-	</string>
-	<string name="AvatarSetBusy">
-		Occupé
-	</string>
-	<string name="ok">
-		OK
-	</string>
-	<string name="no_transfer" value=" (pas de transfert)"/>
-	<string name="no_modify" value=" (pas de modification)"/>
-	<string name="no_copy" value=" (pas de copie)"/>
-	<string name="temporary" value=" (temporaire)"></string>
-	<string name="worn" value=" (porté)"/>
-	<string name="locked" value=" (verrouillé)"></string>
-	<string name="link" value=" (lien)"/>
-	<string name="broken_link" value=" (broken_link)"/>
-	<string name="NoContents">
-		Aucun contenu
-	</string>
-	<string name="WornOnAttachmentPoint" value=" (porté sur [ATTACHMENT_POINT])"/>
-	<string name="ActiveGesture" value="[GESLABEL] (actif)"/>
-	<string name="Chat Message" value="Chat :"/>
-	<string name="Wait" value=" --- Attendre :"/>
-	<string name="AnimFlagStop" value=" Arrêter l&apos;animation :"/>
-	<string name="AnimFlagStart" value=" Lancer l&apos;animation :"/>
-	<string name="Wave" value=" Faire signe"/>
-	<string name="GestureActionNone" value="À choisir"/>
-	<string name="HelloAvatar" value=" Bonjour, avatar !"/>
-	<string name="ViewAllGestures" value="  Tout afficher &gt;&gt;"/>
-	<string name="GetMoreGestures" value="Plus &gt;&gt;"/>
-	<string name="Stone">
-		Pierre
-	</string>
-	<string name="Metal">
-		Métal
-	</string>
-	<string name="Glass">
-		Verre
-	</string>
-	<string name="Wood">
-		Bois
-	</string>
-	<string name="Flesh">
-		Chair
-	</string>
-	<string name="Plastic">
-		Plastique
-	</string>
-	<string name="Rubber">
-		Caoutchouc
-	</string>
-	<string name="Unknown">
-		(Inconnu)
-	</string>
-	<string name="Region">
-		Région
-	</string>
-	<string name="RegionSettings">
-		Réglages de la région
-	</string>
-	<string name="accel-mac-control">
-		⌃
-	</string>
-	<string name="accel-mac-command">
-		⌘
-	</string>
-	<string name="accel-mac-option">
-		⌥
-	</string>
-	<string name="accel-mac-shift">
-		⇧
-	</string>
-	<string name="accel-win-control">
-		Ctrl+
-	</string>
-	<string name="accel-win-alt">
-		Alt+
-	</string>
-	<string name="accel-win-shift">
-		Maj+
-	</string>
-	<string name="MBCmdLineError">
-		Une erreur est survenue lors de la lecture de la ligne de commande.
-Merci de consulter : http://wiki.secondlife.com/wiki/Client_parameters
-Erreur :
-	</string>
-	<string name="MBCmdLineUsg">
-		[APP_NAME] - Utilisation de la ligne de commande :
-	</string>
-	<string name="MBUnableToAccessFile">
-		[APP_NAME] ne peut accéder à un fichier requis.
-
-Cela vient du fait que quelqu&apos;un a ouvert plusieurs copies ou que votre système pense qu&apos;un fichier est ouvert.
-Si ce message persiste, veuillez redémarrer votre ordinateur.
-Si le problème persiste, vous devrez peut-être complètement désinstaller puis réinstaller [APP_NAME].
-	</string>
-	<string name="MBRequiresAltiVec">
-		[APP_NAME] nécessite un microprocesseur AltiVec (version G4 ou antérieure).
-	</string>
-	<string name="MBAlreadyRunning">
-		[APP_NAME] est déjà en cours d&apos;exécution.
-Vérifiez si une version minimisée du programme apparaît dans votre barre de tâches.
-Si ce message persiste, redémarrez votre ordinateur.
-	</string>
-	<string name="MBFrozenCrashed">
-		[APP_NAME] semble avoir crashé lors de l&apos;utilisation précédente.
-Voulez-vous envoyer un rapport de crash ?
-	</string>
-	<string name="MBAlert">
-		Notification
-	</string>
-	<string name="MBNoDirectX">
-		[APP_NAME] ne peut détecter DirectX 9.0b ou une version supérieure.
-[APP_NAME] utilise DirectX pour détecter les matériels et/ou les pilotes qui ne sont pas à jour et peuvent causer des problèmes de stabilité, de performance ou des plantages.  Bien que vous puissiez utiliser [APP_NAME] sans DirectX, nous vous recommandons de l&apos;utiliser avec DirectX 9.0b.
-
-Voulez-vous continuer ?
-	</string>
-	<string name="MBWarning">
-		Avertissement
-	</string>
-	<string name="MBNoAutoUpdate">
-		Les mises à jour automatiques n&apos;existent pas encore pour Linux.
-Veuillez télécharger la dernière version sur www.secondlife.com.
-	</string>
-	<string name="MBRegClassFailed">
-		RegisterClass a échoué
-	</string>
-	<string name="MBError">
-		Erreur
-	</string>
-	<string name="MBFullScreenErr">
-		Impossible d&apos;ouvrir le mode plein écran à [WIDTH] x [HEIGHT].
-Utilisation du mode fenêtré.
-	</string>
-	<string name="MBDestroyWinFailed">
-		Erreur de fermeture lors de la destruction de la fenêtre (DestroyWindow() a échoué)
-	</string>
-	<string name="MBShutdownErr">
-		Erreur de fermeture
-	</string>
-	<string name="MBDevContextErr">
-		Impossible de créer le contexte GL
-	</string>
-	<string name="MBPixelFmtErr">
-		Impossible de trouver le format pixel approprié
-	</string>
-	<string name="MBPixelFmtDescErr">
-		Impossible de trouver la description du format pixel
-	</string>
-	<string name="MBTrueColorWindow">
-		[APP_NAME] nécessite True Color (32 bits) pour s&apos;exécuter.
-Accédez aux paramètres d&apos;affichage de votre ordinateur et réglez le mode couleur sur 32 bits.
-	</string>
-	<string name="MBAlpha">
-		[APP_NAME] ne peut pas s&apos;exécuter, car il n&apos;y pas de canal alpha 8 bits accessible.  En général, ceci vient de problèmes avec le pilote de la carte vidéo.
-Assurez-vous d&apos;avoir installé le pilote de carte vidéo le plus récent possible.
-Assurez-vous aussi que votre écran est réglé sur True Color (32 bits) sous Panneau de configuration &gt; Affichage &gt; Paramètres.
-Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
-	</string>
-	<string name="MBPixelFmtSetErr">
-		Impossible de trouver le format pixel approprié
-	</string>
-	<string name="MBGLContextErr">
-		Impossible de créer le contexte de rendu GL
-	</string>
-	<string name="MBGLContextActErr">
-		Impossible d&apos;activer le contexte de rendu GL
-	</string>
-	<string name="MBVideoDrvErr">
-		[APP_NAME] ne peut pas s&apos;exécuter car les pilotes de votre carte vidéo n&apos;ont pas été installés correctement, ne sont pas à jour, ou sont pour du matériel non pris en charge. Assurez-vous d&apos;avoir des pilotes de cartes vidéos récents, et même si vous avez les plus récents, réinstallez-les.
-
-Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE].
-	</string>
-	<string name="Unnamed">
-		(sans nom)
-	</string>
-	<string name="group_role_everyone">
-		Tous
-	</string>
-	<string name="group_role_officers">
-		Officiers
-	</string>
-	<string name="group_role_owners">
-		Propriétaires
-	</string>
-	<string name="group_member_status_online">
-		En ligne
-	</string>
-	<string name="Chat" value=" Chat :">
-		Chat
-	</string>
-	<string name="ExternalEditorNotSet">
-		Sélectionnez un éditeur à l&apos;aide du paramètre ExternalEditor.
-	</string>
-	<string name="ExternalEditorNotFound">
-		Éditeur externe spécifié introuvable.
-Essayez avec le chemin d&apos;accès à l&apos;éditeur entre guillemets doubles
-(par ex. : &quot;/chemin_accès/editor&quot; &quot;%s&quot;).
-	</string>
-	<string name="ExternalEditorCommandParseError">
-		Erreur lors de l&apos;analyse de la commande d&apos;éditeur externe.
-	</string>
-	<string name="ExternalEditorFailedToRun">
-		Échec d&apos;exécution de l&apos;éditeur externe.
-	</string>
-</strings>
+<?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 do not 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">La connexion à [APP_NAME] apparaît peut-&#xEA;tre comme &#xE9;tant gel&#xE9;e. Veuillez patienter.</string>
+       	<string name="LoginInProgressNoFrozen">C&apos;est parti... en voiture Simone !</string>
+	<string name="LoginAuthenticating">Authentification en cours...</string>
+	<string name="LoginMaintenance">Maintenance du compte en cours...</string>
+	<string name="LoginAttempt">La tentative de connexion pr&#xE9;c&#xE9;dente a &#xE9;chou&#xE9;. Connexion, esssai [NUMBER]</string>
+	<string name="LoginPrecaching">Monde en cours de chargement PATIENCE...</string>
+	<string name="LoginInitializingBrowser">Navigateur Web incorpor&#xE9; en cours d&apos;initialisation...</string>
+	<string name="LoginInitializingMultimedia">Multim&#xE9;dia en cours d&apos;initialisation... Aimez vous Brahms ?</string>
+        <string name="LoginInitializingFonts">Hop hop on loade les polices de caract&#xE8;res...</string>
+	<string name="LoginVerifyingCache">Fichiers du cache en cours de v&#xE9;rification (peut prendre 60-90 s)ou pire...</string>
+	<string name="LoginProcessingResponse">R&#xE9;ponse en cours de traitement... On y r&#xE9;fl&#xE9;chit.</string>
+	<string name="LoginInitializingWorld">Monde en cours d&apos;initialisation...</string>
+	<string name="LoginDecodingImages">D&#xE9;codage des images en cours, croisons les doigts...</string>
+	<string name="LoginInitializingQuicktime">Quicktime en cours d&apos;initialisation...</string>
+	<string name="LoginQuicktimeNotFound">Quicktime introuvable, impossible de proc&#xE9;der à l&apos;initialisation.</string>
+	<string name="LoginQuicktimeOK">Initialisation de Quicktime r&#xE9;ussie.</string>
+	<string name="LoginRequestSeedCapGrant">Voyons vou&#xE8;re les capacit&#xE9;s de la r&#xE9;gion...</string>
+	<string name="LoginRetrySeedCapGrant">Voyons vou&#xE8;re les capacit&#xE9;s de la r&#xE9;gion, tentative [NUMBER]...</string>
+	<string name="LoginWaitingForRegionHandshake">Liaison avec la r&#xE9;gion en cours de cr&#xE9;ation...</string>
+	<string name="LoginConnectingToRegion">Connexion avec la r&#xE9;gion en cours, avec un peu de chance ...</string>
+	<string name="LoginDownloadingClothing">Habits en cours de t&#xE9;l&#xE9;chargement, esp&#xE9;rons-le... Vais-je encore &#xEA;tre tout(e) nu(e) ?</string>
+	<string name="AgentLostConnection">Il y a peut-&#xEA;tre des probl&#xE8;mes techniques dans cette region. Veuillez v&#xE9;rifier votre connexion Internet.</string>
+	<string name="TooltipPerson">
+		Personne
+	</string>
+	<string name="TooltipNoName">
+		(pas de nom)
+	</string>
+	<string name="TooltipOwner">
+		Propri&#xE9;taire :
+	</string>
+	<string name="TooltipPublic">
+		Public
+	</string>
+	<string name="TooltipIsGroup">
+		(Groupe)
+	</string>
+	<string name="TooltipFlagScript">
+		Script
+	</string>
+	<string name="TooltipFlagPhysics">
+		Propri&#xE9;t&#xE9;s physique
+	</string>
+	<string name="TooltipFlagTouch">
+		Toucher
+	</string>
+	<string name="TooltipFlagL$">
+		L$
+	</string>
+	<string name="TooltipFlagDropInventory">
+		Laisser tomber l&apos;inventaire
+	</string>
+	<string name="TooltipFlagPhantom">
+		Fantôme
+	</string>
+	<string name="TooltipFlagTemporary">
+		Temporaire
+	</string>
+	<string name="TooltipFlagRightClickMenu">
+		(clic-droit pour le menu)
+	</string>
+	<string name="TooltipFreeToCopy">
+		Copie autoris&#xE9;e
+	</string>
+	<string name="TooltipForSaleL$">
+		A vendre : [AMOUNT] L$
+	</string>
+	<string name="TooltipForSaleMsg">
+		A vendre : [MESSAGE]
+	</string>
+	<string name="TooltipFlagGroupBuild">
+		Contruction de groupe
+	</string>
+	<string name="TooltipFlagNoBuild">
+		Pas de construction
+	</string>
+	<string name="TooltipFlagNoEdit">
+		Contruction de groupe
+	</string>
+	<string name="TooltipFlagNotSafe">
+		Non s&#xE9;curis&#xE9;
+	</string>
+	<string name="TooltipFlagNoFly">
+		Interdiction de voler
+	</string>
+	<string name="TooltipFlagGroupScripts">
+		Scripts de groupe
+	</string>
+	<string name="TooltipFlagNoScripts">
+		Pas de scripts
+	</string>
+	<string name="TooltipLand">
+		Terrain :
+	</string>
+	<string name="TooltipMustSingleDrop">
+		Impossible de faire glisser plus d&apos;un objet ici
+	</string>
+	<string name="RetrievingData">
+		En cours d&apos;extraction
+	</string>
+	<string name="ReleaseNotes">
+		Notes de version
+	</string>
+	<string name="LoadingData">
+		Chargement
+	</string>
+	<string name="AvatarNameNobody">
+		(personne)
+	</string>
+	<string name="AvatarNameWaiting">
+		(en attente)
+	</string>
+	<string name="AvatarNameHippos">
+		(hippos)
+	</string>
+	<string name="GroupNameNone">
+		(aucun)
+	</string>
+	<string name="AssetErrorNone">
+		Aucune erreur
+	</string>
+	<string name="AssetErrorRequestFailed">
+		Requ&#xEA;te de l&apos;actif : &#xE9;chec
+	</string>
+	<string name="AssetErrorNonexistentFile">
+		Requ&#xEA;te de l&apos;actif : fichier inexistant
+	</string>
+	<string name="AssetErrorNotInDatabase">
+		Requ&#xEA;te de l&apos;actif : actif introuvable dans la base de donn&#xE9;es
+	</string>
+	<string name="AssetErrorEOF">
+		Fin du ficher
+	</string>
+	<string name="AssetErrorCannotOpenFile">
+		Impossible d&apos;ouvrir le fichier
+	</string>
+	<string name="AssetErrorFileNotFound">
+		Fichier introuvable
+	</string>
+	<string name="AssetErrorTCPTimeout">
+		D&#xE9;lai d&apos;attente du transfert du fichier d&#xE9;pass&#xE9;
+	</string>
+	<string name="AssetErrorCircuitGone">
+		Disparition du circuit
+	</string>
+	<string name="AssetErrorPriceMismatch">
+		Il y a une diff&#xE9;rence de prix entre le client et le serveur
+	</string>
+	<string name="AssetErrorUnknownStatus">
+		Statut inconnu
+	</string>
+	<string name="AvatarEditingApparance">
+		(Apparence en cours de modification)
+	</string>
+	<string name="AvatarAway">
+		Absent
+	</string>
+	<string name="AvatarBusy">
+		Occup&#xE9;
+	</string>
+	<string name="AvatarMuted">
+		Ignor&#xE9; - Mute
+	</string>
+	<string name="anim_express_afraid">
+		Effray&#xE9;
+	</string>
+	<string name="anim_express_anger">
+		En col&#xE8;re
+	</string>
+	<string name="anim_away">
+		Absent
+	</string>
+	<string name="anim_backflip">
+		Salto arri&#xE8;re
+	</string>
+	<string name="anim_express_laugh">
+		Rire en se tenant le ventre
+	</string>
+	<string name="anim_express_toothsmile">
+		Grand sourire
+	</string>
+	<string name="anim_blowkiss">
+		Envoyer un baiser
+	</string>
+	<string name="anim_express_bored">
+		Bailler d&apos;ennui
+	</string>
+	<string name="anim_bow">
+		S&apos;incliner
+	</string>
+	<string name="anim_clap">
+		Applaudir
+	</string>
+	<string name="anim_courtbow">
+		R&#xE9;v&#xE9;rence de cour
+	</string>
+	<string name="anim_express_cry">
+		Pleurer
+	</string>
+	<string name="anim_dance1">
+		Danse 1
+	</string>
+	<string name="anim_dance2">
+		Danse 2
+	</string>
+	<string name="anim_dance3">
+		Danse 3
+	</string>
+	<string name="anim_dance4">
+		Danse 4
+	</string>
+	<string name="anim_dance5">
+		Danse 5
+	</string>
+	<string name="anim_dance6">
+		Danse 6
+	</string>
+	<string name="anim_dance7">
+		Danse 7
+	</string>
+	<string name="anim_dance8">
+		Danse 8
+	</string>
+	<string name="anim_express_disdain">
+		M&#xE9;pris
+	</string>
+	<string name="anim_drink">
+		Boire
+	</string>
+	<string name="anim_express_embarrased">
+		G&#xEA;ne
+	</string>
+	<string name="anim_angry_fingerwag">
+		D&#xE9;sapprobation
+	</string>
+	<string name="anim_fist_pump">
+		Victoire
+	</string>
+	<string name="anim_yoga_float">
+		Yoga
+	</string>
+	<string name="anim_express_frown">
+		Froncer les sourcils
+	</string>
+	<string name="anim_impatient">
+		Impatient
+	</string>
+	<string name="anim_jumpforjoy">
+		Sauter de joie
+	</string>
+	<string name="anim_kissmybutt">
+		Va te faire voir !
+	</string>
+	<string name="anim_express_kiss">
+		Baiser
+	</string>
+	<string name="anim_laugh_short">
+		Rire
+	</string>
+	<string name="anim_musclebeach">
+		Montrer ses muscles
+	</string>
+	<string name="anim_no_unhappy">
+		Non (m&#xE9;content)
+	</string>
+	<string name="anim_no_head">
+		Non
+	</string>
+	<string name="anim_nyanya">
+		Nanan&#xE8;re
+	</string>
+	<string name="anim_punch_onetwo">
+		Gauche-droite
+	</string>
+	<string name="anim_express_open_mouth">
+		Bouche ouverte
+	</string>
+	<string name="anim_peace">
+		Paix
+	</string>
+	<string name="anim_point_you">
+		Montrer quelqu&apos;un du doigt
+	</string>
+	<string name="anim_point_me">
+		Se montrer du doigt
+	</string>
+	<string name="anim_punch_l">
+		Gauche
+	</string>
+	<string name="anim_punch_r">
+		Droite
+	</string>
+	<string name="anim_rps_countdown">
+		Compter (pierre-papier-ciseaux)
+	</string>
+	<string name="anim_rps_paper">
+		Papier (pierre-papier-ciseaux)
+	</string>
+	<string name="anim_rps_rock">
+		Pierre (pierre-papier-ciseaux)
+	</string>
+	<string name="anim_rps_scissors">
+		Ciseaux (pierre-papier-ciseaux)
+	</string>
+	<string name="anim_express_repulsed">
+		D&#xE9;goût
+	</string>
+	<string name="anim_kick_roundhouse_r">
+		Coup de pied circulaire
+	</string>
+	<string name="anim_express_sad">
+		Triste
+	</string>
+	<string name="anim_salute">
+		Salut
+	</string>
+	<string name="anim_shout">
+		Crier
+	</string>
+	<string name="anim_express_shrug">
+		Hausser les &#xE9;paules
+	</string>
+	<string name="anim_express_smile">
+		Sourire
+	</string>
+	<string name="anim_smoke_idle">
+		Fumer, immobile
+	</string>
+	<string name="anim_smoke_inhale">
+		Fumer, prendre une bouff&#xE9;e
+	</string>
+	<string name="anim_smoke_throw_down">
+		Fumer, jeter son m&#xE9;got
+	</string>
+	<string name="anim_express_surprise">
+		Surprise
+	</string>
+	<string name="anim_sword_strike_r">
+		Coup d&apos;&#xE9;p&#xE9;e
+	</string>
+	<string name="anim_angry_tantrum">
+		Caprice
+	</string>
+	<string name="anim_express_tongue_out">
+		Tirer la langue
+	</string>
+	<string name="anim_hello">
+		Faire signe
+	</string>
+	<string name="anim_whisper">
+		Chuchoter
+	</string>
+	<string name="anim_whistle">
+		Siffler
+	</string>
+	<string name="anim_express_wink">
+		Clin d&apos;Å“il
+	</string>
+	<string name="anim_wink_hollywood">
+		Clin d&apos;Å“il (Hollywood)
+	</string>
+	<string name="anim_express_worry">
+		Soucis
+	</string>
+	<string name="anim_yes_happy">
+		Oui (Joie)
+	</string>
+	<string name="anim_yes_head">
+		Oui
+	</string>
+	<string name="texture_loading">
+		Chargement
+	</string>
+	<string name="worldmap_offline">
+		Hors ligne
+	</string>
+	<string name="whisper">
+		chuchote :
+	</string>
+	<string name="shout">
+		crie :
+	</string>
+	<string name="SIM_ACCESS_PG">
+		PG
+	</string>
+	<string name="SIM_ACCESS_MATURE">
+		Mature
+	</string>
+	<string name="SIM_ACCESS_ADULT">
+		Adulte
+	</string>
+	<string name="SIM_ACCESS_DOWN">
+		Hors ligne
+	</string>
+	<string name="SIM_ACCESS_MIN">
+		Inconnu
+	</string>
+	<string name="land_type_unknown">
+		(inconnu)
+	</string>
+	<string name="covenant_never_modified">
+		Derni&#xE8;re modification : (jamais)
+	</string>
+	<string name="covenant_modified">
+		Derni&#xE8;re modification :
+	</string>
+	<string name="all_files">
+		Tous fichiers
+	</string>
+	<string name="sound_files">
+		Sons
+	</string>
+	<string name="animation_files">
+		Animations
+	</string>
+	<string name="image_files">
+		Images
+	</string>
+	<string name="save_file_verb">
+		Enregistrer
+	</string>
+	<string name="load_file_verb">
+		Charger
+	</string>
+	<string name="targa_image_files">
+		Images Targa
+	</string>
+	<string name="bitmap_image_files">
+		Images Bitmap
+	</string>
+	<string name="avi_movie_file">
+		Fichier de film AVI
+	</string>
+	<string name="xaf_animation_file">
+		Fichier d&apos;animation XAF
+	</string>
+	<string name="xml_file">
+		Fichier XML
+	</string>
+	<string name="raw_file">
+		Fichier RAW
+	</string>
+	<string name="compressed_image_files">
+		Images compress&#xE9;es
+	</string>
+	<string name="load_files">
+		Charger des fichiers
+	</string>
+	<string name="choose_the_directory">
+		Choisir le r&#xE9;pertoire
+	</string>
+</strings>
diff --git a/indra/newview/skins/default/xui/fr/teleport_strings.xml b/indra/newview/skins/default/xui/fr/teleport_strings.xml
index e42283f12..d2104bfe1 100644
--- a/indra/newview/skins/default/xui/fr/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/fr/teleport_strings.xml
@@ -1,28 +1,77 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- This file contains strings that used to be hardcoded in the UI source.
-     It is only for those strings which don&apos;t belong in a floater and don&apos;t
-     belong to SL-specific dialogs.
-     For example, the menu accelerators cmd, opt, shift, etc -->
-<strings>
-	<string name="accel-mac-control">
-		Ctrl-
-	</string>
-	<string name="accel-mac-command">
-		Cmd-
-	</string>
-	<string name="accel-mac-option">
-		Opt-
-	</string>
-	<string name="accel-mac-shift">
-		Maj-
-	</string>
-	<string name="accel-win-control">
-		Ctrl-
-	</string>
-	<string name="accel-win-alt">
-		Alt-
-	</string>
-	<string name="accel-win-shift">
-		Maj-
-	</string>
-</strings>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<teleport_messages name="">
+	<message_set name="errors">
+		<message name="invalid_tport">
+			Nous avons rencontré des problèmes en essayant de vous téléporter. Vous devrez peut-être vous reconnecter avant de pouvoir être téléporté. Si vous continuez à recevoir ce message, veuillez consulter le Support à la page suivante :
+www.secondlife.com/support
+		</message>
+		<message name="invalid_region_handoff">
+			Nous avons rencontré des problèmes en essayant de vous téléporter. Vous devrez peut-être vous reconnecter avant de pouvoir être téléporté. Si vous continuez à recevoir ce message, veuillez consulter le Support à la page suivante :
+www.secondlife.com/support
+		</message>
+		<message name="blocked_tport">
+			Désolé, la téléportation est bloquée actuellement. Veuillez réessayer dans un moment.
+Si vous ne parvenez toujours pas à être téléporté, déconnectez-vous puis reconnectez-vous pour résoudre le problème.
+		</message>
+		<message name="nolandmark_tport">
+			Désolé, le système n&apos;a pas réussi à localiser la destination de votre repère.
+		</message>
+		<message name="timeout_tport">
+			Désolé, la connexion vers votre lieu de téléportation n&apos;a pas abouti.
+Veuillez réessayer dans un moment.
+		</message>
+		<message name="noaccess_tport">
+			Désolé, vous n&apos;avez pas accès à cette destination.
+		</message>
+		<message name="missing_attach_tport">
+			Vos pieces-jointes ne sont pas encore arrivées. Attendez quelques secondes ou déconnectez-vous puis reconnectez-vous avant d&apos;essayer de vous téléporter.
+		</message>
+		<message name="too_many_uploads_tport">
+			Le trafic vers cette région est bouché en ce moment. Votre téléportation ne pourra pas avoir lieu immédiatement. Veuillez réessayer dans quelques minutes ou bien aller dans une zone moins fréquentée.
+		</message>
+		<message name="expired_tport">
+			Désolé, votre demande de téléportation n&apos;a pas abouti assez rapidement. Veuillez réessayer dans quelques minutes.
+		</message>
+		<message name="expired_region_handoff">
+			Désolé, votre demande pour passer dans une autre région n&apos;a pas abouti assez rapidement. Veuillez réessayer dans quelques minutes.
+		</message>
+		<message name="no_host">
+			Impossible de trouver la destination de la téléportation. Il est possible que cette destination soit temporairement indisponible ou qu&apos;elle n&apos;existe plus. Veuillez réessayer dans quelques minutes.
+		</message>
+		<message name="no_inventory_host">
+			L&apos;inventaire est temporairement indisponible.
+		</message>
+	</message_set>
+	<message_set name="progress">
+		<message name="sending_dest">
+			Envoi vers la destination en cours.
+		</message>
+		<message name="redirecting">
+			Redirection vers un emplacement différent en cours.
+		</message>
+		<message name="relaying">
+			Relai vers la destination en cours.
+		</message>
+		<message name="sending_home">
+			Requête de la demande d&apos;envoi vers votre domicile en cours.
+		</message>
+		<message name="sending_landmark">
+			Requête de la demande d&apos;envoi vers le repère en cours.
+		</message>
+		<message name="completing">
+			Téléportation sur le point d&apos;aboutir.
+		</message>
+		<message name="resolving">
+			Destination en cours de résolution.
+		</message>
+		<message name="contacting">
+			Contact avec la nouvelle région en cours... Mouaip...
+		</message>
+		<message name="arriving">
+			Vous arrivez...enfin, ou &#x3F; myst&#xE8;re...
+		</message>
+		<message name="requesting">
+			Demande de téléportation en cours... AU SECOURS !!!
+		</message>
+	</message_set>
+</teleport_messages>
diff --git a/indra/newview/skins/default/xui/fr/teleport_strings2.xml b/indra/newview/skins/default/xui/fr/teleport_strings2.xml
new file mode 100644
index 000000000..d2104bfe1
--- /dev/null
+++ b/indra/newview/skins/default/xui/fr/teleport_strings2.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<teleport_messages name="">
+	<message_set name="errors">
+		<message name="invalid_tport">
+			Nous avons rencontré des problèmes en essayant de vous téléporter. Vous devrez peut-être vous reconnecter avant de pouvoir être téléporté. Si vous continuez à recevoir ce message, veuillez consulter le Support à la page suivante :
+www.secondlife.com/support
+		</message>
+		<message name="invalid_region_handoff">
+			Nous avons rencontré des problèmes en essayant de vous téléporter. Vous devrez peut-être vous reconnecter avant de pouvoir être téléporté. Si vous continuez à recevoir ce message, veuillez consulter le Support à la page suivante :
+www.secondlife.com/support
+		</message>
+		<message name="blocked_tport">
+			Désolé, la téléportation est bloquée actuellement. Veuillez réessayer dans un moment.
+Si vous ne parvenez toujours pas à être téléporté, déconnectez-vous puis reconnectez-vous pour résoudre le problème.
+		</message>
+		<message name="nolandmark_tport">
+			Désolé, le système n&apos;a pas réussi à localiser la destination de votre repère.
+		</message>
+		<message name="timeout_tport">
+			Désolé, la connexion vers votre lieu de téléportation n&apos;a pas abouti.
+Veuillez réessayer dans un moment.
+		</message>
+		<message name="noaccess_tport">
+			Désolé, vous n&apos;avez pas accès à cette destination.
+		</message>
+		<message name="missing_attach_tport">
+			Vos pieces-jointes ne sont pas encore arrivées. Attendez quelques secondes ou déconnectez-vous puis reconnectez-vous avant d&apos;essayer de vous téléporter.
+		</message>
+		<message name="too_many_uploads_tport">
+			Le trafic vers cette région est bouché en ce moment. Votre téléportation ne pourra pas avoir lieu immédiatement. Veuillez réessayer dans quelques minutes ou bien aller dans une zone moins fréquentée.
+		</message>
+		<message name="expired_tport">
+			Désolé, votre demande de téléportation n&apos;a pas abouti assez rapidement. Veuillez réessayer dans quelques minutes.
+		</message>
+		<message name="expired_region_handoff">
+			Désolé, votre demande pour passer dans une autre région n&apos;a pas abouti assez rapidement. Veuillez réessayer dans quelques minutes.
+		</message>
+		<message name="no_host">
+			Impossible de trouver la destination de la téléportation. Il est possible que cette destination soit temporairement indisponible ou qu&apos;elle n&apos;existe plus. Veuillez réessayer dans quelques minutes.
+		</message>
+		<message name="no_inventory_host">
+			L&apos;inventaire est temporairement indisponible.
+		</message>
+	</message_set>
+	<message_set name="progress">
+		<message name="sending_dest">
+			Envoi vers la destination en cours.
+		</message>
+		<message name="redirecting">
+			Redirection vers un emplacement différent en cours.
+		</message>
+		<message name="relaying">
+			Relai vers la destination en cours.
+		</message>
+		<message name="sending_home">
+			Requête de la demande d&apos;envoi vers votre domicile en cours.
+		</message>
+		<message name="sending_landmark">
+			Requête de la demande d&apos;envoi vers le repère en cours.
+		</message>
+		<message name="completing">
+			Téléportation sur le point d&apos;aboutir.
+		</message>
+		<message name="resolving">
+			Destination en cours de résolution.
+		</message>
+		<message name="contacting">
+			Contact avec la nouvelle région en cours... Mouaip...
+		</message>
+		<message name="arriving">
+			Vous arrivez...enfin, ou &#x3F; myst&#xE8;re...
+		</message>
+		<message name="requesting">
+			Demande de téléportation en cours... AU SECOURS !!!
+		</message>
+	</message_set>
+</teleport_messages>
diff --git a/indra/newview/skins/default/xui/fr/ui_strings.xml b/indra/newview/skins/default/xui/fr/ui_strings.xml
index 0e777751d..7984866d2 100644
--- a/indra/newview/skins/default/xui/fr/ui_strings.xml
+++ b/indra/newview/skins/default/xui/fr/ui_strings.xml
@@ -1,4 +1,17 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xui_version>
-	1.0
-</xui_version>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<!-- This file contains strings that used to be hardcoded in the UI source.
+     It is only for those strings which don't belong in a floater and don't
+     belong to SL-specific dialogs.
+     For example, the menu accelerators cmd, opt, shift, etc -->
+<strings>
+	
+    <!-- menu accelerators -->
+	<string name="accel-mac-control">Ctrl-</string>
+	<string name="accel-mac-command">Cmd-</string>
+	<string name="accel-mac-option">Opt-</string>
+	<string name="accel-mac-shift">Maj-</string>
+	<string name="accel-win-control">Ctrl-</string>
+	<string name="accel-win-alt">Alt-</string>
+	<string name="accel-win-shift">Maj-</string>
+
+</strings>
diff --git a/indra/newview/skins/default/xui/fr/xui_version.xml b/indra/newview/skins/default/xui/fr/xui_version.xml
index 0e777751d..ee2a0be74 100644
--- a/indra/newview/skins/default/xui/fr/xui_version.xml
+++ b/indra/newview/skins/default/xui/fr/xui_version.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xui_version>
-	1.0
-</xui_version>
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<xui_version>
+	1.0
+</xui_version>

From 9a0620f140f53867122017076b72e74f4209f999 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Mon, 16 Jul 2012 19:33:44 -0400
Subject: [PATCH 032/199] Add Voodoo to tags.

---
 indra/newview/app_settings/client_tags_sg1.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/indra/newview/app_settings/client_tags_sg1.xml b/indra/newview/app_settings/client_tags_sg1.xml
index bdbd53003..c533f419e 100644
--- a/indra/newview/app_settings/client_tags_sg1.xml
+++ b/indra/newview/app_settings/client_tags_sg1.xml
@@ -786,6 +786,18 @@
         <real>0.7843137254902</real>
         <real>1</real>
       </array>
+    </map>
+	<key>5886ec80-cf56-11e1-9b23-0800200c9a66</key>
+    <map>
+      <key>name</key>
+      <string>Voodoo</string>
+      <key>color</key>
+      <array>
+        <real>0.70588235294118</real>
+        <real>0.7843137254902</real>
+        <real>0.7843137254902</real>
+        <real>1</real>
+      </array>
     </map>
     <key>734bae36-a197-b087-ee2d-a098d58fed55</key>
     <map>

From 7721c6e3da1090615f6aa6231e950753fb4d717e Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Tue, 17 Jul 2012 16:06:31 -0400
Subject: [PATCH 033/199] Resolved issue with glibc 2.16

Resolved issues introduced by changes made in glibc 2.16 removing the undocumented definition of struct siginfo from bits/siginfo.h
---
 indra/llcommon/llapp.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/indra/llcommon/llapp.h b/indra/llcommon/llapp.h
index 6ad34c8fa..32f1e84c3 100644
--- a/indra/llcommon/llapp.h
+++ b/indra/llcommon/llapp.h
@@ -43,10 +43,14 @@ template <typename Type> class LLAtomic32;
 typedef LLAtomic32<U32> LLAtomicU32;
 class LLErrorThread;
 class LLLiveFile;
+
+
 #if LL_LINUX
-typedef struct siginfo siginfo_t;
+	#include <signal.h>
+	//typedef struct siginfo siginfo_t; //Removed as per changes in glibc 2.16 - Drake Arconis
 #endif
 
+
 typedef void (*LLAppErrorHandler)();
 typedef void (*LLAppChildCallback)(int pid, bool exited, int status);
 

From 465c6b9ed6b417e476bc13dc2fdc4962b8dcb409 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Tue, 17 Jul 2012 16:42:43 -0400
Subject: [PATCH 034/199] Bring back ASCENDED_DEVELOPER, and give it extra
 meaning!

---
 indra/newview/linux_tools/wrapper.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh
index ea944f1c2..04edf2a76 100755
--- a/indra/newview/linux_tools/wrapper.sh
+++ b/indra/newview/linux_tools/wrapper.sh
@@ -59,8 +59,15 @@
 ##   you're building your own viewer, bear in mind that the executable
 ##   in the bin directory will be stripped: you should replace it with
 ##   an unstripped binary before you run.
-#export LL_WRAPPER='gdb --args'
-#export LL_WRAPPER='valgrind --smc-check=all --error-limit=no --log-file=secondlife.vg --leak-check=full --suppressions=/usr/lib/valgrind/glibc-2.5.supp --suppressions=secondlife-i686.supp'
+if [ -n "$ASCENDED_DEVELOPER" ]; then
+	if [ "$ASCENDED_DEVELOPER" = "1" ]; then
+		export LL_WRAPPER='gdb --args'
+	elif [ "$ASCENDED_DEVELOPER" = "2" ]; then
+		export LL_WRAPPER='valgrind --smc-check=all --error-limit=no --log-file=secondlife.vg --leak-check=full --suppressions=/usr/lib/valgrind/glibc-2.5.supp --suppressions=secondlife-i686.supp'
+	elif [ "$ASCENDED_DEVELOPER" = "3" ]; then
+		export LL_WRAPPER='strace -f -ff -o singularity.strace'
+	fi
+fi
 
 ## - This allows one to set an arbitrary value for LD_PRELOAD.
 ##   It won't work if LL_TCMALLOC is set because that uses it's

From b101bb00013452c6d569cf85a79ae5bc3e8ea9db Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Tue, 17 Jul 2012 23:38:34 -0500
Subject: [PATCH 035/199] MAINT-646: Faster traversal of render batch lists. 
 https://bitbucket.org/davep/viewer-development/changeset/38b7779af5f9

---
 indra/newview/lldrawpool.cpp         |   2 +-
 indra/newview/lldrawpoolalpha.cpp    |   4 +-
 indra/newview/lldrawpoolavatar.cpp   |  68 +++++++++-----
 indra/newview/lldrawpoolbump.cpp     |  12 +--
 indra/newview/llspatialpartition.cpp | 135 +++++++++++++++++----------
 indra/newview/llspatialpartition.h   |  68 +++++++++-----
 indra/newview/pipeline.cpp           |  60 ++++++------
 indra/newview/pipeline.h             |   8 +-
 8 files changed, 214 insertions(+), 143 deletions(-)

diff --git a/indra/newview/lldrawpool.cpp b/indra/newview/lldrawpool.cpp
index 968ed740a..69a3cf419 100644
--- a/indra/newview/lldrawpool.cpp
+++ b/indra/newview/lldrawpool.cpp
@@ -446,7 +446,7 @@ void LLRenderPass::renderTexture(U32 type, U32 mask)
 
 void LLRenderPass::pushBatches(U32 type, U32 mask, BOOL texture, BOOL batch_textures)
 {
-	for (LLCullResult::drawinfo_list_t::iterator i = gPipeline.beginRenderMap(type); i != gPipeline.endRenderMap(type); ++i)	
+	for (LLCullResult::drawinfo_iterator i = gPipeline.beginRenderMap(type); i != gPipeline.endRenderMap(type); ++i)	
 	{
 		LLDrawInfo* pparams = *i;
 		if (pparams) 
diff --git a/indra/newview/lldrawpoolalpha.cpp b/indra/newview/lldrawpoolalpha.cpp
index 500f8b67a..865e89f89 100644
--- a/indra/newview/lldrawpoolalpha.cpp
+++ b/indra/newview/lldrawpoolalpha.cpp
@@ -355,7 +355,7 @@ void LLDrawPoolAlpha::render(S32 pass)
 
 void LLDrawPoolAlpha::renderAlphaHighlight(U32 mask)
 {
-	for (LLCullResult::sg_list_t::iterator i = gPipeline.beginAlphaGroups(); i != gPipeline.endAlphaGroups(); ++i)
+	for (LLCullResult::sg_iterator i = gPipeline.beginAlphaGroups(); i != gPipeline.endAlphaGroups(); ++i)
 	{
 		LLSpatialGroup* group = *i;
 		if (group->mSpatialPartition->mRenderByGroup &&
@@ -392,7 +392,7 @@ void LLDrawPoolAlpha::renderAlpha(U32 mask)
 	
 	BOOL use_shaders = gPipeline.canUseVertexShaders();
 		
-	for (LLCullResult::sg_list_t::iterator i = gPipeline.beginAlphaGroups(); i != gPipeline.endAlphaGroups(); ++i)
+	for (LLCullResult::sg_iterator i = gPipeline.beginAlphaGroups(); i != gPipeline.endAlphaGroups(); ++i)
 	{
 		LLSpatialGroup* group = *i;
 		llassert(group);
diff --git a/indra/newview/lldrawpoolavatar.cpp b/indra/newview/lldrawpoolavatar.cpp
index a37f117c4..3e818faa4 100644
--- a/indra/newview/lldrawpoolavatar.cpp
+++ b/indra/newview/lldrawpoolavatar.cpp
@@ -1203,15 +1203,6 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
 
 	if (pass >= 7 && pass < 9)
 	{
-		LLGLEnable blend(GL_BLEND);
-
-		gGL.setColorMask(true, true);
-		gGL.blendFunc(LLRender::BF_SOURCE_ALPHA,
-					  LLRender::BF_ONE_MINUS_SOURCE_ALPHA,
-					  LLRender::BF_ZERO,
-					  LLRender::BF_ONE_MINUS_SOURCE_ALPHA);
-
-		
 		if (pass == 7)
 		{
 			renderRiggedAlpha(avatarp);
@@ -1227,20 +1218,8 @@ void LLDrawPoolAvatar::renderAvatars(LLVOAvatar* single_avatar, S32 pass)
 
 	if (pass == 9)
 	{
-		LLGLEnable blend(GL_BLEND);
-		LLGLDisable test(GL_ALPHA_TEST);
-		gGL.flush();
-
-		LLGLEnable polyOffset(GL_POLYGON_OFFSET_FILL);
-		glPolygonOffset(-1.0f, -1.0f);
-		gGL.setSceneBlendType(LLRender::BT_ADD);
-
-		LLGLDepthTest depth(GL_TRUE, GL_FALSE);
-		gGL.setColorMask(false, true);
-
 		renderRiggedGlow(avatarp);
-		gGL.setColorMask(true, false);
-		gGL.setSceneBlendType(LLRender::BT_ALPHA);
+
 		return;
 	}
 	
@@ -1640,17 +1619,56 @@ void LLDrawPoolAvatar::renderRiggedFullbrightShiny(LLVOAvatar* avatar)
 
 void LLDrawPoolAvatar::renderRiggedAlpha(LLVOAvatar* avatar)
 {
-	renderRigged(avatar, RIGGED_ALPHA);
+	if (!mRiggedFace[RIGGED_ALPHA].empty())
+	{
+		LLGLEnable blend(GL_BLEND);
+
+		gGL.setColorMask(true, true);
+		gGL.blendFunc(LLRender::BF_SOURCE_ALPHA,
+						LLRender::BF_ONE_MINUS_SOURCE_ALPHA,
+						LLRender::BF_ZERO,
+						LLRender::BF_ONE_MINUS_SOURCE_ALPHA);
+
+		renderRigged(avatar, RIGGED_ALPHA);
+	}
 }
 
 void LLDrawPoolAvatar::renderRiggedFullbrightAlpha(LLVOAvatar* avatar)
 {
-	renderRigged(avatar, RIGGED_FULLBRIGHT_ALPHA);
+	if (!mRiggedFace[RIGGED_FULLBRIGHT_ALPHA].empty())
+	{
+		LLGLEnable blend(GL_BLEND);
+
+		gGL.setColorMask(true, true);
+		gGL.blendFunc(LLRender::BF_SOURCE_ALPHA,
+						LLRender::BF_ONE_MINUS_SOURCE_ALPHA,
+						LLRender::BF_ZERO,
+						LLRender::BF_ONE_MINUS_SOURCE_ALPHA);
+
+		renderRigged(avatar, RIGGED_FULLBRIGHT_ALPHA);
+	}
 }
 
 void LLDrawPoolAvatar::renderRiggedGlow(LLVOAvatar* avatar)
 {
-	renderRigged(avatar, RIGGED_GLOW, true);
+	if (!mRiggedFace[RIGGED_GLOW].empty())
+	{
+		LLGLEnable blend(GL_BLEND);
+		LLGLDisable test(GL_ALPHA_TEST);
+		gGL.flush();
+
+		LLGLEnable polyOffset(GL_POLYGON_OFFSET_FILL);
+		glPolygonOffset(-1.0f, -1.0f);
+		gGL.setSceneBlendType(LLRender::BT_ADD);
+
+		LLGLDepthTest depth(GL_TRUE, GL_FALSE);
+		gGL.setColorMask(false, true);
+
+		renderRigged(avatar, RIGGED_GLOW, true);
+
+		gGL.setColorMask(true, false);
+		gGL.setSceneBlendType(LLRender::BT_ALPHA);
+	}
 }
 
 
diff --git a/indra/newview/lldrawpoolbump.cpp b/indra/newview/lldrawpoolbump.cpp
index 65ab71abc..60af91ac8 100644
--- a/indra/newview/lldrawpoolbump.cpp
+++ b/indra/newview/lldrawpoolbump.cpp
@@ -848,12 +848,12 @@ void LLDrawPoolBump::renderDeferred(S32 pass)
 	LLFastTimer ftm(FTM_RENDER_BUMP);
 
 	U32 type = LLRenderPass::PASS_BUMP;
-	LLCullResult::drawinfo_list_t::iterator begin = gPipeline.beginRenderMap(type);
-	LLCullResult::drawinfo_list_t::iterator end = gPipeline.endRenderMap(type);
+	LLCullResult::drawinfo_iterator begin = gPipeline.beginRenderMap(type);
+	LLCullResult::drawinfo_iterator end = gPipeline.endRenderMap(type);
 
 	U32 mask = LLVertexBuffer::MAP_VERTEX | LLVertexBuffer::MAP_TEXCOORD0 | LLVertexBuffer::MAP_BINORMAL | LLVertexBuffer::MAP_NORMAL | LLVertexBuffer::MAP_COLOR;
 	
-	for (LLCullResult::drawinfo_list_t::iterator i = begin; i != end; ++i)	
+	for (LLCullResult::drawinfo_iterator i = begin; i != end; ++i)	
 	{
 		LLDrawInfo& params = **i;
 
@@ -1449,10 +1449,10 @@ void LLBumpImageList::onSourceLoaded( BOOL success, LLViewerTexture *src_vi, LLI
 
 void LLDrawPoolBump::renderBump(U32 type, U32 mask)
 {	
-	LLCullResult::drawinfo_list_t::iterator begin = gPipeline.beginRenderMap(type);
-	LLCullResult::drawinfo_list_t::iterator end = gPipeline.endRenderMap(type);
+	LLCullResult::drawinfo_iterator begin = gPipeline.beginRenderMap(type);
+	LLCullResult::drawinfo_iterator end = gPipeline.endRenderMap(type);
 
-	for (LLCullResult::drawinfo_list_t::iterator i = begin; i != end; ++i)	
+	for (LLCullResult::drawinfo_iterator i = begin; i != end; ++i)	
 	{
 		LLDrawInfo& params = **i;
 
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 2d476dfbb..55e3b758f 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -4476,29 +4476,64 @@ LLVertexBuffer* LLGeometryManager::createVertexBuffer(U32 type_mask, U32 usage)
 }
 
 LLCullResult::LLCullResult() 
-{
+{	
+	mVisibleGroupsAllocated = 0;
+	mAlphaGroupsAllocated = 0;
+	mOcclusionGroupsAllocated = 0;
+	mDrawableGroupsAllocated = 0;
+	mVisibleListAllocated = 0;
+	mVisibleBridgeAllocated = 0;
+
+	mVisibleGroups = NULL;
+	mVisibleGroupsEnd = NULL;
+	mAlphaGroups = NULL;
+	mAlphaGroupsEnd = NULL;
+	mOcclusionGroups = NULL;
+	mOcclusionGroupsEnd = NULL;
+	mDrawableGroups = NULL;
+	mDrawableGroupsEnd = NULL;
+	mVisibleList = NULL;
+	mVisibleListEnd = NULL;
+	mVisibleBridge = NULL;
+	mVisibleBridgeEnd = NULL;
+
+	for (U32 i = 0; i < LLRenderPass::NUM_RENDER_TYPES; i++)
+	{
+		mRenderMap[i] = NULL;
+		mRenderMapEnd[i] = NULL;
+		mRenderMapAllocated[i] = 0;
+	}
+
 	clear();
 }
 
+void LLCullResult::pushBack(void**& head, U32& count, void* val)
+{
+	count++;
+	head = (void**) realloc((void*) head, sizeof(void*) * count);
+	head[count-1] = val;
+}
+
 void LLCullResult::clear()
 {
 	mVisibleGroupsSize = 0;
-	mVisibleGroupsEnd = mVisibleGroups.begin();
+	mVisibleGroupsEnd = mVisibleGroups;
 
 	mAlphaGroupsSize = 0;
-	mAlphaGroupsEnd = mAlphaGroups.begin();
+	mAlphaGroupsEnd = mAlphaGroups;
 
 	mOcclusionGroupsSize = 0;
-	mOcclusionGroupsEnd = mOcclusionGroups.begin();
+	mOcclusionGroupsEnd = mOcclusionGroups;
 
 	mDrawableGroupsSize = 0;
-	mDrawableGroupsEnd = mDrawableGroups.begin();
+	mDrawableGroupsEnd = mDrawableGroups;
 
 	mVisibleListSize = 0;
-	mVisibleListEnd = mVisibleList.begin();
+	mVisibleListEnd = mVisibleList;
 
 	mVisibleBridgeSize = 0;
-	mVisibleBridgeEnd = mVisibleBridge.begin();
+	mVisibleBridgeEnd = mVisibleBridge;
+
 
 	for (U32 i = 0; i < LLRenderPass::NUM_RENDER_TYPES; i++)
 	{
@@ -4507,176 +4542,176 @@ void LLCullResult::clear()
 			mRenderMap[i][j] = 0;
 		}
 		mRenderMapSize[i] = 0;
-		mRenderMapEnd[i] = mRenderMap[i].begin();
+		mRenderMapEnd[i] = mRenderMap[i];
 	}
 }
 
-LLCullResult::sg_list_t::iterator LLCullResult::beginVisibleGroups()
+LLCullResult::sg_iterator LLCullResult::beginVisibleGroups()
 {
-	return mVisibleGroups.begin();
+	return mVisibleGroups;
 }
 
-LLCullResult::sg_list_t::iterator LLCullResult::endVisibleGroups()
+LLCullResult::sg_iterator LLCullResult::endVisibleGroups()
 {
 	return mVisibleGroupsEnd;
 }
 
-LLCullResult::sg_list_t::iterator LLCullResult::beginAlphaGroups()
+LLCullResult::sg_iterator LLCullResult::beginAlphaGroups()
 {
-	return mAlphaGroups.begin();
+	return mAlphaGroups;
 }
 
-LLCullResult::sg_list_t::iterator LLCullResult::endAlphaGroups()
+LLCullResult::sg_iterator LLCullResult::endAlphaGroups()
 {
 	return mAlphaGroupsEnd;
 }
 
-LLCullResult::sg_list_t::iterator LLCullResult::beginOcclusionGroups()
+LLCullResult::sg_iterator LLCullResult::beginOcclusionGroups()
 {
-	return mOcclusionGroups.begin();
+	return mOcclusionGroups;
 }
 
-LLCullResult::sg_list_t::iterator LLCullResult::endOcclusionGroups()
+LLCullResult::sg_iterator LLCullResult::endOcclusionGroups()
 {
 	return mOcclusionGroupsEnd;
 }
 
-LLCullResult::sg_list_t::iterator LLCullResult::beginDrawableGroups()
+LLCullResult::sg_iterator LLCullResult::beginDrawableGroups()
 {
-	return mDrawableGroups.begin();
+	return mDrawableGroups;
 }
 
-LLCullResult::sg_list_t::iterator LLCullResult::endDrawableGroups()
+LLCullResult::sg_iterator LLCullResult::endDrawableGroups()
 {
 	return mDrawableGroupsEnd;
 }
 
-LLCullResult::drawable_list_t::iterator LLCullResult::beginVisibleList()
+LLCullResult::drawable_iterator LLCullResult::beginVisibleList()
 {
-	return mVisibleList.begin();
+	return mVisibleList;
 }
 
-LLCullResult::drawable_list_t::iterator LLCullResult::endVisibleList()
+LLCullResult::drawable_iterator LLCullResult::endVisibleList()
 {
 	return mVisibleListEnd;
 }
 
-LLCullResult::bridge_list_t::iterator LLCullResult::beginVisibleBridge()
+LLCullResult::bridge_iterator LLCullResult::beginVisibleBridge()
 {
-	return mVisibleBridge.begin();
+	return mVisibleBridge;
 }
 
-LLCullResult::bridge_list_t::iterator LLCullResult::endVisibleBridge()
+LLCullResult::bridge_iterator LLCullResult::endVisibleBridge()
 {
 	return mVisibleBridgeEnd;
 }
 
-LLCullResult::drawinfo_list_t::iterator LLCullResult::beginRenderMap(U32 type)
+LLCullResult::drawinfo_iterator LLCullResult::beginRenderMap(U32 type)
 {
-	return mRenderMap[type].begin();
+	return mRenderMap[type];
 }
 
-LLCullResult::drawinfo_list_t::iterator LLCullResult::endRenderMap(U32 type)
+LLCullResult::drawinfo_iterator LLCullResult::endRenderMap(U32 type)
 {
 	return mRenderMapEnd[type];
 }
 
 void LLCullResult::pushVisibleGroup(LLSpatialGroup* group)
 {
-	if (mVisibleGroupsSize < mVisibleGroups.size())
+	if (mVisibleGroupsSize < mVisibleGroupsAllocated)
 	{
 		mVisibleGroups[mVisibleGroupsSize] = group;
 	}
 	else
 	{
-		mVisibleGroups.push_back(group);
+		pushBack((void**&) mVisibleGroups, mVisibleGroupsAllocated, (void*) group);
 	}
 	++mVisibleGroupsSize;
-	mVisibleGroupsEnd = mVisibleGroups.begin()+mVisibleGroupsSize;
+	mVisibleGroupsEnd = mVisibleGroups+mVisibleGroupsSize;
 }
 
 void LLCullResult::pushAlphaGroup(LLSpatialGroup* group)
 {
-	if (mAlphaGroupsSize < mAlphaGroups.size())
+	if (mAlphaGroupsSize < mAlphaGroupsAllocated)
 	{
 		mAlphaGroups[mAlphaGroupsSize] = group;
 	}
 	else
 	{
-		mAlphaGroups.push_back(group);
+		pushBack((void**&) mAlphaGroups, mAlphaGroupsAllocated, (void*) group);
 	}
 	++mAlphaGroupsSize;
-	mAlphaGroupsEnd = mAlphaGroups.begin()+mAlphaGroupsSize;
+	mAlphaGroupsEnd = mAlphaGroups+mAlphaGroupsSize;
 }
 
 void LLCullResult::pushOcclusionGroup(LLSpatialGroup* group)
 {
-	if (mOcclusionGroupsSize < mOcclusionGroups.size())
+	if (mOcclusionGroupsSize < mOcclusionGroupsAllocated)
 	{
 		mOcclusionGroups[mOcclusionGroupsSize] = group;
 	}
 	else
 	{
-		mOcclusionGroups.push_back(group);
+		pushBack((void**&) mOcclusionGroups, mOcclusionGroupsAllocated, (void*) group);
 	}
 	++mOcclusionGroupsSize;
-	mOcclusionGroupsEnd = mOcclusionGroups.begin()+mOcclusionGroupsSize;
+	mOcclusionGroupsEnd = mOcclusionGroups+mOcclusionGroupsSize;
 }
 
 void LLCullResult::pushDrawableGroup(LLSpatialGroup* group)
 {
-	if (mDrawableGroupsSize < mDrawableGroups.size())
+	if (mDrawableGroupsSize < mDrawableGroupsAllocated)
 	{
 		mDrawableGroups[mDrawableGroupsSize] = group;
 	}
 	else
 	{
-		mDrawableGroups.push_back(group);
+		pushBack((void**&) mDrawableGroups, mDrawableGroupsAllocated, (void*) group);
 	}
 	++mDrawableGroupsSize;
-	mDrawableGroupsEnd = mDrawableGroups.begin()+mDrawableGroupsSize;
+	mDrawableGroupsEnd = mDrawableGroups+mDrawableGroupsSize;
 }
 
 void LLCullResult::pushDrawable(LLDrawable* drawable)
 {
-	if (mVisibleListSize < mVisibleList.size())
+	if (mVisibleListSize < mVisibleListAllocated)
 	{
 		mVisibleList[mVisibleListSize] = drawable;
 	}
 	else
 	{
-		mVisibleList.push_back(drawable);
+		pushBack((void**&) mVisibleList, mVisibleListAllocated, (void*) drawable);
 	}
 	++mVisibleListSize;
-	mVisibleListEnd = mVisibleList.begin()+mVisibleListSize;
+	mVisibleListEnd = mVisibleList+mVisibleListSize;
 }
 
 void LLCullResult::pushBridge(LLSpatialBridge* bridge)
 {
-	if (mVisibleBridgeSize < mVisibleBridge.size())
+	if (mVisibleBridgeSize < mVisibleBridgeAllocated)
 	{
 		mVisibleBridge[mVisibleBridgeSize] = bridge;
 	}
 	else
 	{
-		mVisibleBridge.push_back(bridge);
+		pushBack((void**&) mVisibleBridge, mVisibleBridgeAllocated, (void*) bridge);
 	}
 	++mVisibleBridgeSize;
-	mVisibleBridgeEnd = mVisibleBridge.begin()+mVisibleBridgeSize;
+	mVisibleBridgeEnd = mVisibleBridge+mVisibleBridgeSize;
 }
 
 void LLCullResult::pushDrawInfo(U32 type, LLDrawInfo* draw_info)
 {
-	if (mRenderMapSize[type] < mRenderMap[type].size())
+	if (mRenderMapSize[type] < mRenderMapAllocated[type])
 	{
 		mRenderMap[type][mRenderMapSize[type]] = draw_info;
 	}
 	else
 	{
-		mRenderMap[type].push_back(draw_info);
+		pushBack((void**&) mRenderMap[type], mRenderMapAllocated[type], (void*) draw_info);
 	}
 	++mRenderMapSize[type];
-	mRenderMapEnd[type] = mRenderMap[type].begin() + mRenderMapSize[type];
+	mRenderMapEnd[type] = mRenderMap[type] + mRenderMapSize[type];
 }
 
 
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h
index 95ba1c036..d86221ddc 100644
--- a/indra/newview/llspatialpartition.h
+++ b/indra/newview/llspatialpartition.h
@@ -522,34 +522,39 @@ class LLCullResult
 public:
 	LLCullResult();
 
-	typedef std::vector<LLSpatialGroup*> sg_list_t;
-	typedef std::vector<LLDrawable*> drawable_list_t;
-	typedef std::vector<LLSpatialBridge*> bridge_list_t;
-	typedef std::vector<LLDrawInfo*> drawinfo_list_t;
+	typedef LLSpatialGroup** sg_list_t;
+	typedef LLDrawable** drawable_list_t;
+	typedef LLSpatialBridge** bridge_list_t;
+	typedef LLDrawInfo** drawinfo_list_t;
+
+	typedef LLSpatialGroup** sg_iterator;
+	typedef LLSpatialBridge** bridge_iterator;
+	typedef LLDrawInfo** drawinfo_iterator;
+	typedef LLDrawable** drawable_iterator;
 
 	void clear();
 	
-	sg_list_t::iterator beginVisibleGroups();
-	sg_list_t::iterator endVisibleGroups();
+	sg_iterator beginVisibleGroups();
+	sg_iterator endVisibleGroups();
 
-	sg_list_t::iterator beginAlphaGroups();
-	sg_list_t::iterator endAlphaGroups();
+	sg_iterator beginAlphaGroups();
+	sg_iterator endAlphaGroups();
 
 	bool hasOcclusionGroups() { return mOcclusionGroupsSize > 0; }
-	sg_list_t::iterator beginOcclusionGroups();
-	sg_list_t::iterator endOcclusionGroups();
+	sg_iterator beginOcclusionGroups();
+	sg_iterator endOcclusionGroups();
 
-	sg_list_t::iterator beginDrawableGroups();
-	sg_list_t::iterator endDrawableGroups();
+	sg_iterator beginDrawableGroups();
+	sg_iterator endDrawableGroups();
 
-	drawable_list_t::iterator beginVisibleList();
-	drawable_list_t::iterator endVisibleList();
+	drawable_iterator beginVisibleList();
+	drawable_iterator endVisibleList();
 
-	bridge_list_t::iterator beginVisibleBridge();
-	bridge_list_t::iterator endVisibleBridge();
+	bridge_iterator beginVisibleBridge();
+	bridge_iterator endVisibleBridge();
 
-	drawinfo_list_t::iterator beginRenderMap(U32 type);
-	drawinfo_list_t::iterator endRenderMap(U32 type);
+	drawinfo_iterator beginRenderMap(U32 type);
+	drawinfo_iterator endRenderMap(U32 type);
 
 	void pushVisibleGroup(LLSpatialGroup* group);
 	void pushAlphaGroup(LLSpatialGroup* group);
@@ -569,28 +574,41 @@ public:
 	void assertDrawMapsEmpty();
 
 private:
+
+	void pushBack(void** &head, U32& count, void* val);
+
 	U32					mVisibleGroupsSize;
 	U32					mAlphaGroupsSize;
 	U32					mOcclusionGroupsSize;
 	U32					mDrawableGroupsSize;
 	U32					mVisibleListSize;
 	U32					mVisibleBridgeSize;
+
+	U32					mVisibleGroupsAllocated;
+	U32					mAlphaGroupsAllocated;
+	U32					mOcclusionGroupsAllocated;
+	U32					mDrawableGroupsAllocated;
+	U32					mVisibleListAllocated;
+	U32					mVisibleBridgeAllocated;
+
 	U32					mRenderMapSize[LLRenderPass::NUM_RENDER_TYPES];
 
 	sg_list_t			mVisibleGroups;
-	sg_list_t::iterator mVisibleGroupsEnd;
+	sg_iterator			mVisibleGroupsEnd;
 	sg_list_t			mAlphaGroups;
-	sg_list_t::iterator mAlphaGroupsEnd;
+	sg_iterator			mAlphaGroupsEnd;
 	sg_list_t			mOcclusionGroups;
-	sg_list_t::iterator	mOcclusionGroupsEnd;
+	sg_iterator			mOcclusionGroupsEnd;
 	sg_list_t			mDrawableGroups;
-	sg_list_t::iterator mDrawableGroupsEnd;
+	sg_iterator			mDrawableGroupsEnd;
 	drawable_list_t		mVisibleList;
-	drawable_list_t::iterator mVisibleListEnd;
+	drawable_iterator	mVisibleListEnd;
 	bridge_list_t		mVisibleBridge;
-	bridge_list_t::iterator mVisibleBridgeEnd;
+	bridge_iterator		mVisibleBridgeEnd;
 	drawinfo_list_t		mRenderMap[LLRenderPass::NUM_RENDER_TYPES];
-	drawinfo_list_t::iterator mRenderMapEnd[LLRenderPass::NUM_RENDER_TYPES];
+	U32					mRenderMapAllocated[LLRenderPass::NUM_RENDER_TYPES];
+	drawinfo_iterator mRenderMapEnd[LLRenderPass::NUM_RENDER_TYPES];
+
 };
 
 
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 27632dcfc..f6cdbba74 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1815,19 +1815,19 @@ void LLPipeline::checkReferences(LLFace* face)
 #if 0
 	if (sCull)
 	{
-		for (LLCullResult::sg_list_t::iterator iter = sCull->beginVisibleGroups(); iter != sCull->endVisibleGroups(); ++iter)
+		for (LLCullResult::sg_iterator iter = sCull->beginVisibleGroups(); iter != sCull->endVisibleGroups(); ++iter)
 		{
 			LLSpatialGroup* group = *iter;
 			check_references(group, face);
 		}
 
-		for (LLCullResult::sg_list_t::iterator iter = sCull->beginAlphaGroups(); iter != sCull->endAlphaGroups(); ++iter)
+		for (LLCullResult::sg_iterator iter = sCull->beginAlphaGroups(); iter != sCull->endAlphaGroups(); ++iter)
 		{
 			LLSpatialGroup* group = *iter;
 			check_references(group, face);
 		}
 
-		for (LLCullResult::sg_list_t::iterator iter = sCull->beginDrawableGroups(); iter != sCull->endDrawableGroups(); ++iter)
+		for (LLCullResult::sg_iterator iter = sCull->beginDrawableGroups(); iter != sCull->endDrawableGroups(); ++iter)
 		{
 			LLSpatialGroup* group = *iter;
 			check_references(group, face);
@@ -1847,19 +1847,19 @@ void LLPipeline::checkReferences(LLDrawable* drawable)
 #if 0
 	if (sCull)
 	{
-		for (LLCullResult::sg_list_t::iterator iter = sCull->beginVisibleGroups(); iter != sCull->endVisibleGroups(); ++iter)
+		for (LLCullResult::sg_iterator iter = sCull->beginVisibleGroups(); iter != sCull->endVisibleGroups(); ++iter)
 		{
 			LLSpatialGroup* group = *iter;
 			check_references(group, drawable);
 		}
 
-		for (LLCullResult::sg_list_t::iterator iter = sCull->beginAlphaGroups(); iter != sCull->endAlphaGroups(); ++iter)
+		for (LLCullResult::sg_iterator iter = sCull->beginAlphaGroups(); iter != sCull->endAlphaGroups(); ++iter)
 		{
 			LLSpatialGroup* group = *iter;
 			check_references(group, drawable);
 		}
 
-		for (LLCullResult::sg_list_t::iterator iter = sCull->beginDrawableGroups(); iter != sCull->endDrawableGroups(); ++iter)
+		for (LLCullResult::sg_iterator iter = sCull->beginDrawableGroups(); iter != sCull->endDrawableGroups(); ++iter)
 		{
 			LLSpatialGroup* group = *iter;
 			check_references(group, drawable);
@@ -1898,19 +1898,19 @@ void LLPipeline::checkReferences(LLDrawInfo* draw_info)
 #if 0
 	if (sCull)
 	{
-		for (LLCullResult::sg_list_t::iterator iter = sCull->beginVisibleGroups(); iter != sCull->endVisibleGroups(); ++iter)
+		for (LLCullResult::sg_iterator iter = sCull->beginVisibleGroups(); iter != sCull->endVisibleGroups(); ++iter)
 		{
 			LLSpatialGroup* group = *iter;
 			check_references(group, draw_info);
 		}
 
-		for (LLCullResult::sg_list_t::iterator iter = sCull->beginAlphaGroups(); iter != sCull->endAlphaGroups(); ++iter)
+		for (LLCullResult::sg_iterator iter = sCull->beginAlphaGroups(); iter != sCull->endAlphaGroups(); ++iter)
 		{
 			LLSpatialGroup* group = *iter;
 			check_references(group, draw_info);
 		}
 
-		for (LLCullResult::sg_list_t::iterator iter = sCull->beginDrawableGroups(); iter != sCull->endDrawableGroups(); ++iter)
+		for (LLCullResult::sg_iterator iter = sCull->beginDrawableGroups(); iter != sCull->endDrawableGroups(); ++iter)
 		{
 			LLSpatialGroup* group = *iter;
 			check_references(group, draw_info);
@@ -1924,7 +1924,7 @@ void LLPipeline::checkReferences(LLSpatialGroup* group)
 #if 0
 	if (sCull)
 	{
-		for (LLCullResult::sg_list_t::iterator iter = sCull->beginVisibleGroups(); iter != sCull->endVisibleGroups(); ++iter)
+		for (LLCullResult::sg_iterator iter = sCull->beginVisibleGroups(); iter != sCull->endVisibleGroups(); ++iter)
 		{
 			if (group == *iter)
 			{
@@ -1932,7 +1932,7 @@ void LLPipeline::checkReferences(LLSpatialGroup* group)
 			}
 		}
 
-		for (LLCullResult::sg_list_t::iterator iter = sCull->beginAlphaGroups(); iter != sCull->endAlphaGroups(); ++iter)
+		for (LLCullResult::sg_iterator iter = sCull->beginAlphaGroups(); iter != sCull->endAlphaGroups(); ++iter)
 		{
 			if (group == *iter)
 			{
@@ -1940,7 +1940,7 @@ void LLPipeline::checkReferences(LLSpatialGroup* group)
 			}
 		}
 
-		for (LLCullResult::sg_list_t::iterator iter = sCull->beginDrawableGroups(); iter != sCull->endDrawableGroups(); ++iter)
+		for (LLCullResult::sg_iterator iter = sCull->beginDrawableGroups(); iter != sCull->endDrawableGroups(); ++iter)
 		{
 			if (group == *iter)
 			{
@@ -2282,7 +2282,7 @@ void LLPipeline::doOcclusion(LLCamera& camera)
 		}
 		mCubeVB->setBuffer(LLVertexBuffer::MAP_VERTEX);
 
-		for (LLCullResult::sg_list_t::iterator iter = sCull->beginOcclusionGroups(); iter != sCull->endOcclusionGroups(); ++iter)
+		for (LLCullResult::sg_iterator iter = sCull->beginOcclusionGroups(); iter != sCull->endOcclusionGroups(); ++iter)
 		{
 			LLSpatialGroup* group = *iter;
 			group->doOcclusion(&camera);
@@ -2816,7 +2816,7 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result)
 	//LLVertexBuffer::unbind();
 
 	grabReferences(result);
-	for (LLCullResult::sg_list_t::iterator iter = sCull->beginDrawableGroups(); iter != sCull->endDrawableGroups(); ++iter)
+	for (LLCullResult::sg_iterator iter = sCull->beginDrawableGroups(); iter != sCull->endDrawableGroups(); ++iter)
 	{
 		LLSpatialGroup* group = *iter;
 		group->checkOcclusion();
@@ -2842,9 +2842,9 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result)
 	if (LLViewerCamera::sCurCameraID == LLViewerCamera::CAMERA_WORLD)
 	{
 		LLSpatialGroup* last_group = NULL;
-		for (LLCullResult::bridge_list_t::iterator i = sCull->beginVisibleBridge(); i != sCull->endVisibleBridge(); ++i)
+		for (LLCullResult::bridge_iterator i = sCull->beginVisibleBridge(); i != sCull->endVisibleBridge(); ++i)
 		{
-			LLCullResult::bridge_list_t::iterator cur_iter = i;
+			LLCullResult::bridge_iterator cur_iter = i;
 			LLSpatialBridge* bridge = *cur_iter;
 			LLSpatialGroup* group = bridge->getSpatialGroup();
 
@@ -2874,7 +2874,7 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result)
 		}
 	}
 
-	for (LLCullResult::sg_list_t::iterator iter = sCull->beginVisibleGroups(); iter != sCull->endVisibleGroups(); ++iter)
+	for (LLCullResult::sg_iterator iter = sCull->beginVisibleGroups(); iter != sCull->endVisibleGroups(); ++iter)
 	{
 		LLSpatialGroup* group = *iter;
 		group->checkOcclusion();
@@ -2896,7 +2896,7 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result)
 	
 	{
 		LLFastTimer ftm(FTM_STATESORT_DRAWABLE);
-		for (LLCullResult::drawable_list_t::iterator iter = sCull->beginVisibleList();
+		for (LLCullResult::drawable_iterator iter = sCull->beginVisibleList();
 			 iter != sCull->endVisibleList(); ++iter)
 		{
 			LLDrawable *drawablep = *iter;
@@ -3045,11 +3045,11 @@ void LLPipeline::stateSort(LLDrawable* drawablep, LLCamera& camera)
 }
 
 
-void forAllDrawables(LLCullResult::sg_list_t::iterator begin, 
-					 LLCullResult::sg_list_t::iterator end,
+void forAllDrawables(LLCullResult::sg_iterator begin, 
+					 LLCullResult::sg_iterator end,
 					 void (*func)(LLDrawable*))
 {
-	for (LLCullResult::sg_list_t::iterator i = begin; i != end; ++i)
+	for (LLCullResult::sg_iterator i = begin; i != end; ++i)
 	{
 		for (LLSpatialGroup::element_iter j = (*i)->getData().begin(); j != (*i)->getData().end(); ++j)
 		{
@@ -3219,7 +3219,7 @@ void LLPipeline::postSort(LLCamera& camera)
 
 	llpushcallstacks ;
 	//rebuild drawable geometry
-	for (LLCullResult::sg_list_t::iterator i = sCull->beginDrawableGroups(); i != sCull->endDrawableGroups(); ++i)
+	for (LLCullResult::sg_iterator i = sCull->beginDrawableGroups(); i != sCull->endDrawableGroups(); ++i)
 	{
 		LLSpatialGroup* group = *i;
 		if (!sUseOcclusion || 
@@ -3237,7 +3237,7 @@ void LLPipeline::postSort(LLCamera& camera)
 
 	
 	//build render map
-	for (LLCullResult::sg_list_t::iterator i = sCull->beginVisibleGroups(); i != sCull->endVisibleGroups(); ++i)
+	for (LLCullResult::sg_iterator i = sCull->beginVisibleGroups(); i != sCull->endVisibleGroups(); ++i)
 	{
 		LLSpatialGroup* group = *i;
 
@@ -4179,7 +4179,7 @@ void LLPipeline::renderPhysicsDisplay()
 		}
 	}
 
-	for (LLCullResult::bridge_list_t::const_iterator i = sCull->beginVisibleBridge(); i != sCull->endVisibleBridge(); ++i)
+	for (LLCullResult::bridge_iterator i = sCull->beginVisibleBridge(); i != sCull->endVisibleBridge(); ++i)
 	{
 		LLSpatialBridge* bridge = *i;
 		if (!bridge->isDead() && hasRenderType(bridge->mDrawableType))
@@ -4238,7 +4238,7 @@ void LLPipeline::renderDebug()
 		}
 	}
 
-	for (LLCullResult::bridge_list_t::const_iterator i = sCull->beginVisibleBridge(); i != sCull->endVisibleBridge(); ++i)
+	for (LLCullResult::bridge_iterator i = sCull->beginVisibleBridge(); i != sCull->endVisibleBridge(); ++i)
 	{
 		LLSpatialBridge* bridge = *i;
 		if (!bridge->isDead() && hasRenderType(bridge->mDrawableType))
@@ -9328,7 +9328,7 @@ void LLPipeline::generateSunShadow(LLCamera& camera)
 
 void LLPipeline::renderGroups(LLRenderPass* pass, U32 type, U32 mask, BOOL texture)
 {
-	for (LLCullResult::sg_list_t::iterator i = sCull->beginVisibleGroups(); i != sCull->endVisibleGroups(); ++i)
+	for (LLCullResult::sg_iterator i = sCull->beginVisibleGroups(); i != sCull->endVisibleGroups(); ++i)
 	{
 		LLSpatialGroup* group = *i;
 		if (!group->isDead() &&
@@ -9593,22 +9593,22 @@ BOOL LLPipeline::hasRenderBatches(const U32 type) const
 	return sCull->getRenderMapSize(type) > 0;
 }
 
-LLCullResult::drawinfo_list_t::iterator LLPipeline::beginRenderMap(U32 type)
+LLCullResult::drawinfo_iterator LLPipeline::beginRenderMap(U32 type)
 {
 	return sCull->beginRenderMap(type);
 }
 
-LLCullResult::drawinfo_list_t::iterator LLPipeline::endRenderMap(U32 type)
+LLCullResult::drawinfo_iterator LLPipeline::endRenderMap(U32 type)
 {
 	return sCull->endRenderMap(type);
 }
 
-LLCullResult::sg_list_t::iterator LLPipeline::beginAlphaGroups()
+LLCullResult::sg_iterator LLPipeline::beginAlphaGroups()
 {
 	return sCull->beginAlphaGroups();
 }
 
-LLCullResult::sg_list_t::iterator LLPipeline::endAlphaGroups()
+LLCullResult::sg_iterator LLPipeline::endAlphaGroups()
 {
 	return sCull->endAlphaGroups();
 }
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index 4ad8a5e19..3a89ca0a0 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -296,10 +296,10 @@ public:
 	void setLight(LLDrawable *drawablep, BOOL is_light);
 	
 	BOOL hasRenderBatches(const U32 type) const;
-	LLCullResult::drawinfo_list_t::iterator beginRenderMap(U32 type);
-	LLCullResult::drawinfo_list_t::iterator endRenderMap(U32 type);
-	LLCullResult::sg_list_t::iterator beginAlphaGroups();
-	LLCullResult::sg_list_t::iterator endAlphaGroups();
+	LLCullResult::drawinfo_iterator beginRenderMap(U32 type);
+	LLCullResult::drawinfo_iterator endRenderMap(U32 type);
+	LLCullResult::sg_iterator beginAlphaGroups();
+	LLCullResult::sg_iterator endAlphaGroups();
 	
 
 	void addTrianglesDrawn(S32 index_count, U32 render_type = LLRender::TRIANGLES);

From cc5ffafd7c5696d084761cdb99c013aacaee5dee Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Tue, 17 Jul 2012 23:54:10 -0500
Subject: [PATCH 036/199] MAINT-646: Add a lookup map for joints to remove
 hotspot in LLJoint::findJoint
 https://bitbucket.org/davep/viewer-development/changeset/15b05dc53770

---
 indra/llcharacter/llcharacter.cpp        |  5 -----
 indra/llcharacter/llmotioncontroller.cpp |  1 +
 indra/newview/llvoavatar.cpp             | 17 ++++++++++++++++-
 indra/newview/llvoavatar.h               |  4 ++++
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp
index 85291530c..d62eb8da1 100644
--- a/indra/llcharacter/llcharacter.cpp
+++ b/indra/llcharacter/llcharacter.cpp
@@ -194,19 +194,14 @@ void LLCharacter::requestStopMotion( LLMotion* motion)
 //-----------------------------------------------------------------------------
 // updateMotions()
 //-----------------------------------------------------------------------------
-static LLFastTimer::DeclareTimer FTM_UPDATE_ANIMATION("Update Animation");
-static LLFastTimer::DeclareTimer FTM_UPDATE_HIDDEN_ANIMATION("Update Hidden Anim");
-
 void LLCharacter::updateMotions(e_update_t update_type)
 {
 	if (update_type == HIDDEN_UPDATE)
 	{
-		LLFastTimer t(FTM_UPDATE_HIDDEN_ANIMATION);
 		mMotionController.updateMotionsMinimal();
 	}
 	else
 	{
-		LLFastTimer t(FTM_UPDATE_ANIMATION);
 		// unpause if the number of outstanding pause requests has dropped to the initial one
 		if (mMotionController.isPaused() && mPauseRequest->getNumRefs() == 1)
 		{
diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp
index 3b7dbec33..f0c95560e 100644
--- a/indra/llcharacter/llmotioncontroller.cpp
+++ b/indra/llcharacter/llmotioncontroller.cpp
@@ -837,6 +837,7 @@ void LLMotionController::updateMotions(bool force_update)
 				}
 
 				updateLoadingMotions();
+
 				return;
 			}
 			
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 5c4d540ea..d7a6628f2 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1179,6 +1179,7 @@ LLVOAvatar::~LLVOAvatar()
 	lldebugs << "LLVOAvatar Destructor (0x" << this << ") id:" << mID << llendl;
 
 	mRoot.removeAllChildren();
+	mJointMap.clear();
 
 	deleteAndClearArray(mSkeleton);
 	deleteAndClearArray(mCollisionVolumes);
@@ -2340,6 +2341,7 @@ void LLVOAvatar::buildCharacter()
 	// remove all of mRoot's children
 	//-------------------------------------------------------------------------
 	mRoot.removeAllChildren();
+	mJointMap.clear();
 	mIsBuilt = FALSE;
 
 	//-------------------------------------------------------------------------
@@ -5887,7 +5889,20 @@ const LLUUID& LLVOAvatar::getID() const
 // RN: avatar joints are multi-rooted to include screen-based attachments
 LLJoint *LLVOAvatar::getJoint( const std::string &name )
 {
-	LLJoint* jointp = mRoot.findJoint(name);
+	joint_map_t::iterator iter = mJointMap.find(name);
+
+	LLJoint* jointp = NULL;
+
+	if (iter == mJointMap.end() || iter->second == NULL)
+	{ //search for joint and cache found joint in lookup table
+		jointp = mRoot.findJoint(name);
+		mJointMap[name] = jointp;
+	}
+	else
+	{ //return cached pointer
+		jointp = iter->second;
+	}
+
 	return jointp;
 }
 
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h
index e0d4b3bf5..81529a2f3 100644
--- a/indra/newview/llvoavatar.h
+++ b/indra/newview/llvoavatar.h
@@ -376,6 +376,10 @@ public:
 
 	LLVector3			mHeadOffset; // current head position
 	LLViewerJoint		mRoot;
+
+	typedef std::map<std::string, LLJoint*> joint_map_t;
+	joint_map_t			mJointMap;
+
 protected:
 	static BOOL			parseSkeletonFile(const std::string& filename);
 	void				buildCharacter();

From a56ad597d414b9604ae1bad32ab883adc55f8e78 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Wed, 18 Jul 2012 00:54:52 -0500
Subject: [PATCH 037/199] MAINT-646: Factor std::set out of lloctree
 https://bitbucket.org/davep/viewer-development/changeset/52b6c9168974

---
 indra/llmath/lloctree.h              | 131 +++++++++++++++++++--------
 indra/llmath/llvolume.cpp            |   6 +-
 indra/llmath/llvolumeoctree.cpp      |   6 +-
 indra/llmath/llvolumeoctree.h        |   7 +-
 indra/newview/lldrawable.cpp         |  26 +++++-
 indra/newview/lldrawable.h           |   6 +-
 indra/newview/llface.cpp             |  22 +++--
 indra/newview/llspatialpartition.cpp |  48 +++++-----
 indra/newview/llspatialpartition.h   |   5 +
 indra/newview/llvograss.cpp          |   2 +-
 indra/newview/llvopartgroup.cpp      |   2 +-
 indra/newview/llvovolume.cpp         |  29 ++++--
 indra/newview/pipeline.cpp           |  14 +--
 13 files changed, 208 insertions(+), 96 deletions(-)

diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index c8a0875f5..9a5918849 100644
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -89,9 +89,9 @@ public:
 
 	typedef LLOctreeTraveler<T>									oct_traveler;
 	typedef LLTreeTraveler<T>									tree_traveler;
-	typedef typename std::set<LLPointer<T> >					element_list;
-	typedef typename element_list::iterator						element_iter;
-	typedef typename element_list::const_iterator	const_element_iter;
+	typedef LLPointer<T>*										element_list;
+	typedef LLPointer<T>*										element_iter;
+	typedef const LLPointer<T>*									const_element_iter;
 	typedef typename std::vector<LLTreeListener<T>*>::iterator	tree_listener_iter;
 	typedef typename std::vector<LLOctreeNode<T>* >				child_list;
 	typedef LLTreeNode<T>		BaseType;
@@ -115,6 +115,9 @@ public:
 	:	mParent((oct_node*)parent), 
 		mOctant(octant) 
 	{ 
+		mData = NULL;
+		mDataEnd = NULL;
+
 		mCenter = center;
 		mSize = size;
 
@@ -133,6 +136,16 @@ public:
 	{ 
 		BaseType::destroyListeners(); 
 		
+		for (U32 i = 0; i < mElementCount; ++i)
+		{
+			mData[i]->setBinIndex(-1);
+			mData[i] = NULL;
+		}
+
+		free(mData);
+		mData = NULL;
+		mDataEnd = NULL;
+
 		for (U32 i = 0; i < getChildCount(); i++)
 		{
 			delete getChild(i);
@@ -232,9 +245,14 @@ public:
 	virtual bool isLeaf() const						{ return mChild.empty(); }
 	
 	U32 getElementCount() const						{ return mElementCount; }
+	bool isEmpty() const							{ return mElementCount == 0; }
 	element_list& getData()							{ return mData; }
 	const element_list& getData() const				{ return mData; }
-	
+	element_iter getDataBegin()						{ return mData; }
+	element_iter getDataEnd()						{ return mDataEnd; }
+	const_element_iter getDataBegin() const			{ return mData; }
+	const_element_iter getDataEnd() const			{ return mDataEnd; }
+		
 	U32 getChildCount()	const						{ return mChildCount; }
 	oct_node* getChild(U32 index)					{ return mChild[index]; }
 	const oct_node* getChild(U32 index) const		{ return mChild[index]; }
@@ -299,7 +317,7 @@ public:
 	
 	virtual bool insert(T* data)
 	{
-		if (data == NULL)
+		if (data == NULL || data->getBinIndex() != -1)
 		{
 			OCT_ERRS << "!!! INVALID ELEMENT ADDED TO OCTREE BRANCH !!!" << llendl;
 			return false;
@@ -309,22 +327,19 @@ public:
 		//is it here?
 		if (isInside(data->getPositionGroup()))
 		{
-			if (((getElementCount() < gOctreeMaxCapacity && contains(data->getBinRadius())) ||
+			if ((getElementCount() < gOctreeMaxCapacity && contains(data->getBinRadius()) ||
 				(data->getBinRadius() > getSize()[0] &&	parent && parent->getElementCount() >= gOctreeMaxCapacity))) 
 			{ //it belongs here
-#if LL_OCTREE_PARANOIA_CHECK
-				//if this is a redundant insertion, error out (should never happen)
-				if (mData.find(data) != mData.end())
-				{
-					llwarns << "Redundant octree insertion detected. " << data << llendl;
-					return false;
-				}
-#endif
+				mElementCount++;
+				mData = (element_list) realloc(mData, sizeof(LLPointer<T>)*mElementCount);
 
-				mData.insert(data);
+				//avoid unref on uninitialized memory
+				memset(mData+mElementCount-1, 0, sizeof(LLPointer<T>));
+
+				mData[mElementCount-1] = data;
+				mDataEnd = mData + mElementCount;
+				data->setBinIndex(mElementCount-1);
 				BaseType::insert(data);
-
-				mElementCount = mData.size();
 				return true;
 			}
 			else
@@ -358,10 +373,16 @@ public:
 
 				if( lt == 0x7 )
 				{
-					mData.insert(data);
-					BaseType::insert(data);
+					mElementCount++;
+					mData = (element_list) realloc(mData, sizeof(LLPointer<T>)*mElementCount);
 
-					mElementCount = mData.size();
+					//avoid unref on uninitialized memory
+					memset(mData+mElementCount-1, 0, sizeof(LLPointer<T>));
+
+					mData[mElementCount-1] = data;
+					mDataEnd = mData + mElementCount;
+					data->setBinIndex(mElementCount-1);
+					BaseType::insert(data);
 					return true;
 				}
 
@@ -410,23 +431,59 @@ public:
 		return false;
 	}
 
+	void _remove(T* data, S32 i)
+	{ //precondition -- mElementCount > 0, idx is in range [0, mElementCount)
+
+		mElementCount--;
+		data->setBinIndex(-1); 
+		
+		if (mElementCount > 0)
+		{
+			if (mElementCount != i)
+			{
+				mData[i] = mData[mElementCount]; //might unref data, do not access data after this point
+				mData[i]->setBinIndex(i);
+			}
+
+			mData[mElementCount] = NULL; //needed for unref
+			mData = (element_list) realloc(mData, sizeof(LLPointer<T>)*mElementCount);
+			mDataEnd = mData+mElementCount;
+		}
+		else
+		{
+			mData[0] = NULL; //needed for unref
+			free(mData);
+			mData = NULL;
+			mDataEnd = NULL;
+		}
+
+		notifyRemoval(data);
+		checkAlive();
+	}
+
 	bool remove(T* data)
 	{
-		if (mData.find(data) != mData.end())
-		{	//we have data
-			mData.erase(data);
-			mElementCount = mData.size();
-			this->notifyRemoval(data);
-			checkAlive();
-			return true;
+		S32 i = data->getBinIndex();
+
+		if (i >= 0 && i < (S32)mElementCount)
+		{
+			if (mData[i] == data)
+			{ //found it
+				_remove(data, i);
+				llassert(data->getBinIndex() == -1);
+				return true;
+			}
 		}
-		else if (isInside(data))
+		
+		if (isInside(data))
 		{
 			oct_node* dest = getNodeAt(data);
 
 			if (dest != this)
 			{
-				return dest->remove(data);
+				bool ret = dest->remove(data);
+				llassert(data->getBinIndex() == -1);
+				return ret;
 			}
 		}
 
@@ -445,19 +502,20 @@ public:
 		//node is now root
 		llwarns << "!!! OCTREE REMOVING FACE BY ADDRESS, SEVERE PERFORMANCE PENALTY |||" << llendl;
 		node->removeByAddress(data);
+		llassert(data->getBinIndex() == -1);
 		return true;
 	}
 
 	void removeByAddress(T* data)
 	{
-        if (mData.find(data) != mData.end())
+        for (U32 i = 0; i < mElementCount; ++i)
 		{
-			mData.erase(data);
-			mElementCount = mData.size();
-			this->notifyRemoval(data);
-			llwarns << "FOUND!" << llendl;
-			checkAlive();
-			return;
+			if (mData[i] == data)
+			{ //we have data
+				_remove(data, i);
+				llwarns << "FOUND!" << llendl;
+				return;
+			}
 		}
 		
 		for (U32 i = 0; i < getChildCount(); i++)
@@ -624,6 +682,7 @@ protected:
 	U32 mChildCount;
 
 	element_list mData;
+	element_iter mDataEnd;
 	U32 mElementCount;
 		
 };
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 8b47a92ea..99094ce23 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -324,16 +324,16 @@ public:
 		LLVector4a& min = node->mExtents[0];
 		LLVector4a& max = node->mExtents[1];
 
-		if (!branch->getData().empty())
+		if (!branch->isEmpty())
 		{ //node has data, find AABB that binds data set
-			const LLVolumeTriangle* tri = *(branch->getData().begin());
+			const LLVolumeTriangle* tri = *(branch->getDataBegin());
 			
 			//initialize min/max to first available vertex
 			min = *(tri->mV[0]);
 			max = *(tri->mV[0]);
 			
 			for (LLOctreeNode<LLVolumeTriangle>::const_element_iter iter = 
-				branch->getData().begin(); iter != branch->getData().end(); ++iter)
+				branch->getDataBegin(); iter != branch->getDataEnd(); ++iter)
 			{ //for each triangle in node
 
 				//stretch by triangles in node
diff --git a/indra/llmath/llvolumeoctree.cpp b/indra/llmath/llvolumeoctree.cpp
index d5bd5a78d..cf9aeece8 100644
--- a/indra/llmath/llvolumeoctree.cpp
+++ b/indra/llmath/llvolumeoctree.cpp
@@ -131,7 +131,7 @@ void LLOctreeTriangleRayIntersect::traverse(const LLOctreeNode<LLVolumeTriangle>
 void LLOctreeTriangleRayIntersect::visit(const LLOctreeNode<LLVolumeTriangle>* node)
 {
 	for (LLOctreeNode<LLVolumeTriangle>::const_element_iter iter = 
-			node->getData().begin(); iter != node->getData().end(); ++iter)
+			node->getDataBegin(); iter != node->getDataEnd(); ++iter)
 	{
 		const LLVolumeTriangle* tri = *iter;
 
@@ -236,8 +236,8 @@ void LLVolumeOctreeValidate::visit(const LLOctreeNode<LLVolumeTriangle>* branch)
 	}
 
 	//children fit, check data
-	for (LLOctreeNode<LLVolumeTriangle>::const_element_iter iter = branch->getData().begin(); 
-			iter != branch->getData().end(); ++iter)
+	for (LLOctreeNode<LLVolumeTriangle>::const_element_iter iter = branch->getDataBegin(); 
+			iter != branch->getDataEnd(); ++iter)
 	{
 		const LLVolumeTriangle* tri = *iter;
 
diff --git a/indra/llmath/llvolumeoctree.h b/indra/llmath/llvolumeoctree.h
index 688d91dc4..c25e37f1a 100644
--- a/indra/llmath/llvolumeoctree.h
+++ b/indra/llmath/llvolumeoctree.h
@@ -39,7 +39,7 @@ class LLVolumeTriangle : public LLRefCount
 public:
 	LLVolumeTriangle()
 	{
-		
+		mBinIndex = -1;	
 	}
 
 	LLVolumeTriangle(const LLVolumeTriangle& rhs)
@@ -64,9 +64,14 @@ public:
 	U16 mIndex[3];
 
 	F32 mRadius;
+	mutable S32 mBinIndex;
+
 
 	virtual const LLVector4a& getPositionGroup() const;
 	virtual const F32& getBinRadius() const;
+	
+	S32 getBinIndex() const { return mBinIndex; }
+	void setBinIndex(S32 idx) const { mBinIndex = idx; }
 };
 
 class LLVolumeOctreeListener : public LLOctreeListener<LLVolumeTriangle>
diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index b9df32f06..89e26ccb1 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -113,6 +113,7 @@ void LLDrawable::init()
 	
 	mGeneration = -1;
 	mBinRadius = 1.f;
+	mBinIndex = -1;
 	mSpatialBridge = NULL;
 }
 
@@ -963,6 +964,12 @@ void LLDrawable::updateUVMinMax()
 {
 }
 
+LLSpatialGroup* LLDrawable::getSpatialGroup() const
+{ 
+	llassert((mSpatialGroupp == NULL) ? getBinIndex() == -1 : getBinIndex() != -1);
+	return mSpatialGroupp; 
+}
+
 void LLDrawable::setSpatialGroup(LLSpatialGroup *groupp)
 {
 /*if (mSpatialGroupp && (groupp != mSpatialGroupp))
@@ -985,6 +992,8 @@ void LLDrawable::setSpatialGroup(LLSpatialGroup *groupp)
 	}
 
 	mSpatialGroupp = groupp;
+
+	llassert((mSpatialGroupp == NULL) ? getBinIndex() == -1 : getBinIndex() != -1);
 }
 
 LLSpatialPartition* LLDrawable::getSpatialPartition()
@@ -1107,6 +1116,8 @@ LLSpatialBridge::LLSpatialBridge(LLDrawable* root, BOOL render_by_group, U32 dat
 	mDrawable = root;
 	root->setSpatialBridge(this);
 	
+	mBinIndex = -1;
+
 	mRenderType = mDrawable->mRenderType;
 	mDrawableType = mDrawable->mRenderType;
 	
@@ -1500,7 +1511,13 @@ void LLSpatialBridge::cleanupReferences()
 	LLDrawable::cleanupReferences();
 	if (mDrawable)
 	{
-		mDrawable->setSpatialGroup(NULL);
+		LLSpatialGroup* group = mDrawable->getSpatialGroup();
+		if (group)
+		{
+			group->mOctreeNode->remove(mDrawable);
+			mDrawable->setSpatialGroup(NULL);
+		}
+		
 		if (mDrawable->getVObj())
 		{
 			LLViewerObject::const_child_list_t& child_list = mDrawable->getVObj()->getChildren();
@@ -1511,7 +1528,12 @@ void LLSpatialBridge::cleanupReferences()
 				LLDrawable* drawable = child->mDrawable;					
 				if (drawable)
 				{
-					drawable->setSpatialGroup(NULL);
+					LLSpatialGroup* group = drawable->getSpatialGroup();
+					if (group)
+					{
+						group->mOctreeNode->remove(drawable);
+						drawable->setSpatialGroup(NULL);
+					}
 				}
 			}
 		}
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h
index 6f07c82be..bd2d23c5f 100644
--- a/indra/newview/lldrawable.h
+++ b/indra/newview/lldrawable.h
@@ -115,6 +115,9 @@ public:
 	F32			          getIntensity() const			{ return llmin(mXform.getScale().mV[0], 4.f); }
 	S32					  getLOD() const				{ return mVObjp ? mVObjp->getLOD() : 1; }
 	F32					  getBinRadius() const			{ return mBinRadius; }
+	S32					  getBinIndex() const			{ return mBinIndex; }
+	void				  setBinIndex(S32 index) const	{ mBinIndex = index; }
+
 	void  getMinMax(LLVector3& min,LLVector3& max) const { mXform.getMinMax(min,max); }
 	LLXformMatrix*		getXform() { return &mXform; }
 
@@ -200,7 +203,7 @@ public:
 	S32 findReferences(LLDrawable *drawablep); // Not const because of @#$! iterators...
 
 	void setSpatialGroup(LLSpatialGroup *groupp);
-	LLSpatialGroup *getSpatialGroup() const			{ return mSpatialGroupp; }
+	LLSpatialGroup *getSpatialGroup() const;
 	LLSpatialPartition* getSpatialPartition();
 	
 	// Statics
@@ -321,6 +324,7 @@ private:
 	mutable U32		mVisible;
 	F32				mRadius;
 	F32				mBinRadius;
+	mutable S32		mBinIndex;
 	S32				mGeneration;
 	
 	LLVector3		mCurrentScale;
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index e52bb5959..38e41c6b4 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1209,19 +1209,25 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 	{
 		if (num_indices + (S32) mIndicesIndex > mVertexBuffer->getNumIndices())
 		{
-			llwarns	<< "Index buffer overflow!" << llendl;
-			llwarns << "Indices Count: " << mIndicesCount
-					<< " VF Num Indices: " << num_indices
-					<< " Indices Index: " << mIndicesIndex
-					<< " VB Num Indices: " << mVertexBuffer->getNumIndices() << llendl;
-			llwarns	<< " Face Index: " << f
-					<< " Pool Type: " << mPoolType << llendl;
+			if (gDebugGL)
+			{
+				llwarns	<< "Index buffer overflow!" << llendl;
+				llwarns << "Indices Count: " << mIndicesCount
+						<< " VF Num Indices: " << num_indices
+						<< " Indices Index: " << mIndicesIndex
+						<< " VB Num Indices: " << mVertexBuffer->getNumIndices() << llendl;
+				llwarns	<< " Face Index: " << f
+						<< " Pool Type: " << mPoolType << llendl;
+			}
 			return FALSE;
 		}
 
 		if (num_vertices + mGeomIndex > mVertexBuffer->getNumVerts())
 		{
-			llwarns << "Vertex buffer overflow!" << llendl;
+			if (gDebugGL)
+			{
+				llwarns << "Vertex buffer overflow!" << llendl;
+			}
 			return FALSE;
 		}
 	}
diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 55e3b758f..784a0e69c 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -424,7 +424,7 @@ void LLSpatialGroup::validate()
 
 	validateDrawMap();
 
-	for (element_iter i = getData().begin(); i != getData().end(); ++i)
+	for (element_iter i = getDataBegin(); i != getDataEnd(); ++i)
 	{
 		LLDrawable* drawable = *i;
 		sg_assert(drawable->getSpatialGroup() == this);
@@ -640,7 +640,7 @@ BOOL LLSpatialGroup::boundObjects(BOOL empty, LLVector4a& minOut, LLVector4a& ma
 {	
 	const OctreeNode* node = mOctreeNode;
 
-	if (node->getData().empty())
+	if (node->isEmpty())
 	{	//don't do anything if there are no objects
 		if (empty && mOctreeNode->getParent())
 		{	//only root is allowed to be empty
@@ -657,14 +657,14 @@ BOOL LLSpatialGroup::boundObjects(BOOL empty, LLVector4a& minOut, LLVector4a& ma
 		clearState(OBJECT_DIRTY);
 
 		//initialize bounding box to first element
-		OctreeNode::const_element_iter i = node->getData().begin();
+		OctreeNode::const_element_iter i = node->getDataBegin();
 		LLDrawable* drawablep = *i;
 		const LLVector4a* minMax = drawablep->getSpatialExtents();
 
 		newMin = minMax[0];
 		newMax = minMax[1];
 
-		for (++i; i != node->getData().end(); ++i)
+		for (++i; i != node->getDataEnd(); ++i)
 		{
 			drawablep = *i;
 			minMax = drawablep->getSpatialExtents();
@@ -1124,7 +1124,7 @@ void LLSpatialGroup::updateDistance(LLCamera &camera)
 		llerrs << "Spatial group dirty on distance update." << llendl;
 	}
 #endif
-	if (!getData().empty() /*&& !LLSpatialPartition::sFreezeState*/)
+	if (!isEmpty() /*&& !LLSpatialPartition::sFreezeState*/)
 	{
 		mRadius = mSpatialPartition->mRenderByGroup ? mObjectBounds[1].getLength3().getF32() :
 						(F32) mOctreeNode->getSize().getLength3().getF32();
@@ -1276,7 +1276,7 @@ void LLSpatialGroup::handleDestruction(const TreeNode* node)
 	LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
 	setState(DEAD);
 	
-	for (element_iter i = getData().begin(); i != getData().end(); ++i)
+	for (element_iter i = getDataBegin(); i != getDataEnd(); ++i)
 	{
 		LLDrawable* drawable = *i;
 		if (drawable->getSpatialGroup() == this)
@@ -1363,7 +1363,7 @@ void LLSpatialGroup::destroyGL(bool keep_occlusion)
 	}
 
 
-	for (LLSpatialGroup::element_iter i = getData().begin(); i != getData().end(); ++i)
+	for (LLSpatialGroup::element_iter i = getDataBegin(); i != getDataEnd(); ++i)
 	{
 		LLDrawable* drawable = *i;
 		for (S32 j = 0; j < drawable->getNumFaces(); j++)
@@ -1720,12 +1720,14 @@ BOOL LLSpatialPartition::remove(LLDrawable *drawablep, LLSpatialGroup *curp)
 {
 	LLMemType mt(LLMemType::MTYPE_SPACE_PARTITION);
 	
-	drawablep->setSpatialGroup(NULL);
-
 	if (!curp->removeObject(drawablep))
 	{
 		OCT_ERRS << "Failed to remove drawable from octree!" << llendl;
 	}
+	else
+	{
+		drawablep->setSpatialGroup(NULL);
+	}
 
 	assert_octree_valid(mOctree);
 	
@@ -1996,7 +1998,7 @@ public:
 
 	virtual void processGroup(LLSpatialGroup* group)
 	{
-		llassert(!group->isState(LLSpatialGroup::DIRTY) && !group->getData().empty())
+		llassert(!group->isState(LLSpatialGroup::DIRTY) && !group->isEmpty())
 		
 		if (mRes < 2)
 		{
@@ -2063,7 +2065,7 @@ public:
 	{
 		LLSpatialGroup::OctreeNode* branch = group->mOctreeNode;
 
-		for (LLSpatialGroup::OctreeNode::const_element_iter i = branch->getData().begin(); i != branch->getData().end(); ++i)
+		for (LLSpatialGroup::OctreeNode::const_element_iter i = branch->getDataBegin(); i != branch->getDataEnd(); ++i)
 		{
 			LLDrawable* drawable = *i;
 			
@@ -2187,7 +2189,7 @@ public:
 		LLSpatialGroup* group = (LLSpatialGroup*) state->getListener(0);
 		group->destroyGL();
 
-		for (LLSpatialGroup::element_iter i = group->getData().begin(); i != group->getData().end(); ++i)
+		for (LLSpatialGroup::element_iter i = group->getDataBegin(); i != group->getDataEnd(); ++i)
 		{
 			LLDrawable* drawable = *i;
 			if (drawable->getVObj().notNull() && !group->mSpatialPartition->mRenderByGroup)
@@ -2500,7 +2502,7 @@ void renderOctree(LLSpatialGroup* group)
 			gGL.flush();
 			glLineWidth(1.f);
 			gGL.flush();
-			for (LLSpatialGroup::element_iter i = group->getData().begin(); i != group->getData().end(); ++i)
+			for (LLSpatialGroup::element_iter i = group->getDataBegin(); i != group->getDataEnd(); ++i)
 			{
 				LLDrawable* drawable = *i;
 				if (!group->mSpatialPartition->isBridge())
@@ -2546,7 +2548,7 @@ void renderOctree(LLSpatialGroup* group)
 	}
 	else
 	{
-		if (group->mBufferUsage == GL_STATIC_DRAW_ARB && !group->getData().empty() 
+		if (group->mBufferUsage == GL_STATIC_DRAW_ARB && !group->isEmpty() 
 			&& group->mSpatialPartition->mRenderByGroup)
 		{
 			col.setVec(0.8f, 0.4f, 0.1f, 0.1f);
@@ -2614,7 +2616,7 @@ void renderVisibility(LLSpatialGroup* group, LLCamera* camera)
 	glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 
 	BOOL render_objects = (!LLPipeline::sUseOcclusion || !group->isOcclusionState(LLSpatialGroup::OCCLUDED)) && group->isVisible() &&
-							!group->getData().empty();
+							!group->isEmpty();
 
 	if (render_objects)
 	{
@@ -3356,7 +3358,7 @@ void renderPhysicsShape(LLDrawable* drawable, LLVOVolume* volume)
 
 void renderPhysicsShapes(LLSpatialGroup* group)
 {
-	for (LLSpatialGroup::OctreeNode::const_element_iter i = group->getData().begin(); i != group->getData().end(); ++i)
+	for (LLSpatialGroup::OctreeNode::const_element_iter i = group->getDataBegin(); i != group->getDataEnd(); ++i)
 	{
 		LLDrawable* drawable = *i;
 		LLVOVolume* volume = drawable->getVOVolume();
@@ -3601,7 +3603,7 @@ public:
 
 		LLVector3 center, size;
 		
-		if (branch->getData().empty())
+		if (branch->isEmpty())
 		{
 			gGL.diffuseColor3f(1.f,0.2f,0.f);
 			center.set(branch->getCenter().getF32ptr());
@@ -3637,8 +3639,8 @@ public:
 			}
 
 			gGL.begin(LLRender::TRIANGLES);
-			for (LLOctreeNode<LLVolumeTriangle>::const_element_iter iter = branch->getData().begin();
-					iter != branch->getData().end();
+			for (LLOctreeNode<LLVolumeTriangle>::const_element_iter iter = branch->getDataBegin();
+					iter != branch->getDataEnd();
 					++iter)
 			{
 				const LLVolumeTriangle* tri = *iter;
@@ -3875,7 +3877,7 @@ public:
 
 		if (gPipeline.hasRenderDebugMask(LLPipeline::RENDER_DEBUG_BBOXES))
 		{
-			if (!group->getData().empty())
+			if (!group->isEmpty())
 			{
 				gGL.diffuseColor3f(0,0,1);
 				drawBoxOutline(group->mObjectBounds[0],
@@ -3883,7 +3885,7 @@ public:
 			}
 		}
 
-		for (LLSpatialGroup::OctreeNode::const_element_iter i = branch->getData().begin(); i != branch->getData().end(); ++i)
+		for (LLSpatialGroup::OctreeNode::const_element_iter i = branch->getDataBegin(); i != branch->getDataEnd(); ++i)
 		{
 			LLDrawable* drawable = *i;
 					
@@ -4068,7 +4070,7 @@ public:
 			return;
 		}
 
-		for (LLSpatialGroup::OctreeNode::const_element_iter i = branch->getData().begin(); i != branch->getData().end(); ++i)
+		for (LLSpatialGroup::OctreeNode::const_element_iter i = branch->getDataBegin(); i != branch->getDataEnd(); ++i)
 		{
 			LLDrawable* drawable = *i;
 						
@@ -4291,7 +4293,7 @@ public:
 	
 	virtual void visit(const LLSpatialGroup::OctreeNode* branch) 
 	{	
-		for (LLSpatialGroup::OctreeNode::const_element_iter i = branch->getData().begin(); i != branch->getData().end(); ++i)
+		for (LLSpatialGroup::OctreeNode::const_element_iter i = branch->getDataBegin(); i != branch->getDataEnd(); ++i)
 		{
 			check(*i);
 		}
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h
index d86221ddc..890a52f0d 100644
--- a/indra/newview/llspatialpartition.h
+++ b/indra/newview/llspatialpartition.h
@@ -330,8 +330,13 @@ public:
 
 	void dirtyGeom() { setState(GEOM_DIRTY); }
 	void dirtyMesh() { setState(MESH_DIRTY); }
+
+	//octree wrappers to make code more readable
 	element_list& getData() { return mOctreeNode->getData(); }
+	element_iter getDataBegin() { return mOctreeNode->getDataBegin(); }
+	element_iter getDataEnd() { return mOctreeNode->getDataEnd(); }
 	U32 getElementCount() const { return mOctreeNode->getElementCount(); }
+	bool isEmpty() const { return mOctreeNode->isEmpty(); }
 
 	void drawObjectBox(LLColor4 col);
 
diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp
index 5a58ae770..6434dd619 100644
--- a/indra/newview/llvograss.cpp
+++ b/indra/newview/llvograss.cpp
@@ -645,7 +645,7 @@ void LLGrassPartition::addGeometryCount(LLSpatialGroup* group, U32& vertex_count
 	mFaceList.clear();
 
 	LLViewerCamera* camera = LLViewerCamera::getInstance();
-	for (LLSpatialGroup::element_iter i = group->getData().begin(); i != group->getData().end(); ++i)
+	for (LLSpatialGroup::element_iter i = group->getDataBegin(); i != group->getDataEnd(); ++i)
 	{
 		LLDrawable* drawablep = *i;
 		
diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp
index 434c8ca64..3dee80cce 100644
--- a/indra/newview/llvopartgroup.cpp
+++ b/indra/newview/llvopartgroup.cpp
@@ -582,7 +582,7 @@ void LLParticlePartition::addGeometryCount(LLSpatialGroup* group, U32& vertex_co
 	mFaceList.clear();
 
 	LLViewerCamera* camera = LLViewerCamera::getInstance();
-	for (LLSpatialGroup::element_iter i = group->getData().begin(); i != group->getData().end(); ++i)
+	for (LLSpatialGroup::element_iter i = group->getDataBegin(); i != group->getDataEnd(); ++i)
 	{
 		LLDrawable* drawablep = *i;
 		
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index d8b34bd30..4431a9a33 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -2390,7 +2390,7 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const
 		produces_light = 1;
 	}
 
-	for (S32 i = 0; i < num_faces; ++i)
+	for (S32 i = 0; i < (S32)num_faces; ++i)
 	{
 		const LLFace* face = drawablep->getFace(i);
 		if (!face) continue;
@@ -3481,7 +3481,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 		LLFastTimer t(FTM_REBUILD_VOLUME_FACE_LIST);
 
 		//get all the faces into a list
-		for (LLSpatialGroup::element_iter drawable_iter = group->getData().begin(); drawable_iter != group->getData().end(); ++drawable_iter)
+		for (LLSpatialGroup::element_iter drawable_iter = group->getDataBegin(); drawable_iter != group->getDataEnd(); ++drawable_iter)
 		{
 			LLDrawable* drawablep = *drawable_iter;
 		
@@ -3887,7 +3887,7 @@ void LLVolumeGeometryManager::rebuildGeom(LLSpatialGroup* group)
 	if (!LLPipeline::sDelayVBUpdate)
 	{
 		//drawables have been rebuilt, clear rebuild status
-		for (LLSpatialGroup::element_iter drawable_iter = group->getData().begin(); drawable_iter != group->getData().end(); ++drawable_iter)
+		for (LLSpatialGroup::element_iter drawable_iter = group->getDataBegin(); drawable_iter != group->getDataEnd(); ++drawable_iter)
 		{
 			LLDrawable* drawablep = *drawable_iter;
 			drawablep->clearState(LLDrawable::REBUILD_ALL);
@@ -3927,7 +3927,7 @@ void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group)
 		
 		std::set<LLVertexBuffer*> mapped_buffers;
 
-		for (LLSpatialGroup::element_iter drawable_iter = group->getData().begin(); drawable_iter != group->getData().end(); ++drawable_iter)
+		for (LLSpatialGroup::element_iter drawable_iter = group->getDataBegin(); drawable_iter != group->getDataEnd(); ++drawable_iter)
 		{
 			LLDrawable* drawablep = *drawable_iter;
 
@@ -3951,8 +3951,14 @@ void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group)
 						if (buff)
 						{
 							llassert(!face->isState(LLFace::RIGGED));
-							face->getGeometryVolume(*volume, face->getTEOffset(), 
-								vobj->getRelativeXform(), vobj->getRelativeXformInvTrans(), face->getGeomIndex());
+
+							if (!face->getGeometryVolume(*volume, face->getTEOffset(), 
+								vobj->getRelativeXform(), vobj->getRelativeXformInvTrans(), face->getGeomIndex()))
+							{ //something's gone wrong with the vertex buffer accounting, rebuild this group 
+								group->dirtyGeom();
+								gPipeline.markRebuild(group, TRUE);
+							}
+
 
 							if (buff->isLocked())
 							{
@@ -3993,7 +3999,7 @@ void LLVolumeGeometryManager::rebuildMesh(LLSpatialGroup* group)
 				llwarns << "Not all mapped vertex buffers are unmapped!" << llendl ;
 				warningsCount = 1;
 			}
-			for (LLSpatialGroup::element_iter drawable_iter = group->getData().begin(); drawable_iter != group->getData().end(); ++drawable_iter)
+			for (LLSpatialGroup::element_iter drawable_iter = group->getDataBegin(); drawable_iter != group->getDataEnd(); ++drawable_iter)
 			{
 				LLDrawable* drawablep = *drawable_iter;
 				for (S32 i = 0; i < drawablep->getNumFaces(); ++i)
@@ -4294,8 +4300,11 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std::
 
 					llassert(!facep->isState(LLFace::RIGGED));
 
-					facep->getGeometryVolume(*volume, te_idx, 
-						vobj->getRelativeXform(), vobj->getRelativeXformInvTrans(), index_offset,true);
+					if (!facep->getGeometryVolume(*volume, te_idx, 
+						vobj->getRelativeXform(), vobj->getRelativeXformInvTrans(), index_offset,true))
+					{
+						llwarns << "Failed to get geometry for face!" << llendl;
+					}
 
 					if (drawablep->isState(LLDrawable::ANIMATED_CHILD))
 					{
@@ -4464,7 +4473,7 @@ void LLGeometryManager::addGeometryCount(LLSpatialGroup* group, U32 &vertex_coun
 
 	//for each drawable
 
-	for (LLSpatialGroup::element_iter drawable_iter = group->getData().begin(); drawable_iter != group->getData().end(); ++drawable_iter)
+	for (LLSpatialGroup::element_iter drawable_iter = group->getDataBegin(); drawable_iter != group->getDataEnd(); ++drawable_iter)
 	{
 		LLDrawable* drawablep = *drawable_iter;
 		
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index f6cdbba74..9235a7b2a 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1174,7 +1174,7 @@ public:
 	{
 		LLSpatialGroup* group = (LLSpatialGroup*) node->getListener(0);
 
-		if (!group->isState(LLSpatialGroup::GEOM_DIRTY) && !group->getData().empty())
+		if (!group->isState(LLSpatialGroup::GEOM_DIRTY) && !group->isEmpty())
 		{
 			for (LLSpatialGroup::draw_map_t::iterator i = group->mDrawMap.begin(); i != group->mDrawMap.end(); ++i)
 			{
@@ -1781,7 +1781,7 @@ void LLPipeline::clearReferences()
 
 void check_references(LLSpatialGroup* group, LLDrawable* drawable)
 {
-	for (LLSpatialGroup::element_iter i = group->getData().begin(); i != group->getData().end(); ++i)
+	for (LLSpatialGroup::element_iter i = group->getDataBegin(); i != group->getDataEnd(); ++i)
 	{
 		if (drawable == *i)
 		{
@@ -1803,7 +1803,7 @@ void check_references(LLDrawable* drawable, LLFace* face)
 
 void check_references(LLSpatialGroup* group, LLFace* face)
 {
-	for (LLSpatialGroup::element_iter i = group->getData().begin(); i != group->getData().end(); ++i)
+	for (LLSpatialGroup::element_iter i = group->getDataBegin(); i != group->getDataEnd(); ++i)
 	{
 		LLDrawable* drawable = *i;
 		check_references(drawable, face);
@@ -2179,7 +2179,7 @@ void LLPipeline::updateCull(LLCamera& camera, LLCullResult& result, S32 water_cl
 
 void LLPipeline::markNotCulled(LLSpatialGroup* group, LLCamera& camera)
 {
-	if (group->getData().empty())
+	if (group->isEmpty())
 	{ 
 		return;
 	}
@@ -2827,7 +2827,7 @@ void LLPipeline::stateSort(LLCamera& camera, LLCullResult &result)
 		else
 		{
 			group->setVisible();
-			for (LLSpatialGroup::element_iter i = group->getData().begin(); i != group->getData().end(); ++i)
+			for (LLSpatialGroup::element_iter i = group->getDataBegin(); i != group->getDataEnd(); ++i)
 			{
 				markVisible(*i, camera);
 			}
@@ -2915,7 +2915,7 @@ void LLPipeline::stateSort(LLSpatialGroup* group, LLCamera& camera)
 	LLMemType mt(LLMemType::MTYPE_PIPELINE_STATE_SORT);
 	if (!sSkipUpdate && group->changeLOD())
 	{
-		for (LLSpatialGroup::element_iter i = group->getData().begin(); i != group->getData().end(); ++i)
+		for (LLSpatialGroup::element_iter i = group->getDataBegin(); i != group->getDataEnd(); ++i)
 		{
 			LLDrawable* drawablep = *i;
 			stateSort(drawablep, camera);
@@ -3051,7 +3051,7 @@ void forAllDrawables(LLCullResult::sg_iterator begin,
 {
 	for (LLCullResult::sg_iterator i = begin; i != end; ++i)
 	{
-		for (LLSpatialGroup::element_iter j = (*i)->getData().begin(); j != (*i)->getData().end(); ++j)
+		for (LLSpatialGroup::element_iter j = (*i)->getDataBegin(); j != (*i)->getDataEnd(); ++j)
 		{
 			func(*j);	
 		}

From bf3e605d3b47cd715bb76c7789b825b3b164bf80 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Wed, 18 Jul 2012 01:03:54 -0500
Subject: [PATCH 038/199] MAINT-646: Factor std::vector out of lloctree
 https://bitbucket.org/davep/viewer-development/changeset/efcec3eb374f

---
 indra/llmath/lloctree.h      | 17 ++++++++++-------
 indra/llmath/llvolume.cpp    |  2 +-
 indra/newview/llvovolume.cpp |  4 ++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index 9a5918849..07ca00913 100644
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -37,7 +37,6 @@
 #include "v3math.h"
 #include "llvector4a.h"
 #include <vector>
-#include <set>
 
 #if LL_RELEASE_WITH_DEBUG_INFO || LL_DEBUG
 #define OCT_ERRS LL_ERRS("OctreeErrors")
@@ -93,7 +92,8 @@ public:
 	typedef LLPointer<T>*										element_iter;
 	typedef const LLPointer<T>*									const_element_iter;
 	typedef typename std::vector<LLTreeListener<T>*>::iterator	tree_listener_iter;
-	typedef typename std::vector<LLOctreeNode<T>* >				child_list;
+	typedef LLOctreeNode<T>**									child_list;
+	typedef LLOctreeNode<T>**									child_iter;
 	typedef LLTreeNode<T>		BaseType;
 	typedef LLOctreeNode<T>		oct_node;
 	typedef LLOctreeListener<T>	oct_listener;
@@ -242,7 +242,7 @@ public:
 	}
 
 	void accept(oct_traveler* visitor)				{ visitor->visit(this); }
-	virtual bool isLeaf() const						{ return mChild.empty(); }
+	virtual bool isLeaf() const						{ return mChildCount == 0; }
 	
 	U32 getElementCount() const						{ return mElementCount; }
 	bool isEmpty() const							{ return mElementCount == 0; }
@@ -527,8 +527,8 @@ public:
 
 	void clearChildren()
 	{
-		mChild.clear();
 		mChildCount = 0;
+
 		U32* foo = (U32*) mChildMap;
 		foo[0] = foo[1] = 0xFFFFFFFF;
 	}
@@ -590,7 +590,7 @@ public:
 
 		mChildMap[child->getOctant()] = mChildCount;
 
-		mChild.push_back(child);
+		mChild[mChildCount] = child;
 		++mChildCount;
 		child->setParent(this);
 
@@ -619,9 +619,12 @@ public:
 			mChild[index]->destroy();
 			delete mChild[index];
 		}
-		mChild.erase(mChild.begin() + index);
+
 		--mChildCount;
 
+		mChild[index] = mChild[mChildCount];
+		
+
 		//rebuild child map
 		U32* foo = (U32*) mChildMap;
 		foo[0] = foo[1] = 0xFFFFFFFF;
@@ -677,7 +680,7 @@ protected:
 	oct_node* mParent;
 	U8 mOctant;
 
-	child_list mChild;
+	LLOctreeNode<T>* mChild[8];
 	U8 mChildMap[8];
 	U32 mChildCount;
 
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp
index 99094ce23..54a88a570 100644
--- a/indra/llmath/llvolume.cpp
+++ b/indra/llmath/llvolume.cpp
@@ -348,7 +348,7 @@ public:
 				max.setMax(max, *tri->mV[2]);
 			}
 		}
-		else if (!branch->getChildren().empty())
+		else if (!branch->isLeaf())
 		{ //no data, but child nodes exist
 			LLVolumeOctreeListener* child = (LLVolumeOctreeListener*) branch->getChild(0)->getListener(0);
 
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 4431a9a33..ba9b6c994 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -430,8 +430,8 @@ BOOL LLVOVolume::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 {
 	LLViewerObject::idleUpdate(agent, world, time);
 
-	static LLFastTimer::DeclareTimer ftm("Volume Idle");
-	LLFastTimer t(ftm);
+	//static LLFastTimer::DeclareTimer ftm("Volume Idle");
+	//LLFastTimer t(ftm);
 
 	if (mDead || mDrawable.isNull())
 	{

From 9c58d42a3c204821221d4be80ffbc1ac57cb0248 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Wed, 18 Jul 2012 02:40:41 -0500
Subject: [PATCH 039/199] MAINT-646: Don't spend so much time fetching avatar
 physics params.
 https://bitbucket.org/davep/viewer-development/changeset/b895285ab0de

---
 indra/newview/llphysicsmotion.cpp | 117 ++++++++++++++++++++----------
 indra/newview/llphysicsmotion.h   |  37 ++++------
 2 files changed, 95 insertions(+), 59 deletions(-)

diff --git a/indra/newview/llphysicsmotion.cpp b/indra/newview/llphysicsmotion.cpp
index fbcd93912..1df29b37e 100644
--- a/indra/newview/llphysicsmotion.cpp
+++ b/indra/newview/llphysicsmotion.cpp
@@ -2,31 +2,25 @@
  * @file llphysicsmotion.cpp
  * @brief Implementation of LLPhysicsMotion class.
  *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2011&license=viewerlgpl$
  * 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
+ * Copyright (C) 2011, Linden Research, Inc.
  * 
- * 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
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
  * 
- * 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.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
 
@@ -74,6 +68,19 @@ inline F64 llsgn(const F64 a)
 class LLPhysicsMotion
 {
 public:
+	typedef enum
+	{
+		SMOOTHING = 0,
+		MASS,
+		GRAVITY,
+		SPRING,
+		GAIN,
+		DAMPING,
+		DRAG,
+		MAX_EFFECT,
+		NUM_PARAMS
+	} eParamName;
+
         /*
           param_driver_name: The param that controls the params that are being affected by the physics.
           joint_name: The joint that the body part is attached to.  The joint is
@@ -107,8 +114,12 @@ public:
 				mVelocity_local(0)
         {
                 mJointState = new LLJointState;
-        }
 
+				for (U32 i = 0; i < NUM_PARAMS; ++i)
+				{
+					mParamCache[i] = NULL;
+				}
+		}
 		void getString(std::ostringstream &oss);
 
         BOOL initialize();
@@ -124,19 +135,46 @@ public:
 		
 		void reset();
 protected:
-        F32 getParamValue(const std::string& controller_key)
-        {
-                const controller_map_t::const_iterator& entry = mParamControllers.find(controller_key);
+
+		F32 getParamValue(eParamName param)
+		{
+			static std::string controller_key[] = 
+			{
+				"Smoothing",
+				"Mass",
+				"Gravity",
+				"Spring",
+				"Gain",
+				"Damping",
+				"Drag",
+				"MaxEffect"
+			};
+
+			if (!mParamCache[param])
+			{
+				const controller_map_t::const_iterator& entry = mParamControllers.find(controller_key[param]);
                 if (entry == mParamControllers.end())
                 {
-                        return sDefaultController[controller_key];
+                        return sDefaultController[controller_key[param]];
                 }
                 const std::string& param_name = (*entry).second.c_str();
-                return mCharacter->getVisualParamWeight(param_name.c_str());
-        }
+                mParamCache[param] = mCharacter->getVisualParam(param_name.c_str());
+			}
+				
+			if (mParamCache[param])
+			{
+				return mParamCache[param]->getWeight();
+			}
+			else
+			{
+				return sDefaultController[controller_key[param]];
+			}
+		}
+
+        
         void setParamValue(LLViewerVisualParam *param,
                            const F32 new_value_local,
-						   F32 behavior_maxeffect);
+                                                   F32 behavior_maxeffect);
 
         F32 toLocal(const LLVector3 &world);
         F32 calculateVelocity_local();
@@ -164,6 +202,8 @@ private:
 
         F32 mLastTime;
         
+		LLVisualParam* mParamCache[NUM_PARAMS];
+
         static default_controller_map_t sDefaultController;
 };
 
@@ -268,7 +308,7 @@ void LLPhysicsMotion::getString(std::ostringstream &oss)
 	oss << " Controllers:" << std::endl;
 	for(controller_map_t::const_iterator it = mParamControllers.begin(); it!= mParamControllers.end(); ++it)
 	{
-		oss << "  mParamControllers[\"" << it->first << "\"] = \"" << it->second << "\" =" << getParamValue(it->first) << std::endl;
+		oss << "  mParamControllers[\"" << it->first << "\"] = \"" << it->second << "\" =" << mCharacter->getVisualParamWeight(it->first.c_str()) << std::endl;
 	}
 }
 
@@ -574,15 +614,16 @@ BOOL LLPhysicsMotion::onUpdate(F32 time)
 
         LLJoint *joint = mJointState->getJoint();
 
-        const F32 behavior_mass = getParamValue("Mass");
-        const F32 behavior_gravity = getParamValue("Gravity");
-        const F32 behavior_spring = getParamValue("Spring");
-        const F32 behavior_gain = getParamValue("Gain");
-        const F32 behavior_damping = getParamValue("Damping");
-        const F32 behavior_drag = getParamValue("Drag");
-        const BOOL physics_test = FALSE; // Enable this to simulate bouncing on all parts.
+		const F32 behavior_mass = getParamValue(MASS);
+		const F32 behavior_gravity = getParamValue(GRAVITY);
+		const F32 behavior_spring = getParamValue(SPRING);
+		const F32 behavior_gain = getParamValue(GAIN);
+		const F32 behavior_damping = getParamValue(DAMPING);
+		const F32 behavior_drag = getParamValue(DRAG);
+		F32 behavior_maxeffect = getParamValue(MAX_EFFECT);
+		
+		const BOOL physics_test = FALSE; // Enable this to simulate bouncing on all parts.
         
-        F32 behavior_maxeffect = getParamValue("MaxEffect");
         if (physics_test)
                 behavior_maxeffect = 1.0f;
 
diff --git a/indra/newview/llphysicsmotion.h b/indra/newview/llphysicsmotion.h
index 7e6bddd17..7412c9d88 100644
--- a/indra/newview/llphysicsmotion.h
+++ b/indra/newview/llphysicsmotion.h
@@ -2,31 +2,25 @@
  * @file llphysicsmotion.h
  * @brief Implementation of LLPhysicsMotion class.
  *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2011&license=viewerlgpl$
  * 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
+ * Copyright (C) 2011, Linden Research, Inc.
  * 
- * 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
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
  * 
- * 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.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
 
@@ -113,6 +107,7 @@ public:
 	virtual void onDeactivate();
 
 	LLCharacter* getCharacter() { return mCharacter; }
+
 protected:
 	void addMotion(LLPhysicsMotion *motion);
 private:

From 03608103b82d6be623bf5379bee779972c825933 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 18 Jul 2012 03:57:07 -0400
Subject: [PATCH 040/199] Tiny French Translation update

~Thanks Nomade~
---
 .../skins/default/xui/fr/menu_inventory.xml   |   6 +
 .../xui/fr/panel_preferences_graphics1.xml    | 134 ++++++++----------
 2 files changed, 65 insertions(+), 75 deletions(-)

diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml
index 4f1d8f4a4..f63241f51 100644
--- a/indra/newview/skins/default/xui/fr/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml
@@ -68,6 +68,12 @@
 	<menu_item_call label="Éditer" name="Wearable Edit"/>
 	<menu_item_call label="Porter" name="Wearable Wear"/>
 	<menu_item_call label="Enlever" name="Take Off"/>
+	<menu_item_call label="Trouver l'origine" name="Find Original"/>
+	<menu_item_call label="Porter" name="Wearable And Object Wear"/>
+	<menu_item_call label="&#9650; Haut" name="Wearable Move Forward"/>
+	<menu_item_call label="&#9660; Bas" name="Wearable Move Back"/>
+	<menu_item_call label="Ajouter" name="Wearable Add"/>
+	<menu_item_call label="Enlever de l'ensemble" name="Remove From Outfit"/>
 	<menu_item_call label="--aucune option--" name="--no options--"/>
   <menu_item_call bottom_delta="-18" height="18" label="Porter l'ensemble" left="0" name="Wear Items" width="128">
     <on_click filter="" function="Inventory.DoToSelected" userdata="wearitems" />
diff --git a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
index 1deaf0412..17eb1309d 100644
--- a/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/fr/panel_preferences_graphics1.xml
@@ -5,7 +5,7 @@
 		D&#xE9;cocher cette option pour passer en mode plein &#xE9;cran.
 	</text_editor>
 	<text name="WindowSizeLabel">
-		Taille de la fen&#xEA;tre :
+		Taille de la fen&#xEA;tre:
 	</text>
 	<combo_box name="windowsize combo">
 		<combo_item name="640x480">
@@ -25,48 +25,48 @@
 		</combo_item>
 	</combo_box>
 	<text name="DisplayResLabel" width="165">
-		R&#xE9;solution de l&apos;affichage :
+		R&#xE9;solution de l'affichage:
 	</text>
 	<text name="AspectRatioLabel1" tool_tip="largeur/hauteur">
-		Rapport hauteur/largeur :
+		Rapport hauteur/largeur:
 	</text>
 	<combo_box name="aspect_ratio" tool_tip="largeur/hauteur">
-		<combo_item length="1" name="4:3(StandardCRT)" type="string">
+		<combo_item name="4:3(StandardCRT)">
 			4:3 (Standard CRT)
 		</combo_item>
-		<combo_item length="1" name="5:4(1280x1024LCD)" type="string">
+		<combo_item name="5:4(1280x1024LCD)">
 			5:4 (1280 x 1024 LCD)
 		</combo_item>
 		<combo_item name="8:5(Widescreen)">
 			8:5 (&#xE9;cran large)
 		</combo_item>
-		<combo_item length="1" name="16:9(Widescreen)" type="string">
+		<combo_item name="16:9(Widescreen)">
 			16:9 (plein &#xE9;cran)
 		</combo_item>
 	</combo_box>
-	<text length="1" name="text" type="string">
-		R&#xE9;solution d&apos;affichage :
+	<text name="text">
+		R&#xE9;solution d'affichage:
 	</text>
-	<text length="1" name="Fullscreen Aspect Ratio:" type="string">
-		Format de plein &#xE9;cran :
+	<text name="Fullscreen Aspect Ratio:">
+		Format de plein &#xE9;cran:
 	</text>
-	<text length="1" name="(width / height)" type="string">
+	<text name="(width / height)">
 		(largeur / hauteur)
 	</text>
-	<text length="1" name="UI Size:" type="string">
-		Taille de l&apos;IU :
+	<text name="UI Size:">
+		Taille de l'IU:
 	</text>
-	<text length="1" name="(meters, lower is faster)" type="string">
+	<text name="(meters, lower is faster)">
 		(mètres, moins = plus rapide)
 	</text>
-	<text length="1" name="text2" type="string">
-		Options d&apos;affichage :
+	<text name="text2">
+		Options d'affichage:
 	</text>
 	<check_box label="Lancer Singularity dans une fen&#xEA;tre (et non pas, PAR la fen&#xEA;tre)" name="windowed mode"/>
 	<check_box label="Auto-d&#xE9;tection du ratio" left="350" name="aspect_auto_detect"/>
 	<check_box label="Utiliser &#xE9;chelle de r&#xE9;solution ind&#xE9;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"/>
+	<check_box label="Montrer l'avatar en vue subjective" name="avfp"/>
+	<spinner label="Distance d'affichage:" name="draw_distance"/>
 	<text name="HigherText">
 		Qualit&#xE9; et
 	</text>
@@ -94,68 +94,51 @@
 	<text name="QualityText2" visible="false"/>
 	<check_box label="Personnaliser" left="395" name="CustomSettings"/>
 	<text name="ShadersText">
-		Effets :
+		Effets:
 	</text>
 	<check_box label="Pla&#xE7;age de relief et brillance" name="BumpShiny"/>
 	<check_box label="Effets de base" name="BasicShaders" tool_tip="D&#xE9;sactiver cette option peut emp&#xEA;cher certains drivers de cartes graphiques de planter."/>
 	<check_box label="Effets atmosph&#xE9;riques" name="WindLightUseAtmosShaders"/>
-	<check_box bottom_delta="-17" control_name="RenderDeferred" enabled="true"
-	     follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="true" label="D&#xE9;lissage" left_delta="0"
-	     mouse_opaque="true" name="RenderDeferred" radio_style="false"
-	     width="256" />
-<check_box bottom_delta="-17" control_name="RenderDepthOfField"	initial_value="true" label="Profondeur de champ" left_delta="0" name="RenderDepthOfField"/>
-<check_box bottom_delta="-17" control_name="RenderDeferredGI" enabled="true"
-      follows="left|top" font="SansSerifSmall" height="16"
-      initial_value="true" label="Illumination globale (Experimental)" left_delta="0"
-      mouse_opaque="true" name="RenderDeferredGI" radio_style="false"
-      width="256" />
-		<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-17" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12"
-	     left="15" mouse_opaque="true" name="ReflectionDetailText" v_pad="0"
-	     width="128">
-		Reflets :
+	<check_box label="D&#xE9;lissage" name="RenderDeferred" width="256" />
+	<check_box label="Occlusion ambiante" name="UseSSAO"/>
+	<check_box label="Profondeur de champ" name="RenderDepthOfField"/>
+	<check_box label="Illumination globale (Experimental)" name="RenderDeferredGI" width="256"/>
+	<text bottom_delta="-17" name="ReflectionDetailText" width="128">
+		Reflets:
 	</text>
-	<combo_box bottom_delta="-20" control_name="RenderReflectionDetail" enabled = "true" follows="left|top" label="Reflection Detail"
-		 left_delta="-2" mouse_opaque="true" name="ReflectionDetailCombo" width="160" height="16">
-          <combo_item type="string" length="1" name="0">
+	<combo_box bottom_delta="-20" label="Reflection Detail" name="ReflectionDetailCombo">
+		<combo_item name="0">
            Aucun
-           </combo_item>
-		<combo_item type="string" length="1" name="1">
+		</combo_item>
+		<combo_item name="1">
 			Terrain et arbres
 		</combo_item>
-		<combo_item type="string" length="1" name="2">
+		<combo_item name="2">
 			Objets Statiques
 		</combo_item>
-		<combo_item type="string" length="1" name="3">
+		<combo_item name="3">
 			Avatars et objets
 		</combo_item>
-		<combo_item type="string" length="1" name="4">
+		<combo_item name="4">
 			Tout
 		</combo_item>
 	</combo_box>
-<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-      bottom_delta="-17" drop_shadow_visible="true" enabled="true" follows="left|top"
-      font="SansSerifSmall" h_pad="0" halign="left" height="12"
-      left="15" mouse_opaque="true" name="ShadowDetailText" v_pad="0"
-      width="128">
-    Ombres att&#xE9;nu&#xE9;es :
-  </text>
-  <combo_box bottom_delta="-20" control_name="RenderShadowDetail" enabled = "true" follows="left|top" label="Shadow Detail"
-   left_delta="-2" mouse_opaque="true" name="ShadowDetailCombo" width="160" height="16">
-    <combo_item type="string" length="1" name="0" value="0">
-      D&#xE9;sactiv&#xE9;
+	<text bottom_delta="-17" name="ShadowDetailText" width="128">
+		Ombres att&#xE9;nu&#xE9;es:
+	</text>
+	<combo_box bottom_delta="-20" label="Shadow Detail" name="ShadowDetailCombo">
+	<combo_item name="0">
+		D&#xE9;sactiv&#xE9;
     </combo_item>
-    <combo_item type="string" length="1" name="1" value="1">
-      Ombres solaires
+    <combo_item name="1">
+        Ombres solaires
     </combo_item>
-    <combo_item type="string" length="1" name="2" value="2">
-      Ombres des projecteurs
+    <combo_item name="2">
+        Ombres des projecteurs
     </combo_item>
   </combo_box>
-      <text name="AvatarRenderingText">
-		Rendu de l&apos;avatar :
+	<text name="AvatarRenderingText">
+		Rendu de l'avatar:
 	</text>
 	<check_box label="Avatars &#xE9;loign&#xE9;s en 2D" name="AvatarImpostors"/>
 	<check_box label="Acc&#xE9;l&#xE9;ration du rendu" name="AvatarVertexProgram"/>
@@ -166,18 +149,18 @@
 	<text name="DrawDistanceMeterText2">
 		m
 	</text>
-	<slider label="Limite d&apos;affichage :" name="DrawDistance"/>
-	<slider label="Nombre de particules max. :" label_width="143" name="MaxParticleCount"/>
-	<slider label="Qualit&#xE9; post-traitement :" label_width="125" name="RenderPostProcess"/>
+	<slider label="Limite d'affichage:" name="DrawDistance"/>
+	<slider label="Nombre de particules max.:" label_width="143" name="MaxParticleCount"/>
+	<slider label="Qualit&#xE9; post-traitement:" label_width="125" name="RenderPostProcess"/>
 	<text name="MeshDetailText">
-		D&#xE9;tails des rendus :
+		D&#xE9;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"/>
+	<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>
@@ -200,7 +183,7 @@
 		Faible
 	</text>
 	<text name="LightingDetailText">
-		Sources lumineuses :
+		Sources lumineuses:
 	</text>
 	<radio_group name="LightingDetailRadio">
 		<radio_item name="SunMoon">
@@ -211,7 +194,7 @@
 		</radio_item>
 	</radio_group>
 	<text left="380" name="TerrainDetailText">
-		Rendu du terrain :
+		Rendu du terrain:
 	</text>
 	<radio_group name="TerrainDetailRadio">
 		<radio_item name="0">
@@ -221,8 +204,9 @@
 			Elev&#xE9;
 		</radio_item>
 	</radio_group>
-	<button label="Param&#xE8;tres recommand&#xE9;s" name="Defaults"/>
-	<button label="Configuration du matériel" label_selected="Configuration du mat&#xE9;riel" name="GraphicsHardwareButton"/>
+	<button label="Param&#xE8;tres recommand&#xE9;s" left="20" name="Defaults" width="200"/>
+	<!--button label="Advanced" left="130" name="CustomSettingsButton"/-->
+	<button label="Configuration du mat&#xE9;riel" left="240" name="GraphicsHardwareButton" width="220"/>
 	<text name="resolution_format">
 		[RES_X] x [RES_Y]
 	</text>

From d57d0ceb0df1a549a3e97aa33030146d9b9da72c Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Wed, 18 Jul 2012 03:04:12 -0500
Subject: [PATCH 041/199] MAINT-646: Vectorize LLPolyMesh
 https://bitbucket.org/davep/viewer-development/changeset/668dcacd6e76

---
 indra/newview/lldriverparam.cpp     |  26 ++-
 indra/newview/lldriverparam.h       |  10 +-
 indra/newview/llpolymesh.cpp        | 349 +++++++++++++++-------------
 indra/newview/llpolymesh.h          |  52 ++---
 indra/newview/llpolymorph.cpp       | 294 ++++++++++++-----------
 indra/newview/llpolymorph.h         |  18 +-
 indra/newview/lltexlayerparams.h    |  20 +-
 indra/newview/llviewervisualparam.h |   8 +-
 8 files changed, 424 insertions(+), 353 deletions(-)

diff --git a/indra/newview/lldriverparam.cpp b/indra/newview/lldriverparam.cpp
index 93c437d2d..a1cba861c 100644
--- a/indra/newview/lldriverparam.cpp
+++ b/indra/newview/lldriverparam.cpp
@@ -155,6 +155,7 @@ LLDriverParam::LLDriverParam(LLVOAvatar *avatarp) :
 	mAvatarp(avatarp), 
 	mWearablep(NULL)
 {
+	mDefaultVec.clear();
 }
 
 LLDriverParam::LLDriverParam(LLWearable *wearablep) : 
@@ -162,6 +163,7 @@ LLDriverParam::LLDriverParam(LLWearable *wearablep) :
 	mAvatarp(NULL), 
 	mWearablep(wearablep)
 {
+	mDefaultVec.clear();
 }
 
 LLDriverParam::~LLDriverParam()
@@ -341,18 +343,19 @@ F32	LLDriverParam::getTotalDistortion()
 	return sum; 
 }
 
-const LLVector3	&LLDriverParam::getAvgDistortion()	
+const LLVector4a	&LLDriverParam::getAvgDistortion()	
 {
 	// It's not actually correct to take the average of averages, but it good enough here.
-	LLVector3 sum;
+	LLVector4a sum;
+	sum.clear();
 	S32 count = 0;
 	for( entry_list_t::iterator iter = mDriven.begin(); iter != mDriven.end(); iter++ )
 	{
 		LLDrivenEntry* driven = &(*iter);
-		sum += driven->mParam->getAvgDistortion();
+		sum.add(driven->mParam->getAvgDistortion());
 		count++;
 	}
-	sum /= (F32)count;
+	sum.mul( 1.f/(F32)count);
 
 	mDefaultVec = sum;
 	return mDefaultVec; 
@@ -375,21 +378,22 @@ F32	LLDriverParam::getMaxDistortion()
 }
 
 
-LLVector3	LLDriverParam::getVertexDistortion(S32 index, LLPolyMesh *poly_mesh)
+LLVector4a	LLDriverParam::getVertexDistortion(S32 index, LLPolyMesh *poly_mesh)
 {
-	LLVector3 sum;
+	LLVector4a sum;
+	sum.clear();
 	for( entry_list_t::iterator iter = mDriven.begin(); iter != mDriven.end(); iter++ )
 	{
 		LLDrivenEntry* driven = &(*iter);
-		sum += driven->mParam->getVertexDistortion( index, poly_mesh );
+		sum.add(driven->mParam->getVertexDistortion( index, poly_mesh ));
 	}
 	return sum;
 }
 
-const LLVector3*	LLDriverParam::getFirstDistortion(U32 *index, LLPolyMesh **poly_mesh)
+const LLVector4a*	LLDriverParam::getFirstDistortion(U32 *index, LLPolyMesh **poly_mesh)
 {
 	mCurrentDistortionParam = NULL;
-	const LLVector3* v = NULL;
+	const LLVector4a* v = NULL;
 	for( entry_list_t::iterator iter = mDriven.begin(); iter != mDriven.end(); iter++ )
 	{
 		LLDrivenEntry* driven = &(*iter);
@@ -404,7 +408,7 @@ const LLVector3*	LLDriverParam::getFirstDistortion(U32 *index, LLPolyMesh **poly
 	return v;
 };
 
-const LLVector3*	LLDriverParam::getNextDistortion(U32 *index, LLPolyMesh **poly_mesh)
+const LLVector4a*	LLDriverParam::getNextDistortion(U32 *index, LLPolyMesh **poly_mesh)
 {
 	llassert( mCurrentDistortionParam );
 	if( !mCurrentDistortionParam )
@@ -432,7 +436,7 @@ const LLVector3*	LLDriverParam::getNextDistortion(U32 *index, LLPolyMesh **poly_
 	}
 
 	// We're already in the middle of a param's distortions, so get the next one.
-	const LLVector3* v = driven->mParam->getNextDistortion( index, poly_mesh );
+	const LLVector4a* v = driven->mParam->getNextDistortion( index, poly_mesh );
 	if( (!v) && (iter != mDriven.end()) )
 	{
 		// This param is finished, so start the next param.  It might not have any
diff --git a/indra/newview/lldriverparam.h b/indra/newview/lldriverparam.h
index fb1b44458..7a4d711d4 100644
--- a/indra/newview/lldriverparam.h
+++ b/indra/newview/lldriverparam.h
@@ -105,18 +105,18 @@ public:
 	
 	// LLViewerVisualParam Virtual functions
 	/*virtual*/ F32					getTotalDistortion();
-	/*virtual*/ const LLVector3&	getAvgDistortion();
+	/*virtual*/ const LLVector4a&	getAvgDistortion();
 	/*virtual*/ F32					getMaxDistortion();
-	/*virtual*/ LLVector3			getVertexDistortion(S32 index, LLPolyMesh *poly_mesh);
-	/*virtual*/ const LLVector3*	getFirstDistortion(U32 *index, LLPolyMesh **poly_mesh);
-	/*virtual*/ const LLVector3*	getNextDistortion(U32 *index, LLPolyMesh **poly_mesh);
+	/*virtual*/ LLVector4a			getVertexDistortion(S32 index, LLPolyMesh *poly_mesh);
+	/*virtual*/ const LLVector4a*	getFirstDistortion(U32 *index, LLPolyMesh **poly_mesh);
+	/*virtual*/ const LLVector4a*	getNextDistortion(U32 *index, LLPolyMesh **poly_mesh);
 
 protected:
 	F32 getDrivenWeight(const LLDrivenEntry* driven, F32 input_weight);
 	void setDrivenWeight(LLDrivenEntry *driven, F32 driven_weight, bool upload_bake);
 
 
-	LLVector3	mDefaultVec; // temp holder
+	LLVector4a	mDefaultVec; // temp holder
 	typedef std::vector<LLDrivenEntry> entry_list_t;
 	entry_list_t mDriven;
 	LLViewerVisualParam* mCurrentDistortionParam;
diff --git a/indra/newview/llpolymesh.cpp b/indra/newview/llpolymesh.cpp
index 491cf43f3..d7b342b25 100644
--- a/indra/newview/llpolymesh.cpp
+++ b/indra/newview/llpolymesh.cpp
@@ -229,16 +229,20 @@ U32 LLPolyMeshSharedData::getNumKB()
 BOOL LLPolyMeshSharedData::allocateVertexData( U32 numVertices )
 {
 	U32 i;
-	mBaseCoords = new LLVector3[ numVertices ];
-	mBaseNormals = new LLVector3[ numVertices ];
-	mBaseBinormals = new LLVector3[ numVertices ];
+	mBaseCoords = new LLVector4a[ numVertices ];
+	mBaseNormals = new LLVector4a[ numVertices ];
+	mBaseBinormals = new LLVector4a[ numVertices ];
 	mTexCoords = new LLVector2[ numVertices ];
 	mDetailTexCoords = new LLVector2[ numVertices ];
 	mWeights = new F32[ numVertices ];
 	for (i = 0; i < numVertices; i++)
 	{
+		mBaseCoords[i].clear();
+		mBaseNormals[i].clear();
+		mBaseBinormals[i].clear();
+		mTexCoords[i].clear();
 		mWeights[i] = 0.f;
-	}
+    }
 	mNumVertices = numVertices;
 	return TRUE;
 }
@@ -408,40 +412,48 @@ BOOL LLPolyMeshSharedData::loadMesh( const std::string& fileName )
 
 			allocateVertexData( numVertices );	
 
-			//----------------------------------------------------------------
-			// Coords
-			//----------------------------------------------------------------
-			numRead = fread(mBaseCoords, 3*sizeof(float), numVertices, fp);
-			llendianswizzle(mBaseCoords, sizeof(float), 3*numVertices);
-			if (numRead != numVertices)
+			for (U16 i = 0; i < numVertices; ++i)
 			{
-				llerrs << "can't read Coordinates from " << fileName << llendl;
-				return FALSE;
-			}
+				//----------------------------------------------------------------
+				// Coords
+				//----------------------------------------------------------------
+				numRead = fread(&mBaseCoords[i], sizeof(float), 3, fp);
+				llendianswizzle(&mBaseCoords[i], sizeof(float), 3);
+				if (numRead != 3)
+					{
+						llerrs << "can't read Coordinates from " << fileName << llendl;
+						return FALSE;
+					}
+				}
 
-			//----------------------------------------------------------------
-			// Normals
-			//----------------------------------------------------------------
-			numRead = fread(mBaseNormals, 3*sizeof(float), numVertices, fp);
-			llendianswizzle(mBaseNormals, sizeof(float), 3*numVertices);
-			if (numRead != numVertices)
-			{
-				llerrs << " can't read Normals from " << fileName << llendl;
-				return FALSE;
-			}
+				for (U16 i = 0; i < numVertices; ++i)
+				{
+					//----------------------------------------------------------------
+					// Normals
+					//----------------------------------------------------------------
+					numRead = fread(&mBaseNormals[i], sizeof(float), 3, fp);
+					llendianswizzle(&mBaseNormals[i], sizeof(float), 3);
+					if (numRead != 3)
+					{
+						llerrs << " can't read Normals from " << fileName << llendl;
+						return FALSE;
+					}
+				}
 
-			//----------------------------------------------------------------
-			// Binormals
-			//----------------------------------------------------------------
-			numRead = fread(mBaseBinormals, 3*sizeof(float), numVertices, fp);
-			llendianswizzle(mBaseBinormals, sizeof(float), 3*numVertices);
-			if (numRead != numVertices)
-			{
-				llerrs << " can't read Binormals from " << fileName << llendl;
-				return FALSE;
+				for (U16 i = 0; i < numVertices; ++i)
+				{
+				//----------------------------------------------------------------
+				// Binormals
+				//----------------------------------------------------------------
+				numRead = fread(&mBaseBinormals[i], sizeof(float), 3, fp);
+				llendianswizzle(&mBaseBinormals[i], sizeof(float), 3);
+				if (numRead != 3)
+				{
+					llerrs << " can't read Binormals from " << fileName << llendl;
+					return FALSE;
+				}
 			}
 
-
 			//----------------------------------------------------------------
 			// TexCoords
 			//----------------------------------------------------------------
@@ -767,21 +779,28 @@ LLPolyMesh::LLPolyMesh(LLPolyMeshSharedData *shared_data, LLPolyMesh *reference_
 	{
 		// Allocate memory without initializing every vector
 		// NOTE: This makes asusmptions about the size of LLVector[234]
-		int nverts = mSharedData->mNumVertices;
-		int nfloats = nverts * (2*4 + 3*3 + 2 + 4);
+		S32 nverts = mSharedData->mNumVertices;
+		//make sure it's an even number of verts for alignment
+		nverts += nverts%2;
+		S32 nfloats = nverts * (
+					4 + //coords
+					4 + //normals
+					4 + //weights
+					2 + //coords
+					4 + //scaled normals
+					4 + //binormals
+					4); //scaled binormals
+
 		//use 16 byte aligned vertex data to make LLPolyMesh SSE friendly
 		mVertexData = (F32*) ll_aligned_malloc_16(nfloats*4);
-		int offset = 0;
-		mCoords				= 	(LLVector4*)(mVertexData + offset); offset += 4*nverts;
-		mNormals			=	(LLVector4*)(mVertexData + offset); offset += 4*nverts;
-		mClothingWeights	= 	(LLVector4*)(mVertexData + offset); offset += 4*nverts;
-		mTexCoords			= 	(LLVector2*)(mVertexData + offset); offset += 2*nverts;
-
-		// these members don't need to be 16-byte aligned, but the first one might be
-		// read during an aligned memcpy of mTexCoords
-		mScaledNormals =                (LLVector3*)(mVertexData + offset); offset += 3*nverts;
-		mBinormals =                    (LLVector3*)(mVertexData + offset); offset += 3*nverts;
-		mScaledBinormals = 		(LLVector3*)(mVertexData + offset); offset += 3*nverts;
+		S32 offset = 0;
+		mCoords				= 	(LLVector4a*)(mVertexData + offset); offset += 4*nverts;
+		mNormals			=	(LLVector4a*)(mVertexData + offset); offset += 4*nverts;
+		mClothingWeights	= 	(LLVector4a*)(mVertexData + offset); offset += 4*nverts;
+		mTexCoords			= 	(LLVector2*)(mVertexData + offset);  offset += 2*nverts;
+		mScaledNormals		=   (LLVector4a*)(mVertexData + offset); offset += 4*nverts;
+		mBinormals			=   (LLVector4a*)(mVertexData + offset); offset += 4*nverts;
+		mScaledBinormals	=   (LLVector4a*)(mVertexData + offset); offset += 4*nverts; 
 		initializeForMorph();
 	}
 }
@@ -966,38 +985,47 @@ BOOL LLPolyMesh::saveLLM(LLFILE *fp)
 		//----------------------------------------------------------------
 		// Coords
 		//----------------------------------------------------------------
-		LLVector3* coords = mSharedData->mBaseCoords;
-
-		llendianswizzle(coords, sizeof(float), 3*numVertices);
-		if (fwrite(coords, 3*sizeof(float), numVertices, fp) != numVertices)
+		for (U16 i = 0; i < numVertices; ++i)
 		{
-			llwarns << "Short write" << llendl;
+			LLVector4a& coords = mSharedData->mBaseCoords[i];
+
+			llendianswizzle(coords.getF32ptr(), sizeof(float), 3);
+			if (fwrite(coords.getF32ptr(), 3*sizeof(float), 1, fp) != 1)
+			{
+				llwarns << "Short write" << llendl;
+			}
+			llendianswizzle(coords.getF32ptr(), sizeof(float), 3);
 		}
-		llendianswizzle(coords, sizeof(float), 3*numVertices);
 
 		//----------------------------------------------------------------
 		// Normals
 		//----------------------------------------------------------------
-		LLVector3* normals = mSharedData->mBaseNormals;
-
-		llendianswizzle(normals, sizeof(float), 3*numVertices);
-		if (fwrite(normals, 3*sizeof(float), numVertices, fp) != numVertices)
+		for (U16 i = 0; i < numVertices; ++i)
 		{
-			llwarns << "Short write" << llendl;
+			LLVector4a& normals = mSharedData->mBaseNormals[i];
+
+			llendianswizzle(normals.getF32ptr(), sizeof(float), 3);
+			if (fwrite(normals.getF32ptr(), 3*sizeof(float), 1, fp) != 1)
+			{
+				llwarns << "Short write" << llendl;
+			}
+			llendianswizzle(normals.getF32ptr(), sizeof(float), 3);
 		}
-		llendianswizzle(normals, sizeof(float), 3*numVertices);
 
 		//----------------------------------------------------------------
 		// Binormals
 		//----------------------------------------------------------------
-		LLVector3* binormals = mSharedData->mBaseBinormals;
-
-		llendianswizzle(binormals, sizeof(float), 3*numVertices);
-		if (fwrite(binormals, 3*sizeof(float), numVertices, fp) != numVertices)
+		for (U16 i = 0; i < numVertices; ++i)
 		{
-			llwarns << "Short write" << llendl;
+			LLVector4a& binormals = mSharedData->mBaseBinormals[i];
+
+			llendianswizzle(binormals.getF32ptr(), sizeof(float), 3);
+			if (fwrite(binormals.getF32ptr(), 3*sizeof(float), 1, fp) != 1)
+			{
+				llwarns << "Short write" << llendl;
+			}
+			llendianswizzle(binormals.getF32ptr(), sizeof(float), 3);
 		}
-		llendianswizzle(binormals, sizeof(float), 3*numVertices);
 
 		//----------------------------------------------------------------
 		// TexCoords
@@ -1224,24 +1252,24 @@ BOOL LLPolyMesh::saveOBJ(LLFILE *fp)
 	int nfaces = mSharedData->mNumFaces;
 	int i;
 
-	LLVector4* coords = getWritableCoords();
+	LLVector4a* coords = getWritableCoords();
 	for ( i=0; i<nverts; i++) {
 		std::string outstring = llformat("v %f %f %f\n",
-										 coords[i][0],
-										 coords[i][1],
-										 coords[i][2]);
+										 coords[i].getF32ptr()[0],
+										 coords[i].getF32ptr()[1],
+										 coords[i].getF32ptr()[2]);
 		if (fwrite(outstring.c_str(), 1, outstring.length(), fp) != outstring.length())
 		{
 			llwarns << "Short write" << llendl;
 		}
 	}
 
-	LLVector4* normals = getWritableNormals();
+	LLVector4a* normals = getWritableNormals();
 	for ( i=0; i<nverts; i++) {
 		std::string outstring = llformat("vn %f %f %f\n",
-										 normals[i][0],
-										 normals[i][1],
-										 normals[i][2]);
+										 normals[i].getF32ptr()[0],
+										 normals[i].getF32ptr()[1],
+										 normals[i].getF32ptr()[2]);
 		if (fwrite(outstring.c_str(), 1, outstring.length(), fp) != outstring.length())
 		{
 			llwarns << "Short write" << llendl;
@@ -1293,9 +1321,9 @@ BOOL LLPolyMesh::loadOBJ(LLFILE *fp)
 	int nnormals   = 0;
 	int ntexcoords = 0;
 
-	LLVector4* coords    = getWritableCoords();
-	LLVector4* normals   = getWritableNormals();
-	LLVector3* binormals = getWritableBinormals();
+	LLVector4a* coords    = getWritableCoords();
+	LLVector4a* normals   = getWritableNormals();
+	LLVector4a* binormals = getWritableBinormals();
 	LLVector2* tex       = getWritableTexCoords();
 	LLPolyFace* faces    = getFaces();
 
@@ -1398,7 +1426,7 @@ BOOL LLPolyMesh::loadOBJ(LLFILE *fp)
 	int v;
 	for ( v=0; v<nverts; v++)
 	{
-		binormals[v].setZero();
+		binormals[v].clear();
 	}
 
 	int f;
@@ -1408,29 +1436,18 @@ BOOL LLPolyMesh::loadOBJ(LLFILE *fp)
 		S32 f1 = faces[f][1];
 		S32 f2 = faces[f][2];
 
-		LLVector4a v0;
-		LLVector4a v1;
-		LLVector4a v2;
-		v0.load3(coords[f0].mV);;
-		v1.load3(coords[f1].mV);;
-		v2.load3(coords[f2].mV);;
-		LLVector2& t0 = tex[f0];
-		LLVector2& t1 = tex[f1];
-		LLVector2& t2 = tex[f2];
-
 		LLVector4a binorm;
-		calc_binormal_from_triangle(binorm, v0, t0, v1, t1, v2, t2);
+		calc_binormal_from_triangle(binorm, coords[f0], tex[f0], coords[f1], tex[f1], coords[f2], tex[f2]);
 		binorm.normalize3fast();
 
-		LLVector3 binormdelta(binorm.getF32ptr());
-		binormals[f0] += binormdelta;
-		binormals[f1] += binormdelta;
-		binormals[f2] += binormdelta;
+		binormals[f0].add(binorm);
+		binormals[f1].add(binorm);
+		binormals[f2].add(binorm);
 	}
 
 	for ( v=0; v<nverts; v++)
 	{
-		binormals[v].normVec();
+		binormals[v].normalize3();
 	}
 
 	return TRUE;
@@ -1449,26 +1466,26 @@ BOOL LLPolyMesh::setSharedFromCurrent()
 	LLPolyMesh delta(mSharedData, NULL);
 	U32 nverts = delta.getNumVertices();
 
-	LLVector4 *delta_coords     = delta.getWritableCoords();
-	LLVector4 *delta_normals    = delta.getWritableNormals();
-	LLVector3 *delta_binormals  = delta.getWritableBinormals();
+	LLVector4a *delta_coords     = delta.getWritableCoords();
+	LLVector4a *delta_normals    = delta.getWritableNormals();
+	LLVector4a *delta_binormals  = delta.getWritableBinormals();
 	LLVector2 *delta_tex_coords = delta.getWritableTexCoords();
 
 	U32 vert_index;
 	for( vert_index = 0; vert_index < nverts; vert_index++)
 	{
-		delta_coords[vert_index]     -= mCoords[vert_index];
-		delta_normals[vert_index]    -= mNormals[vert_index];
-		delta_binormals[vert_index]  -= mBinormals[vert_index];
-		delta_tex_coords[vert_index] -= mTexCoords[vert_index];
+		delta_coords[vert_index].sub(		mCoords[vert_index]);
+		delta_normals[vert_index].sub(		mNormals[vert_index]);
+		delta_binormals[vert_index].sub(	mBinormals[vert_index]);
+		delta_tex_coords[vert_index]	-=	mTexCoords[vert_index];
 	}
 
 	// Now copy the new base mesh
 
-	memcpy(mSharedData->mBaseCoords, mCoords, sizeof(LLVector3) * mSharedData->mNumVertices);
-	memcpy(mSharedData->mBaseNormals, mNormals, sizeof(LLVector3) * mSharedData->mNumVertices);
-	memcpy(mSharedData->mBaseBinormals, mBinormals, sizeof(LLVector3) * mSharedData->mNumVertices);
-	memcpy(mSharedData->mTexCoords, mTexCoords, sizeof(LLVector2) * mSharedData->mNumVertices);
+	LLVector4a::memcpyNonAliased16((F32*) mSharedData->mBaseCoords, (F32*) mCoords, sizeof(LLVector4a) * mSharedData->mNumVertices);
+	LLVector4a::memcpyNonAliased16((F32*) mSharedData->mBaseNormals, (F32*) mNormals, sizeof(LLVector4a) * mSharedData->mNumVertices);
+	LLVector4a::memcpyNonAliased16((F32*) mSharedData->mBaseBinormals, (F32*) mBinormals, sizeof(LLVector4a) * mSharedData->mNumVertices);
+	LLVector4a::memcpyNonAliased16((F32*) mSharedData->mTexCoords, (F32*) mTexCoords, sizeof(LLVector2) * (mSharedData->mNumVertices + mSharedData->mNumVertices%2));
 
 	// Update all avatars by applying the delta
 
@@ -1479,27 +1496,29 @@ BOOL LLPolyMesh::setSharedFromCurrent()
 		LLPolyMesh* mesh = avatarp->getMesh(mSharedData);
 		if (mesh)
 		{
-			LLVector4 *mesh_coords           = mesh->getWritableCoords();
-			LLVector4 *mesh_normals          = mesh->getWritableNormals();
-			LLVector3 *mesh_binormals        = mesh->getWritableBinormals();
-			LLVector2 *mesh_tex_coords       = mesh->getWritableTexCoords();
-			LLVector3 *mesh_scaled_normals   = mesh->getScaledNormals();
-			LLVector3 *mesh_scaled_binormals = mesh->getScaledBinormals();
+			LLVector4a *mesh_coords           = mesh->getWritableCoords();
+			LLVector4a *mesh_normals          = mesh->getWritableNormals();
+			LLVector4a *mesh_binormals        = mesh->getWritableBinormals();
+			LLVector2 *mesh_tex_coords        = mesh->getWritableTexCoords();
+			LLVector4a *mesh_scaled_normals   = mesh->getScaledNormals();
+			LLVector4a *mesh_scaled_binormals = mesh->getScaledBinormals();
 
 			for( vert_index = 0; vert_index < nverts; vert_index++)
 			{
-				mesh_coords[vert_index]           -= delta_coords[vert_index];
+				mesh_coords[vert_index].sub(delta_coords[vert_index]);
 				mesh_tex_coords[vert_index]       -= delta_tex_coords[vert_index];
 
-				mesh_scaled_normals[vert_index]   -= LLVector3(delta_normals[vert_index]);
-				LLVector3 normalized_normal        = mesh_scaled_normals[vert_index];
-				normalized_normal.normVec();
-				mesh_normals[vert_index]           = LLVector4(normalized_normal);
+				mesh_scaled_normals[vert_index].sub(delta_normals[vert_index]);
+				LLVector4a normalized_normal       = mesh_scaled_normals[vert_index];
+				normalized_normal.normalize3();
+				mesh_normals[vert_index]           = normalized_normal;
 
-				mesh_scaled_binormals[vert_index] -= delta_binormals[vert_index];
-				LLVector3 tangent                  = mesh_scaled_binormals[vert_index] % normalized_normal;
-				LLVector3 normalized_binormal      = normalized_normal % tangent;
-				normalized_binormal.normVec();
+				mesh_scaled_binormals[vert_index].sub(delta_binormals[vert_index]);
+				LLVector4a tangent;
+				tangent.setCross3(mesh_scaled_binormals[vert_index], normalized_normal);
+				LLVector4a normalized_binormal;
+				normalized_binormal.setCross3(normalized_normal, tangent);
+				normalized_binormal.normalize3();
 				mesh_binormals[vert_index]         = normalized_binormal;
 			}
 
@@ -1598,7 +1617,7 @@ void LLPolyMesh::dumpDiagInfo(void*)
 //-----------------------------------------------------------------------------
 // getWritableCoords()
 //-----------------------------------------------------------------------------
-LLVector4 *LLPolyMesh::getWritableCoords()
+LLVector4a *LLPolyMesh::getWritableCoords()
 {
 	return mCoords;
 }
@@ -1606,7 +1625,7 @@ LLVector4 *LLPolyMesh::getWritableCoords()
 //-----------------------------------------------------------------------------
 // getWritableNormals()
 //-----------------------------------------------------------------------------
-LLVector4 *LLPolyMesh::getWritableNormals()
+LLVector4a *LLPolyMesh::getWritableNormals()
 {
 	return mNormals;
 }
@@ -1614,7 +1633,7 @@ LLVector4 *LLPolyMesh::getWritableNormals()
 //-----------------------------------------------------------------------------
 // getWritableBinormals()
 //-----------------------------------------------------------------------------
-LLVector3 *LLPolyMesh::getWritableBinormals()
+LLVector4a *LLPolyMesh::getWritableBinormals()
 {
 	return mBinormals;
 }
@@ -1623,7 +1642,7 @@ LLVector3 *LLPolyMesh::getWritableBinormals()
 //-----------------------------------------------------------------------------
 // getWritableClothingWeights()
 //-----------------------------------------------------------------------------
-LLVector4	*LLPolyMesh::getWritableClothingWeights()
+LLVector4a       *LLPolyMesh::getWritableClothingWeights()
 {
 	return mClothingWeights;
 }
@@ -1639,7 +1658,7 @@ LLVector2	*LLPolyMesh::getWritableTexCoords()
 //-----------------------------------------------------------------------------
 // getScaledNormals()
 //-----------------------------------------------------------------------------
-LLVector3 *LLPolyMesh::getScaledNormals()
+LLVector4a *LLPolyMesh::getScaledNormals()
 {
 	return mScaledNormals;
 }
@@ -1647,7 +1666,7 @@ LLVector3 *LLPolyMesh::getScaledNormals()
 //-----------------------------------------------------------------------------
 // getScaledBinormals()
 //-----------------------------------------------------------------------------
-LLVector3 *LLPolyMesh::getScaledBinormals()
+LLVector4a *LLPolyMesh::getScaledBinormals()
 {
 	return mScaledBinormals;
 }
@@ -1661,19 +1680,20 @@ void LLPolyMesh::initializeForMorph()
 	if (!mSharedData)
 		return;
 
+    LLVector4a::memcpyNonAliased16((F32*) mCoords, (F32*) mSharedData->mBaseCoords, sizeof(LLVector4a) * mSharedData->mNumVertices);
+	LLVector4a::memcpyNonAliased16((F32*) mNormals, (F32*) mSharedData->mBaseNormals, sizeof(LLVector4a) * mSharedData->mNumVertices);
+	LLVector4a::memcpyNonAliased16((F32*) mScaledNormals, (F32*) mSharedData->mBaseNormals, sizeof(LLVector4a) * mSharedData->mNumVertices);
+	LLVector4a::memcpyNonAliased16((F32*) mBinormals, (F32*) mSharedData->mBaseNormals, sizeof(LLVector4a) * mSharedData->mNumVertices);
+	LLVector4a::memcpyNonAliased16((F32*) mScaledBinormals, (F32*) mSharedData->mBaseNormals, sizeof(LLVector4a) * mSharedData->mNumVertices);
+	LLVector4a::memcpyNonAliased16((F32*) mTexCoords, (F32*) mSharedData->mTexCoords, sizeof(LLVector2) * (mSharedData->mNumVertices + mSharedData->mNumVertices%2));
+
 	for (U32 i = 0; i < (U32)mSharedData->mNumVertices; ++i)
 	{
-		mCoords[i] = LLVector4(mSharedData->mBaseCoords[i]);
-		mNormals[i] = LLVector4(mSharedData->mBaseNormals[i]);
+		mClothingWeights[i].clear();
 	}
-
-	memcpy(mScaledNormals, mSharedData->mBaseNormals, sizeof(LLVector3) * mSharedData->mNumVertices);	/*Flawfinder: ignore*/
-	memcpy(mBinormals, mSharedData->mBaseBinormals, sizeof(LLVector3) * mSharedData->mNumVertices);	/*Flawfinder: ignore*/
-	memcpy(mScaledBinormals, mSharedData->mBaseBinormals, sizeof(LLVector3) * mSharedData->mNumVertices);		/*Flawfinder: ignore*/
-	memcpy(mTexCoords, mSharedData->mTexCoords, sizeof(LLVector2) * mSharedData->mNumVertices);		/*Flawfinder: ignore*/
-	memset(mClothingWeights, 0, sizeof(LLVector4) * mSharedData->mNumVertices);
 }
 
+
 //-----------------------------------------------------------------------------
 // getMorphList()
 //-----------------------------------------------------------------------------
@@ -1818,8 +1838,8 @@ BOOL LLPolySkeletalDistortionInfo::parseXml(LLXmlTreeNode* node)
 //-----------------------------------------------------------------------------
 LLPolySkeletalDistortion::LLPolySkeletalDistortion(LLVOAvatar *avatarp)
 {
-	mAvatar = avatarp;
-	mDefaultVec.setVec(0.001f, 0.001f, 0.001f);
+    mAvatar = avatarp;
+    mDefaultVec.splat(0.001f);
 }
 
 //-----------------------------------------------------------------------------
@@ -1947,36 +1967,49 @@ LLPolyMorphData *clone_morph_param_direction(const LLPolyMorphData *src_data,
 					     const LLVector3 &direction,
 					     const std::string &name)
 {
-        LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*src_data);
-        cloned_morph_data->mName = name;
-        for (U32 v=0; v < cloned_morph_data->mNumIndices; v++)
-        {
-                cloned_morph_data->mCoords[v] = direction;
-                cloned_morph_data->mNormals[v] = LLVector3(0,0,0);
-                cloned_morph_data->mBinormals[v] = LLVector3(0,0,0);
-        }
-        return cloned_morph_data;
+	LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*src_data);
+	cloned_morph_data->mName = name;
+	LLVector4a dir;
+	dir.load3(direction.mV);
+
+	for (U32 v=0; v < cloned_morph_data->mNumIndices; v++)
+    {
+		cloned_morph_data->mCoords[v] = dir;
+		cloned_morph_data->mNormals[v].clear();
+		cloned_morph_data->mBinormals[v].clear();
+	}
+	return cloned_morph_data;
 }
 
 LLPolyMorphData *clone_morph_param_cleavage(const LLPolyMorphData *src_data,
                                             F32 scale,
                                             const std::string &name)
 {
-        LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*src_data);
-        cloned_morph_data->mName = name;
-        for (U32 v=0; v < cloned_morph_data->mNumIndices; v++)
-        {
-                cloned_morph_data->mCoords[v] = src_data->mCoords[v]*scale;
-                cloned_morph_data->mNormals[v] = src_data->mNormals[v]*scale;
-                cloned_morph_data->mBinormals[v] = src_data->mBinormals[v]*scale;
-                if (cloned_morph_data->mCoords[v][1] < 0)
-                {
-                        cloned_morph_data->mCoords[v][1] *= -1;
-                        cloned_morph_data->mNormals[v][1] *= -1;
-                        cloned_morph_data->mBinormals[v][1] *= -1;
-                }
-        }
-        return cloned_morph_data;
+	LLPolyMorphData* cloned_morph_data = new LLPolyMorphData(*src_data);
+	cloned_morph_data->mName = name;
+
+	LLVector4a sc;
+	sc.splat(scale);
+
+	LLVector4a nsc;
+	nsc.set(scale, -scale, scale, scale);
+
+	for (U32 v=0; v < cloned_morph_data->mNumIndices; v++)
+	{
+		if (cloned_morph_data->mCoords[v][1] < 0)
+		{
+			cloned_morph_data->mCoords[v].setMul(src_data->mCoords[v],nsc);
+			cloned_morph_data->mNormals[v].setMul(src_data->mNormals[v],nsc);
+			cloned_morph_data->mBinormals[v].setMul(src_data->mBinormals[v],nsc);
+		}
+		else
+		{
+			cloned_morph_data->mCoords[v].setMul(src_data->mCoords[v],sc);
+			cloned_morph_data->mNormals[v].setMul(src_data->mNormals[v], sc);
+			cloned_morph_data->mBinormals[v].setMul(src_data->mBinormals[v],sc);
+		}
+	}
+	return cloned_morph_data;
 }
 
 // End
diff --git a/indra/newview/llpolymesh.h b/indra/newview/llpolymesh.h
index 4b7927564..d09909309 100644
--- a/indra/newview/llpolymesh.h
+++ b/indra/newview/llpolymesh.h
@@ -73,9 +73,9 @@ private:
 							
 	// vertex data			
 	S32						mNumVertices;
-	LLVector3				*mBaseCoords;
-	LLVector3				*mBaseNormals;
-	LLVector3				*mBaseBinormals;
+	LLVector4a				*mBaseCoords;
+	LLVector4a				*mBaseNormals;
+	LLVector4a				*mBaseBinormals;
 	LLVector2				*mTexCoords;
 	LLVector2				*mDetailTexCoords;
 	F32						*mWeights;
@@ -235,41 +235,41 @@ public:
 	}
 
 	// Get coords
-	const LLVector4	*getCoords() const{
+	const LLVector4a	*getCoords() const{
 		return mCoords;
 	}
 
 	// non const version
-	LLVector4 *getWritableCoords();
+	LLVector4a *getWritableCoords();
 
 	// Get normals
-	const LLVector4	*getNormals() const{ 
+	const LLVector4a	*getNormals() const{ 
 		return mNormals; 
 	}
 
 	// Get normals
-	const LLVector3	*getBinormals() const{ 
+	const LLVector4a	*getBinormals() const{ 
 		return mBinormals; 
 	}
 
 	// Get base mesh normals
-	const LLVector3 *getBaseNormals() const{
+	const LLVector4a *getBaseNormals() const{
 		llassert(mSharedData);
 		return mSharedData->mBaseNormals;
 	}
 
 	// Get base mesh normals
-	const LLVector3 *getBaseBinormals() const{
+	const LLVector4a *getBaseBinormals() const{
 		llassert(mSharedData);
 		return mSharedData->mBaseBinormals;
 	}
 
 	// intermediate morphed normals and output normals
-	LLVector4 *getWritableNormals();
-	LLVector3 *getScaledNormals();
+	LLVector4a *getWritableNormals();
+	LLVector4a *getScaledNormals();
 
-	LLVector3 *getWritableBinormals();
-	LLVector3 *getScaledBinormals();
+	LLVector4a *getWritableBinormals();
+	LLVector4a *getScaledBinormals();
 
 	// Get texCoords
 	const LLVector2	*getTexCoords() const { 
@@ -293,9 +293,9 @@ public:
 
 	F32			*getWritableWeights() const;
 
-	LLVector4	*getWritableClothingWeights();
+	LLVector4a	*getWritableClothingWeights();
 
-	const LLVector4		*getClothingWeights()
+	const LLVector4a		*getClothingWeights()
 	{
 		return mClothingWeights;	
 	}
@@ -363,17 +363,17 @@ protected:
 	// Single array of floats for allocation / deletion
 	F32						*mVertexData;
 	// deformed vertices (resulting from application of morph targets)
-	LLVector4				*mCoords;
+	LLVector4a				*mCoords;
 	// deformed normals (resulting from application of morph targets)
-	LLVector3				*mScaledNormals;
+	LLVector4a				*mScaledNormals;
 	// output normals (after normalization)
-	LLVector4				*mNormals;
+	LLVector4a				*mNormals;
 	// deformed binormals (resulting from application of morph targets)
-	LLVector3				*mScaledBinormals;
+	LLVector4a				*mScaledBinormals;
 	// output binormals (after normalization)
-	LLVector3				*mBinormals;
+	LLVector4a				*mBinormals;
 	// weight values that mark verts as clothing/skin
-	LLVector4				*mClothingWeights;
+	LLVector4a				*mClothingWeights;
 	// output texture coordinates
 	LLVector2				*mTexCoords;
 	
@@ -441,17 +441,17 @@ public:
 	
 	// LLViewerVisualParam Virtual functions
 	/*virtual*/ F32					getTotalDistortion() { return 0.1f; }
-	/*virtual*/ const LLVector3&	getAvgDistortion()	{ return mDefaultVec; }
+	/*virtual*/ const LLVector4a&	getAvgDistortion()	{ return mDefaultVec; }
 	/*virtual*/ F32					getMaxDistortion() { return 0.1f; }
-	/*virtual*/ LLVector3			getVertexDistortion(S32 index, LLPolyMesh *poly_mesh){return LLVector3(0.001f, 0.001f, 0.001f);}
-	/*virtual*/ const LLVector3*	getFirstDistortion(U32 *index, LLPolyMesh **poly_mesh){index = 0; poly_mesh = NULL; return &mDefaultVec;};
-	/*virtual*/ const LLVector3*	getNextDistortion(U32 *index, LLPolyMesh **poly_mesh){index = 0; poly_mesh = NULL; return NULL;};
+	/*virtual*/ LLVector4a			getVertexDistortion(S32 index, LLPolyMesh *poly_mesh){return LLVector4a(0.001f, 0.001f, 0.001f);}
+	/*virtual*/ const LLVector4a*	getFirstDistortion(U32 *index, LLPolyMesh **poly_mesh){index = 0; poly_mesh = NULL; return &mDefaultVec;};
+	/*virtual*/ const LLVector4a*	getNextDistortion(U32 *index, LLPolyMesh **poly_mesh){index = 0; poly_mesh = NULL; return NULL;};
 
 protected:
 	typedef std::map<LLJoint*, LLVector3> joint_vec_map_t;
 	joint_vec_map_t mJointScales;
 	joint_vec_map_t mJointOffsets;
-	LLVector3	mDefaultVec;
+	LLVector4a	mDefaultVec;
 	// Backlink only; don't make this an LLPointer.
 	LLVOAvatar *mAvatar;
 };
diff --git a/indra/newview/llpolymorph.cpp b/indra/newview/llpolymorph.cpp
index 73a0b525c..b43837e89 100644
--- a/indra/newview/llpolymorph.cpp
+++ b/indra/newview/llpolymorph.cpp
@@ -49,7 +49,7 @@ LLPolyMorphData::LLPolyMorphData(const std::string& morph_name)
 	mNumIndices = 0;
 	mCurrentIndex = 0;
 	mTotalDistortion = 0.f;
-	mAvgDistortion.zeroVec();
+	mAvgDistortion.clear();
 	mMaxDistortion = 0.f;
 	mVertexIndices = NULL;
 	mCoords = NULL;
@@ -74,9 +74,9 @@ LLPolyMorphData::LLPolyMorphData(const LLPolyMorphData &rhs) :
 {
 	const S32 numVertices = mNumIndices;
 
-	mCoords = new LLVector3[numVertices];
-	mNormals = new LLVector3[numVertices];
-	mBinormals = new LLVector3[numVertices];
+	mCoords = new LLVector4a[numVertices];
+	mNormals = new LLVector4a[numVertices];
+	mBinormals = new LLVector4a[numVertices];
 	mTexCoords = new LLVector2[numVertices];
 	mVertexIndices = new U32[numVertices];
 	
@@ -90,6 +90,7 @@ LLPolyMorphData::LLPolyMorphData(const LLPolyMorphData &rhs) :
 	}
 }
 
+
 //-----------------------------------------------------------------------------
 // ~LLPolyMorphData()
 //-----------------------------------------------------------------------------
@@ -121,16 +122,16 @@ BOOL LLPolyMorphData::loadBinary(LLFILE *fp, LLPolyMeshSharedData *mesh)
 	//-------------------------------------------------------------------------
 	// allocate vertices
 	//-------------------------------------------------------------------------
-	mCoords = new LLVector3[numVertices];
-	mNormals = new LLVector3[numVertices];
-	mBinormals = new LLVector3[numVertices];
+	mCoords = new LLVector4a[numVertices];
+	mNormals = new LLVector4a[numVertices];
+	mBinormals = new LLVector4a[numVertices];
 	mTexCoords = new LLVector2[numVertices];
 	// Actually, we are allocating more space than we need for the skiplist
 	mVertexIndices = new U32[numVertices];
 	mNumIndices = 0;
 	mTotalDistortion = 0.f;
 	mMaxDistortion = 0.f;
-	mAvgDistortion.zeroVec();
+	mAvgDistortion.clear();
 	mMesh = mesh;
 
 	//-------------------------------------------------------------------------
@@ -152,36 +153,36 @@ BOOL LLPolyMorphData::loadBinary(LLFILE *fp, LLPolyMeshSharedData *mesh)
 		}
 
 
-		numRead = fread(&mCoords[v].mV, sizeof(F32), 3, fp);
-		llendianswizzle(&mCoords[v].mV, sizeof(F32), 3);
+		numRead = fread(&mCoords[v], sizeof(F32), 3, fp);
+		llendianswizzle(&mCoords[v], sizeof(F32), 3);
 		if (numRead != 3)
 		{
 			llwarns << "Can't read morph target vertex coordinates" << llendl;
 			return FALSE;
 		}
 
-		F32 magnitude = mCoords[v].magVec();
+		F32 magnitude = mCoords[v].getLength3().getF32();
 		
 		mTotalDistortion += magnitude;
-		mAvgDistortion.mV[VX] += fabs(mCoords[v].mV[VX]);
-		mAvgDistortion.mV[VY] += fabs(mCoords[v].mV[VY]);
-		mAvgDistortion.mV[VZ] += fabs(mCoords[v].mV[VZ]);
+		LLVector4a t;
+		t.setAbs(mCoords[v]);
+		mAvgDistortion.add(t);
 		
 		if (magnitude > mMaxDistortion)
 		{
 			mMaxDistortion = magnitude;
 		}
 
-		numRead = fread(&mNormals[v].mV, sizeof(F32), 3, fp);
-		llendianswizzle(&mNormals[v].mV, sizeof(F32), 3);
+		numRead = fread(&mNormals[v], sizeof(F32), 3, fp);
+		llendianswizzle(&mNormals[v], sizeof(F32), 3);
 		if (numRead != 3)
 		{
 			llwarns << "Can't read morph target normal" << llendl;
 			return FALSE;
 		}
 
-		numRead = fread(&mBinormals[v].mV, sizeof(F32), 3, fp);
-		llendianswizzle(&mBinormals[v].mV, sizeof(F32), 3);
+		numRead = fread(&mBinormals[v], sizeof(F32), 3, fp);
+		llendianswizzle(&mBinormals[v], sizeof(F32), 3);
 		if (numRead != 3)
 		{
 			llwarns << "Can't read morph target binormal" << llendl;
@@ -200,8 +201,8 @@ BOOL LLPolyMorphData::loadBinary(LLFILE *fp, LLPolyMeshSharedData *mesh)
 		mNumIndices++;
 	}
 
-	mAvgDistortion = mAvgDistortion * (1.f/(F32)mNumIndices);
-	mAvgDistortion.normVec();
+	mAvgDistortion.mul(1.f/(F32)mNumIndices);
+	mAvgDistortion.normalize3fast();
 
 	return TRUE;
 }
@@ -235,26 +236,26 @@ BOOL LLPolyMorphData::saveLLM(LLFILE *fp)
 		}
 		llendianswizzle(&mVertexIndices[v], sizeof(U32), 1);
 
-		llendianswizzle(&mCoords[v].mV, sizeof(F32), 3);
-		if (fwrite(&mCoords[v].mV, sizeof(F32), 3, fp) != 3)
+		llendianswizzle(mCoords[v].getF32ptr(), sizeof(F32), 3);
+		if (fwrite(mCoords[v].getF32ptr(), sizeof(F32), 3, fp) != 3)
 		{
 			llwarns << "Short write" << llendl;
 		}
-		llendianswizzle(&mCoords[v].mV, sizeof(F32), 3);
+		llendianswizzle(mCoords[v].getF32ptr(), sizeof(F32), 3);
 
-		llendianswizzle(&mNormals[v].mV, sizeof(F32), 3);
-		if (fwrite(&mNormals[v].mV, sizeof(F32), 3, fp) != 3)
+		llendianswizzle(mNormals[v].getF32ptr(), sizeof(F32), 3);
+		if (fwrite(mNormals[v].getF32ptr(), sizeof(F32), 3, fp) != 3)
 		{
 			llwarns << "Short write" << llendl;
 		}
-		llendianswizzle(&mNormals[v].mV, sizeof(F32), 3);
+		llendianswizzle(mNormals[v].getF32ptr(), sizeof(F32), 3);
 
-		llendianswizzle(&mBinormals[v].mV, sizeof(F32), 3);
-		if (fwrite(&mBinormals[v].mV, sizeof(F32), 3, fp) != 3)
+		llendianswizzle(mBinormals[v].getF32ptr(), sizeof(F32), 3);
+		if (fwrite(mBinormals[v].getF32ptr(), sizeof(F32), 3, fp) != 3)
 		{
 			llwarns << "Short write" << llendl;
 		}
-		llendianswizzle(&mBinormals[v].mV, sizeof(F32), 3);
+		llendianswizzle(mBinormals[v].getF32ptr(), sizeof(F32), 3);
 
 		llendianswizzle(&mTexCoords[v].mV, sizeof(F32), 2);
 		if (fwrite(&mTexCoords[v].mV, sizeof(F32), 2, fp) != 2)
@@ -277,17 +278,17 @@ BOOL LLPolyMorphData::saveOBJ(LLFILE *fp)
 
 	LLPolyMesh mesh(mMesh, NULL);
 
-	LLVector4 *coords     = mesh.getWritableCoords();
-	LLVector4 *normals    = mesh.getWritableNormals();
+	LLVector4a *coords     = mesh.getWritableCoords();
+	LLVector4a *normals    = mesh.getWritableNormals();
 	LLVector2 *tex_coords = mesh.getWritableTexCoords();
 
 	for(U32 vert_index_morph = 0; vert_index_morph < mNumIndices; vert_index_morph++)
 	{
 		S32 vert_index_mesh = mVertexIndices[vert_index_morph];
 
-		coords[vert_index_mesh]     += LLVector4(mCoords[vert_index_morph]);
-		normals[vert_index_mesh]    += LLVector4(mNormals[vert_index_morph]);
-		normals[vert_index_mesh].normVec();
+		coords[vert_index_mesh].add(mCoords[vert_index_morph]);
+		normals[vert_index_mesh].add(mNormals[vert_index_morph]);
+		normals[vert_index_mesh].normalize3();
 		tex_coords[vert_index_mesh] += mTexCoords[vert_index_morph];
 	}
 
@@ -302,9 +303,9 @@ BOOL LLPolyMorphData::setMorphFromMesh(LLPolyMesh *morph)
 	if (!morph)
 		return FALSE;
 
-	LLVector4 *morph_coords     = morph->getWritableCoords();
-	LLVector4 *morph_normals    = morph->getWritableNormals();
-	LLVector3 *morph_binormals  = morph->getWritableBinormals();
+	LLVector4a *morph_coords     = morph->getWritableCoords();
+	LLVector4a *morph_normals    = morph->getWritableNormals();
+	LLVector4a *morph_binormals  = morph->getWritableBinormals();
 	LLVector2 *morph_tex_coords = morph->getWritableTexCoords();
 
 	// We now have the morph loaded as a mesh.  We have to subtract the
@@ -313,19 +314,19 @@ BOOL LLPolyMorphData::setMorphFromMesh(LLPolyMesh *morph)
 	LLPolyMesh delta(mMesh, NULL);
 	U32 nverts = delta.getNumVertices();
 
-	LLVector4 *delta_coords     = delta.getWritableCoords();
-	LLVector4 *delta_normals    = delta.getWritableNormals();
-	LLVector3 *delta_binormals  = delta.getWritableBinormals();
+	LLVector4a *delta_coords     = delta.getWritableCoords();
+	LLVector4a *delta_normals    = delta.getWritableNormals();
+	LLVector4a *delta_binormals  = delta.getWritableBinormals();
 	LLVector2 *delta_tex_coords = delta.getWritableTexCoords();
 
 	U32 num_significant = 0;
 	U32 vert_index;
 	for( vert_index = 0; vert_index < nverts; vert_index++)
 	{
-		delta_coords[vert_index]     = morph_coords[vert_index] - delta_coords[vert_index];
-		delta_normals[vert_index]    = morph_normals[vert_index] - delta_normals[vert_index];
-		delta_binormals[vert_index]  = morph_binormals[vert_index] - delta_binormals[vert_index];
-		delta_tex_coords[vert_index] = morph_tex_coords[vert_index] - delta_tex_coords[vert_index];
+		delta_coords[vert_index].setSub(	morph_coords[vert_index], delta_coords[vert_index]);
+		delta_normals[vert_index].setSub(	morph_normals[vert_index], delta_normals[vert_index]);
+		delta_binormals[vert_index].setSub(	morph_binormals[vert_index], delta_binormals[vert_index]);
+		delta_tex_coords[vert_index] =		morph_tex_coords[vert_index] - delta_tex_coords[vert_index];
 
 		// For the normals and binormals, we really want the deltas
 		// to be perpendicular to the mesh (bi)normals in the plane
@@ -333,10 +334,10 @@ BOOL LLPolyMorphData::setMorphFromMesh(LLPolyMesh *morph)
 		// that the morph (bi)normals form the hypotenuses of right
 		// triangles. Right now, we just compute the difference vector.
 
-		if (delta_coords[vert_index].length()     > SIGNIFICANT_DELTA
-		||  delta_normals[vert_index].length()    > SIGNIFICANT_DELTA
-		||  delta_binormals[vert_index].length()  > SIGNIFICANT_DELTA
-		||  delta_tex_coords[vert_index].length() > SIGNIFICANT_DELTA)
+		if (delta_coords[vert_index].getLength3().getF32()		> SIGNIFICANT_DELTA
+		||  delta_normals[vert_index].getLength3().getF32()		> SIGNIFICANT_DELTA
+		||  delta_binormals[vert_index].getLength3().getF32()	> SIGNIFICANT_DELTA
+		||  delta_tex_coords[vert_index].length()				> SIGNIFICANT_DELTA)
 		{
 			num_significant++;
 		}
@@ -353,39 +354,39 @@ BOOL LLPolyMorphData::setMorphFromMesh(LLPolyMesh *morph)
 	if (num_significant == 0)
 		nindices = 1;
 
-	LLVector3* new_coords     = new LLVector3[nindices];
-	LLVector3* new_normals    = new LLVector3[nindices];
-	LLVector3* new_binormals  = new LLVector3[nindices];
+	LLVector4a* new_coords     = new LLVector4a[nindices];
+	LLVector4a* new_normals    = new LLVector4a[nindices];
+	LLVector4a* new_binormals  = new LLVector4a[nindices];
 	LLVector2* new_tex_coords = new LLVector2[nindices];
 	U32* new_vertex_indices   = new U32[nindices];
 
     // We'll set the distortion directly
 	mTotalDistortion = 0.f;
 	mMaxDistortion   = 0.f;
-	mAvgDistortion.zeroVec();
+	mAvgDistortion.clear();
 
 	U32 morph_index = 0;
 	for( vert_index = 0; vert_index < nverts; vert_index++)
 	{
-		if (delta_coords[vert_index].length()     > SIGNIFICANT_DELTA
-		||  delta_normals[vert_index].length()    > SIGNIFICANT_DELTA
-		||  delta_binormals[vert_index].length()  > SIGNIFICANT_DELTA
-		||  delta_tex_coords[vert_index].length() > SIGNIFICANT_DELTA
+		if (delta_coords[vert_index].getLength3().getF32()		> SIGNIFICANT_DELTA
+		||  delta_normals[vert_index].getLength3().getF32()		> SIGNIFICANT_DELTA
+		||  delta_binormals[vert_index].getLength3().getF32()	> SIGNIFICANT_DELTA
+		||  delta_tex_coords[vert_index].length()				> SIGNIFICANT_DELTA
 		||  num_significant == 0)
 		{
 			new_vertex_indices[morph_index] = vert_index;
 
-			new_coords[morph_index]     = LLVector3(delta_coords[vert_index]);
-			new_normals[morph_index]    = LLVector3(delta_normals[vert_index]);
+			new_coords[morph_index]     = delta_coords[vert_index];
+			new_normals[morph_index]    = delta_normals[vert_index];
 			new_binormals[morph_index]  = delta_binormals[vert_index];
 			new_tex_coords[morph_index] = delta_tex_coords[vert_index];
 
-			F32 magnitude = new_coords[morph_index].magVec();
+			F32 magnitude = new_coords[morph_index].getLength3().getF32();
 
 			mTotalDistortion += magnitude;
-			mAvgDistortion.mV[VX] += fabs(new_coords[morph_index].mV[VX]);
-			mAvgDistortion.mV[VY] += fabs(new_coords[morph_index].mV[VY]);
-			mAvgDistortion.mV[VZ] += fabs(new_coords[morph_index].mV[VZ]);
+			LLVector4a t;
+			t.setAbs(new_coords[morph_index]);
+			mAvgDistortion.add(t);
 
 			if (magnitude > mMaxDistortion)
 			{
@@ -397,8 +398,8 @@ BOOL LLPolyMorphData::setMorphFromMesh(LLPolyMesh *morph)
 		}
 	}
 
-	mAvgDistortion = mAvgDistortion * (1.f/(F32)nindices);
-	mAvgDistortion.normVec();
+	mAvgDistortion.mul(1.f/(F32)nindices);
+	mAvgDistortion.normalize3();
 
 	//-------------------------------------------------------------------------
 	// compute the change in the morph
@@ -412,9 +413,9 @@ BOOL LLPolyMorphData::setMorphFromMesh(LLPolyMesh *morph)
 	{
 		vert_index = mVertexIndices[morph_index];
 
-		delta_coords[vert_index]     -= LLVector4(mCoords[morph_index]);
-		delta_normals[vert_index]    -= LLVector4(mNormals[morph_index]);
-		delta_binormals[vert_index]  -= mBinormals[morph_index];
+		delta_coords[vert_index].sub(	mCoords[morph_index]);
+		delta_normals[vert_index].sub(	mNormals[morph_index]);
+		delta_binormals[vert_index].sub(mBinormals[morph_index]);
 		delta_tex_coords[vert_index] -= mTexCoords[morph_index];
 	}
 
@@ -451,27 +452,35 @@ BOOL LLPolyMorphData::setMorphFromMesh(LLPolyMesh *morph)
 			continue;
 		}*/
 
-		LLVector4 *mesh_coords           = mesh->getWritableCoords();
-		LLVector4 *mesh_normals          = mesh->getWritableNormals();
-		LLVector3 *mesh_binormals        = mesh->getWritableBinormals();
-		LLVector2 *mesh_tex_coords       = mesh->getWritableTexCoords();
-		LLVector3 *mesh_scaled_normals   = mesh->getScaledNormals();
-		LLVector3 *mesh_scaled_binormals = mesh->getScaledBinormals();
+		LLVector4a *mesh_coords           = mesh->getWritableCoords();
+		LLVector4a *mesh_normals          = mesh->getWritableNormals();
+		LLVector4a *mesh_binormals        = mesh->getWritableBinormals();
+		LLVector2 *mesh_tex_coords        = mesh->getWritableTexCoords();
+		LLVector4a *mesh_scaled_normals   = mesh->getScaledNormals();
+		LLVector4a *mesh_scaled_binormals = mesh->getScaledBinormals();
 
 		for( vert_index = 0; vert_index < nverts; vert_index++)
 		{
-			mesh_coords[vert_index]           += delta_coords[vert_index] * weight;
+			delta_coords[vert_index].mul(weight);
+			mesh_coords[vert_index].add(delta_coords[vert_index]);
+
 			mesh_tex_coords[vert_index]       += delta_tex_coords[vert_index] * weight;
 
-			mesh_scaled_normals[vert_index]   += LLVector3(delta_normals[vert_index] * weight * NORMAL_SOFTEN_FACTOR);
-			LLVector3 normalized_normal        = mesh_scaled_normals[vert_index];
-			normalized_normal.normVec();
-			mesh_normals[vert_index]           = LLVector4(normalized_normal);
+			delta_normals[vert_index].mul(weight * NORMAL_SOFTEN_FACTOR);
+			mesh_scaled_normals[vert_index].add(delta_normals[vert_index]);
+			
+			LLVector4a normalized_normal       = mesh_scaled_normals[vert_index];
+			normalized_normal.normalize3();
+			mesh_normals[vert_index]           = normalized_normal;
 
-			mesh_scaled_binormals[vert_index] += delta_binormals[vert_index] * weight * NORMAL_SOFTEN_FACTOR;
-			LLVector3 tangent                  = mesh_scaled_binormals[vert_index] % normalized_normal;
-			LLVector3 normalized_binormal      = normalized_normal % tangent;
-			normalized_binormal.normVec();
+			delta_binormals[vert_index].mul(weight * NORMAL_SOFTEN_FACTOR);
+			mesh_scaled_binormals[vert_index].add(delta_binormals[vert_index]);
+
+			LLVector4a tangent;
+			tangent.setCross3(mesh_scaled_binormals[vert_index], normalized_normal);
+			LLVector4a normalized_binormal;
+			normalized_binormal.setCross3(normalized_normal, tangent);
+			normalized_binormal.normalize3();
 			mesh_binormals[vert_index]         = normalized_binormal;
 		}
 
@@ -658,9 +667,9 @@ BOOL LLPolyMorphTarget::parseData(LLXmlTreeNode* node)
 //-----------------------------------------------------------------------------
 // getVertexDistortion()
 //-----------------------------------------------------------------------------
-LLVector3 LLPolyMorphTarget::getVertexDistortion(S32 requested_index, LLPolyMesh *mesh)
+LLVector4a LLPolyMorphTarget::getVertexDistortion(S32 requested_index, LLPolyMesh *mesh)
 {
-	if (!mMorphData || mMesh != mesh) return LLVector3::zero;
+	if (!mMorphData || mMesh != mesh) return LLVector4a::getZero();
 
 	for(U32 index = 0; index < mMorphData->mNumIndices; index++)
 	{
@@ -670,17 +679,17 @@ LLVector3 LLPolyMorphTarget::getVertexDistortion(S32 requested_index, LLPolyMesh
 		}
 	}
 
-	return LLVector3::zero;
+	return LLVector4a::getZero();
 }
 
 //-----------------------------------------------------------------------------
 // getFirstDistortion()
 //-----------------------------------------------------------------------------
-const LLVector3 *LLPolyMorphTarget::getFirstDistortion(U32 *index, LLPolyMesh **poly_mesh)
+const LLVector4a *LLPolyMorphTarget::getFirstDistortion(U32 *index, LLPolyMesh **poly_mesh)
 {
-	if (!mMorphData) return &LLVector3::zero;
+	if (!mMorphData) return &LLVector4a::getZero();
 
-	LLVector3* resultVec;
+	LLVector4a* resultVec;
 	mMorphData->mCurrentIndex = 0;
 	if (mMorphData->mNumIndices)
 	{
@@ -702,11 +711,11 @@ const LLVector3 *LLPolyMorphTarget::getFirstDistortion(U32 *index, LLPolyMesh **
 //-----------------------------------------------------------------------------
 // getNextDistortion()
 //-----------------------------------------------------------------------------
-const LLVector3 *LLPolyMorphTarget::getNextDistortion(U32 *index, LLPolyMesh **poly_mesh)
+const LLVector4a *LLPolyMorphTarget::getNextDistortion(U32 *index, LLPolyMesh **poly_mesh)
 {
-	if (!mMorphData) return &LLVector3::zero;
+	if (!mMorphData) return &LLVector4a::getZero();
 
-	LLVector3* resultVec;
+	LLVector4a* resultVec;
 	mMorphData->mCurrentIndex++;
 	if (mMorphData->mCurrentIndex < mMorphData->mNumIndices)
 	{
@@ -742,7 +751,7 @@ F32	LLPolyMorphTarget::getTotalDistortion()
 //-----------------------------------------------------------------------------
 // getAvgDistortion()
 //-----------------------------------------------------------------------------
-const LLVector3& LLPolyMorphTarget::getAvgDistortion()	
+const LLVector4a& LLPolyMorphTarget::getAvgDistortion()	
 {
 	if (mMorphData) 
 	{
@@ -750,7 +759,7 @@ const LLVector3& LLPolyMorphTarget::getAvgDistortion()
 	}
 	else 
 	{
-		return LLVector3::zero;
+		return LLVector4a::getZero();
 	}
 }
 
@@ -799,15 +808,15 @@ void LLPolyMorphTarget::apply( ESex avatar_sex )
 	if (delta_weight != 0.f)
 	{
 		llassert(!mMesh->isLOD());
-		LLVector4 *coords = mMesh->getWritableCoords();
+		LLVector4a *coords = mMesh->getWritableCoords();
 
-		LLVector3 *scaled_normals = mMesh->getScaledNormals();
-		LLVector4 *normals = mMesh->getWritableNormals();
+		LLVector4a *scaled_normals = mMesh->getScaledNormals();
+		LLVector4a *normals = mMesh->getWritableNormals();
 
-		LLVector3 *scaled_binormals = mMesh->getScaledBinormals();
-		LLVector3 *binormals = mMesh->getWritableBinormals();
+		LLVector4a *scaled_binormals = mMesh->getScaledBinormals();
+		LLVector4a *binormals = mMesh->getWritableBinormals();
 
-		LLVector4 *clothing_weights = mMesh->getWritableClothingWeights();
+		LLVector4a *clothing_weights = mMesh->getWritableClothingWeights();
 		LLVector2 *tex_coords = mMesh->getWritableTexCoords();
 
 		F32 *maskWeightArray = (mVertMask) ? mVertMask->getMorphMaskWeights() : NULL;
@@ -822,31 +831,38 @@ void LLPolyMorphTarget::apply( ESex avatar_sex )
 				maskWeight = maskWeightArray[vert_index_morph];
 			}
 
-			coords[vert_index_mesh] += LLVector4(mMorphData->mCoords[vert_index_morph] * delta_weight * maskWeight);
+
+			LLVector4a pos = mMorphData->mCoords[vert_index_morph];
+			pos.mul(delta_weight*maskWeight);
+			coords[vert_index_mesh].add(pos);
 
 			if (getInfo()->mIsClothingMorph && clothing_weights)
 			{
-				LLVector3 clothing_offset = mMorphData->mCoords[vert_index_morph] * delta_weight * maskWeight;
-				LLVector4* clothing_weight = &clothing_weights[vert_index_mesh];
-				clothing_weight->mV[VX] += clothing_offset.mV[VX];
-				clothing_weight->mV[VY] += clothing_offset.mV[VY];
-				clothing_weight->mV[VZ] += clothing_offset.mV[VZ];
-				clothing_weight->mV[VW] = maskWeight;
+				LLVector4a clothing_offset = mMorphData->mCoords[vert_index_morph];
+				clothing_offset.mul(delta_weight * maskWeight);
+				LLVector4a* clothing_weight = &clothing_weights[vert_index_mesh];
+				clothing_weight->add(clothing_offset);
+				clothing_weight->getF32ptr()[VW] = maskWeight;
 			}
 
 			// calculate new normals based on half angles
-			scaled_normals[vert_index_mesh] += mMorphData->mNormals[vert_index_morph] * delta_weight * maskWeight * NORMAL_SOFTEN_FACTOR;
-			LLVector3 normalized_normal = scaled_normals[vert_index_mesh];
-			normalized_normal.normVec();
-			normals[vert_index_mesh] = LLVector4(normalized_normal);
+			LLVector4a norm = mMorphData->mNormals[vert_index_morph];
+			norm.mul(delta_weight*maskWeight*NORMAL_SOFTEN_FACTOR);
+			scaled_normals[vert_index_mesh].add(norm);
+			norm = scaled_normals[vert_index_mesh];
+			norm.normalize3fast();
+			normals[vert_index_mesh] = norm;
 
 			// calculate new binormals
-			scaled_binormals[vert_index_mesh] += mMorphData->mBinormals[vert_index_morph] * delta_weight * maskWeight * NORMAL_SOFTEN_FACTOR;
-			LLVector3 tangent = scaled_binormals[vert_index_mesh] % normalized_normal;
-			LLVector3 normalized_binormal = normalized_normal % tangent; 
-			normalized_binormal.normVec();
-			binormals[vert_index_mesh] = normalized_binormal;
-
+			LLVector4a binorm = mMorphData->mBinormals[vert_index_morph];
+			binorm.mul(delta_weight*maskWeight*NORMAL_SOFTEN_FACTOR);
+			scaled_binormals[vert_index_mesh].add(binorm);
+			LLVector4a tangent;
+			tangent.setCross3(scaled_binormals[vert_index_mesh], norm);
+			LLVector4a& normalized_binormal = binormals[vert_index_mesh];
+			normalized_binormal.setCross3(norm, tangent); 
+			normalized_binormal.normalize3fast();
+			
 			tex_coords[vert_index_mesh] += mMorphData->mTexCoords[vert_index_morph] * delta_weight * maskWeight;
 		}
 
@@ -873,7 +889,7 @@ void LLPolyMorphTarget::apply( ESex avatar_sex )
 //-----------------------------------------------------------------------------
 void	LLPolyMorphTarget::applyMask(U8 *maskTextureData, S32 width, S32 height, S32 num_components, BOOL invert)
 {
-	LLVector4 *clothing_weights = getInfo()->mIsClothingMorph ? mMesh->getWritableClothingWeights() : NULL;
+	LLVector4a *clothing_weights = getInfo()->mIsClothingMorph ? mMesh->getWritableClothingWeights() : NULL;
 
 	if (!mVertMask)
 	{
@@ -887,29 +903,47 @@ void	LLPolyMorphTarget::applyMask(U8 *maskTextureData, S32 width, S32 height, S3
 
 		if (maskWeights)
 		{
-			LLVector4 *coords = mMesh->getWritableCoords();
-			LLVector3 *scaled_normals = mMesh->getScaledNormals();
-			LLVector3 *scaled_binormals = mMesh->getScaledBinormals();
+			LLVector4a *coords = mMesh->getWritableCoords();
+			LLVector4a *scaled_normals = mMesh->getScaledNormals();
+			LLVector4a *scaled_binormals = mMesh->getScaledBinormals();
 			LLVector2 *tex_coords = mMesh->getWritableTexCoords();
 
+			LLVector4Logical clothing_mask;
+			clothing_mask.clear();
+			clothing_mask.setElement<0>();
+			clothing_mask.setElement<1>();
+			clothing_mask.setElement<2>();
+
+
 			for(U32 vert = 0; vert < mMorphData->mNumIndices; vert++)
 			{
 				F32 lastMaskWeight = mLastWeight * maskWeights[vert];
 				S32 out_vert = mMorphData->mVertexIndices[vert];
 
 				// remove effect of existing masked morph
-				coords[out_vert] -= LLVector4(mMorphData->mCoords[vert]) * lastMaskWeight;
-				scaled_normals[out_vert] -= mMorphData->mNormals[vert] * lastMaskWeight * NORMAL_SOFTEN_FACTOR;
-				scaled_binormals[out_vert] -= mMorphData->mBinormals[vert] * lastMaskWeight * NORMAL_SOFTEN_FACTOR;
+				LLVector4a t;
+				t = mMorphData->mCoords[vert];
+				t.mul(lastMaskWeight);
+				coords[out_vert].sub(t);
+
+				t = mMorphData->mNormals[vert];
+				t.mul(lastMaskWeight*NORMAL_SOFTEN_FACTOR);
+				scaled_normals[out_vert].sub(t);
+
+				t = mMorphData->mBinormals[vert];
+				t.mul(lastMaskWeight*NORMAL_SOFTEN_FACTOR);
+				scaled_binormals[out_vert].sub(t);
+
 				tex_coords[out_vert] -= mMorphData->mTexCoords[vert] * lastMaskWeight;
 
 				if (clothing_weights)
 				{
-					LLVector3 clothing_offset = mMorphData->mCoords[vert] * lastMaskWeight;
-					LLVector4* clothing_weight = &clothing_weights[out_vert];
-					clothing_weight->mV[VX] -= clothing_offset.mV[VX];
-					clothing_weight->mV[VY] -= clothing_offset.mV[VY];
-					clothing_weight->mV[VZ] -= clothing_offset.mV[VZ];
+					LLVector4a clothing_offset = mMorphData->mCoords[vert];
+					clothing_offset.mul(lastMaskWeight);
+					LLVector4a* clothing_weight = &clothing_weights[out_vert];
+					LLVector4a t;
+					t.setSub(*clothing_weight, clothing_offset);
+					clothing_weight->setSelectWithMask(clothing_mask, t, *clothing_weight);
 				}
 			}
 		}
@@ -945,7 +979,7 @@ LLPolyVertexMask::~LLPolyVertexMask()
 //-----------------------------------------------------------------------------
 // generateMask()
 //-----------------------------------------------------------------------------
-void LLPolyVertexMask::generateMask(U8 *maskTextureData, S32 width, S32 height, S32 num_components, BOOL invert, LLVector4 *clothing_weights)
+void LLPolyVertexMask::generateMask(U8 *maskTextureData, S32 width, S32 height, S32 num_components, BOOL invert, LLVector4a *clothing_weights)
 {
 // RN debug output that uses Image Debugger (http://www.cs.unc.edu/~baxter/projects/imdebug/)
 //	BOOL debugImg = FALSE; 
@@ -989,7 +1023,7 @@ void LLPolyVertexMask::generateMask(U8 *maskTextureData, S32 width, S32 height,
 
 		if (clothing_weights)
 		{
-			clothing_weights[vertIndex].mV[VW] = mWeights[index];
+			clothing_weights[vertIndex].getF32ptr()[VW] = mWeights[index];
 		}
 	}
 	mWeightsGenerated = TRUE;
diff --git a/indra/newview/llpolymorph.h b/indra/newview/llpolymorph.h
index be7019fdf..dac698437 100644
--- a/indra/newview/llpolymorph.h
+++ b/indra/newview/llpolymorph.h
@@ -68,14 +68,14 @@ public:
 	U32					mNumIndices;
 	U32*				mVertexIndices;
 	U32					mCurrentIndex;
-	LLVector3*			mCoords;
-	LLVector3*			mNormals;
-	LLVector3*			mBinormals;
+	LLVector4a*			mCoords;
+	LLVector4a*			mNormals;
+	LLVector4a*			mBinormals;
 	LLVector2*			mTexCoords;
 
 	F32					mTotalDistortion;	// vertex distortion summed over entire morph
 	F32					mMaxDistortion;		// maximum single vertex distortion in a given morph
-	LLVector3			mAvgDistortion;		// average vertex distortion, to infer directionality of the morph
+	LLVector4a			mAvgDistortion;		// average vertex distortion, to infer directionality of the morph
 	LLPolyMeshSharedData*	mMesh;
 };
 
@@ -88,7 +88,7 @@ public:
 	LLPolyVertexMask(LLPolyMorphData* morph_data);
 	~LLPolyVertexMask();
 
-	void generateMask(U8 *maskData, S32 width, S32 height, S32 num_components, BOOL invert, LLVector4 *clothing_weights);
+	void generateMask(U8 *maskData, S32 width, S32 height, S32 num_components, BOOL invert, LLVector4a *clothing_weights);
 	F32* getMorphMaskWeights();
 
 
@@ -167,11 +167,11 @@ public:
 	
 	// LLViewerVisualParam Virtual functions
 	/*virtual*/ F32					getTotalDistortion();
-	/*virtual*/ const LLVector3&	getAvgDistortion();
+	/*virtual*/ const LLVector4a&	getAvgDistortion();
 	/*virtual*/ F32					getMaxDistortion();
-	/*virtual*/ LLVector3			getVertexDistortion(S32 index, LLPolyMesh *poly_mesh);
-	/*virtual*/ const LLVector3*	getFirstDistortion(U32 *index, LLPolyMesh **poly_mesh);
-	/*virtual*/ const LLVector3*	getNextDistortion(U32 *index, LLPolyMesh **poly_mesh);
+	/*virtual*/ LLVector4a			getVertexDistortion(S32 index, LLPolyMesh *poly_mesh);
+	/*virtual*/ const LLVector4a*	getFirstDistortion(U32 *index, LLPolyMesh **poly_mesh);
+	/*virtual*/ const LLVector4a*	getNextDistortion(U32 *index, LLPolyMesh **poly_mesh);
 
 	void	applyMask(U8 *maskData, S32 width, S32 height, S32 num_components, BOOL invert);
 	void	addPendingMorphMask() { mNumMorphMasksPending++; }
diff --git a/indra/newview/lltexlayerparams.h b/indra/newview/lltexlayerparams.h
index 74c22b0cd..2c0da60b4 100644
--- a/indra/newview/lltexlayerparams.h
+++ b/indra/newview/lltexlayerparams.h
@@ -76,11 +76,11 @@ public:
 
 	// LLViewerVisualParam Virtual functions
 	/*virtual*/ F32					getTotalDistortion()									{ return 1.f; }
-	/*virtual*/ const LLVector3&	getAvgDistortion()										{ return mAvgDistortionVec; }
+	/*virtual*/ const LLVector4a&	getAvgDistortion()										{ return mAvgDistortionVec; }
 	/*virtual*/ F32					getMaxDistortion()										{ return 3.f; }
-	/*virtual*/ LLVector3			getVertexDistortion(S32 index, LLPolyMesh *poly_mesh)	{ return LLVector3(1.f, 1.f, 1.f);}
-	/*virtual*/ const LLVector3*	getFirstDistortion(U32 *index, LLPolyMesh **poly_mesh)	{ index = 0; poly_mesh = NULL; return &mAvgDistortionVec;};
-	/*virtual*/ const LLVector3*	getNextDistortion(U32 *index, LLPolyMesh **poly_mesh)	{ index = 0; poly_mesh = NULL; return NULL;};
+	/*virtual*/ LLVector4a			getVertexDistortion(S32 index, LLPolyMesh *poly_mesh)	{ return LLVector4a(1.f, 1.f, 1.f);}
+	/*virtual*/ const LLVector4a*	getFirstDistortion(U32 *index, LLPolyMesh **poly_mesh)	{ index = 0; poly_mesh = NULL; return &mAvgDistortionVec;};
+	/*virtual*/ const LLVector4a*	getNextDistortion(U32 *index, LLPolyMesh **poly_mesh)	{ index = 0; poly_mesh = NULL; return NULL;};
 
 	// New functions
 	BOOL					render( S32 x, S32 y, S32 width, S32 height );
@@ -94,7 +94,7 @@ private:
 	LLPointer<LLImageRaw>	mStaticImageRaw;
 	BOOL					mNeedsCreateTexture;
 	BOOL					mStaticImageInvalid;
-	LLVector3				mAvgDistortionVec;
+	LLVector4a				mAvgDistortionVec;
 	F32						mCachedEffectiveWeight;
 
 public:
@@ -155,18 +155,18 @@ public:
 
 	// LLViewerVisualParam Virtual functions
 	/*virtual*/ F32					getTotalDistortion()									{ return 1.f; }
-	/*virtual*/ const LLVector3&	getAvgDistortion()										{ return mAvgDistortionVec; }
+	/*virtual*/ const LLVector4a&	getAvgDistortion()										{ return mAvgDistortionVec; }
 	/*virtual*/ F32					getMaxDistortion()										{ return 3.f; }
-	/*virtual*/ LLVector3			getVertexDistortion(S32 index, LLPolyMesh *poly_mesh)	{ return LLVector3(1.f, 1.f, 1.f); }
-	/*virtual*/ const LLVector3*	getFirstDistortion(U32 *index, LLPolyMesh **poly_mesh)	{ index = 0; poly_mesh = NULL; return &mAvgDistortionVec;};
-	/*virtual*/ const LLVector3*	getNextDistortion(U32 *index, LLPolyMesh **poly_mesh)	{ index = 0; poly_mesh = NULL; return NULL;};
+	/*virtual*/ LLVector4a			getVertexDistortion(S32 index, LLPolyMesh *poly_mesh)	{ return LLVector4a(1.f, 1.f, 1.f); }
+	/*virtual*/ const LLVector4a*	getFirstDistortion(U32 *index, LLPolyMesh **poly_mesh)	{ index = 0; poly_mesh = NULL; return &mAvgDistortionVec;};
+	/*virtual*/ const LLVector4a*	getNextDistortion(U32 *index, LLPolyMesh **poly_mesh)	{ index = 0; poly_mesh = NULL; return NULL;};
 
 	// New functions
 	LLColor4				getNetColor() const;
 protected:
 	virtual void onGlobalColorChanged(bool upload_bake) {}
 private:
-	LLVector3				mAvgDistortionVec;
+	LLVector4a				mAvgDistortionVec;
 };
 
 class LLTexLayerParamColorInfo : public LLViewerVisualParamInfo
diff --git a/indra/newview/llviewervisualparam.h b/indra/newview/llviewervisualparam.h
index 8eaa0af0a..259c0d6ee 100644
--- a/indra/newview/llviewervisualparam.h
+++ b/indra/newview/llviewervisualparam.h
@@ -84,11 +84,11 @@ public:
 
 	// New Virtual functions
 	virtual F32					getTotalDistortion() = 0;
-	virtual const LLVector3&	getAvgDistortion() = 0;
+	virtual const LLVector4a&	getAvgDistortion() = 0;
 	virtual F32					getMaxDistortion() = 0;
-	virtual LLVector3			getVertexDistortion(S32 index, LLPolyMesh *mesh) = 0;
-	virtual const LLVector3*	getFirstDistortion(U32 *index, LLPolyMesh **mesh) = 0;
-	virtual const LLVector3*	getNextDistortion(U32 *index, LLPolyMesh **mesh) = 0;
+	virtual LLVector4a			getVertexDistortion(S32 index, LLPolyMesh *mesh) = 0;
+	virtual const LLVector4a*	getFirstDistortion(U32 *index, LLPolyMesh **mesh) = 0;
+	virtual const LLVector4a*	getNextDistortion(U32 *index, LLPolyMesh **mesh) = 0;
 	
 	// interface methods
 	F32					getDisplayOrder() const		{ return getInfo()->mEditGroupDisplayOrder; }

From 4cbdb7897dc50e9d3d2bb93450785827b2cd492b Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Wed, 18 Jul 2012 03:08:47 -0500
Subject: [PATCH 042/199] MAINT-646: Knock out some extraneous performance
 timers. https://bitbucket.org/davep/viewer-development/changeset/71673401390a

---
 indra/newview/llviewerobject.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 54ed9ac8d..5732027be 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2245,8 +2245,9 @@ BOOL LLViewerObject::isActive() const
 
 BOOL LLViewerObject::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 {
-	static LLFastTimer::DeclareTimer ftm("Viewer Object");
-	LLFastTimer t(ftm);
+	//static LLFastTimer::DeclareTimer ftm("Viewer Object");
+	//LLFastTimer t(ftm);
+
 	if (mDead)
 	{
 		// It's dead.  Don't update it.

From 6736e91ce0367b184ee34369e94d24323b2ce7c2 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Wed, 18 Jul 2012 03:09:16 -0500
Subject: [PATCH 043/199] MAINT-1147: Don't rebuild volume meshes on region
 crossing.
 https://bitbucket.org/davep/viewer-development/changeset/0f20bb7cb9ee

---
 indra/newview/llspatialpartition.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp
index 784a0e69c..20c390931 100644
--- a/indra/newview/llspatialpartition.cpp
+++ b/indra/newview/llspatialpartition.cpp
@@ -805,7 +805,7 @@ void LLSpatialGroup::shift(const LLVector4a &offset)
 	mObjectExtents[0].add(offset);
 	mObjectExtents[1].add(offset);
 
-	//if (!mSpatialPartition->mRenderByGroup)
+	if (!mSpatialPartition->mRenderByGroup)
 	{
 		setState(GEOM_DIRTY);
 		gPipeline.markRebuild(this, TRUE);

From 8fe69254146a76f5780d6a1ab005340ca48b2990 Mon Sep 17 00:00:00 2001
From: Damian Zhaoying <damian.zhaoying@avataresargentinos.com.ar>
Date: Wed, 18 Jul 2012 15:30:03 -0300
Subject: [PATCH 044/199] New Spanish Translations

---
 .../default/xui/es/floater_post_process.xml   | 176 +++-----
 .../skins/default/xui/es/floater_postcard.xml |  56 +--
 .../default/xui/es/floater_preferences.xml    |  32 +-
 .../xui/es/floater_preview_animation.xml      |  34 +-
 .../xui/es/floater_preview_classified.xml     |   8 +-
 .../es/floater_preview_embedded_texture.xml   |   6 +-
 .../default/xui/es/floater_preview_event.xml  |   8 +-
 .../es/floater_preview_existing_landmark.xml  |   8 +-
 .../xui/es/floater_preview_gesture.xml        | 128 ++----
 .../xui/es/floater_preview_notecard.xml       |  77 +---
 .../floater_preview_notecard_keep_discard.xml |  81 +---
 .../default/xui/es/floater_preview_sound.xml  |  28 +-
 .../xui/es/floater_preview_texture.xml        |  91 ++--
 .../floater_preview_texture_keep_discard.xml  |  32 +-
 .../default/xui/es/floater_preview_url.xml    |   8 +-
 .../xui/es/floater_price_for_listing.xml      |  32 +-
 .../skins/default/xui/es/floater_radar.xml    | 347 +++-------------
 .../default/xui/es/floater_report_abuse.xml   | 389 ++++++++----------
 .../default/xui/es/floater_report_bug.xml     | 197 +++------
 .../default/xui/es/floater_rlv_behaviours.xml | 104 +----
 .../default/xui/es/floater_rlv_locks.xml      |  17 +-
 .../default/xui/es/floater_script_debug.xml   |  15 +-
 .../xui/es/floater_script_ed_panel.xml        | 103 ++---
 .../default/xui/es/floater_script_preview.xml |  24 +-
 .../default/xui/es/floater_script_queue.xml   |  14 +-
 25 files changed, 565 insertions(+), 1450 deletions(-)

diff --git a/indra/newview/skins/default/xui/es/floater_post_process.xml b/indra/newview/skins/default/xui/es/floater_post_process.xml
index aef810211..138856077 100644
--- a/indra/newview/skins/default/xui/es/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/es/floater_post_process.xml
@@ -1,141 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Post-Process Floater" title="Configuración de Post Procesado">
-	  <tab_container name="Post-Process Tabs">
-			 <panel label="Filtro de Color" name="ColorFilterPanel">
-					<check_box label="Activar" name="enable_color_filter"/>
-					<text name="ColorFilterGammaText">
-						  Gama
-					</text>
-					<slider label="" name="gamma" />
-					<text name="ColorFilterBrightnessText">
-						  Brillo
-					</text>
-					<slider label="" name="brightness" />
-					<text name="ColorFilterSaturationText">
-						  Saturación
-					</text>
-					<slider label="" name="saturation"/>
-					<text name="ColorFilterContrastText">
-						  Contraste
-					</text>
-					<slider label="" name="contrast"/>
-					<text name="ColorFilterBaseText">
-						  Color base del contraste
-					</text>
-					<slider label="R" name="contrast_base[0]"/>
-					<slider label="G" name="contrast_base[1]"/>
-					<slider label="B" name="contrast_base[2]"/>
-					<slider label="I" name="contrast_base[3]"/>
-			 </panel>
-			 <panel label="Desenfoque Gaussiano" name="GaussBlurPanel">
-					<check_box label="Activar" name="enable_gauss_blur"/>
-					<text name="GaussBlurPassesText">
-						  Pasos a aplicar
-					</text>
-					<slider label="" name="gauss_blur_passes"/>
-			 </panel>
-		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
-		     label="Night Vision" left="1" mouse_opaque="false"
-		     name="NightVisionPanel" width="398">
-			<check_box bottom="-20" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="false" label="Enable"
-			     left="14" mouse_opaque="true" name="enable_night_vision" width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="NightVisionBrightMultText" v_pad="0"
-			     width="355">
-				Light Amplification Multiple
+	<tab_container name="Post-Process Tabs">
+		<panel label="Filtro de Color" name="ColorFilterPanel">
+			<check_box label="Activar" name="enable_color_filter"/>
+			<text name="ColorFilterGammaText">
+				Gama
 			</text>
-			<slider bottom_delta="-30" can_edit_text="true"
-			     decimal_digits="3" follows="left"
-			     height="18" increment="0.01" initial_val="3.0" label="" left="14"
-			     max_val="10" min_val="1" mouse_opaque="true"
-			     name="brightness_multiplier" show_text="true" value="0.7" width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="NightVisionNoiseSizeText" v_pad="0"
-			     width="355">
-				Noise Size
+			<slider label="" name="gamma" />
+			<text name="ColorFilterBrightnessText">
+				Brillo
 			</text>
-			<slider bottom_delta="-30" can_edit_text="true"
-			     decimal_digits="3" follows="left" height="18" increment="0.1"
-			     initial_val="1" label="" left="14" max_val="100" min_val="1"
-			     mouse_opaque="true" name="noise_size" show_text="true"
-			     value="1.0" width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="NightVisionNoiseStrengthText"
-			     v_pad="0" width="355">
-				Noise Strength
+			<slider label="" name="brightness" />
+			<text name="ColorFilterSaturationText">
+				Saturación
 			</text>
-			<slider bottom_delta="-30" can_edit_text="true" decimal_digits="3"
-			     follows="left" height="18" increment="0.01" initial_val="0.3" label=""
-			     left="14" max_val="1" min_val="0" mouse_opaque="true"
-			     name="noise_strength" show_text="true" value="1.0" width="200" />
+			<slider label="" name="saturation"/>
+			<text name="ColorFilterContrastText">
+				Contraste
+			</text>
+			<slider label="" name="contrast"/>
+			<text name="ColorFilterBaseText">
+				Color base del contraste
+			</text>
+			<slider label="R" name="contrast_base[0]"/>
+			<slider label="G" name="contrast_base[1]"/>
+			<slider label="B" name="contrast_base[2]"/>
+			<slider label="I" name="contrast_base[3]"/>
 		</panel>
-		<!--<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
-		     label="Bloom" left="1" mouse_opaque="true"
-		     name="BloomPanel" width="398">
-			<check_box bottom="-20" control_name="BloomToggle" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="false" label="Enable"
-			     left="14" mouse_opaque="true" name="BloomToggle" width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="BloomExtractText" v_pad="0"
-			     width="355">
-				Luminosity Extraction
+		<panel label="Desenfoque Gaussiano" name="GaussBlurPanel">
+			<check_box label="Activar" name="enable_gauss_blur"/>
+			<text name="GaussBlurPassesText">
+				Pasos a aplicar
 			</text>
-			<slider bottom_delta="-30" can_edit_text="true" control_name="BloomExtract"
-			     decimal_digits="3" follows="left" height="18" increment="0.01"
-			     initial_val="0.9" label="" left="14" max_val="1" min_val="0"
-			     mouse_opaque="true" name="BloomExtract" show_text="true" value="0.7"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="BloomSizeText" v_pad="0" width="355">
-				Bloom Size
+			<slider label="" name="gauss_blur_passes"/>
+		</panel>
+		<panel label="Visión Nocturna" name="NightVisionPanel">
+			<check_box label="Activar" name="enable_night_vision"/>
+			<text name="NightVisionBrightMultText">
+					Amplificación Múltiple de luz
 			</text>
-			<slider bottom_delta="-30" can_edit_text="true" control_name="BloomSize"
-			     decimal_digits="3" follows="left" height="18" increment="0.01"
-			     initial_val="3.0" label="" left="14" max_val="20" min_val="0"
-			     mouse_opaque="true" name="BloomSize" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="BloomStrengthText" v_pad="0"
-			     width="355">
-				Bloom Strength
+			<slider label="" name="brightness_multiplier"/>
+			<text name="NightVisionNoiseSizeText">
+				Tamaño del Ruido
 			</text>
-			<slider bottom_delta="-30" can_edit_text="true" control_name="BloomStrength"
-			     decimal_digits="3" follows="left" height="18" increment="0.01"
-			     initial_val="1.2" label="" left="14" max_val="10" min_val="0"
-			     mouse_opaque="true" name="BloomStrength" show_text="true" value="1.0"
-			     width="200" />
-		</panel>-->
-		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
-		     label="Extras" left="1" mouse_opaque="false" name="Extras"
-		     width="398">
-			<button bottom="-33" enabled="true" font="SansSerif" halign="center" height="20"
-			      label="LoadEffect" label_selected="LoadEffect" left="15"
-			     mouse_opaque="true" name="PPLoadEffect" scale_image="true" width="100" />
-			<button bottom="-60" enabled="true" font="SansSerif" halign="center" height="20"
-			      label="SaveEffect" label_selected="SaveEffect" left="15"
-			     mouse_opaque="true" name="PPSaveEffect" scale_image="true" width="100" />
-			<combo_box allow_text_entry="false" bottom="-33" follows="left|top" height="18"
-			     left_delta="120" max_chars="20" mouse_opaque="true" name="PPEffectsCombo"
-			     width="150" />
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-75"
-			     enabled="true" follows="left|right|bottom" font="SansSerif"
-			     handle_edit_keys_directly="false" height="20"
-			     label="Effect Name" left="135" max_length="40" mouse_opaque="true"
-			     name="PPEffectNameEditor" select_all_on_focus_received="false"
-			     select_on_focus="false" tab_group="1" width="150" />
+			<slider label="" name="noise_size"/>
+			<text name="NightVisionNoiseStrengthText">
+					Fuerza del Ruido
+			</text>
+			<slider label="" name="noise_strength"/>
+		</panel>
+		<panel label="Extras" name="Extras">
+			<button label="Cargar Efecto" label_selected="Cargar Efecto" name="PPLoadEffect"/>
+			<button label="Guardar Efecto" label_selected="Guardar Efecto" name="PPSaveEffect"/>
+			<combo_box name="PPEffectsCombo"/>
+			<line_editor label="Nombre del Efecto" name="PPEffectNameEditor"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_postcard.xml b/indra/newview/skins/default/xui/es/floater_postcard.xml
index b6aabcf94..c8c7640a2 100644
--- a/indra/newview/skins/default/xui/es/floater_postcard.xml
+++ b/indra/newview/skins/default/xui/es/floater_postcard.xml
@@ -1,54 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="true" height="380" min_height="380" min_width="450"
-     name="Postcard" title="Email Snapshot" width="450">
-	<text bottom="-35" follows="top|left" font="SansSerif" left="12" name="to_label">
-		Recipient&apos;s Email:
+<floater name="Postcard" title="Enviar Foto por Email">
+	<text name="to_label">
+		Email Destinat.:
 	</text>
-	<line_editor bottom_delta="-6" follows="left|top" height="20" left="120" max_length="254"
-	     name="to_form" width="150" />
-	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="12"
-	     name="from_label">
-		Your Email:
+	<text name="from_label">
+		Tu Email:
 	</text>
-	<line_editor bottom_delta="-6" follows="left|top" height="20" left="120" max_length="254"
-	     name="from_form" width="150" />
-	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="12"
-	     name="name_label">
-		Your Name:
+	<text name="name_label">
+		Tu Nombre:
 	</text>
-	<line_editor bottom_delta="-6" follows="left|top" height="20" left="120" max_length="100"
-	     name="name_form" width="150" />
-	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="12"
-	     name="subject_label">
-		Subject:
+	<text name="subject_label">
+		Asunto:
 	</text>
-	<line_editor bottom_delta="-6" follows="left|top" height="20"
-	     label="Type your subject here." left="120" max_length="100"
+	<line_editor label="Escribe el Asunto aquí." left="120" max_length="100"
 	     name="subject_form" width="150" spell_check="true" />
 	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="12"
 	     name="msg_label">
-		Message:
+		Mensaje:
 	</text>
-	<text_editor bottom_delta="-150" follows="left|top|right|bottom" height="140" left="12"
-	     max_length="700" name="msg_form" width="420" spell_check="true">
-		Type your message here.
+	<text_editor name="msg_form">
+		Escribe tu Mensaje aquí.
 	</text_editor>
-	<text bottom_delta="-37" follows="left|bottom" font="SansSerifSmall" left="12"
-	     name="fine_print">
-		If your recipient joins our universe, you&apos;ll get a referral bonus.
+	<text name="fine_print">
+		Si el destinatario se une a nuestro universo, recibirás un bono por referido.
 	</text>
-	<button bottom_delta="-32" follows="right|bottom" height="20" label="Cancel"
-	     name="cancel_btn" right="-10" width="100" />
-	<button bottom_delta="0" follows="right|bottom" height="20" label="Send"
-	     left_delta="-106" name="send_btn" width="100" />
+	<button label="Cancelar" name="cancel_btn" right="-10" width="100" />
+	<button label="Enviar" left_delta="-106" name="send_btn" width="100" />
 	<string name="default_subject">
-    Postcard from [SECOND_LIFE].
+		Tarjeta Postal desde [SECOND_LIFE].
   </string>
 	<string name="default_message">
-		Check this out!
+		¡Mira esto!
 	</string>
 	<string name="upload_message">
-	 "Sending..."
+		"Enviando..."
 	</string>	
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preferences.xml b/indra/newview/skins/default/xui/es/floater_preferences.xml
index ea850207c..cd73a8981 100644
--- a/indra/newview/skins/default/xui/es/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/es/floater_preferences.xml
@@ -1,28 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-666" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" can_tear_off="true" default_tab_group="1" enabled="true"
-     height="510" left="330" min_height="213" min_width="324"
-     mouse_opaque="true" name="Preferences" title="Preferences" width="620">
-	<button bottom="-505" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" label="OK" label_selected="OK" left="335"
-	     mouse_opaque="true" name="OK" scale_image="true" width="90" />
-	<button bottom="-505" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" label="Cancel" label_selected="Cancel"
-	     left_delta="93" mouse_opaque="true" name="Cancel" scale_image="true"
-	     width="90" />
-	<button bottom="-505" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" label="Apply" label_selected="Apply"
-	     left_delta="93" mouse_opaque="true" name="Apply" scale_image="true"
-	     width="90" />
-	<button bottom="-505" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" label="About" label_selected="About" left="9"
-	     mouse_opaque="true" name="About..." scale_image="true" width="90" />
-	<button bottom="-505" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20"
-	     help_url="http://secondlife.com/app/help/technical/preferences.php"
-	     label="Help" label_selected="Help" left_delta="93" mouse_opaque="true"
-	     name="Help" scale_image="true" width="90" />
-	<tab_container bottom="-466" enabled="true" follows="left|top|right|bottom" height="445"
-	     left="0" mouse_opaque="false" name="pref core" tab_group="1"
-	     tab_position="left" tab_width="120" width="620" />
+<floater name="Preferences" title="Preferencias">
+	<button label="OK" label_selected="OK" name="OK"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<button label="Aplicar" label_selected="Aplicar" name="Apply"/>
+	<button label="Acerca de" label_selected="Acerca de" name="About..."/>
+	<button label="Ayuda" label_selected="Ayuda" name="Help"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_animation.xml b/indra/newview/skins/default/xui/es/floater_preview_animation.xml
index 8eaf14b06..13a9501d6 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_animation.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_animation.xml
@@ -1,32 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-366" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="85" left="239" min_height="0"
-     min_width="0" mouse_opaque="true" name="preview_anim" width="300">
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
-	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
-	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-	     select_on_focus="false" width="194" spell_check="true" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
-	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
-		Description:
+<floater name="preview_anim">
+	<text name="desc txt">
+		Descripción:
 	</text>
-	<!--<button bottom="-66" enabled="true" font="SansSerif" halign="center" height="19"
-	     label="Play in World" label_selected="Stop" left="27" mouse_opaque="true"
-	     name="Anim play btn" scale_image="true"
-	     tool_tip="Play this animation so that others can see it." width="96" />
-	<button bottom="-66" enabled="true" font="SansSerif" halign="center" height="19"
-	     label="Play Locally" label_selected="Stop" left="177" mouse_opaque="true"
-	     name="Anim audition btn" scale_image="true"
-	     tool_tip="Play this animation so that only you can see it." width="96" />-->
-	<button bottom="-66" enabled="true" font="SansSerif" halign="center" height="19"
-	     label="Play in World" label_selected="Stop" left="4" mouse_opaque="true"
-	     name="Anim play btn" scale_image="true"
-	     tool_tip="Play this animation so that others can see it." width="96" />
-	<button bottom="-66" enabled="true" font="SansSerif" halign="center" height="19"
-	     label="Play Locally" label_selected="Stop" left_delta="98" mouse_opaque="true"
-	     name="Anim audition btn" scale_image="true"
-	     tool_tip="Play this animation so that only you can see it." width="96" />
+	<button label="Mundo" label_selected="Stop" name="Anim play btn" tool_tip="Reproducir esta animación para que otros puedan verla."/>
+	<button label="Localmente" label_selected="Stop" name="Anim audition btn" tool_tip="Reproducir esta animación de modo que sólo tu puedas verla."/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_classified.xml b/indra/newview/skins/default/xui/es/floater_preview_classified.xml
index 3b116b3fe..7e96aafb2 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_classified.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_classified.xml
@@ -1,9 +1,3 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="510" left="242" min_height="480"
-     min_width="450" mouse_opaque="true" name="classified_preview"
-     rect_control="PreviewClassifiedRect" title="Classified Information"
-     width="440">
-	<panel bottom="20" follows="bottom|left" height="470" left="0"
-	     name="classified_details_panel" width="440" />
+<floater name="classified_preview" title="Información Clasificados">
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_embedded_texture.xml b/indra/newview/skins/default/xui/es/floater_preview_embedded_texture.xml
index 951708401..181799c47 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_embedded_texture.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_embedded_texture.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-338" can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" height="331" left="201" min_height="120" min_width="300" name="preview_texture" width="300">
-	<button bottom="-325" font="SansSerif" height="20" label="Copy To Inventory" left="105" name="Copy To Inventory" scale_image="true" width="172" />
-	<text bottom="30" font="SansSerifSmall" height="14" left="13" name="dimensions">Dimensions: [WIDTH] x [HEIGHT]</text>
+<floater name="preview_texture">
+	<button label="Copiar al Inventario" name="Copy To Inventory"/>
+	<text name="dimensions">Dimensiones: [WIDTH] x [HEIGHT]</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_event.xml b/indra/newview/skins/default/xui/es/floater_preview_event.xml
index 8aab4676d..ec8c1433d 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_event.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_event.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="510" left="242" min_height="480"
-     min_width="450" mouse_opaque="true" name="event_preview"
-     rect_control="PreviewEventRect" title="Event Information" width="440">
-	<panel bottom="20" follows="bottom|left" height="470" left="0"
-	     name="event_details_panel" width="440" />
+<floater name="event_preview" title="Información de Eventos">
+	<panel name="event_details_panel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_existing_landmark.xml b/indra/newview/skins/default/xui/es/floater_preview_existing_landmark.xml
index efe3aca47..62886e348 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_existing_landmark.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_existing_landmark.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-311" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="495" left="242" min_height="510"
-     min_width="460" mouse_opaque="true" name="existing_landmark_preview"
-     width="440">
-	<panel bottom="0" follows="bottom|left" height="475" left="0"
-	     name="place_details_panel" width="440" />
+<floater name="existing_landmark_preview">
+	<panel name="place_details_panel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
index c596107a5..c04b3d9b5 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_gesture.xml
@@ -1,108 +1,64 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="350" min_height="350" min_width="450"
-     name="gesture_preview" width="450">
-	<string name="step_anim" />
-	<string name="step_sound" />
-	<string name="step_chat" />
-	<string name="step_wait" />
+<floater name="gesture_preview">
 	<string name="stop_txt">
-		Stop
+		Detener
 	</string>
 	<string name="preview_txt">
-		Preview
+		Vista Previa
 	</string>
 	<string name="none_text">
-		-- None --
+		-- Nada --
 	</string>
-	<text bottom="-35" follows="top|left" font="SansSerif" left="16" name="desc_label">
-		Description:
+	<text name="desc_label">
+		Descripción:
 	</text>
-	<line_editor bottom_delta="-6" follows="left|top" height="20" left="100" max_length="254"
-	     name="desc" width="330" spell_check="true" />
 	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="16"
 	     name="trigger_label">
-		Trigger:
+		Disparador:
 	</text>
-	<line_editor bottom_delta="-6" follows="left|top" height="20" left="100" max_length="31"
-	     name="trigger_editor" width="105" />
-	<text bottom_delta="6" follows="top|left" font="SansSerif" left="220"
-	     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!">
-		Replace with:
+	<text name="replace_text" tool_tip="Reemplaza la palabra disparadora con estas palabras. Por ejemplo, el disparador &apos;Hola&apos; reemplázalo con &apos;Hello&apos; esto hará que en el chat salga &apos;Quiero decir Hello&apos; en vez de &apos;Quiero decir Hola&apos; al ejecutar el gesto.">
+		Reemplazar:
 	</text>
-	<line_editor bottom_delta="-6" follows="left|top" height="20" left="300" max_length="31"
-	     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"
-	     width="130" spell_check="true" />
-	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="16"
-	     name="key_label">
-		Shortcut Key:
+	<line_editor name="replace_editor" tool_tip="Reemplaza la palabra disparadora con estas palabras. Por ejemplo, el disparador &apos;Hola&apos; reemplázalo con &apos;Hello&apos; esto hará que en el chat salga &apos;Quiero decir Hello&apos; en vez de &apos;Quiero decir Hola&apos; al ejecutar el gesto."/>
+	<text name="key_label">
+		Atajo Teclado:
 	</text>
-	<combo_box bottom_delta="-6" follows="left|top" height="20" label="None" left="100"
-	     name="modifier_combo" width="50" />
-	<combo_box bottom_delta="0" follows="left|top" height="20" label="None" left_delta="60"
-	     name="key_combo" width="45" />
-	<text bottom_delta="-23" follows="top|left" font="SansSerif" left="16" name="library_label">
-		Library:
+	<combo_box label="Nada" name="modifier_combo"/>
+	<combo_box label="Nada" name="key_combo"/>
+	<text name="library_label">
+		Librería:
 	</text>
-	<text bottom_delta="0" follows="top|left" font="SansSerif" left="220" name="steps_label">
-		Steps:
+	<text name="steps_label">
+		Pasos:
 	</text>
-	<scroll_list bottom_delta="-120" draw_border="true" follows="top|left" height="110"
-	     left="16" multi_select="false" name="library_list" width="100">
-		Animation
-Sound
+	<scroll_list name="library_list">
+		Animación
+Sonidos
 Chat
-Wait
+Esperar
 	</scroll_list>
-	<button bottom_delta="90" follows="top|left" height="20" label="Add &gt;&gt;"
-	     left="130" name="add_btn" width="80" />
-	<button bottom_delta="-30" follows="top|left" height="20" label="Move Up"
-	     left_delta="0" name="up_btn" width="80" />
-	<button bottom_delta="-30" follows="top|left" height="20" label="Move Down"
-	     left_delta="0" name="down_btn" width="80" />
-	<button bottom_delta="-30" follows="top|left" height="20" label="Remove" left_delta="0"
-	     name="delete_btn" width="80" />
-	<scroll_list bottom_delta="0" draw_border="true" follows="top|left" height="110" left="220"
-	     multi_select="false" name="step_list" width="210" />
-	<text bottom_delta="-70" follows="top|left" font="SansSerif" height="60" left="16"
-	     name="help_label">
-		All steps happen simultaneously, 
-unless you add wait steps.
+	<button label="Añadir &gt;&gt;" name="add_btn"/>
+	<button label="Subir" name="up_btn"/>
+	<button label="Bajar" name="down_btn"/>
+	<button label="Quitar" name="delete_btn"/>
+	<scroll_list name="step_list"/>
+	<text name="help_label">
+		Todos los pasos se ejecutan 
+simultáneamente, a menos que 
+agregues un paso de espera.
 	</text>
-	<text bottom_delta="0" follows="top|left" height="60" left="222" name="options_text"
-	     width="205" />
-	<combo_box bottom_delta="20" follows="top|left" height="20" left_delta="10"
-	     name="animation_list" width="100" />
-	<combo_box bottom_delta="0" follows="top|left" height="20" left_delta="0"
-	     name="sound_list" width="100" />
-	<line_editor bottom_delta="0" follows="top|left" height="20" left_delta="0" max_length="127"
-	     name="chat_editor" width="100" spell_check="true" />
-	<radio_group bottom_delta="-20" draw_border="false" follows="top|left" height="40"
-	     left="340" name="animation_trigger_type" width="80">
-		<radio_item bottom_delta="-5" follows="left|top" height="16" left="3" mouse_opaque="true"
-		     width="80" name="start">
-			Start
+	<radio_group name="animation_trigger_type">
+		<radio_item name="start">
+			Iniciar
 		</radio_item>
-		<radio_item bottom_delta="-10" follows="left|top" height="16" left="3" mouse_opaque="true"
-		     width="80" name="stop">
-			Stop
+		<radio_item name="stop">
+			Detener
 		</radio_item>
 	</radio_group>
-	<check_box bottom_delta="25" follows="top|left" height="20"
-	     label="until animations are done" left="232" name="wait_anim_check"
-	     width="100" />
-	<check_box bottom_delta="-20" follows="top|left" height="20" label="time in seconds"
-	     left_delta="0" name="wait_time_check" width="100" />
-	<line_editor bottom_delta="0" follows="top|left" height="20" left_delta="105"
-	     max_length="15" name="wait_time_editor" width="50" />
-	<check_box bottom="7" follows="top|left" height="20" label="Active" left="140"
-	     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."
-	     width="100" />
-	<button bottom="5" follows="top|left" height="20" label="Preview" left_delta="80"
-	     name="preview_btn" width="80" />
-	<button bottom="5" follows="top|left" height="20" label="Save" left_delta="90"
-	     name="save_btn" width="80" />
+	<check_box label="Hasta que la aninación termine" name="wait_anim_check"/>
+	<check_box height="20" label="tiempo en segundos" name="wait_time_check"/>
+	<line_editor left_delta="125" name="wait_time_editor"/>
+	<check_box label="Activa" name="active_check" tool_tip="Los Gestos activos pueden ser disparados en el chat por sus frases disparadoras o pulsando sus teclas de acceso rápido. Los Gestos, por lo general, se vuelven inactivas cuando hay un conflicto en la combinación de teclas."/>
+	<button label="Vista Previa" name="preview_btn"/>
+	<button label="Guardar" name="save_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
index 5307864c6..1bd4e085d 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_notecard.xml
@@ -1,68 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-762" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" follows="left|top" height="377" left="273"
-     min_height="259" min_width="234" mouse_opaque="true"
-     name="preview notecard" title="Note:" width="400">
-	<button bottom="-370" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" label="Get Items" label_selected="Get Items" left_delta="120"
-	     mouse_opaque="false" name="Get Items" scale_image="true" width="100" />
-	<!--<check_box follows="left|bottom" bottom_delta="0" left_delta="110" name="https_chk" label="Saves via HTTPS" />-->
-	<icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16"
-	     image_name="icon_lock.tga" left="344" mouse_opaque="true" name="lock"
-	     width="16" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
-	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
-		Description:
+<floater name="preview notecard" title="Nota:">
+	<button label="Obtener Items" label_selected="Obtener Items" name="Get Items"/>
+	<text name="desc txt">
+		Descripción:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
-	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
-	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-	     select_on_focus="false" width="294" spell_check="true" />
-	<menu_bar bottom="-56" drop_shadow="false" enabled="true" follows="left|top|right"
-	     height="18" left="8" mouse_opaque="false" name="motecard_menu" opaque="false"
-	     tear_off="false" width="220">
-		<menu bottom_delta="16" left="0" drop_shadow="true" enabled="true" height="198" width="150"
-		     mouse_opaque="false" name="Edit" opaque="true" tear_off="false">
-			<menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
-			     mouse_opaque="true" name="Undo" width="139" />
-			<menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"
-			     mouse_opaque="true" name="Redo" width="139" />
-			<menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator1" width="139" />
-			<menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0"
-			     mouse_opaque="true" name="Cut" width="139" />
-			<menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0"
-			     mouse_opaque="true" name="Copy" width="139" />
-			<menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0"
-			     mouse_opaque="true" name="Paste" width="139" />
-			<menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator2" width="139" />
-			<menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0"
-			     mouse_opaque="true" name="Select All" width="139" />
-			<menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0"
-			     mouse_opaque="true" name="Deselect" width="139" />
-			<menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator3" width="139" />
-			<menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."
-			     left="0" mouse_opaque="true" name="Search / Replace..." width="139" />
+	<menu_bar name="motecard_menu">
+		<menu name="Edit" label="Editar">
+			<menu_item_call label="Deshacer" name="Undo"/>
+			<menu_item_call label="Rehacer" name="Redo"/>
+			<menu_item_call label="Cortar" name="Cut"/>
+			<menu_item_call label="Copiar" name="Copy"/>
+			<menu_item_call label="Pegar" name="Paste"/>
+			<menu_item_call label="Seleccionar Todo" name="Select All"/>
+			<menu_item_call label="Deseleccionar" name="Deselect"/>
+			<menu_item_call label="Buscar / Reemplazar..." name="Search / Replace..."/>
 		</menu>
 	</menu_bar>
-	<text_editor type="string" length="1" bottom="-344" embedded_items="true" enabled="true"
-	     follows="left|top|right|bottom" font="SansSerif" height="285"
-	     ignore_tab="false" left="4" max_length="65536" mouse_opaque="true"
-	     name="Notecard Editor" width="392" word_wrap="true" spell_check="true">
-		Loading...
+	<text_editor name="Notecard Editor">
+		Cargando...
 	</text_editor>
-	<button bottom="-370" enabled="false" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" label="Save" label_selected="Save" left="9"
-	     mouse_opaque="false" name="Save" scale_image="true" width="100" />
+	<button label="Guardar" label_selected="Guardar" name="Save"/>
 	<string name="no_object">
-		Unable to find object containing this note.
+		Incapaz de hallar el objeto contenido en esta nota.
 	</string>
 	<string name="not_allowed">
-		You are not allowed to view this note.
+		No tienes permiso para ver esta nota.
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_notecard_keep_discard.xml b/indra/newview/skins/default/xui/es/floater_preview_notecard_keep_discard.xml
index 96fd2633d..2858fbc7f 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_notecard_keep_discard.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_notecard_keep_discard.xml
@@ -1,71 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-762" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" follows="left|top" height="377" left="273"
-     min_height="259" min_width="350" mouse_opaque="true"
-     name="preview notecard" title="Note:" width="400">
-	<icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16"
-	     image_name="icon_lock.tga" left="344" mouse_opaque="true" name="lock"
-	     width="16" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
-	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
-		Description:
+<floater name="preview notecard" title="Nota:">
+	<text name="desc txt">
+		Descripción:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
-	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
-	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-	     select_on_focus="false" width="294" spell_check="true" />
-	<menu_bar bottom="-56" drop_shadow="false" enabled="true" follows="left|top|right"
-	     height="18" left="8" mouse_opaque="false" name="motecard_menu" opaque="false"
-	     tear_off="false" width="220">
-		<menu bottom_delta="16" left="0" drop_shadow="true" enabled="true" height="198" width="150"
-		     mouse_opaque="false" name="Edit" opaque="true" tear_off="false">
-			<menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
-			     mouse_opaque="true" name="Undo" width="139" />
-			<menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"
-			     mouse_opaque="true" name="Redo" width="139" />
-			<menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator1" width="139" />
-			<menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0"
-			     mouse_opaque="true" name="Cut" width="139" />
-			<menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0"
-			     mouse_opaque="true" name="Copy" width="139" />
-			<menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0"
-			     mouse_opaque="true" name="Paste" width="139" />
-			<menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator2" width="139" />
-			<menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0"
-			     mouse_opaque="true" name="Select All" width="139" />
-			<menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0"
-			     mouse_opaque="true" name="Deselect" width="139" />
-			<menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator3" width="139" />
-			<menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."
-			     left="0" mouse_opaque="true" name="Search / Replace..." width="139" />
+	<menu_bar name="motecard_menu" >
+		<menu name="Edit" label="Editar">
+			<menu_item_call label="Deshacer" name="Undo"/>
+			<menu_item_call label="Rehacer" name="Redo"/>
+			<menu_item_call label="Cortar" name="Cut"/>
+			<menu_item_call label="Copiar" name="Copy"/>
+			<menu_item_call label="Pegar" name="Paste"/>
+			<menu_item_call label="Seleccionar Todo" name="Select All"/>
+			<menu_item_call label="Deseleccionar" name="Deselect"/>
+			<menu_item_call label="Buscar / Reemplazar..." name="Search / Replace..."/>
 		</menu>
 	</menu_bar>
-	<text_editor type="string" length="1" bottom="-344" embedded_items="true" enabled="true"
-	     follows="left|top|right|bottom" font="SansSerif" height="285"
-	     ignore_tab="false" left="4" max_length="65536" mouse_opaque="true"
-	     name="Notecard Editor" width="392" word_wrap="true">
-		Loading...
+	<text_editor name="Notecard Editor">
+		Cargando...
 	</text_editor>
-	<button bottom="-370" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" label="Keep" label_selected="Keep" left="9"
-	     mouse_opaque="true" name="Keep" scale_image="true" width="100" />
-	<button bottom="-370" enabled="false" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" label="Save" label_selected="Save" left="114"
-	     mouse_opaque="false" name="Save" scale_image="true" width="100" />
-	<button bottom="-370" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" label="Discard" label_selected="Discard"
-	     left="219" mouse_opaque="true" name="Discard" scale_image="true"
-	     width="100" />
+	<button label="Mantener" label_selected="Mantener" name="Keep"/>
+	<button label="Guardar" label_selected="Guardar" name="Save"/>
+	<button label="Descartar" label_selected="Descartar" name="Discard"/>
 	<string name="no_object">
-		Unable to find object containing this note.
+		Incapaz de hallar el objeto contenido en esta nota.
 	</string>
 	<string name="not_allowed">
-		You are not allowed to view this note.
+		No tienes permiso para ver esta nota.
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_sound.xml b/indra/newview/skins/default/xui/es/floater_preview_sound.xml
index 0c422f1c8..e390e8075 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_sound.xml
@@ -1,26 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-85" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="85" left="176" min_height="0"
-     min_width="0" mouse_opaque="true" name="preview_sound" width="300">
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
-	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" left="95" max_length="127"
-	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-	     select_on_focus="false" width="192" spell_check="true" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
-	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
-		Description:
+<floater name="preview_sound">
+	<text name="desc txt">
+		Descripción:
 	</text>
-	<button bottom="-70" enabled="true" font="SansSerif" halign="center" height="19"
-	     label="Play Locally" label_selected="Play Locally" left="168"
+	<button label="Reproducir Localmente" label_selected="Reproducir Localmente" left="150"
 	     mouse_opaque="true" name="Sound audition btn" scale_image="true"
 	     sound_flags="0" tool_tip="Play this sound so that only you can hear it."
-	     width="120" />
-	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="19"
-	     label="Play in World" label_selected="Play in World" left_delta="-126"
-	     mouse_opaque="true" name="Sound play btn" scale_image="true"
-	     sound_flags="0" tool_tip="Play this sound so that others can hear it."
-	     width="120" />
+	     width="148" />
+	<button label="Reproducir en Mundo" label_selected="Reproducir en Mundo" left_delta="-146" name="Sound play btn" tool_tip="Play this sound so that others can hear it."
+	     width="142" />
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_texture.xml b/indra/newview/skins/default/xui/es/floater_preview_texture.xml
index 9a8681b7e..b76719394 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_texture.xml
@@ -1,88 +1,53 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-331" can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true" enabled="true" height="324" left="300" min_height="150" min_width="300" mouse_opaque="true" name="preview_texture" width="335">
-	<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="15"
-		left="13" mouse_opaque="true" name="desc txt" v_pad="0" width="80">
-			Description:
+<floater name="preview_texture">
+	<text name="desc txt">
+			Descripción:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-43" enabled="false"
-		follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="false" height="17" left="93" 
-		max_length="127" mouse_opaque="true" name="desc" select_all_on_focus_received="false" select_on_focus="false" 
-		width="229" spell_check="true" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
-		bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall" h_pad="0" 
-		halign="left" height="16" left="13" mouse_opaque="true" name="uuid txt" v_pad="0" width="80">
+	<text name="uuid txt">
 			UUID:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" enabled="false" 
-		follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="false" height="16" left="93" 
-		max_length="127" mouse_opaque="true" name="uuid" select_all_on_focus_received="false" select_on_focus="false" 
-		width="229" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
-		bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall" h_pad="0" 
-		halign="left" height="16" left="13" mouse_opaque="true" name="uploader txt" v_pad="0" width="80">
-			Uploaded by:
+	<text name="uploader txt">
+			Subida por:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" enabled="false" 
-		follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="false" height="16" left="93" 
-		right="-80" max_length="127" mouse_opaque="true" name="uploader" select_all_on_focus_received="false" 
-		select_on_focus="false" width="420" />
-	<button bottom_delta="-1" enabled="true" follows="right|top" font="SansSerifSmall" halign="center" height="18" 
-		label="Profile" right="320" mouse_opaque="true" name="openprofile" scale_image="true" width="60" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
-		bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall" 
-		h_pad="0" halign="left" height="16" left="13" mouse_opaque="true" name="uploadtime txt" v_pad="0" width="80">
-			Uploaded on:
+	<button label="Perfil" name="openprofile"/>
+	<text name="uploadtime txt">
+			Subida el:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0" enabled="false" 
-		follows="left|top|right" font="SansSerifSmall" handle_edit_keys_directly="false" height="16" left="93" 
-		right="-80" max_length="127" mouse_opaque="true" name="uploadtime" select_all_on_focus_received="false" 
-		select_on_focus="false" width="420" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
-		bottom_delta="-1" drop_shadow_visible="true" enabled="true" follows="right|top" font="SansSerifSmall" 
-		h_pad="50" halign="left" height="16" right="345" mouse_opaque="true" name="alphanote" v_pad="0" width="80">
-			Loading...
+	<text name="alphanote">
+			Cargando...
 	</text>
-	<button bottom="8" enabled="true" follows="left|bottom" font="SansSerif" halign="center" height="20" 
-		label="Keep" label_selected="Keep" left="9" mouse_opaque="true" name="Keep" scale_image="true" width="100" />
-	<button bottom="8" enabled="true" follows="left|bottom" font="SansSerif" halign="center" height="20" 
-		label="Discard" label_selected="Discard" left="114" mouse_opaque="true" name="Discard" scale_image="true" width="100" />
-	<button bottom="8" enabled="true" follows="left|bottom" font="SansSerif" halign="center" height="20" 
-		label="Copy To Inventory" left="9" mouse_opaque="true" name="Copy To Inventory" scale_image="true" width="170" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
-		bottom="35" drop_shadow_visible="true" enabled="true" follows="left|bottom" font="SansSerifSmall" h_pad="0" 
-		halign="left" height="14" left="13" mouse_opaque="true" name="dimensions" v_pad="0" width="135">
-			Dimensions: [WIDTH] x [HEIGHT]
+	<button label="Mantener" label_selected="Mantener" name="Keep"/>
+	<button label="Descartar" label_selected="Descartar" name="Discard"/>
+	<button label="Copiar al Inventario" name="Copy To Inventory"/>
+	<text name="dimensions">
+			Tamaño: [WIDTH] x [HEIGHT]
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 
-		bottom="35" drop_shadow_visible="true" enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0" 
-		halign="right" height="14" left="86" mouse_opaque="true" name="aspect_ratio" v_pad="0" width="110">
-			Preview Aspect Ratio
+	<text name="aspect_ratio">
+			Aspecto Vista Previa
 	</text>
-	<combo_box allow_text_entry="true" bottom="32" follows="right|bottom" height="20" left="202" max_chars="20" 
-		mouse_opaque="true" enabled="true" width="108" name="combo_aspect_ratio" tool_tip="Preview at a fixed aspect ratio">
-		<combo_item name="Unconstrained" value="Unconstrained">
-			Unconstrained
+	<combo_box name="combo_aspect_ratio" tool_tip="Vista Previa en aspecto fijo">
+		<combo_item name="Unconstrained">
+			Sin restricciones
 		</combo_item>
-		<combo_item name="1:1" value="1:1" tool_tip="Group Insignia or 1st Life Profile">
+		<combo_item name="1:1" tool_tip="Insignia de Grupo o Imagen del Perfil en 1ra. Vida">
 			1:1
 		</combo_item>
-		<combo_item name="4:3" value="4:3" tool_tip="2nd Life Profile">
+		<combo_item name="4:3" tool_tip="Imagen del Perfil en 2da. Vida">
 			4:3
 		</combo_item>
-		<combo_item name="10:7" value="10:7" tool_tip="Classifieds and search listings, landmarks">
+		<combo_item name="10:7" tool_tip="Clasificados y listados de la búsqueda, hitos">
 			10:7
 		</combo_item>
-		<combo_item name="3:2" value="3:2" tool_tip="About land">
+		<combo_item name="3:2" tool_tip="Acerca del Terreno">
 			3:2
 		</combo_item>
-		<combo_item name="16:10" value="16:10">
+		<combo_item name="16:10">
 			16:10
 		</combo_item>
-		<combo_item name="16:9" value="16:9" tool_tip="Profile Picks">
+		<combo_item name="16:9" tool_tip="Imagen Destacados del Perfil">
 			16:9
 		</combo_item>
-		<combo_item name="2:1" value="2:1">
+		<combo_item name="2:1">
 			2:1
 		</combo_item>
 	</combo_box>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_texture_keep_discard.xml b/indra/newview/skins/default/xui/es/floater_preview_texture_keep_discard.xml
index 2c24f4519..b1b1cba03 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_texture_keep_discard.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_texture_keep_discard.xml
@@ -1,29 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-331" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" height="331" left="176" min_height="120"
-     min_width="300" mouse_opaque="true" name="preview_texture" width="300">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
-	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
-		Description:
+<floater name="preview_texture">
+	<text name="desc txt">
+		Descripción:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
-	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
-	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-	     select_on_focus="false" width="194" spell_check="true" />
-	<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" label="Keep" label_selected="Keep" left="9"
-	     mouse_opaque="true" name="Keep" scale_image="true" width="100" />
-	<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="20" label="Discard" label_selected="Discard"
-	     left="114" mouse_opaque="true" name="Discard" scale_image="true"
-	     width="100" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="30" drop_shadow_visible="true" enabled="true" follows="left|bottom"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="13"
-	     mouse_opaque="true" name="dimensions" v_pad="0" width="163">
-		Dimensions: [WIDTH] x [HEIGHT]
+	<button label="Mantener" label_selected="Mantener" name="Keep"/>
+	<button label="Descartar" label_selected="Descartar" name="Discard"/>
+	<text name="dimensions">
+		Tamaño: [WIDTH] x [HEIGHT]
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_url.xml b/indra/newview/skins/default/xui/es/floater_preview_url.xml
index 055a5fc5b..1edbce078 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_url.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_url.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" enabled="true" height="495" mouse_opaque="true"
-     name="url_preview" rect_control="PreviewURLRect" title="Place Information"
-     width="440">
-	<panel bottom="0" follows="bottom|left" height="475" left="0"
-	     name="place_details_panel" width="440" />
+<floater name="url_preview" title="Información del lugar">
+	<panel name="place_details_panel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_price_for_listing.xml b/indra/newview/skins/default/xui/es/floater_price_for_listing.xml
index 873102394..d767dded4 100644
--- a/indra/newview/skins/default/xui/es/floater_price_for_listing.xml
+++ b/indra/newview/skins/default/xui/es/floater_price_for_listing.xml
@@ -1,25 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="240" min_height="300" min_width="300"
-     name="price_for_listing" title="Publish Classified Ad" width="320">
-	<text bottom="-200" follows="top|left" font="SansSerif" height="165" left="15"
-	     name="explanation_text">
-		Your classified ad will run for one week from 
-the date it is published. 
+<floater name="price_for_listing" title="Publicar Aviso Clasificado">
+	<text name="explanation_text">
+		Tu aviso clasificado se mantendrá durante una
+semana desde la fecha de su publicación. 
  
-Your ad&apos;s position in the classified listings 
-is determined by how much you choose to pay.
-The highest paid ads go to the top of the list, 
-and appear higher in searches.
+ La posición de tu aviso en el listado de avisos
+ se determina por cuanto decidas pagar.
+ Mientras más pagues por el aviso, mas alto en 
+ la lista y aparecerá en los primeros lugares.
 	</text>
-	<text bottom="50" follows="top|left" font="SansSerif" height="20" left="15"
-	     name="price_text" width="120">
-		Price for Ad ([CURRENCY]):
+	<text name="price_text">
+		Precio por el Aviso ([CURRENCY]):
 	</text>
-	<line_editor bottom_delta="2" follows="top|left" height="20" left="125" max_length="6"
-	     name="price_edit" width="60" />
-	<button bottom="13" follows="top|left" height="20" label="Cancel" left="205"
-	     name="cancel_btn" width="100" />
-	<button bottom_delta="0" follows="top|left" height="20" label="Set Price"
-	     left_delta="-106" name="set_price_btn" width="100" />
+	<button label="Cancelar" name="cancel_btn"/>
+	<button label="Definir Precio" name="set_price_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_radar.xml b/indra/newview/skins/default/xui/es/floater_radar.xml
index d0b67529b..0fb55cb12 100644
--- a/indra/newview/skins/default/xui/es/floater_radar.xml
+++ b/indra/newview/skins/default/xui/es/floater_radar.xml
@@ -1,329 +1,80 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="radar" title="Radar"
-	can_resize="true" can_minimize="true" can_close="true" can_drag_on_left="false"
-	rect_control="FloaterRadarRect" min_width="300"	min_height="300">
+<floater name="radar" title="Radar">
 
-	<scroll_list name="avatar_list"
-		    left="10" right="-10" top="-20" bottom="140" can_resize="true"
-		    column_padding="0" follows="left|top|bottom|right"
-		    draw_heading="true" multi_select="true" search_column="1"
-		    tool_tip="Hold shift or control while clicking to select multiple avatars">
-		<column name="marked" label="Mark" width="12" tool_tip="Marked avatars"/>
-		<column name="avatar_name" label="Name" width="150" tool_tip="Hold shift or control while clicking to select multiple avatars"/>
-		<column name="distance" label="Dist." width="48" tool_tip="Distance from your avatar (red=within chat range, yellow=within shout range, green=within draw distance)"/>
-		<column name="position" label="Pos." width="60" tool_tip="Position (X, Y) within this sim, or general direction (cardinal point) for outside sims"/>
-		<column name="altitude" label="Alt." width="48" tool_tip="Altitude"/>
-    <column name="activity" label="Act." width="24" tool_tip="Activity"/>
-    <column name="client" label="Client" width="80" dynamicwidth="true" tool_tip="Client the avatar is possibly using"/>
+	<scroll_list name="avatar_list" tool_tip="Mantén presionada la tecla Mayús o la tecla Ctrl al  pulsar con el mouse para seleccionar multiples avatares">
+		<column name="marked" label="Marcar" tool_tip="Avatares Marcados"/>
+		<column name="avatar_name" label="Nombre" tool_tip="Mantén presionada la tecla Mayús o la tecla Ctrl al  pulsar con el mouse para seleccionar multiples avatares"/>
+		<column name="distance" label="Dist." tool_tip="Distancia desde tu avatar (rojo=dentro del rango de chat, amarillo=dentro del rango de gritos, verde=dentro de la distancia de dibujo)"/>
+		<column name="position" label="Pos." tool_tip="Posición (X, Y) dentro del sim, o dirección general (punto cardinal) fuera del sim"/>
+		<column name="altitude" label="Alt." tool_tip="Altitud"/>
+		<column name="activity" label="Act." tool_tip="Actividad"/>
+		<column name="client" label="Cliente" tool_tip="Cliente-Visor que el avatar posiblemente esté usando"/>
 	</scroll_list>
 
-	<tab_container border="false" bottom_delta="-130" height="120" left="6" mouse_opaque="false"
-		       name="actions_tab_container" tab_position="top" follows="left|right|bottom">
-		<panel border="true" bottom_delta="-130" follows="left|top|right|bottom" height="255"
-		       label="Avatar" left="1" mouse_opaque="true"
-		     name="actions_tab" width="398">
+	<tab_container name="actions_tab_container">
+		<panel label="Avatar" name="actions_tab">
 			<!-- upper row -->
-			<button
-			       name="profile_btn"
-			       label="Profile"
-			       tool_tip="Show picture, groups, and other information"
-			       left="10"
-			       bottom_delta="-180"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="track_btn"
-			       label="(Un)Track"
-			       tool_tip="Toggle tracking of this avatar's position"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="get_key_btn"
-			       label="Get Key"
-			       tool_tip="Copies avatar's key to the clipboard"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
+			<button name="profile_btn" label="Perfil" tool_tip="Mostrar foto, grupos y demás información"/>
+			<button name="track_btn" label="(No)Rastrear" tool_tip="Rastrea la posición del avatar"/>
+			<button name="get_key_btn" label="Obtener Key" tool_tip="Copia la Key del avatar al portapapeles"/>
 			<!-- upper middle row -->
-			<button
-			       name="im_btn"
-			       label="IM"
-			       tool_tip="Open Instant Message session"
-			       left="10"
-			       bottom_delta="-22"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="offer_btn"
-			       label="Offer TP"
-			       tool_tip="Offer Teleport"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="teleport_btn"
-			       label="TP to"
-			       tool_tip="Teleport to avatar's position"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />			
+			<button name="im_btn" label="MI" tool_tip="Abre una sesión de Mensaje Instantáneo"/>
+			<button name="offer_btn" label="Ofrecer TP" tool_tip="Ofrecer Teleporte"/>
+			<button name="teleport_btn" label="TP a" tool_tip="Teleportarse a la posición del avatar"/>			
 			<!-- lower middle row-->
-			<button
-			       name="mark_btn"
-			       label="(Un)Mark"
-			       tool_tip="(Un)Mark this avatar in the list"
-			       left="10"
-			       bottom_delta="-22"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="prev_marked_btn"
-			       label="Prev Marked"
-			       tool_tip="Focus camera on previous marked avatar"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="next_marked_btn"
-			       label="Next Marked"
-			       tool_tip="Focus camera on next marked avatar"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
+			<button name="mark_btn" label="(No)Marcar" tool_tip="Marca/Desmarca a este avatar de la lista"/>
+			<button name="prev_marked_btn" label="Marcado Ant." tool_tip="Enfoca la cámara en el avatar marcado previo de la lista"/>
+			<button name="next_marked_btn" label="Marcado Sig." tool_tip="Enfoca la cámara en el avatar marcado siguiente de la lista"/>
 			<!-- lower row-->
-			<button
-			       name="focus_btn"
-			       label="Focus"
-			       tool_tip="Focus camera on this avatar in the list"
-			       left="10"
-			       bottom_delta="-22"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="prev_in_list_btn"
-			       label="Previous"
-			       tool_tip="Focus camera on previous avatar in list"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="next_in_list_btn"
-			       label="Next"
-			       tool_tip="Focus camera on next avatar in list"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
+			<button name="focus_btn" label="Foco" tool_tip="Enfoca la cámara en este avatar de la lista"/>
+			<button name="prev_in_list_btn" label="Anterior" tool_tip="Enfoca la cámara en el anterior avatar de la lista"/>
+			<button name="next_in_list_btn" label="Siguiente" tool_tip="Enfoca la cámara en el siguiente avatar de la lista"/>
 
 		</panel>
 
-		<panel border="true" bottom_delta="-150" follows="left|top|right|bottom" height="255"
-		       label="Alerts" left="1" mouse_opaque="true"
-		       name="alerts_tab" width="398">
-			<check_box height="16" label="Display alerts in chat"
-				   left="10" bottom_delta="-176" name="radar_alerts" 
-				   width="200" follows="bottom|left"
-				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
-				   initial_value="true" enabled="true" radio_style="false" 
-				   control_name="RadarChatAlerts"
-				   tool_tip="Announce alerts about incoming and outgoing avatars in chat" />
+		<panel label="Alertas" name="alerts_tab">
+			<check_box label="Mostrar Alertas en el chat" name="radar_alerts" tool_tip="Muestra en el chat las alertas de llegada y salida de los avatares" />
 
-			<check_box height="16" label="Avatars entering/exiting the sim"
-				   left="20" bottom_delta="-18" name="alerts_sim"
-				   width="200" follows="bottom|left"
-				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
-				   initial_value="true" enabled="true" radio_style="false"
-				   control_name="RadarAlertSim"
-				   tool_tip="Report avatars entering or exiting the sim" />
+			<check_box label="Avatares entrando/saliendo del sim" name="alerts_sim" tool_tip="Reporta los avatares que entran o salen del sim" />
 
-			<check_box height="16" label="Avatars within/beyond the draw distance"
-				   left="20" bottom_delta="-18" name="alerts_draw"
-				   width="200" follows="bottom|left"
-				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
-				   initial_value="true" enabled="true" radio_style="false"
-				   control_name="RadarAlertDraw"
-				   tool_tip="Report avatars getting within or beyond the draw distance" />
+			<check_box label="Avatare entrando/saliendo de la distancia de dibujo" name="alerts_draw" tool_tip="Reporta los avatares que entran o salen de la distancia de dibujo" />
 
-			<check_box height="16" label="Avatars within/beyond the shout range"
-				   left="20" bottom_delta="-18" name="alerts_chat"
-				   width="200" follows="bottom|left"
-				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
-				   initial_value="true" enabled="true" radio_style="false"
-				   control_name="RadarAlertShoutRange"
-				   tool_tip="Report avatars getting within or beyond the shout range" />
+			<check_box label="Avatares entrando/saliendo del rango de gritos" name="alerts_chat" tool_tip="Reporta los avatares que entran o salen del rango de gritos" />
 
-			<check_box height="16" label="Avatars within/beyond the chat range"
-				   left="20" bottom_delta="-18" name="alerts_chat"
-				   width="200" follows="bottom|left"
-				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
-				   initial_value="true" enabled="true" radio_style="false"
-				   control_name="RadarAlertChatRange"
-				   tool_tip="Report avatars getting within or beyond the chat range" />
+			<check_box label="Avatares entrando/saliendo del rango de chat" name="alerts_chat" tool_tip="Reporta los avatares que entran o salen del rango de chat" />
 		</panel>
 
-		<panel border="true" bottom_delta="-130" follows="left|top|right|bottom" height="255"
-		       label="Moderation" left="1" mouse_opaque="true"
-		       name="land_tab" width="398">
+		<panel label="Moderación" name="land_tab">
 			
 			<!-- Upper row -->
-			<button
-			       name="mute_btn"
-			       label="(Un)Mute"
-			       tool_tip="Mute or unmute this avatar (muted avatars' names are highlighted in red in the list)."
-			       left="10"
-			       bottom_delta="-200"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="freeze_btn"
-			       label="Freeze"
-			       tool_tip="Freeze the avatar, preventing it from moving"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
-			<button
-			       name="ar_btn"
-			       label="AR"
-			       tool_tip="Report abuse on this avatar"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
+			<button name="mute_btn" label="(No)Ignorar" tool_tip="Ignorar o dejar de ignorar a este avatar (los nombre de los avatares ignorados se resaltan en rojo en la lista)."/>
+			<button name="freeze_btn" label="Congelar" tool_tip="Congelar al avatar, para evitar que se pueda mover"/>
+			<button name="ar_btn" label="AR" tool_tip="Enviar un Reporte de Abuso sobre este avatar"/>
 			<!-- Lower row -->
-			<button
-			       name="eject_btn"
-			       label="Eject"
-			       tool_tip="Eject the avatar from the parcel"
-			       left="10"
-			       bottom_delta="-24"
-			       width="80"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
+			<button name="eject_btn" label="Expulsar" tool_tip="Expulsar a este avatar de la parcela"/>
 			
-			<button
-			       name="estate_eject_btn"
-			       label="Eject from estate"
-			       tool_tip="Eject this avatar from the estate"
-			       left_delta="90"
-			       bottom_delta="0"
-			       width="170"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
+			<button name="estate_eject_btn" label="Expulsar del Estado" tool_tip="Expulsar a este avatar del estado"/>
 		</panel>
 
-		<panel border="true" bottom_delta="-150" follows="left|top|right|bottom" height="255"
-		       label="Options" left="1" mouse_opaque="true"
-		       name="options_tab" width="398">
-			<check_box height="16" label="Update"
-				   left="10" bottom_delta="-180" name="update_enabled_cb" 
-				   width="200" follows="bottom|left"
-				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
-				   initial_value="true" enabled="true" radio_style="false" 
-				   tool_tip="Set whether the avatar list should update" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				   bottom_delta="-24" drop_shadow_visible="true" enabled="true" font="SansSerifSmall" height="18" left="24"
-				   mouse_opaque="false" name="rate" width="30">
-					Rate:
+		<panel label="Opciones" name="options_tab">
+			<check_box label="Actualizar" name="update_enabled_cb" tool_tip="Definir cuando debe ser actualizada la lista de avatares"/>
+			<text name="rate">
+					Frec.:
 			</text>
-			<radio_group draw_border="true" bottom_delta="2" left_delta="44" follows="bottom|left" width="196" height="20"
-				   mouse_opaque="true" name="update_rate" control_name="RadarUpdateRate" enabled="true"
-				   tool_tip="Rate of the radar updates (eats up more FPS when higher)">
-				<radio_item type="string" length="1" bottom_delta="0" height="16" left_delta="4" mouse_opaque="true"
-		     		 	name="high" width="20" follows="bottom|left">
-					High
+			<radio_group name="update_rate" tool_tip="Frecuencia de actualización del radar (consume mas FPS cuando es alta)">
+				<radio_item name="high">
+					Alta
 				</radio_item>
-				<radio_item type="string" length="1" bottom_delta="0" height="16" left_delta="30" mouse_opaque="true"
-		     		 	name="medium" width="25" follows="bottom|left">
-					Medium
+				<radio_item name="medium">
+					Media
 				</radio_item>
-				<radio_item type="string" length="1" bottom_delta="0" height="16" left_delta="35" mouse_opaque="true"
-		     		 	name="low" width="20" follows="bottom|left">
-					Low
+				<radio_item name="low">
+					Baja
 				</radio_item>
 			</radio_group>
-			<check_box height="16" label="Announce even when closed"
-				   left="10" bottom_delta="-24" name="keep_open"
-				   width="200" follows="bottom|left"
-				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
-				   initial_value="true" enabled="true" radio_style="false"
-				   control_name="RadarKeepOpen"
-				   tool_tip="Hides floater instead of closing to still announce in chat" />
-			<check_box height="16" label="Announce keys to HUD"
-				   left="10" bottom_delta="-20" name="radar_chat_keys" 
-				   width="200" follows="bottom|left"
-				   hidden="false" mouse_opaque="true" font="SansSerifSmall"
-				   initial_value="true" enabled="true" radio_style="false" 
-				   control_name="RadarChatKeys"
-				   tool_tip="Set whether to send keys of avatars to LSL scripts" />
-			<button
-			       name="send_keys_btn"
-			       label="Announce now"
-			       tool_tip="Send all keys to HUD now"
-			       left_delta="150"
-			       bottom_delta="-2"
-			       width="100"
-			       height="20"
-			       font="SansSerifSmall"
-			       follows="bottom|left"
-			       />
+			<check_box label="Anunciar aun estando cerrado" name="keep_open" tool_tip="Oculta el radar en vez de cerrarlo para seguir enviando los avisos al chat" />
+			<check_box label="Anunciar keys all HUD" name="radar_chat_keys" tool_tip="Definir cuando enviar las keys de los avarares a los scritps LSL" />
+			<button name="send_keys_btn" label="Anunciar Ahora" tool_tip="Envia todas las keys al HUD ahora"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_report_abuse.xml b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
index 95e9ad79c..4715df69b 100644
--- a/indra/newview/skins/default/xui/es/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/es/floater_report_abuse.xml
@@ -1,246 +1,189 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="590" min_height="100" min_width="100"
-     name="floater_report_abuse" title="Report Abuse" width="390">
-	<texture_picker allow_no_texture="true" bottom="-150" default_image_name="None"
-	     follows="left|top" height="114" label="" left="238" mouse_opaque="true"
-	     name="screenshot" width="134" />
-	<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Include screenshot" left="13"
-	     mouse_opaque="true" name="screen_check" width="116" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-48" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="reporter_title" v_pad="0" width="50">
-		Reporter:
+<floater name="floater_report_abuse" title="Reportar Abuso">
+	<texture_picker label="" name="screenshot"/>
+	<check_box label="Incluir captura" name="screen_check"/>
+	<text name="reporter_title">
+		Denunciante:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-48" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
-	     mouse_opaque="true" name="reporter_field" v_pad="0" width="150">
+	<text name="reporter_field">
 		Loremipsum Dolorsitamut
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-64" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="sim_title" v_pad="0" width="60">
-		Region:
+	<text name="sim_title">
+		Región:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-64" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
-	     mouse_opaque="true" name="sim_field" v_pad="0" width="120">
-		Region Name
+	<text name="sim_field">
+		Nombre de la Región
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-80" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="pos_title" v_pad="0" width="50">
-		Position:
+	<text name="pos_title">
+		Posición:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-80" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
-	     mouse_opaque="true" name="pos_field" v_pad="0" width="120">
+	<text name="pos_field">
 		{128.1, 128.1, 15.4}
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-18" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="select_object_label" v_pad="0" width="220">
-		Click the button then the object:
+	<text name="select_object_label">
+		Pulsa el botón y luego el objeto:
 	</text>
-	<button bottom_delta="-30" font="SansSerif" halign="center" height="32" label=""
-	     label_selected="" left="16" mouse_opaque="true" name="pick_btn"
-	     tool_tip="Object Picker - Identify an object as the subject of this report"
-	     width="32" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="16" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="53"
-	     mouse_opaque="true" name="object_name_label" v_pad="0" width="60">
-		Name:
+	<button label="" label_selected="" name="pick_btn" tool_tip="Selector de Objetos - Identificar un objeto como el sujeto de la denuncia"/>
+	<text name="object_name_label">
+		Nombre:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="66"
-	     mouse_opaque="true" name="object_name" v_pad="0" width="109">
+	<text name="object_name">
 		Consetetur Sadipscing
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="53"
-	     mouse_opaque="true" name="owner_name_label" v_pad="0" width="60">
-		Owner:
+	<text name="owner_name_label">
+		Propietario:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="66"
-	     mouse_opaque="true" name="owner_name" v_pad="0" width="109">
+	<text name="owner_name">
 		Hendrerit Vulputate
 	</text>
-	<combo_box bottom_delta="-48" follows="left|top" height="20" left="16" mouse_opaque="true"
-	     name="category_combo"
-	     tool_tip="Category -- select the category that best describes this report"
-	     width="356">
-    <combo_item name="Select_category" value="0">
-    Select category
-    </combo_item><combo_item name="Age__Age_play" value="31">
-    Age > Age play
-    </combo_item><combo_item name="Age__Adult_resident_on_Teen_Second_Life" value="32">
-    Age > Adult resident on Teen Second Life
-    </combo_item><combo_item name="Age__Underage_resident_outside_of_Teen_Second_Life" value="33">
-    Age > Underage resident outside of Teen Second Life
-    </combo_item><combo_item name="Assault__Combat_sandbox___unsafe_area" value="34">
-    Assault > Combat sandbox / unsafe area
-    </combo_item><combo_item name="Assault__Safe_area" value="35">
-    Assault > Safe area
-    </combo_item><combo_item name="Assault__Weapons_testing_sandbox" value="36">
-    Assault > Weapons testing sandbox
-    </combo_item><combo_item name="Commerce__Failure_to_deliver_product_or_service" value="38">
-    Commerce > Failure to deliver product or service
-    </combo_item><combo_item name="Disclosure__Real_world_information" value="39">
-    Disclosure > Real world information
-    </combo_item><combo_item name="Disclosure__Remotely_monitoring chat" value="40">
-    Disclosure > Remotely monitoring chat
-    </combo_item><combo_item name="Disclosure__Second_Life_information_chat_IMs" value="41">
-    Disclosure > Second Life information/chat/IMs
-    </combo_item><combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources" value="42">
-    Disturbing the peace > Unfair use of region resources
-    </combo_item><combo_item name="Disturbing_the_peace__Excessive_scripted_objects" value="43">
-    Disturbing the peace > Excessive scripted objects
-    </combo_item><combo_item name="Disturbing_the_peace__Object_littering" value="44">
-    Disturbing the peace > Object littering
-    </combo_item><combo_item name="Disturbing_the_peace__Repetitive_spam" value="45">
-    Disturbing the peace > Repetitive spam
-    </combo_item><combo_item name="Disturbing_the_peace__Unwanted_advert_spam" value="46">
-    Disturbing the peace > Unwanted advert spam
-    </combo_item><combo_item name="Fraud__L$" value="47">
-    Fraud > L$
-    </combo_item><combo_item name="Fraud__Land" value="48">
-    Fraud > Land
-    </combo_item><combo_item name="Fraud__Pyramid_scheme_or_chain_letter" value="49">
-    Fraud > Pyramid scheme or chain letter
-    </combo_item><combo_item name="Fraud__US$" value="50">
-    Fraud > US$
-    </combo_item><combo_item name="Ridiculous3" value="71">
-    Freud > User has taken an interest in their mother
-    </combo_item><combo_item name="Harassment__Advert_farms___visual_spam" value="51">
-    Harassment > Advert farms / visual spam
-    </combo_item><combo_item name="Harassment__Defaming_individuals_or_groups" value="52">
-    Harassment > Defaming individuals or groups
-    </combo_item><combo_item name="Harassment__Impeding_movement" value="53">
-    Harassment > Impeding movement
-    </combo_item><combo_item name="Harassment__Sexual_harassment" value="54">
-    Harassment > Sexual harassment
-    </combo_item><combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS" value="55">
-    Harassment > Solicting/inciting others to violate ToS
-    </combo_item><combo_item name="Harassment__Verbal_abuse" value="56">
-    Harassment > Verbal abuse
-    </combo_item><combo_item name="Ridiculous1" value="69">
-    Harassment > User keeps licking finger and touching me
-    </combo_item><combo_item name="Indecency__Broadly_offensive_content_or_conduct" value="57">
-    Indecency > Broadly offensive content or conduct
-    <!--  58 = deprecated by AO -->
-    </combo_item><combo_item name="Indecency__Inappropriate_avatar_name" value="59">
-    Indecency > Inappropriate avatar name
-    </combo_item><combo_item name="Indecency__Mature_content_in_PG_region" value="60">
-    Indecency > Inappropriate content or conduct in a PG region
-    </combo_item><combo_item name="Indecency__Inappropriate_content_in_Mature_region" value="69">
-    Indecency > Inappropriate content or conduct in a Mature region
-    </combo_item><combo_item name="Intellectual_property_infringement_Content_Removal" value="66">
-    Intellectual property infringement > Content Removal
-    </combo_item><combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit" value="37">
-    Intellectual property infringement > CopyBot or Permissions Exploit
-    </combo_item><combo_item name="Intolerance" value="61">
-    Intolerance
-    </combo_item><combo_item name="Land__Abuse_of_sandbox_resources" value="62">
-    Land > Abuse of sandbox resources
-    </combo_item><combo_item name="Land__Encroachment__Objects_textures" value="63">
-    Land > Encroachment > Objects/textures
-    </combo_item><combo_item name="Land__Encroachment__Particles" value="64">
-    Land > Encroachment > Particles
-    </combo_item><combo_item name="Land__Encroachment__Trees_plants" value="65">
-    Land > Encroachment > Trees/plants
-    </combo_item><combo_item name="Ridiculous2" value="70">
-    Land > Encroachment > User won't stay on their side of the car
-    </combo_item><combo_item name="Wagering_gambling" value="67">
-    Wagering/gambling
-    </combo_item>
-    <combo_item name="Other" value="68">
-      Other
-    </combo_item>
-    </combo_box>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="abuser_name_title" v_pad="0" width="180">
-		Abuser name:
+	<combo_box name="category_combo" tool_tip="Categoría -- selecciona la categoría que mejor describe esta denuncia">
+		<combo_item name="Select_category">
+			Seleccionar categoría
+		</combo_item>
+		<combo_item name="Age__Age_play">
+			Edad > Jugar a se niño
+		</combo_item>
+		<combo_item name="Age__Adult_resident_on_Teen_Second_Life">
+			Edad > Residente adulto en Teen Second Life
+		</combo_item>
+		<combo_item name="Age__Underage_resident_outside_of_Teen_Second_Life">
+			Edad > Residente menor de edad fuera de Teen Second Life
+		</combo_item>
+		<combo_item name="Assault__Combat_sandbox___unsafe_area">
+			Ataque > Sandox de Combate / zona no segura
+		</combo_item>
+		<combo_item name="Assault__Safe_area">
+			Ataque > >Zona segura
+		</combo_item>
+		<combo_item name="Assault__Weapons_testing_sandbox">
+			Ataque > Sandbox de prueba de armas
+		</combo_item>
+		<combo_item name="Commerce__Failure_to_deliver_product_or_service">
+			Comercio > Error en la entrega de productos o servicios
+		</combo_item><combo_item name="Disclosure__Real_world_information">
+			Indiscreción > Información del mundo real
+		</combo_item>
+		<combo_item name="Disclosure__Remotely_monitoring chat">
+			Indiscreción > Monitoreo remoto del chat
+		</combo_item>
+		<combo_item name="Disclosure__Second_Life_information_chat_IMs">
+			Indiscreción > Información de Second Life/chat/IMs
+		</combo_item><combo_item name="Disturbing_the_peace__Unfair_use_of_region_resources">
+			Alterar la Paz > Abuso de los recursos de la región
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Excessive_scripted_objects">
+			Alterar la Paz > Uso excesivo de objetos con scripts
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Object_littering">
+			Alterar la Paz > Objetos basura
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Repetitive_spam">
+			Alterar la Paz > Spam (Mensajes no solicitados) repetitivo
+		</combo_item>
+		<combo_item name="Disturbing_the_peace__Unwanted_advert_spam">
+			Alterar la Paz > Publicidad no deseada
+		</combo_item>
+		<combo_item name="Fraud__L$">
+			Fraude > L$
+		</combo_item>
+		<combo_item name="Fraud__Land">
+			Fraude > Terreno
+		</combo_item>
+		<combo_item name="Fraud__Pyramid_scheme_or_chain_letter">
+			Fraude > Esquemas piramidales o cadenas de cartas
+		</combo_item>
+		<combo_item name="Fraud__US$">
+			Fraude > US$
+		</combo_item>
+		<combo_item name="Ridiculous3">
+			Freud > Un usuario a manifestado interes en su madre
+		</combo_item>
+		<combo_item name="Harassment__Advert_farms___visual_spam">
+			Acoso > Anuncios múltiples / spam visual
+		</combo_item>
+		<combo_item name="Harassment__Defaming_individuals_or_groups">
+			Acoso > Difamación de individuos o grupos
+		</combo_item>
+		<combo_item name="Harassment__Impeding_movement">
+			Acoso > Impedir el movimiento
+		</combo_item>
+		<combo_item name="Harassment__Sexual_harassment">
+			Acoso > Acoso sexual
+		</combo_item>
+		<combo_item name="Harassment__Solicting_inciting_others_to_violate_ToS">
+			Acoso > Pedir/incitar a otros para violar el ToS
+		</combo_item>
+		<combo_item name="Harassment__Verbal_abuse">
+			Acoso > Abuso verbal
+		</combo_item>
+		<combo_item name="Ridiculous1">
+			Acoso > El usuario se lame los dedos y me toca
+		</combo_item>
+		<combo_item name="Indecency__Broadly_offensive_content_or_conduct">
+			Indecencia > En general, contenido o conducta ofensivos
+		<!--  58 = deprecated by AO -->
+		</combo_item><combo_item name="Indecency__Inappropriate_avatar_name">
+			Indecencia > Nombre inapropiado de avatar
+		</combo_item>
+		<combo_item name="Indecency__Mature_content_in_PG_region">
+			Indecencia > Contenido o conducta inapropiados en una región PG
+		</combo_item>
+		<combo_item name="Indecency__Inappropriate_content_in_Mature_region">
+			Indecencia > Contenido o conducta inapropiados en una región Mature
+		</combo_item>
+		<combo_item name="Intellectual_property_infringement_Content_Removal">
+			Infracción de la propiedad Intelectual > Eliminación de contenidos
+		</combo_item>
+		<combo_item name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit">
+			Infracción de la propiedad Intelectual > CopyBot o Exploit (programa malicioso) de permisos
+		</combo_item>
+		<combo_item name="Intolerance">
+			Intolerancia
+		</combo_item>
+		<combo_item name="Land__Abuse_of_sandbox_resources">
+			Terreno > Abuso de los recursos de un sandbox
+		</combo_item>
+		<combo_item name="Land__Encroachment__Objects_textures">
+			Terreno > Invasión > Objetos/texturas
+		</combo_item>
+		<combo_item name="Land__Encroachment__Particles">
+			Terreno > Invasión >  Partículas
+		</combo_item>
+		<combo_item name="Land__Encroachment__Trees_plants">
+			Terreno > Invasión > �rboles/plantas
+		</combo_item>
+		<combo_item name="Ridiculous2">
+			Terreno > Invasión > El usuario no se quiere quedar de su lado del coche
+		</combo_item>
+		<combo_item name="Wagering_gambling">
+			Apuestas/Juego
+		</combo_item>
+		<combo_item name="Other">
+			Otra
+		</combo_item>
+	</combo_box>
+	<text name="abuser_name_title">
+		Nombre del Infractor:
 	</text>
-	<line_editor bevel_style="in" border_style="line"
-	     border_thickness="1" bottom_delta="-18" follows="left|top"
-	     font="SansSerifSmall" height="16" left="16" max_length="32"
-	     mouse_opaque="true" name="abuser_name_edit"
-	     width="180" />
-	<button bottom_delta="-2" font="SansSerif" halign="center" height="20"
-	     label="Choose Resident" label_selected="" left_delta="190"
-	     mouse_opaque="true" name="select_abuser"
-	     tool_tip="Select the name of the abuser from a list" width="160" />
-
-	<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Don't know abuser's name" left="13" visible="false"
-	     mouse_opaque="true" name="omit_abuser_name" width="116" 
-		 tool_tip="Check this if you are unable to provide the abuser's name"/>
-
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="abuser_name_title2" v_pad="0" width="180">
-		Location of Abuse:
+	<button label="Elegir al Residente" label_selected="" name="select_abuser" tool_tip="Elegir de una lista el nombre del infractor"/>
+	<check_box label="No se el nombre del infractor" name="omit_abuser_name" tool_tip="Marca esto si no puedes aportar el nombre del infractor"/>
+	<text name="abuser_name_title2">
+			Localización de la Infracción:
 	</text>
-	<line_editor bevel_style="in" border_style="line"
-	     border_thickness="1" bottom_delta="-18" follows="left|top"
-	     font="SansSerifSmall" height="16" left="16" max_length="256"
-	     mouse_opaque="true" name="abuse_location_edit"
-	     width="356" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="sum_title" v_pad="0" width="180">
-		Summary:
+	<text name="sum_title">
+		Sumario:
 	</text>
-	<line_editor bevel_style="in" border_style="line"
-	     border_thickness="1" bottom_delta="-18" follows="left|top"
-	     font="SansSerifSmall" height="16" left="16" max_length="64"
-	     mouse_opaque="true" name="summary_edit" 
-	     width="356" spell_check="true" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="dscr_title" v_pad="0" width="180">
-		Details:
+	<text name="dscr_title">
+		Detalles:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-32" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="48" left="70"
-	     mouse_opaque="true" name="bug_aviso" v_pad="0" width="308">
-		Please be specific about the date, location, nature of
-abuse, relevant chat/IM text, and select the object
-if possible.
+	<text name="bug_aviso">
+		Por favor, se muy concreto sobre la fecha, la localización,
+la naturaleza de la infracción, el aportar textos relevantes
+del chat o los MI, y, si es posible, selecciona el objeto.	
 	</text>
-	<text_editor bottom_delta="-152" embedded_items="false"
-	     follows="left|top" font="SansSerifSmall" height="146" left="16"
-	     max_length="800" mouse_opaque="false" name="details_edit"
-	     width="356" word_wrap="true" spell_check="true" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="incomplete_title" v_pad="0" width="342">
-		Note: Incomplete reports will not be investigated.
+	<text name="incomplete_title">
+		Nota: Las denuncias incompletas no serán investigadas.
 	</text>
-	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
-	     label="Cancel" label_selected="Cancel" mouse_opaque="true"
-	     name="cancel_btn" right="373" width="150" />
-	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
-	     label="Report Abuse" label_selected="Report Abuse" mouse_opaque="true"
-	     name="send_btn" right="217" width="150" />
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<button label="Reportar Abuso" label_selected="Reportar Abuso" name="send_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_report_bug.xml b/indra/newview/skins/default/xui/es/floater_report_bug.xml
index 83d7a5c46..d90672d20 100644
--- a/indra/newview/skins/default/xui/es/floater_report_bug.xml
+++ b/indra/newview/skins/default/xui/es/floater_report_bug.xml
@@ -1,176 +1,107 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="455" min_height="100" min_width="100"
-     name="bug_reporter" title="Report Bug" width="390">
-	<texture_picker allow_no_texture="true" bottom="-150" default_image_name="None"
-	     follows="left|top" height="114" label="" left="238" mouse_opaque="true"
-	     name="screenshot" width="134" />
-	<check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Include screenshot" left="234"
-	     mouse_opaque="true" name="screen_check" width="116" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-48" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="reporter_title" v_pad="0" width="50">
-		Reporter:
+<floater name="bug_reporter" title="Reportar Fallo">
+	<texture_picker label="" name="screenshot"/>
+	<check_box label="Incluir captura de pantalla" name="screen_check"/>
+	<text name="reporter_title">
+		Informante:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-48" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
-	     mouse_opaque="true" name="reporter_field" v_pad="0" width="120" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-64" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="sim_title" v_pad="0" width="50">
-		Region:
+	<text name="sim_title">
+		Región:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-64" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
-	     mouse_opaque="true" name="sim_field" v_pad="0" width="120" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-80" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="pos_title" v_pad="0" width="50">
-		Position:
+	<text name="pos_title">
+		Posición:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-80" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="62"
-	     mouse_opaque="true" name="pos_field" v_pad="0" width="120" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-22" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="select_object_label" v_pad="0" width="200">
-		Click the button then the object:
+	<text name="select_object_label">
+		Haz clic en el botón y en el objeto para seleccionar:
 	</text>
-	<button bottom_delta="-32" font="SansSerif" halign="center" height="32" label=""
-	     label_selected="" left="16" mouse_opaque="true" name="pick_btn"
-	     tool_tip="Object Picker - Identify an object as the subject of this report"
-	     width="32" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="16" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="53"
-	     mouse_opaque="true" name="object_name_label" v_pad="0" width="60">
-		Name:
+	<button label="" label_selected="" name="pick_btn" tool_tip="Selector de Objetos - Identifica un objeto como el sujeto de este reporte"/>
+	<text name="object_name_label">
+		Nombre:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="66"
-	     mouse_opaque="true" name="object_name" v_pad="0" width="109">
+	<text name="object_name">
 		Consetetur Sadipscing
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="53"
-	     mouse_opaque="true" name="owner_name_label" v_pad="0" width="60">
-		Owner:
+	<text name="owner_name_label">
+		Propietario:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="66"
-	     mouse_opaque="true" name="owner_name" v_pad="0" width="109">
+	<text name="owner_name">
 		Hendrerit Vulputate
 	</text>
-	<combo_box bottom_delta="-28" follows="left|top" height="20" left="16" mouse_opaque="true"
-	     name="category_combo"
-	     tool_tip="Category -- select the category that best describes this report"
-	     width="180">
-		<combo_item name="Selectcategory" value="0">
-			Select category
+	<combo_box name="category_combo" tool_tip="Categoría -- Elige la categoría que mejor describe este reporte">
+		<combo_item name="Selectcategory">
+			Elegir categoría
 		</combo_item>
-		<combo_item name="Building" value="9">
-			Building
+		<combo_item name="Building">
+			Construcción
 		</combo_item>
 		<combo_item name="Character" value="8">
-			Character
+			Personaje
 		</combo_item>
-		<combo_item name="Chat/IM" value="3">
-			Chat/IM
+		<combo_item name="Chat/IM">
+			Chat/MI
 		</combo_item>
-		<combo_item name="Documentation" value="10">
-			Documentation
+		<combo_item name="Documentation">
+			Documentación
 		</combo_item>
-		<combo_item name="Exploit" value="22">
+		<combo_item name="Exploit">
 			Exploit
 		</combo_item>
 		<combo_item name="Graphics" value="11">
-			Graphics
+			Gráficos
 		</combo_item>
-		<combo_item name="Inventory" value="12">
-			Inventory
+		<combo_item name="Inventory">
+			Inventario
 		</combo_item>
-		<combo_item name="Lag" value="13">
+		<combo_item name="Lag">
 			Lag
 		</combo_item>
-		<combo_item name="MissingContent" value="21">
-			Missing Content
+		<combo_item name="MissingContent">
+			Contenido Perdido
 		</combo_item>
-		<combo_item name="LindenDollars(L$)" value="14">
+		<combo_item name="LindenDollars(L$)">
 			Linden Dollars (L$)
 		</combo_item>
-		<combo_item name="Permissions" value="15">
-			Permissions
+		<combo_item name="Permissions">
+			Permisos
 		</combo_item>
-		<combo_item name="Physics" value="16">
-			Physics
+		<combo_item name="Physics">
+			Física
 		</combo_item>
-		<combo_item name="Script" value="17">
+		<combo_item name="Script">
 			Script
 		</combo_item>
-		<combo_item name="Sound" value="6">
-			Sound
+		<combo_item name="Sound">
+			Sonidos
 		</combo_item>
-		<combo_item name="Stipends" value="18">
-			Stipends
+		<combo_item name="Stipends">
+			Salario
 		</combo_item>
-		<combo_item name="Userinterface" value="19">
-			User interface
+		<combo_item name="Userinterface">
+			Interfaz de usuario
 		</combo_item>
-		<combo_item name="Miscellaneous" value="20">
-			Miscellaneous
+		<combo_item name="Miscellaneous">
+			Misceláneo
 		</combo_item>
 	</combo_box>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="sum_title" v_pad="0" width="180">
-		Summary:
+	<text name="sum_title">
+		Sumario:
 	</text>
-	<line_editor bevel_style="in" border_style="line"
-	     border_thickness="1" bottom_delta="-16" follows="left|top"
-	     font="SansSerifSmall" height="16" left="16" max_length="64"
-	     mouse_opaque="true" name="summary_edit" 
-	     width="356" spell_check="true" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="16"
-	     mouse_opaque="true" name="dscr_title" v_pad="0" width="342">
-		Details: (Please provide as much information as possible)
+	<text name="dscr_title">
+		Detalles: (Por favor, proporciona toda la información que sea posible)
 	</text>
-	<text_editor bottom_delta="-112" embedded_items="false"
-	     follows="left|top" font="SansSerifSmall" height="112" left="16"
-	     max_length="900" mouse_opaque="false" name="details_edit"
-	     width="356" word_wrap="true" spell_check="true">
-		Steps to reproduce the bug:
+	<text_editor name="details_edit">
+		Pasos para reproducir el fallo:
 
-Observed results:
+Resultados observados:
 
-Expected results:
+Resultados esperados:
 	</text_editor>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-40" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="32" left="16"
-	     mouse_opaque="true" name="bug_aviso" v_pad="0" width="342">
-		Note: Incomplete reports will not be investigated
-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 name="bug_aviso">
+		Nota: los informes incompletos no serán investigados
+Si el fallo te permite hacer algo que no deberías poder hacer,
+especialmente si éste impacta en el rendimiento o seguridad,
+por favor seleeciona la categoría &apos;Exploit&apos; ¡Gracias!
 	</text>
-	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
-	     label="Cancel" label_selected="Cancel" mouse_opaque="true"
-	     name="cancel_btn" right="380" width="150" />
-	<button bottom="10" follows="right|bottom" font="SansSerif" halign="center" height="20"
-	     label="Report Bug" label_selected="Report Bug" mouse_opaque="true"
-	     name="send_btn" right="224" width="150" />
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<button label="Reportar Fallo" label_selected="Reportar Fallo" name="send_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_rlv_behaviours.xml b/indra/newview/skins/default/xui/es/floater_rlv_behaviours.xml
index c4c9abc3b..127022a1b 100644
--- a/indra/newview/skins/default/xui/es/floater_rlv_behaviours.xml
+++ b/indra/newview/skins/default/xui/es/floater_rlv_behaviours.xml
@@ -1,89 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater 
-  can_close="true"
-  can_drag_on_left="false"
-  can_minimize="true"
-  can_resize="true"
-  height="455"
-  min_height="200"
-  min_width="375"
-  name="rlv_behaviours"
-  title="Active RLV Restrictions"
-  width="350">
-
-  <tab_container
-    follows="top|left|bottom|right"
-    bottom="-445"
-    left="5"
-    height="420"
-    width="338"
-    name="behaviour_tab"
-    tab_position="top">
-    <panel
-      border="true"
-      label="Restrictions"
-      name="behaviour_panel">
-      
-      <scroll_list
-        top_pad="17"
-	height="-30"
-	follows="top|left|bottom|right"
-	draw_border="false"
-	multi_select="false"
-	name="behaviour_list"
-	draw_heading="true"
-	draw_stripes="true"
-	left="2"
-	right="-2">
-	 <column
-	   label="Restriction"
-	   name="behaviour"
-	   width="170" />
-         <column
-	   label="Object Name"
-	   name="issuer"
-	   width="170" />
-      </scroll_list>
-    </panel>
-    <panel
-      border="true"
-      label="Exceptions"
-      name="exception_panel">
-      
-      <scroll_list
-top_pad="17"
-	height="-30"
-	follows="top|left|bottom|right"
-	draw_border="false"
-	multi_select="false"
-	name="exception_list"
-	draw_heading="true"
-	draw_stripes="true"
-	left="2"
-	right="-2">
-	 <column
-	   label="Restriction"
-	   name="behaviour"
-	   width="70" />
-	 <column
-	   label="Option"
-	   name="option"
-	   width="170" />
-         <column
-	   label="Object Name"
-	   name="issuer"
-	   width="170" />
-      </scroll_list>
-    </panel>
-  </tab_container>
-
-  <button
-    follows="bottom|left"
-    height="25"
-    label="Copy to Clipboard"
-    left="10"
-    name="copy_btn"
-    bottom="-440"
-    width="180" />
-
+<floater name="rlv_behaviours" title="Activar Restricciones RLV">
+	<tab_container name="behaviour_tab">
+		<panel label="Restricciones" name="behaviour_panel">
+			<scroll_list name="behaviour_list">
+				<column label="Restricción" name="behaviour"/>
+				<column label="Nombre de Objeto" name="issuer"/>
+			</scroll_list>
+		</panel>
+		<panel label="Excepciones" name="exception_panel">
+			<scroll_list name="exception_list">
+				<column label="Restricción" name="behaviour"/>
+				<column label="Opción" name="option"/>
+				<column label="Nombre de Objeto" name="issuer"/>
+			</scroll_list>
+		</panel>
+	</tab_container>
+	<button label="Copiar al Portapapeles" name="copy_btn"/>
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_rlv_locks.xml b/indra/newview/skins/default/xui/es/floater_rlv_locks.xml
index b2a836a8c..63327dcdf 100644
--- a/indra/newview/skins/default/xui/es/floater_rlv_locks.xml
+++ b/indra/newview/skins/default/xui/es/floater_rlv_locks.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-         height="425" min_height="200" min_width="375" name="rlvLocks" title="Active RLV Locks" width="375"
-         save_rect="true" save_visibility="true" single_instance="true">
-  <scroll_list bottom="-410" left="2" right="-2" draw_border="false" follows="top|left|bottom|right" height="390" multi_select="false"
-               name="lock_list" draw_heading="true" draw_stripes="true" layout="topleft">
-    <column label="Lock Type" name="lock_type" width="110" />
-    <column label="Add / Rem" name="lock_addrem" width="65" />
-    <column label="Lock Target" name="lock_target" width="150" />
-    <column label="Held By" name="lock_origin" width="150" />
-  </scroll_list>
+<floater name="rlvLocks" title="Activar Bloqueos RLV">
+	<scroll_list name="lock_list">
+		<column label="Tipo" name="lock_type"/>
+		<column label="Añadir/Quitar" name="lock_addrem"/>
+		<column label="Destino" name="lock_target"/>
+		<column label="Por" name="lock_origin"/>
+	</scroll_list>
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_script_debug.xml b/indra/newview/skins/default/xui/es/floater_script_debug.xml
index 2abd503be..d063870c5 100644
--- a/indra/newview/skins/default/xui/es/floater_script_debug.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_debug.xml
@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater bottom="-463" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="233" left="337" min_height="100" min_width="100"
-     mouse_opaque="true" name="script debug floater"
-     rect_control="FloaterScriptDebugRect" title="Script Warning/Error"
-     width="450">
-	<tab_container border="false" bottom="-233" follows="left|top|right|bottom" height="217"
-	     left="1" mouse_opaque="false" name="Preview Tabs" tab_position="bottom"
-	     width="448">
-		<floater bottom="-202" can_close="false" can_drag_on_left="false" can_minimize="true"
-		     can_resize="false" follows="left|top|right|bottom" height="201"
-		     label="Script" left="1" min_height="100" min_width="100"
-		     mouse_opaque="true" name="all_scripts" title="[All scripts]" width="446" />
+<multi_floater name="script debug floater" title="Avisos de Error de Script">
+	<tab_container name="Preview Tabs">
+		<floater label="Script" name="all_scripts" title="[Todos los scripts]"/>
 	</tab_container>
 </multi_floater>
diff --git a/indra/newview/skins/default/xui/es/floater_script_ed_panel.xml b/indra/newview/skins/default/xui/es/floater_script_ed_panel.xml
index 9e5147595..f732f7d28 100644
--- a/indra/newview/skins/default/xui/es/floater_script_ed_panel.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_ed_panel.xml
@@ -1,89 +1,44 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="-550" enabled="true" follows="left|top|right|bottom" height="508"
-     left="0" mouse_opaque="true" name="script panel" width="500" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0">
-	<text_editor type="string" length="1" bottom="-393"
-	     embedded_items="false" enabled="true" follows="left|top|right|bottom"
-	     font="Monospace" height="376" ignore_tab="false" left="4"
-	     max_length="65536" mouse_opaque="true" name="Script Editor" width="492" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0"
-	     word_wrap="true" show_line_numbers="true">
-		Loading...
+<panel name="script panel" >
+	<text_editor name="Script Editor">
+		Cargando...
 	</text_editor>
-  <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" label="Edit..." label_selected="Edit..." left="230"
-	     mouse_opaque="true" name="Edit_btn" width="128" />
-  <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" label="Save" label_selected="Save" left="360"
-	     mouse_opaque="true" name="Save_btn" width="128" />
-	<scroll_list background_visible="true" bottom="-457" column_padding="5" draw_border="true"
-	     draw_heading="false" draw_stripes="true" enabled="true"
-	     follows="left|right|bottom" height="60" left="4" mouse_opaque="true"
-	     multi_select="false" name="lsl errors" width="492" />
-	<combo_box allow_text_entry="false" bottom="-499" enabled="true" follows="left|bottom"
-	     height="20" label="Insert..." left="12" max_chars="20" mouse_opaque="true"
-	     name="Insert..." width="128" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0"
-	     bottom="-473" drop_shadow_visible="true" enabled="true"
-	     follows="left|bottom" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="12" left="12" mouse_opaque="true" name="line_col" v_pad="0"
-	     width="128" />
-	<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
-	     height="18" left="8" mouse_opaque="false" name="script_menu" opaque="false"
-	     tear_off="false" width="476">
-		<menu bottom="0" drop_shadow="true" enabled="true" height="62"
-		     left="0" mouse_opaque="false" name="File" opaque="true" tear_off="false"
-		     width="138">
-			<menu_item_call bottom_delta="-30" height="20" label="Save" left="0" mouse_opaque="true"
-			     name="Save" width="138" />
-			<menu_item_separator bottom_delta="-38" height="8" left="0" mouse_opaque="true" name="separator"
-			     width="138" />
-			<menu_item_call bottom_delta="-58" height="20" label="Revert All Changes" left="0"
-			     mouse_opaque="true" name="Revert All Changes" width="138" />
+	<button label="Edición..." label_selected="Edición..." name="Edit_btn"/>
+	<button label="Guardar" label_selected="Guardar" name="Save_btn"/>
+	<combo_box label="Insertar..." name="Insert..."/>
+	<menu_bar name="script_menu">
+		<menu name="File" label="Archivo" >
+			<menu_item_call label="Guardar" name="Save"/>
+			<menu_item_call label="Revertir los Cambios" name="Revert All Changes"/>
 		</menu>
-		<menu bottom="665" drop_shadow="true" enabled="true" height="198"
-		     left="222" mouse_opaque="false" name="Edit" opaque="true" tear_off="false"
-		     width="139">
-			<menu_item_call bottom_delta="-30" enabled="false" height="20" label="Undo" left="0"
-			     mouse_opaque="true" name="Undo" width="139" />
-			<menu_item_call bottom_delta="-50" enabled="false" height="20" label="Redo" left="0"
-			     mouse_opaque="true" name="Redo" width="139" />
-			<menu_item_separator bottom_delta="-58" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator" width="139" />
-			<menu_item_call bottom_delta="-78" enabled="false" height="20" label="Cut" left="0"
-			     mouse_opaque="true" name="Cut" width="139" />
-			<menu_item_call bottom_delta="-98" enabled="false" height="20" label="Copy" left="0"
-			     mouse_opaque="true" name="Copy" width="139" />
-			<menu_item_call bottom_delta="-118" enabled="false" height="20" label="Paste" left="0"
-			     mouse_opaque="true" name="Paste" width="139" />
-			<menu_item_separator bottom_delta="-126" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator2" width="139" />
-			<menu_item_call bottom_delta="-146" enabled="true" height="20" label="Select All" left="0"
-			     mouse_opaque="true" name="Select All" width="139" />
-			<menu_item_call bottom_delta="-166" enabled="false" height="20" label="Deselect" left="0"
-			     mouse_opaque="true" name="Deselect" width="139" />
-			<menu_item_separator bottom_delta="-174" enabled="true" height="8" label="-----------" left="0"
-			     mouse_opaque="true" name="separator3" width="139" />
-			<menu_item_call bottom_delta="-194" enabled="true" height="20" label="Search / Replace..."
-			     left="0" mouse_opaque="true" name="Search / Replace..." width="139" />
+		<menu name="Edit" label="Edición">
+			<menu_item_call label="Deshacer" name="Undo"/>
+			<menu_item_call label="Rehacer" 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="Pegar" name="Paste"/>
+			<menu_item_separator label="-----------" name="separator2"/>
+			<menu_item_call label="Seleccionar Todol" name="Select All"/>
+			<menu_item_call label="Deseleccionar" name="Deselect"/>
+			<menu_item_separator label="-----------" name="separator3"/>
+			<menu_item_call label="Buscar / Reemplazar..." name="Search / Replace..."/>
 		</menu>
-		<menu bottom="-18" drop_shadow="true" enabled="true" height="34"
-		     left="0" mouse_opaque="false" name="Help" opaque="true" tear_off="false"
-		     width="112">
-			<menu_item_call bottom="-30" enabled="true" height="20" label="Help..." left="0"
-			     mouse_opaque="true" name="Help..." width="112" />
-			<menu_item_call bottom="-30" enabled="true" height="20" label="LSL Wiki Help..." left="0"
-			     mouse_opaque="true" name="LSL Wiki Help..." width="112" />
+		<menu name="Help" label="Ayuda">
+			<menu_item_call label="Ayuda..." name="Help..."/>
+			<menu_item_call label="Ayuda LSL Wiki..." name="LSL Wiki Help..."/>
 		</menu>
 	</menu_bar>
 	<string name="loading">
-		Loading...
+		Cargando...
 	</string>
 	<string name="can_not_view">
-		You are not allowed to view this script.
+		No tienes permiso para ver este script.
 	</string>
 	<string name="public_objects_can_not_run">
-		Public Objects cannot run scripts
+		Los objetos públicos no pueden ejecutar scripts
 	</string>
 	<string name="script_running">
-		Running
+		Ejecutándose
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/floater_script_preview.xml b/indra/newview/skins/default/xui/es/floater_script_preview.xml
index 11735ea8b..1da35e4d4 100644
--- a/indra/newview/skins/default/xui/es/floater_script_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_preview.xml
@@ -1,23 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-757" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" height="550" left="358" min_height="271"
-     min_width="290" mouse_opaque="true" name="preview lsl text"
-     rect_control="PreviewScriptRect" title="Script: Rotation Script"
-     width="500">
-	<panel bottom="-550" enabled="true" follows="left|top|right|bottom" height="508"
-	     left="1" name="script panel" width="497" border_thickness="0"/>
-	<icon bottom="-19" color="1 1 1 1" enabled="true" follows="top|right" height="16"
-	     image_name="icon_lock.tga" left="444" mouse_opaque="true" name="lock"
-	     width="16" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-38" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="19" left="13"
-	     mouse_opaque="true" name="desc txt" v_pad="0" width="80">
-		Description:
+<floater name="preview lsl text" title="Script: Rotation Script">
+	<panel name="script panel"/>
+	<text name="desc txt">
+		Descripción:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-38"
-	     enabled="true" follows="left|top|right" font="SansSerif"
-	     handle_edit_keys_directly="false" height="19" left="93" max_length="127"
-	     mouse_opaque="true" name="desc" select_all_on_focus_received="false"
-	     select_on_focus="false" width="394" spell_check="true" />
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_script_queue.xml b/indra/newview/skins/default/xui/es/floater_script_queue.xml
index 90d1ac12e..cd7cefcab 100644
--- a/indra/newview/skins/default/xui/es/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_queue.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-763" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" enabled="true" height="400" left="408" min_height="100"
-     min_width="100" mouse_opaque="true" name="queue" title="Reset Progress"
-     width="300" border_bevel="none" border_thickness="0">
-	<button bottom="-392" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="24" label="Close" label_selected="Close" left="220"
-	     mouse_opaque="true" name="close" width="64" />
-	<scroll_list background_visible="true" bottom="-364" column_padding="5" draw_border="true"
-	     draw_heading="false" draw_stripes="true" enabled="true"
-	     follows="left|top|right|bottom" height="344" left="4" mouse_opaque="true"
-	     multi_select="false" name="queue output" width="292" />
+<floater name="queue" title="Reiniciar Progreso">
+	<button label="Cerrar" label_selected="Cerrar" name="close"/>
+	<scroll_list name="queue output"/>
 </floater>

From 085db93fc896266e73f56e5fc2bdc74f38fde60a Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 18 Jul 2012 16:04:12 -0400
Subject: [PATCH 045/199] menu_inventory.xml translations update.

Brought the French up to date, translations on my own..
Brought the Spanish up to standard.
---
 .../skins/default/xui/es/menu_inventory.xml   | 175 ++++++++----------
 .../skins/default/xui/fr/menu_inventory.xml   | 157 ++++++++--------
 2 files changed, 161 insertions(+), 171 deletions(-)

diff --git a/indra/newview/skins/default/xui/es/menu_inventory.xml b/indra/newview/skins/default/xui/es/menu_inventory.xml
index 98aad1a6e..9ef5e9719 100644
--- a/indra/newview/skins/default/xui/es/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/es/menu_inventory.xml
@@ -1,97 +1,84 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <menu name="Popup">
-	  <menu_item_call name="Task Buy" label="Comprar" ></menu_item_call>
-	  <menu_item_call name="Task Open" label="Abrir" ></menu_item_call>
-	  <menu_item_call name="Task Play" label="Reproducir" ></menu_item_call>
-	  <menu_item_call name="Task Properties" label="Propiedades" ></menu_item_call>
-	  <menu_item_call name="Task Rename" label="Renombrar" ></menu_item_call>
-	  <menu_item_call name="Task Remove" label="Borrar" ></menu_item_call>
-	  <menu_item_call name="Empty Trash" label="Vaciar Papelera" ></menu_item_call>
-	  <menu_item_call name="Empty Lost And Found" label="Vaciar Perdidos y Encontrados" ></menu_item_call>
-	  <menu_item_call name="New Folder" label="Carpeta nueva" ></menu_item_call>
-	  <menu_item_call name="New Script" label="Script nuevo" ></menu_item_call>
-	  <menu_item_call  name="New Note" label="Nota nueva" ></menu_item_call>
-	  <menu_item_call name="New Gesture" label="Gesto nuevo" ></menu_item_call>
-	  <menu name="New Clothes" label="Nuevas Ropas">
-			 <menu_item_call name="New Shirt" label="Camisa nueva" ></menu_item_call>
-			 <menu_item_call name="New Pants" label="Pantalones nuevos" ></menu_item_call>
-			 <menu_item_call name="New Shoes" label="Zapatos nuevos" ></menu_item_call>
-			 <menu_item_call name="New Socks" label="Calcetines nuevos" ></menu_item_call>
-			 <menu_item_call name="New Jacket" label="Chaqueta nueva" ></menu_item_call>
-			 <menu_item_call name="New Skirt" label="Falda nueva" ></menu_item_call>
-			 <menu_item_call name="New Gloves" label="Guantes nuevos" ></menu_item_call>
-			 <menu_item_call name="New Undershirt" label="Camiseta nueva" ></menu_item_call>
-			 <menu_item_call name="New Underpants" label="Ropa Interior nueva" ></menu_item_call>
-			 <menu_item_call name="New Tattoo" label="Tatuaje nuevo" ></menu_item_call>
-			 <menu_item_call name="New Alpha" label="Alfa nueva" ></menu_item_call>
-			 <menu_item_call name="New Physics" label="Física nueva" ></menu_item_call>
-	  </menu>
-	  <menu name="New Body Parts" label="Partes de Cuerpo Nuevas" >
-			 <menu_item_call name="New Shape" label="Forma nueva" ></menu_item_call>
-			 <menu_item_call name="New Skin" label="Piel nueva" ></menu_item_call>
-			 <menu_item_call name="New Hair" label="Pelo nuevo" ></menu_item_call>
-			 <menu_item_call name="New Eyes" label="Ojos nuevos" ></menu_item_call>
-	  </menu>
-	  <menu_item_call name="Landmark Open" label="Teleport" ></menu_item_call>
-	  <menu_item_call name="Animation Open" label="Abrir" ></menu_item_call>
-	  <menu_item_call name="Sound Open" label="Abrir"></menu_item_call>
-	  <menu_item_call name="Find Original" label="Encontrar original" ></menu_item_call>
-	  <menu_item_call name="Purge Item" label="Limpiar objeto" ></menu_item_call>
-	  <menu_item_call name="Restore Item" label="Restaurar objeto" ></menu_item_call>
-	  <menu name="Open With..." label="Abrir con...">
-			 <menu_item_call name="Hex Open" label="Editor Hexa" ></menu_item_call>
-			 <menu_item_call name="Open Text" label="Editor de Texto" ></menu_item_call>
-			 <menu_item_call name="Rez" label="Rezear Objeto" ></menu_item_call>
-	  </menu>
-	  <menu_item_call name="Open" label="Abrir" ></menu_item_call>
-	  <menu_item_call name="Properties" label="Propiedades"></menu_item_call>
-	  <menu_item_call name="Rename" label="Renombrar" ></menu_item_call>
-	  <menu_item_call name="Copy Asset UUID" label="Copiar Asset UUID" ></menu_item_call>
-	  <menu_item_call name="Reupload..." label="Resubir..." ></menu_item_call>
-	  <menu_item_call name="Acquire Asset ID" label="Adquirir Asset ID" ></menu_item_call>
-	  <menu_item_separator name="Copy Separator" />
-	  <menu_item_call name="Copy" label="Copiar" ></menu_item_call>
-	  <menu_item_call name="Paste" label="Pegar"></menu_item_call>
-	  <menu_item_call name="Paste As Link" label="Pegar como Link" ></menu_item_call>
-	  <menu_item_call name="Restore to Last Position" label="Restaurar en el mundo" ></menu_item_call>
-	  <menu_item_separator name="Paste Separator" />
-	  <menu_item_call name="Remove Link" label="Borrar Link" ></menu_item_call>
-	  <menu_item_call name="Delete" label="Borrar"></menu_item_call>
-	  <menu_item_separator name="Folder Wearables Separator" />
-	  <menu_item_call name="Wear Items" label="Vestirse objetos" ></menu_item_call>
-	  <menu_item_call name="Add To Outfit" label="Añadir al vestuario" ></menu_item_call>
-	  <menu_item_call name="Replace Outfit" label="Reemplazar Vestuario" ></menu_item_call>
-	  <menu_item_call label="Quitar del Vestuario" name="Remove From Outfit"></menu_item_call>
-	  <menu_item_separator name="Outfit Separator"></menu_item_separator>
-	  <menu_item_separator name="Calling Card Separator" />
-	  <menu_item_call name="Conference Chat Folder" label="Iniciar Conferencia Grupal" ></menu_item_call>
-	  <menu_item_separator name="Sound Separator" />
-	  <menu_item_call name="Sound Play" label="Reproducir" ></menu_item_call>
-	  <menu_item_separator name="Landmark Separator" />
-	  <menu_item_call name="Teleport To Landmark" label="Sobre el hito" ></menu_item_call>
-	  <menu_item_separator name="Animation Separator" />
-	  <menu_item_call name="Animation Play" label="Reproducir en el mundo"></menu_item_call>
-	  <menu_item_call name="Animation Audition" label="Reproducir localmente" ></menu_item_call>
-	  <menu_item_separator name="Send Instant Message Separator" />
-	  <menu_item_call name="Send Instant Message" label="Enviar MI" ></menu_item_call>
-	  <menu_item_call name="Offer Teleport..." label="Ofrecer Teleport..." ></menu_item_call>
-	  <menu_item_call name="Conference Chat" label="Iniciar Conferencia Grupal" ></menu_item_call>
-	  <menu_item_separator name="Gesture Separator" />
-	  <menu_item_call name="Activate" label="Activar" ></menu_item_call>
-	  <menu_item_call name="Deactivate" label="Desactivar" ></menu_item_call>
-	  <menu_item_separator name="Wearable And Object Separator" />
-	  <menu_item_call name="Wearable And Object Wear" label="Vestirse Objeto" ></menu_item_call>
-	  <menu_item_call label="Añadir al Vestuario" name="Wearable Add"></menu_item_call>
-	  <menu_item_call label="&#9650; >Hacia Adelante" name="Wearable Move Forward"></menu_item_call>
-	  <menu_item_call label="&#9660; Hacia Atrás" name="Wearable Move Back"></menu_item_call>
-	  <menu label="Anexar a " name="Attach To"/>
-	  <menu label="Anexar al HUD" name="Attach To HUD"/>
-	  <menu_item_call label="Quitarse" name="Detach From Yourself"></menu_item_call>
-	  <menu_item_call label="Editar" name="Wearable Edit"></menu_item_call>
-	  <menu_item_call label="Quitarse" name="Take Off"></menu_item_call>
-	  <menu_item_separator name="Marketplace Separator" />
-	  <menu_item_call label="Copiar al Merchant Outbox" name="Merchant Copy"/>
-	  <menu_item_call label="Enviar a Marketplace" name="Marketplace Send"/>
-	  <menu_item_call label="--sin opciones--" name="--no options--" />
-	  <!--menu_item_separator name="Wearable Separator" -->	
+	<menu_item_call name="Task Buy" label="Comprar"/>
+	<menu_item_call name="Task Open" label="Abrir"/>
+	<menu_item_call name="Task Play" label="Reproducir"/>
+	<menu_item_call name="Task Properties" label="Propiedades"/>
+	<menu_item_call name="Task Rename" label="Renombrar"/>
+	<menu_item_call name="Task Remove" label="Borrar"/>
+	<menu_item_call name="Empty Trash" label="Vaciar Papelera"/>
+	<menu_item_call name="Empty Lost And Found" label="Vaciar Perdidos y Encontrados"/>
+	<menu_item_call name="New Folder" label="Carpeta nueva"/>
+	<menu_item_call name="New Script" label="Script nuevo"/>
+	<menu_item_call name="New Note" label="Nota nueva"/>
+	<menu_item_call name="New Gesture" label="Gesto nuevo"/>
+	<menu name="New Clothes" label="Nuevas Ropas">
+		<menu_item_call name="New Shirt" label="Camisa nueva"/>
+		<menu_item_call name="New Pants" label="Pantalones nuevos"/>
+		<menu_item_call name="New Shoes" label="Zapatos nuevos"/>
+		<menu_item_call name="New Socks" label="Calcetines nuevos"/>
+		<menu_item_call name="New Jacket" label="Chaqueta nueva"/>
+		<menu_item_call name="New Skirt" label="Falda nueva"/>
+		<menu_item_call name="New Gloves" label="Guantes nuevos"/>
+		<menu_item_call name="New Undershirt" label="Camiseta nueva"/>
+		<menu_item_call name="New Underpants" label="Ropa Interior nueva"/>
+		<menu_item_call name="New Tattoo" label="Tatuaje nuevo"/>
+		<menu_item_call name="New Alpha" label="Alfa nueva"/>
+		<menu_item_call name="New Physics" label="Física nueva"/>
+	</menu>
+	<menu name="New Body Parts" label="Partes de Cuerpo Nuevas">
+		<menu_item_call name="New Shape" label="Forma nueva"/>
+		<menu_item_call name="New Skin" label="Piel nueva"/>
+		<menu_item_call name="New Hair" label="Pelo nuevo"/>
+		<menu_item_call name="New Eyes" label="Ojos nuevos"/>
+	</menu>
+	<menu_item_call name="Landmark Open" label="Teleport"/>
+	<menu_item_call name="Animation Open" label="Abrir"/>
+	<menu_item_call name="Sound Open" label="Abrir"/>
+	<menu_item_call name="Find Original" label="Encontrar original"/>
+	<menu_item_call name="Purge Item" label="Limpiar objeto"/>
+	<menu_item_call name="Restore Item" label="Restaurar objeto"/>
+	<menu name="Open With..." label="Abrir con...">
+		<menu_item_call name="Hex Open" label="Editor Hexa"/>
+		<menu_item_call name="Open Text" label="Editor de Texto"/>
+		<menu_item_call name="Rez" label="Rezear Objeto"/>
+	</menu>
+	<menu_item_call name="Open" label="Abrir"/>
+	<menu_item_call name="Properties" label="Propiedades"/>
+	<menu_item_call name="Rename" label="Renombrar"/>
+	<menu_item_call name="Copy Asset UUID" label="Copiar Asset UUID"/>
+	<menu_item_call name="Reupload..." label="Resubir..."/>
+	<menu_item_call name="Acquire Asset ID" label="Adquirir Asset ID"/>
+	<menu_item_call name="Copy" label="Copiar"/>
+	<menu_item_call name="Paste" label="Pegar"/>
+	<menu_item_call name="Paste As Link" label="Pegar como Link"/>
+	<menu_item_call name="Restore to Last Position" label="Restaurar en el mundo"/>
+	<menu_item_call name="Remove Link" label="Borrar Link"/>
+	<menu_item_call name="Delete" label="Borrar"/>
+	<menu_item_call name="Wear Items" label="Vestirse objetos"/>
+	<menu_item_call name="Add To Outfit" label="Añadir al vestuario"/>
+	<menu_item_call name="Replace Outfit" label="Reemplazar Vestuario"/>
+	<menu_item_call name="Remove From Outfit" label="Quitar del Vestuario"/>
+	<menu_item_call name="Conference Chat Folder" label="Iniciar Conferencia Grupal"/>
+	<menu_item_call name="Sound Play" label="Reproducir"/>
+	<menu_item_call name="Teleport To Landmark" label="Sobre el hito"/>
+	<menu_item_call name="Animation Play" label="Reproducir en el mundo"/>
+	<menu_item_call name="Animation Audition" label="Reproducir localmente" />
+	<menu_item_call name="Send Instant Message" label="Enviar MI"/>
+	<menu_item_call name="Offer Teleport..." label="Ofrecer Teleport..."/>
+	<menu_item_call name="Conference Chat" label="Iniciar Conferencia Grupal"/>
+	<menu_item_call name="Activate" label="Activar"/>
+	<menu_item_call name="Deactivate" label="Desactivar"/>
+	<menu_item_call name="Wearable And Object Wear" label="Vestirse Objeto"/>
+	<menu_item_call name="Wearable Add" label="Añadir al Vestuario"/>
+	<menu_item_call name="Wearable Move Forward" label="&#9650; Hacia Adelante"/>
+	<menu_item_call name="Wearable Move Back" label="&#9660; Hacia Atrás"/>
+	<menu name="Attach To" label="Anexar a"/>
+	<menu name="Attach To HUD" label="Anexar al HUD"/>
+	<menu_item_call name="Detach From Yourself" label="Quitarse"/>
+	<menu_item_call name="Wearable Edit" label="Editar"/>
+	<menu_item_call name="Take Off" label="Quitarse"/>
+	<menu_item_call name="Merchant Copy" label="Copiar al Merchant Outbox"/>
+	<menu_item_call name="Marketplace Send" label="Enviar a Marketplace"/>
+	<menu_item_call name="--no options--" label="--sin opciones--"/>
 </menu>
diff --git a/indra/newview/skins/default/xui/fr/menu_inventory.xml b/indra/newview/skins/default/xui/fr/menu_inventory.xml
index f63241f51..266109d55 100644
--- a/indra/newview/skins/default/xui/fr/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/fr/menu_inventory.xml
@@ -1,81 +1,84 @@
 <?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="Nouvelle gesture" name="New Gesture"/>
-	<menu name="New Clothes">
-		<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 Tee-shirt" name="New Undershirt"/>
-		<menu_item_call label="Nouveaux sous-vêtements" name="New Underpants"/>
+	<menu_item_call name="Task Buy" label="Acheter"/>
+	<menu_item_call name="Task Open" label="Ouvrir"/>
+	<menu_item_call name="Task Play" label="Jouer"/>
+	<menu_item_call name="Task Properties" label="Propriétés"/>
+	<menu_item_call name="Task Rename" label="Renommer"/>
+	<menu_item_call name="Task Remove" label="Supprimer"/>
+	<menu_item_call name="Empty Trash" label="Vider la corbeille"/>
+	<menu_item_call name="Empty Lost And Found" label="Vider les objets trouvés"/>
+	<menu_item_call name="New Folder" label="Nouveau dossier"/>
+	<menu_item_call name="New Script" label="Nouveau script"/>
+	<menu_item_call name="New Note" label="Nouvelle note"/>
+	<menu_item_call name="New Gesture" label="Nouvelle gesture"/>
+	<menu name="New Clothes" label="Nouveaux Vêtements">
+		<menu_item_call name="New Shirt" label="Nouvelle chemise"/>
+		<menu_item_call name="New Pants" label="Nouveau pantalon"/>
+		<menu_item_call name="New Shoes" label="Nouvelles chaussures"/>
+		<menu_item_call name="New Socks" label="Nouvelles chaussettes"/>
+		<menu_item_call name="New Jacket" label="Nouvelle veste"/>
+		<menu_item_call name="New Skirt" label="Nouvelle jupe"/>
+		<menu_item_call name="New Gloves" label="Nouveaux gants"/>
+		<menu_item_call name="New Undershirt" label="Nouveau Tee-shirt"/>
+		<menu_item_call name="New Underpants" label="Nouveaux sous-vêtements"/>
+		<menu_item_call name="New Tattoo" label="Nouveau Tatouage"/>
+		<menu_item_call name="New Alpha" label="Nouvelle Alpha"/>
+		<menu_item_call name="New Physics" label="Nouvelle Physique"/>
 	</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 name="New Body Parts" label="Parties du corps nouvelles">
+		<menu_item_call name="New Shape" label="Nouvelle silhouette"/>
+		<menu_item_call name="New Skin" label="Nouvelle peau"/>
+		<menu_item_call name="New Hair" label="Nouveaux cheveux"/>
+		<menu_item_call name="New Eyes" label="Nouveaux yeux"/>
 	</menu>
-	<menu_item_call bottom_delta="-18" height="18" label="Ajouter" left="0" name="Object Add" width="128">
-		<on_click function="Inventory.DoToSelected" userdata="wear_add" />
-	</menu_item_call>
-	<menu_item_call bottom_delta="-18" height="18" label="Faire un Lien" left="0" name="Paste As Link" width="128">
-		<on_click filter="" function="Inventory.DoToSelected" userdata="paste_link" />
-	</menu_item_call>
-	<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'objet" name="Purge Item"/>
-	<menu_item_call label="Restaurer l'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'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="Enlever l'ensemble" name="Take Off Items"/>
-	<menu_item_call label="Ajouter à l'ensemble" name="Add To Outfit"/>
-	<menu_item_call label="Remplacer l'ensemble" name="Replace Outfit"/>
-	<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="Remettre au dernier emplacement" name="Restore to Last Position"/>
-	<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="Éditer" name="Wearable Edit"/>
-	<menu_item_call label="Porter" name="Wearable Wear"/>
-	<menu_item_call label="Enlever" name="Take Off"/>
-	<menu_item_call label="Trouver l'origine" name="Find Original"/>
-	<menu_item_call label="Porter" name="Wearable And Object Wear"/>
-	<menu_item_call label="&#9650; Haut" name="Wearable Move Forward"/>
-	<menu_item_call label="&#9660; Bas" name="Wearable Move Back"/>
-	<menu_item_call label="Ajouter" name="Wearable Add"/>
-	<menu_item_call label="Enlever de l'ensemble" name="Remove From Outfit"/>
-	<menu_item_call label="--aucune option--" name="--no options--"/>
-  <menu_item_call bottom_delta="-18" height="18" label="Porter l'ensemble" left="0" name="Wear Items" width="128">
-    <on_click filter="" function="Inventory.DoToSelected" userdata="wearitems" />
-  </menu_item_call>
-</menu>
\ No newline at end of file
+	<menu_item_call name="Landmark Open" label="Téléporter"/>
+	<menu_item_call name="Animation Open" label="Ouvrir"/>
+	<menu_item_call name="Sound Open" label="Ouvrir"/>
+	<menu_item_call name="Find Original" label="Trouver l'origine"/>
+	<menu_item_call name="Purge Item" label="Purger l'objet"/>
+	<menu_item_call name="Restore Item" label="Restaurer l'objet"/>
+	<menu name="Open With..." label="Ouvrir avec...">
+		<menu_item_call name="Hex Open" label="Hex Editor"/>
+		<menu_item_call name="Open Text" label="Text Editor"/>
+		<menu_item_call name="Rez" label="Rez l'objet"/>
+	</menu>
+	<menu_item_call name="Open" label="Ouvrir"/>
+	<menu_item_call name="Properties" label="Propriétés"/>
+	<menu_item_call name="Rename" label="Renommer"/>
+	<menu_item_call name="Copy Asset UUID" label="Copier l'UUID (identifiant universel unique)"/>
+	<menu_item_call name="Reupload..." label="Reupload..."/>
+	<menu_item_call name="Acquire Asset ID" label="Acquérir Asset ID"/>
+	<menu_item_call name="Copy" label="Copier"/>
+	<menu_item_call name="Paste" label="Coller"/>
+	<menu_item_call name="Paste As Link" label="Faire un Lien"/>
+	<menu_item_call name="Restore to Last Position" label="Remettre au dernier emplacement"/>
+	<menu_item_call name="Remove Link" label="Supprimer Lien"/>
+	<menu_item_call name="Delete" label="Supprimer"/>
+	<menu_item_call name="Wear Items" label="Porter l'ensemble"/>
+	<menu_item_call name="Add To Outfit" label="Ajouter à l'ensemble"/>
+	<menu_item_call name="Replace Outfit" label="Remplacer l'ensemble"/>
+	<menu_item_call name="Remove From Outfit" label="Enlever de l'ensemble"/>
+	<menu_item_call name="Conference Chat Folder" label="Démarrer le chat conférence"/>
+	<menu_item_call name="Sound Play" label="Jouer"/>
+	<menu_item_call name="Teleport To Landmark" label="Au sujet du repère"/>
+	<menu_item_call name="Animation Play" label="Jouer dans le Monde"/>
+	<menu_item_call name="Animation Audition" label="Jouer localement"/>
+	<menu_item_call name="Send Instant Message" label="Envoyer un message instantané"/>
+	<menu_item_call name="Offer Teleport..." label="Offrir de téléporter"/>
+	<menu_item_call name="Conference Chat" label="Démarrer le chat conférence"/>
+	<menu_item_call name="Activate" label="Activer"/>
+	<menu_item_call name="Deactivate" label="Désactiver"/>
+	<menu_item_call name="Wearable And Object Wear" label="Porter"/>
+	<menu_item_call name="Wearable Add" label="Ajouter"/>
+	<menu_item_call name="Wearable Move Forward" label="&#9650; Haut"/>
+	<menu_item_call name="Wearable Move Back" label="&#9660; Bas"/>
+	<menu name="Attach To" label="Attacher à"/>
+	<menu name="Attach To HUD" label="Attacher au HUD"/>
+	<menu_item_call name="Detach From Yourself" label="Détacher de vous"/>
+	<menu_item_call name="Wearable Edit" label="Éditer"/>
+	<menu_item_call name="Take Off" label="Enlever"/>
+	<menu_item_call name="Merchant Copy" label="Copier au Merchant Outbox"/>
+	<menu_item_call name="Marketplace Send" label="Envoyer à Marketplace"/>
+	<menu_item_call name="--no options--" label="--aucune option--"/>
+</menu>

From 20e445b4befd974eee9eed65e8d0365f13be7675 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 18 Jul 2012 20:26:19 -0400
Subject: [PATCH 046/199] Added icons for folders from phoenix, and created
 outbox folder icon for future use.

---
 indra/newview/llviewerfoldertype.cpp             |  14 +++++++-------
 .../default/textures/inv_folder_favorite.tga     | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_folder_inbox.tga  | Bin 0 -> 2085 bytes
 .../skins/default/textures/inv_folder_mesh.tga   | Bin 0 -> 674 bytes
 .../skins/default/textures/inv_folder_outbox.tga | Bin 0 -> 654 bytes
 .../skins/default/textures/inv_folder_outfit.tga | Bin 0 -> 603 bytes
 .../newview/skins/default/textures/textures.xml  |  15 +++++++++++++--
 7 files changed, 20 insertions(+), 9 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/inv_folder_favorite.tga
 create mode 100644 indra/newview/skins/default/textures/inv_folder_inbox.tga
 create mode 100644 indra/newview/skins/default/textures/inv_folder_mesh.tga
 create mode 100644 indra/newview/skins/default/textures/inv_folder_outbox.tga
 create mode 100644 indra/newview/skins/default/textures/inv_folder_outfit.tga

diff --git a/indra/newview/llviewerfoldertype.cpp b/indra/newview/llviewerfoldertype.cpp
index 8c7184ede..419d5d690 100644
--- a/indra/newview/llviewerfoldertype.cpp
+++ b/indra/newview/llviewerfoldertype.cpp
@@ -125,15 +125,15 @@ LLViewerFolderDictionary::LLViewerFolderDictionary()
 	addEntry(LLFolderType::FT_LOST_AND_FOUND, 		new ViewerFolderEntry("Lost And Found",	   		"inv_folder_lostandfound.tga",		"inv_folder_lostandfound.tga",	TRUE,		false));
 	addEntry(LLFolderType::FT_ANIMATION, 			new ViewerFolderEntry("Animations",				"inv_folder_animation.tga",			"inv_folder_animation.tga",		FALSE,		false));
 	addEntry(LLFolderType::FT_GESTURE, 				new ViewerFolderEntry("Gestures",				"inv_folder_gesture.tga",			"inv_folder_gesture.tga",		FALSE,		false));
-	addEntry(LLFolderType::FT_FAVORITE, 			new ViewerFolderEntry("Favorites",				"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	FALSE,		false));
+	addEntry(LLFolderType::FT_FAVORITE, 			new ViewerFolderEntry("Favorites",				"inv_folder_favorite.tga",			"inv_folder_favorite.tga",		FALSE,		false));
 
-	addEntry(LLFolderType::FT_CURRENT_OUTFIT, 		new ViewerFolderEntry("Current Outfit",			"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	TRUE,		false));
-	addEntry(LLFolderType::FT_OUTFIT, 				new ViewerFolderEntry("New Outfit",				"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	TRUE,		false));
-	addEntry(LLFolderType::FT_MY_OUTFITS, 			new ViewerFolderEntry("My Outfits",				"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	TRUE,		false));
-	addEntry(LLFolderType::FT_MESH, 				new ViewerFolderEntry("Meshes",					"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	FALSE,		false));
+	addEntry(LLFolderType::FT_CURRENT_OUTFIT, 		new ViewerFolderEntry("Current Outfit",			"inv_folder_outfit.tga",			"inv_folder_outfit.tga",		TRUE,		false));
+	addEntry(LLFolderType::FT_OUTFIT, 				new ViewerFolderEntry("New Outfit",				"inv_folder_outfit.tga",			"inv_folder_outfit.tga",		TRUE,		false));
+	addEntry(LLFolderType::FT_MY_OUTFITS, 			new ViewerFolderEntry("My Outfits",				"inv_folder_outfit.tga",			"inv_folder_outfit.tga",		TRUE,		false));
+	addEntry(LLFolderType::FT_MESH, 				new ViewerFolderEntry("Meshes",					"inv_folder_mesh.tga",				"inv_folder_mesh.tga",			FALSE,		false));
 	
-	addEntry(LLFolderType::FT_INBOX, 				new ViewerFolderEntry("Inbox",					"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	FALSE,		false));
-	addEntry(LLFolderType::FT_OUTBOX, 				new ViewerFolderEntry("Outbox",					"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	FALSE,		false));
+	addEntry(LLFolderType::FT_INBOX, 				new ViewerFolderEntry("Inbox",					"inv_folder_inbox.tga",				"inv_folder_inbox.tga",			FALSE,		false));
+	addEntry(LLFolderType::FT_OUTBOX, 				new ViewerFolderEntry("Outbox",					"inv_folder_outbox.tga",			"inv_folder_outbox",			FALSE,		false));
 
 	addEntry(LLFolderType::FT_BASIC_ROOT, 			new ViewerFolderEntry("Basic Root",				"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	FALSE,		false));
 		 
diff --git a/indra/newview/skins/default/textures/inv_folder_favorite.tga b/indra/newview/skins/default/textures/inv_folder_favorite.tga
new file mode 100644
index 0000000000000000000000000000000000000000..a6c807d124441c05d8c03a49c78bb7627ca38617
GIT binary patch
literal 1068
zcmZQzU}As)0R{mE1r8XG3iN-V8RTFFhB<ToC!afqf#Z*z{U3Me42C#NEz~}+{&WBT
z|DOXS=0NH0`(OV@WZ(E7SbXJw<FfbvXa9rBgVX>q$P5hqAiY4`eBr}?uh5JCRpod8
zSC-!O-!bI$|C)Jk;AZ2~-}CV6fA5To|CMES|5ri6PGM*Mx32pHHv^abdCMRF*V5RB
zq8DV2y276SX)_<d{fJ9{Lf>7myOHe%u|fU_&%8m<{(`m7{~MYe`mYMK&(!|te+$>+
z|5X%r|JT(z@IPbzLxT2Ce*g17$c%*kyZ@^WzW(2M=KcTV$@l(eEq?TW!i(>C?FYpn
zF&Gp_=>7-sabZyU!itd-Jy6Z}@899}gVPbv9<V-0x<*!wosG>NV)bG-k#3?PL7}c;
Rp242}e!3BEo<6R63;@i3+Nl5l

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/textures/inv_folder_inbox.tga b/indra/newview/skins/default/textures/inv_folder_inbox.tga
new file mode 100644
index 0000000000000000000000000000000000000000..04539c2cc4f002c9c1c4724215e5b7cf08cfb177
GIT binary patch
literal 2085
zcmeHF!A`<J5M4AHk9>fKet>f010<nM6C<Rk@xY~Nuo|!!T2CB$X+NS#6Am0oNjUUJ
z`U(7kM~>sZRfwUbA~8l2HhG<$H#7UTvr}RRY`My;%%l@WL_Y$4EbRj5voIthO}`E3
zE$dUh3Hc}d$|8pYdYO7&t0)TDwoScWF9Yz17u8#qMU%;dMxzmp$77n!X2QY;k9bkN
zX__KGiXsYvfHX}L7Cz2H9RIlK{*L2N9LLmdx2amKlIMBC!UvCdk-jX;RIAm<_kBu|
zgr?J}u<*enUZjtnx~@yZ;gGuBuIM2weDH{G(#IQagFOAB`N4eUfy=FCAMwRvvC@YI
zAnHEm>~ntJK2KvgV|n?1fqO0S8}8RX=z#j9n;oU256+|u!+5d#_l~4mMkRCg`H__2
z)`@HFrhcoo)W+5MovdEgD{T8gXsjQ$_kXnmP5sewq}D_KS!xdYyGb9O9={i62jLCQ
C7t+N5

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/textures/inv_folder_mesh.tga b/indra/newview/skins/default/textures/inv_folder_mesh.tga
new file mode 100644
index 0000000000000000000000000000000000000000..be95f00079ec99da1a44cf821034cb4be25b0be7
GIT binary patch
literal 674
zcmaJ<Jx>Bb5Ismp3>NYe{BJZC7RG2Sv^hj76)^~k$A<(3L_-8rR3eBU1PO<TBnFL*
zg^fMsb7u4qG+~pQ-MO7NZ{Ex*id8X|O|dECBW`w8HY@bO#3x15;IQjDED61UK*0%r
zehz^PmG)W0swph;Ek|OMEdz7_8kx9$E)b3UgQq$oH`_=(RuH|5B3{o!<sj1!{tui}
z6qmuQ9OXNihBrHbV9AZ-Ls^&y;bQ~r1m|K?ts1dv*gTuZdd7}$c|)q;lw1|>2LHbV
z49dKIVCOc1^m7MCFYnl^WwCpo?twXpk-*$vfyy^lR?D2xN(_m{CCQk=VY^8wL%kG3
z;Nj~nX=1RrN>ZvKgRAhJ&PeIQ*)87Oq_Fr&NV3&L=*mNLXi(p&HgmuB-&s>bU|A~_
zWQd;Q1=;u89pv6Vq4KS{pS1^cv5Y02zH~vJk%`@IxBHC~R{2E{6iUm%#%X}yVpm?F
Fm@nB0lXCz7

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/textures/inv_folder_outbox.tga b/indra/newview/skins/default/textures/inv_folder_outbox.tga
new file mode 100644
index 0000000000000000000000000000000000000000..589348221b1784594eed8ba1763d2cd9f3ceaccc
GIT binary patch
literal 654
zcmZWnze_?<6uxFuwB*(r?zQ<32r5DpSV@E6j|K<DC+MOMqP!<1NJ|dF69WT(po69E
z+7J)xK@R-~N`p%+5)EJXTzZ3e;oft<@0{=4bMLu~?J{Fnn1vne+yY=ZT1wo3ZQ3za
zMQWns`elNm_KI8W4Fyey#Ao43*LegF-84e)7Yo!zW0d+s<W%h)W>x!u%H68YC%1Xp
znEsX6GK8(c01w?R{C@wJ*Xu<porWBZMqy4Q5^%X(FeH11q(7ZP<&t19IF}>|&1Ms|
zS`GDj9bL|oB}{xQ7F$p7I3A<i=^zveeTKtfA!sxjs8lNOcs#-qrbOglsbIfa#b`Fe
zU9U$)|HR{Qv|26rd_LH0HpsFpEMel4$>e&1Ctkr#xr{&{@J+Y2+wD*k1wEd$-EIp@
zn0Tktxtf4l^E{uUIvj$Ff2~$4ve_&$nG7P42<Y|55+<G+Wn95zJYtb|0~^$sHJ50w
zLZ>i_79YbzaJgI}N4gy81Vy<OiptX>3lVVzg5qC^g;QdjdoCPa_nG_j<nYqzK6V_j
EKU^YzHUIzs

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/textures/inv_folder_outfit.tga b/indra/newview/skins/default/textures/inv_folder_outfit.tga
new file mode 100644
index 0000000000000000000000000000000000000000..dfb05929b9edbbb28a455855b7d7f02a6ec644be
GIT binary patch
literal 603
zcmZvaJxjw-6ozk;QnelI<|_UG|Am9Ab2q^b4kAttT9QTuKX6f@kU^J%vlLteT?8G1
zbafRs=Zvp;4&D%K0y#J5@IL3`o;cTb{^`1|Tb{qfjW8F*s|H^#O?AGRW#U^QmQW^X
zb>~VaZhco_XJcQ74^#c=v{;p`Y@KOsI96I9X~F$JuV24}rhoffCTLX?08neG7YlJj
zphYSW8tC0TT54ZEsNyDXdnuhDuO{?e)#5SL7VbWN45QlK{oBkCwP*r5N88NjtN61P
zv1-lJr%$_2cyN3hBLMbbxt}512nUm?T?Uh}keFydiWwjw5*$o2ZI53xdjD3!Qtj4k
c{|($c&lQoxN?WK<=m=SiDIp!>+V5lL7fEYIu>b%7

literal 0
HcmV?d00001

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 973f76923..3552b3eaf 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -105,11 +105,16 @@
   <texture name="inv_folder_bodypart.tga"/>
   <texture name="inv_folder_callingcard.tga"/>
   <texture name="inv_folder_clothing.tga"/>
+  <texture name="inv_folder_favorite.tga"/>
   <texture name="inv_folder_gesture.tga"/>
+  <texture name="inv_folder_inbox.tga"/>
   <texture name="inv_folder_landmark.tga"/>
   <texture name="inv_folder_lostandfound.tga"/>
+  <texture name="inv_folder_mesh.tga"/>
   <texture name="inv_folder_notecard.tga"/>
   <texture name="inv_folder_object.tga"/>
+  <texture name="inv_folder_outfit.tga"/>
+  <texture name="inv_folder_outbox.tga"/>
   <texture name="inv_folder_plain_closed.tga"/>
   <texture name="inv_folder_plain_open.tga"/>
   <texture name="inv_folder_script.tga"/>
@@ -147,7 +152,7 @@
   <texture name="inv_item_texture.tga"/>
   <texture name="inv_item_underpants.tga"/>
   <texture name="inv_item_undershirt.tga"/>
-  
+
   <texture name="lag_status_critical.tga"/>
   <texture name="lag_status_good.tga"/>
   <texture name="lag_status_warning.tga"/>
@@ -370,6 +375,9 @@
   <texture name="icn_label_music.tga"/>
   <texture name="icn_label_media.tga"/>
   <texture name="arrow_down.tga"/>
+  <texture name="arrow_up.tga"/>
+  <texture name="arrow_left.tga"/>
+  <texture name="arrow_right.tga"/>
   <texture name="cloud-particle.j2c" use_mips="true"/>
   
   <texture name="skin_thumbnail_default.png" preload="true" />
@@ -396,7 +404,10 @@
   
   <texture name="go-previous-4.png"/>
   <texture name="go-next-4.png"/>
-  <texture name="view-refresh-5.png"/> 
+  <texture name="view-refresh-5.png"/>
   <texture name="go-home-4.png"/>
 
+  <texture name="Inv_WindLight.png" preload="true"/>
+  <texture name="Inv_WaterLight.png" preload="true"/>
+
 </textures>

From 2334793554b569258f5887b4d020e8a9e8841379 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Thu, 19 Jul 2012 03:24:44 +0200
Subject: [PATCH 047/199] Build SLPLugin.exe without tcmalloc, for SkyDrive

---
 indra/llplugin/slplugin/CMakeLists.txt | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt
index 7e957d356..ea9afec16 100644
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -55,7 +55,6 @@ set_target_properties(SLPlugin
   )
 
 target_link_libraries(SLPlugin
-  ${GOOGLE_PERFTOOLS_LIBRARIES}
   ${LLPLUGIN_LIBRARIES}
   ${LLMESSAGE_LIBRARIES}
   ${LLCOMMON_LIBRARIES}
@@ -82,11 +81,4 @@ if (DARWIN)
   )
 endif (DARWIN)
 
-if (WINDOWS)
-    set_target_properties(SLPlugin
-      PROPERTIES
-        LINK_FLAGS "${GOOGLE_PERFTOOLS_LINKER_FLAGS}"
-        )
-endif (WINDOWS)
-
 #ll_deploy_sharedlibs_command(SLPlugin)

From 96fa4af9396f4266940abc8cd2e65e467ca02f96 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Thu, 19 Jul 2012 03:26:02 +0200
Subject: [PATCH 048/199] Initialize FMOD Ex with 44100 Hz, like FMOD

---
 indra/llaudio/llaudioengine_fmodex.cpp | 58 +++++---------------------
 1 file changed, 10 insertions(+), 48 deletions(-)

diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp
index 2b2bd19d5..c3e3fe286 100644
--- a/indra/llaudio/llaudioengine_fmodex.cpp
+++ b/indra/llaudio/llaudioengine_fmodex.cpp
@@ -124,54 +124,8 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 			<< ")!  You should be using FMOD Ex" << FMOD_VERSION << LL_ENDL;
 	}
 
-#if LL_WINDOWS
-	int numdrivers;
-	FMOD_SPEAKERMODE speakermode;
-	FMOD_CAPS caps;
-	char name[256];
-
-	//Is this block applicable to linux?
-	{
-		result = mSystem->getNumDrivers(&numdrivers);
-		Check_FMOD_Error(result, "FMOD::System::getNumDrivers");
-		if (numdrivers == 0)
-		{
-			result = mSystem->setOutput(FMOD_OUTPUTTYPE_NOSOUND);
-			Check_FMOD_Error(result, "FMOD::System::setOutput");
-		}
-		else
-		{
-			result = mSystem->getDriverCaps(0, &caps, 0, &speakermode);
-			Check_FMOD_Error(result,"FMOD::System::getDriverCaps");
-			/*
-			Set the user selected speaker mode.
-			*/
-			result = mSystem->setSpeakerMode(speakermode);
-			Check_FMOD_Error(result, "FMOD::System::setSpeakerMode");
-			if (caps & FMOD_CAPS_HARDWARE_EMULATED)
-			{
-				/*
-				The user has the 'Acceleration' slider set to off! This is really bad
-				for latency! You might want to warn the user about this.
-				*/
-				result = mSystem->setDSPBufferSize(1024, 10);
-				Check_FMOD_Error(result, "FMOD::System::setDSPBufferSize");
-			}
-			result = mSystem->getDriverInfo(0, name, 256, 0);
-			Check_FMOD_Error(result, "FMOD::System::getDriverInfo");
-
-			if (strstr(name, "SigmaTel"))
-			{
-				/*
-				Sigmatel sound devices crackle for some reason if the format is PCM 16bit.
-				PCM floating point output seems to solve it.
-				*/
-				result = mSystem->setSoftwareFormat(48000, FMOD_SOUND_FORMAT_PCMFLOAT, 0,0, FMOD_DSP_RESAMPLER_LINEAR);
-				Check_FMOD_Error(result,"FMOD::System::setSoftwareFormat");
-			}
-		}
-	}
-#endif //LL_WINDOWS
+	result = mSystem->setSoftwareFormat(44100, FMOD_SOUND_FORMAT_PCM16, 0, 0, FMOD_DSP_RESAMPLER_LINEAR);
+	Check_FMOD_Error(result,"FMOD::System::setSoftwareFormat");
 
 	// In this case, all sounds, PLUS wind and stream will be software.
 	result = mSystem->setSoftwareChannels(num_channels + 2);
@@ -297,6 +251,14 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 
 	LL_INFOS("AppInit") << "LLAudioEngine_FMODEX::init() FMOD Ex initialized correctly" << LL_ENDL;
 
+	int r_numbuffers, r_samplerate, r_channels, r_bits;
+	unsigned int r_bufferlength;
+	mSystem->getDSPBufferSize(&r_bufferlength, &r_numbuffers);
+	mSystem->getSoftwareFormat(&r_samplerate, NULL, &r_channels, NULL, NULL, &r_bits);
+	int latency = 1000.0 * r_bufferlength * r_numbuffers /r_samplerate;
+	LL_INFOS("AppInit") << "FMOD Ex parameters: " << r_samplerate << " Hz * " << r_channels << " * " <<r_bits <<" bit\n"
+		<< "\tbuffer " << r_bufferlength << " * " << r_numbuffers << " (" << latency <<"ms)" << LL_ENDL;
+
 	mInited = true;
 
 	return true;

From d8fc6916259edd9822ea36424dfb250cbfbe8160 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Wed, 18 Jul 2012 20:26:43 -0500
Subject: [PATCH 049/199] MAINT-646: Hotspot in LLViewerObjectList::update

---
 indra/newview/llviewerobject.cpp     |  1 +
 indra/newview/llviewerobject.h       |  5 ++
 indra/newview/llviewerobjectlist.cpp | 79 ++++++++++++++++++++++------
 indra/newview/llviewerobjectlist.h   |  4 +-
 4 files changed, 72 insertions(+), 17 deletions(-)

diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 5732027be..be2d1e065 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -208,6 +208,7 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe
 	mID(id),
 	mLocalID(0),
 	mTotalCRC(0),
+	mListIndex(-1),
 	mTEImages(NULL),
 	mGLName(0),
 	mbCanSelect(TRUE),
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 403b27490..ee266ce99 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -233,6 +233,8 @@ public:
 	const LLUUID &getID() const						{ return mID; }
 	U32 getLocalID() const							{ return mLocalID; }
 	U32 getCRC() const								{ return mTotalCRC; }
+	S32 getListIndex() const						{ return mListIndex; }
+	void setListIndex(S32 idx)						{ mListIndex = idx; }
 
 	virtual BOOL isFlexible() const					{ return FALSE; }
 	virtual BOOL isSculpted() const 				{ return FALSE; }
@@ -604,6 +606,9 @@ public:
 	// Last total CRC received from sim, used for caching
 	U32				mTotalCRC;
 
+	// index into LLViewerObjectList::mActiveObjects or -1 if not in list
+	S32				mListIndex;
+
 	LLPointer<LLViewerTexture> *mTEImages;
 
 	// Selection, picking and rendering variables
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 758a8c3e9..1886e4fb8 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -932,21 +932,30 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
 	LLViewerObject *objectp = NULL;	
 	
 	// Make a copy of the list in case something in idleUpdate() messes with it
-	std::vector<LLViewerObject*> idle_list;
-	
+	static std::vector<LLViewerObject*> idle_list;
+
+	U32 idle_count = 0;
+		
 	static LLFastTimer::DeclareTimer idle_copy("Idle Copy");
 
 	{
 		LLFastTimer t(idle_copy);
-		idle_list.reserve( mActiveObjects.size() );
-
- 		for (std::set<LLPointer<LLViewerObject> >::iterator active_iter = mActiveObjects.begin();
+		
+ 		for (std::vector<LLPointer<LLViewerObject> >::iterator active_iter = mActiveObjects.begin();
 			active_iter != mActiveObjects.end(); active_iter++)
 		{
 			objectp = *active_iter;
 			if (objectp)
 			{
-				idle_list.push_back( objectp );
+				if (idle_count >= idle_list.size())
+				{
+					idle_list.push_back( objectp );
+				}
+				else
+				{
+					idle_list[idle_count] = objectp;
+				}
+				++idle_count;
 			}
 			else
 			{	// There shouldn't be any NULL pointers in the list, but they have caused
@@ -956,11 +965,12 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
 		}
 	}
 
+	std::vector<LLViewerObject*>::iterator idle_end = idle_list.begin()+idle_count;
 	static const LLCachedControl<bool> freeze_time("FreezeTime",0);
 	if (freeze_time)
 	{
 		for (std::vector<LLViewerObject*>::iterator iter = idle_list.begin();
-			iter != idle_list.end(); iter++)
+			iter != idle_end; iter++)
 		{
 			objectp = *iter;
 			if (
@@ -976,17 +986,17 @@ void LLViewerObjectList::update(LLAgent &agent, LLWorld &world)
 	else
 	{
 		for (std::vector<LLViewerObject*>::iterator idle_iter = idle_list.begin();
-			idle_iter != idle_list.end(); idle_iter++)
+			idle_iter != idle_end; idle_iter++)
 		{
 			objectp = *idle_iter;
-			if (!objectp->idleUpdate(agent, world, frame_time))
+			if (objectp->idleUpdate(agent, world, frame_time))
 			{
-				//  If Idle Update returns false, kill object!
-				kill_list.push_back(objectp);
+				num_active_objects++;				
 			}
 			else
 			{
-				num_active_objects++;
+				//  If Idle Update returns false, kill object!
+				kill_list.push_back(objectp);
 			}
 		}
 		for (std::vector<LLViewerObject*>::iterator kill_iter = kill_list.begin();
@@ -1229,7 +1239,7 @@ void LLViewerObjectList::cleanupReferences(LLViewerObject *objectp)
 	{
 		//llinfos << "Removing " << objectp->mID << " " << objectp->getPCodeString() << " from active list in cleanupReferences." << llendl;
 		objectp->setOnActiveList(FALSE);
-		mActiveObjects.erase(objectp);
+		removeFromActiveList(objectp);
 	}
 
 	if (objectp->isOnMap())
@@ -1296,6 +1306,7 @@ BOOL LLViewerObjectList::killObject(LLViewerObject *objectp)
 
 		return TRUE;
 	}
+
 	return FALSE;
 }
 
@@ -1419,6 +1430,26 @@ void LLViewerObjectList::cleanDeadObjects(BOOL use_timer)
 	mNumDeadObjects = 0;
 }
 
+void LLViewerObjectList::removeFromActiveList(LLViewerObject* objectp)
+{
+	S32 idx = objectp->getListIndex();
+	if (idx != -1)
+	{ //remove by moving last element to this object's position
+		llassert(mActiveObjects[idx] == objectp);
+		
+		objectp->setListIndex(-1);
+
+		S32 last_index = mActiveObjects.size()-1;
+
+		if (idx != last_index)
+		{
+			mActiveObjects[idx] = mActiveObjects[last_index];
+			mActiveObjects[idx]->setListIndex(idx);
+			mActiveObjects.pop_back();
+		}
+	}
+}
+
 void LLViewerObjectList::updateActive(LLViewerObject *objectp)
 {
 	LLMemType mt(LLMemType::MTYPE_OBJECT);
@@ -1433,13 +1464,29 @@ void LLViewerObjectList::updateActive(LLViewerObject *objectp)
 		if (active)
 		{
 			//llinfos << "Adding " << objectp->mID << " " << objectp->getPCodeString() << " to active list." << llendl;
-			mActiveObjects.insert(objectp);
-			objectp->setOnActiveList(TRUE);
+			S32 idx = objectp->getListIndex();
+			if (idx <= -1)
+			{
+				mActiveObjects.push_back(objectp);
+				objectp->setListIndex(mActiveObjects.size()-1);
+				objectp->setOnActiveList(TRUE);
+			}
+			else
+			{
+				llassert(idx < (S32)mActiveObjects.size());
+				llassert(mActiveObjects[idx] == objectp);
+
+				if (idx >= (S32)mActiveObjects.size() ||
+					mActiveObjects[idx] != objectp)
+				{
+					llwarns << "Invalid object list index detected!" << llendl;
+				}
+			}
 		}
 		else
 		{
 			//llinfos << "Removing " << objectp->mID << " " << objectp->getPCodeString() << " from active list." << llendl;
-			mActiveObjects.erase(objectp);
+			removeFromActiveList(objectp);
 			objectp->setOnActiveList(FALSE);
 		}
 	}
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h
index 9266dcf2d..5a48656b7 100644
--- a/indra/newview/llviewerobjectlist.h
+++ b/indra/newview/llviewerobjectlist.h
@@ -128,7 +128,9 @@ public:
 
 	void dirtyAllObjectInventory();
 
+	void removeFromActiveList(LLViewerObject* objectp);
 	void updateActive(LLViewerObject *objectp);
+	
 	void updateAvatarVisibility();
 
 	// Selection related stuff
@@ -206,7 +208,7 @@ public:
 	typedef std::vector<LLPointer<LLViewerObject> > vobj_list_t;
 
 	vobj_list_t mObjects;
-	std::set<LLPointer<LLViewerObject> > mActiveObjects;
+	std::vector<LLPointer<LLViewerObject> > mActiveObjects;
 
 	vobj_list_t mMapObjects;
 

From 77dca2ddb2278ed1a5aa74e51414204390ee680f Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Wed, 18 Jul 2012 21:04:21 -0500
Subject: [PATCH 050/199] FMODEx diagnostics. SHFMODExStreamBufferSize added.
 Determines stream buffer size in ms. (stream restart required)
 SHFMODExDecodeBufferSize added. Determines decode buffer size in ms. (stream
 restart required) Streams will mute themselves if they are starving, until
 they are free of starvation for 5 full seconds. Streams that fail to
 accumulate any buffer progress while starving for 10 full updates will be
 stopped. Stream buffer progress(buffer percent) is llinfos spewed every
 update. (temporary) Doubled default stream buffer size Increased default
 decode buffer size to 1000ms (from 400) Temporarily using
 FMOD::Memory_Initialize to display raw stream/decode buffer sizes via
 llinfos. Added llwarns messages for SigmaTel hardware or bad audio
 acceleration configuration.

---
 indra/llaudio/llaudioengine_fmodex.cpp     | 28 +++++++++
 indra/llaudio/llstreamingaudio.h           |  3 +
 indra/llaudio/llstreamingaudio_fmodex.cpp  | 68 ++++++++++++++++++++--
 indra/llaudio/llstreamingaudio_fmodex.h    |  7 +++
 indra/newview/app_settings/settings_sh.xml | 22 +++++++
 indra/newview/llviewerparcelmedia.cpp      |  4 ++
 6 files changed, 126 insertions(+), 6 deletions(-)

diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp
index 2b2bd19d5..83ef4c5b4 100644
--- a/indra/llaudio/llaudioengine_fmodex.cpp
+++ b/indra/llaudio/llaudioengine_fmodex.cpp
@@ -95,6 +95,28 @@ inline bool Check_FMOD_Error(FMOD_RESULT result, const char *string)
 	return true;
 }
 
+void* __stdcall decode_alloc(unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr)
+{
+	if(type & FMOD_MEMORY_STREAM_DECODE)
+	{
+		llinfos << "Decode buffer size: " << size << llendl;
+	}
+	else if(type & FMOD_MEMORY_STREAM_FILE)
+	{
+		llinfos << "Strean buffer size: " << size << llendl;
+	}
+	return new char[size];
+}
+void* __stdcall decode_realloc(void *ptr, unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr)
+{
+	memset(ptr,0,size);
+	return ptr;
+}
+void __stdcall decode_dealloc(void *ptr, FMOD_MEMORY_TYPE type, const char *sourcestr)
+{
+	delete[] ptr;
+}
+
 bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 {
 
@@ -108,6 +130,10 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 
 	LL_DEBUGS("AppInit") << "LLAudioEngine_FMODEX::init() initializing FMOD" << LL_ENDL;
 
+	result = FMOD::Memory_Initialize(NULL, NULL, &decode_alloc, &decode_realloc, &decode_dealloc, FMOD_MEMORY_STREAM_DECODE | FMOD_MEMORY_STREAM_FILE);
+	if(Check_FMOD_Error(result, "FMOD::Memory_Initialize"))
+		return false;
+
 	result = FMOD::System_Create(&mSystem);
 	if(Check_FMOD_Error(result, "FMOD::System_Create"))
 		return false;
@@ -156,12 +182,14 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 				*/
 				result = mSystem->setDSPBufferSize(1024, 10);
 				Check_FMOD_Error(result, "FMOD::System::setDSPBufferSize");
+				llwarns << "Windows audio acceleration is disabled. This may introduce latency issues." << llendl;
 			}
 			result = mSystem->getDriverInfo(0, name, 256, 0);
 			Check_FMOD_Error(result, "FMOD::System::getDriverInfo");
 
 			if (strstr(name, "SigmaTel"))
 			{
+				llwarns << "SigmaTel device detected. This may introduce audio quality issues." << llendl;
 				/*
 				Sigmatel sound devices crackle for some reason if the format is PCM 16bit.
 				PCM floating point output seems to solve it.
diff --git a/indra/llaudio/llstreamingaudio.h b/indra/llaudio/llstreamingaudio.h
index 0e81cc530..3fb9ad4e3 100644
--- a/indra/llaudio/llstreamingaudio.h
+++ b/indra/llaudio/llstreamingaudio.h
@@ -58,6 +58,9 @@ class LLStreamingAudioInterface
 	virtual const LLSD *getMetaData() = 0;
 	virtual bool supportsWaveData() = 0;
 	virtual bool getWaveData(float* arr, S32 count, S32 stride = 1) = 0;
+
+	virtual bool supportsAdjustableBufferSizes(){return false;}
+	virtual void setBufferSizes(U32 streambuffertime, U32 decodebuffertime){};
 };
 
 #endif // LL_STREAMINGAUDIO_H
diff --git a/indra/llaudio/llstreamingaudio_fmodex.cpp b/indra/llaudio/llstreamingaudio_fmodex.cpp
index 6d97bcc49..c57f7d59b 100644
--- a/indra/llaudio/llstreamingaudio_fmodex.cpp
+++ b/indra/llaudio/llstreamingaudio_fmodex.cpp
@@ -50,7 +50,7 @@ public:
 
 	const std::string& getURL() 	{ return mInternetStreamURL; }
 
-	FMOD_OPENSTATE getOpenState();
+	FMOD_OPENSTATE getOpenState(unsigned int* percentbuffered=NULL, bool* starving=NULL, bool* diskbusy=NULL);
 protected:
 	FMOD::System* mSystem;
 	FMOD::Channel* mStreamChannel;
@@ -70,11 +70,13 @@ LLStreamingAudio_FMODEX::LLStreamingAudio_FMODEX(FMOD::System *system) :
 	mCurrentInternetStreamp(NULL),
 	mFMODInternetStreamChannelp(NULL),
 	mGain(1.0f),
-	mMetaData(NULL)
+	mMetaData(NULL),
+	mStarvedProgress(0),
+	mStarvedNoProgressFrames(0)
 {
 	// Number of milliseconds of audio to buffer for the audio card.
 	// Must be larger than the usual Second Life frame stutter time.
-	const U32 buffer_seconds = 5;		//sec
+	const U32 buffer_seconds = 10;		//sec
 	const U32 estimated_bitrate = 128;	//kbit/sec
 	mSystem->setStreamBufferSize(estimated_bitrate * buffer_seconds * 128/*bytes/kbit*/, FMOD_TIMEUNIT_RAWBYTES);
 
@@ -145,7 +147,10 @@ void LLStreamingAudio_FMODEX::update()
 		return;
 	}
 
-	FMOD_OPENSTATE open_state = mCurrentInternetStreamp->getOpenState();
+	unsigned int progress;
+	bool starving;
+	bool diskbusy;
+	FMOD_OPENSTATE open_state = mCurrentInternetStreamp->getOpenState(&progress, &starving, &diskbusy);
 
 	if (open_state == FMOD_OPENSTATE_READY)
 	{
@@ -158,6 +163,7 @@ void LLStreamingAudio_FMODEX::update()
 			// Reset volume to previously set volume
 			setGain(getGain());
 			mFMODInternetStreamChannelp->setPaused(false);
+			mLastStarved.stop();
 		}
 	}
 	else if(open_state == FMOD_OPENSTATE_ERROR)
@@ -168,6 +174,7 @@ void LLStreamingAudio_FMODEX::update()
 
 	if(mFMODInternetStreamChannelp)
 	{
+		llinfos << "progress = " << progress << llendl;
 		if(!mMetaData)
 			mMetaData = new LLSD;
 
@@ -237,12 +244,46 @@ void LLStreamingAudio_FMODEX::update()
 					}
 				}
 			}
+			if(starving)
+			{
+				if(!mLastStarved.getStarted())
+				{
+					llinfos << "Stream starvation detected! Muting stream audio until it clears." << llendl;
+					llinfos << "  (diskbusy="<<diskbusy<<")" << llendl;
+					llinfos << "  (progress="<<progress<<")" << llendl;
+					mFMODInternetStreamChannelp->setMute(true);
+					mStarvedProgress = progress;
+					mStarvedNoProgressFrames = 0;
+				}
+				else if(mStarvedProgress == progress)
+				{
+					if(++mStarvedNoProgressFrames >= 10)
+					{
+						//we got 10 consecutive updates of 0 progress made on the stream buffer. It probably stalled.
+						llinfos << "Stream unable to recover from starvation. Halting." << llendl;
+						stop();
+						return;
+					}
+				}
+				else
+				{
+					mStarvedNoProgressFrames = 0;
+					mStarvedProgress = progress;
+				}
+				mLastStarved.start();
+			}
+			else if(mLastStarved.getStarted() && mLastStarved.getElapsedTimeF32() > 5.f)
+			{
+				mLastStarved.stop();
+				mFMODInternetStreamChannelp->setMute(false);
+			}
 		}
 	}
 }
 
 void LLStreamingAudio_FMODEX::stop()
 {
+	mLastStarved.stop();
 	if(mMetaData)
 	{
 		delete mMetaData;
@@ -341,6 +382,11 @@ void LLStreamingAudio_FMODEX::setGain(F32 vol)
 	if(!mFMODInternetStreamChannelp || !mCurrentInternetStreamp)
 		return false;
 
+	bool muted=false;
+	mFMODInternetStreamChannelp->getMute(&muted);
+	if(muted)
+		return false;
+
 	static std::vector<float> local_array(count);	//Have to have an extra buffer to mix channels. Bleh.
 	if(count > (S32)local_array.size())	//Expand the array if needed. Try to minimize allocation calls, so don't ever shrink.
 		local_array.resize(count);
@@ -442,9 +488,19 @@ bool LLAudioStreamManagerFMODEX::stopStream()
 	}
 }
 
-FMOD_OPENSTATE LLAudioStreamManagerFMODEX::getOpenState()
+FMOD_OPENSTATE LLAudioStreamManagerFMODEX::getOpenState(unsigned int* percentbuffered, bool* starving, bool* diskbusy)
 {
 	FMOD_OPENSTATE state;
-	mInternetStream->getOpenState(&state,NULL,NULL,NULL);
+	mInternetStream->getOpenState(&state,percentbuffered,starving,diskbusy);
 	return state;
 }
+
+void LLStreamingAudio_FMODEX::setBufferSizes(U32 streambuffertime, U32 decodebuffertime)
+{
+	mSystem->setStreamBufferSize(streambuffertime/1000*128*128, FMOD_TIMEUNIT_RAWBYTES);
+	FMOD_ADVANCEDSETTINGS settings;
+	memset(&settings,0,sizeof(settings));
+	settings.cbsize=sizeof(settings);
+	settings.defaultDecodeBufferSize = decodebuffertime;//ms
+	mSystem->setAdvancedSettings(&settings);
+}
\ No newline at end of file
diff --git a/indra/llaudio/llstreamingaudio_fmodex.h b/indra/llaudio/llstreamingaudio_fmodex.h
index 064b266e6..46c0ea553 100644
--- a/indra/llaudio/llstreamingaudio_fmodex.h
+++ b/indra/llaudio/llstreamingaudio_fmodex.h
@@ -37,6 +37,7 @@
 #include "stdtypes.h" // from llcommon
 
 #include "llstreamingaudio.h"
+#include "lltimer.h"
 
 //Stubs
 class LLAudioStreamManagerFMODEX;
@@ -66,6 +67,8 @@ class LLStreamingAudio_FMODEX : public LLStreamingAudioInterface
 	/*virtual*/ const LLSD *getMetaData(){return mMetaData;}	//return NULL if not playing.
 	/*virtual*/ bool supportsWaveData(){return true;}
 	/*virtual*/ bool getWaveData(float* arr, S32 count, S32 stride = 1);
+	/*virtual*/ bool supportsAdjustableBufferSizes(){return true;}
+	/*virtual*/ void setBufferSizes(U32 streambuffertime, U32 decodebuffertime);
 private:
 	FMOD::System *mSystem;
 
@@ -76,6 +79,10 @@ private:
 	std::string mURL;
 	F32 mGain;
 
+	LLTimer mLastStarved;
+	unsigned int mStarvedProgress;
+	unsigned int mStarvedNoProgressFrames;
+
 	LLSD *mMetaData;
 };
 
diff --git a/indra/newview/app_settings/settings_sh.xml b/indra/newview/app_settings/settings_sh.xml
index 803f7a12e..feae4cb77 100644
--- a/indra/newview/app_settings/settings_sh.xml
+++ b/indra/newview/app_settings/settings_sh.xml
@@ -40,6 +40,28 @@
       <string>Boolean</string>
       <key>Value</key>
       <integer>0</integer>
+    </map>
+    <key>SHFMODExStreamBufferSize</key>
+    <map>
+      <key>Comment</key>
+      <string>Sets the streaming buffer size (in milliseconds)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>7000</integer>
+    </map>
+    <key>SHFMODExDecodeBufferSize</key>
+    <map>
+      <key>Comment</key>
+      <string>Sets the streaming decode buffer size (in milliseconds)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>1000</integer>
     </map>
 		<key>SHAllowScriptCommands</key>
 		<map>
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp
index 9e7df265e..1349429ee 100644
--- a/indra/newview/llviewerparcelmedia.cpp
+++ b/indra/newview/llviewerparcelmedia.cpp
@@ -54,6 +54,7 @@
 #include "llaudioengine.h"
 #include "lloverlaybar.h"
 #include "slfloatermediafilter.h"
+#include "llstreamingaudio.h"
 
 // Static Variables
 
@@ -661,6 +662,9 @@ void LLViewerParcelMedia::playStreamingMusic(LLParcel* parcel, bool filter)
 	else if (gAudiop)
 	{
 		LLStringUtil::trim(music_url);
+		LLStreamingAudioInterface *stream = gAudiop->getStreamingAudioImpl();
+		if(stream && stream->supportsAdjustableBufferSizes())
+			stream->setBufferSizes(gSavedSettings.getU32("SHFMODExStreamBufferSize"),gSavedSettings.getU32("SHFMODExDecodeBufferSize"));
 		gAudiop->startInternetStream(music_url);
 		if (music_url.empty())
 		{

From 5fcdbfdd9e543abca3f5606b9f62306ff3c9099e Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Wed, 18 Jul 2012 21:04:21 -0500
Subject: [PATCH 051/199] FMODEx diagnostics. SHFMODExStreamBufferSize added.
 Determines stream buffer size in ms. (stream restart required)
 SHFMODExDecodeBufferSize added. Determines decode buffer size in ms. (stream
 restart required) Streams will mute themselves if they are starving, until
 they are free of starvation for 5 full seconds. Streams that fail to
 accumulate any buffer progress while starving for 10 full updates will be
 stopped. Stream buffer progress(buffer percent) is llinfos spewed every
 update. (temporary) Doubled default stream buffer size Increased default
 decode buffer size to 1000ms (from 400) Temporarily using
 FMOD::Memory_Initialize to display raw stream/decode buffer sizes via
 llinfos. Added llwarns messages for SigmaTel hardware or bad audio
 acceleration configuration.

---
 indra/llaudio/llaudioengine_fmodex.cpp     | 28 +++++++++
 indra/llaudio/llstreamingaudio.h           |  3 +
 indra/llaudio/llstreamingaudio_fmodex.cpp  | 68 ++++++++++++++++++++--
 indra/llaudio/llstreamingaudio_fmodex.h    |  7 +++
 indra/newview/app_settings/settings_sh.xml | 22 +++++++
 indra/newview/llviewerparcelmedia.cpp      |  4 ++
 6 files changed, 126 insertions(+), 6 deletions(-)

diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp
index 2b2bd19d5..83ef4c5b4 100644
--- a/indra/llaudio/llaudioengine_fmodex.cpp
+++ b/indra/llaudio/llaudioengine_fmodex.cpp
@@ -95,6 +95,28 @@ inline bool Check_FMOD_Error(FMOD_RESULT result, const char *string)
 	return true;
 }
 
+void* __stdcall decode_alloc(unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr)
+{
+	if(type & FMOD_MEMORY_STREAM_DECODE)
+	{
+		llinfos << "Decode buffer size: " << size << llendl;
+	}
+	else if(type & FMOD_MEMORY_STREAM_FILE)
+	{
+		llinfos << "Strean buffer size: " << size << llendl;
+	}
+	return new char[size];
+}
+void* __stdcall decode_realloc(void *ptr, unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr)
+{
+	memset(ptr,0,size);
+	return ptr;
+}
+void __stdcall decode_dealloc(void *ptr, FMOD_MEMORY_TYPE type, const char *sourcestr)
+{
+	delete[] ptr;
+}
+
 bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 {
 
@@ -108,6 +130,10 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 
 	LL_DEBUGS("AppInit") << "LLAudioEngine_FMODEX::init() initializing FMOD" << LL_ENDL;
 
+	result = FMOD::Memory_Initialize(NULL, NULL, &decode_alloc, &decode_realloc, &decode_dealloc, FMOD_MEMORY_STREAM_DECODE | FMOD_MEMORY_STREAM_FILE);
+	if(Check_FMOD_Error(result, "FMOD::Memory_Initialize"))
+		return false;
+
 	result = FMOD::System_Create(&mSystem);
 	if(Check_FMOD_Error(result, "FMOD::System_Create"))
 		return false;
@@ -156,12 +182,14 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 				*/
 				result = mSystem->setDSPBufferSize(1024, 10);
 				Check_FMOD_Error(result, "FMOD::System::setDSPBufferSize");
+				llwarns << "Windows audio acceleration is disabled. This may introduce latency issues." << llendl;
 			}
 			result = mSystem->getDriverInfo(0, name, 256, 0);
 			Check_FMOD_Error(result, "FMOD::System::getDriverInfo");
 
 			if (strstr(name, "SigmaTel"))
 			{
+				llwarns << "SigmaTel device detected. This may introduce audio quality issues." << llendl;
 				/*
 				Sigmatel sound devices crackle for some reason if the format is PCM 16bit.
 				PCM floating point output seems to solve it.
diff --git a/indra/llaudio/llstreamingaudio.h b/indra/llaudio/llstreamingaudio.h
index 0e81cc530..3fb9ad4e3 100644
--- a/indra/llaudio/llstreamingaudio.h
+++ b/indra/llaudio/llstreamingaudio.h
@@ -58,6 +58,9 @@ class LLStreamingAudioInterface
 	virtual const LLSD *getMetaData() = 0;
 	virtual bool supportsWaveData() = 0;
 	virtual bool getWaveData(float* arr, S32 count, S32 stride = 1) = 0;
+
+	virtual bool supportsAdjustableBufferSizes(){return false;}
+	virtual void setBufferSizes(U32 streambuffertime, U32 decodebuffertime){};
 };
 
 #endif // LL_STREAMINGAUDIO_H
diff --git a/indra/llaudio/llstreamingaudio_fmodex.cpp b/indra/llaudio/llstreamingaudio_fmodex.cpp
index 6d97bcc49..c57f7d59b 100644
--- a/indra/llaudio/llstreamingaudio_fmodex.cpp
+++ b/indra/llaudio/llstreamingaudio_fmodex.cpp
@@ -50,7 +50,7 @@ public:
 
 	const std::string& getURL() 	{ return mInternetStreamURL; }
 
-	FMOD_OPENSTATE getOpenState();
+	FMOD_OPENSTATE getOpenState(unsigned int* percentbuffered=NULL, bool* starving=NULL, bool* diskbusy=NULL);
 protected:
 	FMOD::System* mSystem;
 	FMOD::Channel* mStreamChannel;
@@ -70,11 +70,13 @@ LLStreamingAudio_FMODEX::LLStreamingAudio_FMODEX(FMOD::System *system) :
 	mCurrentInternetStreamp(NULL),
 	mFMODInternetStreamChannelp(NULL),
 	mGain(1.0f),
-	mMetaData(NULL)
+	mMetaData(NULL),
+	mStarvedProgress(0),
+	mStarvedNoProgressFrames(0)
 {
 	// Number of milliseconds of audio to buffer for the audio card.
 	// Must be larger than the usual Second Life frame stutter time.
-	const U32 buffer_seconds = 5;		//sec
+	const U32 buffer_seconds = 10;		//sec
 	const U32 estimated_bitrate = 128;	//kbit/sec
 	mSystem->setStreamBufferSize(estimated_bitrate * buffer_seconds * 128/*bytes/kbit*/, FMOD_TIMEUNIT_RAWBYTES);
 
@@ -145,7 +147,10 @@ void LLStreamingAudio_FMODEX::update()
 		return;
 	}
 
-	FMOD_OPENSTATE open_state = mCurrentInternetStreamp->getOpenState();
+	unsigned int progress;
+	bool starving;
+	bool diskbusy;
+	FMOD_OPENSTATE open_state = mCurrentInternetStreamp->getOpenState(&progress, &starving, &diskbusy);
 
 	if (open_state == FMOD_OPENSTATE_READY)
 	{
@@ -158,6 +163,7 @@ void LLStreamingAudio_FMODEX::update()
 			// Reset volume to previously set volume
 			setGain(getGain());
 			mFMODInternetStreamChannelp->setPaused(false);
+			mLastStarved.stop();
 		}
 	}
 	else if(open_state == FMOD_OPENSTATE_ERROR)
@@ -168,6 +174,7 @@ void LLStreamingAudio_FMODEX::update()
 
 	if(mFMODInternetStreamChannelp)
 	{
+		llinfos << "progress = " << progress << llendl;
 		if(!mMetaData)
 			mMetaData = new LLSD;
 
@@ -237,12 +244,46 @@ void LLStreamingAudio_FMODEX::update()
 					}
 				}
 			}
+			if(starving)
+			{
+				if(!mLastStarved.getStarted())
+				{
+					llinfos << "Stream starvation detected! Muting stream audio until it clears." << llendl;
+					llinfos << "  (diskbusy="<<diskbusy<<")" << llendl;
+					llinfos << "  (progress="<<progress<<")" << llendl;
+					mFMODInternetStreamChannelp->setMute(true);
+					mStarvedProgress = progress;
+					mStarvedNoProgressFrames = 0;
+				}
+				else if(mStarvedProgress == progress)
+				{
+					if(++mStarvedNoProgressFrames >= 10)
+					{
+						//we got 10 consecutive updates of 0 progress made on the stream buffer. It probably stalled.
+						llinfos << "Stream unable to recover from starvation. Halting." << llendl;
+						stop();
+						return;
+					}
+				}
+				else
+				{
+					mStarvedNoProgressFrames = 0;
+					mStarvedProgress = progress;
+				}
+				mLastStarved.start();
+			}
+			else if(mLastStarved.getStarted() && mLastStarved.getElapsedTimeF32() > 5.f)
+			{
+				mLastStarved.stop();
+				mFMODInternetStreamChannelp->setMute(false);
+			}
 		}
 	}
 }
 
 void LLStreamingAudio_FMODEX::stop()
 {
+	mLastStarved.stop();
 	if(mMetaData)
 	{
 		delete mMetaData;
@@ -341,6 +382,11 @@ void LLStreamingAudio_FMODEX::setGain(F32 vol)
 	if(!mFMODInternetStreamChannelp || !mCurrentInternetStreamp)
 		return false;
 
+	bool muted=false;
+	mFMODInternetStreamChannelp->getMute(&muted);
+	if(muted)
+		return false;
+
 	static std::vector<float> local_array(count);	//Have to have an extra buffer to mix channels. Bleh.
 	if(count > (S32)local_array.size())	//Expand the array if needed. Try to minimize allocation calls, so don't ever shrink.
 		local_array.resize(count);
@@ -442,9 +488,19 @@ bool LLAudioStreamManagerFMODEX::stopStream()
 	}
 }
 
-FMOD_OPENSTATE LLAudioStreamManagerFMODEX::getOpenState()
+FMOD_OPENSTATE LLAudioStreamManagerFMODEX::getOpenState(unsigned int* percentbuffered, bool* starving, bool* diskbusy)
 {
 	FMOD_OPENSTATE state;
-	mInternetStream->getOpenState(&state,NULL,NULL,NULL);
+	mInternetStream->getOpenState(&state,percentbuffered,starving,diskbusy);
 	return state;
 }
+
+void LLStreamingAudio_FMODEX::setBufferSizes(U32 streambuffertime, U32 decodebuffertime)
+{
+	mSystem->setStreamBufferSize(streambuffertime/1000*128*128, FMOD_TIMEUNIT_RAWBYTES);
+	FMOD_ADVANCEDSETTINGS settings;
+	memset(&settings,0,sizeof(settings));
+	settings.cbsize=sizeof(settings);
+	settings.defaultDecodeBufferSize = decodebuffertime;//ms
+	mSystem->setAdvancedSettings(&settings);
+}
\ No newline at end of file
diff --git a/indra/llaudio/llstreamingaudio_fmodex.h b/indra/llaudio/llstreamingaudio_fmodex.h
index 064b266e6..46c0ea553 100644
--- a/indra/llaudio/llstreamingaudio_fmodex.h
+++ b/indra/llaudio/llstreamingaudio_fmodex.h
@@ -37,6 +37,7 @@
 #include "stdtypes.h" // from llcommon
 
 #include "llstreamingaudio.h"
+#include "lltimer.h"
 
 //Stubs
 class LLAudioStreamManagerFMODEX;
@@ -66,6 +67,8 @@ class LLStreamingAudio_FMODEX : public LLStreamingAudioInterface
 	/*virtual*/ const LLSD *getMetaData(){return mMetaData;}	//return NULL if not playing.
 	/*virtual*/ bool supportsWaveData(){return true;}
 	/*virtual*/ bool getWaveData(float* arr, S32 count, S32 stride = 1);
+	/*virtual*/ bool supportsAdjustableBufferSizes(){return true;}
+	/*virtual*/ void setBufferSizes(U32 streambuffertime, U32 decodebuffertime);
 private:
 	FMOD::System *mSystem;
 
@@ -76,6 +79,10 @@ private:
 	std::string mURL;
 	F32 mGain;
 
+	LLTimer mLastStarved;
+	unsigned int mStarvedProgress;
+	unsigned int mStarvedNoProgressFrames;
+
 	LLSD *mMetaData;
 };
 
diff --git a/indra/newview/app_settings/settings_sh.xml b/indra/newview/app_settings/settings_sh.xml
index 803f7a12e..feae4cb77 100644
--- a/indra/newview/app_settings/settings_sh.xml
+++ b/indra/newview/app_settings/settings_sh.xml
@@ -40,6 +40,28 @@
       <string>Boolean</string>
       <key>Value</key>
       <integer>0</integer>
+    </map>
+    <key>SHFMODExStreamBufferSize</key>
+    <map>
+      <key>Comment</key>
+      <string>Sets the streaming buffer size (in milliseconds)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>7000</integer>
+    </map>
+    <key>SHFMODExDecodeBufferSize</key>
+    <map>
+      <key>Comment</key>
+      <string>Sets the streaming decode buffer size (in milliseconds)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>1000</integer>
     </map>
 		<key>SHAllowScriptCommands</key>
 		<map>
diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp
index 9e7df265e..1349429ee 100644
--- a/indra/newview/llviewerparcelmedia.cpp
+++ b/indra/newview/llviewerparcelmedia.cpp
@@ -54,6 +54,7 @@
 #include "llaudioengine.h"
 #include "lloverlaybar.h"
 #include "slfloatermediafilter.h"
+#include "llstreamingaudio.h"
 
 // Static Variables
 
@@ -661,6 +662,9 @@ void LLViewerParcelMedia::playStreamingMusic(LLParcel* parcel, bool filter)
 	else if (gAudiop)
 	{
 		LLStringUtil::trim(music_url);
+		LLStreamingAudioInterface *stream = gAudiop->getStreamingAudioImpl();
+		if(stream && stream->supportsAdjustableBufferSizes())
+			stream->setBufferSizes(gSavedSettings.getU32("SHFMODExStreamBufferSize"),gSavedSettings.getU32("SHFMODExDecodeBufferSize"));
 		gAudiop->startInternetStream(music_url);
 		if (music_url.empty())
 		{

From 1a3c9ac5ef16954e97d80164577c43ec9d6fb671 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Wed, 18 Jul 2012 21:27:02 -0500
Subject: [PATCH 052/199] GCC being GCC-ey. Fix a couple errors and warnings

---
 indra/llaudio/llaudioengine_fmodex.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp
index 83ef4c5b4..c745dbcd1 100644
--- a/indra/llaudio/llaudioengine_fmodex.cpp
+++ b/indra/llaudio/llaudioengine_fmodex.cpp
@@ -95,7 +95,7 @@ inline bool Check_FMOD_Error(FMOD_RESULT result, const char *string)
 	return true;
 }
 
-void* __stdcall decode_alloc(unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr)
+void* F_STDCALL decode_alloc(unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr)
 {
 	if(type & FMOD_MEMORY_STREAM_DECODE)
 	{
@@ -107,14 +107,14 @@ void* __stdcall decode_alloc(unsigned int size, FMOD_MEMORY_TYPE type, const cha
 	}
 	return new char[size];
 }
-void* __stdcall decode_realloc(void *ptr, unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr)
+void* F_STDCALL decode_realloc(void *ptr, unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr)
 {
 	memset(ptr,0,size);
 	return ptr;
 }
-void __stdcall decode_dealloc(void *ptr, FMOD_MEMORY_TYPE type, const char *sourcestr)
+void F_STDCALL decode_dealloc(void *ptr, FMOD_MEMORY_TYPE type, const char *sourcestr)
 {
-	delete[] ptr;
+	delete[] (char*)ptr;
 }
 
 bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
@@ -130,7 +130,7 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 
 	LL_DEBUGS("AppInit") << "LLAudioEngine_FMODEX::init() initializing FMOD" << LL_ENDL;
 
-	result = FMOD::Memory_Initialize(NULL, NULL, &decode_alloc, &decode_realloc, &decode_dealloc, FMOD_MEMORY_STREAM_DECODE | FMOD_MEMORY_STREAM_FILE);
+	result = FMOD::Memory_Initialize(NULL, 0, &decode_alloc, &decode_realloc, &decode_dealloc, FMOD_MEMORY_STREAM_DECODE | FMOD_MEMORY_STREAM_FILE);
 	if(Check_FMOD_Error(result, "FMOD::Memory_Initialize"))
 		return false;
 

From 643844c01d4a96fa56a61f70a03ccdde6c65b24d Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Wed, 18 Jul 2012 21:27:02 -0500
Subject: [PATCH 053/199] GCC being GCC-ey. Fix a couple errors and warnings

---
 indra/llaudio/llaudioengine_fmodex.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp
index 83ef4c5b4..c745dbcd1 100644
--- a/indra/llaudio/llaudioengine_fmodex.cpp
+++ b/indra/llaudio/llaudioengine_fmodex.cpp
@@ -95,7 +95,7 @@ inline bool Check_FMOD_Error(FMOD_RESULT result, const char *string)
 	return true;
 }
 
-void* __stdcall decode_alloc(unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr)
+void* F_STDCALL decode_alloc(unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr)
 {
 	if(type & FMOD_MEMORY_STREAM_DECODE)
 	{
@@ -107,14 +107,14 @@ void* __stdcall decode_alloc(unsigned int size, FMOD_MEMORY_TYPE type, const cha
 	}
 	return new char[size];
 }
-void* __stdcall decode_realloc(void *ptr, unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr)
+void* F_STDCALL decode_realloc(void *ptr, unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr)
 {
 	memset(ptr,0,size);
 	return ptr;
 }
-void __stdcall decode_dealloc(void *ptr, FMOD_MEMORY_TYPE type, const char *sourcestr)
+void F_STDCALL decode_dealloc(void *ptr, FMOD_MEMORY_TYPE type, const char *sourcestr)
 {
-	delete[] ptr;
+	delete[] (char*)ptr;
 }
 
 bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
@@ -130,7 +130,7 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 
 	LL_DEBUGS("AppInit") << "LLAudioEngine_FMODEX::init() initializing FMOD" << LL_ENDL;
 
-	result = FMOD::Memory_Initialize(NULL, NULL, &decode_alloc, &decode_realloc, &decode_dealloc, FMOD_MEMORY_STREAM_DECODE | FMOD_MEMORY_STREAM_FILE);
+	result = FMOD::Memory_Initialize(NULL, 0, &decode_alloc, &decode_realloc, &decode_dealloc, FMOD_MEMORY_STREAM_DECODE | FMOD_MEMORY_STREAM_FILE);
 	if(Check_FMOD_Error(result, "FMOD::Memory_Initialize"))
 		return false;
 

From a4d2cb3d1246d19049ebb67c54ec721e9538e83e Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Thu, 19 Jul 2012 05:35:17 +0200
Subject: [PATCH 054/199] Some fighting with Shyotl over FMOD Ex

---
 indra/llaudio/llaudioengine_fmodex.cpp    | 7 ++++++-
 indra/llaudio/llstreamingaudio_fmodex.cpp | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp
index 392122c58..d57ef7f3a 100644
--- a/indra/llaudio/llaudioengine_fmodex.cpp
+++ b/indra/llaudio/llaudioengine_fmodex.cpp
@@ -279,10 +279,15 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 
 	int r_numbuffers, r_samplerate, r_channels, r_bits;
 	unsigned int r_bufferlength;
+	char r_name[256];
 	mSystem->getDSPBufferSize(&r_bufferlength, &r_numbuffers);
 	mSystem->getSoftwareFormat(&r_samplerate, NULL, &r_channels, NULL, NULL, &r_bits);
+	mSystem->getDriverInfo(0, r_name, 255, 0);
+	r_name[255] = '\0';
 	int latency = 1000.0 * r_bufferlength * r_numbuffers /r_samplerate;
-	LL_INFOS("AppInit") << "FMOD Ex parameters: " << r_samplerate << " Hz * " << r_channels << " * " <<r_bits <<" bit\n"
+
+	LL_INFOS("AppInit") << "FMOD device: "<< r_name << "\n"
+		<< "FMOD Ex parameters: " << r_samplerate << " Hz * " << r_channels << " * " <<r_bits <<" bit\n"
 		<< "\tbuffer " << r_bufferlength << " * " << r_numbuffers << " (" << latency <<"ms)" << LL_ENDL;
 
 	mInited = true;
diff --git a/indra/llaudio/llstreamingaudio_fmodex.cpp b/indra/llaudio/llstreamingaudio_fmodex.cpp
index c57f7d59b..b2c015afe 100644
--- a/indra/llaudio/llstreamingaudio_fmodex.cpp
+++ b/indra/llaudio/llstreamingaudio_fmodex.cpp
@@ -174,7 +174,7 @@ void LLStreamingAudio_FMODEX::update()
 
 	if(mFMODInternetStreamChannelp)
 	{
-		llinfos << "progress = " << progress << llendl;
+		//llinfos << "progress = " << progress << llendl;
 		if(!mMetaData)
 			mMetaData = new LLSD;
 

From 32e2b584b9eaf1ea26eb64443ab4bb8488490f77 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Thu, 19 Jul 2012 02:12:51 -0400
Subject: [PATCH 055/199] Translation Fix

---
 indra/newview/llinventorybridge.cpp                           | 4 ++--
 .../newview/skins/default/xui/en-us/floater_preview_sound.xml | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 8fcbb600e..1995efd2c 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4206,7 +4206,7 @@ void LLSoundBridge::openSoundPreview(void* which)
 		rect.translate(left - rect.mLeft, top - rect.mTop);
 		LLPreviewSound* preview = new LLPreviewSound("preview sound",
 										   rect,
-										   std::string("Sound: ") + me->getName(),
+										   LLTrans::getString("Sound: ") + me->getName(),
 										   me->mUUID);
 		preview->setFocus(TRUE);
 		// Keep entirely onscreen.
@@ -6308,7 +6308,7 @@ public:
 				rect.translate(left - rect.mLeft, top - rect.mTop);
 				LLPreviewSound* preview = new LLPreviewSound("preview sound",
 												   rect,
-												   std::string("Sound: ") + item->getName(),
+												   LLTrans::getString("Sound: ") + item->getName(),
 												   mUUID);
 				preview->setFocus(TRUE);
 				// Keep entirely onscreen.
diff --git a/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml b/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml
index 0c422f1c8..36596ca13 100644
--- a/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_preview_sound.xml
@@ -23,4 +23,5 @@
 	     mouse_opaque="true" name="Sound play btn" scale_image="true"
 	     sound_flags="0" tool_tip="Play this sound so that others can hear it."
 	     width="120" />
+	 <string name="Sound: ">Sound: </string>
 </floater>

From 756a284048fff0d6dbd375ec4bfa7af564b09bab Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Thu, 19 Jul 2012 02:32:16 -0500
Subject: [PATCH 056/199] Don't ever halt stalled fmodex streams, as they don't
 seem to truly 'stall'. Decrease delay between leaving starvation and unmuting
 down to 1 second (from 5).

---
 indra/llaudio/llstreamingaudio_fmodex.cpp | 23 ++---------------------
 indra/llaudio/llstreamingaudio_fmodex.h   |  2 --
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/indra/llaudio/llstreamingaudio_fmodex.cpp b/indra/llaudio/llstreamingaudio_fmodex.cpp
index c57f7d59b..d2db99d45 100644
--- a/indra/llaudio/llstreamingaudio_fmodex.cpp
+++ b/indra/llaudio/llstreamingaudio_fmodex.cpp
@@ -70,9 +70,7 @@ LLStreamingAudio_FMODEX::LLStreamingAudio_FMODEX(FMOD::System *system) :
 	mCurrentInternetStreamp(NULL),
 	mFMODInternetStreamChannelp(NULL),
 	mGain(1.0f),
-	mMetaData(NULL),
-	mStarvedProgress(0),
-	mStarvedNoProgressFrames(0)
+	mMetaData(NULL)
 {
 	// Number of milliseconds of audio to buffer for the audio card.
 	// Must be larger than the usual Second Life frame stutter time.
@@ -252,27 +250,10 @@ void LLStreamingAudio_FMODEX::update()
 					llinfos << "  (diskbusy="<<diskbusy<<")" << llendl;
 					llinfos << "  (progress="<<progress<<")" << llendl;
 					mFMODInternetStreamChannelp->setMute(true);
-					mStarvedProgress = progress;
-					mStarvedNoProgressFrames = 0;
-				}
-				else if(mStarvedProgress == progress)
-				{
-					if(++mStarvedNoProgressFrames >= 10)
-					{
-						//we got 10 consecutive updates of 0 progress made on the stream buffer. It probably stalled.
-						llinfos << "Stream unable to recover from starvation. Halting." << llendl;
-						stop();
-						return;
-					}
-				}
-				else
-				{
-					mStarvedNoProgressFrames = 0;
-					mStarvedProgress = progress;
 				}
 				mLastStarved.start();
 			}
-			else if(mLastStarved.getStarted() && mLastStarved.getElapsedTimeF32() > 5.f)
+			else if(mLastStarved.getStarted() && mLastStarved.getElapsedTimeF32() > 1.f)
 			{
 				mLastStarved.stop();
 				mFMODInternetStreamChannelp->setMute(false);
diff --git a/indra/llaudio/llstreamingaudio_fmodex.h b/indra/llaudio/llstreamingaudio_fmodex.h
index 46c0ea553..1b5211485 100644
--- a/indra/llaudio/llstreamingaudio_fmodex.h
+++ b/indra/llaudio/llstreamingaudio_fmodex.h
@@ -80,8 +80,6 @@ private:
 	F32 mGain;
 
 	LLTimer mLastStarved;
-	unsigned int mStarvedProgress;
-	unsigned int mStarvedNoProgressFrames;
 
 	LLSD *mMetaData;
 };

From 15af410e6f58ca9ee69049151a12fde058209f91 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Thu, 19 Jul 2012 14:02:11 -0400
Subject: [PATCH 057/199] Fix typo in outbox icon name, when closed.

---
 indra/newview/llviewerfoldertype.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llviewerfoldertype.cpp b/indra/newview/llviewerfoldertype.cpp
index 419d5d690..a779b617b 100644
--- a/indra/newview/llviewerfoldertype.cpp
+++ b/indra/newview/llviewerfoldertype.cpp
@@ -133,7 +133,7 @@ LLViewerFolderDictionary::LLViewerFolderDictionary()
 	addEntry(LLFolderType::FT_MESH, 				new ViewerFolderEntry("Meshes",					"inv_folder_mesh.tga",				"inv_folder_mesh.tga",			FALSE,		false));
 	
 	addEntry(LLFolderType::FT_INBOX, 				new ViewerFolderEntry("Inbox",					"inv_folder_inbox.tga",				"inv_folder_inbox.tga",			FALSE,		false));
-	addEntry(LLFolderType::FT_OUTBOX, 				new ViewerFolderEntry("Outbox",					"inv_folder_outbox.tga",			"inv_folder_outbox",			FALSE,		false));
+	addEntry(LLFolderType::FT_OUTBOX, 				new ViewerFolderEntry("Outbox",					"inv_folder_outbox.tga",			"inv_folder_outbox.tga",		FALSE,		false));
 
 	addEntry(LLFolderType::FT_BASIC_ROOT, 			new ViewerFolderEntry("Basic Root",				"inv_folder_plain_open.tga",		"inv_folder_plain_closed.tga",	FALSE,		false));
 		 

From 6673c89791f0d939de24e5045edb680a3bf64475 Mon Sep 17 00:00:00 2001
From: Ruby <ruby.boonstein@gmail.com>
Date: Thu, 19 Jul 2012 16:36:39 -0400
Subject: [PATCH 058/199] Add Antispam code from NaCl (Chalice Yao)

Amended by: Lirusaito <inusaito@gmail.com>
---
 indra/newview/CMakeLists.txt            |   2 +
 indra/newview/NACLantispam.cpp          | 390 ++++++++++++++++++++++++
 indra/newview/NACLantispam.h            |  90 ++++++
 indra/newview/app_settings/settings.xml |  68 ++++-
 indra/newview/llagent.cpp               |   6 +
 indra/newview/llstartup.cpp             |   8 +
 indra/newview/llviewercontrol.cpp       |  27 ++
 indra/newview/llviewermessage.cpp       | 137 ++++++++-
 8 files changed, 726 insertions(+), 2 deletions(-)
 create mode 100644 indra/newview/NACLantispam.cpp
 create mode 100644 indra/newview/NACLantispam.h

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index c41698c34..66e02cfca 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -115,6 +115,7 @@ set(viewer_SOURCE_FILES
     jcfloaterareasearch.cpp
     chatbar_as_cmdline.cpp
     qtoolalign.cpp
+	NACLantispam.cpp
     llaccountingcostmanager.cpp
     llagent.cpp
     llagentaccess.cpp
@@ -574,6 +575,7 @@ set(viewer_HEADER_FILES
     CMakeLists.txt
     ViewerInstall.cmake
 
+	NACLantispam.h
     sgmemstat.h
     sgversion.h
     llviewerobjectbackup.h
diff --git a/indra/newview/NACLantispam.cpp b/indra/newview/NACLantispam.cpp
new file mode 100644
index 000000000..5e6be5d9d
--- /dev/null
+++ b/indra/newview/NACLantispam.cpp
@@ -0,0 +1,390 @@
+#include "llviewerprecompiledheaders.h"
+#include "NACLantispam.h"
+#include "llviewercontrol.h"
+#include "llnotificationsutil.h"
+#include "llviewerobjectlist.h"
+#include "llagent.h"
+#include <time.h>
+
+U32 NACLAntiSpamRegistry::globalAmount;
+U32 NACLAntiSpamRegistry::globalTime;
+bool NACLAntiSpamRegistry::bGlobalQueue;
+NACLAntiSpamQueue* NACLAntiSpamRegistry::queues[NACLAntiSpamRegistry::QUEUE_MAX] = {0};
+std::tr1::unordered_map<std::string,NACLAntiSpamQueueEntry*> NACLAntiSpamRegistry::globalEntries;
+std::tr1::unordered_map<std::string,NACLAntiSpamQueueEntry*>::iterator NACLAntiSpamRegistry::it2;
+
+const std::string COLLISION_SOUNDS[] ={"dce5fdd4-afe4-4ea1-822f-dd52cac46b08","51011582-fbca-4580-ae9e-1a5593f094ec","68d62208-e257-4d0c-bbe2-20c9ea9760bb","75872e8c-bc39-451b-9b0b-042d7ba36cba","6a45ba0b-5775-4ea8-8513-26008a17f873","992a6d1b-8c77-40e0-9495-4098ce539694","2de4da5a-faf8-46be-bac6-c4d74f1e5767","6e3fb0f7-6d9c-42ca-b86b-1122ff562d7d","14209133-4961-4acc-9649-53fc38ee1667","bc4a4348-cfcc-4e5e-908e-8a52a8915fe6","9e5c1297-6eed-40c0-825a-d9bcd86e3193","e534761c-1894-4b61-b20c-658a6fb68157","8761f73f-6cf9-4186-8aaa-0948ed002db1","874a26fd-142f-4173-8c5b-890cd846c74d","0e24a717-b97e-4b77-9c94-b59a5a88b2da","75cf3ade-9a5b-4c4d-bb35-f9799bda7fb2","153c8bf7-fb89-4d89-b263-47e58b1b4774","55c3e0ce-275a-46fa-82ff-e0465f5e8703","24babf58-7156-4841-9a3f-761bdbb8e237","aca261d8-e145-4610-9e20-9eff990f2c12","0642fba6-5dcf-4d62-8e7b-94dbb529d117","25a863e8-dc42-4e8a-a357-e76422ace9b5","9538f37c-456e-4047-81be-6435045608d4","8c0f84c3-9afd-4396-b5f5-9bca2c911c20","be582e5d-b123-41a2-a150-454c39e961c8","c70141d4-ba06-41ea-bcbc-35ea81cb8335","7d1826f4-24c4-4aac-8c2e-eff45df37783","063c97d3-033a-4e9b-98d8-05c8074922cb","00000000-0000-0000-0000-000000000120"};
+const int COLLISION_SOUNDS_SIZE=29;
+
+// NaClAntiSpamQueueEntry
+
+NACLAntiSpamQueueEntry::NACLAntiSpamQueueEntry()
+{
+	entryTime=0;
+	entryAmount=0;
+	blocked=false;
+}
+void NACLAntiSpamQueueEntry::clearEntry()
+{
+	entryTime=0;
+	entryAmount=0;
+	blocked=false;
+}
+U32 NACLAntiSpamQueueEntry::getEntryAmount()
+{
+	return entryAmount;
+}
+U32 NACLAntiSpamQueueEntry::getEntryTime()
+{
+	return entryTime;
+}
+void NACLAntiSpamQueueEntry::updateEntryAmount()
+{
+	entryAmount++;
+}
+void NACLAntiSpamQueueEntry::updateEntryTime()
+{
+	entryTime=time(0);
+}
+void NACLAntiSpamQueueEntry::setBlocked()
+{
+	blocked=true;
+}
+bool NACLAntiSpamQueueEntry::getBlocked()
+{
+	return blocked;
+}
+
+// NaClAntiSpamQueue
+
+NACLAntiSpamQueue::NACLAntiSpamQueue(U32 time, U32 amount)
+{
+	queueTime=time;
+	queueAmount=amount;
+}
+void NACLAntiSpamQueue::setAmount(U32 amount)
+{
+	queueAmount=amount;
+}
+void NACLAntiSpamQueue::setTime(U32 time)
+{
+	queueTime=time;
+}
+void NACLAntiSpamQueue::clearEntries()
+{
+	for(it = entries.begin(); it != entries.end(); it++)
+	{
+		it->second->clearEntry();
+	}
+}
+void NACLAntiSpamQueue::purgeEntries()
+{
+	for(it = entries.begin(); it != entries.end(); it++)
+	{
+		delete it->second;
+	}
+	entries.clear();
+}
+void NACLAntiSpamQueue::blockEntry(LLUUID& source)
+{
+	it=entries.find(source.asString());
+	if(it == entries.end())
+	{
+		entries[source.asString()]=new NACLAntiSpamQueueEntry();
+	}
+	entries[source.asString()]->setBlocked();
+}
+int NACLAntiSpamQueue::checkEntry(LLUUID& name, U32 multiplier)
+{
+	it=entries.find(name.asString());
+	if(it != entries.end())
+	{
+		if(it->second->getBlocked()) return 2;
+		U32 eTime=it->second->getEntryTime();
+		U32 currentTime=time(0);
+		if((currentTime-eTime) <= queueTime)
+		{
+			it->second->updateEntryAmount();
+			U32 eAmount=it->second->getEntryAmount();
+			if(eAmount > (queueAmount*multiplier))
+			{
+				it->second->setBlocked();
+				return 1;
+			}
+			else
+				return 0;
+		}
+		else
+		{
+			it->second->clearEntry();
+			it->second->updateEntryAmount();
+			it->second->updateEntryTime();
+			return 0;
+		}
+	}
+	else
+	{
+		entries[name.asString()]=new NACLAntiSpamQueueEntry();
+		entries[name.asString()]->updateEntryAmount();
+		entries[name.asString()]->updateEntryTime();
+		return 0;
+	}
+}
+
+// NaClAntiSpamRegistry
+
+static const char* QUEUE_NAME[NACLAntiSpamRegistry::QUEUE_MAX] = {
+"Chat",
+"Inventory",
+"Instant Message",
+"Calling Card",
+"Sound",
+"Sound Preload",
+"Script Dialog",
+"Teleport"};
+
+NACLAntiSpamRegistry::NACLAntiSpamRegistry(U32 time, U32 amount)
+{
+	globalTime=time;
+	globalAmount=amount;
+	static LLCachedControl<bool> _NACL_AntiSpamGlobalQueue(gSavedSettings,"_NACL_AntiSpamGlobalQueue");
+	bGlobalQueue=_NACL_AntiSpamGlobalQueue;
+	for(int queue = 0; queue < QUEUE_MAX; ++queue)
+	{
+		queues[queue] = new NACLAntiSpamQueue(time,amount);
+	}
+}
+const char* NACLAntiSpamRegistry::getQueueName(U32 queue_id)
+{
+	if(queue_id >= QUEUE_MAX)
+		return "Unknown";
+	return QUEUE_NAME[queue_id];
+}
+void NACLAntiSpamRegistry::registerQueues(U32 time, U32 amount)
+{
+	globalTime=time;
+	globalAmount=amount;
+	static LLCachedControl<bool> _NACL_AntiSpamGlobalQueue(gSavedSettings,"_NACL_AntiSpamGlobalQueue");
+	bGlobalQueue=_NACL_AntiSpamGlobalQueue;
+	for(int queue = 0; queue < QUEUE_MAX; ++queue)
+	{
+		queues[queue] = new NACLAntiSpamQueue(time,amount);
+	}
+}
+void NACLAntiSpamRegistry::registerQueue(U32 name, U32 time, U32 amount)
+{
+	/*
+	it=queues.find(name);
+	if(it == queues.end())
+	{
+		queues[name]=new NACLAntiSpamQueue(time,amount);
+	}
+	*/
+}
+void NACLAntiSpamRegistry::setRegisteredQueueTime(U32 name, U32 time)
+{
+	if(name >= QUEUE_MAX || queues[name] == 0)
+	{
+		LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(name) << llendl;
+		return;
+	}
+	
+	queues[name]->setTime(time);
+}
+void NACLAntiSpamRegistry::setRegisteredQueueAmount(U32 name, U32 amount)
+{
+	if(name >= QUEUE_MAX || queues[name] == 0)
+	{
+		LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(name) << llendl;
+		return;
+	}
+	
+	queues[name]->setAmount(amount);
+}
+void NACLAntiSpamRegistry::setAllQueueTimes(U32 time)
+{
+	globalTime=time;
+	for(int queue = 0; queue < QUEUE_MAX; ++queue)
+		queues[queue]->setTime(time);
+}
+void NACLAntiSpamRegistry::setAllQueueAmounts(U32 amount)
+{
+	globalAmount=amount;
+	for(int queue = 0; queue < QUEUE_MAX; ++queue)
+	{
+		if(queue == QUEUE_SOUND || queue == QUEUE_SOUND_PRELOAD)
+			queues[queue]->setAmount(amount*5);
+		else
+			queues[queue]->setAmount(amount);
+	}
+}
+void NACLAntiSpamRegistry::clearRegisteredQueue(U32 name)
+{
+	if(name >= QUEUE_MAX || queues[name] == 0)
+	{
+		LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(name) << llendl;
+		return;
+	}
+	
+	queues[name]->clearEntries();
+}
+void NACLAntiSpamRegistry::purgeRegisteredQueue(U32 name)
+{
+	if(name >= QUEUE_MAX || queues[name] == 0)
+	{
+		LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(name) << llendl;
+		return;
+	}
+	
+	queues[name]->purgeEntries();
+}
+void NACLAntiSpamRegistry::blockOnQueue(U32 name, LLUUID& source)
+{
+	if(bGlobalQueue)
+	{
+		NACLAntiSpamRegistry::blockGlobalEntry(source);
+	}
+	else
+	{
+		if(name >= QUEUE_MAX || queues[name] == 0)
+		{
+			LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(name) << llendl;
+			return;
+		}
+		queues[name]->blockEntry(source);
+	}
+}
+void NACLAntiSpamRegistry::blockGlobalEntry(LLUUID& source)
+{
+	it2=globalEntries.find(source.asString());
+	if(it2 == globalEntries.end())
+	{
+		globalEntries[source.asString()]=new NACLAntiSpamQueueEntry();
+	}
+	globalEntries[source.asString()]->setBlocked();
+}
+bool NACLAntiSpamRegistry::checkQueue(U32 name, LLUUID& source, U32 multiplier, bool silent)
+{
+	if(source.isNull()) return false;
+	if(gAgent.getID() == source) return false;
+	LLViewerObject *obj=gObjectList.findObject(source);
+	if(obj)
+		if(obj->permYouOwner()) return false;
+	
+	int result;
+	if(bGlobalQueue)
+	{
+		result=NACLAntiSpamRegistry::checkGlobalEntry(source,multiplier);
+	}
+	else
+	{
+		if(name >= QUEUE_MAX || queues[name] == 0)
+		{
+			LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(name) << llendl;
+			return false;
+		}
+		result=queues[name]->checkEntry(source,multiplier);
+	}
+	if(result==0)
+	{
+		return false;
+	}
+	else if(result==2)
+	{
+		return true;
+	}
+	else
+	{
+		if(!silent)
+		{
+		LLSD args;
+		args["MESSAGE"] = std::string(getQueueName(name))+": Blocked object "+source.asString();
+		LLNotificationsUtil::add("SystemMessageTip", args);
+		}
+		return true;
+	}
+}
+
+// Global queue stoof
+void NACLAntiSpamRegistry::setGlobalQueue(bool value)
+{
+	NACLAntiSpamRegistry::purgeAllQueues();
+	bGlobalQueue=value;
+}
+void NACLAntiSpamRegistry::setGlobalAmount(U32 amount)
+{
+	globalAmount=amount;
+}
+void NACLAntiSpamRegistry::setGlobalTime(U32 time)
+{
+	globalTime=time;
+}
+void NACLAntiSpamRegistry::clearAllQueues()
+{
+	if(bGlobalQueue)
+		NACLAntiSpamRegistry::clearGlobalEntries();
+	else
+	for(int queue = 0; queue < QUEUE_MAX; ++queue)
+	{
+		queues[queue]->clearEntries();
+	}
+}
+void NACLAntiSpamRegistry::purgeAllQueues()
+{
+	if(bGlobalQueue)
+		NACLAntiSpamRegistry::purgeGlobalEntries();
+	else
+		for(int queue = 0; queue < QUEUE_MAX; ++queue)
+		{
+			queues[queue]->purgeEntries();
+		}
+}
+int NACLAntiSpamRegistry::checkGlobalEntry(LLUUID& name, U32 multiplier)
+{
+	it2=globalEntries.find(name.asString());
+	if(it2 != globalEntries.end())
+	{
+		if(it2->second->getBlocked()) return 2;
+		U32 eTime=it2->second->getEntryTime();
+		U32 currentTime=time(0);
+		if((currentTime-eTime) <= globalTime)
+		{
+			it2->second->updateEntryAmount();
+			U32 eAmount=it2->second->getEntryAmount();
+			if(eAmount > (globalAmount*multiplier))
+				return 1;
+			else
+				return 0;
+		}
+		else
+		{
+			it2->second->clearEntry();
+			it2->second->updateEntryAmount();
+			it2->second->updateEntryTime();
+			return 0;
+		}
+	}
+	else
+	{
+		globalEntries[name.asString()]=new NACLAntiSpamQueueEntry();
+		globalEntries[name.asString()]->updateEntryAmount();
+		globalEntries[name.asString()]->updateEntryTime();
+		return 0;
+	}
+}
+void NACLAntiSpamRegistry::clearGlobalEntries()
+{
+	for(it2 = globalEntries.begin(); it2 != globalEntries.end(); it2++)
+	{
+		it2->second->clearEntry();
+	}
+}
+void NACLAntiSpamRegistry::purgeGlobalEntries()
+{
+	for(it2 = globalEntries.begin(); it2 != globalEntries.end(); it2++)
+	{
+		delete it2->second;
+		it2->second = 0;
+	}
+	globalEntries.clear();
+}
\ No newline at end of file
diff --git a/indra/newview/NACLantispam.h b/indra/newview/NACLantispam.h
new file mode 100644
index 000000000..8706aa124
--- /dev/null
+++ b/indra/newview/NACLantispam.h
@@ -0,0 +1,90 @@
+#ifndef NACLANTISPAM_H
+#define NACLANTISPAM_H
+#include <boost/tr1/unordered_map.hpp>
+#include "stdtypes.h"
+#include "lluuid.h"
+class NACLAntiSpamQueueEntry
+{
+	friend class NACLAntiSpamQueue;
+	friend class NACLAntiSpamRegistry;
+protected:
+	NACLAntiSpamQueueEntry();
+	void clearEntry();
+	U32 getEntryAmount();
+	U32 getEntryTime();
+	void updateEntryAmount();
+	void updateEntryTime();
+	bool getBlocked();
+	void setBlocked();
+private:
+	U32 entryAmount;
+	U32 entryTime;
+	bool blocked;
+};
+class NACLAntiSpamQueue
+{
+	friend class NACLAntiSpamRegistry;
+protected:
+	NACLAntiSpamQueue(U32 time, U32 amount);
+	void setAmount(U32 amount);
+	void setTime(U32 time);
+	void clearEntries();
+	void purgeEntries();
+	void blockEntry(LLUUID& source);
+	int checkEntry(LLUUID& source, U32 multiplier);
+private:
+	std::tr1::unordered_map<std::string,NACLAntiSpamQueueEntry*> entries;
+	std::tr1::unordered_map<std::string,NACLAntiSpamQueueEntry*>::iterator it;
+	U32 queueAmount;
+	U32 queueTime;
+};
+class NACLAntiSpamRegistry
+{
+public:
+	NACLAntiSpamRegistry(U32 time=2, U32 amount=10);
+	static void registerQueues(U32 time=2, U32 amount=10);
+	static void registerQueue(U32 name, U32 time, U32 amount);
+	static void setRegisteredQueueTime(U32 name, U32 time);
+	static void setRegisteredQueueAmount(U32 name,U32 amount);
+	static void setAllQueueTimes(U32 amount);
+	static void setAllQueueAmounts(U32 time);
+	static bool checkQueue(U32 name, LLUUID& source, U32 multiplier=1, bool silent=false);
+	static void clearRegisteredQueue(U32 name);
+	static void purgeRegisteredQueue(U32 name);
+	static void clearAllQueues();
+	static void purgeAllQueues();
+	static void setGlobalQueue(bool value);
+	static void setGlobalAmount(U32 amount);
+	static void setGlobalTime(U32 time);
+	static void blockOnQueue(U32 name,LLUUID& owner_id);
+	enum {
+		QUEUE_CHAT,
+		QUEUE_INVENTORY,
+		QUEUE_IM,
+		QUEUE_CALLING_CARD,
+		QUEUE_SOUND,
+		QUEUE_SOUND_PRELOAD,
+		QUEUE_SCRIPT_DIALOG,
+		QUEUE_TELEPORT,
+		QUEUE_MAX
+	};
+private:
+	static const char* getQueueName(U32 queue_id);
+	static NACLAntiSpamQueue* queues[QUEUE_MAX];
+	static std::tr1::unordered_map<std::string,NACLAntiSpamQueueEntry*> globalEntries;
+	static std::tr1::unordered_map<std::string,NACLAntiSpamQueueEntry*>::iterator it2;
+	static U32 globalTime;
+	static U32 globalAmount;
+	static bool bGlobalQueue;
+
+	static int checkGlobalEntry(LLUUID& source, U32 multiplier);
+	static void clearGlobalEntries();
+	static void purgeGlobalEntries();
+	static void blockGlobalEntry(LLUUID& source);
+};
+
+
+extern const std::string COLLISION_SOUNDS[];
+extern const int COLLISION_SOUNDS_SIZE;
+
+#endif //NACLANTISPAM_H
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 5dc30d0c3..f6a4526fe 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -8,7 +8,6 @@
 		<string>settings_sh.xml</string>
 		<string>settings_rlv.xml</string>
 	</array>
-	
 	<key>SianaRenderDeferredInvisiprim</key>
 	<map>
 	  <key>Comment</key>
@@ -895,6 +894,72 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>_NACL_AntiSpamGlobalQueue</key>
+    <map>
+        <key>Comment</key>
+        <string> </string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>Boolean</string>
+        <key>Value</key>
+        <integer>0</integer>
+    </map>
+    <key>_NACL_AntiSpamTime</key>
+    <map>
+        <key>Comment</key>
+        <string> </string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>U32</string>
+        <key>Value</key>
+        <integer>2</integer>
+    </map>
+        <key>_NACL_AntiSpamAmount</key>
+        <map>
+        <key>Comment</key>
+        <string> </string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>U32</string>
+        <key>Value</key>
+        <integer>10</integer>
+    </map>
+        <key>_NACL_AntiSpamSoundMulti</key>
+        <map>
+        <key>Comment</key>
+        <string> </string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>U32</string>
+        <key>Value</key>
+        <integer>4</integer>
+    </map>
+        <key>_NACL_AntiSpamNewlines</key>
+        <map>
+        <key>Comment</key>
+        <string>How many newlines a message can have before it's considered spam.</string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>U32</string>
+        <key>Value</key>
+        <integer>30</integer>
+    </map>
+    <key>_NACL_AntiSpamSoundPreloadMulti</key>
+    <map>
+        <key>Comment</key>
+        <string> </string>
+        <key>Persist</key>
+        <integer>1</integer>
+        <key>Type</key>
+        <string>U32</string>
+        <key>Value</key>
+        <integer>4</integer>
+    </map>
     <!-- Vanilla SL settings that are now optionally Account-Specific -->
     <key>AgentChatColor</key>
     <map>
@@ -15097,3 +15162,4 @@
     </map>
   </map>
 </llsd>
+
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index d0ba0a140..ac99480f0 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -100,6 +100,8 @@
 #include "llattachmentsmgr.h"
 // [/RLVa:KB]
 
+#include "NACLantispam.h" // for NaCl Antispam Registry
+
 using namespace LLVOAvatarDefines;
 
 const BOOL ANIMATE = TRUE;
@@ -665,6 +667,10 @@ void LLAgent::setRegion(LLViewerRegion *regionp)
 				<< " located at " << ip << llendl;
 		if (mRegionp)
 		{
+            // NaCl - Antispam Registry
+            NACLAntiSpamRegistry::purgeAllQueues();
+            // NaCl End
+
 			// We've changed regions, we're now going to change our agent coordinate frame.
 			mAgentOriginGlobal = regionp->getOriginGlobal();
 			LLVector3d agent_offset_global = mRegionp->getOriginGlobal();
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 18aaabef4..856b6d43b 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -233,6 +233,8 @@
 #include "lldxhardware.h"
 #endif
 
+#include "NACLantispam.h"    // for NaCl Antispam Registry
+
 //
 // exported globals
 //
@@ -1057,6 +1059,12 @@ bool idle_startup()
 		LLFile::mkdir(gDirUtilp->getChatLogsDir());
 		LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir());
 
+        // NaCl - Antispam
+        U32 antispam_time = gSavedSettings.getU32("_NACL_AntiSpamTime");
+        U32 antispam_amount = gSavedSettings.getU32("_NACL_AntiSpamAmount");
+        NACLAntiSpamRegistry::registerQueues(antispam_time, antispam_amount);
+        // NaCl End
+
 		//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());		
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 755e97e1c..d884029ab 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -83,6 +83,8 @@
 #include "lldrawpoolbump.h"
 #include "emeraldboobutils.h"
 
+#include "NACLantispam.h"    // for NaCl Antispam Registry
+
 #ifdef TOGGLE_HACKED_GODLIKE_VIEWER
 BOOL 				gHackGodmode = FALSE;
 #endif
@@ -572,6 +574,25 @@ bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
 	return true;
 }
 
+// NaCl - Antispam Registry
+bool handleNaclAntiSpamGlobalQueueChanged(const LLSD& newvalue)
+{
+    NACLAntiSpamRegistry::setGlobalQueue(newvalue.asBoolean());
+    return true;
+}
+bool handleNaclAntiSpamTimeChanged(const LLSD& newvalue)
+{
+    NACLAntiSpamRegistry::setAllQueueTimes(newvalue.asInteger());
+    return true;
+}
+bool handleNaclAntiSpamAmountChanged(const LLSD& newvalue)
+{
+    NACLAntiSpamRegistry::setAllQueueAmounts(newvalue.asInteger());
+    return true;
+}
+// NaCl End
+
+
 bool handleTranslateChatPrefsChanged(const LLSD& newvalue)
 {
 	LLFloaterChat* floaterp = LLFloaterChat::getInstance();
@@ -794,6 +815,12 @@ void settings_setup_listeners()
     // [/Ansariel: Display name support]
 
 	gSavedSettings.getControl("AllowLargeSounds")->getSignal()->connect(boost::bind(&handleAllowLargeSounds, _2));
+
+    // NaCl - Antispam Registry
+    gSavedSettings.getControl("_NACL_AntiSpamGlobalQueue")->getSignal()->connect(boost::bind(&handleNaclAntiSpamGlobalQueueChanged, _2));
+    gSavedSettings.getControl("_NACL_AntiSpamTime")->getSignal()->connect(boost::bind(&handleNaclAntiSpamTimeChanged, _2));
+    gSavedSettings.getControl("_NACL_AntiSpamAmount")->getSignal()->connect(boost::bind(&handleNaclAntiSpamAmountChanged, _2));
+    // NaCl End
 }
 
 void onCommitControlSetting_gSavedSettings(LLUICtrl* ctrl, void* name)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 00ec70cd1..45b33e1cb 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -179,6 +179,13 @@
 #include "llwindebug.h"	// For the invalid message handler
 #endif
 
+// NaCl - Antispam Registry
+#include "NACLantispam.h"
+// NaCl - Newline flood protection
+#include <boost/regex.hpp>
+static const boost::regex NEWLINES("\\n{1}");
+// NaCl End
+
 // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
 #include "llfloateravatarinfo.h"
 extern LLMap< const LLUUID, LLFloaterAvatarInfo* > gAvatarInfoInstances; // Only defined in llfloateravatarinfo.cpp
@@ -1698,6 +1705,11 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 
 void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
 {
+    // NaCl - Antispam Registry
+    if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_INVENTORY,info->mFromID))
+        return;
+    // NaCl End
+	
 	//Until throttling is implmented, busy mode should reject inventory instead of silently
 	//accepting it.  SEE SL-39554
 	if (gAgent.getBusy())
@@ -1987,6 +1999,24 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	//msg->getData("MessageBlock", "Count",		&count);
 	msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_FromAgentName, name);
 	msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_Message,		message);
+    // NaCl - Newline flood protection
+    LLViewerObject* obj=gObjectList.findObject(from_id);
+    if(!from_id.isNull() //Not from nothing.
+    && gAgent.getID() != from_id //Not from self.
+    && !(obj && obj->permYouOwner())) //Not from own object.
+    {
+        static LLCachedControl<U32> SpamNewlines(gSavedSettings,"_NACL_AntiSpamNewlines");
+        boost::sregex_iterator iter(message.begin(), message.end(), NEWLINES);
+        if(std::abs(std::distance(iter, boost::sregex_iterator())) > SpamNewlines)
+        {
+            NACLAntiSpamRegistry::blockOnQueue((U32)NACLAntiSpamRegistry::QUEUE_IM,from_id);
+            LLSD args;
+            args["MESSAGE"] = "Message: Blocked newline flood from "+from_id.asString();
+            LLNotificationsUtil::add("SystemMessageTip", args);
+            return;
+        }
+    }
+    // NaCl End
 	msg->getU32Fast(_PREHASH_MessageBlock, _PREHASH_ParentEstateID, parent_estate_id);
 	msg->getUUIDFast(_PREHASH_MessageBlock, _PREHASH_RegionID, region_id);
 	msg->getVector3Fast(_PREHASH_MessageBlock, _PREHASH_Position, position);
@@ -1994,6 +2024,12 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	binary_bucket_size = msg->getSizeFast(_PREHASH_MessageBlock, _PREHASH_BinaryBucket);
 	EInstantMessage dialog = (EInstantMessage)d;
 
+	// NaCl - Antispam Registry
+    if((dialog != IM_TYPING_START && dialog != IM_TYPING_STOP)
+    && NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_IM,from_id))
+        return;
+    // NaCl End
+
     // make sure that we don't have an empty or all-whitespace name
 	LLStringUtil::trim(name);
 	if (name.empty())
@@ -3196,6 +3232,12 @@ void process_offer_callingcard(LLMessageSystem* msg, void**)
 
 	LLUUID source_id;
 	msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, source_id);
+
+	// NaCl - Antispam Registry
+    if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_CALLING_CARD,source_id))
+        return;
+    // NaCl End
+
 	LLUUID tid;
 	msg->getUUIDFast(_PREHASH_AgentBlock, _PREHASH_TransactionID, tid);
 
@@ -3385,6 +3427,14 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 	msg->getU8("ChatData", "ChatType", type_temp);
 	chat.mChatType = (EChatType)type_temp;
 
+
+    // NaCL - Antispam Registry
+    if((chat.mChatType != CHAT_TYPE_START && chat.mChatType != CHAT_TYPE_STOP)    //Chat type isn't typing
+    &&((owner_id.isNull() && NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_CHAT,from_id))    //Spam from an object?
+    ||(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_CHAT,owner_id))))    //Spam from a resident?
+        return;
+    // NaCl End
+
 	msg->getU8Fast(_PREHASH_ChatData, _PREHASH_Audible, audible_temp);
 	chat.mAudible = (EChatAudible)audible_temp;
 	
@@ -3509,6 +3559,25 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 	if (is_audible)
 	{
 		msg->getStringFast(_PREHASH_ChatData, _PREHASH_Message, mesg);
+
+		// NaCl - Newline flood protection
+        LLViewerObject* obj=gObjectList.findObject(from_id);
+        if(!(from_id.isNull())    //Not from nothing.
+        || !(gAgent.getID() != from_id)    //Not from self.
+        || !(obj && obj->permYouOwner()))    //Not from own object.
+        {
+            static LLCachedControl<U32> SpamNewlines(gSavedSettings,"_NACL_AntiSpamNewlines");
+            boost::sregex_iterator iter(mesg.begin(), mesg.end(), NEWLINES);
+            if(std::abs(std::distance(iter, boost::sregex_iterator())) > SpamNewlines)
+            {
+                NACLAntiSpamRegistry::blockOnQueue((U32)NACLAntiSpamRegistry::QUEUE_CHAT,owner_id);
+                LLSD args;
+                args["MESSAGE"] = "Chat: Blocked newline flood from "+owner_id.asString();
+                LLNotificationsUtil::add("SystemMessageTip", args);
+                return;
+            }
+        }
+        // NaCl End
 		
 		static std::map<LLUUID, bool> sChatObjectAuth;
 
@@ -4840,6 +4909,23 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
 	msg->getUUIDFast(_PREHASH_SoundData, _PREHASH_SoundID, sound_id);
 	msg->getUUIDFast(_PREHASH_SoundData, _PREHASH_OwnerID, owner_id);
 	msg->getUUIDFast(_PREHASH_SoundData, _PREHASH_ObjectID, object_id);
+
+	// NaCl - Antispam Registry
+	/*if(owner_id.isNull())
+	{*/
+	bool bDoSpamCheck=1;
+	std::string sSound=sound_id.asString();
+ 	static LLCachedControl<U32> _NACL_AntiSpamSoundMulti(gSavedSettings,"_NACL_AntiSpamSoundMulti");
+	for(int i=0;i< COLLISION_SOUNDS_SIZE;i++)
+		if(COLLISION_SOUNDS[i] == sSound)
+			bDoSpamCheck=0;
+		if(bDoSpamCheck)
+			if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND,object_id, _NACL_AntiSpamSoundMulti,true)) return;
+	/*}
+	else
+		if(NACLAntiSpamRegistry::checkQueue("Soundspam",owner_id)) return;*/
+	// NaCl End
+
 	msg->getUUIDFast(_PREHASH_SoundData, _PREHASH_ParentID, parent_id);
 	msg->getU64Fast(_PREHASH_SoundData, _PREHASH_Handle, region_handle);
 	msg->getVector3Fast(_PREHASH_SoundData, _PREHASH_Position, pos_local);
@@ -4903,6 +4989,14 @@ void process_preload_sound(LLMessageSystem *msg, void **user_data)
 	msg->getUUIDFast(_PREHASH_DataBlock, _PREHASH_ObjectID, object_id);
 	msg->getUUIDFast(_PREHASH_DataBlock, _PREHASH_OwnerID, owner_id);
 
+    // NaCl - Antispam Registry
+    static LLCachedControl<U32> _NACL_AntiSpamSoundPreloadMulti(gSavedSettings,"_NACL_AntiSpamSoundPreloadMulti");
+    if((owner_id.isNull()
+    && NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND_PRELOAD,object_id,_NACL_AntiSpamSoundPreloadMulti))
+    || NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND_PRELOAD,owner_id,_NACL_AntiSpamSoundPreloadMulti))
+        return;
+    // NaCl End
+
 	LLViewerObject *objectp = gObjectList.findObject(object_id);
 	if (!objectp) return;
 
@@ -4938,6 +5032,14 @@ void process_attached_sound(LLMessageSystem *msg, void **user_data)
 	msg->getUUIDFast(_PREHASH_DataBlock, _PREHASH_SoundID, sound_id);
 	msg->getUUIDFast(_PREHASH_DataBlock, _PREHASH_ObjectID, object_id);
 	msg->getUUIDFast(_PREHASH_DataBlock, _PREHASH_OwnerID, owner_id);
+
+    // NaCl - Antispam Registry
+    if(/*owner_id.isNull()
+    &&*/ NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND,object_id))
+    /*|| (NACLAntiSpamRegistry::checkQueue("Soundspam",owner_id))*/
+        return;
+    // NaCl End
+
 	msg->getF32Fast(_PREHASH_DataBlock, _PREHASH_Gain, gain);
 	msg->getU8Fast(_PREHASH_DataBlock, _PREHASH_Flags, flags);
 
@@ -6030,6 +6132,12 @@ void process_economy_data(LLMessageSystem *msg, void** /*user_data*/)
 
 void notify_cautioned_script_question(const LLSD& notification, const LLSD& response, S32 orig_questions, BOOL granted)
 {
+
+    // NaCl - Antispam Registry
+    if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG, notification["payload"]["task_id"].asUUID()))
+        return;
+    // NaCl End
+
 	// only continue if at least some permissions were requested
 	if (orig_questions)
 	{
@@ -6210,6 +6318,14 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
 	msg->getUUIDFast(_PREHASH_Data, _PREHASH_TaskID, taskid );
 	// itemid -> script asset key of script requesting permissions
 	msg->getUUIDFast(_PREHASH_Data, _PREHASH_ItemID, itemid );
+
+    // NaCl - Antispam Registry
+    if((taskid.isNull()
+    &&  NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,itemid))
+    || NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,taskid))
+        return;
+    // NaCl End
+
 	msg->getStringFast(_PREHASH_Data, _PREHASH_ObjectName, object_name);
 	msg->getStringFast(_PREHASH_Data, _PREHASH_ObjectOwner, owner_name);
 	msg->getS32Fast(_PREHASH_Data, _PREHASH_Questions, questions );
@@ -6874,11 +6990,22 @@ void process_script_dialog(LLMessageSystem* msg, void**)
 	LLUUID object_id;
 	msg->getUUID("Data", "ObjectID", object_id);
 
-//	For compability with OS grids first check for presence of extended packet before fetching data.
+	// NaCl - Antispam Registry
+    if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,object_id))
+        return;
+    // NaCl End
+
+	//	For compability with OS grids first check for presence of extended packet before fetching data.
     LLUUID owner_id;
 	if (gMessageSystem->getNumberOfBlocks("OwnerData") > 0)
 	{
     msg->getUUID("OwnerData", "OwnerID", owner_id);
+
+        // NaCl - Antispam Registry
+        if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,owner_id))
+            return;
+        // NaCl End
+
 	}
 
 	if (LLMuteList::getInstance()->isMuted(object_id) || LLMuteList::getInstance()->isMuted(owner_id))
@@ -7048,6 +7175,14 @@ void process_load_url(LLMessageSystem* msg, void**)
 	msg->getString("Data", "ObjectName", 256, object_name);
 	msg->getUUID(  "Data", "ObjectID", object_id);
 	msg->getUUID(  "Data", "OwnerID", owner_id);
+
+    // NaCl - Antispam Registry
+    if((owner_id.isNull()
+    &&  NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,object_id))
+    || NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,owner_id))
+        return;
+    // NaCl End
+
 	msg->getBOOL(  "Data", "OwnerIsGroup", owner_is_group);
 	msg->getString("Data", "Message", 256, message);
 	msg->getString("Data", "URL", 256, url);

From 8bfdc98ef4b21e86dcd639012a0f4ec485e7c190 Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Thu, 19 Jul 2012 17:44:13 -0400
Subject: [PATCH 059/199] Improvements!

Fixed Boost library to not throw warnings
Changed PNG cmake slightly
Updated 32lib package for correct locations
Cleaned up flags a bit for linux64
---
 indra/cmake/00-Common.cmake  | 10 +++++-----
 indra/cmake/PNG.cmake        |  2 +-
 indra/llimage/llpngwrapper.h |  2 +-
 install.xml                  |  8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 9006b2247..5c0d433be 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -190,10 +190,10 @@ if (LINUX)
     endif (NOT STANDALONE)
     if (${ARCH} STREQUAL "x86_64")
       add_definitions(-DLINUX64=1 -pipe)
-      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers")
-      set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers")
-      set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers")
-      set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -fomit-frame-pointer -mmmx -msse -mfpmath=sse -msse2 -ffast-math -ftree-vectorize -fweb -fexpensive-optimizations -frename-registers")
+      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fomit-frame-pointer -ffast-math -funroll-loops")
+      set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fomit-frame-pointer -ffast-math -funroll-loops")
+      set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -ffast-math")
+      set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ffast-math")
     else (${ARCH} STREQUAL "x86_64")
       if (NOT STANDALONE)
         set(MARCH_FLAG " -march=pentium4")
@@ -327,7 +327,7 @@ else (STANDALONE)
       glib-2.0
       gstreamer-0.10
       gtk-2.0
-      llfreetype2
+      freetype2
       pango-1.0
       )
 endif (STANDALONE)
diff --git a/indra/cmake/PNG.cmake b/indra/cmake/PNG.cmake
index 269b54de7..011b87f64 100644
--- a/indra/cmake/PNG.cmake
+++ b/indra/cmake/PNG.cmake
@@ -15,5 +15,5 @@ else (STANDALONE)
   else(LINUX)
     set(PNG_LIBRARIES png15)
   endif()
-  set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/libpng15)
+  set(PNG_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/)
 endif (STANDALONE)
diff --git a/indra/llimage/llpngwrapper.h b/indra/llimage/llpngwrapper.h
index a4c3d80b5..7def0c713 100644
--- a/indra/llimage/llpngwrapper.h
+++ b/indra/llimage/llpngwrapper.h
@@ -32,7 +32,7 @@
 #ifndef LL_LLPNGWRAPPER_H
 #define LL_LLPNGWRAPPER_H
 
-#include "png.h"
+#include "libpng15/png.h"
 #include "llimage.h"
 
 class LLPngWrapper
diff --git a/install.xml b/install.xml
index 405dd7233..dd94fa71c 100644
--- a/install.xml
+++ b/install.xml
@@ -20,9 +20,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>cbaafc55fb8b14283541791e82f13462</string>
+            <string>5add23ded1a53f57044132cb1aed4950</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/linux64-32bitcompatibilitylibs-20100903.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/linux64-32bitcompatibilitylibs-20100903_1.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -188,9 +188,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>a7c23f5395f79033dbb09b201f16a4ce</string>
+            <string>ac6e5b52d5cf13443607c09d8c62b6c5</string>
             <key>url</key>
-            <uri>https://github.com/downloads/LightDrake/Public-Libraries/boost-1.48.0-linux-x86_64-20120514.tar.bz2</uri>
+            <uri>https://github.com/downloads/LightDrake/Public-Libraries/boost-1.48.0-linux-x86_64-20120719.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>

From f3f8bee83b275f6a1fbb179c0e97c9ae2cdfb9a8 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Thu, 19 Jul 2012 23:40:07 -0400
Subject: [PATCH 060/199] Remove old spam stuffs, Clean up new spam stuffs to
 compile, UI new spam stuffs.

---
 indra/newview/NACLantispam.cpp                |  18 +-
 indra/newview/NACLantispam.h                  |   3 +
 indra/newview/app_settings/settings.xml       |  11 ++
 indra/newview/app_settings/settings_sh.xml    |  88 ----------
 indra/newview/ascentprefschat.cpp             |  43 +++--
 indra/newview/ascentprefschat.h               |  11 +-
 indra/newview/llstartup.cpp                   |   4 +
 indra/newview/llviewercontrol.cpp             |  25 ---
 indra/newview/llviewermessage.cpp             | 166 +++++++-----------
 .../en-us/panel_preferences_ascent_chat.xml   |  22 +--
 10 files changed, 138 insertions(+), 253 deletions(-)

diff --git a/indra/newview/NACLantispam.cpp b/indra/newview/NACLantispam.cpp
index 5e6be5d9d..95aad581b 100644
--- a/indra/newview/NACLantispam.cpp
+++ b/indra/newview/NACLantispam.cpp
@@ -387,4 +387,20 @@ void NACLAntiSpamRegistry::purgeGlobalEntries()
 		it2->second = 0;
 	}
 	globalEntries.clear();
-}
\ No newline at end of file
+}
+bool NACLAntiSpamRegistry::handleNaclAntiSpamGlobalQueueChanged(const LLSD& newvalue)
+{
+    setGlobalQueue(newvalue.asBoolean());
+    return true;
+}
+bool NACLAntiSpamRegistry::handleNaclAntiSpamTimeChanged(const LLSD& newvalue)
+{
+    setAllQueueTimes(newvalue.asInteger());
+    return true;
+}
+bool NACLAntiSpamRegistry::handleNaclAntiSpamAmountChanged(const LLSD& newvalue)
+{
+    setAllQueueAmounts(newvalue.asInteger());
+    return true;
+}
+
diff --git a/indra/newview/NACLantispam.h b/indra/newview/NACLantispam.h
index 8706aa124..2f65fc423 100644
--- a/indra/newview/NACLantispam.h
+++ b/indra/newview/NACLantispam.h
@@ -49,6 +49,9 @@ public:
 	static void setAllQueueTimes(U32 amount);
 	static void setAllQueueAmounts(U32 time);
 	static bool checkQueue(U32 name, LLUUID& source, U32 multiplier=1, bool silent=false);
+	static bool handleNaclAntiSpamGlobalQueueChanged(const LLSD& newvalue);
+	static bool handleNaclAntiSpamTimeChanged(const LLSD& newvalue);
+	static bool handleNaclAntiSpamAmountChanged(const LLSD& newvalue);
 	static void clearRegisteredQueue(U32 name);
 	static void purgeRegisteredQueue(U32 name);
 	static void clearAllQueues();
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index f6a4526fe..45121a899 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -893,6 +893,17 @@
       <string>Boolean</string>
       <key>Value</key>
       <integer>1</integer>
+    </map>
+	<key>_NACL_Antispam</key>
+    <map>
+      <key>Comment</key>
+      <string>When true, all dialogs will be blocked, resets on restart.</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
     </map>
     <key>_NACL_AntiSpamGlobalQueue</key>
     <map>
diff --git a/indra/newview/app_settings/settings_sh.xml b/indra/newview/app_settings/settings_sh.xml
index feae4cb77..81659467c 100644
--- a/indra/newview/app_settings/settings_sh.xml
+++ b/indra/newview/app_settings/settings_sh.xml
@@ -141,94 +141,6 @@
 			<real>1.0</real>
 		</map>
 
-    <key>SGBlockGeneralSpam</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable automatic general spam blocking</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>SGBlockCardSpam</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable automatic calling card spam blocking</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>SGBlockChatSpam</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable automatic chat spam blocking</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
-    <key>SGBlockDialogSpam</key>
-    <map>
-      <key>Comment</key>
-      <string>Enable automatic dialog spam blocking</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>1</integer>
-    </map>
-    <key>SGSpamTime</key>
-    <map>
-      <key>Comment</key>
-      <string>Time of Evalulating spam. (Default: 1.000)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>1.0</real>
-    </map>
-    <key>SGSpamCount</key>
-    <map>
-      <key>Comment</key>
-      <string>Number of items spammed per time period in SGSpamTime. (Default: 4)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>U32</string>
-      <key>Value</key>
-      <real>4</real>
-    </map>
-    <key>SGChatSpamTime</key>
-    <map>
-      <key>Comment</key>
-      <string>Time of Evalulating spam. (Default: 1.000)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>1.0</real>
-    </map>
-    <key>SGChatSpamCount</key>
-    <map>
-      <key>Comment</key>
-      <string>Number of items spammed per time set in SGSpamTime. (Default: 10)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>U32</string>
-      <key>Value</key>
-      <real>10.0</real>
-    </map>
     <key>ShyotlUseLegacyTextureBatching</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/ascentprefschat.cpp b/indra/newview/ascentprefschat.cpp
index 0410ce2aa..29e5d3ff0 100644
--- a/indra/newview/ascentprefschat.cpp
+++ b/indra/newview/ascentprefschat.cpp
@@ -40,6 +40,7 @@
 #include "llradiogroup.h"
 #include "lluictrlfactory.h"
 #include "llviewercontrol.h"
+#include "NACLantispam.h"
 #include "lgghunspell_wrapper.h"
 
 #include "llstartup.h"
@@ -78,7 +79,8 @@ LLPrefsAscentChat::LLPrefsAscentChat()
 		addChild(mObjectDropTarget);
 	}
 
-	if (LLStartUp::getStartupState() == STATE_STARTED)
+	bool started = LLStartUp::getStartupState() == STATE_STARTED;
+	if (started)
 	{
 		LLUUID itemid = (LLUUID)gSavedPerAccountSettings.getString("AscentInstantMessageResponseItemData");
 		LLViewerInventoryItem* item = gInventory.getItem(itemid);
@@ -91,6 +93,9 @@ LLPrefsAscentChat::LLPrefsAscentChat()
 
     childSetCommitCallback("im_response", onCommitAutoResponse, this);
 
+	childSetEnabled("reset_antispam", started);
+	childSetCommitCallback("reset_antispam", onCommitResetAS, this);
+
     childSetCommitCallback("KeywordsOn", onCommitKeywords, this);
     childSetCommitCallback("KeywordsList", onCommitKeywords, this);
     childSetCommitCallback("KeywordsSound", onCommitKeywords, this);
@@ -218,7 +223,7 @@ void LLPrefsAscentChat::onCommitTimeDate(LLUICtrl* ctrl, void* userdata)
 //static
 void LLPrefsAscentChat::onCommitAutoResponse(LLUICtrl* ctrl, void* user_data)
 {
-    LLPrefsAscentChat* self = (LLPrefsAscentChat*)user_data;	
+    LLPrefsAscentChat* self = (LLPrefsAscentChat*)user_data;
 
     gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseAnyone",  self->childGetValue("AscentInstantMessageResponseAnyone"));
     gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseFriends", self->childGetValue("AscentInstantMessageResponseFriends"));
@@ -237,6 +242,12 @@ void LLPrefsAscentChat::SinguIMResponseItemDrop(LLViewerInventoryItem* item)
 	sInst->childSetValue("im_give_disp_rect_txt","Currently set to: "+item->getName());
 }
 
+//static
+void LLPrefsAscentChat::onCommitResetAS(LLUICtrl*, void*)
+{
+	NACLAntiSpamRegistry::purgeAllQueues();
+}
+
 //static
 void LLPrefsAscentChat::onCommitKeywords(LLUICtrl* ctrl, void* user_data)
 {
@@ -316,13 +327,13 @@ void LLPrefsAscentChat::refreshValues()
     mIMResponseText                 = gSavedPerAccountSettings.getString("AscentInstantMessageResponse");
 
     //Spam --------------------------------------------------------------------------------
-    mBlockChatSpam                  = gSavedSettings.getBOOL("SGBlockChatSpam");
-    mChatSpamCount                  = gSavedSettings.getU32("SGChatSpamCount");
-    mChatSpamTime                   = gSavedSettings.getF32("SGChatSpamTime");
-    mBlockDialogSpam                = gSavedSettings.getBOOL("SGBlockDialogSpam");
-    mBlockCardSpam                  = gSavedSettings.getBOOL("SGBlockCardSpam");
-    mSpamCount                      = gSavedSettings.getU32("SGSpamCount");
-    mSpamTime                       = gSavedSettings.getF32("SGSpamTime");
+    mGlobalQueue                    = gSavedSettings.getBOOL("_NACL_AntiSpamGlobalQueue");
+    mChatSpamCount                  = gSavedSettings.getU32("_NACL_AntiSpamAmount");
+    mChatSpamTime                   = gSavedSettings.getU32("_NACL_AntiSpamTime");
+    mBlockDialogSpam                = gSavedSettings.getBOOL("_NACL_Antispam");
+    mSoundMulti                     = gSavedSettings.getU32("_NACL_AntiSpamSoundMulti");
+    mNewLines                       = gSavedSettings.getU32("_NACL_AntiSpamNewlines");
+    mPreloadMulti                   = gSavedSettings.getU32("_NACL_AntiSpamSoundPreloadMulti");
 
     //Text Options ------------------------------------------------------------------------
     mSpellDisplay                   = gSavedSettings.getBOOL("SpellDisplay");
@@ -503,13 +514,13 @@ void LLPrefsAscentChat::cancel()
     gSavedPerAccountSettings.setString("AscentInstantMessageResponse",      mIMResponseText);
 
     //Spam --------------------------------------------------------------------------------
-    gSavedSettings.setBOOL("SGBlockChatSpam",   mBlockChatSpam);
-    gSavedSettings.setU32("SGChatSpamCount",    mChatSpamCount);
-    gSavedSettings.setF32("SGChatSpamTime",     mChatSpamTime);
-    gSavedSettings.setBOOL("SGBlockDialogSpam", mBlockDialogSpam);
-    gSavedSettings.setBOOL("SGBlockCardSpam",   mBlockCardSpam);
-    gSavedSettings.setU32("SGSpamCount",        mSpamCount);
-    gSavedSettings.setF32("SGSpamTime",         mSpamTime);
+    gSavedSettings.setBOOL("_NACL_AntiSpamGlobalQueue",      mGlobalQueue);
+    gSavedSettings.setU32("_NACL_AntiSpamAmount",            mChatSpamCount);
+    gSavedSettings.setU32("_NACL_AntiSpamTime",              mChatSpamTime);
+    gSavedSettings.setBOOL("_NACL_Antispam",                 mBlockDialogSpam);
+    gSavedSettings.setU32("_NACL_AntiSpamSoundMulti",        mSoundMulti);
+    gSavedSettings.setU32("_NACL_AntiSpamNewlines",          mNewLines);
+    gSavedSettings.setU32("_NACL_AntiSpamSoundPreloadMulti", mPreloadMulti);
 
     //Text Options ------------------------------------------------------------------------
     gSavedSettings.setBOOL("SpellDisplay",                  mSpellDisplay);
diff --git a/indra/newview/ascentprefschat.h b/indra/newview/ascentprefschat.h
index 15c7a44be..d83b5b2d9 100644
--- a/indra/newview/ascentprefschat.h
+++ b/indra/newview/ascentprefschat.h
@@ -56,6 +56,7 @@ protected:
     static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata);
     static void onCommitTimeDate(LLUICtrl* ctrl, void *userdata);
     static void onCommitAutoResponse(LLUICtrl* ctrl, void* user_data);
+	static void onCommitResetAS(LLUICtrl*,void*);
     static void onCommitKeywords(LLUICtrl* ctrl, void* user_data);
 
     //Chat/IM -----------------------------------------------------------------------------
@@ -84,13 +85,13 @@ protected:
     std::string mIMResponseText;
 
     //Spam --------------------------------------------------------------------------------
-    BOOL mBlockChatSpam;
+    BOOL mGlobalQueue;
     U32  mChatSpamCount;
-    F32  mChatSpamTime;
+    U32  mChatSpamTime;
     BOOL mBlockDialogSpam;
-    BOOL mBlockCardSpam;
-    U32  mSpamCount;
-    F32  mSpamTime;
+    BOOL mSoundMulti;
+    U32  mNewLines;
+    U32  mPreloadMulti;
 
     //Text Options ------------------------------------------------------------------------
     BOOL mSpellDisplay;
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 856b6d43b..26773586c 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1063,6 +1063,9 @@ bool idle_startup()
         U32 antispam_time = gSavedSettings.getU32("_NACL_AntiSpamTime");
         U32 antispam_amount = gSavedSettings.getU32("_NACL_AntiSpamAmount");
         NACLAntiSpamRegistry::registerQueues(antispam_time, antispam_amount);
+		gSavedSettings.getControl("_NACL_AntiSpamGlobalQueue")->getSignal()->connect(boost::bind(&NACLAntiSpamRegistry::handleNaclAntiSpamGlobalQueueChanged, _2));
+		gSavedSettings.getControl("_NACL_AntiSpamTime")->getSignal()->connect(boost::bind(&NACLAntiSpamRegistry::handleNaclAntiSpamTimeChanged, _2));
+		gSavedSettings.getControl("_NACL_AntiSpamAmount")->getSignal()->connect(boost::bind(&NACLAntiSpamRegistry::handleNaclAntiSpamAmountChanged, _2));
         // NaCl End
 
 		//good as place as any to create user windlight directories
@@ -4362,3 +4365,4 @@ bool process_login_success_response(std::string& password)
 	}
 	return success;
 }
+
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index d884029ab..b6c442c6e 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -574,25 +574,6 @@ bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
 	return true;
 }
 
-// NaCl - Antispam Registry
-bool handleNaclAntiSpamGlobalQueueChanged(const LLSD& newvalue)
-{
-    NACLAntiSpamRegistry::setGlobalQueue(newvalue.asBoolean());
-    return true;
-}
-bool handleNaclAntiSpamTimeChanged(const LLSD& newvalue)
-{
-    NACLAntiSpamRegistry::setAllQueueTimes(newvalue.asInteger());
-    return true;
-}
-bool handleNaclAntiSpamAmountChanged(const LLSD& newvalue)
-{
-    NACLAntiSpamRegistry::setAllQueueAmounts(newvalue.asInteger());
-    return true;
-}
-// NaCl End
-
-
 bool handleTranslateChatPrefsChanged(const LLSD& newvalue)
 {
 	LLFloaterChat* floaterp = LLFloaterChat::getInstance();
@@ -815,12 +796,6 @@ void settings_setup_listeners()
     // [/Ansariel: Display name support]
 
 	gSavedSettings.getControl("AllowLargeSounds")->getSignal()->connect(boost::bind(&handleAllowLargeSounds, _2));
-
-    // NaCl - Antispam Registry
-    gSavedSettings.getControl("_NACL_AntiSpamGlobalQueue")->getSignal()->connect(boost::bind(&handleNaclAntiSpamGlobalQueueChanged, _2));
-    gSavedSettings.getControl("_NACL_AntiSpamTime")->getSignal()->connect(boost::bind(&handleNaclAntiSpamTimeChanged, _2));
-    gSavedSettings.getControl("_NACL_AntiSpamAmount")->getSignal()->connect(boost::bind(&handleNaclAntiSpamAmountChanged, _2));
-    // NaCl End
 }
 
 void onCommitControlSetting_gSavedSettings(LLUICtrl* ctrl, void* name)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 45b33e1cb..ca174d71a 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -246,75 +246,6 @@ const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] =
 	FALSE	// ControlYourCamera
 };
 
-template <typename T>
-class SH_SpamHandler
-{
-public:
-	SH_SpamHandler(const char *pToggleCtrl, const char *pDurCtrl, const char *pFreqCtrl) :
-		mDuration(pDurCtrl, 1.f),
-		mFrequency(pFreqCtrl, 5),
-		mEnabled(false)
-	{
-		gSavedSettings.getControl(pToggleCtrl)->getSignal()->connect(boost::bind(&SH_SpamHandler::CtrlToggle, this, _2));
-		CtrlToggle(gSavedSettings.getBOOL(pToggleCtrl));
-	}
-	bool CtrlToggle(const LLSD& newvalue)
-	{
-		bool on = newvalue.asBoolean();
-		if(on == mEnabled)
-			return true;
-		mEnabled = on;
-		mTimer.stop();
-		mActiveList.clear();
-		mBlockedList.clear();
-		return true;
-	}
-	bool isBlocked(const T &owner, const LLUUID &source_id, const char *pNotification, LLSD args=LLSD())
-	{
-		if(!mEnabled || isAgent(owner))
-			return false;
-		if(mBlockedList.find(owner) != mBlockedList.end())
-			return true;
-		if(mTimer.getStarted() && mTimer.getElapsedTimeF32() < mDuration)
-		{
-			typename std::map<const T,U32>::iterator it = mActiveList.insert(std::pair<const T, U32>(owner,0)).first;
-			if(++(it->second)>=mFrequency)
-			{
-				mBlockedList.insert(owner);
-				if(pNotification)
-				{
-					args["OWNER"] = owner;
-					args["SOURCE"] = source_id;
-					LLNotifications::getInstance()->add(pNotification,args);
-				}
-				return true;
-			}
-		}
-		else
-		{
-			mActiveList.clear();
-			mTimer.start();
-		}
-		return false;
-	}
-private:
-	//Owner is either a key, or a name. Do not look up perms since object may be unknown.
-	static bool isAgent(const T &owner);
-	bool mEnabled;
-	LLFrameTimer mTimer;
-	const LLCachedControl<F32> mDuration;
-	const LLCachedControl<U32> mFrequency;
-	std::map<const T,U32> mActiveList;
-	std::set<T> mBlockedList;
-};
-template<> bool SH_SpamHandler<LLUUID>::isAgent(const LLUUID &owner) { return gAgent.getID() == owner; }
-template<> bool SH_SpamHandler<std::string>::isAgent(const std::string &owner)
-{
-	std::string str;
-	gAgent.getName(str);
-	return str == owner;
-}
-
 bool friendship_offer_callback(const LLSD& notification, const LLSD& response)
 {
 	S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
@@ -1705,11 +1636,6 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 
 void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
 {
-    // NaCl - Antispam Registry
-    if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_INVENTORY,info->mFromID))
-        return;
-    // NaCl End
-	
 	//Until throttling is implmented, busy mode should reject inventory instead of silently
 	//accepting it.  SEE SL-39554
 	if (gAgent.getBusy())
@@ -1717,7 +1643,12 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
 		info->forceResponse(IOR_BUSY);
 		return;
 	}
-	
+
+	// NaCl - Antispam Registry
+	static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
+	if(antispam || NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_INVENTORY,info->mFromID))
+		return;
+	// NaCl End
 	//If muted, don't even go through the messaging stuff.  Just curtail the offer here.
 	if (LLMuteList::getInstance()->isMuted(info->mFromID, info->mFromName))
 	{
@@ -1971,6 +1902,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	{
 		return;
 	}
+	static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
 	LLUUID from_id;
 	BOOL from_group;
 	LLUUID to_id;
@@ -2059,15 +1991,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	{
 		LLSD args;
 		args["NAME"] = name;
-		static SH_SpamHandler<LLUUID> avatar_spam_check("SGBlockGeneralSpam","SGSpamTime","SGSpamCount");
-		static SH_SpamHandler<LLUUID> object_spam_check("SGBlockGeneralSpam","SGSpamTime","SGSpamCount");
-		if(d==IM_FROM_TASK||d==IM_GOTO_URL||d==IM_FROM_TASK_AS_ALERT||d==IM_TASK_INVENTORY_OFFERED||d==IM_TASK_INVENTORY_ACCEPTED||d==IM_TASK_INVENTORY_DECLINED)
-		{
-			if(object_spam_check.isBlocked(from_id,session_id,"BlockedGeneralObjects",args))
-				return;
-		}
-		else if(avatar_spam_check.isBlocked(from_id,from_id,"BlockedGeneralAvatar",args))
-			return;
 	}
 
 	LLViewerObject *source = gObjectList.findObject(session_id); //Session ID is probably the wrong thing.
@@ -2501,6 +2424,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	case IM_GROUP_NOTICE:
 	case IM_GROUP_NOTICE_REQUESTED:
 		{
+			// NaCl - Antispam
+			if(antispam)
+				return;
+			// NaCl End
 			LL_INFOS("Messaging") << "Received IM_GROUP_NOTICE message." << LL_ENDL;
 			// Read the binary bucket for more information.
 			struct notice_bucket_header_t
@@ -2596,6 +2523,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		break;
 	case IM_GROUP_INVITATION:
 		{
+			// NaCl - Antispam
+			if(antispam)
+				return;
+			// NaCl End
 			//if (!is_linden && (is_busy || is_muted))
 			if ((is_busy || is_muted))
 			{
@@ -2640,6 +2571,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	case IM_TASK_INVENTORY_OFFERED:
 		// Someone has offered us some inventory.
 		{
+			// NaCl - Antispam
+			if(antispam)
+				return;
+			// NaCl End
 			LLOfferInfo* info = new LLOfferInfo;
 
 			if (IM_INVENTORY_OFFERED == dialog)
@@ -2892,6 +2827,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		}
 		break;
 	case IM_FROM_TASK_AS_ALERT:
+			// NaCl - Antispam
+			if(antispam)
+				return;
+			// NaCl End
 		if (is_busy && !is_owned_by_me)
 		{
 			return;
@@ -2929,6 +2868,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		
 	case IM_LURE_USER:
 		{
+			if(antispam)	return; //NaCl Antispam
 // [RLVa:KB] - Checked: 2010-12-11 (RLVa-1.2.2c) | Added: RLVa-1.2.2c
 			// If the lure sender is a specific @accepttp exception they will override muted and busy status
 			bool fRlvSummon = (rlv_handler_t::isEnabled()) && (gRlvHandler.isException(RLV_BHVR_ACCEPTTP, from_id));
@@ -3069,6 +3009,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
 	case IM_GOTO_URL:
 		{
+			// NaCl - Antispam
+			if(antispam)
+				return;
+			// NaCl End
 			LLSD args;
 			// n.b. this is for URLs sent by the system, not for
 			// URLs sent by scripts (i.e. llLoadURL)
@@ -3093,6 +3037,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
 	case IM_FRIENDSHIP_OFFERED:
 		{
+			// NaCl - Antispam
+			if(antispam)
+				return;
+			// NaCl End
 			LLSD payload;
 			payload["from_id"] = from_id;
 			payload["session_id"] = session_id;;
@@ -3227,6 +3175,11 @@ static LLNotificationFunctorRegistration callingcard_offer_cb_reg("OfferCallingC
 
 void process_offer_callingcard(LLMessageSystem* msg, void**)
 {
+	// NaCl - Antispam
+	static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
+	if(antispam)
+		return;
+	// NaCl End
 	// someone has offered to form a friendship
 	LL_DEBUGS("Messaging") << "callingcard offer" << LL_ENDL;
 
@@ -3270,9 +3223,6 @@ void process_offer_callingcard(LLMessageSystem* msg, void**)
 		}
 		else
 		{
-			static SH_SpamHandler<LLUUID> spam_check("SGBlockCardSpam","SHSpamTime","SGSpamCount");
-			if(spam_check.isBlocked(source_id,source_id,"BlockedCards",args))
-				return;
 			LLNotificationsUtil::add("OfferCallingCard", args, payload);
 		}
 	}
@@ -3482,12 +3432,6 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 	{
 		LLSD args;
 		args["NAME"] = from_name;
-		static SH_SpamHandler<LLUUID> avatar_spam_check("SGBlockChatSpam","SGChatSpamTime","SGChatSpamCount");
-		static SH_SpamHandler<LLUUID> object_spam_check("SGBlockChatSpam","SGChatSpamTime","SGChatSpamCount");
-		if(	(chatter->isAvatar()	&&	avatar_spam_check.isBlocked(from_id,from_id,"BlockedChatterAvatar",args)) ||
-			(!chatter->isAvatar()	&&	object_spam_check.isBlocked(owner_id,from_id,"BlockedChatterObjects",args)) )
-			return;
-
 		chat.mPosAgent = chatter->getPositionAgent();
 		
 		// Make swirly things only for talking objects. (not script debug messages, though)
@@ -6132,12 +6076,10 @@ void process_economy_data(LLMessageSystem *msg, void** /*user_data*/)
 
 void notify_cautioned_script_question(const LLSD& notification, const LLSD& response, S32 orig_questions, BOOL granted)
 {
-
-    // NaCl - Antispam Registry
-    if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG, notification["payload"]["task_id"].asUUID()))
-        return;
-    // NaCl End
-
+	// NaCl - Antispam Registry
+	LLUUID task_id = notification["payload"]["task_id"].asUUID();
+	if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,task_id)) return;
+	// NaCl End
 	// only continue if at least some permissions were requested
 	if (orig_questions)
 	{
@@ -6304,7 +6246,12 @@ static LLNotificationFunctorRegistration script_question_cb_reg_2("ScriptQuestio
 
 void process_script_question(LLMessageSystem *msg, void **user_data)
 {
-	// *TODO:translate owner name -> [FIRST] [LAST]
+	// NaCl - Antispam
+	static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
+	if(antispam)
+		return;
+	// NaCl End
+	// *TODO: Translate owner name -> [FIRST] [LAST]
 
 	LLHost sender = msg->getSender();
 
@@ -6984,6 +6931,11 @@ static LLNotificationFunctorRegistration callback_script_dialog_reg_2("ScriptDia
 
 void process_script_dialog(LLMessageSystem* msg, void**)
 {
+	// NaCl - Antispam
+	static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
+	if(antispam)
+		return;
+	// NaCl End
 	S32 i;
 	LLSD payload;
 
@@ -7078,10 +7030,6 @@ void process_script_dialog(LLMessageSystem* msg, void**)
 	{
 		args["NAME"] = LLCacheName::buildFullName(first_name, last_name);
 
-		static SH_SpamHandler<std::string> spam_check("SGBlockDialogSpam","SGSpamTime","SGSpamCount");
-		if(spam_check.isBlocked(first_name + " " + last_name,object_id,"BlockedDialogs",args))
-			return;
-
 		if (is_text_box)
 		{
 			args["DEFAULT"] = default_text;
@@ -7165,6 +7113,11 @@ void callback_load_url_name(const LLUUID& id, const std::string& full_name, bool
 
 void process_load_url(LLMessageSystem* msg, void**)
 {
+	// NaCl - Antispam
+	static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
+	if(antispam)
+		return;
+	// NaCl End
 	LLUUID object_id;
 	LLUUID owner_id;
 	BOOL owner_is_group;
@@ -7255,6 +7208,11 @@ void process_initiate_download(LLMessageSystem* msg, void**)
 
 void process_script_teleport_request(LLMessageSystem* msg, void**)
 {
+	// NaCl - Antispam
+	static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
+	if(antispam)
+		return;
+	// NaCl End
 	if (!gSavedSettings.getBOOL("ScriptsCanShowUI")) return;
 	
 	std::string object_name;
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
index 62d8c0cd3..0d5167818 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
@@ -68,20 +68,14 @@
     </panel>
 
     <panel border="true" left="1" bottom="-408" height="408" width="500" label="Spam" name="Spam">
-      <check_box left="10" bottom_delta="-25" follows="top" font="SansSerifSmall"
-        label="Enable chat spam blocking" tool_tip="Enable automatic chat spam blocking" name="AscChatSpamBlock" control_name="SGBlockChatSpam"/>
-      <spinner left_delta="20" height="18" width="120" follows="top" decimal_digits="0" increment="1" initial_val="10" min_val="2" max_val="100"
-        label="Chat count" label_width="70" tool_tip="Number of items spammed per time set. (Default: 10)" name="AscChatSpamCount" control_name="SGChatSpamCount"/>
-      <spinner height="18" width="120" follows="left|top" decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
-        label="Chat time" label_width="70" name="AscChatSpamTime" control_name="SGChatSpamTime" tool_tip="Time of evalulating spam in seconds. (Default: 1.0)"/>
-      <text bottom_delta="0" left_delta="130" height="16" follows="top" name="" width="100">seconds</text>
-      <check_box left_delta="-150" height="16" follows="top" label="Enable dialog spam blocking" tool_tip="Enable automatic dialog spam blocking" name="AscDialogSpamBlock" control_name="SGBlockDialogSpam"/>
-      <check_box height="16" follows="left|top" label="Enable calling card spam blocking" tool_tip="Enable automatic calling card spam blocking" name="AscCardSpamBlock" control_name="SGBlockCardSpam"/>
-      <spinner left_delta="20" height="18" width="120" follows="top" decimal_digits="0" increment="1" initial_val="4" min_val="2" max_val="100"
-        label="Spam count" label_width="70" name="AscSpamCount" control_name="SGSpamCount" tool_tip="This setting applies to both Dialog and Card spam (Default: 4)"/>
-      <spinner height="18" width="120" follows="left|top" decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
-        label="Spam time" label_width="70" name="AscSpamTime" control_name="SGSpamTime" tool_tip="This setting applies to both Dialog and Card spam (Default: 1.0)"/>
-      <text bottom_delta="0" left_delta="130" height="16" follows="top" name="">seconds</text>
+      <check_box control_name="_NACL_AntiSpamGlobalQueue" label="No messagetype-specific spam queues" name="spammsg_checkbox" width="256" left="6"/>
+      <button height="23" label="Reset antispam queues" label_selected="Reset antispam queues" name="reset_antispam" width="230" bottom_delta="0" left="260"/>
+      <spinner control_name="_NACL_AntiSpamTime" decimal_digits="0" increment="1" min_val="1" max_val="60" label="Antispam time(seconds):" label_width="330" name="antispamtime" width="390" left="10"/>
+      <spinner control_name="_NACL_AntiSpamAmount" decimal_digits="0" increment="1" min_val="5" max_val="100" label="Antispam amount:" label_width="330" name="antispamamount" width="390"/>
+      <spinner control_name="_NACL_AntiSpamSoundMulti" decimal_digits="0" increment="1" min_val="1" max_val="100" label="Amount multiplicatior for sound antispam:" label_width="330" left="10" name="antispamsoundmulti" width="390"/>
+      <spinner control_name="_NACL_AntiSpamSoundPreloadMulti" decimal_digits="0" increment="1" min_val="1" max_val="99999" label="Amount multiplicatior for sound preload antispam:" label_width="330" name="antispamsoundpreloadmulti" width="390"/>
+      <spinner control_name="_NACL_AntiSpamNewlines" decimal_digits="0" increment="1" min_val="5" max_val="99999" label="Amount of newlines to instablock message:" label_width="330" name="antispamnewlines" width="390"/>
+      <check_box control_name="_NACL_Antispam" height="16" label="Disable -all- dialogs (resets on login)" name="antispam_checkbox" left="6"/>
     </panel>
 
     <panel border="true" bottom="-580" height="525" label="Text Options" left="1" name="TextOptions" width="418">

From 85da7163a7786bce45ae7e0a29333ded496a7496 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 20 Jul 2012 04:00:02 -0500
Subject: [PATCH 061/199] Changing the rolloff settings now immediately apply
 (with fmodex). Also added AudioLevelUnderwaterRolloff now that the underwater
 rolloff 3d setting doesnt immediately get clobbered. Also, divvied up sound
 channels into channelgroups if using the fmod profiler, so it actually has
 useful info to show now.

---
 indra/llaudio/llaudioengine.h                 |  1 -
 indra/llaudio/llaudioengine_fmodex.cpp        | 11 ++++++
 indra/llaudio/llaudioengine_fmodex.h          |  4 +++
 indra/llaudio/lllistener_fmodex.cpp           |  9 +++++
 indra/newview/app_settings/settings.xml       | 11 ++++++
 indra/newview/llpanelaudioprefs.cpp           |  2 ++
 indra/newview/llpanelaudioprefs.h             |  1 +
 indra/newview/llvieweraudio.cpp               | 36 +++++--------------
 indra/newview/llviewercontrol.cpp             |  1 +
 .../xui/en-us/panel_preferences_audio.xml     |  7 ++--
 10 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h
index c80b71688..a4dcaa2b1 100644
--- a/indra/llaudio/llaudioengine.h
+++ b/indra/llaudio/llaudioengine.h
@@ -47,7 +47,6 @@
 #include "lllistener.h"
 
 const F32 LL_WIND_UPDATE_INTERVAL = 0.1f;
-const F32 LL_ROLLOFF_MULTIPLIER_UNDER_WATER = 5.f;			//  How much sounds are weaker under water
 const F32 LL_WIND_UNDERWATER_CENTER_FREQ = 20.f;
 
 const F32 ATTACHED_OBJECT_TIMEOUT = 5.0f;
diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp
index c745dbcd1..3f90f9cb2 100644
--- a/indra/llaudio/llaudioengine_fmodex.cpp
+++ b/indra/llaudio/llaudioengine_fmodex.cpp
@@ -72,6 +72,8 @@ bool attemptDelayLoad()
 
 FMOD_RESULT F_CALLBACK windCallback(FMOD_DSP_STATE *dsp_state, float *inbuffer, float *outbuffer, unsigned int length, int inchannels, int outchannels);
 
+FMOD::ChannelGroup *LLAudioEngine_FMODEX::mChannelGroups[LLAudioEngine::AUDIO_TYPE_COUNT] = {0};
+
 LLAudioEngine_FMODEX::LLAudioEngine_FMODEX(bool enable_profiler)
 {
 	mInited = false;
@@ -207,7 +209,13 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 
 	U32 fmod_flags = FMOD_INIT_NORMAL;
 	if(mEnableProfiler)
+	{
 		fmod_flags |= FMOD_INIT_ENABLE_PROFILE;
+		mSystem->createChannelGroup("None", &mChannelGroups[AUDIO_TYPE_NONE]);
+		mSystem->createChannelGroup("SFX", &mChannelGroups[AUDIO_TYPE_SFX]);
+		mSystem->createChannelGroup("UI", &mChannelGroups[AUDIO_TYPE_UI]);
+		mSystem->createChannelGroup("Ambient", &mChannelGroups[AUDIO_TYPE_AMBIENT]);
+	}
 
 #if LL_LINUX
 	bool audio_ok = false;
@@ -639,6 +647,9 @@ void LLAudioChannelFMODEX::play()
 	Check_FMOD_Error(mChannelp->setPaused(false), "FMOD::Channel::pause");
 
 	getSource()->setPlayedOnce(true);
+
+	if(LLAudioEngine_FMODEX::mChannelGroups[getSource()->getType()])
+		mChannelp->setChannelGroup(LLAudioEngine_FMODEX::mChannelGroups[getSource()->getType()]);
 }
 
 
diff --git a/indra/llaudio/llaudioengine_fmodex.h b/indra/llaudio/llaudioengine_fmodex.h
index f6f920e10..6b780128f 100644
--- a/indra/llaudio/llaudioengine_fmodex.h
+++ b/indra/llaudio/llaudioengine_fmodex.h
@@ -44,6 +44,7 @@ namespace FMOD
 {
 	class System;
 	class Channel;
+	class ChannelGroup;
 	class Sound;
 	class DSP;
 }
@@ -83,6 +84,9 @@ protected:
 	FMOD::DSP *mWindDSP;
 	FMOD::System *mSystem;
 	bool mEnableProfiler;
+
+public:
+	static FMOD::ChannelGroup *mChannelGroups[LLAudioEngine::AUDIO_TYPE_COUNT];
 };
 
 
diff --git a/indra/llaudio/lllistener_fmodex.cpp b/indra/llaudio/lllistener_fmodex.cpp
index 43749e6b1..e70dc7c60 100644
--- a/indra/llaudio/lllistener_fmodex.cpp
+++ b/indra/llaudio/lllistener_fmodex.cpp
@@ -106,6 +106,15 @@ void LLListener_FMODEX::commitDeferredChanges()
 
 void LLListener_FMODEX::setRolloffFactor(F32 factor)
 {
+	//An internal FMODEx optimization skips 3D updates if there have not been changes to the 3D sound environment.
+	//Sadly, a change in rolloff is not accounted for, thus we must touch the listener properties as well.
+	//In short: Changing the position ticks a dirtyflag inside fmodex, which makes it not skip 3D processing next update call.
+	if(mRolloffFactor != factor)
+	{
+		LLVector3 pos = mVelocity - LLVector3(0.f,0.f,.1f);
+		mSystem->set3DListenerAttributes(0, (FMOD_VECTOR*)pos.mV, NULL, NULL, NULL);
+		mSystem->set3DListenerAttributes(0, (FMOD_VECTOR*)mVelocity.mV, NULL, NULL, NULL);
+	}
 	mRolloffFactor = factor;
 	mSystem->set3DSettings(mDopplerFactor, 1.f, mRolloffFactor);
 }
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 5dc30d0c3..a6a95d8a8 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1725,6 +1725,17 @@
       <key>Value</key>
       <real>1.0</real>
     </map>
+    <key>AudioLevelUnderwaterRolloff</key>
+    <map>
+      <key>Comment</key>
+      <string>Controls the distance-based dropoff of audio volume when camera is submerged (fraction or multiple of default audio rolloff)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>4.0</real>
+    </map>
     <key>AudioLevelSFX</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llpanelaudioprefs.cpp b/indra/newview/llpanelaudioprefs.cpp
index 0d78a44ae..d58635c85 100644
--- a/indra/newview/llpanelaudioprefs.cpp
+++ b/indra/newview/llpanelaudioprefs.cpp
@@ -105,6 +105,7 @@ void LLPanelAudioPrefs::refreshValues()
 	mPreviousMediaVolume = gSavedSettings.getF32("AudioLevelMedia");
 	mPreviousDoppler = gSavedSettings.getF32("AudioLevelDoppler");
 	mPreviousRolloff = gSavedSettings.getF32("AudioLevelRolloff");
+	mPreviousUnderwaterRolloff = gSavedSettings.getF32("AudioLevelUnderwaterRolloff");
 
 	mPreviousMoneyThreshold = gSavedSettings.getF32("UISndMoneyChangeThreshold");
 	mPreviousHealthThreshold = gSavedSettings.getF32("UISndHealthReductionThreshold");
@@ -126,6 +127,7 @@ void LLPanelAudioPrefs::cancel()
 	gSavedSettings.setF32("AudioLevelMedia", mPreviousMediaVolume);
 	gSavedSettings.setF32("AudioLevelDoppler", mPreviousDoppler );
 	gSavedSettings.setF32("AudioLevelRolloff", mPreviousRolloff );
+	gSavedSettings.setF32("AudioLevelUnderwaterRolloff", mPreviousUnderwaterRolloff );
 
 	gSavedSettings.setF32("UISndMoneyChangeThreshold", mPreviousMoneyThreshold );
 	gSavedSettings.setF32("UISndHealthReductionThreshold", mPreviousHealthThreshold );
diff --git a/indra/newview/llpanelaudioprefs.h b/indra/newview/llpanelaudioprefs.h
index 08009c9e6..45b6de83e 100644
--- a/indra/newview/llpanelaudioprefs.h
+++ b/indra/newview/llpanelaudioprefs.h
@@ -67,6 +67,7 @@ private:
 	F32             mPreviousDoppler;
 	F32             mPreviousDistance;
 	F32             mPreviousRolloff;
+	F32             mPreviousUnderwaterRolloff;
 
 	S32             mPreviousBitrate;
 
diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp
index e46058591..9538262c1 100644
--- a/indra/newview/llvieweraudio.cpp
+++ b/indra/newview/llvieweraudio.cpp
@@ -134,6 +134,7 @@ void audio_update_volume(bool force_update)
 	static const LLCachedControl<bool> mute_when_minimized("MuteWhenMinimized",true);
 	static const LLCachedControl<F32> audio_level_doppler("AudioLevelDoppler",1.0);
 	static const LLCachedControl<F32> audio_level_rolloff("AudioLevelRolloff",1.0);
+	static const LLCachedControl<F32> audio_level_underwater_rolloff("AudioLevelUnderwaterRolloff",3.0);
 	BOOL mute_audio = _mute_audio;
 	if (!gViewerWindow->getActive() && mute_when_minimized)
 	{
@@ -147,7 +148,11 @@ void audio_update_volume(bool force_update)
 		gAudiop->setMasterGain ( master_volume );
 
 		gAudiop->setDopplerFactor(audio_level_doppler);
-		gAudiop->setRolloffFactor(audio_level_rolloff);
+		if(!LLViewerCamera::getInstance()->cameraUnderWater())
+			gAudiop->setRolloffFactor( audio_level_rolloff );
+		else
+			gAudiop->setRolloffFactor( audio_level_underwater_rolloff );
+
 		gAudiop->setMuted(mute_audio);
 		
 		if (force_update)
@@ -215,32 +220,8 @@ void audio_update_listener()
 void audio_update_wind(bool force_update)
 {
 #ifdef kAUDIO_ENABLE_WIND
-	//
-	//  Extract height above water to modulate filter by whether above/below water 
-	// 
-	LLViewerRegion* region = gAgent.getRegion();
-	if (region)
+	if(gAgent.getRegion())
 	{
-		static F32 last_camera_water_height = -1000.f;
-		LLVector3 camera_pos = gAgentCamera.getCameraPositionAgent();
-		F32 camera_water_height = camera_pos.mV[VZ] - region->getWaterHeight();
-		
-		//
-		//  Don't update rolloff factor unless water surface has been crossed
-		//
-		if (force_update || (last_camera_water_height * camera_water_height) < 0.f)
-		{
-			static const LLCachedControl<F32> audio_level_rolloff("AudioLevelRolloff",1);
-			if (camera_water_height < 0.f)
-			{
-				gAudiop->setRolloffFactor(audio_level_rolloff * LL_ROLLOFF_MULTIPLIER_UNDER_WATER);
-			}
-			else 
-			{
-				gAudiop->setRolloffFactor(audio_level_rolloff);
-			}
-		}
-
         // Scale down the contribution of weather-simulation wind to the
         // ambient wind noise.  Wind velocity averages 3.5 m/s, with gusts to 7 m/s
         // whereas steady-state avatar walk velocity is only 3.2 m/s.
@@ -289,8 +270,7 @@ void audio_update_wind(bool force_update)
 			gAudiop->mMaxWindGain = llmax(gAudiop->mMaxWindGain - volume_delta, 0.f);
 		}
 		
-		last_camera_water_height = camera_water_height;
-		gAudiop->updateWind(gRelativeWindVec, camera_water_height);
+		gAudiop->updateWind(gRelativeWindVec, gAgentCamera.getCameraPositionAgent()[VZ] - gAgent.getRegion()->getWaterHeight());
 	}
 #endif
 }
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp
index 6440652ef..1ba3f1d9e 100644
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -690,6 +690,7 @@ void settings_setup_listeners()
 	gSavedSettings.getControl("AudioLevelVoice")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
 	gSavedSettings.getControl("AudioLevelDoppler")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
 	gSavedSettings.getControl("AudioLevelRolloff")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
+	gSavedSettings.getControl("AudioLevelUnderwaterRolloff")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
 	gSavedSettings.getControl("AudioStreamingMusic")->getSignal()->connect(boost::bind(&handleAudioStreamMusicChanged, _2));
 	gSavedSettings.getControl("MuteAudio")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
 	gSavedSettings.getControl("MuteMusic")->getSignal()->connect(boost::bind(&handleAudioVolumeChanged, _2));
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 2ca59db4b..27c4ca7e6 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -9,8 +9,9 @@
 	<check_box bottom_delta="-20" control_name="ParcelMediaAutoPlayEnable" follows="top" height="16" initial_value="true" label="Automatically play media" left="162" name="auto_streaming_video"/>
 	<check_box bottom_delta="-20" control_name="MediaEnableFilter" follows="top" height="16" initial_value="true" label="Ask for permission (enables filtering)" name="streaming_video"/>
 	<check_box bottom_delta="-25" control_name="MuteWhenMinimized" follows="top" height="16" initial_value="true" label="Mute Audio When Window Minimized" left="142" name="mute_when_minimized"/>
-	<slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Doppler Effect" label_width="69" left="148" max_val="2" min_val="0" name="Doppler Effect" show_text="true" width="219" />
-	<slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Rolloff Factor" label_width="69" max_val="2" min_val="0" name="Rolloff Factor" width="219"/>
-	<spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0" follows="top" height="16" increment="10" initial_val="10" label="[CURRENCY] change threshold:" label_width="128" max_val="10000" min_val="0" name="currency_change_threshold" width="192"/>
+	<slider bottom_delta="-20" control_name="AudioLevelDoppler" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Doppler Effect" label_width="130" left="148" max_val="2" min_val="0" name="Doppler Effect" show_text="true" width="300" />
+	<slider bottom_delta="-20" control_name="AudioLevelRolloff" edit_text="true" follows="top" height="15" increment="0.1" initial_val="1" label="Rolloff Factor (Default)" label_width="130" max_val="2" min_val="0" name="Rolloff Factor" width="300"/>
+  <slider bottom_delta="-20" control_name="AudioLevelUnderwaterRolloff" edit_text="true" follows="top" height="15" increment="0.1" initial_val="3" label="Rolloff Factor (Underwater)" label_width="130" max_val="8" min_val="0" name="Underwater Rolloff Factor" width="300"/>
+  <spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0" follows="top" height="16" increment="10" initial_val="10" label="[CURRENCY] change threshold:" label_width="128" max_val="10000" min_val="0" name="currency_change_threshold" width="192"/>
 	<spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold" decimal_digits="0" follows="top" height="16" increment="10" initial_val="20" label="Health Change Threshold" label_width="128" max_val="10000" min_val="0" name="Health Change Threshold" width="192" />
 </panel>

From b785b9d219dd6458550304945ed806cf5a153a2a Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 20 Jul 2012 05:15:47 -0500
Subject: [PATCH 062/199] Added 'Transparent Water' checkbox to graphics panel,
 as we actually have space for it now.

---
 indra/newview/llpaneldisplay.cpp                           | 7 +++++++
 indra/newview/llpaneldisplay.h                             | 2 ++
 .../default/xui/en-us/panel_preferences_graphics1.xml      | 5 +++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llpaneldisplay.cpp b/indra/newview/llpaneldisplay.cpp
index aaf304236..680160a82 100644
--- a/indra/newview/llpaneldisplay.cpp
+++ b/indra/newview/llpaneldisplay.cpp
@@ -224,6 +224,9 @@ BOOL LLPanelDisplay::postBuild()
 
 	mGraphicsBorder = getChild<LLViewBorder>("GraphicsBorder");
 
+	// Enable Transparent Water
+	mCtrlTransparentWater = getChild<LLCheckBoxCtrl>("TransparentWater");
+
 	//----------------------------------------------------------------------------
 	// Enable Bump/Shiny
 	mCtrlBumpShiny = getChild<LLCheckBoxCtrl>("BumpShiny");
@@ -409,6 +412,7 @@ void LLPanelDisplay::refresh()
 	mQualityPerformance = gSavedSettings.getU32("RenderQualityPerformance");
 	mCustomSettings = gSavedSettings.getBOOL("RenderCustomSettings");
 
+	mTransparentWater = gSavedSettings.getBOOL("RenderTransparentWater");
 	// shader settings
 	mBumpShiny = gSavedSettings.getBOOL("RenderObjectBump");
 	mShaderEnable = gSavedSettings.getBOOL("VertexShaderEnable");
@@ -666,6 +670,7 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
 	llassert(mSkyFactorText != NULL);
 	llassert(mPostProcessText != NULL);
 
+	llassert(mCtrlTransparentWater != NULL);
 	llassert(mCtrlBumpShiny != NULL);
 	llassert(mCtrlWindLight != NULL);
 	llassert(mCtrlAvatarVP != NULL);
@@ -716,6 +721,7 @@ void LLPanelDisplay::setHiddenGraphicsState(bool isHidden)
 	mSkyFactorText->setVisible(!isHidden);
 	mPostProcessText->setVisible(!isHidden);
 
+	mCtrlTransparentWater->setVisible(!isHidden);
 	mCtrlBumpShiny->setVisible(!isHidden);
 	mCtrlWindLight->setVisible(!isHidden);
 	mCtrlAvatarVP->setVisible(!isHidden);
@@ -761,6 +767,7 @@ void LLPanelDisplay::cancel()
 
 	gSavedSettings.setBOOL("RenderCustomSettings", mCustomSettings);
 
+	gSavedSettings.setBOOL("RenderTransparentWater", mTransparentWater);
 	gSavedSettings.setBOOL("RenderObjectBump", mBumpShiny);
 	gSavedSettings.setBOOL("VertexShaderEnable", mShaderEnable);
 	gSavedSettings.setBOOL("WindLightUseAtmosShaders", mWindLight);
diff --git a/indra/newview/llpaneldisplay.h b/indra/newview/llpaneldisplay.h
index 9b601d7d1..6cf3df465 100644
--- a/indra/newview/llpaneldisplay.h
+++ b/indra/newview/llpaneldisplay.h
@@ -108,6 +108,7 @@ protected:
 	LLSliderCtrl	*mCtrlPostProcess;				// Max Particle
 	LLSliderCtrl	*mCtrlNonImpostors;				// Max non-impostors
 
+	LLCheckBoxCtrl	*mCtrlTransparentWater;
 	LLCheckBoxCtrl	*mCtrlBumpShiny;
 	LLCheckBoxCtrl	*mCtrlWindLight;
 	LLCheckBoxCtrl	*mCtrlAvatarVP;
@@ -153,6 +154,7 @@ protected:
 	S32 mQualityPerformance;
 	BOOL mCustomSettings;
 
+	BOOL mTransparentWater;
 	BOOL mBumpShiny;
 	BOOL mShaderEnable;
 	BOOL mWindLight;
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 4be19eadc..9c1608092 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -39,14 +39,15 @@
 	<check_box bottom="-96" control_name="RenderCustomSettings" label="Custom" left="395" initial_value="true" name="CustomSettings"/>
 	<!--view_border bevel_style="none" bottom="-395" height="280" left="5" name="GraphicsBorder" width="485"/-->
 	<text bottom="-130" height="12" left="10" name="ShadersText">Shaders:</text>
-	<check_box bottom_delta="-23" control_name="RenderObjectBump" height="16" initial_value="true" label="Bump mapping and shiny" left="10" name="BumpShiny"/>
+  <check_box bottom_delta="-23" control_name="RenderTransparentWater" height="16" initial_value="true" label="Transparent water" left="10" name="TransparentWater"/>
+	<check_box bottom_delta="-17" control_name="RenderObjectBump" height="16" initial_value="true" label="Bump mapping and shiny" left="10" name="BumpShiny"/>
     <check_box bottom_delta="-17" control_name="RenderLocalLights" height="16" label="Local Lights" name="LightingDetailRadio"/>
 	<check_box bottom_delta="-17" control_name="VertexShaderEnable" height="16" initial_value="true" label="Basic shaders" left_delta="0" name="BasicShaders" tool_tip="Disabling this option may prevent some graphics card drivers from crashing."/>
 	<check_box bottom_delta="-17" control_name="WindLightUseAtmosShaders" initial_value="true" label="Atmospheric shaders" left_delta="0" name="WindLightUseAtmosShaders"/>
 	<check_box bottom_delta="-17" control_name="RenderDeferred" initial_value="true" label="Lighting and Shadows" tool_tip="Deferred Shading" left_delta="0" name="RenderDeferred"/>
     <check_box bottom_delta="-17" control_name="RenderDeferredSSAO" height="16" initial_value="true" label="Ambient Occlusion" left_delta="0" name="UseSSAO"/>
 	<check_box bottom_delta="-17" control_name="RenderDepthOfField"	initial_value="true" label="Depth of Field" left_delta="0" name="RenderDepthOfField"/>
-  <text bottom_delta="-60" height="12" left="15" name="ShadowDetailText">Shadows:</text>
+  <text bottom_delta="-43" height="12" left="15" name="ShadowDetailText">Shadows:</text>
   <combo_box bottom_delta="-22" control_name="RenderShadowDetail" label="Shadow Detail" left_delta="-2" name="ShadowDetailCombo" width="160" height="16">
 	  <combo_item name="0" value="0">Disabled</combo_item>
 	  <combo_item name="1" value="1">Sun/Moon</combo_item>

From 1e81966b89ac0cf4737f09bbc617acc922f45c0a Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Fri, 20 Jul 2012 08:13:07 -0400
Subject: [PATCH 063/199] Clean up and updates

Cleaned up header bloatyness in linden_common
Moved around things to be in line with Linden Lab
Updated llinitparam and imported its new dependencies
Removed dohexeditor and related files
Removed unused legacy files

             /\_..._/\
             |/ \_/ \|
             | o.-.o |
             \ ( O ) /
             /'--U--'\
             |  .:.  | /\
             | /:;:\ |` /
   Drake     | |:;:| |-'
  Arconis   /  |'-'|  \
            `""`   `""`
---
 indra/CMakeLists.txt                          |    1 -
 indra/cmake/LLXUIXML.cmake                    |    7 -
 indra/llaudio/llaudioengine.h                 |    1 +
 indra/llcommon/CMakeLists.txt                 |   10 +-
 indra/llcommon/linden_common.h                |   23 +-
 indra/{llxuixml => llcommon}/llinitparam.cpp  |    0
 indra/{llxuixml => llcommon}/llinitparam.h    |   34 +-
 indra/llcommon/llsortedvector.h               |  152 ++
 indra/llcommon/llstrider.h                    |   74 +-
 indra/llcommon/lltypeinfolookup.h             |  110 ++
 indra/llimage/llimage.h                       |    2 +-
 indra/llmessage/llxfer.h                      |    1 +
 indra/llui/CMakeLists.txt                     |    5 +-
 indra/{llxuixml => llui}/lluicolor.cpp        |    0
 indra/{llxuixml => llui}/lluicolor.h          |    0
 indra/llxuixml/CMakeLists.txt                 |   40 -
 indra/newview/CMakeLists.txt                  |    9 -
 indra/newview/dhparam.cpp                     |   42 -
 indra/newview/dofloaterhex.cpp                |  503 -------
 indra/newview/dofloaterhex.h                  |   51 -
 indra/newview/dohexeditor.cpp                 | 1243 -----------------
 indra/newview/dohexeditor.h                   |  159 ---
 indra/newview/dsaparam.cpp                    |   69 -
 indra/newview/llfloatervfsexplorer.cpp        |    9 -
 indra/newview/llinventorybridge.cpp           |    1 -
 indra/newview/lllocalinventory.cpp            |    4 +-
 indra/newview/llviewermenu.cpp                |    7 -
 .../skins/default/xui/en-us/floater_hex.xml   |   14 -
 indra/newview/statemachine/CMakeLists.txt     |    2 -
 29 files changed, 304 insertions(+), 2269 deletions(-)
 delete mode 100644 indra/cmake/LLXUIXML.cmake
 rename indra/{llxuixml => llcommon}/llinitparam.cpp (100%)
 rename indra/{llxuixml => llcommon}/llinitparam.h (98%)
 create mode 100644 indra/llcommon/llsortedvector.h
 create mode 100644 indra/llcommon/lltypeinfolookup.h
 rename indra/{llxuixml => llui}/lluicolor.cpp (100%)
 rename indra/{llxuixml => llui}/lluicolor.h (100%)
 delete mode 100644 indra/llxuixml/CMakeLists.txt
 delete mode 100644 indra/newview/dhparam.cpp
 delete mode 100644 indra/newview/dofloaterhex.cpp
 delete mode 100644 indra/newview/dofloaterhex.h
 delete mode 100644 indra/newview/dohexeditor.cpp
 delete mode 100644 indra/newview/dohexeditor.h
 delete mode 100644 indra/newview/dsaparam.cpp
 delete mode 100644 indra/newview/skins/default/xui/en-us/floater_hex.xml

diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index e81965cc6..08daa9681 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -77,7 +77,6 @@ if (VIEWER)
   add_subdirectory(${LIBS_OPEN_PREFIX}llcrashlogger)
   add_subdirectory(${LIBS_OPEN_PREFIX}llplugin)
   add_subdirectory(${LIBS_OPEN_PREFIX}llui)
-  add_subdirectory(${LIBS_OPEN_PREFIX}llxuixml)
 
   # viewer plugins directory
   add_subdirectory(${LIBS_OPEN_PREFIX}plugins)
diff --git a/indra/cmake/LLXUIXML.cmake b/indra/cmake/LLXUIXML.cmake
deleted file mode 100644
index b8bfe48c7..000000000
--- a/indra/cmake/LLXUIXML.cmake
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- cmake -*-
-
-set(LLXUIXML_INCLUDE_DIRS
-    ${LIBS_OPEN_DIR}/llxuixml
-    )
-
-set(LLXUIXML_LIBRARIES llxuixml)
diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h
index c80b71688..2d54073ee 100644
--- a/indra/llaudio/llaudioengine.h
+++ b/indra/llaudio/llaudioengine.h
@@ -43,6 +43,7 @@
 #include "lluuid.h"
 #include "llframetimer.h"
 #include "llassettype.h"
+#include "llextendedstatus.h"
 
 #include "lllistener.h"
 
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 29feeebc4..64e0140e1 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -15,8 +15,8 @@ include_directories(
     )
 
 set(llcommon_SOURCE_FILES
-	aiframetimer.cpp
-	imageids.cpp
+    aiframetimer.cpp
+    imageids.cpp
     indra_constants.cpp
     llallocator.cpp
     llallocator_heap_profile.cpp
@@ -24,7 +24,7 @@ set(llcommon_SOURCE_FILES
     llapr.cpp
     llaprpool.cpp
     llassettype.cpp
-	llavatarname.cpp
+    llavatarname.cpp
     llbase32.cpp
     llbase64.cpp
     llcommon.cpp
@@ -53,6 +53,7 @@ set(llcommon_SOURCE_FILES
     llformat.cpp
     llframetimer.cpp
     llheartbeat.cpp
+    llinitparam.cpp
     llinstancetracker.cpp
     llindraconfigfile.cpp
     llliveappconfig.cpp
@@ -171,6 +172,7 @@ set(llcommon_HEADER_FILES
     llheartbeat.h
     llhttpstatuscodes.h
     llindexedqueue.h
+    llinitparam.h
     llinstancetracker.h
     llindraconfigfile.h
     llkeythrottle.h
@@ -212,6 +214,7 @@ set(llcommon_HEADER_FILES
     llsingleton.h
     llskiplist.h
     llskipmap.h
+    llsortedvector.h
     llstack.h
     llstacktrace.h
     llstat.h
@@ -226,6 +229,7 @@ set(llcommon_HEADER_FILES
     llthreadsafequeue.h
     lltimer.h
     lltreeiterators.h
+    lltypeinfolookup.h
     lluri.h
     lluuid.h
     lluuidhashmap.h
diff --git a/indra/llcommon/linden_common.h b/indra/llcommon/linden_common.h
index d486359c7..a0d64b3f8 100644
--- a/indra/llcommon/linden_common.h
+++ b/indra/llcommon/linden_common.h
@@ -33,6 +33,11 @@
 #ifndef LL_LINDEN_COMMON_H
 #define LL_LINDEN_COMMON_H
 
+// *NOTE:  Please keep includes here to a minimum!
+//
+// Files included here are included in every library .cpp file and
+// are not precompiled.
+
 #include "cwdebug.h"
 
 #if defined(LL_WINDOWS) && defined(_DEBUG)
@@ -55,33 +60,15 @@
 #include <ctime>
 #include <iosfwd>
 
-// Work around Microsoft compiler warnings in STL headers
-#ifdef LL_WINDOWS
-#pragma warning (disable : 4702) // unreachable code
-#pragma warning (disable : 4244) // conversion from time_t to S32
-#endif	//	LL_WINDOWS
-
 // *TODO: Eliminate these, most library .cpp files don't need them.
 // Add them to llviewerprecompiledheaders.h if necessary.
 #include <list>
-#include <map>
-#include <vector>
-#include <string>
-
-#ifdef LL_WINDOWS
-// Reenable warnings we disabled above
-#pragma warning (3 : 4702) // unreachable code, we like level 3, not 4
-// moved msvc warnings to llpreprocessor.h  *TODO - delete this comment after merge conflicts are unlikely -brad
-#endif	//	LL_WINDOWS
 
 // Linden only libs in alpha-order other than stdtypes.h
 // *NOTE: Please keep includes here to a minimum, see above.
 #include "stdtypes.h"
 #include "lldefs.h"
 #include "llerror.h"
-#include "llextendedstatus.h"
-// Don't do this, adds 15K lines of header code to every library file.
-//#include "llfasttimer.h"
 #include "llfile.h"
 #include "llformat.h"
 
diff --git a/indra/llxuixml/llinitparam.cpp b/indra/llcommon/llinitparam.cpp
similarity index 100%
rename from indra/llxuixml/llinitparam.cpp
rename to indra/llcommon/llinitparam.cpp
diff --git a/indra/llxuixml/llinitparam.h b/indra/llcommon/llinitparam.h
similarity index 98%
rename from indra/llxuixml/llinitparam.h
rename to indra/llcommon/llinitparam.h
index 7285d3c48..542b4ab15 100644
--- a/indra/llxuixml/llinitparam.h
+++ b/indra/llcommon/llinitparam.h
@@ -35,6 +35,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include "llerror.h"
+#include "lltypeinfolookup.h"
 
 namespace LLInitParam
 {
@@ -205,7 +206,7 @@ namespace LLInitParam
 		mutable std::string	mValueName;
 	};
 
-	class Parser
+	class LL_COMMON_API Parser
 	{
 		LOG_CLASS(Parser);
 
@@ -227,9 +228,9 @@ namespace LLInitParam
 		typedef bool (*parser_write_func_t)(Parser& parser, const void*, name_stack_t&);
 		typedef boost::function<void (name_stack_t&, S32, S32, const possible_values_t*)>	parser_inspect_func_t;
 
-		typedef std::map<const std::type_info*, parser_read_func_t, CompareTypeID>		parser_read_func_map_t;
-		typedef std::map<const std::type_info*, parser_write_func_t, CompareTypeID>		parser_write_func_map_t;
-		typedef std::map<const std::type_info*, parser_inspect_func_t, CompareTypeID>	parser_inspect_func_map_t;
+		typedef LLTypeInfoLookup<parser_read_func_t>		parser_read_func_map_t;
+		typedef LLTypeInfoLookup<parser_write_func_t>		parser_write_func_map_t;
+		typedef LLTypeInfoLookup<parser_inspect_func_t>		parser_inspect_func_map_t;
 
 		Parser(parser_read_func_map_t& read_map, parser_write_func_map_t& write_map, parser_inspect_func_map_t& inspect_map)
 		:	mParseSilently(false),
@@ -301,7 +302,7 @@ namespace LLInitParam
 	class Param;
 
 	// various callbacks and constraints associated with an individual param
-	struct ParamDescriptor
+	struct LL_COMMON_API ParamDescriptor
 	{
 		struct UserData
 		{
@@ -341,7 +342,7 @@ namespace LLInitParam
 	typedef boost::shared_ptr<ParamDescriptor> ParamDescriptorPtr;
 
 	// each derived Block class keeps a static data structure maintaining offsets to various params
-	class BlockDescriptor
+	class LL_COMMON_API BlockDescriptor
 	{
 	public:
 		BlockDescriptor();
@@ -369,7 +370,7 @@ namespace LLInitParam
 		class BaseBlock*				mCurrentBlockPtr;		// pointer to block currently being constructed
 	};
 
-	class BaseBlock
+	class LL_COMMON_API BaseBlock
 	{
 	public:
 		//TODO: implement in terms of owned_ptr
@@ -566,7 +567,7 @@ namespace LLInitParam
 		static bool equals(const BaseBlock::Lazy<T>& a, const BaseBlock::Lazy<T>& b) { return !a.empty() || !b.empty(); }
 	};
 
-	class Param
+	class LL_COMMON_API Param
 	{
 	public:
 		void setProvided(bool is_provided = true)
@@ -1253,15 +1254,16 @@ namespace LLInitParam
 			return mValues.back();
 		}
 
-		void add(const value_t& item)
+		self_t& add(const value_t& item)
 		{
 			param_value_t param_value;
 			param_value.setValue(item);
 			mValues.push_back(param_value);
 			setProvided();
+			return *this;
 		}
 
-		void add(const typename name_value_lookup_t::name_t& name)
+		self_t& add(const typename name_value_lookup_t::name_t& name)
 		{
 			value_t value;
 
@@ -1271,6 +1273,8 @@ namespace LLInitParam
 				add(value);
 				mValues.back().setValueName(name);
 			}
+
+			return *this;
 		}
 
 		// implicit conversion
@@ -1441,13 +1445,14 @@ namespace LLInitParam
 			return mValues.back();
 		}
 
-		void add(const value_t& item)
+		self_t& add(const value_t& item)
 		{
 			mValues.push_back(item);
 			setProvided();
+			return *this;
 		}
 
-		void add(const typename name_value_lookup_t::name_t& name)
+		self_t& add(const typename name_value_lookup_t::name_t& name)
 		{
 			value_t value;
 
@@ -1457,6 +1462,7 @@ namespace LLInitParam
 				add(value);
 				mValues.back().setValueName(name);
 			}
+			return *this;
 		}
 
 		// implicit conversion
@@ -2057,8 +2063,8 @@ namespace LLInitParam
 		
 
 		// block param interface
-		bool deserializeBlock(Parser& p, Parser::name_stack_range_t name_stack_range, bool new_name);
-		void serializeBlock(Parser& p, Parser::name_stack_t& name_stack, const BaseBlock* diff_block = NULL) const;
+		LL_COMMON_API bool deserializeBlock(Parser& p, Parser::name_stack_range_t name_stack_range, bool new_name);
+		LL_COMMON_API void serializeBlock(Parser& p, Parser::name_stack_t& name_stack, const BaseBlock* diff_block = NULL) const;
 		bool inspectBlock(Parser& p, Parser::name_stack_t name_stack = Parser::name_stack_t(), S32 min_count = 0, S32 max_count = S32_MAX) const
 		{
 			//TODO: implement LLSD params as schema type Any
diff --git a/indra/llcommon/llsortedvector.h b/indra/llcommon/llsortedvector.h
new file mode 100644
index 000000000..391b82ee4
--- /dev/null
+++ b/indra/llcommon/llsortedvector.h
@@ -0,0 +1,152 @@
+/**
+ * @file   llsortedvector.h
+ * @author Nat Goodspeed
+ * @date   2012-04-08
+ * @brief  LLSortedVector class wraps a vector that we maintain in sorted
+ *         order so we can perform binary-search lookups.
+ * 
+ * $LicenseInfo:firstyear=2012&license=viewerlgpl$
+ * Copyright (c) 2012, Linden Research, Inc.
+ * $/LicenseInfo$
+ */
+
+#if ! defined(LL_LLSORTEDVECTOR_H)
+#define LL_LLSORTEDVECTOR_H
+
+#include <vector>
+#include <algorithm>
+
+/**
+ * LLSortedVector contains a std::vector<std::pair> that we keep sorted on the
+ * first of the pair. This makes insertion somewhat more expensive than simple
+ * std::vector::push_back(), but allows us to use binary search for lookups.
+ * It's intended for small aggregates where lookup is far more performance-
+ * critical than insertion; in such cases a binary search on a small, sorted
+ * std::vector can be more performant than a std::map lookup.
+ */
+template <typename KEY, typename VALUE>
+class LLSortedVector
+{
+public:
+    typedef LLSortedVector<KEY, VALUE> self;
+    typedef KEY key_type;
+    typedef VALUE mapped_type;
+    typedef std::pair<key_type, mapped_type> value_type;
+    typedef std::vector<value_type> PairVector;
+    typedef typename PairVector::iterator iterator;
+    typedef typename PairVector::const_iterator const_iterator;
+
+    /// Empty
+    LLSortedVector() {}
+
+    /// Fixed initial size
+    LLSortedVector(std::size_t size):
+        mVector(size)
+    {}
+
+    /// Bulk load
+    template <typename ITER>
+    LLSortedVector(ITER begin, ITER end):
+        mVector(begin, end)
+    {
+        // Allow caller to dump in a bunch of (pairs convertible to)
+        // value_type if desired, but make sure we sort afterwards.
+        std::sort(mVector.begin(), mVector.end());
+    }
+
+    /// insert(key, value)
+    std::pair<iterator, bool> insert(const key_type& key, const mapped_type& value)
+    {
+        return insert(value_type(key, value));
+    }
+
+    /// insert(value_type)
+    std::pair<iterator, bool> insert(const value_type& pair)
+    {
+        typedef std::pair<iterator, bool> iterbool;
+        iterator found = std::lower_bound(mVector.begin(), mVector.end(), pair,
+                                          less<value_type>());
+        // have to check for end() before it's even valid to dereference
+        if (found == mVector.end())
+        {
+            std::size_t index(mVector.size());
+            mVector.push_back(pair);
+            // don't forget that push_back() invalidates 'found'
+            return iterbool(mVector.begin() + index, true);
+        }
+        if (found->first == pair.first)
+        {
+            return iterbool(found, false);
+        }
+        // remember that insert() invalidates 'found' -- save index
+        std::size_t index(found - mVector.begin());
+        mVector.insert(found, pair);
+        // okay, convert from index back to iterator
+        return iterbool(mVector.begin() + index, true);
+    }
+
+    iterator begin() { return mVector.begin(); }
+    iterator end()   { return mVector.end(); }
+    const_iterator begin() const { return mVector.begin(); }
+    const_iterator end()   const { return mVector.end(); }
+
+    bool empty() const { return mVector.empty(); }
+    std::size_t size() const { return mVector.size(); }
+
+    /// find
+    iterator find(const key_type& key)
+    {
+        iterator found = std::lower_bound(mVector.begin(), mVector.end(),
+                                          value_type(key, mapped_type()),
+                                          less<value_type>());
+        if (found == mVector.end() || found->first != key)
+            return mVector.end();
+        return found;
+    }
+
+    const_iterator find(const key_type& key) const
+    {
+        return const_cast<self*>(this)->find(key);
+    }
+
+private:
+    // Define our own 'less' comparator so we can specialize without messing
+    // with std::less.
+    template <typename T>
+    struct less: public std::less<T> {};
+
+    // Specialize 'less' for an LLSortedVector::value_type involving
+    // std::type_info*. This is one of LLSortedVector's foremost use cases. We
+    // specialize 'less' rather than just defining a specific comparator
+    // because LLSortedVector should be usable for other key_types as well.
+    template <typename T>
+    struct less< std::pair<std::type_info*, T> >:
+        public std::binary_function<std::pair<std::type_info*, T>,
+                                    std::pair<std::type_info*, T>,
+                                    bool>
+    {
+        bool operator()(const std::pair<std::type_info*, T>& lhs,
+                        const std::pair<std::type_info*, T>& rhs) const
+        {
+            return lhs.first->before(*rhs.first);
+        }
+    };
+
+    // Same as above, but with const std::type_info*.
+    template <typename T>
+    struct less< std::pair<const std::type_info*, T> >:
+        public std::binary_function<std::pair<const std::type_info*, T>,
+                                    std::pair<const std::type_info*, T>,
+                                    bool>
+    {
+        bool operator()(const std::pair<const std::type_info*, T>& lhs,
+                        const std::pair<const std::type_info*, T>& rhs) const
+        {
+            return lhs.first->before(*rhs.first);
+        }
+    };
+
+    PairVector mVector;
+};
+
+#endif /* ! defined(LL_LLSORTEDVECTOR_H) */
diff --git a/indra/llcommon/llstrider.h b/indra/llcommon/llstrider.h
index 7d1b80710..b4f310a51 100644
--- a/indra/llcommon/llstrider.h
+++ b/indra/llcommon/llstrider.h
@@ -42,10 +42,10 @@ template <class Object> class LLStrider
 		U8*		mBytep;
 	};
 	U32     mSkip;
-	//U32		mTypeSize;
+
 public:
 
-	LLStrider()  { mObjectp = NULL; /*mTypeSize = */mSkip = sizeof(Object); } 
+	LLStrider()  { mObjectp = NULL; mSkip = sizeof(Object); } 
 	~LLStrider() { } 
 
 	const LLStrider<Object>& operator =  (Object *first)    { mObjectp = first; return *this;}
@@ -60,9 +60,6 @@ public:
 		return ret;
 	}
 	
-	//void setTypeSize (S32 typeBytes){ mTypeSize = (typeBytes ? typeBytes : sizeof(Object)); }
-
-	//bool isStrided() const		   { return mTypeSize != mSkip; } 
 	void skip(const U32 index)     { mBytep += mSkip*index;}
 	U32 getSkip() const			   { return mSkip; }
 	Object* get()                  { return mObjectp; }
@@ -70,72 +67,9 @@ public:
 	Object& operator *()           { return *mObjectp; }
 	Object* operator ++(int)       { Object* old = mObjectp; mBytep += mSkip; return old; }
 	Object* operator +=(int i)     { mBytep += mSkip*i; return mObjectp; }
+
 	Object& operator[](U32 index)  { return *(Object*)(mBytep + (mSkip * index)); }
-	/*void assignArray(U8* __restrict source, const size_t elem_size, const size_t elem_count)
-	{
-		llassert_always(sizeof(Object) <= elem_size);
-
-		U8* __restrict dest = mBytep;				//refer to dest instead of mBytep to benefit from __restrict hint
-		const U32 bytes = elem_size * elem_count;	//total bytes to copy from source to dest
-
-		//stride == sizeof(element) implies entire buffer is unstrided and thus memcpy-able, provided source buffer elements match in size.
-		//Because LLStrider is often passed an LLVector3 even if the reprensentation is LLVector4 in the vertex buffer, mTypeSize is set to 
-		//the TRUE vbo datatype size via VertexBufferStrider::get
-		if(!isStrided() && mTypeSize == elem_size)	
-		{
-			if(bytes >= sizeof(LLVector4) * 4)	//Should be able to pull at least 3 16byte blocks from this. Smaller isn't really beneficial.
-			{
-				U8* __restrict aligned_source = LL_NEXT_ALIGNED_ADDRESS(source);
-				U8* __restrict aligned_dest = LL_NEXT_ALIGNED_ADDRESS(dest);
-				const U32 source_offset = aligned_source - source;	//Offset to first aligned location in source buffer.
-				const U32 dest_offset = aligned_dest - dest;		//Offset to first aligned location in dest buffer.
-				llassert_always(source_offset < 16);
-				llassert_always(dest_offset < 16);
-				if(source_offset == dest_offset)	//delta to aligned location matches between source and destination! _mm_*_ps should be viable.
-				{
-					const U32 end_offset = (bytes - source_offset) % sizeof(LLVector4);		//buffers may not neatly end on a 16byte alignment boundary.
-					const U32 aligned_bytes = bytes - source_offset - end_offset;	//how many bytes to copy from aligned start to aligned end.
-
-					llassert_always(aligned_bytes > 0);
-
-					if(source_offset)	//memcpy up to the aligned location if needed
-						memcpy(dest,source,source_offset);
-					LLVector4a::memcpyNonAliased16((F32*) aligned_dest, (F32*) aligned_source, aligned_bytes);
-					if(end_offset)		//memcpy to the very end if needed.
-						memcpy(aligned_dest+aligned_bytes,aligned_source+aligned_bytes,end_offset);
-				}
-				else	//buffers non-uniformly offset from aligned location. Using _mm_*u_ps.
-				{
-					U32 end = bytes/sizeof(LLVector4);	//sizeof(LLVector4) = 16 bytes = 128 bits
-
-					llassert_always(end > 0);
-
-					__m128* dst = (__m128*) dest;
-					__m128* src = (__m128*) source;			
-
-					for (U32 i = 0; i < end; i++)	//copy 128bit chunks
-					{
-						__m128 res = _mm_loadu_ps((F32*)&src[i]);
-						_mm_storeu_ps((F32*)&dst[i], res);
-					}
-					end*=16;//Convert to real byte offset
-					if(end < bytes)	//just memcopy the rest
-						memcpy(dest+end,source+end,bytes-end);
-				}
-			}
-			else	//Too small. just do a simple memcpy.
-				memcpy(dest,source,bytes);
-		}
-		else
-		{
-			for(U32 i=0;i<elem_count;i++)
-			{
-				memcpy(dest,source,sizeof(Object));
-				dest+=mSkip;
-				source+=elem_size;
-			}
-		}
-	}*/
+	
 };
 
 #endif // LL_LLSTRIDER_H
diff --git a/indra/llcommon/lltypeinfolookup.h b/indra/llcommon/lltypeinfolookup.h
new file mode 100644
index 000000000..7510cc12e
--- /dev/null
+++ b/indra/llcommon/lltypeinfolookup.h
@@ -0,0 +1,110 @@
+/**
+ * @file   lltypeinfolookup.h
+ * @author Nat Goodspeed
+ * @date   2012-04-08
+ * @brief  Template data structure like std::map<std::type_info*, T>
+ * 
+ * $LicenseInfo:firstyear=2012&license=viewerlgpl$
+ * Copyright (c) 2012, Linden Research, Inc.
+ * $/LicenseInfo$
+ */
+
+#if ! defined(LL_LLTYPEINFOLOOKUP_H)
+#define LL_LLTYPEINFOLOOKUP_H
+
+#include "llsortedvector.h"
+#include <typeinfo>
+
+/**
+ * LLTypeInfoLookup is specifically designed for use cases for which you might
+ * consider std::map<std::type_info*, VALUE>. We have several such data
+ * structures in the viewer. The trouble with them is that at least on Linux,
+ * you can't rely on always getting the same std::type_info* for a given type:
+ * different load modules will produce different std::type_info*.
+ * LLTypeInfoLookup contains a workaround to address this issue.
+ *
+ * Specifically, when we don't find the passed std::type_info*,
+ * LLTypeInfoLookup performs a linear search over registered entries to
+ * compare name() strings. Presuming that this succeeds, we cache the new
+ * (previously unrecognized) std::type_info* to speed future lookups.
+ *
+ * This worst-case fallback search (linear search with string comparison)
+ * should only happen the first time we look up a given type from a particular
+ * load module other than the one from which we initially registered types.
+ * (However, a lookup which wouldn't succeed anyway will always have
+ * worst-case performance.) This class is probably best used with less than a
+ * few dozen different types.
+ */
+template <typename VALUE>
+class LLTypeInfoLookup
+{
+public:
+    typedef LLTypeInfoLookup<VALUE> self;
+    typedef LLSortedVector<const std::type_info*, VALUE> vector_type;
+    typedef typename vector_type::key_type key_type;
+    typedef typename vector_type::mapped_type mapped_type;
+    typedef typename vector_type::value_type value_type;
+    typedef typename vector_type::iterator iterator;
+    typedef typename vector_type::const_iterator const_iterator;
+
+    LLTypeInfoLookup() {}
+
+    iterator begin() { return mVector.begin(); }
+    iterator end()   { return mVector.end(); }
+    const_iterator begin() const { return mVector.begin(); }
+    const_iterator end()   const { return mVector.end(); }
+    bool empty() const { return mVector.empty(); }
+    std::size_t size() const { return mVector.size(); }
+
+    std::pair<iterator, bool> insert(const std::type_info* key, const VALUE& value)
+    {
+        return insert(value_type(key, value));
+    }
+
+    std::pair<iterator, bool> insert(const value_type& pair)
+    {
+        return mVector.insert(pair);
+    }
+
+    // const find() forwards to non-const find(): this can alter mVector!
+    const_iterator find(const std::type_info* key) const
+    {
+        return const_cast<self*>(this)->find(key);
+    }
+
+    // non-const find() caches previously-unknown type_info* to speed future
+    // lookups.
+    iterator find(const std::type_info* key)
+    {
+        iterator found = mVector.find(key);
+        if (found != mVector.end())
+        {
+            // If LLSortedVector::find() found, great, we're done.
+            return found;
+        }
+        // Here we didn't find the passed type_info*. On Linux, though, even
+        // for the same type, typeid(sametype) produces a different type_info*
+        // when used in different load modules. So the fact that we didn't
+        // find the type_info* we seek doesn't mean this type isn't
+        // registered. Scan for matching name() string.
+        for (typename vector_type::iterator ti(mVector.begin()), tend(mVector.end());
+             ti != tend; ++ti)
+        {
+            if (std::string(ti->first->name()) == key->name())
+            {
+                // This unrecognized 'key' is for the same type as ti->first.
+                // To speed future lookups, insert a new entry that lets us
+                // look up ti->second using this same 'key'.
+                return insert(key, ti->second).first;
+            }
+        }
+        // We simply have never seen a type with this type_info* from any load
+        // module.
+        return mVector.end();
+    }
+
+private:
+    vector_type mVector;
+};
+
+#endif /* ! defined(LL_LLTYPEINFOLOOKUP_H) */
diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h
index 3eaf74b04..3782ff1cf 100644
--- a/indra/llimage/llimage.h
+++ b/indra/llimage/llimage.h
@@ -35,8 +35,8 @@
 
 #include "lluuid.h"
 #include "llstring.h"
-#include "llmemtype.h"
 #include "llthread.h"
+#include "llmemtype.h"
 #include "aithreadsafe.h"
 
 const S32 MIN_IMAGE_MIP =  2; // 4x4, only used for expand/contract power of 2
diff --git a/indra/llmessage/llxfer.h b/indra/llmessage/llxfer.h
index 989e8b2ca..f9348eb11 100644
--- a/indra/llmessage/llxfer.h
+++ b/indra/llmessage/llxfer.h
@@ -29,6 +29,7 @@
 
 #include "message.h"
 #include "lltimer.h"
+#include "llextendedstatus.h"
 
 const S32 LL_XFER_LARGE_PAYLOAD = 7680;
 
diff --git a/indra/llui/CMakeLists.txt b/indra/llui/CMakeLists.txt
index 92a54d021..22651bd5d 100644
--- a/indra/llui/CMakeLists.txt
+++ b/indra/llui/CMakeLists.txt
@@ -12,7 +12,6 @@ include(LLRender)
 include(LLWindow)
 include(LLVFS)
 include(LLXML)
-include(LLXUIXML)
 
 include_directories(
     ${LLCOMMON_INCLUDE_DIRS}
@@ -24,7 +23,6 @@ include_directories(
     ${LLWINDOW_INCLUDE_DIRS}
     ${LLVFS_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
-    ${LLXUIXML_INCLUDE_DIRS}
     )
 
 set(llui_SOURCE_FILES
@@ -73,6 +71,7 @@ set(llui_SOURCE_FILES
     lltextparser.cpp
     lltrans.cpp
     llui.cpp
+    lluicolor.cpp
     lluictrl.cpp
     lluictrlfactory.cpp
     lluiimage.cpp
@@ -142,6 +141,7 @@ set(llui_HEADER_FILES
     lluictrl.h
     lluifwd.h
     llui.h
+    lluicolor.h
     lluiimage.h
     lluistring.h
     lluixmltags.h
@@ -165,7 +165,6 @@ target_link_libraries(llui
     llwindow
     llimage
     llvfs       # ugh, just for LLDir
-    llxuixml
     llxml
     llcommon    # must be after llimage, llwindow, llrender
     llmath
diff --git a/indra/llxuixml/lluicolor.cpp b/indra/llui/lluicolor.cpp
similarity index 100%
rename from indra/llxuixml/lluicolor.cpp
rename to indra/llui/lluicolor.cpp
diff --git a/indra/llxuixml/lluicolor.h b/indra/llui/lluicolor.h
similarity index 100%
rename from indra/llxuixml/lluicolor.h
rename to indra/llui/lluicolor.h
diff --git a/indra/llxuixml/CMakeLists.txt b/indra/llxuixml/CMakeLists.txt
deleted file mode 100644
index bc98a43bd..000000000
--- a/indra/llxuixml/CMakeLists.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- cmake -*-
-
-project(llxuixml)
-
-include(00-Common)
-include(LLCommon)
-include(LLMath)
-include(LLXML)
-
-include_directories(
-    ${LLCOMMON_INCLUDE_DIRS}
-    ${LLMATH_INCLUDE_DIRS}
-    ${LLXML_INCLUDE_DIRS}
-    )
-
-set(llxuixml_SOURCE_FILES
-    llinitparam.cpp
-    lluicolor.cpp
-    )
-    
-set(llxuixml_HEADER_FILES
-    CMakeLists.txt
-
-    llinitparam.h
-    lluicolor.h
-    )
-
-set_source_files_properties(${llxuixml_HEADER_FILES}
-                            PROPERTIES HEADER_FILE_ONLY TRUE)
-
-list(APPEND llxuixml_SOURCE_FILES ${llxuixml_HEADER_FILES})
-
-add_library (llxuixml ${llxuixml_SOURCE_FILES})
-# Libraries on which this library depends, needed for Linux builds
-# Sort by high-level to low-level
-target_link_libraries(llxuixml
-    llxml
-    llcommon
-    llmath
-    )
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index c41698c34..91203f19b 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -37,7 +37,6 @@ include(LLUI)
 include(LLVFS)
 include(LLWindow)
 include(LLXML)
-include(LLXUIXML)
 include(LScript)
 include(Linking)
 include(NDOF)
@@ -72,7 +71,6 @@ include_directories(
     ${LLVFS_INCLUDE_DIRS}
     ${LLWINDOW_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
-    ${LLXUIXML_INCLUDE_DIRS}
     ${LSCRIPT_INCLUDE_DIRS}
     ${LSCRIPT_INCLUDE_DIRS}/lscript_compile
     )
@@ -98,11 +96,7 @@ set(viewer_SOURCE_FILES
     ascentprefschat.cpp
     ascentprefssys.cpp
     ascentprefsvan.cpp
-	#dhparam.cpp
-	#dsaparam.cpp
     emeraldboobutils.cpp
-    dofloaterhex.cpp
-    dohexeditor.cpp
     floatersculptpreview.cpp
     hbfloatergrouptitles.cpp
     hgfloatertexteditor.cpp
@@ -593,8 +587,6 @@ set(viewer_HEADER_FILES
     ascentprefssys.h
     ascentprefsvan.h
     emeraldboobutils.h
-    dofloaterhex.h
-    dohexeditor.h
     floatersculptpreview.h
     hbfloatergrouptitles.h
     hgfloatertexteditor.h
@@ -1548,7 +1540,6 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${LLVFS_LIBRARIES}
     ${LLWINDOW_LIBRARIES}
     ${LLXML_LIBRARIES}
-    ${LLXUIXML_LIBRARIES}
     ${LSCRIPT_LIBRARIES}
     ${LLMATH_LIBRARIES}
     ${LLCOMMON_LIBRARIES}
diff --git a/indra/newview/dhparam.cpp b/indra/newview/dhparam.cpp
deleted file mode 100644
index 917eb714d..000000000
--- a/indra/newview/dhparam.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Generated using openssl */
-#include "llviewerprecompiledheaders.h"
-#include <openssl/dh.h>
-
-DH *get_dh2048()
-	{
-	static unsigned char dh2048_p[]={
-		0xAC,0x31,0xAA,0xFD,0x76,0x1B,0x47,0x24,0x99,0x6D,0xF8,0xD5,
-		0x5B,0x4B,0xD1,0x7E,0xF9,0x1A,0x41,0xF6,0x29,0xCC,0xA9,0x02,
-		0x6B,0xED,0xFD,0xC9,0x37,0xCE,0xF6,0x11,0x78,0x6F,0x37,0x38,
-		0x7D,0x49,0x3F,0x78,0x36,0x83,0x0A,0x6F,0xBA,0x6F,0x74,0xD9,
-		0xB1,0xC1,0xC4,0x5A,0x7D,0x84,0x26,0x56,0x8B,0x53,0xF4,0xFE,
-		0xD1,0x34,0xF1,0xE0,0x08,0x65,0xA6,0xFD,0xDB,0x5D,0xAC,0x14,
-		0xCD,0xC9,0x7E,0x79,0xE9,0x3B,0xAF,0x92,0xC7,0x4D,0x91,0x15,
-		0x0B,0x1E,0x2F,0x0A,0x56,0x4E,0x0D,0x3A,0x4D,0x9E,0xB0,0xB5,
-		0xFC,0x0D,0xB1,0x55,0x40,0xC6,0x30,0x99,0xCD,0xE8,0x7E,0x72,
-		0x08,0x93,0x9C,0x7F,0x55,0x23,0x27,0x09,0xF4,0x50,0xF2,0x96,
-		0xB5,0x30,0x35,0x6A,0x99,0x4C,0xD6,0x85,0x72,0x8D,0x9C,0x19,
-		0x70,0x9A,0x77,0x52,0xE8,0x33,0x03,0x7A,0x00,0xDA,0xFE,0xD7,
-		0x98,0xD0,0x7B,0x26,0xBA,0xD7,0xFF,0xD1,0x49,0x61,0x27,0x3E,
-		0xFC,0x12,0x81,0xC9,0xB0,0xAF,0x34,0x14,0x97,0x66,0xFB,0xEF,
-		0xD3,0xFE,0xC9,0x01,0x25,0xEC,0xF4,0xE8,0xA8,0xD8,0x21,0x45,
-		0x20,0x6F,0xFC,0xA8,0xB3,0xCE,0xCF,0x0D,0xA1,0x14,0xCC,0x38,
-		0x81,0x74,0x6A,0x5E,0x36,0x09,0x1D,0xBE,0x4C,0x08,0x52,0x5E,
-		0xC2,0x5F,0xA4,0x48,0x3A,0x71,0x85,0xF2,0x97,0x32,0xEC,0x3B,
-		0xFB,0x1B,0x9A,0x8A,0x4B,0x20,0x32,0xFE,0x6A,0x94,0x4C,0x02,
-		0xB2,0xD7,0xC3,0x1B,0xF8,0x90,0x54,0x76,0x70,0x49,0x81,0x86,
-		0x30,0x12,0xD2,0x91,0xF0,0xFD,0x1B,0x53,0x2E,0x60,0x13,0x78,
-		0x8B,0x3F,0x1B,0x13,
-		};
-	static unsigned char dh2048_g[]={
-		0x05,
-		};
-	DH *dh;
-
-	if ((dh=DH_new()) == NULL) return(NULL);
-	dh->p=BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
-	dh->g=BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
-	if ((dh->p == NULL) || (dh->g == NULL))
-		{ DH_free(dh); return(NULL); }
-	return(dh);
-	}
diff --git a/indra/newview/dofloaterhex.cpp b/indra/newview/dofloaterhex.cpp
deleted file mode 100644
index ed700be4c..000000000
--- a/indra/newview/dofloaterhex.cpp
+++ /dev/null
@@ -1,503 +0,0 @@
-/**
- * @file dofloaterhex.h
- * @brief Hex Editor Floater made by Day
- * @author Day Oh
- * 
- * $LicenseInfo:firstyear=2009&license=WTFPLV2$
- *  
- */
-
-// <edit>
-
-#include "llviewerprecompiledheaders.h"
-
-#include "dofloaterhex.h"
-#include "lluictrlfactory.h"
-#include "llinventorybackup.h" // for downloading
-#include "llviewercontrol.h" // gSavedSettings
-#include "llviewerwindow.h" // alertXML
-#include "llagent.h" // gAgent getID
-#include "llviewermenufile.h"
-#include "llviewerregion.h" // getCapability
-#include "llassetuploadresponders.h" // LLUpdateAgentInventoryResponder
-#include "llinventorymodel.h" // gInventory.updateItem
-#include "llappviewer.h" // System Folders
-#include "llfloaterperms.h" //get default perms
-#include "llnotificationsutil.h"
-
-std::list<DOFloaterHex*> DOFloaterHex::sInstances;
-S32 DOFloaterHex::sUploadAmount = 10;
-
-DOFloaterHex::DOFloaterHex(LLUUID item_id, BOOL vfs, LLAssetType::EType asset_type)
-:	LLFloater()
-{
-	sInstances.push_back(this);
-
-	mVFS = vfs;
-
-	//we are editing an asset directly from the VFS
-	if(vfs)
-	{
-		mAssetId = item_id;
-		mAssetType = asset_type;
-
-	//we are editing an inventory item
-	} else {
-		mItem = (LLInventoryItem*)gInventory.getItem(item_id);
-		mAssetId = mItem->getAssetUUID();
-		mAssetType = mItem->getType();
-	}
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_hex.xml");
-}
-
-//this bit should be rewritten entirely
-void DOFloaterHex::show(LLUUID item_id, BOOL vfs, LLAssetType::EType asset_type)
-{
-	if(!vfs)
-	{
-		LLInventoryItem* item = (LLInventoryItem*)gInventory.getItem(item_id);
-		if(item)
-		{
-			S32 left, top;
-			gFloaterView->getNewFloaterPosition(&left, &top);
-			LLRect rect = gSavedSettings.getRect("FloaterHexRect");
-			rect.translate(left - rect.mLeft, top - rect.mTop);
-
-			DOFloaterHex* floaterp = new DOFloaterHex(item_id);
-			floaterp->setRect(rect);
-
-			gFloaterView->adjustToFitScreen(floaterp, FALSE);
-		}
-	} else if (item_id.notNull() && asset_type != LLAssetType::AT_NONE) {
-		S32 left, top;
-		gFloaterView->getNewFloaterPosition(&left, &top);
-		LLRect rect = gSavedSettings.getRect("FloaterHexRect");
-		rect.translate(left - rect.mLeft, top - rect.mTop);
-		DOFloaterHex* floaterp = new DOFloaterHex(item_id, true, asset_type);
-		floaterp->setRect(rect);
-
-		llinfos << "Asset ID: " << item_id.asString() << llendl;
-
-		gFloaterView->adjustToFitScreen(floaterp, FALSE);
-	}
-}
-
-DOFloaterHex::~DOFloaterHex()
-{
-	sInstances.remove(this);
-}
-
-void DOFloaterHex::close(bool app_quitting)
-{
-	LLFloater::close(app_quitting);
-}
-
-BOOL DOFloaterHex::postBuild(void)
-{
-	DOHexEditor* editor = getChild<DOHexEditor>("hex");
-	mEditor = editor;
-#ifndef COLUMN_SPAN
-	// Set number of columns
-	U8 columns = U8(gSavedSettings.getU32("HexEditorColumns"));
-	editor->setColumns(columns);
-	// Reflect clamped U8ness in settings
-	gSavedSettings.setU32("HexEditorColumns", U32(columns));
-#endif
-	handleSizing();
-
-	childSetEnabled("upload_btn", false);
-	childSetLabelArg("upload_btn", "[UPLOAD]", std::string("Upload"));
-	childSetAction("upload_btn", onClickUpload, this);
-	childSetEnabled("save_btn", false);
-	childSetAction("save_btn", onClickSave, this);
-
-	if(!mVFS && mItem)
-	{
-		std::string title = "Hex editor: " + mItem->getName();
-		const char* asset_type_name = LLAssetType::lookup(mItem->getType());
-		if(asset_type_name)
-		{
-			title.append(" (" + std::string(asset_type_name) + ")");
-		}
-		setTitle(title);
-	}
-	if(!mVFS)
-	{
-		// Load the asset
-		editor->setVisible(FALSE);
-		childSetText("status_text", std::string("Loading..."));
-		LLInventoryBackup::download(mItem, this, imageCallback, assetCallback);
-	}
-	else if (mVFS) //the asset already exists in the VFS, we don't need to fetch it
-		           //and we don't want to associate it with an item
-	{
-		setTitle(mAssetId.asString());
-		readVFile();
-	} else {
-		this->close(false);
-	}
-
-	return TRUE;
-}
-
-// static
-void DOFloaterHex::imageCallback(BOOL success, 
-					LLViewerFetchedTexture *src_vi,
-					LLImageRaw* src, 
-					LLImageRaw* aux_src, 
-					S32 discard_level,
-					BOOL final,
-					void* userdata)
-{
-
-	if(final)
-	{
-		LLInventoryBackup::callbackdata* data = static_cast<LLInventoryBackup::callbackdata*>(userdata);
-		DOFloaterHex* floater = (DOFloaterHex*)(data->floater);
-		if(!floater) return;
-		if(std::find(sInstances.begin(), sInstances.end(), floater) == sInstances.end()) return; // no more crash
-		//LLInventoryItem* item = data->item;
-
-		if(!success)
-		{
-			floater->childSetText("status_text", std::string("Unable to download asset."));
-			return;
-		}
-
-		U8* src_data = src->getData();
-		S32 size = src->getDataSize();
-		std::vector<U8> new_data;
-		for(S32 i = 0; i < size; i++)
-			new_data.push_back(src_data[i]);
-
-		floater->mEditor->setValue(new_data);
-		floater->mEditor->setVisible(TRUE);
-		floater->childSetText("status_text", std::string("Note: Image data shown isn't the actual asset data, yet"));
-
-		floater->childSetEnabled("save_btn", false);
-		floater->childSetEnabled("upload_btn", true);
-		floater->childSetLabelArg("upload_btn", "[UPLOAD]", std::string("Upload (L$10)"));
-	}
-	else
-	{
-		src_vi->setBoostLevel(LLViewerTexture::BOOST_UI);
-	}
-}
-
-// static
-void DOFloaterHex::assetCallback(LLVFS *vfs,
-				   const LLUUID& asset_uuid,
-				   LLAssetType::EType type,
-				   void* user_data, S32 status, LLExtStat ext_status)
-{
-
-	LLInventoryBackup::callbackdata* data = static_cast<LLInventoryBackup::callbackdata*>(user_data);
-	DOFloaterHex* floater = (DOFloaterHex*)(data->floater);
-	if(!floater) return;
-	if(std::find(sInstances.begin(), sInstances.end(), floater) == sInstances.end()) return; // no more crash
-	LLInventoryItem* item = data->item;
-
-	if(status != 0 && item->getType() != LLAssetType::AT_NOTECARD)
-	{
-		floater->childSetText("status_text", std::string("Unable to download asset."));
-		return;
-	}
-
-	// Todo: this doesn't work for static vfs shit
-	LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
-	S32 size = file.getSize();
-
-	char* buffer = new char[size];
-	if (buffer == NULL)
-	{
-		llerrs << "Memory Allocation Failed" << llendl;
-		return;
-	}
-
-	file.read((U8*)buffer, size);
-
-	std::vector<U8> new_data;
-	for(S32 i = 0; i < size; i++)
-		new_data.push_back(buffer[i]);
-
-	delete[] buffer;
-
-	floater->mEditor->setValue(new_data);
-	floater->mEditor->setVisible(TRUE);
-	floater->childSetText("status_text", std::string(""));
-
-	floater->childSetEnabled("upload_btn", true);
-	floater->childSetEnabled("save_btn", false);
-	if(item->getPermissions().allowModifyBy(gAgent.getID()))
-	{
-		switch(item->getType())
-		{
-		case LLAssetType::AT_TEXTURE:
-		case LLAssetType::AT_ANIMATION:
-		case LLAssetType::AT_SOUND:
-			floater->childSetLabelArg("upload_btn", "[UPLOAD]", std::string("Upload (L$10)"));
-			break;
-		case LLAssetType::AT_LANDMARK:
-		case LLAssetType::AT_CALLINGCARD:
-			floater->childSetEnabled("upload_btn", false);
-			floater->childSetEnabled("save_btn", false);
-			break;
-		default:
-			floater->childSetEnabled("save_btn", true);
-			break;
-		}
-	}
-	else
-	{
-		switch(item->getType())
-		{
-		case LLAssetType::AT_TEXTURE:
-		case LLAssetType::AT_ANIMATION:
-		case LLAssetType::AT_SOUND:
-			floater->childSetLabelArg("upload_btn", "[UPLOAD]", std::string("Upload (L$10)"));
-			break;
-		default:
-			break;
-		}
-	}
-
-	// Never enable save if it's a pretend item
-	if(gInventory.isObjectDescendentOf(item->getUUID(), gSystemFolderRoot))
-	{
-		floater->childSetEnabled("save_btn", false);
-	}
-}
-
-// static
-void DOFloaterHex::onClickUpload(void* user_data)
-{
-
-	DOFloaterHex* floater = (DOFloaterHex*)user_data;
-	LLInventoryItem* item = floater->mItem;
-
-	LLTransactionID transaction_id;
-	transaction_id.generate();
-	LLUUID fake_asset_id = transaction_id.makeAssetID(gAgent.getSecureSessionID());
-
-	std::vector<U8> value = floater->mEditor->getValue();
-	int size = value.size();
-	U8* buffer = new U8[size];
-	for(int i = 0; i < size; i++)
-		buffer[i] = value[i];
-	value.clear();
-
-	LLVFile file(gVFS, fake_asset_id, item->getType(), LLVFile::APPEND);
-	file.setMaxSize(size);
-	if (!file.write(buffer, size))
-	{
-		LLSD args;
-		args["ERROR_MESSAGE"] = "Couldn't write data to file";
-		LLNotificationsUtil::add("ErrorMessage", args);
-		return;
-	}
-	delete[] buffer;
-	
-	LLAssetStorage::LLStoreAssetCallback callback = NULL;
-	void *fake_user_data = NULL;
-
-	if(item->getType() != LLAssetType::AT_GESTURE && item->getType() != LLAssetType::AT_LSL_TEXT
-		&& item->getType() != LLAssetType::AT_NOTECARD)
-	{
-		upload_new_resource(transaction_id, 
-			item->getType(), 
-			item->getName(), 
-			item->getDescription(), 
-			0, 
-			LLFolderType::assetTypeToFolderType(item->getType()), 
-			item->getInventoryType(), 
-			LLFloaterPerms::getNextOwnerPerms(), LLFloaterPerms::getGroupPerms(), LLFloaterPerms::getEveryonePerms(),
-			item->getName(),  
-			callback, 
-			sUploadAmount,
-			fake_user_data);
-	}
-	else // gestures and scripts, create an item first
-	{ // AND notecards
-		//if(item->getType() == LLAssetType::AT_NOTECARD) gDontOpenNextNotecard = true;
-		create_inventory_item(	gAgent.getID(),
-									gAgent.getSessionID(),
-									item->getParentUUID(), //gInventory.findCategoryUUIDForType(item->getType()),
-									LLTransactionID::tnull,
-									item->getName(),
-									fake_asset_id.asString(),
-									item->getType(),
-									item->getInventoryType(),
-									(LLWearableType::EType)item->getFlags(),
-									PERM_ITEM_UNRESTRICTED,
-									new NewResourceItemCallback);
-	}
-}
-
-struct LLSaveInfo
-{
-	LLSaveInfo(DOFloaterHex* floater, LLTransactionID transaction_id)
-		: mFloater(floater), mTransactionID(transaction_id)
-	{
-	}
-
-	DOFloaterHex* mFloater;
-	LLTransactionID mTransactionID;
-};
-
-// static
-void DOFloaterHex::onClickSave(void* user_data)
-{
-	DOFloaterHex* floater = (DOFloaterHex*)user_data;
-	LLInventoryItem* item = floater->mItem;
-
-	LLTransactionID transaction_id;
-	transaction_id.generate();
-	LLUUID fake_asset_id = transaction_id.makeAssetID(gAgent.getSecureSessionID());
-
-	std::vector<U8> value = floater->mEditor->getValue();
-	int size = value.size();
-	U8* buffer = new U8[size];
-	for(int i = 0; i < size; i++)
-		buffer[i] = value[i];
-	value.clear();
-
-	LLVFile file(gVFS, fake_asset_id, item->getType(), LLVFile::APPEND);
-	file.setMaxSize(size);
-	if (!file.write(buffer, size))
-	{
-		LLSD args;
-		args["ERROR_MESSAGE"] = "Couldn't write data to file";
-		LLNotificationsUtil::add("ErrorMessage", args);
-		return;
-	}
-	delete[] buffer;
-
-
-	bool caps = false;
-	std::string url;
-	LLSD body;
-	body["item_id"] = item->getUUID();
-
-	switch(item->getType())
-	{
-	case LLAssetType::AT_GESTURE:
-		url = gAgent.getRegion()->getCapability("UpdateGestureAgentInventory");
-		caps = true;
-		break;
-	case LLAssetType::AT_LSL_TEXT:
-		url = gAgent.getRegion()->getCapability("UpdateScriptAgent");
-		body["target"] = "mono";
-		caps = true;
-		break;
-	case LLAssetType::AT_NOTECARD:
-		url = gAgent.getRegion()->getCapability("UpdateNotecardAgentInventory");
-		caps = true;
-		break;
-	default: // wearables & notecards, Oct 12 2009
-		// ONLY WEARABLES, Oct 15 2009
-		floater->childSetText("status_text", std::string("Saving..."));
-		LLSaveInfo* info = new LLSaveInfo(floater, transaction_id);
-		gAssetStorage->storeAssetData(transaction_id, item->getType(), onSaveComplete, info);
-		caps = false;
-		break;
-	}
-
-	if(caps)
-	{
-		LLHTTPClient::post(url, body,
-					new LLUpdateAgentInventoryResponder(body, fake_asset_id, item->getType()));
-	}
-}
-
-void DOFloaterHex::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status)
-{
-	LLSaveInfo* info = (LLSaveInfo*)user_data;
-	DOFloaterHex* floater = info->mFloater;
-	if(std::find(sInstances.begin(), sInstances.end(), floater) == sInstances.end()) return; // no more crash
-	LLInventoryItem* item = floater->mItem;
-
-	floater->childSetText("status_text", std::string(""));
-
-	if(item && (status == 0))
-	{
-		LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item);
-		new_item->setDescription(item->getDescription());
-		new_item->setTransactionID(info->mTransactionID);
-		new_item->setAssetUUID(asset_uuid);
-		new_item->updateServer(FALSE);
-		gInventory.updateItem(new_item);
-		gInventory.notifyObservers();
-	}
-	else
-	{
-		LLSD args;
-		args["ERROR_MESSAGE"] = llformat("Upload failed with status %d, also %d", status, ext_status);
-		LLNotificationsUtil::add("ErrorMessage", args);
-	}
-}
-
-void DOFloaterHex::onCommitColumnCount(LLUICtrl *control, void *user_data)
-{
-	if(control && user_data)
-	{
-		DOFloaterHex *instance = (DOFloaterHex *)user_data;
-		U8 columns = llclamp<U8>((U8)llfloor(control->getValue().asReal()), 0x00, 0xFF);
-		instance->mEditor->setColumns(columns);
-		gSavedSettings.setU32("HexEditorColumns", (U32)instance->mEditor->getColumns());
-		instance->handleSizing();
-	}
-}
-
-void DOFloaterHex::handleSizing()
-{
-	// Reshape a little based on columns
-	S32 min_width = S32(mEditor->getSuggestedWidth(MIN_COLS)) + 20;
-	setResizeLimits(min_width, getMinHeight());
-	if(getRect().getWidth() < min_width)
-	{
-		//LLRect rect = getRect();
-		//rect.setOriginAndSize(rect.mLeft, rect.mBottom, min_width, rect.getHeight());
-		//setRect(rect);
-
-		reshape(min_width, getRect().getHeight(), FALSE);
-		mEditor->reshape(mEditor->getRect().getWidth(), mEditor->getRect().getHeight(), TRUE);
-	}
-}
-
-void DOFloaterHex::readVFile()
-{
-	if(!mVFS) return;
-	// quick cut paste job
-	// Todo: this doesn't work for static vfs shit
-	LLVFile file(gVFS, mAssetId, mAssetType, LLVFile::READ);
-	if(file.getVFSThread())
-	{
-		S32 size = file.getSize();
-
-		char* buffer = new char[size];
-		if (buffer == NULL)
-		{
-			llerrs << "Memory Allocation Failed" << llendl;
-			return;
-		}
-
-		file.read((U8*)buffer, size);
-
-		std::vector<U8> new_data;
-		for(S32 i = 0; i < size; i++)
-			new_data.push_back(buffer[i]);
-
-		delete[] buffer;
-
-		mEditor->setValue(new_data);
-		mEditor->setVisible(TRUE);
-
-	}
-
-	childSetText("status_text", std::string("Editing VFile"));
-
-	childSetEnabled("upload_btn", false);
-	childSetEnabled("save_btn", false);
-}
-
-// </edit>
diff --git a/indra/newview/dofloaterhex.h b/indra/newview/dofloaterhex.h
deleted file mode 100644
index 62ef709d8..000000000
--- a/indra/newview/dofloaterhex.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// <edit>
-
-
-#ifndef LL_LLFLOATERHEX_H
-#define LL_LLFLOATERHEX_H
-
-#include "llfloater.h"
-#include "dohexeditor.h"
-#include "llinventory.h"
-#include "llviewertexture.h"
-#include "llassettype.h"
-
-class DOFloaterHex
-: public LLFloater
-{
-public:
-	DOFloaterHex(LLUUID item_id, BOOL vfs=false, LLAssetType::EType asset_type = LLAssetType::AT_NONE);
-	static void show(LLUUID item_id, BOOL vfs=false, LLAssetType::EType asset_type = LLAssetType::AT_NONE);
-	BOOL postBuild(void);
-	void close(bool app_quitting);
-	static void imageCallback(BOOL success, 
-					LLViewerFetchedTexture *src_vi,
-					LLImageRaw* src, 
-					LLImageRaw* aux_src, 
-					S32 discard_level,
-					BOOL final,
-					void* userdata);
-	static void assetCallback(LLVFS *vfs,
-				   const LLUUID& asset_uuid,
-				   LLAssetType::EType type,
-				   void* user_data, S32 status, LLExtStat ext_status);
-	static void onClickSave(void* user_data);
-	static void onClickUpload(void* user_data);
-	static void onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status);
-	static void onCommitColumnCount(LLUICtrl *control, void *user_data);
-	void handleSizing();
-	void readVFile();
-	LLInventoryItem* mItem;
-	LLUUID mAssetId;
-	LLAssetType::EType mAssetType;
-	BOOL mVFS;
-	DOHexEditor* mEditor;
-	static std::list<DOFloaterHex*> sInstances;
-private:
-	virtual ~DOFloaterHex();
-protected:
-	static S32 sUploadAmount;
-};
-
-#endif
-// </edit>
diff --git a/indra/newview/dohexeditor.cpp b/indra/newview/dohexeditor.cpp
deleted file mode 100644
index 046360785..000000000
--- a/indra/newview/dohexeditor.cpp
+++ /dev/null
@@ -1,1243 +0,0 @@
-/**
- * @file dohexeditor.cpp
- * @brief DOHexEditor Widget
- * @author Day Oh
- * 
- * $LicenseInfo:firstyear=2009&license=WTFPLV2$
- *  
- */
-
-// <edit>
-#include "llviewerprecompiledheaders.h"
-
-#include "linden_common.h"
-#include "dohexeditor.h"
-#include "llfocusmgr.h"
-#include "llkeyboard.h"
-#include "llclipboard.h"
-#include "lllocalcliprect.h"
-#include "llwindow.h" // setCursor
-#include "lllocalinventory.h"
-
-static LLRegisterWidget<DOHexEditor> r("hex_editor");
-
-DOHexEditor::DOHexEditor(const std::string& name, const LLRect& rect)
-:	LLUICtrl(name, rect, TRUE, NULL, NULL),
-	LLEditMenuHandler(),
-	mColumns(16),
-	mCursorPos(0),
-	mSecondNibble(FALSE),
-	mSelecting(FALSE),
-	mHasSelection(FALSE),
-	mInData(FALSE),
-	mSelectionStart(0),
-	mSelectionEnd(0)
-{
-	mGLFont = LLFontGL::getFontMonospace();
-
-	mTextRect.setOriginAndSize( 
-		5, // border + padding
-		1, // border
-		getRect().getWidth() - SCROLLBAR_SIZE - 6,
-		getRect().getHeight() - 5);
-
-	S32 line_height = llround( mGLFont->getLineHeight() );
-	S32 page_size = mTextRect.getHeight() / line_height;
-
-	// Init the scrollbar
-	LLRect scroll_rect;
-	scroll_rect.setOriginAndSize( 
-		getRect().getWidth() - SCROLLBAR_SIZE,
-		1,
-		SCROLLBAR_SIZE,
-		getRect().getHeight() - 1);
-	S32 lines_in_doc = getLineCount();
-	mScrollbar = new LLScrollbar( std::string("Scrollbar"), scroll_rect,
-		LLScrollbar::VERTICAL,
-		lines_in_doc,						
-		0,						
-		page_size,
-		NULL, this );
-	mScrollbar->setFollowsRight();
-	mScrollbar->setFollowsTop();
-	mScrollbar->setFollowsBottom();
-	mScrollbar->setEnabled( TRUE );
-	mScrollbar->setVisible( TRUE );
-	mScrollbar->setOnScrollEndCallback(NULL, NULL);
-	addChild(mScrollbar);
-
-	mBorder = new LLViewBorder( std::string("text ed border"),
-							LLRect(0, getRect().getHeight(), getRect().getWidth(), 0),
-							LLViewBorder::BEVEL_IN,
-							LLViewBorder::STYLE_LINE,
-							1 ); // border width
-	addChild( mBorder );
-
-	changedLength();
-
-	mUndoBuffer = new LLUndoBuffer(DOUndoHex::create, 128);
-}
-
-DOHexEditor::~DOHexEditor()
-{
-	gFocusMgr.releaseFocusIfNeeded(this);
-}
-
-LLView* DOHexEditor::fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory)
-{
-	std::string name("text_editor");
-	node->getAttributeString("name", name);
-
-	LLRect rect;
-	createRect(node, rect, parent, LLRect());
-
-	DOHexEditor* editor = new DOHexEditor(name, rect);
-
-	editor->initFromXML(node, parent);
-
-	return editor;
-}
-
-void DOHexEditor::setValue(const LLSD& value)
-{
-	mValue = value.asBinary();
-	changedLength();
-}
-
-LLSD DOHexEditor::getValue() const
-{
-	return LLSD(mValue);
-}
-
-void DOHexEditor::setColumns(U8 columns)
-{
-	//mColumns = columns;
-	mColumns = llclamp<U8>(llfloor(columns), 8, 64); //clamp this ffs
-	changedLength();
-}
-
-U32 DOHexEditor::getLineCount()
-{
-	U32 lines = mValue.size();
-	lines /= mColumns;
-	lines++; // incomplete or extra line at bottom
-	return lines;
-}
-
-void DOHexEditor::getPosAndContext(S32 x, S32 y, BOOL force_context, U32& pos, BOOL& in_data, BOOL& second_nibble)
-{
-	pos = 0;
-
-	F32 line_height = mGLFont->getLineHeight();
-	F32 char_width = mGLFont->getWidthF32(".");
-	F32 data_column_width = char_width * 3; // " 00";
-	F32 text_x = mTextRect.mLeft;
-	F32 text_x_data = text_x + (char_width * 10.1f); // "00000000  ", dunno why it's a fraction off
-	F32 text_x_ascii = text_x_data + (data_column_width * mColumns) + (char_width * 2);
-	F32 text_y = (F32)(mTextRect.mTop - line_height);
-	U32 first_line = mScrollbar->getDocPos();
-	//U32 last_line = first_line + mScrollbar->getPageSize(); // don't -2 from scrollbar sizes
-	S32 first_line_y = text_y - line_height;
-
-	S32 ly = -(y - first_line_y); // negative vector from first line to y
-	ly -= 5; // slight skew
-	S32 line = ly / line_height;
-	if(line < 0) line = 0;
-	line += first_line;
-
-	if(!force_context)
-	{
-		in_data = (x < (text_x_ascii - char_width)); // char width for less annoying
-	}
-	S32 lx = x;
-	S32 offset;
-	if(in_data)
-	{
-		lx -= char_width; // subtracting char width because idk
-		lx -= text_x_data;
-		offset = lx / data_column_width;
-
-		// Now, which character
-		S32 rem = S32( (F32)lx - (data_column_width * offset) - (char_width * 0.25) );
-		if(rem > 0)
-		{
-			if(rem > char_width)
-			{
-				offset++; // next byte
-				second_nibble = FALSE;
-			}
-			else second_nibble = TRUE;
-		}
-		else second_nibble = FALSE;
-	}
-	else
-	{
-		second_nibble = FALSE;
-		lx += char_width; // adding char width because idk
-		lx -= text_x_ascii;
-		offset = lx / char_width;
-	}
-	if(offset < 0) offset = 0;
-	if(offset >= mColumns)//offset = mColumns - 1;
-	{
-		offset = 0;
-		line++;
-		second_nibble = FALSE;
-	}
-
-	pos = (line * mColumns) + offset;
-	if(pos < 0) pos = 0;
-	if(pos > mValue.size()) pos = mValue.size();
-	if(pos == mValue.size())
-	{
-		second_nibble = FALSE;
-	}
-}
-
-void DOHexEditor::changedLength()
-{
-	S32 line_height = llround( mGLFont->getLineHeight() );
-	S32 page_size = mTextRect.getHeight() / line_height;
-	page_size -= 2; // don't count the spacer and header
-
-	mScrollbar->setDocSize(getLineCount());
-	mScrollbar->setPageSize(page_size);
-
-	moveCursor(mCursorPos, mSecondNibble); // cursor was off end after undo of paste
-}
-
-void DOHexEditor::reshape(S32 width, S32 height, BOOL called_from_parent)
-{
-	LLView::reshape( width, height, called_from_parent );
-	mTextRect.setOriginAndSize( 
-		5, // border + padding
-		1, // border
-		getRect().getWidth() - SCROLLBAR_SIZE - 6,
-		getRect().getHeight() - 5);
-	LLRect scrollrect;
-	scrollrect.setOriginAndSize( 
-		getRect().getWidth() - SCROLLBAR_SIZE,
-		1,
-		SCROLLBAR_SIZE,
-		getRect().getHeight() - 1);
-	mScrollbar->setRect(scrollrect);
-	mBorder->setRect(LLRect(0, getRect().getHeight(), getRect().getWidth(), 0));
-	changedLength();
-}
-
-void DOHexEditor::setFocus(BOOL b)
-{
-	if(b)
-	{
-		LLEditMenuHandler::gEditMenuHandler = this;
-	}
-	else
-	{
-		mSelecting = FALSE;
-		gFocusMgr.releaseFocusIfNeeded(this);
-		if(gEditMenuHandler == this)
-		{
-			gEditMenuHandler = NULL;
-		}
-	}
-	LLUICtrl::setFocus(b);
-}
-
-F32 DOHexEditor::getSuggestedWidth(U8 cols)
-{
-	cols = cols>1?cols:mColumns;
-	F32 char_width = mGLFont->getWidthF32(".");
-	F32 data_column_width = char_width * 3; // " 00";
-	F32 text_x = mTextRect.mLeft;
-	F32 text_x_data = text_x + (char_width * 10.1f); // "00000000  ", dunno why it's a fraction off
-	F32 text_x_ascii = text_x_data + (data_column_width * cols) + (char_width * 2);
-	F32 suggested_width = text_x_ascii + (char_width * cols);
-	suggested_width += mScrollbar->getRect().getWidth();
-	suggested_width += 10.0f;
-	return suggested_width;
-}
-
-U32 DOHexEditor::getProperSelectionStart()
-{
-	return (mSelectionStart < mSelectionEnd) ? mSelectionStart : mSelectionEnd;
-}
-
-U32 DOHexEditor::getProperSelectionEnd()
-{
-	return (mSelectionStart < mSelectionEnd) ? mSelectionEnd : mSelectionStart;
-}
-
-BOOL DOHexEditor::handleScrollWheel(S32 x, S32 y, S32 clicks)
-{
-	mScrollbar->handleScrollWheel( 0, 0, clicks );
-	return TRUE;
-}
-
-BOOL DOHexEditor::handleMouseDown(S32 x, S32 y, MASK mask)
-{
-	BOOL handled = FALSE;
-	handled = LLView::childrenHandleMouseDown(x, y, mask) != NULL;
-	if(!handled)
-	{
-		setFocus(TRUE);
-		gFocusMgr.setMouseCapture(this);
-		handled = TRUE;
-		if(!mSelecting)
-		{
-			if(mask & MASK_SHIFT)
-			{
-				// extend a selection
-				getPosAndContext(x, y, FALSE, mCursorPos, mInData, mSecondNibble);
-				mSelectionEnd = mCursorPos;
-				mHasSelection = (mSelectionStart != mSelectionEnd);
-				mSelecting = TRUE;
-			}
-			else
-			{
-				// start selecting
-				getPosAndContext(x, y, FALSE, mCursorPos, mInData, mSecondNibble);
-				mSelectionStart = mCursorPos;
-				mSelectionEnd = mCursorPos;
-				mHasSelection = FALSE;
-				mSelecting = TRUE;
-			}
-		}
-	}
-	return handled;
-}
-
-BOOL DOHexEditor::handleHover(S32 x, S32 y, MASK mask)
-{
-	BOOL handled = FALSE;
-	if(!hasMouseCapture())
-	{
-		handled = childrenHandleHover(x, y, mask) != NULL;
-	}
-	if(!handled && mSelecting && hasMouseCapture())
-	{
-		// continuation of selecting
-		getPosAndContext(x, y, TRUE, mCursorPos, mInData, mSecondNibble);
-		mSelectionEnd = mCursorPos;
-		mHasSelection = (mSelectionStart != mSelectionEnd);
-		handled = TRUE;
-	}
-	return handled;
-}
-
-BOOL DOHexEditor::handleMouseUp(S32 x, S32 y, MASK mask)
-{
-	BOOL handled = FALSE;
-	handled = LLView::childrenHandleMouseUp(x, y, mask) != NULL;
-	if(!handled && mSelecting && hasMouseCapture())
-	{
-		gFocusMgr.setMouseCapture(NULL);
-		mSelecting = FALSE;
-	}
-	return handled;
-}
-
-BOOL DOHexEditor::handleKeyHere(KEY key, MASK mask)
-{
-	return FALSE;
-}
-
-BOOL DOHexEditor::handleKey(KEY key, MASK mask, BOOL called_from_parent)
-{
-	BOOL handled = FALSE;
-
-	BOOL moved_cursor = FALSE;
-	U32 old_cursor = mCursorPos;
-	U32 cursor_line = mCursorPos / mColumns;
-	U32 doc_first_line = 0;
-	U32 doc_last_line = mValue.size() / mColumns;
-	//U32 first_line = mScrollbar->getDocPos();
-	//U32 last_line = first_line + mScrollbar->getPageSize(); // don't -2 from scrollbar sizes
-	U32 beginning_of_line = mCursorPos - (mCursorPos % mColumns);
-	U32 end_of_line = beginning_of_line + mColumns - 1;
-
-	handled = TRUE;
-	switch( key )
-	{
-
-	// Movement keys
-
-	case KEY_UP:
-		if(cursor_line > doc_first_line)
-		{
-			moveCursor(mCursorPos - mColumns, mSecondNibble);
-			moved_cursor = TRUE;
-		}
-		break;
-	case KEY_DOWN:
-		if(cursor_line < doc_last_line)
-		{
-			moveCursor(mCursorPos + mColumns, mSecondNibble);
-			moved_cursor = TRUE;
-		}
-		break;
-	case KEY_LEFT:
-		if(mCursorPos)
-		{
-			if(!mSecondNibble) moveCursor(mCursorPos - 1, FALSE);
-			else moveCursor(mCursorPos, FALSE);
-			moved_cursor = TRUE;
-		}
-		break;
-	case KEY_RIGHT:
-		moveCursor(mCursorPos + 1, FALSE);
-		moved_cursor = TRUE;
-		break;
-	case KEY_PAGE_UP:
-		mScrollbar->pageUp(1);
-		break;
-	case KEY_PAGE_DOWN:
-		mScrollbar->pageDown(1);
-		break;
-	case KEY_HOME:
-		if(mask & MASK_CONTROL)
-			moveCursor(0, FALSE);
-		else
-			moveCursor(beginning_of_line, FALSE);
-		moved_cursor = TRUE;
-		break;
-	case KEY_END:
-		if(mask & MASK_CONTROL)
-			moveCursor(mValue.size(), FALSE);
-		else
-			moveCursor(end_of_line, FALSE);
-		moved_cursor = TRUE;
-		break;
-
-	// Special
-
-	case KEY_INSERT:
-		gKeyboard->toggleInsertMode();
-		break;
-
-	case KEY_ESCAPE:
-		gFocusMgr.releaseFocusIfNeeded(this);
-		break;
-
-	// Editing
-	case KEY_BACKSPACE:
-		if(mHasSelection)
-		{
-			U32 start = getProperSelectionStart();
-			U32 end = getProperSelectionEnd();
-			del(start, end - 1, TRUE);
-			moveCursor(start, FALSE);
-		}
-		else if(mCursorPos && (!mSecondNibble))
-		{
-			del(mCursorPos - 1, mCursorPos - 1, TRUE);
-			moveCursor(mCursorPos - 1, FALSE);
-		}
-		break;
-	
-	case KEY_DELETE:
-		if(mHasSelection)
-		{
-			U32 start = getProperSelectionStart();
-			U32 end = getProperSelectionEnd();
-			del(start, end - 1, TRUE);
-			moveCursor(start, FALSE);
-		}
-		else if((mCursorPos != mValue.size()) && (!mSecondNibble))
-		{
-			del(mCursorPos, mCursorPos, TRUE);
-		}
-		break;
-
-	default:
-		handled = FALSE;
-		break;
-	}
-
-	if(moved_cursor)
-	{
-		// Selecting and deselecting
-		if(mask & MASK_SHIFT)
-		{
-			if(!mHasSelection) mSelectionStart = old_cursor;
-			mSelectionEnd = mCursorPos;
-		}
-		else
-		{
-			mSelectionStart = mCursorPos;
-			mSelectionEnd = mCursorPos;
-		}
-		mHasSelection = mSelectionStart != mSelectionEnd;
-	}
-	
-	return handled;
-}
-
-BOOL DOHexEditor::handleUnicodeChar(llwchar uni_char, BOOL called_from_parent)
-{
-	U8 c = uni_char & 0xff;
-	if(mInData)
-	{
-		if(c > 0x39)
-		{
-			if(c > 0x46) c -= 0x20;
-			if(c >= 0x41 && c <= 0x46) c = (c & 0x0f) + 0x09;
-			else return TRUE;
-		}
-		else if(c < 0x30) return TRUE;
-		else c &= 0x0f;
-	}
-
-	if(uni_char < 0x20) return FALSE;
-
-	if( (LL_KIM_INSERT == gKeyboard->getInsertMode() && (!mHasSelection))
-		|| (!mHasSelection && (mCursorPos == mValue.size())) )// last byte? always insert
-	{
-		// Todo: this should overwrite if there's a selection
-		if(!mInData)
-		{
-			std::vector<U8> new_data;
-			new_data.push_back(c);
-			insert(mCursorPos, new_data, TRUE);
-			moveCursor(mCursorPos + 1, FALSE);
-		}
-		else if(!mSecondNibble)
-		{
-			c <<= 4;
-			std::vector<U8> new_data;
-			new_data.push_back(c);
-			insert(mCursorPos, new_data, TRUE);
-			moveCursor(mCursorPos, TRUE);
-		}
-		else
-		{
-			c |= (mValue[mCursorPos] & 0xF0);
-			std::vector<U8> new_data;
-			new_data.push_back(c);
-			overwrite(mCursorPos, mCursorPos, new_data, TRUE);
-			moveCursor(mCursorPos + 1, FALSE);
-		}
-	}
-	else // overwrite mode
-	{
-		if(mHasSelection)
-		{
-			if(mInData) c <<= 4;
-			std::vector<U8> new_data;
-			new_data.push_back(c);
-			U8 start = getProperSelectionStart();
-			overwrite(start, getProperSelectionEnd() - 1, new_data, TRUE);
-			if(mInData) moveCursor(start, TRUE); // we only entered a nibble
-			else moveCursor(start + 1, FALSE); // we only entered a byte
-		}
-		else if(!mInData)
-		{
-			std::vector<U8> new_data;
-			new_data.push_back(c);
-			overwrite(mCursorPos, mCursorPos, new_data, TRUE);
-			moveCursor(mCursorPos + 1, FALSE);
-		}
-		else if(!mSecondNibble)
-		{
-			c <<= 4;
-			c |= (mValue[mCursorPos] & 0x0F);
-			std::vector<U8> new_data;
-			new_data.push_back(c);
-			overwrite(mCursorPos, mCursorPos, new_data, TRUE);
-			moveCursor(mCursorPos, TRUE);
-		}
-		else
-		{
-			c |= (mValue[mCursorPos] & 0xF0);
-			std::vector<U8> new_data;
-			new_data.push_back(c);
-			overwrite(mCursorPos, mCursorPos, new_data, TRUE);
-			moveCursor(mCursorPos + 1, FALSE);
-		}
-	}
-
-	return TRUE;
-}
-
-BOOL DOHexEditor::handleUnicodeCharHere(llwchar uni_char)
-{
-	return FALSE;
-}
-
-void DOHexEditor::draw()
-{
-	S32 left = 0;
-	S32 top = getRect().getHeight();
-	S32 right = getRect().getWidth();
-	S32 bottom = 0;
-
-	BOOL has_focus = gFocusMgr.getKeyboardFocus() == this;
-
-	F32 line_height = mGLFont->getLineHeight();
-	F32 char_width = mGLFont->getWidthF32(".");
-	F32 data_column_width = char_width * 3; // " 00";
-	F32 text_x = mTextRect.mLeft;
-	F32 text_x_data = text_x + (char_width * 10.1f); // "00000000  ", dunno why it's a fraction off
-#ifdef COLUMN_SPAN
-	mColumns = (right - char_width * 2 - text_x_data - mScrollbar->getRect().getWidth()) / (char_width * 4); // touch this if you dare...
-#endif
-	F32 text_x_ascii = text_x_data + (data_column_width * mColumns) + (char_width * 2);
-	F32 text_y = (F32)(mTextRect.mTop - line_height);
-
-	U32 data_length = mValue.size();
-	U32 line_count = getLineCount();
-	U32 first_line = mScrollbar->getDocPos();
-	U32 last_line = first_line + mScrollbar->getPageSize(); // don't -2 from scrollbar sizes
-
-	LLRect clip(getRect());
-	clip.mRight = mScrollbar->getRect().mRight;
-	clip.mLeft -= 10;
-	clip.mBottom -= 10;
-	LLLocalClipRect bgclip(clip);
-
-	// Background
-	gl_rect_2d(left, top, right, bottom, LLColor4::white);
-
-	// Let's try drawing some helpful guides
-	LLColor4 guide_color_light = LLColor4(1.0f, 1.0f, 0.9f);
-	LLColor4 guide_color_dark = LLColor4(1.0f, 1.0f, 0.8f);
-	for(U32 col = 0; col < mColumns; col += 2)
-	{
-		// Behind hex
-		F32 box_left = text_x_data + (col * data_column_width) + 2; // skew 2
-		F32 box_right = box_left + data_column_width;
-		gl_rect_2d(box_left, top, box_right, bottom, (col & 3) ? guide_color_light : guide_color_dark);
-		// Behind ASCII
-		//box_left = text_x_ascii + (col * char_width) - 1; // skew 1
-		//box_right = box_left + char_width;
-		//gl_rect_2d(box_left, top, box_right, bottom, guide_color);
-	}
-
-	
-	// Scrollbar & border (drawn twice?)
-	mBorder->setKeyboardFocusHighlight(has_focus);
-	LLView::draw();
-
-
-	LLLocalClipRect textrect_clip(mTextRect);
-
-
-	// Selection stuff is reused
-	U32 selection_start = getProperSelectionStart();
-	U32 selection_end = getProperSelectionEnd();
-	U32 selection_first_line = selection_start / mColumns;
-	U32 selection_last_line = selection_end / mColumns;
-	U32 selection_start_column = selection_start % mColumns;
-	U32 selection_end_column = selection_end % mColumns;
-
-	// Don't pretend a selection there is visible
-	if(!selection_end_column)
-	{
-		selection_last_line--;
-		selection_end_column = mColumns;
-	}
-
-	if(mHasSelection)
-	{
-		LLColor4 selection_color_context(LLColor4::black);
-		LLColor4 selection_color_not_context(LLColor4::grey3);
-		LLColor4 selection_color_data(selection_color_not_context);
-		LLColor4 selection_color_ascii(selection_color_not_context);
-		if(mInData) selection_color_data = selection_color_context;
-		else selection_color_ascii = selection_color_context;
-
-
-		// Setup for selection in data
-		F32 selection_pixel_x_base = text_x_data + char_width - 3; // skew 3
-		F32 selection_pixel_x_right_base = selection_pixel_x_base + (data_column_width * mColumns) - char_width + 4;
-		F32 selection_pixel_x;
-		F32 selection_pixel_x_right;
-		F32 selection_pixel_y = (F32)(mTextRect.mTop - line_height) - 3; // skew 3;
-		selection_pixel_y -= line_height * 2;
-		selection_pixel_y -= line_height * (S32(selection_first_line) - S32(first_line));
-
-		// Selection in data, First line
-		if(selection_first_line >= first_line && selection_first_line <= last_line)
-		{
-			selection_pixel_x = selection_pixel_x_base;
-			selection_pixel_x += (data_column_width * selection_start_column);
-			if(selection_first_line == selection_last_line)
-			{
-				// Select to last character
-				selection_pixel_x_right = selection_pixel_x_base + (data_column_width * selection_end_column);
-				selection_pixel_x_right -= (char_width - 4);
-			}
-			else
-			{
-				// Select to end of line
-				selection_pixel_x_right = selection_pixel_x_right_base;
-			}
-			gl_rect_2d(selection_pixel_x, selection_pixel_y + line_height, selection_pixel_x_right, selection_pixel_y, selection_color_data);
-		}
-
-		// Selection in data, Middle lines
-		for(U32 line = selection_first_line + 1; line < selection_last_line; line++)
-		{
-			selection_pixel_y -= line_height;
-			if(line >= first_line && line <= last_line)
-			{
-				gl_rect_2d(selection_pixel_x_base, selection_pixel_y + line_height, selection_pixel_x_right_base, selection_pixel_y, selection_color_data);
-			}
-		}
-		
-		// Selection in data, Last line
-		if(selection_first_line != selection_last_line
-			&& selection_last_line >= first_line && selection_last_line <= last_line)
-		{
-			selection_pixel_x_right = selection_pixel_x_base + (data_column_width * selection_end_column);
-			selection_pixel_x_right -= (char_width - 4);
-			selection_pixel_y -= line_height;
-			gl_rect_2d(selection_pixel_x_base, selection_pixel_y + line_height, selection_pixel_x_right, selection_pixel_y, selection_color_data);
-		}
-
-		selection_pixel_y = (F32)(mTextRect.mTop - line_height) - 3; // skew 3;
-		selection_pixel_y -= line_height * 2;
-		selection_pixel_y -= line_height * (S32(selection_first_line) - S32(first_line));
-
-		// Setup for selection in ASCII
-		selection_pixel_x_base = text_x_ascii - 1;
-		selection_pixel_x_right_base = selection_pixel_x_base + (char_width * mColumns);
-
-		// Selection in ASCII, First line
-		if(selection_first_line >= first_line && selection_first_line <= last_line)
-		{
-			selection_pixel_x = selection_pixel_x_base;
-			selection_pixel_x += (char_width * selection_start_column);
-			if(selection_first_line == selection_last_line)
-			{
-				// Select to last character
-				selection_pixel_x_right = selection_pixel_x_base + (char_width * selection_end_column);
-			}
-			else
-			{
-				// Select to end of line
-				selection_pixel_x_right = selection_pixel_x_right_base;
-			}
-			gl_rect_2d(selection_pixel_x, selection_pixel_y + line_height, selection_pixel_x_right, selection_pixel_y, selection_color_ascii);
-		}
-
-		// Selection in ASCII, Middle lines
-		for(U32 line = selection_first_line + 1; line < selection_last_line; line++)
-		{
-			selection_pixel_y -= line_height;
-			if(line >= first_line && line <= last_line)
-			{
-				gl_rect_2d(selection_pixel_x_base, selection_pixel_y + line_height, selection_pixel_x_right_base, selection_pixel_y, selection_color_ascii);
-			}
-		}
-		
-		// Selection in ASCII, Last line
-		if(selection_first_line != selection_last_line
-			&& selection_last_line >= first_line && selection_last_line <= last_line)
-		{
-			selection_pixel_x_right = selection_pixel_x_base + (char_width * selection_end_column);
-			selection_pixel_y -= line_height;
-			gl_rect_2d(selection_pixel_x_base, selection_pixel_y + line_height, selection_pixel_x_right, selection_pixel_y, selection_color_ascii);
-		}
-	}
-
-
-	// Insert/Overwrite
-	std::string text = (LL_KIM_OVERWRITE == gKeyboard->getInsertMode()) ? "OVERWRITE" : "INSERT";
-	mGLFont->renderUTF8(text, 0, text_x, text_y, LLColor4::purple);
-	// Offset on top
-	text = "";
-	for(U32 i = 0; i < mColumns; i++)
-	{
-		text.append(llformat(" %02X", i));
-	}
-	mGLFont->renderUTF8(text, 0, text_x_data, text_y, LLColor4::blue);
-	// Size
-	{
-		S32 size = mValue.size();
-		std::string size_desc;
-		if(size < 1000) size_desc = llformat("%d bytes", size);
-		else
-		{
-			if(size < 1000000)
-			{
-				size_desc = llformat("%f", F32(size) / 1000.0f);
-				int i = size_desc.length() - 1;
-				for(; i && size_desc.substr(i, 1) == "0"; i--);
-				if(size_desc.substr(i, 1) == ".") i--;
-				size_desc = size_desc.substr(0, i + 1);
-				size_desc.append(" KB");
-			}
-			else
-			{
-				size_desc = llformat("%f", F32(size) / 1000000.0f);
-				int i = size_desc.length() - 1;
-				for(; i && size_desc.substr(i, 1) == "0"; i--);
-				if(size_desc.substr(i, 1) == ".") i--;
-				size_desc = size_desc.substr(0, i + 1);
-				size_desc.append(" MB");
-			}
-		}
-		F32 x = text_x_ascii;
-		x += (char_width * (mColumns - size_desc.length()));
-		mGLFont->renderUTF8(size_desc, 0, x, text_y, LLColor4::purple);
-	}
-	// Leave a blank line
-	text_y -= (line_height * 2);
-
-	// Everything below "header"
-	for(U32 line = first_line; line <= last_line; line++)
-	{
-		if(line >= line_count) break;
-		
-		// Offset on left
-		text = llformat("%08X", line * mColumns); // offset on left
-		mGLFont->renderUTF8(text, 0, text_x, text_y, LLColor4::blue);
-
-		// Setup for rendering hex and ascii
-		U32 line_char_offset = mColumns * line;
-		U32 colstart0 = 0;
-		U32 colend0 = mColumns;
-		U32 colstart1 = mColumns;
-		U32 colend1 = mColumns;
-		U32 colstart2 = mColumns;
-		U32 colend2 = mColumns;
-		if(mHasSelection)
-		{
-			if(line == selection_first_line)
-			{
-				colend0 = selection_start_column;
-				colstart1 = selection_start_column;
-				if(selection_first_line == selection_last_line)
-				{
-					colend1 = selection_end_column;
-					colstart2 = selection_end_column;
-					colend2 = mColumns;
-				}
-			}
-			else if(line > selection_first_line && line < selection_last_line)
-			{
-				colend0 = 0;
-				colstart1 = 0;
-				colend1 = mColumns;
-			}
-			else if(line == selection_last_line)
-			{
-				colend0 = 0;
-				colstart1 = 0;
-				colend1 = selection_end_column;
-				colstart2 = selection_end_column;
-				colend2 = mColumns;
-			}
-		}
-
-		// Data in hex
-		text = "";
-		for(U32 c = colstart0; c < colend0; c++)
-		{
-			U32 o = line_char_offset + c;
-			if(o >= data_length) text.append("   ");
-			else text.append(llformat(" %02X", mValue[o]));
-		}
-		mGLFont->renderUTF8(text, 0, text_x_data + (colstart0 * data_column_width), text_y, LLColor4::black);
-		text = "";
-		for(U32 c = colstart1; c < colend1; c++)
-		{
-			U32 o = line_char_offset + c;
-			if(o >= data_length) text.append("   ");
-			else text.append(llformat(" %02X", mValue[o]));
-		}
-		mGLFont->renderUTF8(text, 0, text_x_data + (colstart1 * data_column_width), text_y, LLColor4::white);
-		text = "";
-		for(U32 c = colstart2; c < colend2; c++)
-		{
-			U32 o = line_char_offset + c;
-			if(o >= data_length) text.append("   ");
-			else text.append(llformat(" %02X", mValue[o]));
-		}
-		mGLFont->renderUTF8(text, 0, text_x_data + (colstart2 * data_column_width), text_y, LLColor4::black);
-
-		// ASCII
-		text = "";
-		for(U32 c = colstart0; c < colend0; c++)
-		{
-			U32 o = line_char_offset + c;
-			if(o >= data_length) break;
-			if((mValue[o] < 0x20) || (mValue[o] >= 0x7F)) text.append(".");
-			else text.append(llformat("%c", mValue[o]));
-		}
-		mGLFont->renderUTF8(text, 0, text_x_ascii + (colstart0 * char_width), text_y, LLColor4::black);
-		text = "";
-		for(U32 c = colstart1; c < colend1; c++)
-		{
-			U32 o = line_char_offset + c;
-			if(o >= data_length) break;
-			if((mValue[o] < 0x20) || (mValue[o] >= 0x7F)) text.append(".");
-			else text.append(llformat("%c", mValue[o]));
-		}
-		mGLFont->renderUTF8(text, 0, text_x_ascii + (colstart1 * char_width), text_y, LLColor4::white);
-		text = "";
-		for(U32 c = colstart2; c < colend2; c++)
-		{
-			U32 o = line_char_offset + c;
-			if(o >= data_length) break;
-			if((mValue[o] < 0x20) || (mValue[o] >= 0x7F)) text.append(".");
-			else text.append(llformat("%c", mValue[o]));
-		}
-		mGLFont->renderUTF8(text, 0, text_x_ascii + (colstart2 * char_width), text_y, LLColor4::black);
-
-		text_y -= line_height;
-	}
-
-
-
-	// Cursor
-	if(has_focus && !mHasSelection && (U32(LLTimer::getElapsedSeconds() * 2.0f) & 0x1))
-	{
-		U32 cursor_line = mCursorPos / mColumns;
-		if((cursor_line >= first_line) && (cursor_line <= last_line))
-		{
-			F32 pixel_y = (F32)(mTextRect.mTop - line_height);
-			pixel_y -= line_height * (2 + (cursor_line - first_line));
-
-			U32 cursor_offset = mCursorPos % mColumns; // bytes
-			F32 pixel_x = mInData ? text_x_data : text_x_ascii;
-			if(mInData)
-			{
-				pixel_x += data_column_width * cursor_offset;
-				pixel_x += char_width;
-				if(mSecondNibble) pixel_x += char_width;
-			}
-			else
-			{
-				pixel_x += char_width * cursor_offset;
-			}
-			pixel_x -= 2.0f;
-			pixel_y -= 2.0f;
-			gl_rect_2d(pixel_x, pixel_y + line_height, pixel_x + 2, pixel_y, LLColor4::black);
-		}
-	}
-}
-
-void DOHexEditor::deselect()
-{
-	mSelectionStart = mCursorPos;
-	mSelectionEnd = mCursorPos;
-	mHasSelection = FALSE;
-	mSelecting = FALSE;
-}
-
-BOOL DOHexEditor::canUndo() const
-{
-	return mUndoBuffer->canUndo();
-}
-
-void DOHexEditor::undo()
-{
-	mUndoBuffer->undoAction();
-}
-
-BOOL DOHexEditor::canRedo() const
-{
-	return mUndoBuffer->canRedo();
-}
-
-void DOHexEditor::redo()
-{
-	mUndoBuffer->redoAction();
-}
-
-
-
-
-void DOHexEditor::moveCursor(U32 pos, BOOL second_nibble)
-{
-	mCursorPos = pos;
-
-	// Clamp and handle second nibble
-	if(mCursorPos >= mValue.size())
-	{
-		mCursorPos = mValue.size();
-		mSecondNibble = FALSE;
-	}
-	else
-	{
-		mSecondNibble = mInData ? second_nibble : FALSE;
-	}
-
-	// Change selection
-	mSelectionEnd = mCursorPos;
-	if(!mHasSelection) mSelectionStart = mCursorPos;
-
-	// Scroll
-	U32 line = mCursorPos / mColumns;
-	U32 first_line = mScrollbar->getDocPos();
-	U32 last_line = first_line + mScrollbar->getPageSize(); // don't -2 from scrollbar sizes
-	if(line < first_line) mScrollbar->setDocPos(line);
-	if(line > (last_line - 2)) mScrollbar->setDocPos(line - mScrollbar->getPageSize() + 1);
-}
-
-BOOL DOHexEditor::canCut() const
-{
-	return mHasSelection;
-}
-
-void DOHexEditor::cut()
-{
-	if(!canCut()) return;
-
-	copy();
-
-	U32 start = getProperSelectionStart();
-	del(start, getProperSelectionEnd() - 1, TRUE);
-    
-	moveCursor(start, FALSE);
-}
-
-BOOL DOHexEditor::canCopy() const
-{
-	return mHasSelection;
-}
-
-void DOHexEditor::copy()
-{
-	if(!canCopy()) return;
-
-	std::string text;
-	if(mInData)
-	{
-		U32 start = getProperSelectionStart();
-		U32 end = getProperSelectionEnd();
-		for(U32 i = start; i < end; i++)
-			text.append(llformat("%02X", mValue[i]));
-	}
-	else
-	{
-		U32 start = getProperSelectionStart();
-		U32 end = getProperSelectionEnd();
-		for(U32 i = start; i < end; i++)
-			text.append(llformat("%c", mValue[i]));
-	}
-	LLWString wtext = utf8str_to_wstring(text);
-	gClipboard.copyFromSubstring(wtext, 0, wtext.length());
-}
-
-BOOL DOHexEditor::canPaste() const
-{
-	return TRUE;
-}
-
-void DOHexEditor::paste()
-{
-	if(!canPaste()) return;
-
-	std::string clipstr = wstring_to_utf8str(gClipboard.getPasteWString());
-	const char* clip = clipstr.c_str();
-
-	std::vector<U8> new_data;
-	if(mInData)
-	{
-		int len = strlen(clip);
-		for(int i = 0; (i + 1) < len; i += 2)
-		{
-			int c = 0;
-			if(sscanf(&(clip[i]), "%02X", &c) != 1) break;
-			new_data.push_back(U8(c));
-		}
-	}
-	else
-	{
-		int len = strlen(clip);
-		for(int i = 0; i < len; i++)
-		{
-			U8 c = 0;
-			if(sscanf(&(clip[i]), "%c", &c) != 1) break;
-			new_data.push_back(c);
-		}
-	}
-
-	U32 start = mCursorPos;
-	if(!mHasSelection)
-		insert(start, new_data, TRUE);
-	else
-	{
-		start = getProperSelectionStart();
-		overwrite(start, getProperSelectionEnd() - 1, new_data, TRUE);
-	}
-
-	moveCursor(start + new_data.size(), FALSE);
-}
-
-BOOL DOHexEditor::canDoDelete() const
-{
-	return mValue.size() > 0;
-}
-
-void DOHexEditor::doDelete()
-{
-	if(!canDoDelete()) return;
-
-	U32 start = getProperSelectionStart();
-	del(start, getProperSelectionEnd(), TRUE);
-
-	moveCursor(start, FALSE);
-}
-
-BOOL DOHexEditor::canSelectAll() const
-{
-	return mValue.size() > 0;
-}
-
-void DOHexEditor::selectAll()
-{
-	if(!canSelectAll()) return;
-
-	mSelectionStart = 0;
-	mSelectionEnd = mValue.size();
-	mHasSelection = mSelectionStart != mSelectionEnd;
-}
-
-BOOL DOHexEditor::canDeselect() const
-{
-	return mHasSelection;
-}
-
-void DOHexEditor::insert(U32 pos, std::vector<U8> new_data, BOOL undoable)
-{
-	if(pos > mValue.size())
-	{
-		llwarns << "pos outside data!" << llendl;
-		return;
-	}
-
-	deselect();
-
-	if(undoable)
-	{
-		DOUndoHex* action = (DOUndoHex*)(mUndoBuffer->getNextAction());
-		action->set(this, &(DOUndoHex::undoInsert), &(DOUndoHex::redoInsert), pos, pos, std::vector<U8>(), new_data);
-	}
-
-	std::vector<U8>::iterator wheres = mValue.begin() + pos;
-
-	mValue.insert(wheres, new_data.begin(), new_data.end());
-
-	changedLength();
-}
-
-void DOHexEditor::overwrite(U32 first_pos, U32 last_pos, std::vector<U8> new_data, BOOL undoable)
-{
-	if(first_pos > mValue.size() || last_pos > mValue.size())
-	{
-		llwarns << "pos outside data!" << llendl;
-		return;
-	}
-
-	deselect();
-
-	std::vector<U8>::iterator first = mValue.begin() + first_pos;
-	std::vector<U8>::iterator last = mValue.begin() + last_pos;
-
-	std::vector<U8> old_data;
-	if(last_pos > 0) old_data = std::vector<U8>(first, last + 1);
-
-	if(undoable)
-	{
-		DOUndoHex* action = (DOUndoHex*)(mUndoBuffer->getNextAction());
-		action->set(this, &(DOUndoHex::undoOverwrite), &(DOUndoHex::redoOverwrite), first_pos, last_pos, old_data, new_data);
-	}
-
-	mValue.erase(first, last + 1);
-	first = mValue.begin() + first_pos;
-	mValue.insert(first, new_data.begin(), new_data.end());
-
-	changedLength();
-}
-
-void DOHexEditor::del(U32 first_pos, U32 last_pos, BOOL undoable)
-{
-	if(first_pos > mValue.size() || last_pos > mValue.size())
-	{
-		llwarns << "pos outside data!" << llendl;
-		return;
-	}
-
-	deselect();
-
-	std::vector<U8>::iterator first = mValue.begin() + first_pos;
-	std::vector<U8>::iterator last = mValue.begin() + last_pos;
-
-	std::vector<U8> old_data;
-	if(last_pos > 0) old_data = std::vector<U8>(first, last + 1);
-
-	if(undoable)
-	{
-		DOUndoHex* action = (DOUndoHex*)(mUndoBuffer->getNextAction());
-		action->set(this, &(DOUndoHex::undoDel), &(DOUndoHex::redoDel), first_pos, last_pos, old_data, std::vector<U8>());
-	}
-	
-	mValue.erase(first, last + 1);
-
-	changedLength();
-}
-
-void DOUndoHex::set(DOHexEditor* hex_editor,
-					void (*undo_action)(DOUndoHex*),
-					void (*redo_action)(DOUndoHex*),
-					U32 first_pos,
-					U32 last_pos,
-					std::vector<U8> old_data,
-					std::vector<U8> new_data)
-{
-	mHexEditor = hex_editor;
-	mUndoAction = undo_action;
-	mRedoAction = redo_action;
-	mFirstPos = first_pos;
-	mLastPos = last_pos;
-	mOldData = old_data;
-	mNewData = new_data;
-}
-
-void DOUndoHex::undo()
-{
-	mUndoAction(this);
-}
-
-void DOUndoHex::redo()
-{
-	mRedoAction(this);
-}
-
-void DOUndoHex::undoInsert(DOUndoHex* action)
-{
-	//action->mHexEditor->del(action->mFirstPos, action->mLastPos, FALSE);
-	action->mHexEditor->del(action->mFirstPos, action->mFirstPos + action->mNewData.size() - 1, FALSE);
-}
-
-void DOUndoHex::redoInsert(DOUndoHex* action)
-{
-	action->mHexEditor->insert(action->mFirstPos, action->mNewData, FALSE);
-}
-
-void DOUndoHex::undoOverwrite(DOUndoHex* action)
-{
-	//action->mHexEditor->overwrite(action->mFirstPos, action->mLastPos, action->mOldData, FALSE);
-	action->mHexEditor->overwrite(action->mFirstPos, action->mFirstPos + action->mNewData.size() - 1, action->mOldData, FALSE);
-}
-
-void DOUndoHex::redoOverwrite(DOUndoHex* action)
-{
-	action->mHexEditor->overwrite(action->mFirstPos, action->mLastPos, action->mNewData, FALSE);
-}
-
-void DOUndoHex::undoDel(DOUndoHex* action)
-{
-	action->mHexEditor->insert(action->mFirstPos, action->mOldData, FALSE);
-}
-
-void DOUndoHex::redoDel(DOUndoHex* action)
-{
-	action->mHexEditor->del(action->mFirstPos, action->mLastPos, FALSE);
-}
-
-
-// </edit>
diff --git a/indra/newview/dohexeditor.h b/indra/newview/dohexeditor.h
deleted file mode 100644
index 8790d7913..000000000
--- a/indra/newview/dohexeditor.h
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * @file dohexeditor.h
- * @brief DOHexEditor Widget
- * @author Day Oh
- * 
- * $LicenseInfo:firstyear=2009&license=WTFPLV2$
- *  
- */
-
-// <edit>
-#ifndef DO_DOHEXEDITOR_H
-#define DO_DOHEXEDITOR_H
-
-#define MIN_COLS 8
-#define MAX_COLS 48
-
-#ifndef COLUMN_SPAN
-#define COLUMN_SPAN
-#endif
-
-#include "lluictrl.h"
-#include "llscrollbar.h"
-#include "llviewborder.h"
-#include "llundo.h"
-#include "lleditmenuhandler.h"
-
-class DOHexEditor : public LLUICtrl, public LLEditMenuHandler
-{
-public:
-	DOHexEditor(const std::string& name, const LLRect& rect);
-	~DOHexEditor();
-	static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
-	void setValue(const LLSD& value);
-	LLSD getValue() const;
-	void setColumns(U8 columns);
-	U8 getColumns() { return mColumns; };
-	U32 getLineCount();
-	F32 getSuggestedWidth(U8 cols = -1);
-	U32 getProperSelectionStart();
-	U32 getProperSelectionEnd();
-	void reshape(S32 width, S32 height, BOOL called_from_parent);
-	void setFocus(BOOL b);
-	
-	BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
-	BOOL handleMouseDown(S32 x, S32 y, MASK mask);
-	BOOL handleHover(S32 x, S32 y, MASK mask);
-	BOOL handleMouseUp(S32 x, S32 y, MASK mask);
-
-	BOOL handleKeyHere(KEY key, MASK mask);
-	BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
-	BOOL handleUnicodeChar(llwchar uni_char, BOOL called_from_parent);
-	BOOL handleUnicodeCharHere(llwchar uni_char);
-
-	void draw();
-
-	void moveCursor(U32 pos, BOOL second_nibble);
-
-	void insert(U32 pos, std::vector<U8> new_data, BOOL undoable);
-	void overwrite(U32 first_pos, U32 last_pos, std::vector<U8> new_data, BOOL undoable);
-	void del(U32 first_pos, U32 last_pos, BOOL undoable);
-
-	virtual void	cut();
-	virtual BOOL	canCut() const;
-
-	virtual void	copy();
-	virtual BOOL	canCopy() const;
-
-	virtual void	paste();
-	virtual BOOL	canPaste() const;
-	
-	virtual void	doDelete();
-	virtual BOOL	canDoDelete() const;
-
-	virtual void	selectAll();
-	virtual BOOL	canSelectAll() const;
-
-	virtual void	deselect();
-	virtual BOOL	canDeselect() const;
-
-	virtual void	undo();
-	virtual BOOL	canUndo() const;
-
-	virtual void	redo();
-	virtual BOOL	canRedo() const;
-
-private:
-	std::vector<U8> mValue;
-	U8 mColumns;
-
-	U32 mCursorPos;
-	BOOL mSecondNibble;
-	BOOL mInData;
-	BOOL mSelecting;
-	BOOL mHasSelection;
-	U32 mSelectionStart;
-	U32 mSelectionEnd;
-
-	LLFontGL* mGLFont;
-	LLRect mTextRect;
-	LLScrollbar* mScrollbar;
-	LLViewBorder* mBorder;
-
-	LLUndoBuffer* mUndoBuffer;
-
-	void changedLength();
-	void getPosAndContext(S32 x, S32 y, BOOL force_context, U32& pos, BOOL& in_data, BOOL& second_nibble);
-};
-
-class DOUndoHex : public LLUndoBuffer::LLUndoAction
-{
-protected:
-	DOUndoHex() {  }
-	DOHexEditor* mHexEditor;
-	U32 mFirstPos;
-	U32 mLastPos;
-	std::vector<U8> mOldData;
-	std::vector<U8> mNewData;
-public:
-	static LLUndoAction* create() { return new DOUndoHex(); }
-	virtual void set(DOHexEditor* hex_editor,
-					 void (*undo_action)(DOUndoHex*),
-					 void (*redo_action)(DOUndoHex*),
-					 U32 first_pos,
-					 U32 last_pos,
-					 std::vector<U8> old_data,
-					 std::vector<U8> new_data);
-	void (*mUndoAction)(DOUndoHex*);
-	void (*mRedoAction)(DOUndoHex*);
-	virtual void undo();
-	virtual void redo();
-	
-	static void undoInsert(DOUndoHex* action);
-	static void redoInsert(DOUndoHex* action);
-	static void undoOverwrite(DOUndoHex* action);
-	static void redoOverwrite(DOUndoHex* action);
-	static void undoDel(DOUndoHex* action);
-	static void redoDel(DOUndoHex* action);
-};
-
-class DOHexInsert : public DOUndoHex
-{
-	virtual void undo();
-	virtual void redo();
-};
-
-class DOHexOverwrite : public DOUndoHex
-{
-	virtual void undo();
-	virtual void redo();
-};
-
-class DOHexDel : public DOUndoHex
-{
-	virtual void undo();
-	virtual void redo();
-};
-
-#endif
-// </edit>
diff --git a/indra/newview/dsaparam.cpp b/indra/newview/dsaparam.cpp
deleted file mode 100644
index c7720e61e..000000000
--- a/indra/newview/dsaparam.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Generated using openssl */
-#include "llviewerprecompiledheaders.h"
-#include <openssl/dsa.h>
-
-static unsigned char dsa2048_p[]={
-	0xD4,0x63,0x93,0xFA,0x69,0x87,0xDB,0x60,0x68,0xFB,0xCC,0x8F,
-	0x55,0x85,0x7A,0xAC,0xAD,0x1F,0x8E,0xF0,0x2C,0x62,0x2F,0xE6,
-	0xA6,0xA4,0xF3,0x57,0x42,0xDC,0xF0,0xE0,0x0E,0xC6,0x67,0x01,
-	0x95,0x22,0x6F,0x03,0x00,0x2A,0xB4,0xBF,0x62,0x6D,0xA1,0xBD,
-	0xB7,0x10,0x81,0xB4,0x20,0x1C,0x7D,0x41,0x75,0xCE,0x0F,0xCF,
-	0x9D,0x03,0xEC,0xE6,0x7E,0xBC,0x76,0x97,0xBC,0x5C,0x70,0xFE,
-	0xD5,0x64,0x15,0x20,0xD8,0xA8,0x25,0x73,0xD4,0xA2,0x77,0x99,
-	0xC7,0x3B,0xF7,0x4E,0x20,0x40,0x43,0xD7,0x7C,0xFD,0xBC,0x2F,
-	0x75,0xB5,0x18,0xA3,0x8C,0x85,0x79,0x86,0x53,0x62,0x73,0xBA,
-	0x66,0x73,0xE2,0x48,0x15,0xAF,0x04,0x65,0xE2,0x4D,0x15,0x47,
-	0x74,0x33,0x79,0xAE,0xBF,0x90,0xC0,0xF7,0x2F,0x04,0xFB,0xEE,
-	0x29,0xEC,0x42,0xC7,0x36,0x14,0xAC,0xB2,0xBC,0xE1,0x71,0x13,
-	0x65,0xBA,0x0D,0x61,0x11,0x89,0x49,0x41,0x5D,0xCC,0xE2,0x72,
-	0x7B,0x93,0xF2,0x2E,0xD1,0x23,0x37,0xF9,0xFF,0x55,0x59,0xF6,
-	0x41,0x78,0x87,0xC9,0xCD,0x95,0xD2,0xE5,0x1B,0x3A,0x25,0x7A,
-	0xD8,0x16,0x2F,0x58,0xFE,0x3B,0xD5,0xB1,0x59,0x63,0x3C,0x90,
-	0xA0,0xBF,0xA0,0x21,0x54,0xB0,0xB0,0x3F,0x9D,0xC6,0xB5,0x31,
-	0xBA,0x86,0xDC,0x86,0x41,0xB7,0xBA,0xCE,0x58,0x09,0x8B,0xD9,
-	0xD4,0xF1,0xD2,0x3B,0x5F,0x87,0xEE,0x66,0xFD,0x77,0x8C,0x2C,
-	0x66,0x3E,0xC9,0xDA,0x3E,0x2A,0x38,0x03,0x23,0x71,0xC9,0x04,
-	0x3E,0x9D,0x18,0x7F,0xBB,0x82,0x21,0x8E,0x5F,0xF0,0xAF,0xC8,
-	0x08,0x2D,0xA6,0x3F,
-	};
-static unsigned char dsa2048_q[]={
-	0xAE,0xCA,0x67,0x69,0x21,0x7A,0xE1,0x9B,0x64,0x74,0xED,0x58,
-	0xF0,0x28,0xE0,0x45,0x2B,0x39,0xBC,0x79,
-	};
-static unsigned char dsa2048_g[]={
-	0x51,0x1D,0xB0,0xF6,0x4E,0x8B,0xAF,0x1C,0x59,0x71,0x62,0x3C,
-	0xC3,0xE2,0x44,0x35,0xCE,0x11,0xB4,0x49,0x04,0x41,0xA1,0x1C,
-	0x22,0x59,0x47,0x8C,0x70,0x1D,0xA1,0x0C,0x51,0xFE,0x86,0x43,
-	0x7B,0x75,0x5C,0xB7,0x68,0xA5,0xBE,0x81,0x9C,0x6F,0x6D,0x32,
-	0x03,0xB0,0x28,0xA4,0x6B,0x5B,0x37,0xC3,0x35,0xCF,0xBD,0x92,
-	0xC3,0x66,0x2E,0xAB,0xB4,0x13,0xEC,0x23,0xA3,0xE3,0x09,0x4E,
-	0x47,0x7D,0xA5,0x90,0x33,0x80,0x5D,0x68,0xD6,0x39,0x54,0xBE,
-	0x35,0xB0,0x61,0x5B,0x96,0x63,0x05,0x67,0xB7,0x3C,0x21,0x17,
-	0x37,0x50,0x17,0x78,0xEA,0xC0,0x10,0x73,0xDF,0xE2,0x70,0x19,
-	0x17,0xF7,0x11,0x82,0x73,0xDB,0xFF,0x3E,0x8D,0x98,0x2F,0x2F,
-	0xA2,0x12,0xC3,0xB4,0x08,0xB2,0x2C,0x5B,0xA3,0x51,0xAA,0x7F,
-	0x3D,0xE0,0x74,0x39,0xE5,0xAF,0x81,0x32,0xF8,0x45,0x75,0x11,
-	0x35,0xD9,0x90,0xA1,0xA3,0x91,0x1A,0xEE,0xE9,0xAC,0x97,0x30,
-	0x4C,0xD5,0x5B,0x38,0x49,0x12,0x3B,0xCC,0x0C,0x84,0xA2,0x59,
-	0x78,0xB4,0xFD,0x46,0xAC,0x49,0x43,0x08,0xDB,0xF4,0x23,0xFF,
-	0x23,0xF8,0x9A,0xFD,0x15,0xAF,0x6B,0x81,0xCE,0x15,0x22,0xEF,
-	0x09,0x64,0x0A,0x1F,0x4D,0x6B,0xF1,0x9F,0x16,0x00,0x3E,0xE8,
-	0xFC,0x9A,0x24,0x58,0x1C,0xB4,0x5F,0x56,0x3E,0x83,0x8C,0x0C,
-	0x51,0x43,0x72,0x25,0xA8,0x1D,0x08,0x30,0x7E,0x17,0xC8,0xD6,
-	0x66,0x57,0x0C,0x59,0x76,0xE4,0xA6,0x0C,0x05,0xA8,0x60,0x1D,
-	0xA4,0x8F,0xBC,0xC4,0x67,0x55,0x0E,0x81,0x8F,0x66,0xED,0x1B,
-	0x84,0xCD,0x02,0x9F,
-	};
-
-DSA *get_dsa2048()
-	{
-	DSA *dsa;
-
-	if ((dsa=DSA_new()) == NULL) return(NULL);
-	dsa->p=BN_bin2bn(dsa2048_p,sizeof(dsa2048_p),NULL);
-	dsa->q=BN_bin2bn(dsa2048_q,sizeof(dsa2048_q),NULL);
-	dsa->g=BN_bin2bn(dsa2048_g,sizeof(dsa2048_g),NULL);
-	if ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))
-		{ DSA_free(dsa); return(NULL); }
-	return(dsa);
-	}
diff --git a/indra/newview/llfloatervfsexplorer.cpp b/indra/newview/llfloatervfsexplorer.cpp
index 99662b9d9..9c4030bee 100644
--- a/indra/newview/llfloatervfsexplorer.cpp
+++ b/indra/newview/llfloatervfsexplorer.cpp
@@ -9,7 +9,6 @@
 #include "lllocalinventory.h"
 #include "llviewerwindow.h"
 #include "llassetconverter.h"
-#include "dofloaterhex.h"
 
 LLFloaterVFSExplorer* LLFloaterVFSExplorer::sInstance;
 std::map<LLVFSFileSpecifier, LLVFSFileBlock*> LLFloaterVFSExplorer::sVFSFileMap;
@@ -41,7 +40,6 @@ BOOL LLFloaterVFSExplorer::postBuild()
 	childSetAction("remove_btn", onClickRemove, this);
 	childSetAction("reload_all_btn", onClickReload, this);
 	childSetAction("copy_uuid_btn", onClickCopyUUID, this);
-	childSetAction("edit_data_btn", onClickEditData, this);
 	childSetAction("item_btn", onClickItem, this);
 	refresh();
 	return TRUE;
@@ -175,13 +173,6 @@ void LLFloaterVFSExplorer::onClickReload(void* user_data)
 	floaterp->reloadAll();
 }
 // static
-void LLFloaterVFSExplorer::onClickEditData(void* user_data)
-{
-	LLFloaterVFSExplorer* floaterp = (LLFloaterVFSExplorer*)user_data;
-	LLVFSFileSpecifier file = floaterp->getEditEntry();
-	DOFloaterHex::show(file.mFileID, true, file.mFileType);
-}
-// static
 void LLFloaterVFSExplorer::onClickItem(void* user_data)
 {
 	LLFloaterVFSExplorer* floaterp = (LLFloaterVFSExplorer*)user_data;
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 1995efd2c..e2f6144fb 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -113,7 +113,6 @@
 #include "llfloateranimpreview.h" // for reuploads
 #include "llfloaterimagepreview.h" // for reuploads
 //#include "llcheats.h"
-#include "dofloaterhex.h"
 #include "hgfloatertexteditor.h"
 #include "statemachine/aifilepicker.h"
 // </edit>
diff --git a/indra/newview/lllocalinventory.cpp b/indra/newview/lllocalinventory.cpp
index c6578ed8c..1bb9cf102 100644
--- a/indra/newview/lllocalinventory.cpp
+++ b/indra/newview/lllocalinventory.cpp
@@ -11,7 +11,6 @@
 #include "llpreviewtexture.h"
 #include "llpreviewgesture.h"
 #include "llpreviewlandmark.h"
-#include "dofloaterhex.h"
 #include "hgfloatertexteditor.h"
 
 #include "llappviewer.h"
@@ -151,8 +150,7 @@ void LLLocalInventory::open(LLUUID item_id)
 	}
 	else
 	{
-		llwarns << "Dunno how to open type " << type << ", falling back to hex editor" << llendl;
-		DOFloaterHex::show(item_id);
+		llwarns << "Dunno how to open type " << type << llendl;
 	}
 }
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 669c57d43..0135e4d1d 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -245,7 +245,6 @@
 #include "lltexlayer.h"
 
 // <edit>
-#include "dofloaterhex.h"
 #include "hgfloatertexteditor.h"
 #include "llfloatervfs.h"
 #include "llfloatervfsexplorer.h"
@@ -473,7 +472,6 @@ void handle_force_ground_sit(void*);
 void handle_phantom_avatar(void*);
 void handle_hide_typing_notification(void*);
 void handle_close_all_notifications(void*);
-void handle_reopen_with_hex_editor(void*);
 //void handle_open_message_log(void*);
 void handle_edit_ao(void*);
 void handle_local_assets(void*);
@@ -3638,11 +3636,6 @@ void process_grant_godlike_powers(LLMessageSystem* msg, void**)
 
 // <edit>
 
-void handle_reopen_with_hex_editor(void*)
-{
-
-}
-
 /*void handle_open_message_log(void*)
 {
 	LLFloaterMessageLog::show();
diff --git a/indra/newview/skins/default/xui/en-us/floater_hex.xml b/indra/newview/skins/default/xui/en-us/floater_hex.xml
deleted file mode 100644
index 36f02f068..000000000
--- a/indra/newview/skins/default/xui/en-us/floater_hex.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="200" width="580" min_width="580" min_height="128"  
-     name="floater_hex" title="Hex Editor" rect_control="FloaterHexRect">
-	<text name="status_text" follows="left|top" left="120" top="-25" height="20">Loading...</text>
-	<slider can_edit_text="false" top="-25" control_name="column_count"
-			decimal_digits="3" follows="left|top" height="16" increment="1"
-			initial_val="16" label="Columns" left="10" max_val="48" min_val="8"
-			mouse_opaque="true" name="column_count" show_text="false" value="16"
-			width="100" />
-	<button name="upload_btn" follows="right|top" top="-25" right="-120" width="100" bottom="155" label="[UPLOAD]" enabled="false"/>
-	<button name="save_btn" follows="right|top" top="-25" right="-10" width="100" bottom="155" label="Save" enabled="false"/>
-	<hex_editor name="hex" follows="left|top|right|bottom" left="10" top="-50" right="-10" bottom="10" visible="false"/>
-</floater>
diff --git a/indra/newview/statemachine/CMakeLists.txt b/indra/newview/statemachine/CMakeLists.txt
index d36caca38..86f19107e 100644
--- a/indra/newview/statemachine/CMakeLists.txt
+++ b/indra/newview/statemachine/CMakeLists.txt
@@ -9,7 +9,6 @@ include(LLMessage)		# This is needed by LLPlugin.
 include(LLMath)
 include(LLVFS)
 include(LLXML)
-include(LLXUIXML)
 include(LLWindow)
 include(LLUI)
 include(LLRender)
@@ -26,7 +25,6 @@ include_directories(
 	${LLMATH_INCLUDE_DIRS}
 	${LLVFS_INCLUDE_DIRS}
 	${LLXML_INCLUDE_DIRS}
-	${LLXUIXML_INCLUDE_DIRS}
 	${LLWINDOW_INCLUDE_DIRS}
 	${LLUI_INCLUDE_DIRS}
 	${LLRENDER_INCLUDE_DIRS}

From 6331267df64068e89bc794d80b2fd22cf586e59e Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 20 Jul 2012 08:54:25 -0500
Subject: [PATCH 064/199] MAINT-646: Optimize
 LLVolumeImplFlexible::doIdleUpdate()
 https://bitbucket.org/davep/viewer-development/changeset/b0148737d316

---
 indra/newview/llflexibleobject.cpp | 134 +++++++++++++++--------------
 indra/newview/llflexibleobject.h   |   3 +-
 indra/newview/llvovolume.h         |   2 +-
 3 files changed, 71 insertions(+), 68 deletions(-)

diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp
index 11edb6071..a98bb3b88 100644
--- a/indra/newview/llflexibleobject.cpp
+++ b/indra/newview/llflexibleobject.cpp
@@ -255,50 +255,28 @@ void LLVolumeImplFlexible::onSetVolume(const LLVolumeParams &volume_params, cons
 {
 }
 
-//---------------------------------------------------------------------------------
-// This calculates the physics of the flexible object. Note that it has to be 0
-// updated every time step. In the future, perhaps there could be an 
-// optimization similar to what Havok does for objects that are stationary. 
-//---------------------------------------------------------------------------------
-static LLFastTimer::DeclareTimer FTM_FLEXIBLE_UPDATE("Update Flexies");
-BOOL LLVolumeImplFlexible::doIdleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
+
+void LLVolumeImplFlexible::updateRenderRes()
 {
-	if (mVO->mDrawable.isNull())
-	{
-		// Don't do anything until we have a drawable
-		return FALSE; // (we are not initialized or updated)
-	}
+	LLDrawable* drawablep = mVO->mDrawable;
 
-	BOOL force_update = mSimulateRes == 0 ? TRUE : FALSE;
-
-	//flexible objects never go static
-	mVO->mDrawable->mQuietCount = 0;
-	if (!mVO->mDrawable->isRoot())
-	{
-		LLViewerObject* parent = (LLViewerObject*) mVO->getParent();
-		parent->mDrawable->mQuietCount = 0;
-	}
-
-	LLFastTimer ftm(FTM_FLEXIBLE_UPDATE);
-		
 	S32 new_res = mAttributes->getSimulateLOD();
 
-	//number of segments only cares about z axis
-	F32 app_angle = llround((F32) atan2( mVO->getScale().mV[2]*2.f, mVO->mDrawable->mDistanceWRTCamera) * RAD_TO_DEG, 0.01f);
+#if 1 //optimal approximation of previous behavior that doesn't rely on atan2
+	F32 app_angle = mVO->getScale().mV[2]/drawablep->mDistanceWRTCamera;
 
 	// Rendering sections increases with visible angle on the screen
+	mRenderRes = (S32) (12.f*app_angle);
+#else //legacy behavior
+	//number of segments only cares about z axis
+	F32 app_angle = llround((F32) atan2( mVO->getScale().mV[2]*2.f, drawablep->mDistanceWRTCamera) * RAD_TO_DEG, 0.01f);
+
+ 	// Rendering sections increases with visible angle on the screen
 	mRenderRes = (S32)(FLEXIBLE_OBJECT_MAX_SECTIONS*4*app_angle*DEG_TO_RAD/LLViewerCamera::getInstance()->getView());
-	if (mRenderRes > FLEXIBLE_OBJECT_MAX_SECTIONS)
-	{
-		mRenderRes = FLEXIBLE_OBJECT_MAX_SECTIONS;
-	}
-
-
-	// Bottom cap at 1/4 the original number of sections
-	if (mRenderRes < mAttributes->getSimulateLOD()-1)
-	{
-		mRenderRes = mAttributes->getSimulateLOD()-1;
-	}
+#endif
+		
+	mRenderRes = llclamp(mRenderRes, new_res-1, (S32) FLEXIBLE_OBJECT_MAX_SECTIONS);
+		
 	// Throttle back simulation of segments we're not rendering
 	if (mRenderRes < new_res)
 	{
@@ -311,43 +289,65 @@ BOOL LLVolumeImplFlexible::doIdleUpdate(LLAgent &agent, LLWorld &world, const F6
 		setAttributesOfAllSections();
 		mInitialized = TRUE;
 	}
-	if (!gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE))
-	{
-		return FALSE; // (we are not initialized or updated)
-	}
+}
+//---------------------------------------------------------------------------------
+// This calculates the physics of the flexible object. Note that it has to be 0
+// updated every time step. In the future, perhaps there could be an 
+// optimization similar to what Havok does for objects that are stationary. 
+//---------------------------------------------------------------------------------
+static LLFastTimer::DeclareTimer FTM_FLEXIBLE_UPDATE("Update Flexies");
+void LLVolumeImplFlexible::doIdleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
+{
+	LLDrawable* drawablep = mVO->mDrawable;
 
-	bool visible = mVO->mDrawable->isVisible();
-
-	if (force_update && visible)
+	if (drawablep)
 	{
-		gPipeline.markRebuild(mVO->mDrawable, LLDrawable::REBUILD_POSITION, FALSE);
-	}
-	else if	(visible &&
-		!mVO->mDrawable->isState(LLDrawable::IN_REBUILD_Q1) &&
-		mVO->getPixelArea() > 256.f)
-	{
-		U32 id;
-		F32 pixel_area = mVO->getPixelArea();
+		//LLFastTimer ftm(FTM_FLEXIBLE_UPDATE);
 
-		if (mVO->isRootEdit())
+		//flexible objects never go static
+		drawablep->mQuietCount = 0;
+		if (!drawablep->isRoot())
 		{
-			id = mID;
-		}
-		else
-		{
-			LLVOVolume* parent = (LLVOVolume*) mVO->getParent();
-			id = parent->getVolumeInterfaceID();
+			LLViewerObject* parent = (LLViewerObject*) mVO->getParent();
+			parent->mDrawable->mQuietCount = 0;
 		}
 
-		U32 update_period = (U32) (LLViewerCamera::getInstance()->getScreenPixelArea()*0.01f/(pixel_area*(sUpdateFactor+1.f)))+1;
-
-		if ((LLDrawable::getCurrentFrame()+id)%update_period == 0)
+		if (gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE))
 		{
-			gPipeline.markRebuild(mVO->mDrawable, LLDrawable::REBUILD_POSITION, FALSE);
+			bool visible = drawablep->isVisible();
+
+			if ((mSimulateRes == 0) && visible)
+			{
+				updateRenderRes();
+				gPipeline.markRebuild(drawablep, LLDrawable::REBUILD_POSITION, FALSE);
+			}
+			else if	(visible &&
+				!drawablep->isState(LLDrawable::IN_REBUILD_Q1) &&
+				mVO->getPixelArea() > 256.f)
+			{
+				U32 id;
+				F32 pixel_area = mVO->getPixelArea();
+
+				if (mVO->isRootEdit())
+				{
+					id = mID;
+				}
+				else
+				{
+					LLVOVolume* parent = (LLVOVolume*) mVO->getParent();
+					id = parent->getVolumeInterfaceID();
+				}
+
+				U32 update_period = (U32) (LLViewerCamera::getInstance()->getScreenPixelArea()*0.01f/(pixel_area*(sUpdateFactor+1.f)))+1;
+
+				if ((LLDrawable::getCurrentFrame()+id)%update_period == 0)
+				{
+					updateRenderRes();
+					gPipeline.markRebuild(drawablep, LLDrawable::REBUILD_POSITION, FALSE);
+				}
+			}
 		}
 	}
-	
-	return force_update;
 }
 
 inline S32 log2(S32 x)
@@ -369,7 +369,9 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
 	if ((mSimulateRes == 0 || !mInitialized) && mVO->mDrawable->isVisible()) 
 	{
 		//mVO->markForUpdate(TRUE);
-		if (!doIdleUpdate(gAgent, *LLWorld::getInstance(), 0.0))
+		doIdleUpdate(gAgent, *LLWorld::getInstance(), 0.0);
+
+		if (mSimulateRes == 0)
 		{
 			return;	// we did not get updated or initialized, proceeding without can be dangerous
 		}
diff --git a/indra/newview/llflexibleobject.h b/indra/newview/llflexibleobject.h
index faed3801b..7d68a67da 100644
--- a/indra/newview/llflexibleobject.h
+++ b/indra/newview/llflexibleobject.h
@@ -84,7 +84,8 @@ class LLVolumeImplFlexible : public LLVolumeInterface
 		LLVector3 getFramePosition() const;
 		LLQuaternion getFrameRotation() const;
 		LLVolumeInterfaceType getInterfaceType() const		{ return INTERFACE_FLEXIBLE; }
-		BOOL doIdleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
+		void updateRenderRes();
+		void doIdleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
 		BOOL doUpdateGeometry(LLDrawable *drawable);
 		LLVector3 getPivotPosition() const;
 		void onSetVolume(const LLVolumeParams &volume_params, const S32 detail);
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index cc7b5cf10..9fbc50208 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -70,7 +70,7 @@ class LLVolumeInterface
 public:
 	virtual ~LLVolumeInterface() { }
 	virtual LLVolumeInterfaceType getInterfaceType() const = 0;
-	virtual BOOL doIdleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) = 0;
+	virtual void doIdleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) = 0;
 	virtual BOOL doUpdateGeometry(LLDrawable *drawable) = 0;
 	virtual LLVector3 getPivotPosition() const = 0;
 	virtual void onSetVolume(const LLVolumeParams &volume_params, const S32 detail) = 0;

From c9e0a6c533525b9921109316f2b9f4e591434915 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 20 Jul 2012 08:55:02 -0500
Subject: [PATCH 065/199] MAINT-1270: Fix for some flexi prims becoming flat at
 some LoDs.
 https://bitbucket.org/davep/viewer-development/changeset/47f0d08ba7ad

---
 indra/newview/llflexibleobject.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp
index a98bb3b88..5ff314865 100644
--- a/indra/newview/llflexibleobject.cpp
+++ b/indra/newview/llflexibleobject.cpp
@@ -368,10 +368,11 @@ void LLVolumeImplFlexible::doFlexibleUpdate()
 	LLPath *path = &volume->getPath();
 	if ((mSimulateRes == 0 || !mInitialized) && mVO->mDrawable->isVisible()) 
 	{
-		//mVO->markForUpdate(TRUE);
+		BOOL force_update = mSimulateRes == 0 ? TRUE : FALSE;
+
 		doIdleUpdate(gAgent, *LLWorld::getInstance(), 0.0);
 
-		if (mSimulateRes == 0)
+		if (!force_update || !gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FLEXIBLE))
 		{
 			return;	// we did not get updated or initialized, proceeding without can be dangerous
 		}

From 531af998fbb8342774e1bfc7aa17059afc0cd49e Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 20 Jul 2012 11:29:11 -0500
Subject: [PATCH 066/199] MAINT-775: Fix for particle index pool corruption on
 teleport. (And removed alternative workaround)
 https://bitbucket.org/davep/viewer-development/changeset/04fdf7945708

---
 indra/newview/llappviewer.cpp   |  5 +++++
 indra/newview/llface.cpp        | 28 ++++++------------------
 indra/newview/llface.h          |  1 +
 indra/newview/llvopartgroup.cpp | 38 ++++++---------------------------
 indra/newview/llvopartgroup.h   |  1 +
 5 files changed, 20 insertions(+), 53 deletions(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index c0bb21085..9d8d68c13 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -83,6 +83,7 @@
 #include "llvector4a.h"
 #include "llfont.h"
 #include "llvocache.h"
+#include "llvopartgroup.h"
 #include "llfloaterteleporthistory.h"
 
 #include "llweb.h"
@@ -602,6 +603,10 @@ bool LLAppViewer::init()
 
 	// initialize SSE options
 	LLVector4a::initClass();
+
+	//initialize particle index pool
+	LLVOPartGroup::initClass();
+
 	// Need to do this initialization before we do anything else, since anything
 	// that touches files should really go through the lldir API
 	gDirUtilp->initAppDirs("SecondLife");
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 38e41c6b4..59deb7c44 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -169,19 +169,10 @@ void LLFace::init(LLDrawable* drawablep, LLViewerObject* objp)
 	mGeomCount		= 0;
 	mGeomIndex		= 0;
 	mIndicesCount	= 0;
-	if (drawablep->getRenderType() == LLPipeline::RENDER_TYPE_PARTICLES ||
-		drawablep->getRenderType() == LLPipeline::RENDER_TYPE_HUD_PARTICLES
-#if ENABLE_CLASSIC_CLOUDS
-		|| drawablep->getRenderType() == LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS
-#endif
-		)
-	{ //indicate to LLParticlePartition that this particle is uninitialized
-		mIndicesIndex = 0xFFFFFFFF;
-	}
-	else
-	{
-		mIndicesIndex	= 0;
-	}
+
+	//special value to indicate uninitialized position
+	mIndicesIndex	= 0xFFFFFFFF;
+
 	mIndexInTex = 0;
 	mTexture		= NULL;
 	mTEOffset		= -1;
@@ -214,17 +205,10 @@ void LLFace::destroy()
 		mTexture->removeFace(this) ;
 	}
 	
-	if (mDrawablep.notNull() &&
-		(mDrawablep->getRenderType() == LLPipeline::RENDER_TYPE_PARTICLES ||
-		mDrawablep->getRenderType() == LLPipeline::RENDER_TYPE_HUD_PARTICLES
-#if ENABLE_CLASSIC_CLOUDS
-		|| mDrawablep->getRenderType() == LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS
-#endif
-		) &&
-		mIndicesIndex != 0xFFFFFFFF)
+	if (isState(LLFace::PARTICLE))
 	{
 		LLVOPartGroup::freeVBSlot(getGeomIndex()/4);
-		mIndicesIndex = 0xFFFFFFFF;
+		clearState(LLFace::PARTICLE);
 	}
 
 	if (mDrawPoolp)
diff --git a/indra/newview/llface.h b/indra/newview/llface.h
index 5513ecd41..4cab49205 100644
--- a/indra/newview/llface.h
+++ b/indra/newview/llface.h
@@ -84,6 +84,7 @@ public:
 		USE_FACE_COLOR	= 0x0010,
 		TEXTURE_ANIM	= 0x0020, 
 		RIGGED			= 0x0040,
+		PARTICLE		= 0x0080,
 	};
 
 	static void initClass();
diff --git a/indra/newview/llvopartgroup.cpp b/indra/newview/llvopartgroup.cpp
index 3dee80cce..0a5a76900 100644
--- a/indra/newview/llvopartgroup.cpp
+++ b/indra/newview/llvopartgroup.cpp
@@ -49,7 +49,6 @@
 #include "llviewerregion.h"
 #include "pipeline.h"
 #include "llspatialpartition.h"
-#include "llviewerobjectlist.h"
 
 const F32 MAX_PART_LIFETIME = 120.f;
 
@@ -59,8 +58,7 @@ LLPointer<LLVertexBuffer> LLVOPartGroup::sVB = NULL;
 S32 LLVOPartGroup::sVBSlotFree[];
 S32* LLVOPartGroup::sVBSlotCursor = NULL;
 
-//static
-void LLVOPartGroup::restoreGL()
+void LLVOPartGroup::initClass()
 {
 	for (S32 i = 0; i < LL_MAX_PARTICLE_COUNT; ++i)
 	{
@@ -68,7 +66,11 @@ void LLVOPartGroup::restoreGL()
 	}
 
 	sVBSlotCursor = sVBSlotFree;
+}
 
+//static
+void LLVOPartGroup::restoreGL()
+{
 	sVB = new LLVertexBuffer(VERTEX_DATA_MASK, GL_STREAM_DRAW_ARB);
 	U32 count = LL_MAX_PARTICLE_COUNT;
 	sVB->allocateBuffer(count*4, count*6, true);
@@ -120,32 +122,6 @@ void LLVOPartGroup::restoreGL()
 //static
 void LLVOPartGroup::destroyGL()
 {
-	//Just iterate over all particle faces and mark their vbo index as 'uninitialized' since sVBSlotFree & sVBSlotCursor will be clobbered.
-	for (int i=0; i<gObjectList.getNumObjects(); i++)
-	{
-		LLViewerObject *obj = gObjectList.getObject(i);
-		if(obj && obj->mDrawable)
-		{
-			if (obj->mDrawable->getRenderType() == LLPipeline::RENDER_TYPE_PARTICLES ||
-				obj->mDrawable->getRenderType() == LLPipeline::RENDER_TYPE_HUD_PARTICLES
-#if ENABLE_CLASSIC_CLOUDS
-				|| obj->mDrawable->getRenderType() == LLPipeline::RENDER_TYPE_CLASSIC_CLOUDS
-#endif
-				)
-			{
-				for (S32 j = 0; j < obj->mDrawable->getNumFaces(); ++j)
-				{
-					LLFace* facep = obj->mDrawable->getFace(j);
-					if(facep)
-						facep->setIndicesIndex(0xFFFFFFFF);
-				}
-			}
-		}
-	}
-	for (S32 i = 0; i < LL_MAX_PARTICLE_COUNT; ++i)
-	{
-		sVBSlotFree[i] = i;
-	}
 	sVB = NULL;
 }
 
@@ -160,7 +136,6 @@ S32 LLVOPartGroup::findAvailableVBSlot()
 	S32 ret = *sVBSlotCursor;
 	sVBSlotCursor++;
 
-
 	return ret;
 }
 
@@ -654,7 +629,7 @@ void LLParticlePartition::getGeometry(LLSpatialGroup* group)
 		LLFace* facep = *i;
 		LLAlphaObject* object = (LLAlphaObject*) facep->getViewerObject();
 
-		if (facep->getIndicesStart() == 0xFFFFFFFF)
+		if (!facep->isState(LLFace::PARTICLE))
 		{ //set the indices of this face
 			S32 idx = LLVOPartGroup::findAvailableVBSlot();
 			if (idx >= 0)
@@ -663,6 +638,7 @@ void LLParticlePartition::getGeometry(LLSpatialGroup* group)
 				facep->setIndicesIndex(idx*6);
 				facep->setVertexBuffer(LLVOPartGroup::sVB);
 				facep->setPoolType(LLDrawPool::POOL_ALPHA);
+				facep->setState(LLFace::PARTICLE);
 			}
 			else
 			{
diff --git a/indra/newview/llvopartgroup.h b/indra/newview/llvopartgroup.h
index 4c2e073d7..4948ddf55 100644
--- a/indra/newview/llvopartgroup.h
+++ b/indra/newview/llvopartgroup.h
@@ -51,6 +51,7 @@ public:
 	static S32 sVBSlotFree[LL_MAX_PARTICLE_COUNT];
 	static S32* sVBSlotCursor;
 
+	static void initClass();
 	static void restoreGL();
 	static void destroyGL();
 	static S32 findAvailableVBSlot();

From 7b23aece00e1ee4853f7110700ba46c554776bdd Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 20 Jul 2012 11:37:01 -0500
Subject: [PATCH 067/199] Missed a couple LLCullResult::drawable_list_t ->
 LLCullResult::drawable_iterator replacements, albeit in #if'd out code
 blocks.

---
 indra/newview/pipeline.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 9235a7b2a..83ef73155 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -1833,7 +1833,7 @@ void LLPipeline::checkReferences(LLFace* face)
 			check_references(group, face);
 		}
 
-		for (LLCullResult::drawable_list_t::iterator iter = sCull->beginVisibleList(); iter != sCull->endVisibleList(); ++iter)
+		for (LLCullResult::drawable_iterator iter = sCull->beginVisibleList(); iter != sCull->endVisibleList(); ++iter)
 		{
 			LLDrawable* drawable = *iter;
 			check_references(drawable, face);
@@ -1865,7 +1865,7 @@ void LLPipeline::checkReferences(LLDrawable* drawable)
 			check_references(group, drawable);
 		}
 
-		for (LLCullResult::drawable_list_t::iterator iter = sCull->beginVisibleList(); iter != sCull->endVisibleList(); ++iter)
+		for (LLCullResult::drawable_iterator iter = sCull->beginVisibleList(); iter != sCull->endVisibleList(); ++iter)
 		{
 			if (drawable == *iter)
 			{

From b8b235df09a77a37e2ccfd78f7b06423d208621a Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 20 Jul 2012 12:03:41 -0500
Subject: [PATCH 068/199] And suddeny the texture index attrib(for batching) is
 now an integer! (Changing switch to an if block on nividia hardware seems
 like the real solution to pink textures... not the index datatype)

---
 indra/llrender/llshadermgr.cpp                     | 10 +++++-----
 indra/llrender/llvertexbuffer.cpp                  |  6 +++---
 .../shaders/class1/objects/indexedTextureV.glsl    |  4 ++--
 indra/newview/llface.cpp                           | 14 ++++++--------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index 0c17fbfb5..a37604ae5 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -680,7 +680,7 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 
 		vec4 diffuseLookup(vec2 texcoord)
 		{
-			switch (vary_texture_index.r))
+			switch (vary_texture_index))
 			{
 				case 0: ret = texture2D(tex0, texcoord); break;
 				case 1: ret = texture2D(tex1, texcoord); break;
@@ -704,7 +704,7 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 
 		if (texture_index_channels > 1)
 		{
-			text[count++] = strdup("VARYING_FLAT ivec4 vary_texture_index;\n");
+			text[count++] = strdup("VARYING_FLAT int vary_texture_index;\n");
 		}
 
 		text[count++] = strdup("vec4 diffuseLookup(vec2 texcoord)\n");
@@ -722,7 +722,7 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 			{ //switches are unreliable on some NVIDIA drivers
 				for (S32 i = 0; i < texture_index_channels; ++i)
 				{
-					std::string if_string = llformat("\t%sif (vary_texture_index.r == %d) { return texture2D(tex%d, texcoord); }\n", i > 0 ? "else " : "", i, i); 
+					std::string if_string = llformat("\t%sif (vary_texture_index == %d) { return texture2D(tex%d, texcoord); }\n", i > 0 ? "else " : "", i, i); 
 					text[count++] = strdup(if_string.c_str());
 				}
 				text[count++] = strdup("\treturn vec4(1,0,1,1);\n");
@@ -731,13 +731,13 @@ GLhandleARB LLShaderMgr::loadShaderFile(const std::string& filename, S32 & shade
 			else
 			{
 				text[count++] = strdup("\tvec4 ret = vec4(1,0,1,1);\n");
-				text[count++] = strdup("\tswitch (vary_texture_index.r)\n");
+				text[count++] = strdup("\tswitch (vary_texture_index)\n");
 				text[count++] = strdup("\t{\n");
 		
 				//switch body
 				for (S32 i = 0; i < texture_index_channels; ++i)
 				{
-					std::string case_str = llformat("\t\tcase %d: ret = texture2D(tex%d, texcoord); break;\n", i, i);
+					std::string case_str = llformat("\t\tcase %d: return texture2D(tex%d, texcoord);\n", i, i);
 					text[count++] = strdup(case_str.c_str());
 				}
 
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp
index bc4c201d9..896560d4d 100644
--- a/indra/llrender/llvertexbuffer.cpp
+++ b/indra/llrender/llvertexbuffer.cpp
@@ -1249,7 +1249,7 @@ void LLVertexBuffer::setupVertexArray()
 		1, //TYPE_WEIGHT,
 		4, //TYPE_WEIGHT4,
 		4, //TYPE_CLOTHWEIGHT,
-		4, //TYPE_TEXTURE_INDEX
+		1, //TYPE_TEXTURE_INDEX
 	};
 
 	U32 attrib_type[] =
@@ -1266,7 +1266,7 @@ void LLVertexBuffer::setupVertexArray()
 		GL_FLOAT, //TYPE_WEIGHT,
 		GL_FLOAT, //TYPE_WEIGHT4,
 		GL_FLOAT, //TYPE_CLOTHWEIGHT,
-		GL_UNSIGNED_BYTE, //TYPE_TEXTURE_INDEX
+		GL_UNSIGNED_INT, //TYPE_TEXTURE_INDEX
 	};
 
 	bool attrib_integer[] = 
@@ -2313,7 +2313,7 @@ void LLVertexBuffer::setupVertexBuffer(U32 data_mask)
 #if !LL_DARWIN
 			S32 loc = TYPE_TEXTURE_INDEX;
 			void *ptr = (void*) (base + mOffsets[TYPE_VERTEX] + 12);
-			glVertexAttribIPointer(loc, 4, GL_UNSIGNED_BYTE, LLVertexBuffer::sTypeSize[TYPE_VERTEX], ptr);
+			glVertexAttribIPointer(loc, 1, GL_UNSIGNED_INT, LLVertexBuffer::sTypeSize[TYPE_VERTEX], ptr);
 #endif
 		}
 		if (data_mask & MAP_VERTEX)
diff --git a/indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl b/indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl
index 7c0699d72..ca29bf314 100644
--- a/indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl
+++ b/indra/newview/app_settings/shaders/class1/objects/indexedTextureV.glsl
@@ -23,9 +23,9 @@
  * $/LicenseInfo$
  */
 
-ATTRIBUTE ivec4 texture_index;
+ATTRIBUTE int texture_index;
 
-VARYING_FLAT ivec4 vary_texture_index;
+VARYING_FLAT int vary_texture_index;
 
 void passTextureIndex()
 {
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 59deb7c44..fc7a2ae49 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -1622,7 +1622,8 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 						if (!do_xform)
 						{
 							LLFastTimer t(FTM_FACE_TEX_QUICK_NO_XFORM);
-							LLVector4a::memcpyNonAliased16((F32*) tex_coords.get(), (F32*) vf.mTexCoords, num_vertices*2*sizeof(F32));
+							S32 tc_size = (num_vertices*2*sizeof(F32)+0xF) & ~0xF;
+							LLVector4a::memcpyNonAliased16((F32*) tex_coords.get(), (F32*) vf.mTexCoords, tc_size);
 						}
 						else
 						{
@@ -1843,15 +1844,12 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 
 			LLVector4a texIdx;
 
-			U8 index = mTextureIndex < 255 ? mTextureIndex : 0;
+			S32 index = mTextureIndex < 255 ? mTextureIndex : 0;
 
 			F32 val = 0.f;
-			U8* vp = (U8*) &val;
-			vp[0] = index;
-			vp[1] = 0;
-			vp[2] = 0;
-			vp[3] = 0;
-
+			S32* vp = (S32*) &val;
+			*vp = index;
+			
 			llassert(index <= LLGLSLShader::sIndexedTextureChannels-1);
 
 			LLVector4Logical mask;

From 73bc656e63dace4a1e891a4546c40c94349a0906 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 20 Jul 2012 12:04:24 -0500
Subject: [PATCH 069/199] Flexis were not being reliably initialized before
 being drawn.

---
 indra/newview/llflexibleobject.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llflexibleobject.cpp b/indra/newview/llflexibleobject.cpp
index 5ff314865..8b0fd109f 100644
--- a/indra/newview/llflexibleobject.cpp
+++ b/indra/newview/llflexibleobject.cpp
@@ -346,7 +346,9 @@ void LLVolumeImplFlexible::doIdleUpdate(LLAgent &agent, LLWorld &world, const F6
 					gPipeline.markRebuild(drawablep, LLDrawable::REBUILD_POSITION, FALSE);
 				}
 			}
-		}
+ 		}
+		if(!mInitialized)
+			updateRenderRes();
 	}
 }
 

From 4e4d554ea425a30f6dfbdaacb9759dce9bf8c6d0 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 20 Jul 2012 12:11:30 -0500
Subject: [PATCH 070/199] Silence the diagnostic llinfos spam when listening to
 a stream.

---
 indra/llaudio/llstreamingaudio_fmodex.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/llaudio/llstreamingaudio_fmodex.cpp b/indra/llaudio/llstreamingaudio_fmodex.cpp
index d2db99d45..afa3a1a37 100644
--- a/indra/llaudio/llstreamingaudio_fmodex.cpp
+++ b/indra/llaudio/llstreamingaudio_fmodex.cpp
@@ -172,7 +172,6 @@ void LLStreamingAudio_FMODEX::update()
 
 	if(mFMODInternetStreamChannelp)
 	{
-		llinfos << "progress = " << progress << llendl;
 		if(!mMetaData)
 			mMetaData = new LLSD;
 

From 0d3fab40e52dee8a5328c29ce3c21f43cce0c4ba Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Sat, 21 Jul 2012 03:01:42 -0400
Subject: [PATCH 071/199] Further header cleanup and a few updates

Updated llstring to current linden
Further linden_common cleanup
Header cleanup
Raised banlines to 5000 as per linden server change
Included missing llmediaentry.cpp file
Minor whitespace changes here and there
---
 indra/llcharacter/llcharacter.cpp          |   1 -
 indra/llcharacter/llheadrotmotion.cpp      |   4 +-
 indra/llcharacter/llmotioncontroller.cpp   |  16 +-
 indra/llcharacter/llvisualparam.h          |   1 +
 indra/llcommon/linden_common.h             |   5 -
 indra/llcommon/llstring.cpp                |   9 +-
 indra/llcommon/llstring.h                  | 594 ++++++++++++++++----
 indra/llcommon/lluuid.cpp                  |   2 +-
 indra/llcommon/lluuid.h                    |   1 -
 indra/llinventory/llinventory.cpp          |   2 +-
 indra/llinventory/llinventorytype.cpp      |   2 +-
 indra/llinventory/llparcel.h               |   5 +-
 indra/llinventory/llpermissionsflags.h     |   3 -
 indra/llinventory/lltransactionflags.cpp   |   2 +-
 indra/llinventory/lltransactiontypes.h     |   1 +
 indra/llmessage/llbuffer.cpp               |   1 -
 indra/llmessage/lldispatcher.cpp           |   1 -
 indra/llmessage/llfiltersd2xmlrpc.cpp      |   1 -
 indra/llmessage/llhttpclient.cpp           |   2 +-
 indra/llmessage/lliohttpserver.cpp         |   1 -
 indra/llmessage/lliosocket.cpp             |   1 -
 indra/llmessage/llioutil.cpp               |   1 -
 indra/llprimitive/CMakeLists.txt           |   1 +
 indra/llprimitive/llmaterialtable.cpp      |   1 +
 indra/llprimitive/llmediaentry.cpp         | 596 +++++++++++++++++++++
 indra/llprimitive/llmodel.cpp              |  11 +-
 indra/newview/llvieweraudio.cpp            |  25 +-
 indra/newview/llviewermessage.cpp          |   5 +-
 indra/newview/llviewerprecompiledheaders.h |  24 +-
 indra/newview/llviewerwindow.cpp           |   5 +-
 indra/newview/llvoavatar.cpp               |   1 +
 31 files changed, 1143 insertions(+), 182 deletions(-)
 create mode 100644 indra/llprimitive/llmediaentry.cpp

diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp
index 85291530c..6a2e74c4c 100644
--- a/indra/llcharacter/llcharacter.cpp
+++ b/indra/llcharacter/llcharacter.cpp
@@ -38,7 +38,6 @@
 
 #include "llcharacter.h"
 #include "llstring.h"
-#include "llfasttimer.h"
 
 #define SKEL_HEADER "Linden Skeleton 1.0"
 
diff --git a/indra/llcharacter/llheadrotmotion.cpp b/indra/llcharacter/llheadrotmotion.cpp
index 9d12ee98d..0ee378f3b 100644
--- a/indra/llcharacter/llheadrotmotion.cpp
+++ b/indra/llcharacter/llheadrotmotion.cpp
@@ -250,9 +250,9 @@ BOOL LLHeadRotMotion::onUpdate(F32 time, U8* joint_mask)
 	head_rot_local = nlerp(head_slerp_amt, mLastHeadRot, head_rot_local);
 	mLastHeadRot = head_rot_local;
 
-	if(mNeckState->getJoint() && mNeckState->getJoint()->getParent()) //Guess this has crashed? Taken from snowglobe -Shyotl
+	// Set the head rotation.
+	if(mNeckState->getJoint() && mNeckState->getJoint()->getParent())
 	{
-		// Set the head rotation.
 		LLQuaternion torsoRotLocal =  mNeckState->getJoint()->getParent()->getWorldRotation() * currentInvRootRotWorld;
 		head_rot_local = head_rot_local * ~torsoRotLocal;
 		mNeckState->setRotation( nlerp(NECK_LAG, LLQuaternion::DEFAULT, head_rot_local) );
diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp
index 3b7dbec33..ab2f87275 100644
--- a/indra/llcharacter/llmotioncontroller.cpp
+++ b/indra/llcharacter/llmotioncontroller.cpp
@@ -637,9 +637,9 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
 			motionp->fadeIn();
 		}
 
-		// **********************
+		//**********************
 		// MOTION INACTIVE
-		// **********************
+		//**********************
 		if (motionp->isStopped() && mAnimTime > motionp->getStopTime() + motionp->getEaseOutDuration())
 		{
 			// this motion has gone on too long, deactivate it
@@ -659,9 +659,9 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
 			}
 		}
 
-		// **********************
+		//**********************
 		// MOTION EASE OUT
-		// **********************
+		//**********************
 		else if (motionp->isStopped() && mAnimTime > motionp->getStopTime())
 		{
 			// is this the first iteration in the ease out phase?
@@ -684,9 +684,9 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
 			update_result = motionp->onUpdate(mAnimTime - motionp->mActivationTimestamp, last_joint_signature);
 		}
 
-		// **********************
+		//**********************
 		// MOTION ACTIVE
-		// **********************
+		//**********************
 		else if (mAnimTime > motionp->mActivationTimestamp + motionp->getEaseInDuration())
 		{
 			posep->setWeight(motionp->getFadeWeight());
@@ -707,9 +707,9 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty
 			update_result = motionp->onUpdate(mAnimTime - motionp->mActivationTimestamp, last_joint_signature);
 		}
 
-		// **********************
+		//**********************
 		// MOTION EASE IN
-		// **********************
+		//**********************
 		else if (mAnimTime >= motionp->mActivationTimestamp)
 		{
 			if (mLastTime < motionp->mActivationTimestamp)
diff --git a/indra/llcharacter/llvisualparam.h b/indra/llcharacter/llvisualparam.h
index a70efa9dd..694e27f37 100644
--- a/indra/llcharacter/llvisualparam.h
+++ b/indra/llcharacter/llvisualparam.h
@@ -93,6 +93,7 @@ class LLVisualParam
 {
 public:
 	typedef	boost::function<LLVisualParam*(S32)> visual_param_mapper;
+
 	LLVisualParam();
 	virtual ~LLVisualParam();
 
diff --git a/indra/llcommon/linden_common.h b/indra/llcommon/linden_common.h
index a0d64b3f8..b6fdef4ca 100644
--- a/indra/llcommon/linden_common.h
+++ b/indra/llcommon/linden_common.h
@@ -60,16 +60,11 @@
 #include <ctime>
 #include <iosfwd>
 
-// *TODO: Eliminate these, most library .cpp files don't need them.
-// Add them to llviewerprecompiledheaders.h if necessary.
-#include <list>
-
 // Linden only libs in alpha-order other than stdtypes.h
 // *NOTE: Please keep includes here to a minimum, see above.
 #include "stdtypes.h"
 #include "lldefs.h"
 #include "llerror.h"
 #include "llfile.h"
-#include "llformat.h"
 
 #endif
diff --git a/indra/llcommon/llstring.cpp b/indra/llcommon/llstring.cpp
index 7c159c830..f00eefe90 100644
--- a/indra/llcommon/llstring.cpp
+++ b/indra/llcommon/llstring.cpp
@@ -34,7 +34,6 @@
 
 #include "llstring.h"
 #include "llerror.h"
-#include "llfasttimer.h"
 
 #if LL_WINDOWS
 #define WIN32_LEAN_AND_MEAN
@@ -604,16 +603,10 @@ std::string utf8str_removeCRLF(const std::string& utf8str)
 	}
 	const char CR = 13;
 
-	S32 i = utf8str.find(CR);
-	if(i == std::string::npos)
-		return  utf8str; //Save us from a reserve call.
-
 	std::string out;
 	out.reserve(utf8str.length());
 	const S32 len = (S32)utf8str.length();
-	if(i)
-		out.assign(utf8str,0,i); //Copy previous text to buffer
-	for( ++i; i < len; i++ )
+	for( S32 i = 0; i < len; i++ )
 	{
 		if( utf8str[i] != CR )
 		{
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index bdbefe935..ee763a61a 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -35,11 +35,10 @@
 
 #include <string>
 #include <cstdio>
-#include <algorithm>
-#include <map>
 #include <locale>
 #include <iomanip>
 #include "llsd.h"
+#include "llfasttimer.h"
 
 #if LL_LINUX || LL_SOLARIS
 #include <wctype.h>
@@ -47,6 +46,7 @@
 #endif
 
 #include <string.h>
+#include <boost/scoped_ptr.hpp>
 
 #if LL_SOLARIS
 // stricmp and strnicmp do not exist on Solaris:
@@ -246,40 +246,77 @@ private:
 	static std::string sLocale;
 
 public:
-	typedef typename std::basic_string<T>::size_type size_type;
+	typedef std::basic_string<T> string_type;
+	typedef typename string_type::size_type size_type;
 	
 public:
 	/////////////////////////////////////////////////////////////////////////////////////////
 	// Static Utility functions that operate on std::strings
 
-	static const std::basic_string<T> null;
+	static const string_type null;
 	
 	typedef std::map<LLFormatMapString, LLFormatMapString> format_map_t;
-	LL_COMMON_API static void getTokens(const std::basic_string<T>& instr, std::vector<std::basic_string<T> >& tokens, const std::basic_string<T>& delims);
-	LL_COMMON_API static void formatNumber(std::basic_string<T>& numStr, std::basic_string<T> decimals);
-	LL_COMMON_API static bool formatDatetime(std::basic_string<T>& replacement, std::basic_string<T> token, std::basic_string<T> param, S32 secFromEpoch);
-	LL_COMMON_API static S32 format(std::basic_string<T>& s, const format_map_t& substitutions);
-	LL_COMMON_API static S32 format(std::basic_string<T>& s, const LLSD& substitutions);
-	LL_COMMON_API static bool simpleReplacement(std::basic_string<T>& replacement, std::basic_string<T> token, const format_map_t& substitutions);
-	LL_COMMON_API static bool simpleReplacement(std::basic_string<T>& replacement, std::basic_string<T> token, const LLSD& substitutions);
+	/// considers any sequence of delims as a single field separator
+	LL_COMMON_API static void getTokens(const string_type& instr,
+										std::vector<string_type >& tokens,
+										const string_type& delims);
+	/// like simple scan overload, but returns scanned vector
+	static std::vector<string_type> getTokens(const string_type& instr,
+											  const string_type& delims);
+	/// add support for keep_delims and quotes (either could be empty string)
+	static void getTokens(const string_type& instr,
+						  std::vector<string_type>& tokens,
+						  const string_type& drop_delims,
+						  const string_type& keep_delims,
+						  const string_type& quotes=string_type());
+	/// like keep_delims-and-quotes overload, but returns scanned vector
+	static std::vector<string_type> getTokens(const string_type& instr,
+											  const string_type& drop_delims,
+											  const string_type& keep_delims,
+											  const string_type& quotes=string_type());
+	/// add support for escapes (could be empty string)
+	static void getTokens(const string_type& instr,
+						  std::vector<string_type>& tokens,
+						  const string_type& drop_delims,
+						  const string_type& keep_delims,
+						  const string_type& quotes,
+						  const string_type& escapes);
+	/// like escapes overload, but returns scanned vector
+	static std::vector<string_type> getTokens(const string_type& instr,
+											  const string_type& drop_delims,
+											  const string_type& keep_delims,
+											  const string_type& quotes,
+											  const string_type& escapes);
+
+	LL_COMMON_API static void formatNumber(string_type& numStr, string_type decimals);
+	LL_COMMON_API static bool formatDatetime(string_type& replacement, string_type token, string_type param, S32 secFromEpoch);
+	LL_COMMON_API static S32 format(string_type& s, const format_map_t& substitutions);
+	LL_COMMON_API static S32 format(string_type& s, const LLSD& substitutions);
+	LL_COMMON_API static bool simpleReplacement(string_type& replacement, string_type token, const format_map_t& substitutions);
+	LL_COMMON_API static bool simpleReplacement(string_type& replacement, string_type token, const LLSD& substitutions);
 	LL_COMMON_API static void setLocale (std::string inLocale);
 	LL_COMMON_API static std::string getLocale (void);
 	
-	static bool isValidIndex(const std::basic_string<T>& string, size_type i)
+	static bool isValidIndex(const string_type& string, size_type i)
 	{
 		return !string.empty() && (0 <= i) && (i <= string.size());
 	}
 
-	static void	trimHead(std::basic_string<T>& string);
-	static void	trimTail(std::basic_string<T>& string);
-	static void	trim(std::basic_string<T>& string)	{ trimHead(string); trimTail(string); }
-	static void truncate(std::basic_string<T>& string, size_type count);
+	static bool contains(const string_type& string, T c, size_type i=0)
+	{
+		return string.find(c, i) != string_type::npos;
+	}
 
-	static void	toUpper(std::basic_string<T>& string);
-	static void	toLower(std::basic_string<T>& string);
+	static void	trimHead(string_type& string);
+	static void	trimTail(string_type& string);
+	static void	trim(string_type& string)	{ trimHead(string); trimTail(string); }
+	static void truncate(string_type& string, size_type count);
+
+	static void	toUpper(string_type& string);
+	static void	toLower(string_type& string);
 	
 	// True if this is the head of s.
-	static BOOL	isHead( const std::basic_string<T>& string, const T* s ); 
+	static BOOL	isHead( const string_type& string, const T* s ); 
 
 	/**
 	 * @brief Returns true if string starts with substr
@@ -287,8 +324,8 @@ public:
 	 * If etither string or substr are empty, this method returns false.
 	 */
 	static bool startsWith(
-		const std::basic_string<T>& string,
-		const std::basic_string<T>& substr);
+		const string_type& string,
+		const string_type& substr);
 
 	/**
 	 * @brief Returns true if string ends in substr
@@ -296,19 +333,32 @@ public:
 	 * If etither string or substr are empty, this method returns false.
 	 */
 	static bool endsWith(
-		const std::basic_string<T>& string,
-		const std::basic_string<T>& substr);
+		const string_type& string,
+		const string_type& substr);
 
-	static void	addCRLF(std::basic_string<T>& string);
-	static void	removeCRLF(std::basic_string<T>& string);
+	static void	addCRLF(string_type& string);
+	static void	removeCRLF(string_type& string);
 
-	static void	replaceTabsWithSpaces( std::basic_string<T>& string, size_type spaces_per_tab );
-	static void	replaceNonstandardASCII( std::basic_string<T>& string, T replacement );
-	static void	replaceChar( std::basic_string<T>& string, T target, T replacement );
-	static void replaceString( std::basic_string<T>& string, std::basic_string<T> target, std::basic_string<T> replacement );
+	static void	replaceTabsWithSpaces( string_type& string, size_type spaces_per_tab );
+	static void	replaceNonstandardASCII( string_type& string, T replacement );
+	static void	replaceChar( string_type& string, T target, T replacement );
+	static void replaceString( string_type& string, string_type target, string_type replacement );
 	
-	static BOOL	containsNonprintable(const std::basic_string<T>& string);
-	static void	stripNonprintable(std::basic_string<T>& string);
+	static BOOL	containsNonprintable(const string_type& string);
+	static void	stripNonprintable(string_type& string);
+
+	/**
+	 * Double-quote an argument string if needed, unless it's already
+	 * double-quoted. Decide whether it's needed based on the presence of any
+	 * character in @a triggers (default space or double-quote). If we quote
+	 * it, escape any embedded double-quote with the @a escape string (default
+	 * backslash).
+	 *
+	 * Passing triggers="" means always quote, unless it's already double-quoted.
+	 */
+	static string_type quote(const string_type& str,
+							 const string_type& triggers=" \"",
+							 const string_type& escape="\\");
 
 	/**
 	 * @brief Unsafe way to make ascii characters. You should probably
@@ -317,18 +367,18 @@ public:
 	 * The 2 and 4 byte std::string probably work, so LLWStringUtil::_makeASCII
 	 * should work.
 	 */
-	static void _makeASCII(std::basic_string<T>& string);
+	static void _makeASCII(string_type& string);
 
 	// Conversion to other data types
-	static BOOL	convertToBOOL(const std::basic_string<T>& string, BOOL& value);
-	static BOOL	convertToU8(const std::basic_string<T>& string, U8& value);
-	static BOOL	convertToS8(const std::basic_string<T>& string, S8& value);
-	static BOOL	convertToS16(const std::basic_string<T>& string, S16& value);
-	static BOOL	convertToU16(const std::basic_string<T>& string, U16& value);
-	static BOOL	convertToU32(const std::basic_string<T>& string, U32& value);
-	static BOOL	convertToS32(const std::basic_string<T>& string, S32& value);
-	static BOOL	convertToF32(const std::basic_string<T>& string, F32& value);
-	static BOOL	convertToF64(const std::basic_string<T>& string, F64& value);
+	static BOOL	convertToBOOL(const string_type& string, BOOL& value);
+	static BOOL	convertToU8(const string_type& string, U8& value);
+	static BOOL	convertToS8(const string_type& string, S8& value);
+	static BOOL	convertToS16(const string_type& string, S16& value);
+	static BOOL	convertToU16(const string_type& string, U16& value);
+	static BOOL	convertToU32(const string_type& string, U32& value);
+	static BOOL	convertToS32(const string_type& string, S32& value);
+	static BOOL	convertToF32(const string_type& string, F32& value);
+	static BOOL	convertToF64(const string_type& string, F64& value);
 
 	/////////////////////////////////////////////////////////////////////////////////////////
 	// Utility functions for working with char*'s and strings
@@ -336,24 +386,24 @@ public:
 	// Like strcmp but also handles empty strings. Uses
 	// current locale.
 	static S32		compareStrings(const T* lhs, const T* rhs);
-	static S32		compareStrings(const std::basic_string<T>& lhs, const std::basic_string<T>& rhs);
+	static S32		compareStrings(const string_type& lhs, const string_type& rhs);
 	
 	// case insensitive version of above. Uses current locale on
 	// Win32, and falls back to a non-locale aware comparison on
 	// Linux.
 	static S32		compareInsensitive(const T* lhs, const T* rhs);
-	static S32		compareInsensitive(const std::basic_string<T>& lhs, const std::basic_string<T>& rhs);
+	static S32		compareInsensitive(const string_type& lhs, const string_type& rhs);
 
 	// Case sensitive comparison with good handling of numbers.  Does not use current locale.
 	// a.k.a. strdictcmp()
-	static S32		compareDict(const std::basic_string<T>& a, const std::basic_string<T>& b);
+	static S32		compareDict(const string_type& a, const string_type& b);
 
 	// Case *in*sensitive comparison with good handling of numbers.  Does not use current locale.
 	// a.k.a. strdictcmp()
-	static S32		compareDictInsensitive(const std::basic_string<T>& a, const std::basic_string<T>& b);
+	static S32		compareDictInsensitive(const string_type& a, const string_type& b);
 
 	// Puts compareDict() in a form appropriate for LL container classes to use for sorting.
-	static BOOL		precedesDict( const std::basic_string<T>& a, const std::basic_string<T>& b );
+	static BOOL		precedesDict( const string_type& a, const string_type& b );
 
 	// A replacement for strncpy.
 	// If the dst buffer is dst_size bytes long or more, ensures that dst is null terminated and holds
@@ -361,7 +411,7 @@ public:
 	static void		copy(T* dst, const T* src, size_type dst_size);
 	
 	// Copies src into dst at a given offset.  
-	static void		copyInto(std::basic_string<T>& dst, const std::basic_string<T>& src, size_type offset);
+	static void		copyInto(string_type& dst, const string_type& src, size_type offset);
 	
 	static bool		isPartOfWord(T c) { return (c == (T)'_') || LLStringOps::isAlnum(c); }
 
@@ -371,7 +421,7 @@ public:
 #endif
 
 private:
-	LL_COMMON_API static size_type getSubstitution(const std::basic_string<T>& instr, size_type& start, std::vector<std::basic_string<T> >& tokens);
+	LL_COMMON_API static size_type getSubstitution(const string_type& instr, size_type& start, std::vector<string_type >& tokens);
 };
 
 template<class T> const std::basic_string<T> LLStringUtilBase<T>::null;
@@ -649,6 +699,321 @@ namespace LLStringFn
 
 ////////////////////////////////////////////////////////////
 
+// static
+template <class T>
+std::vector<typename LLStringUtilBase<T>::string_type>
+LLStringUtilBase<T>::getTokens(const string_type& instr, const string_type& delims)
+{
+	std::vector<string_type> tokens;
+	getTokens(instr, tokens, delims);
+	return tokens;
+}
+
+// static
+template <class T>
+std::vector<typename LLStringUtilBase<T>::string_type>
+LLStringUtilBase<T>::getTokens(const string_type& instr,
+							   const string_type& drop_delims,
+							   const string_type& keep_delims,
+							   const string_type& quotes)
+{
+	std::vector<string_type> tokens;
+	getTokens(instr, tokens, drop_delims, keep_delims, quotes);
+	return tokens;
+}
+
+// static
+template <class T>
+std::vector<typename LLStringUtilBase<T>::string_type>
+LLStringUtilBase<T>::getTokens(const string_type& instr,
+							   const string_type& drop_delims,
+							   const string_type& keep_delims,
+							   const string_type& quotes,
+							   const string_type& escapes)
+{
+	std::vector<string_type> tokens;
+	getTokens(instr, tokens, drop_delims, keep_delims, quotes, escapes);
+	return tokens;
+}
+
+namespace LLStringUtilBaseImpl
+{
+
+/**
+ * Input string scanner helper for getTokens(), or really any other
+ * character-parsing routine that may have to deal with escape characters.
+ * This implementation defines the concept (also an interface, should you
+ * choose to implement the concept by subclassing) and provides trivial
+ * implementations for a string @em without escape processing.
+ */
+template <class T>
+struct InString
+{
+	typedef std::basic_string<T> string_type;
+	typedef typename string_type::const_iterator const_iterator;
+
+	InString(const_iterator b, const_iterator e):
+		mIter(b),
+		mEnd(e)
+	{}
+	virtual ~InString() {}
+
+	bool done() const { return mIter == mEnd; }
+	/// Is the current character (*mIter) escaped? This implementation can
+	/// answer trivially because it doesn't support escapes.
+	virtual bool escaped() const { return false; }
+	/// Obtain the current character and advance @c mIter.
+	virtual T next() { return *mIter++; }
+	/// Does the current character match specified character?
+	virtual bool is(T ch) const { return (! done()) && *mIter == ch; }
+	/// Is the current character any one of the specified characters?
+	virtual bool oneof(const string_type& delims) const
+	{
+		return (! done()) && LLStringUtilBase<T>::contains(delims, *mIter);
+	}
+
+	/**
+	 * Scan forward from @from until either @a delim or end. This is primarily
+	 * useful for processing quoted substrings.
+	 *
+	 * If we do see @a delim, append everything from @from until (excluding)
+	 * @a delim to @a into, advance @c mIter to skip @a delim, and return @c
+	 * true.
+	 *
+	 * If we do not see @a delim, do not alter @a into or @c mIter and return
+	 * @c false. Do not pass GO, do not collect $200.
+	 *
+	 * @note The @c false case described above implements normal getTokens()
+	 * treatment of an unmatched open quote: treat the quote character as if
+	 * escaped, that is, simply collect it as part of the current token. Other
+	 * plausible behaviors directly affect the way getTokens() deals with an
+	 * unmatched quote: e.g. throwing an exception to treat it as an error, or
+	 * assuming a close quote beyond end of string (in which case return @c
+	 * true).
+	 */
+	virtual bool collect_until(string_type& into, const_iterator from, T delim)
+	{
+		const_iterator found = std::find(from, mEnd, delim);
+		// If we didn't find delim, change nothing, just tell caller.
+		if (found == mEnd)
+			return false;
+		// Found delim! Append everything between from and found.
+		into.append(from, found);
+		// advance past delim in input
+		mIter = found + 1;
+		return true;
+	}
+
+	const_iterator mIter, mEnd;
+};
+
+/// InString subclass that handles escape characters
+template <class T>
+class InEscString: public InString<T>
+{
+public:
+	typedef InString<T> super;
+	typedef typename super::string_type string_type;
+	typedef typename super::const_iterator const_iterator;
+	using super::done;
+	using super::mIter;
+	using super::mEnd;
+
+	InEscString(const_iterator b, const_iterator e, const string_type& escapes):
+		super(b, e),
+		mEscapes(escapes)
+	{
+		// Even though we've already initialized 'mIter' via our base-class
+		// constructor, set it again to check for initial escape char.
+		setiter(b);
+	}
+
+	/// This implementation uses the answer cached by setiter().
+	virtual bool escaped() const { return mIsEsc; }
+	virtual T next()
+	{
+		// If we're looking at the escape character of an escape sequence,
+		// skip that character. This is the one time we can modify 'mIter'
+		// without using setiter: for this one case we DO NOT CARE if the
+		// escaped character is itself an escape.
+		if (mIsEsc)
+			++mIter;
+		// If we were looking at an escape character, this is the escaped
+		// character; otherwise it's just the next character.
+		T result(*mIter);
+		// Advance mIter, checking for escape sequence.
+		setiter(mIter + 1);
+		return result;
+	}
+
+	virtual bool is(T ch) const
+	{
+		// Like base-class is(), except that an escaped character matches
+		// nothing.
+		return (! done()) && (! mIsEsc) && *mIter == ch;
+	}
+
+	virtual bool oneof(const string_type& delims) const
+	{
+		// Like base-class oneof(), except that an escaped character matches
+		// nothing.
+		return (! done()) && (! mIsEsc) && LLStringUtilBase<T>::contains(delims, *mIter);
+	}
+
+	virtual bool collect_until(string_type& into, const_iterator from, T delim)
+	{
+		// Deal with escapes in the characters we collect; that is, an escaped
+		// character must become just that character without the preceding
+		// escape. Collect characters in a separate string rather than
+		// directly appending to 'into' in case we do not find delim, in which
+		// case we're supposed to leave 'into' unmodified.
+		string_type collected;
+		// For scanning purposes, we're going to work directly with 'mIter'.
+		// Save its current value in case we fail to see delim.
+		const_iterator save_iter(mIter);
+		// Okay, set 'mIter', checking for escape.
+		setiter(from);
+		while (! done())
+		{
+			// If we see an unescaped delim, stop and report success.
+			if ((! mIsEsc) && *mIter == delim)
+			{
+				// Append collected chars to 'into'.
+				into.append(collected);
+				// Don't forget to advance 'mIter' past delim.
+				setiter(mIter + 1);
+				return true;
+			}
+			// We're not at end, and either we're not looking at delim or it's
+			// escaped. Collect this character and keep going.
+			collected.push_back(next());
+		}
+		// Here we hit 'mEnd' without ever seeing delim. Restore mIter and tell
+		// caller.
+		setiter(save_iter);
+		return false;
+	}
+
+private:
+	void setiter(const_iterator i)
+	{
+		mIter = i;
+
+		// Every time we change 'mIter', set 'mIsEsc' to be able to repetitively
+		// answer escaped() without having to rescan 'mEscapes'. mIsEsc caches
+		// contains(mEscapes, *mIter).
+
+		// We're looking at an escaped char if we're not already at end (that
+		// is, *mIter is even meaningful); if *mIter is in fact one of the
+		// specified escape characters; and if there's one more character
+		// following it. That is, if an escape character is the very last
+		// character of the input string, it loses its special meaning.
+		mIsEsc = (! done()) &&
+				LLStringUtilBase<T>::contains(mEscapes, *mIter) &&
+				(mIter+1) != mEnd;
+	}
+
+	const string_type mEscapes;
+	bool mIsEsc;
+};
+
+/// getTokens() implementation based on InString concept
+template <typename INSTRING, typename string_type>
+void getTokens(INSTRING& instr, std::vector<string_type>& tokens,
+			   const string_type& drop_delims, const string_type& keep_delims,
+			   const string_type& quotes)
+{
+	// There are times when we want to match either drop_delims or
+	// keep_delims. Concatenate them up front to speed things up.
+	string_type all_delims(drop_delims + keep_delims);
+	// no tokens yet
+	tokens.clear();
+
+	// try for another token
+	while (! instr.done())
+	{
+		// scan past any drop_delims
+		while (instr.oneof(drop_delims))
+		{
+			// skip this drop_delim
+			instr.next();
+			// but if that was the end of the string, done
+			if (instr.done())
+				return;
+		}
+		// found the start of another token: make a slot for it
+		tokens.push_back(string_type());
+		if (instr.oneof(keep_delims))
+		{
+			// *iter is a keep_delim, a token of exactly 1 character. Append
+			// that character to the new token and proceed.
+			tokens.back().push_back(instr.next());
+			continue;
+		}
+		// Here we have a non-delimiter token, which might consist of a mix of
+		// quoted and unquoted parts. Use bash rules for quoting: you can
+		// embed a quoted substring in the midst of an unquoted token (e.g.
+		// ~/"sub dir"/myfile.txt); you can ram two quoted substrings together
+		// to make a single token (e.g. 'He said, "'"Don't."'"'). We diverge
+		// from bash in that bash considers an unmatched quote an error. Our
+		// param signature doesn't allow for errors, so just pretend it's not
+		// a quote and embed it.
+		// At this level, keep scanning until we hit the next delimiter of
+		// either type (drop_delims or keep_delims).
+		while (! instr.oneof(all_delims))
+		{
+			// If we're looking at an open quote, search forward for
+			// a close quote, collecting characters along the way.
+			if (instr.oneof(quotes) &&
+				instr.collect_until(tokens.back(), instr.mIter+1, *instr.mIter))
+			{
+				// collect_until is cleverly designed to do exactly what we
+				// need here. No further action needed if it returns true.
+			}
+			else
+			{
+				// Either *iter isn't a quote, or there's no matching close
+				// quote: in other words, just an ordinary char. Append it to
+				// current token.
+				tokens.back().push_back(instr.next());
+			}
+			// having scanned that segment of this token, if we've reached the
+			// end of the string, we're done
+			if (instr.done())
+				return;
+		}
+	}
+}
+
+} // namespace LLStringUtilBaseImpl
+
+// static
+template <class T>
+void LLStringUtilBase<T>::getTokens(const string_type& string, std::vector<string_type>& tokens,
+									const string_type& drop_delims, const string_type& keep_delims,
+									const string_type& quotes)
+{
+	// Because this overload doesn't support escapes, use simple InString to
+	// manage input range.
+	LLStringUtilBaseImpl::InString<T> instring(string.begin(), string.end());
+	LLStringUtilBaseImpl::getTokens(instring, tokens, drop_delims, keep_delims, quotes);
+}
+
+// static
+template <class T>
+void LLStringUtilBase<T>::getTokens(const string_type& string, std::vector<string_type>& tokens,
+									const string_type& drop_delims, const string_type& keep_delims,
+									const string_type& quotes, const string_type& escapes)
+{
+	// This overload must deal with escapes. Delegate that to InEscString
+	// (unless there ARE no escapes).
+	boost::scoped_ptr< LLStringUtilBaseImpl::InString<T> > instrp;
+	if (escapes.empty())
+		instrp.reset(new LLStringUtilBaseImpl::InString<T>(string.begin(), string.end()));
+	else
+		instrp.reset(new LLStringUtilBaseImpl::InEscString<T>(string.begin(), string.end(), escapes));
+	LLStringUtilBaseImpl::getTokens(*instrp, tokens, drop_delims, keep_delims, quotes);
+}
 
 // static
 template<class T> 
@@ -678,7 +1043,7 @@ S32 LLStringUtilBase<T>::compareStrings(const T* lhs, const T* rhs)
 
 //static 
 template<class T> 
-S32 LLStringUtilBase<T>::compareStrings(const std::basic_string<T>& lhs, const std::basic_string<T>& rhs)
+S32 LLStringUtilBase<T>::compareStrings(const string_type& lhs, const string_type& rhs)
 {
 	return LLStringOps::collate(lhs.c_str(), rhs.c_str());
 }
@@ -704,8 +1069,8 @@ S32 LLStringUtilBase<T>::compareInsensitive(const T* lhs, const T* rhs )
 	}
 	else
 	{
-		std::basic_string<T> lhs_string(lhs);
-		std::basic_string<T> rhs_string(rhs);
+		string_type lhs_string(lhs);
+		string_type rhs_string(rhs);
 		LLStringUtilBase<T>::toUpper(lhs_string);
 		LLStringUtilBase<T>::toUpper(rhs_string);
 		result = LLStringOps::collate(lhs_string.c_str(), rhs_string.c_str());
@@ -715,10 +1080,10 @@ S32 LLStringUtilBase<T>::compareInsensitive(const T* lhs, const T* rhs )
 
 //static 
 template<class T> 
-S32 LLStringUtilBase<T>::compareInsensitive(const std::basic_string<T>& lhs, const std::basic_string<T>& rhs)
+S32 LLStringUtilBase<T>::compareInsensitive(const string_type& lhs, const string_type& rhs)
 {
-	std::basic_string<T> lhs_string(lhs);
-	std::basic_string<T> rhs_string(rhs);
+	string_type lhs_string(lhs);
+	string_type rhs_string(rhs);
 	LLStringUtilBase<T>::toUpper(lhs_string);
 	LLStringUtilBase<T>::toUpper(rhs_string);
 	return LLStringOps::collate(lhs_string.c_str(), rhs_string.c_str());
@@ -729,7 +1094,7 @@ S32 LLStringUtilBase<T>::compareInsensitive(const std::basic_string<T>& lhs, con
 
 //static 
 template<class T>
-S32 LLStringUtilBase<T>::compareDict(const std::basic_string<T>& astr, const std::basic_string<T>& bstr)
+S32 LLStringUtilBase<T>::compareDict(const string_type& astr, const string_type& bstr)
 {
 	const T* a = astr.c_str();
 	const T* b = bstr.c_str();
@@ -770,7 +1135,7 @@ S32 LLStringUtilBase<T>::compareDict(const std::basic_string<T>& astr, const std
 
 // static
 template<class T>
-S32 LLStringUtilBase<T>::compareDictInsensitive(const std::basic_string<T>& astr, const std::basic_string<T>& bstr)
+S32 LLStringUtilBase<T>::compareDictInsensitive(const string_type& astr, const string_type& bstr)
 {
 	const T* a = astr.c_str();
 	const T* b = bstr.c_str();
@@ -805,7 +1170,7 @@ S32 LLStringUtilBase<T>::compareDictInsensitive(const std::basic_string<T>& astr
 // Puts compareDict() in a form appropriate for LL container classes to use for sorting.
 // static 
 template<class T> 
-BOOL LLStringUtilBase<T>::precedesDict( const std::basic_string<T>& a, const std::basic_string<T>& b )
+BOOL LLStringUtilBase<T>::precedesDict( const string_type& a, const string_type& b )
 {
 	if( a.size() && b.size() )
 	{
@@ -819,7 +1184,7 @@ BOOL LLStringUtilBase<T>::precedesDict( const std::basic_string<T>& a, const std
 
 //static
 template<class T> 
-void LLStringUtilBase<T>::toUpper(std::basic_string<T>& string)	
+void LLStringUtilBase<T>::toUpper(string_type& string)	
 { 
 	if( !string.empty() )
 	{ 
@@ -833,7 +1198,7 @@ void LLStringUtilBase<T>::toUpper(std::basic_string<T>& string)
 
 //static
 template<class T> 
-void LLStringUtilBase<T>::toLower(std::basic_string<T>& string)
+void LLStringUtilBase<T>::toLower(string_type& string)
 { 
 	if( !string.empty() )
 	{ 
@@ -847,7 +1212,7 @@ void LLStringUtilBase<T>::toLower(std::basic_string<T>& string)
 
 //static
 template<class T> 
-void LLStringUtilBase<T>::trimHead(std::basic_string<T>& string)
+void LLStringUtilBase<T>::trimHead(string_type& string)
 {			
 	if( !string.empty() )
 	{
@@ -862,7 +1227,7 @@ void LLStringUtilBase<T>::trimHead(std::basic_string<T>& string)
 
 //static
 template<class T> 
-void LLStringUtilBase<T>::trimTail(std::basic_string<T>& string)
+void LLStringUtilBase<T>::trimTail(string_type& string)
 {			
 	if( string.size() )
 	{
@@ -881,7 +1246,7 @@ void LLStringUtilBase<T>::trimTail(std::basic_string<T>& string)
 // Replace line feeds with carriage return-line feed pairs.
 //static
 template<class T>
-void LLStringUtilBase<T>::addCRLF(std::basic_string<T>& string)
+void LLStringUtilBase<T>::addCRLF(string_type& string)
 {
 	const T LF = 10;
 	const T CR = 13;
@@ -923,7 +1288,7 @@ void LLStringUtilBase<T>::addCRLF(std::basic_string<T>& string)
 // Remove all carriage returns
 //static
 template<class T> 
-void LLStringUtilBase<T>::removeCRLF(std::basic_string<T>& string)
+void LLStringUtilBase<T>::removeCRLF(string_type& string)
 {
 	const T CR = 13;
 
@@ -944,10 +1309,10 @@ void LLStringUtilBase<T>::removeCRLF(std::basic_string<T>& string)
 
 //static
 template<class T> 
-void LLStringUtilBase<T>::replaceChar( std::basic_string<T>& string, T target, T replacement )
+void LLStringUtilBase<T>::replaceChar( string_type& string, T target, T replacement )
 {
 	size_type found_pos = 0;
-	while( (found_pos = string.find(target, found_pos)) != std::basic_string<T>::npos ) 
+	while( (found_pos = string.find(target, found_pos)) != string_type::npos ) 
 	{
 		string[found_pos] = replacement;
 		found_pos++; // avoid infinite defeat if target == replacement
@@ -956,10 +1321,10 @@ void LLStringUtilBase<T>::replaceChar( std::basic_string<T>& string, T target, T
 
 //static
 template<class T> 
-void LLStringUtilBase<T>::replaceString( std::basic_string<T>& string, std::basic_string<T> target, std::basic_string<T> replacement )
+void LLStringUtilBase<T>::replaceString( string_type& string, string_type target, string_type replacement )
 {
 	size_type found_pos = 0;
-	while( (found_pos = string.find(target, found_pos)) != std::basic_string<T>::npos )
+	while( (found_pos = string.find(target, found_pos)) != string_type::npos )
 	{
 		string.replace( found_pos, target.length(), replacement );
 		found_pos += replacement.length(); // avoid infinite defeat if replacement contains target
@@ -968,7 +1333,7 @@ void LLStringUtilBase<T>::replaceString( std::basic_string<T>& string, std::basi
 
 //static
 template<class T> 
-void LLStringUtilBase<T>::replaceNonstandardASCII( std::basic_string<T>& string, T replacement )
+void LLStringUtilBase<T>::replaceNonstandardASCII( string_type& string, T replacement )
 {
 	const char LF = 10;
 	const S8 MIN = 32;
@@ -988,12 +1353,12 @@ void LLStringUtilBase<T>::replaceNonstandardASCII( std::basic_string<T>& string,
 
 //static
 template<class T> 
-void LLStringUtilBase<T>::replaceTabsWithSpaces( std::basic_string<T>& str, size_type spaces_per_tab )
+void LLStringUtilBase<T>::replaceTabsWithSpaces( string_type& str, size_type spaces_per_tab )
 {
 	const T TAB = '\t';
 	const T SPACE = ' ';
 
-	std::basic_string<T> out_str;
+	string_type out_str;
 	// Replace tabs with spaces
 	for (size_type i = 0; i < str.length(); i++)
 	{
@@ -1012,7 +1377,7 @@ void LLStringUtilBase<T>::replaceTabsWithSpaces( std::basic_string<T>& str, size
 
 //static
 template<class T> 
-BOOL LLStringUtilBase<T>::containsNonprintable(const std::basic_string<T>& string)
+BOOL LLStringUtilBase<T>::containsNonprintable(const string_type& string)
 {
 	const char MIN = 32;
 	BOOL rv = FALSE;
@@ -1029,7 +1394,7 @@ BOOL LLStringUtilBase<T>::containsNonprintable(const std::basic_string<T>& strin
 
 //static
 template<class T> 
-void LLStringUtilBase<T>::stripNonprintable(std::basic_string<T>& string)
+void LLStringUtilBase<T>::stripNonprintable(string_type& string)
 {
 	const char MIN = 32;
 	size_type j = 0;
@@ -1060,8 +1425,43 @@ void LLStringUtilBase<T>::stripNonprintable(std::basic_string<T>& string)
 	delete []c_string;
 }
 
+template<class T>
+std::basic_string<T> LLStringUtilBase<T>::quote(const string_type& str,
+												const string_type& triggers,
+												const string_type& escape)
+{
+	size_type len(str.length());
+	// If the string is already quoted, assume user knows what s/he's doing.
+	if (len >= 2 && str[0] == '"' && str[len-1] == '"')
+	{
+		return str;
+	}
+
+	// Not already quoted: do we need to? triggers.empty() is a special case
+	// meaning "always quote."
+	if ((! triggers.empty()) && str.find_first_of(triggers) == string_type::npos)
+	{
+		// no trigger characters, don't bother quoting
+		return str;
+	}
+
+	// For whatever reason, we must quote this string.
+	string_type result;
+	result.push_back('"');
+	for (typename string_type::const_iterator ci(str.begin()), cend(str.end()); ci != cend; ++ci)
+	{
+		if (*ci == '"')
+		{
+			result.append(escape);
+		}
+		result.push_back(*ci);
+	}
+	result.push_back('"');
+	return result;
+}
+
 template<class T> 
-void LLStringUtilBase<T>::_makeASCII(std::basic_string<T>& string)
+void LLStringUtilBase<T>::_makeASCII(string_type& string)
 {
 	// Replace non-ASCII chars with LL_UNKNOWN_CHAR
 	for (size_type i = 0; i < string.length(); i++)
@@ -1091,7 +1491,7 @@ void LLStringUtilBase<T>::copy( T* dst, const T* src, size_type dst_size )
 
 // static
 template<class T> 
-void LLStringUtilBase<T>::copyInto(std::basic_string<T>& dst, const std::basic_string<T>& src, size_type offset)
+void LLStringUtilBase<T>::copyInto(string_type& dst, const string_type& src, size_type offset)
 {
 	if ( offset == dst.length() )
 	{
@@ -1101,7 +1501,7 @@ void LLStringUtilBase<T>::copyInto(std::basic_string<T>& dst, const std::basic_s
 	}
 	else
 	{
-		std::basic_string<T> tail = dst.substr(offset);
+		string_type tail = dst.substr(offset);
 
 		dst = dst.substr(0, offset);
 		dst += src;
@@ -1112,7 +1512,7 @@ void LLStringUtilBase<T>::copyInto(std::basic_string<T>& dst, const std::basic_s
 // True if this is the head of s.
 //static
 template<class T> 
-BOOL LLStringUtilBase<T>::isHead( const std::basic_string<T>& string, const T* s ) 
+BOOL LLStringUtilBase<T>::isHead( const string_type& string, const T* s ) 
 { 
 	if( string.empty() )
 	{
@@ -1128,8 +1528,8 @@ BOOL LLStringUtilBase<T>::isHead( const std::basic_string<T>& string, const T* s
 // static
 template<class T> 
 bool LLStringUtilBase<T>::startsWith(
-	const std::basic_string<T>& string,
-	const std::basic_string<T>& substr)
+	const string_type& string,
+	const string_type& substr)
 {
 	if(string.empty() || (substr.empty())) return false;
 	if(0 == string.find(substr)) return true;
@@ -1139,8 +1539,8 @@ bool LLStringUtilBase<T>::startsWith(
 // static
 template<class T> 
 bool LLStringUtilBase<T>::endsWith(
-	const std::basic_string<T>& string,
-	const std::basic_string<T>& substr)
+	const string_type& string,
+	const string_type& substr)
 {
 	if(string.empty() || (substr.empty())) return false;
 	std::string::size_type idx = string.rfind(substr);
@@ -1150,14 +1550,14 @@ bool LLStringUtilBase<T>::endsWith(
 
 
 template<class T> 
-BOOL LLStringUtilBase<T>::convertToBOOL(const std::basic_string<T>& string, BOOL& value)
+BOOL LLStringUtilBase<T>::convertToBOOL(const string_type& string, BOOL& value)
 {
 	if( string.empty() )
 	{
 		return FALSE;
 	}
 
-	std::basic_string<T> temp( string );
+	string_type temp( string );
 	trim(temp);
 	if( 
 		(temp == "1") || 
@@ -1187,7 +1587,7 @@ BOOL LLStringUtilBase<T>::convertToBOOL(const std::basic_string<T>& string, BOOL
 }
 
 template<class T> 
-BOOL LLStringUtilBase<T>::convertToU8(const std::basic_string<T>& string, U8& value) 
+BOOL LLStringUtilBase<T>::convertToU8(const string_type& string, U8& value) 
 {
 	S32 value32 = 0;
 	BOOL success = convertToS32(string, value32);
@@ -1200,7 +1600,7 @@ BOOL LLStringUtilBase<T>::convertToU8(const std::basic_string<T>& string, U8& va
 }
 
 template<class T> 
-BOOL LLStringUtilBase<T>::convertToS8(const std::basic_string<T>& string, S8& value) 
+BOOL LLStringUtilBase<T>::convertToS8(const string_type& string, S8& value) 
 {
 	S32 value32 = 0;
 	BOOL success = convertToS32(string, value32);
@@ -1213,7 +1613,7 @@ BOOL LLStringUtilBase<T>::convertToS8(const std::basic_string<T>& string, S8& va
 }
 
 template<class T> 
-BOOL LLStringUtilBase<T>::convertToS16(const std::basic_string<T>& string, S16& value) 
+BOOL LLStringUtilBase<T>::convertToS16(const string_type& string, S16& value) 
 {
 	S32 value32 = 0;
 	BOOL success = convertToS32(string, value32);
@@ -1226,7 +1626,7 @@ BOOL LLStringUtilBase<T>::convertToS16(const std::basic_string<T>& string, S16&
 }
 
 template<class T> 
-BOOL LLStringUtilBase<T>::convertToU16(const std::basic_string<T>& string, U16& value) 
+BOOL LLStringUtilBase<T>::convertToU16(const string_type& string, U16& value) 
 {
 	S32 value32 = 0;
 	BOOL success = convertToS32(string, value32);
@@ -1239,17 +1639,17 @@ BOOL LLStringUtilBase<T>::convertToU16(const std::basic_string<T>& string, U16&
 }
 
 template<class T> 
-BOOL LLStringUtilBase<T>::convertToU32(const std::basic_string<T>& string, U32& value) 
+BOOL LLStringUtilBase<T>::convertToU32(const string_type& string, U32& value) 
 {
 	if( string.empty() )
 	{
 		return FALSE;
 	}
 
-	std::basic_string<T> temp( string );
+	string_type temp( string );
 	trim(temp);
 	U32 v;
-	std::basic_istringstream<T> i_stream((std::basic_string<T>)temp);
+	std::basic_istringstream<T> i_stream((string_type)temp);
 	if(i_stream >> v)
 	{
 		value = v;
@@ -1259,17 +1659,17 @@ BOOL LLStringUtilBase<T>::convertToU32(const std::basic_string<T>& string, U32&
 }
 
 template<class T> 
-BOOL LLStringUtilBase<T>::convertToS32(const std::basic_string<T>& string, S32& value) 
+BOOL LLStringUtilBase<T>::convertToS32(const string_type& string, S32& value) 
 {
 	if( string.empty() )
 	{
 		return FALSE;
 	}
 
-	std::basic_string<T> temp( string );
+	string_type temp( string );
 	trim(temp);
 	S32 v;
-	std::basic_istringstream<T> i_stream((std::basic_string<T>)temp);
+	std::basic_istringstream<T> i_stream((string_type)temp);
 	if(i_stream >> v)
 	{
 		//TODO: figure out overflow and underflow reporting here
@@ -1286,7 +1686,7 @@ BOOL LLStringUtilBase<T>::convertToS32(const std::basic_string<T>& string, S32&
 }
 
 template<class T> 
-BOOL LLStringUtilBase<T>::convertToF32(const std::basic_string<T>& string, F32& value) 
+BOOL LLStringUtilBase<T>::convertToF32(const string_type& string, F32& value) 
 {
 	F64 value64 = 0.0;
 	BOOL success = convertToF64(string, value64);
@@ -1299,17 +1699,17 @@ BOOL LLStringUtilBase<T>::convertToF32(const std::basic_string<T>& string, F32&
 }
 
 template<class T> 
-BOOL LLStringUtilBase<T>::convertToF64(const std::basic_string<T>& string, F64& value)
+BOOL LLStringUtilBase<T>::convertToF64(const string_type& string, F64& value)
 {
 	if( string.empty() )
 	{
 		return FALSE;
 	}
 
-	std::basic_string<T> temp( string );
+	string_type temp( string );
 	trim(temp);
 	F64 v;
-	std::basic_istringstream<T> i_stream((std::basic_string<T>)temp);
+	std::basic_istringstream<T> i_stream((string_type)temp);
 	if(i_stream >> v)
 	{
 		//TODO: figure out overflow and underflow reporting here
@@ -1326,7 +1726,7 @@ BOOL LLStringUtilBase<T>::convertToF64(const std::basic_string<T>& string, F64&
 }
 
 template<class T> 
-void LLStringUtilBase<T>::truncate(std::basic_string<T>& string, size_type count)
+void LLStringUtilBase<T>::truncate(string_type& string, size_type count)
 {
 	size_type cur_size = string.size();
 	string.resize(count < cur_size ? count : cur_size);
diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp
index bcbae06ec..74874585c 100644
--- a/indra/llcommon/lluuid.cpp
+++ b/indra/llcommon/lluuid.cpp
@@ -460,7 +460,7 @@ typedef struct _ASTAT_
 }ASTAT, * PASTAT;
 
 // static
-S32 LLUUID::getNodeID(unsigned char * node_id)
+S32 LLUUID::getNodeID(unsigned char *node_id)
 {
 	  ASTAT Adapter;
       NCB Ncb;
diff --git a/indra/llcommon/lluuid.h b/indra/llcommon/lluuid.h
index c54fd6be8..d7ded1a26 100644
--- a/indra/llcommon/lluuid.h
+++ b/indra/llcommon/lluuid.h
@@ -34,7 +34,6 @@
 
 #include <iostream>
 #include <set>
-#include <vector>
 #include "stdtypes.h"
 #include "llpreprocessor.h"
 
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index c34b89e37..1f1f4ce38 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -1700,6 +1700,6 @@ LLPointer<LLInventoryCategory> ll_create_category_from_sd(const LLSD& sd_cat)
 		LLAssetType::lookup(sd_cat[INV_ASSET_TYPE_LABEL].asString()));
 	rv->setPreferredType(
 			LLFolderType::lookup(
-			sd_cat[INV_PREFERRED_TYPE_LABEL].asString()));
+				sd_cat[INV_PREFERRED_TYPE_LABEL].asString()));
 	return rv;
 }
diff --git a/indra/llinventory/llinventorytype.cpp b/indra/llinventory/llinventorytype.cpp
index ce62f0de2..a174f08c1 100644
--- a/indra/llinventory/llinventorytype.cpp
+++ b/indra/llinventory/llinventorytype.cpp
@@ -148,7 +148,7 @@ DEFAULT_ASSET_FOR_INV_TYPE[LLAssetType::AT_COUNT] =
 	LLInventoryType::IT_NONE,			// 46	AT_NONE
 	LLInventoryType::IT_NONE,			// 47	AT_NONE
 	LLInventoryType::IT_NONE,			// 48	AT_NONE
-	LLInventoryType::IT_MESH            // 49	AT_MESH
+	LLInventoryType::IT_MESH			// 49	AT_MESH
 };
 
 // static
diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h
index 492be170b..e8bb3f182 100644
--- a/indra/llinventory/llparcel.h
+++ b/indra/llinventory/llparcel.h
@@ -51,7 +51,7 @@ const S32 PARCEL_UNIT_AREA			= 16;
 const F32 PARCEL_HEIGHT = 50.f;
 
 //Height above ground which parcel boundries exist for explicitly banned avatars
-const F32 BAN_HEIGHT = 768.f;
+const F32 BAN_HEIGHT = 5000.f;
 
 // Maximum number of entries in an access list
 const S32 PARCEL_MAX_ACCESS_LIST = 300;
@@ -260,7 +260,7 @@ public:
 	void setMediaURLResetTimer(F32 time);
 	virtual void	setLocalID(S32 local_id);
 
-	// blow away all the extra crap lurking in parcels, including urls, access lists, etc
+	// blow away all the extra stuff lurking in parcels, including urls, access lists, etc
 	void clearParcel();
 
 	// This value is not persisted out to the parcel file, it is only
@@ -686,6 +686,7 @@ public:
 	std::map<LLUUID,LLAccessEntry>	mBanList;
 	std::map<LLUUID,LLAccessEntry>	mTempBanList;
 	std::map<LLUUID,LLAccessEntry>	mTempAccessList;
+
 };
 
 
diff --git a/indra/llinventory/llpermissionsflags.h b/indra/llinventory/llpermissionsflags.h
index afa2adbd9..f810929d6 100644
--- a/indra/llinventory/llpermissionsflags.h
+++ b/indra/llinventory/llpermissionsflags.h
@@ -32,9 +32,6 @@
 #ifndef LL_LLPERMISSIONSFLAGS_H
 #define LL_LLPERMISSIONSFLAGS_H
 
-// llpermissionsflags.h
-// Copyright 2002, Linden Research, Inc.
-//
 // Flags for various permissions bits.
 // Shared between viewer and simulator.
 
diff --git a/indra/llinventory/lltransactionflags.cpp b/indra/llinventory/lltransactionflags.cpp
index 41b3dc84d..fda8cad90 100644
--- a/indra/llinventory/lltransactionflags.cpp
+++ b/indra/llinventory/lltransactionflags.cpp
@@ -38,7 +38,7 @@
 #include "lltransactiontypes.h"
 
 #include "../newview/hippogridmanager.h"
- 
+
 const U8 TRANSACTION_FLAGS_NONE = 0;
 const U8 TRANSACTION_FLAG_SOURCE_GROUP = 1;
 const U8 TRANSACTION_FLAG_DEST_GROUP = 2;
diff --git a/indra/llinventory/lltransactiontypes.h b/indra/llinventory/lltransactiontypes.h
index 7f49c763c..2c699bcb8 100644
--- a/indra/llinventory/lltransactiontypes.h
+++ b/indra/llinventory/lltransactiontypes.h
@@ -74,6 +74,7 @@ const S32 TRANS_CLASSIFIED_RENEW	= 2005;
 // automatically end up in the list below :-(
 // So make sure you check the transaction_description table
 const S32 TRANS_RECURRING_GENERIC  = 2100;
+
 // Codes 3000-3999 reserved for inventory transactions
 const S32 TRANS_GIVE_INVENTORY		= 3000;
 
diff --git a/indra/llmessage/llbuffer.cpp b/indra/llmessage/llbuffer.cpp
index b604e40ca..58208dbe1 100644
--- a/indra/llmessage/llbuffer.cpp
+++ b/indra/llmessage/llbuffer.cpp
@@ -28,7 +28,6 @@
 
 #include "linden_common.h"
 #include "llbuffer.h"
-#include <iterator>
 
 #include "llmath.h"
 #include "llmemtype.h"
diff --git a/indra/llmessage/lldispatcher.cpp b/indra/llmessage/lldispatcher.cpp
index 7ac3651a7..b2dc414a6 100644
--- a/indra/llmessage/lldispatcher.cpp
+++ b/indra/llmessage/lldispatcher.cpp
@@ -29,7 +29,6 @@
 #include "lldispatcher.h"
 
 #include <algorithm>
-#include <iterator>
 #include "llstl.h"
 #include "message.h"
 
diff --git a/indra/llmessage/llfiltersd2xmlrpc.cpp b/indra/llmessage/llfiltersd2xmlrpc.cpp
index dbb8c4e28..e0ca056a5 100644
--- a/indra/llmessage/llfiltersd2xmlrpc.cpp
+++ b/indra/llmessage/llfiltersd2xmlrpc.cpp
@@ -80,7 +80,6 @@
 
 #include "llbuffer.h"
 #include "llbufferstream.h"
-#include "llfasttimer.h"
 #include "llmemorystream.h"
 #include "llsd.h"
 #include "llsdserialize.h"
diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp
index 037688906..75ccc3818 100644
--- a/indra/llmessage/llhttpclient.cpp
+++ b/indra/llmessage/llhttpclient.cpp
@@ -158,7 +158,7 @@ namespace
 			if(fstream.is_open())
 			{
 				fstream.seekg(0, std::ios::end);
-				U32 fileSize = fstream.tellg();
+				U32 fileSize = (U32)fstream.tellg();
 				fstream.seekg(0, std::ios::beg);
 				std::vector<char> fileBuffer(fileSize);
 				fstream.read(&fileBuffer[0], fileSize);
diff --git a/indra/llmessage/lliohttpserver.cpp b/indra/llmessage/lliohttpserver.cpp
index e64667836..9c1a6677e 100644
--- a/indra/llmessage/lliohttpserver.cpp
+++ b/indra/llmessage/lliohttpserver.cpp
@@ -33,7 +33,6 @@
 #include "llapr.h"
 #include "llbuffer.h"
 #include "llbufferstream.h"
-#include "llfasttimer.h"
 #include "llhttpnode.h"
 #include "lliopipe.h"
 #include "lliosocket.h"
diff --git a/indra/llmessage/lliosocket.cpp b/indra/llmessage/lliosocket.cpp
index cfc60f163..0c815c681 100644
--- a/indra/llmessage/lliosocket.cpp
+++ b/indra/llmessage/lliosocket.cpp
@@ -32,7 +32,6 @@
 #include "llapr.h"
 
 #include "llbuffer.h"
-#include "llfasttimer.h"
 #include "llhost.h"
 #include "llmemtype.h"
 #include "llpumpio.h"
diff --git a/indra/llmessage/llioutil.cpp b/indra/llmessage/llioutil.cpp
index 63dbf7b07..8c50fd506 100644
--- a/indra/llmessage/llioutil.cpp
+++ b/indra/llmessage/llioutil.cpp
@@ -27,7 +27,6 @@
  */
 
 #include "linden_common.h"
-#include "llfasttimer.h"
 #include "llioutil.h"
 
 /**
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt
index 52171c6bc..8cda46a6b 100644
--- a/indra/llprimitive/CMakeLists.txt
+++ b/indra/llprimitive/CMakeLists.txt
@@ -17,6 +17,7 @@ include_directories(
 
 set(llprimitive_SOURCE_FILES
     llmaterialtable.cpp
+    llmediaentry.cpp
     llmodel.cpp
     llprimitive.cpp
     llprimtexturelist.cpp
diff --git a/indra/llprimitive/llmaterialtable.cpp b/indra/llprimitive/llmaterialtable.cpp
index 63687c258..280c6d61c 100644
--- a/indra/llprimitive/llmaterialtable.cpp
+++ b/indra/llprimitive/llmaterialtable.cpp
@@ -137,6 +137,7 @@ void LLMaterialTable::initTableTransNames(std::map<std::string, std::string> nam
 		infop->mName = namemap[name];
 	}
 }
+
 void LLMaterialTable::initBasicTable()
 {
 	// *TODO: Translate
diff --git a/indra/llprimitive/llmediaentry.cpp b/indra/llprimitive/llmediaentry.cpp
new file mode 100644
index 000000000..02aba2bd8
--- /dev/null
+++ b/indra/llprimitive/llmediaentry.cpp
@@ -0,0 +1,596 @@
+/** 
+ * @file llmediaentry.cpp
+ * @brief This is a single instance of media data related to the face of a prim
+ *
+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "linden_common.h"
+#include "llmediaentry.h"
+#include "lllslconstants.h"
+
+#include <boost/regex.hpp>
+
+// LLSD key defines
+// DO NOT REORDER OR REMOVE THESE!
+
+// Some LLSD keys.  Do not change!
+#define MEDIA_ALT_IMAGE_ENABLE_KEY_STR   "alt_image_enable"
+#define MEDIA_CONTROLS_KEY_STR           "controls"
+#define MEDIA_CURRENT_URL_KEY_STR        "current_url"
+#define MEDIA_HOME_URL_KEY_STR           "home_url"
+#define MEDIA_AUTO_LOOP_KEY_STR          "auto_loop"
+#define MEDIA_AUTO_PLAY_KEY_STR          "auto_play"
+#define MEDIA_AUTO_SCALE_KEY_STR         "auto_scale"
+#define MEDIA_AUTO_ZOOM_KEY_STR          "auto_zoom"
+#define MEDIA_FIRST_CLICK_INTERACT_KEY_STR  "first_click_interact"
+#define MEDIA_WIDTH_PIXELS_KEY_STR       "width_pixels"
+#define MEDIA_HEIGHT_PIXELS_KEY_STR      "height_pixels"
+
+// "security" fields
+#define MEDIA_WHITELIST_ENABLE_KEY_STR   "whitelist_enable"
+#define MEDIA_WHITELIST_KEY_STR          "whitelist"
+
+// "permissions" fields
+#define MEDIA_PERMS_INTERACT_KEY_STR     "perms_interact"
+#define MEDIA_PERMS_CONTROL_KEY_STR      "perms_control"
+
+// "general" fields
+const char* LLMediaEntry::ALT_IMAGE_ENABLE_KEY  = MEDIA_ALT_IMAGE_ENABLE_KEY_STR;
+const char* LLMediaEntry::CONTROLS_KEY          = MEDIA_CONTROLS_KEY_STR;
+const char* LLMediaEntry::CURRENT_URL_KEY       = MEDIA_CURRENT_URL_KEY_STR;
+const char* LLMediaEntry::HOME_URL_KEY          = MEDIA_HOME_URL_KEY_STR;
+const char* LLMediaEntry::AUTO_LOOP_KEY         = MEDIA_AUTO_LOOP_KEY_STR;
+const char* LLMediaEntry::AUTO_PLAY_KEY         = MEDIA_AUTO_PLAY_KEY_STR;
+const char* LLMediaEntry::AUTO_SCALE_KEY        = MEDIA_AUTO_SCALE_KEY_STR;
+const char* LLMediaEntry::AUTO_ZOOM_KEY         = MEDIA_AUTO_ZOOM_KEY_STR;
+const char* LLMediaEntry::FIRST_CLICK_INTERACT_KEY = MEDIA_FIRST_CLICK_INTERACT_KEY_STR;
+const char* LLMediaEntry::WIDTH_PIXELS_KEY      = MEDIA_WIDTH_PIXELS_KEY_STR;
+const char* LLMediaEntry::HEIGHT_PIXELS_KEY     = MEDIA_HEIGHT_PIXELS_KEY_STR;
+
+// "security" fields
+const char* LLMediaEntry::WHITELIST_ENABLE_KEY  = MEDIA_WHITELIST_ENABLE_KEY_STR;
+const char* LLMediaEntry::WHITELIST_KEY         = MEDIA_WHITELIST_KEY_STR;
+
+// "permissions" fields
+const char* LLMediaEntry::PERMS_INTERACT_KEY    = MEDIA_PERMS_INTERACT_KEY_STR;
+const char* LLMediaEntry::PERMS_CONTROL_KEY     = MEDIA_PERMS_CONTROL_KEY_STR;
+
+#define DEFAULT_URL_PREFIX  "http://"
+
+// Constructor(s)
+LLMediaEntry::LLMediaEntry() :
+    mAltImageEnable(false),
+    mControls(STANDARD),
+    mCurrentURL(""),
+    mHomeURL(""),
+    mAutoLoop(false),
+    mAutoPlay(false),
+    mAutoScale(false),
+    mAutoZoom(false),
+    mFirstClickInteract(false),
+    mWidthPixels(0),
+    mHeightPixels(0),
+    mWhiteListEnable(false),
+    // mWhiteList
+    mPermsInteract(PERM_ALL),
+    mPermsControl(PERM_ALL),
+    mMediaIDp(NULL)
+{
+}
+
+LLMediaEntry::LLMediaEntry(const LLMediaEntry &rhs) :
+    mMediaIDp(NULL)
+{
+    // "general" fields
+    mAltImageEnable = rhs.mAltImageEnable;
+    mControls = rhs.mControls;
+    mCurrentURL = rhs.mCurrentURL;
+    mHomeURL = rhs.mHomeURL;
+    mAutoLoop = rhs.mAutoLoop;
+    mAutoPlay = rhs.mAutoPlay;
+    mAutoScale = rhs.mAutoScale;
+    mAutoZoom = rhs.mAutoZoom;
+    mFirstClickInteract = rhs.mFirstClickInteract;
+    mWidthPixels = rhs.mWidthPixels;
+    mHeightPixels = rhs.mHeightPixels;
+
+    // "security" fields
+    mWhiteListEnable = rhs.mWhiteListEnable;
+    mWhiteList = rhs.mWhiteList;
+
+    // "permissions" fields
+    mPermsInteract = rhs.mPermsInteract;
+    mPermsControl = rhs.mPermsControl;
+}
+
+LLMediaEntry::~LLMediaEntry()
+{
+    if (NULL != mMediaIDp)
+    {
+        delete mMediaIDp;
+    }
+}
+
+LLSD LLMediaEntry::asLLSD() const
+{
+    LLSD sd;
+    asLLSD(sd);
+    return sd;
+}
+
+//
+// LLSD functions
+//
+void LLMediaEntry::asLLSD(LLSD& sd) const
+{
+    // "general" fields
+    sd[ALT_IMAGE_ENABLE_KEY] = mAltImageEnable;
+    sd[CONTROLS_KEY] = (LLSD::Integer)mControls;
+    sd[CURRENT_URL_KEY] = mCurrentURL;
+    sd[HOME_URL_KEY] = mHomeURL;
+    sd[AUTO_LOOP_KEY] = mAutoLoop;
+    sd[AUTO_PLAY_KEY] = mAutoPlay;
+    sd[AUTO_SCALE_KEY] = mAutoScale;
+    sd[AUTO_ZOOM_KEY] = mAutoZoom;
+    sd[FIRST_CLICK_INTERACT_KEY] = mFirstClickInteract;
+    sd[WIDTH_PIXELS_KEY] = mWidthPixels;
+    sd[HEIGHT_PIXELS_KEY] = mHeightPixels;
+
+    // "security" fields
+    sd[WHITELIST_ENABLE_KEY] = mWhiteListEnable;
+	sd.erase(WHITELIST_KEY);
+    for (U32 i=0; i<mWhiteList.size(); i++) 
+	{
+        sd[WHITELIST_KEY].append(mWhiteList[i]);
+    }
+
+    // "permissions" fields
+    sd[PERMS_INTERACT_KEY] = mPermsInteract;
+    sd[PERMS_CONTROL_KEY] = mPermsControl;
+}
+
+// static
+bool LLMediaEntry::checkLLSD(const LLSD& sd)
+{
+    if (sd.isUndefined()) return true;
+    LLMediaEntry temp;
+    return temp.fromLLSDInternal(sd, true);
+}
+
+void LLMediaEntry::fromLLSD(const LLSD& sd)
+{
+    (void)fromLLSDInternal(sd, true);
+}
+
+void LLMediaEntry::mergeFromLLSD(const LLSD& sd)
+{
+    (void)fromLLSDInternal(sd, false);
+}
+
+// *NOTE: returns true if NO failures to set occurred, false otherwise.
+//        However, be aware that if a failure to set does occur, it does
+//        not stop setting fields from the LLSD!
+bool LLMediaEntry::fromLLSDInternal(const LLSD& sd, bool overwrite)
+{
+    // *HACK: we sort of cheat here and assume that status is a
+    // bit field.  We "or" into status and instead of returning
+    // it, we return whether it finishes off as LSL_STATUS_OK or not.
+    U32 status = LSL_STATUS_OK;
+    
+    // "general" fields
+    if ( overwrite || sd.has(ALT_IMAGE_ENABLE_KEY) )
+    {
+        status |= setAltImageEnable( sd[ALT_IMAGE_ENABLE_KEY] );
+    }
+    if ( overwrite || sd.has(CONTROLS_KEY) )
+    {
+        status |= setControls( (MediaControls)(LLSD::Integer)sd[CONTROLS_KEY] );
+    }
+    if ( overwrite || sd.has(CURRENT_URL_KEY) )
+    {
+        // Don't check whitelist
+        status |= setCurrentURLInternal( sd[CURRENT_URL_KEY], false );
+    }
+    if ( overwrite || sd.has(HOME_URL_KEY) )
+    {
+        status |= setHomeURL( sd[HOME_URL_KEY] );
+    }
+    if ( overwrite || sd.has(AUTO_LOOP_KEY) )
+    {
+        status |= setAutoLoop( sd[AUTO_LOOP_KEY] );
+    }
+    if ( overwrite || sd.has(AUTO_PLAY_KEY) )
+    {
+        status |= setAutoPlay( sd[AUTO_PLAY_KEY] );
+    }
+    if ( overwrite || sd.has(AUTO_SCALE_KEY) )
+    {
+        status |= setAutoScale( sd[AUTO_SCALE_KEY] );
+    }
+    if ( overwrite || sd.has(AUTO_ZOOM_KEY) )
+    {
+        status |= setAutoZoom( sd[AUTO_ZOOM_KEY] );
+    }
+    if ( overwrite || sd.has(FIRST_CLICK_INTERACT_KEY) )
+    {
+        status |= setFirstClickInteract( sd[FIRST_CLICK_INTERACT_KEY] );
+    }
+    if ( overwrite || sd.has(WIDTH_PIXELS_KEY) )
+    {
+        status |= setWidthPixels( (LLSD::Integer)sd[WIDTH_PIXELS_KEY] );
+    }
+    if ( overwrite || sd.has(HEIGHT_PIXELS_KEY) )
+    {
+        status |= setHeightPixels( (LLSD::Integer)sd[HEIGHT_PIXELS_KEY] );
+    }
+
+    // "security" fields
+    if ( overwrite || sd.has(WHITELIST_ENABLE_KEY) )
+    {
+        status |= setWhiteListEnable( sd[WHITELIST_ENABLE_KEY] );
+    }
+    if ( overwrite || sd.has(WHITELIST_KEY) )
+    {
+        status |= setWhiteList( sd[WHITELIST_KEY] );
+    }
+
+    // "permissions" fields
+    if ( overwrite || sd.has(PERMS_INTERACT_KEY) )
+    {
+        status |= setPermsInteract( 0xff & (LLSD::Integer)sd[PERMS_INTERACT_KEY] );
+    }
+    if ( overwrite || sd.has(PERMS_CONTROL_KEY) )
+    {
+        status |= setPermsControl( 0xff & (LLSD::Integer)sd[PERMS_CONTROL_KEY] );
+    }
+    
+    return LSL_STATUS_OK == status;
+}
+
+LLMediaEntry& LLMediaEntry::operator=(const LLMediaEntry &rhs)
+{
+    if (this != &rhs)
+    {
+        // "general" fields
+        mAltImageEnable = rhs.mAltImageEnable;
+        mControls = rhs.mControls;
+        mCurrentURL = rhs.mCurrentURL;
+        mHomeURL = rhs.mHomeURL;
+        mAutoLoop = rhs.mAutoLoop;
+        mAutoPlay = rhs.mAutoPlay;
+        mAutoScale = rhs.mAutoScale;
+        mAutoZoom = rhs.mAutoZoom;
+        mFirstClickInteract = rhs.mFirstClickInteract;
+        mWidthPixels = rhs.mWidthPixels;
+        mHeightPixels = rhs.mHeightPixels;
+
+        // "security" fields
+        mWhiteListEnable = rhs.mWhiteListEnable;
+        mWhiteList = rhs.mWhiteList;
+
+        // "permissions" fields
+        mPermsInteract = rhs.mPermsInteract;
+        mPermsControl = rhs.mPermsControl;
+    }
+
+    return *this;
+}
+
+bool LLMediaEntry::operator==(const LLMediaEntry &rhs) const
+{
+    return (
+        // "general" fields
+        mAltImageEnable == rhs.mAltImageEnable &&
+        mControls == rhs.mControls &&
+        mCurrentURL == rhs.mCurrentURL &&
+        mHomeURL == rhs.mHomeURL &&
+        mAutoLoop == rhs.mAutoLoop &&
+        mAutoPlay == rhs.mAutoPlay &&
+        mAutoScale == rhs.mAutoScale &&
+        mAutoZoom == rhs.mAutoZoom &&
+        mFirstClickInteract == rhs.mFirstClickInteract &&
+        mWidthPixels == rhs.mWidthPixels &&
+        mHeightPixels == rhs.mHeightPixels &&
+
+        // "security" fields
+        mWhiteListEnable == rhs.mWhiteListEnable &&
+        mWhiteList == rhs.mWhiteList &&
+
+        // "permissions" fields
+        mPermsInteract == rhs.mPermsInteract &&
+        mPermsControl == rhs.mPermsControl
+
+        );
+}
+ 
+bool LLMediaEntry::operator!=(const LLMediaEntry &rhs) const
+{
+    return (
+        // "general" fields
+        mAltImageEnable != rhs.mAltImageEnable ||
+        mControls != rhs.mControls ||
+        mCurrentURL != rhs.mCurrentURL ||
+        mHomeURL != rhs.mHomeURL ||
+        mAutoLoop != rhs.mAutoLoop ||
+        mAutoPlay != rhs.mAutoPlay ||
+        mAutoScale != rhs.mAutoScale ||
+        mAutoZoom != rhs.mAutoZoom ||
+        mFirstClickInteract != rhs.mFirstClickInteract ||
+        mWidthPixels != rhs.mWidthPixels ||
+        mHeightPixels != rhs.mHeightPixels ||
+
+        // "security" fields
+        mWhiteListEnable != rhs.mWhiteListEnable ||
+        mWhiteList != rhs.mWhiteList ||
+
+        // "permissions" fields
+        mPermsInteract != rhs.mPermsInteract ||
+        mPermsControl != rhs.mPermsControl 
+        
+        );
+}
+
+U32 LLMediaEntry::setWhiteList( const std::vector<std::string> &whitelist )
+{
+    // *NOTE: This code is VERY similar to the setWhitelist below.
+    // IF YOU CHANGE THIS IMPLEMENTATION, BE SURE TO CHANGE THE OTHER!
+    U32 size = 0;
+    U32 count = 0;
+    // First count to make sure the size constraint is not violated
+    std::vector<std::string>::const_iterator iter = whitelist.begin();
+    std::vector<std::string>::const_iterator end = whitelist.end();
+    for ( ; iter < end; ++iter) 
+    {
+        const std::string &entry = (*iter);
+        size += entry.length() + 1; // Include one for \0
+        count ++;
+        if (size > MAX_WHITELIST_SIZE || count > MAX_WHITELIST_COUNT) 
+		{
+            return LSL_STATUS_BOUNDS_ERROR;
+        }
+    }
+    // Next clear the vector
+    mWhiteList.clear();
+    // Then re-iterate and copy entries
+    iter = whitelist.begin();
+    for ( ; iter < end; ++iter)
+    {
+        const std::string &entry = (*iter);
+        mWhiteList.push_back(entry);
+    }
+    return LSL_STATUS_OK;
+}
+
+U32 LLMediaEntry::setWhiteList( const LLSD &whitelist )
+{
+    // If whitelist is undef, the whitelist is cleared
+    if (whitelist.isUndefined()) 
+	{
+		mWhiteList.clear();
+		return LSL_STATUS_OK;
+	}
+
+    // However, if the whitelist is an empty array, erase it.
+    if (whitelist.isArray()) 
+    {
+        // *NOTE: This code is VERY similar to the setWhitelist above.
+        // IF YOU CHANGE THIS IMPLEMENTATION, BE SURE TO CHANGE THE OTHER!
+        U32 size = 0;
+        U32 count = 0;
+        // First check to make sure the size and count constraints are not violated
+        LLSD::array_const_iterator iter = whitelist.beginArray();
+        LLSD::array_const_iterator end = whitelist.endArray();
+        for ( ; iter < end; ++iter) 
+        {
+            const std::string &entry = (*iter).asString();
+            size += entry.length() + 1; // Include one for \0
+            count ++;
+            if (size > MAX_WHITELIST_SIZE || count > MAX_WHITELIST_COUNT) 
+			{
+                return LSL_STATUS_BOUNDS_ERROR;
+            }
+        }
+        // Next clear the vector
+        mWhiteList.clear();
+        // Then re-iterate and copy entries
+        iter = whitelist.beginArray();
+        for ( ; iter < end; ++iter)
+        {
+            const std::string &entry = (*iter).asString();
+            mWhiteList.push_back(entry);
+        }
+        return LSL_STATUS_OK;
+    }
+    else 
+	{
+        return LSL_STATUS_MALFORMED_PARAMS;
+    }
+}
+
+
+static void prefix_with(std::string &str, const char *chars, const char *prefix)
+{
+    // Given string 'str', prefix all instances of any character in 'chars'
+    // with 'prefix'
+    size_t found = str.find_first_of(chars);
+    size_t prefix_len = strlen(prefix);
+    while (found != std::string::npos)
+    {
+        str.insert(found, prefix, prefix_len);
+        found = str.find_first_of(chars, found+prefix_len+1);
+    }
+}
+
+static bool pattern_match(const std::string &candidate_str, const std::string &pattern)
+{
+    // If the pattern is empty, it matches
+    if (pattern.empty()) return true;
+    
+    // 'pattern' is a glob pattern, we only accept '*' chars
+    // copy it
+    std::string expression = pattern;
+    
+    // Escape perl's regexp chars with a backslash, except all "*" chars
+    prefix_with(expression, ".[{()\\+?|^$", "\\");
+    prefix_with(expression, "*", ".");
+                    
+    // case-insensitive matching:
+    boost::regex regexp(expression, boost::regex::perl|boost::regex::icase);
+    return boost::regex_match(candidate_str, regexp);
+}
+
+bool LLMediaEntry::checkCandidateUrl(const std::string& url) const
+{
+    if (getWhiteListEnable()) 
+    {
+        return checkUrlAgainstWhitelist(url, getWhiteList());
+    }
+    else 
+	{
+        return true;
+    }
+}
+
+// static
+bool LLMediaEntry::checkUrlAgainstWhitelist(const std::string& url, 
+                                            const std::vector<std::string> &whitelist)
+{
+    bool passes = true;
+    // *NOTE: no entries?  Don't check
+    if (whitelist.size() > 0) 
+    {
+        passes = false;
+            
+        // Case insensitive: the reason why we toUpper both this and the
+        // filter
+        std::string candidate_url = url;
+        // Use lluri to see if there is a path part in the candidate URL.  No path?  Assume "/"
+        LLURI candidate_uri(candidate_url);
+        std::vector<std::string>::const_iterator iter = whitelist.begin();
+        std::vector<std::string>::const_iterator end = whitelist.end();
+        for ( ; iter < end; ++iter )
+        {
+            std::string filter = *iter;
+                
+            LLURI filter_uri(filter);
+            bool scheme_passes = pattern_match( candidate_uri.scheme(), filter_uri.scheme() );
+            if (filter_uri.scheme().empty()) 
+            {
+                filter_uri = LLURI(DEFAULT_URL_PREFIX + filter);
+            }
+            bool authority_passes = pattern_match( candidate_uri.authority(), filter_uri.authority() );
+            bool path_passes = pattern_match( candidate_uri.escapedPath(), filter_uri.escapedPath() );
+
+            if (scheme_passes && authority_passes && path_passes)
+            {
+                passes = true;
+                break;
+            }
+        }
+    }
+    return passes;
+}
+
+U32 LLMediaEntry::setStringFieldWithLimit( std::string &field, const std::string &value, U32 limit )
+{
+    if ( value.length() > limit ) 
+	{
+        return LSL_STATUS_BOUNDS_ERROR;
+    }
+    else 
+	{
+        field = value;
+        return LSL_STATUS_OK;
+    }
+}
+
+U32 LLMediaEntry::setControls(LLMediaEntry::MediaControls controls)
+{
+    if (controls == STANDARD ||
+        controls == MINI)
+    {
+        mControls = controls;
+        return LSL_STATUS_OK;
+    }
+    return LSL_STATUS_BOUNDS_ERROR;
+}
+
+U32 LLMediaEntry::setPermsInteract( U8 val )
+{
+    mPermsInteract = val & PERM_MASK;
+    return LSL_STATUS_OK;
+}
+
+U32 LLMediaEntry::setPermsControl( U8 val )
+{
+    mPermsControl = val & PERM_MASK;
+    return LSL_STATUS_OK;
+}
+
+U32 LLMediaEntry::setCurrentURL(const std::string& current_url)
+{
+    return setCurrentURLInternal( current_url, true );
+}
+
+U32 LLMediaEntry::setCurrentURLInternal(const std::string& current_url, bool check_whitelist)
+{
+    if ( ! check_whitelist || checkCandidateUrl(current_url)) 
+    {
+        return setStringFieldWithLimit( mCurrentURL, current_url, MAX_URL_LENGTH );
+    }
+    else 
+	{
+        return LSL_STATUS_WHITELIST_FAILED;
+    }
+}
+
+U32 LLMediaEntry::setHomeURL(const std::string& home_url)
+{
+    return setStringFieldWithLimit( mHomeURL, home_url, MAX_URL_LENGTH );
+}
+
+U32 LLMediaEntry::setWidthPixels(U16 width)
+{
+    if (width > MAX_WIDTH_PIXELS) return LSL_STATUS_BOUNDS_ERROR;
+    mWidthPixels = width;
+    return LSL_STATUS_OK; 
+}
+
+U32 LLMediaEntry::setHeightPixels(U16 height)
+{
+    if (height > MAX_HEIGHT_PIXELS) return LSL_STATUS_BOUNDS_ERROR;
+    mHeightPixels = height;
+    return LSL_STATUS_OK; 
+}
+
+const LLUUID &LLMediaEntry::getMediaID() const
+{
+    // Lazily generate media ID
+    if (NULL == mMediaIDp)
+    {
+        mMediaIDp = new LLUUID();
+        mMediaIDp->generate();
+    }
+    return *mMediaIDp;
+}
+
diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 6d7b09af7..7d4b34ead 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -83,7 +83,6 @@ LLModel::~LLModel()
 bool get_dom_sources(const domInputLocalOffset_Array& inputs, S32& pos_offset, S32& tc_offset, S32& norm_offset, S32 &idx_stride,
 					 domSource* &pos_source, domSource* &tc_source, domSource* &norm_source)
 {
-	
 	idx_stride = 0;
 
 	for (U32 j = 0; j < inputs.getCount(); ++j)
@@ -209,7 +208,6 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa
 								n[idx[i+norm_offset]*3+1],
 								n[idx[i+norm_offset]*3+2]));
 		}
-
 		
 		BOOL found = FALSE;
 			
@@ -276,7 +274,6 @@ LLModel::EModelStatus load_face_from_dom_triangles(std::vector<LLVolumeFace>& fa
 			face = LLVolumeFace();
 			point_map.clear();
 		}
-
 	}
 
 	if (!verts.empty())
@@ -509,7 +506,7 @@ LLModel::EModelStatus load_face_from_dom_polylist(std::vector<LLVolumeFace>& fac
 		{
 			material = std::string(poly->getMaterial());
 		}
-		
+	
 		materials.push_back(material);
 		face_list.push_back(face);
 		face_list.rbegin()->fillFromLegacyData(verts, indices);
@@ -539,7 +536,6 @@ LLModel::EModelStatus load_face_from_dom_polygons(std::vector<LLVolumeFace>& fac
 
 	const domInputLocalOffset_Array& inputs = poly->getInput_array();
 
-
 	S32 v_offset = -1;
 	S32 n_offset = -1;
 	S32 t_offset = -1;
@@ -651,8 +647,7 @@ LLModel::EModelStatus load_face_from_dom_polygons(std::vector<LLVolumeFace>& fac
 				vert.mTexCoord.setVec(t->get(t_idx),
 								t->get(t_idx+1));								
 			}
-		
-			
+						
 			verts.push_back(vert);
 		}
 	}
@@ -1467,7 +1462,6 @@ LLSD LLModel::writeModel(
 					}
 				}
 
-
 				LLVector2 tc_range = max_tc - min_tc;
 
 				for (U32 j = 0; j < (U32)face.mNumVertices; ++j)
@@ -1983,6 +1977,7 @@ bool LLModel::matchMaterialOrder(LLModel* ref, int& refFaceCnt, int& modelFaceCn
 	
 	//build a map of material slot names to face indexes
 	bool reorder = false;
+
 	std::set<std::string> base_mat;
 	std::set<std::string> cur_mat;
 
diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp
index e46058591..3c5d03d26 100644
--- a/indra/newview/llvieweraudio.cpp
+++ b/indra/newview/llvieweraudio.cpp
@@ -230,7 +230,7 @@ void audio_update_wind(bool force_update)
 		//
 		if (force_update || (last_camera_water_height * camera_water_height) < 0.f)
 		{
-			static const LLCachedControl<F32> audio_level_rolloff("AudioLevelRolloff",1);
+			static const LLCachedControl<F32> audio_level_rolloff("AudioLevelRolloff", 1.0f);
 			if (camera_water_height < 0.f)
 			{
 				gAudiop->setRolloffFactor(audio_level_rolloff * LL_ROLLOFF_MULTIPLIER_UNDER_WATER);
@@ -241,17 +241,18 @@ void audio_update_wind(bool force_update)
 			}
 		}
 
-        // Scale down the contribution of weather-simulation wind to the
-        // ambient wind noise.  Wind velocity averages 3.5 m/s, with gusts to 7 m/s
-        // whereas steady-state avatar walk velocity is only 3.2 m/s.
-        // Without this the world feels desolate on first login when you are
-        // standing still.
-        static LLCachedControl<F32> wind_level("AudioLevelWind", 0.5f);
-        LLVector3 scaled_wind_vec = gWindVec * wind_level;
+		// Scale down the contribution of weather-simulation wind to the
+		// ambient wind noise.  Wind velocity averages 3.5 m/s, with gusts to 7 m/s
+		// whereas steady-state avatar walk velocity is only 3.2 m/s.
+		// Without this the world feels desolate on first login when you are
+		// standing still.
+		static LLCachedControl<F32> wind_level("AudioLevelWind", 0.5f);
+		LLVector3 scaled_wind_vec = gWindVec * wind_level;
+
+		// Mix in the avatar's motion, subtract because when you walk north,
+		// the apparent wind moves south.
+		LLVector3 final_wind_vec = scaled_wind_vec - gAgent.getVelocity();
 
-        // Mix in the avatar's motion, subtract because when you walk north,
-        // the apparent wind moves south.
-        LLVector3 final_wind_vec = scaled_wind_vec - gAgent.getVelocity();
 		// rotate the wind vector to be listener (agent) relative
 		gRelativeWindVec = gAgent.getFrameAgent().rotateToLocal(final_wind_vec);
 
@@ -275,7 +276,7 @@ void audio_update_wind(bool force_update)
 		if (gSavedSettings.getBOOL("MuteWind"))
 		{
 			// volume decreases by itself
-			gAudiop->mMaxWindGain -= gAudiop->mMaxWindGain;
+			gAudiop->mMaxWindGain = 0.f;
 		}
 		// mute wind when not /*flying*/ in air
 		else if /*(gAgent.getFlying())*/ (gAgentAvatarp && gAgentAvatarp->mInAir)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 00ec70cd1..e3e60d33a 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -43,7 +43,7 @@
 #include "llavatarnamecache.h"
 #include "indra_constants.h"
 #include "lscript_byteformat.h"
-#include "mean_collision_data.h"
+
 #include "llfloaterbump.h"
 #include "llassetstorage.h"
 #include "llcachename.h"
@@ -61,7 +61,10 @@
 #include "llteleportflags.h"
 #include "lltracker.h"
 #include "lltransactionflags.h"
+#include "llvfile.h"
+#include "llvfs.h"
 #include "llxfermanager.h"
+#include "mean_collision_data.h"
 #include "message.h"
 #include "sound_ids.h"
 #include "lleventtimer.h"
diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h
index 031e5fa6a..9fb55c7ee 100644
--- a/indra/newview/llviewerprecompiledheaders.h
+++ b/indra/newview/llviewerprecompiledheaders.h
@@ -72,6 +72,8 @@
 #include "lldeleteutils.h"
 #include "imageids.h"
 #include "indra_constants.h"
+#include "llinitparam.h"
+
 //#include "linden_common.h"
 //#include "llpreprocessor.h"
 #include "llapp.h"
@@ -103,7 +105,6 @@
 #include "llthread.h"
 #include "lltimer.h"
 #include "lluuidhashmap.h"
-//#include "llversionviewer.h"
 //#include "processor.h"
 #include "stdenums.h"
 #include "stdtypes.h"
@@ -112,27 +113,13 @@
 #include "timing.h"
 #include "u64.h"
 
-// Library includes from llimage
-//#include "llblockdata.h"
-//#include "llimage.h"
-//#include "llimagebmp.h"
-//#include "llimagepng.h"
-//#include "llimagej2c.h"
-//#include "llimagejpeg.h"
-//#include "llimagetga.h"
-//#include "llmapimagetype.h"
-
 // Library includes from llmath project
-//#include "camera.h"
-//#include "coordframe.h"
 #include "llmath.h"
 #include "llbboxlocal.h"
 #include "llcamera.h"
 #include "llcoord.h"
 #include "llcoordframe.h"
 #include "llcrc.h"
-#include "llinterp.h"
-#include "llperlin.h"
 #include "llplane.h"
 #include "llquantize.h"
 #include "llrand.h"
@@ -141,7 +128,6 @@
 #include "m3math.h"
 #include "m4math.h"
 #include "llquaternion.h"
-#include "raytrace.h"
 #include "v2math.h"
 #include "v3color.h"
 #include "v3dmath.h"
@@ -149,11 +135,9 @@
 #include "v4color.h"
 #include "v4coloru.h"
 #include "v4math.h"
-////#include "vmath.h"
 #include "xform.h"
 
 // Library includes from llmessage project
-//#include "llassetstorage.h"
 #include "llcachename.h"
 #include "llcircuit.h"
 #include "lldatapacker.h"
@@ -163,16 +147,12 @@
 #include "llhost.h"
 #include "llinstantmessage.h"
 #include "llinvite.h"
-//#include "llloginflags.h"
-//#include "llmail.h"
 #include "llmessagethrottle.h"
 #include "llnamevalue.h"
 #include "llpacketack.h"
 #include "llpacketbuffer.h"
 #include "llpacketring.h"
 #include "llpartdata.h"
-//#include "llqueryflags.h"
-//#include "llregionflags.h"
 #include "llregionhandle.h"
 #include "lltaskname.h"
 #include "llteleportflags.h"
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 833d6412d..1320a0b79 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -31,6 +31,8 @@
  */
 
 #include "llviewerprecompiledheaders.h"
+#include "llviewerwindow.h"
+
 
 // system library includes
 #include <stdio.h>
@@ -42,7 +44,7 @@
 #include "llmeshrepository.h"
 #include "llpanellogin.h"
 #include "llviewerkeyboard.h"
-#include "llviewerwindow.h"
+
 
 #include "llviewquery.h"
 #include "llxmltree.h"
@@ -75,6 +77,7 @@
 #include "lltimer.h"
 #include "timing.h"
 #include "llviewermenu.h"
+#include "raytrace.h"
 
 // newview includes
 #include "llagent.h"
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 5c4d540ea..832d27299 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -40,6 +40,7 @@
 #include "llaudioengine.h"
 #include "noise.h"
 #include "llsdserialize.h"
+#include "raytrace.h"
 
 #include "llagent.h" //  Get state values from here
 #include "llagentcamera.h"

From 72a9b6b7fe857b64b6a69e0f01dd0e32a692f1c6 Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Sat, 21 Jul 2012 03:23:02 -0400
Subject: [PATCH 072/199] Corrected issues

Corrected issue noted in media_plugin_webkit by Aleric.
Grr.
---
 indra/plugins/webkit/media_plugin_webkit.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/indra/plugins/webkit/media_plugin_webkit.cpp b/indra/plugins/webkit/media_plugin_webkit.cpp
index 95ebd6757..4d6e91d90 100644
--- a/indra/plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/plugins/webkit/media_plugin_webkit.cpp
@@ -25,8 +25,8 @@
  * $/LicenseInfo$
  * @endcond
  */
-#include "linden_common.h"
 #include "llqtwebkit.h"
+#include "linden_common.h"
 #include "indra_constants.h" // for indra keyboard codes
 
 #include "lltimer.h"
@@ -1016,14 +1016,6 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
 
 				// FIXME: Should we do anything with this if it comes in after the browser has been initialized?
 			}
-			else if(message_name == "plugins_enabled")
-			{
-				mPluginsEnabled = message_in.getValueBoolean("enable");
-			}
-			else if(message_name == "javascript_enabled")
-			{
-				mJavascriptEnabled = message_in.getValueBoolean("enable");
-			}
 			else if(message_name == "size_change")
 			{
 				std::string name = message_in.getValue("name");
@@ -1312,15 +1304,15 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
 				mCookiesEnabled = message_in.getValueBoolean("enable");
 				LLQtWebKit::getInstance()->enableCookies( mCookiesEnabled );
 			}
-			else if(message_name == "enable_plugins")
+			else if(message_name == "plugins_enabled")
 			{
 				mPluginsEnabled = message_in.getValueBoolean("enable");
 				LLQtWebKit::getInstance()->enablePlugins( mPluginsEnabled );
 			}
-			else if(message_name == "enable_javascript")
+			else if(message_name == "javascript_enabled")
 			{
 				mJavascriptEnabled = message_in.getValueBoolean("enable");
-				//LLQtWebKit::getInstance()->enableJavascript( mJavascriptEnabled );
+				LLQtWebKit::getInstance()->enableJavascript( mJavascriptEnabled );
 			}
 			else if(message_name == "set_cookies")
 			{

From 3710ea903e553d272ff94c1d4aa784c52e4f2f14 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sat, 21 Jul 2012 03:27:43 -0500
Subject: [PATCH 073/199] Enable texture auditing categories, also fixed
 potential buffer underread related to auditing.

---
 indra/llrender/llimagegl.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index 6d7054e7e..42139dfec 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -2001,7 +2001,6 @@ BOOL LLImageGL::getMask(const LLVector2 &tc)
 
 void LLImageGL::setCategory(S32 category) 
 {
-#if 0 //turn this off temporarily because it is not in use now.
 	if(!gAuditTexture)
 	{
 		return ;
@@ -2022,7 +2021,6 @@ void LLImageGL::setCategory(S32 category)
 			mCategory = -1 ;
 		}
 	}
-#endif
 }
 
 //for debug use 
@@ -2053,14 +2051,16 @@ S32 LLImageGL::getTextureCounterIndex(U32 val)
 void LLImageGL::incTextureCounter(U32 val, S32 ncomponents, S32 category) 
 {
 	sTextureLoadedCounter[getTextureCounterIndex(val)]++ ;
-	sTextureMemByCategory[category] += (S32)val * ncomponents ;
+	if(category > -1)
+		sTextureMemByCategory[category] += (S32)val * ncomponents ;
 }
 
 //static
 void LLImageGL::decTextureCounter(U32 val, S32 ncomponents, S32 category) 
 {
 	sTextureLoadedCounter[getTextureCounterIndex(val)]-- ;
-	sTextureMemByCategory[category] += (S32)val * ncomponents ;
+	if(category > -1)
+		sTextureMemByCategory[category] -= (S32)val * ncomponents ;
 }
 
 void LLImageGL::setCurTexSizebar(S32 index, BOOL set_pick_size)

From a1e714dce7fe3b6e79f5c729a78a44e62c29c206 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sat, 21 Jul 2012 03:43:30 -0500
Subject: [PATCH 074/199] mDeferredVB only needs allocated when rendering in
 deferred mode. mCubeVB only needs allocated when occlusion is working. Let
 them be lazy-allocated on an as-needed basis.

---
 indra/newview/pipeline.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 83ef73155..a3f4374a4 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -453,15 +453,6 @@ void LLPipeline::init()
 		mSpotLightFade[i] = 1.f;
 	}
 
-	if (mCubeVB.isNull())
-	{
-		mCubeVB = ll_create_cube_vb(LLVertexBuffer::MAP_VERTEX, GL_STATIC_DRAW_ARB);
-	}
-	if(mDeferredVB.isNull())
-	{
-		mDeferredVB = new LLVertexBuffer(DEFERRED_VB_MASK, 0);
-		mDeferredVB->allocateBuffer(8, 0, true);
-	}
 	setLightingDetail(-1);
 	gSavedSettings.getControl("RenderAutoMaskAlphaDeferred")->getCommitSignal()->connect(boost::bind(&LLPipeline::refreshCachedSettings));
 	gSavedSettings.getControl("RenderAutoMaskAlphaNonDeferred")->getCommitSignal()->connect(boost::bind(&LLPipeline::refreshCachedSettings));

From 32f407340fc8c07097f4ea856c044ff0ab267c76 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sat, 21 Jul 2012 21:16:41 -0500
Subject: [PATCH 075/199] Call LLImageGL::initClass to avoid crash when calling
 LLFeatureManager::applyRecommendedSettings. (texauditing vectors must be
 allocated)

---
 indra/newview/llviewerwindow.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 833d6412d..acd55d913 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -1562,6 +1562,7 @@ LLViewerWindow::LLViewerWindow(
 	LLVertexBuffer::initClass(gSavedSettings.getBOOL("RenderVBOEnable"), gSavedSettings.getBOOL("RenderVBOMappingDisable"));
 	LL_INFOS("RenderInit") << "LLVertexBuffer initialization done." << LL_ENDL ;
 	gGL.init() ;
+	LLImageGL::initClass(LLViewerTexture::MAX_GL_IMAGE_CATEGORY) ;
 
 	if (LLFeatureManager::getInstance()->isSafe()
 		|| (gSavedSettings.getS32("LastFeatureVersion") != LLFeatureManager::getInstance()->getVersion())
@@ -1586,7 +1587,6 @@ LLViewerWindow::LLViewerWindow(
 		
 	// Init the image list.  Must happen after GL is initialized and before the images that
 	// LLViewerWindow needs are requested.
-	LLImageGL::initClass(LLViewerTexture::MAX_GL_IMAGE_CATEGORY) ;
 	gTextureList.init();
 	LLViewerTextureManager::init() ;
 	gBumpImageList.init();

From 15086833a36efc0221040c9014c19ac8eedb9d16 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sat, 21 Jul 2012 05:36:45 +0200
Subject: [PATCH 076/199] Random stab in the dark coming right up!

---
 indra/llmessage/llares.cpp             |  10 +-
 indra/llmessage/llcurl.cpp             |  67 +++++++-------
 indra/llmessage/llcurl.h               |  10 +-
 indra/llmessage/lliosocket.h           |   1 +
 indra/llmessage/llioutil.cpp           |   2 +-
 indra/llmessage/llmail.cpp             |  17 ++--
 indra/llmessage/llmail.h               |   4 +-
 indra/llmessage/llmime.cpp             |   4 +-
 indra/llmessage/llpumpio.cpp           | 121 ++++++++++---------------
 indra/llmessage/llpumpio.h             |  49 +++++-----
 indra/llmessage/llsdmessage.cpp        |   2 +-
 indra/llmessage/llsdmessagebuilder.cpp |   2 +-
 indra/llmessage/message.cpp            |  18 ++--
 13 files changed, 141 insertions(+), 166 deletions(-)

diff --git a/indra/llmessage/llares.cpp b/indra/llmessage/llares.cpp
index 3328f2fd5..48072d0e4 100644
--- a/indra/llmessage/llares.cpp
+++ b/indra/llmessage/llares.cpp
@@ -39,7 +39,6 @@
 
 #include "llapr.h"
 #include "llareslistener.h"
-#include "llscopedvolatileaprpool.h"
 
 #if defined(LL_WINDOWS)
 #pragma warning (disable : 4355) // 'this' used in initializer list: yes, intentionally
@@ -469,6 +468,7 @@ bool LLAres::process(U64 timeout)
 	ares_socket_t socks[ARES_GETSOCK_MAXNUM];
 	apr_pollfd_t aprFds[ARES_GETSOCK_MAXNUM];
 	apr_int32_t nsds = 0;	
+	apr_status_t status;
 	int nactive = 0;
 	int bitmask;
 
@@ -479,8 +479,6 @@ bool LLAres::process(U64 timeout)
 		return nsds > 0;
 	}
 
-	LLScopedVolatileAPRPool scoped_pool;
-
 	for (int i = 0; i < ARES_GETSOCK_MAXNUM; i++)
 	{
 		if (ARES_GETSOCK_READABLE(bitmask, i))
@@ -496,7 +494,7 @@ bool LLAres::process(U64 timeout)
 
 		apr_socket_t *aprSock = NULL;
 
-		apr_status_t status = apr_os_sock_put(&aprSock, (apr_os_sock_t *) &socks[i], scoped_pool);
+		status = apr_os_sock_put(&aprSock, (apr_os_sock_t *) &socks[i], LLAPRRootPool::get()());
 		if (status != APR_SUCCESS)
 		{
 			ll_apr_warn_status(status);
@@ -505,7 +503,7 @@ bool LLAres::process(U64 timeout)
 
 		aprFds[nactive].desc.s = aprSock;
 		aprFds[nactive].desc_type = APR_POLL_SOCKET;
-		aprFds[nactive].p = scoped_pool;
+		aprFds[nactive].p = LLAPRRootPool::get()();
 		aprFds[nactive].rtnevents = 0;
 		aprFds[nactive].client_data = &socks[i];
 
@@ -514,7 +512,7 @@ bool LLAres::process(U64 timeout)
 
 	if (nactive > 0)
 	{
-		apr_status_t status = apr_poll(aprFds, nactive, &nsds, timeout);
+		status = apr_poll(aprFds, nactive, &nsds, timeout);
 
 		if (status != APR_SUCCESS && status != APR_TIMEUP)
 		{
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 0f46d2810..617d43980 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -271,10 +271,10 @@ void LLCurl::Easy::releaseEasyHandle(CURL* handle)
 
 		if(sFreeHandles.size() < MAX_NUM_FREE_HANDLES)
 		{
-			sFreeHandles.insert(handle);
-		}
-		else
-		{
+		sFreeHandles.insert(handle);
+	}
+	else
+	{
 			LLCurl::deleteEasyHandle(handle) ;
 		}
 	}
@@ -461,9 +461,9 @@ size_t curlReadCallback(char* data, size_t size, size_t nmemb, void* user_data)
 	LLCurl::Easy* easy = (LLCurl::Easy*)user_data;
 	
 	S32 n = size * nmemb;
-	S32 startpos = easy->getInput().tellg();
+	S32 startpos = (S32)easy->getInput().tellg();
 	easy->getInput().seekg(0, std::ios::end);
-	S32 endpos = easy->getInput().tellg();
+	S32 endpos = (S32)easy->getInput().tellg();
 	easy->getInput().seekg(startpos, std::ios::beg);
 	S32 maxn = endpos - startpos;
 	n = llmin(n, maxn);
@@ -569,16 +569,16 @@ LLCurl::Multi::Multi(F32 idle_time_out)
 	}
 	
 	//llassert_always(mCurlMultiHandle);	
-	
+
 	if(mCurlMultiHandle)
 	{
-		if(LLCurl::getCurlThread()->getThreaded())
-		{
-			mMutexp = new LLMutex;
-			mDeletionMutexp = new LLMutex;
-			mEasyMutexp = new LLMutex;
-		}
-		LLCurl::getCurlThread()->addMulti(this) ;
+	if(LLCurl::getCurlThread()->getThreaded())
+	{
+		mMutexp = new LLMutex() ;
+		mDeletionMutexp = new LLMutex() ;
+		mEasyMutexp = new LLMutex() ;
+	}
+	LLCurl::getCurlThread()->addMulti(this) ;
 
 		mIdleTimeOut = idle_time_out ;
 		if(mIdleTimeOut < LLCurl::sCurlRequestTimeOut)
@@ -586,13 +586,13 @@ LLCurl::Multi::Multi(F32 idle_time_out)
 			mIdleTimeOut = LLCurl::sCurlRequestTimeOut ;
 		}
 
-		++gCurlMultiCount;
-	}
+	++gCurlMultiCount;
+}
 }
 
 LLCurl::Multi::~Multi()
 {
-	cleanup(true);
+	cleanup(true) ;	
 	
 	delete mDeletionMutexp ;
 	mDeletionMutexp = NULL ;	
@@ -943,8 +943,8 @@ bool LLCurlThread::CurlRequest::processRequest()
 
 		if(!completed)
 		{
-			setPriority(LLQueuedThread::PRIORITY_LOW) ;
-		}
+		setPriority(LLQueuedThread::PRIORITY_LOW) ;
+	}
 	}
 
 	return completed ;
@@ -954,7 +954,7 @@ void LLCurlThread::CurlRequest::finishRequest(bool completed)
 {
 	if(mMulti->isDead())
 	{
-		mCurlThread->deleteMulti(mMulti) ;
+	mCurlThread->deleteMulti(mMulti) ;
 	}
 	else
 	{
@@ -1062,7 +1062,7 @@ void LLCurlRequest::addMulti()
 		mActiveRequestCount = 0 ;
 		return;
 	}
-
+	
 	mMultiSet.insert(multi);
 	mActiveMulti = multi;
 	mActiveRequestCount = 0;
@@ -1258,15 +1258,15 @@ LLCurlEasyRequest::LLCurlEasyRequest()
 	
 	if(mMulti->isValid())
 	{
-		mEasy = mMulti->allocEasy();
-		if (mEasy)
-		{
-			mEasy->setErrorBuffer();
-			mEasy->setCA();
-			// Set proxy settings if configured to do so.
-			LLProxy::getInstance()->applyProxySettings(mEasy);
-		}
+	mEasy = mMulti->allocEasy();
+	if (mEasy)
+	{
+		mEasy->setErrorBuffer();
+		mEasy->setCA();
+		// Set proxy settings if configured to do so.
+		LLProxy::getInstance()->applyProxySettings(mEasy);
 	}
+}
 	else
 	{
 		LLCurl::getCurlThread()->killMulti(mMulti) ;
@@ -1486,7 +1486,7 @@ void LLCurl::initClass(F32 curl_reuest_timeout, S32 max_number_handles, bool mul
 	S32 mutex_count = CRYPTO_num_locks();
 	for (S32 i=0; i<mutex_count; i++)
 	{
-		sSSLMutex.push_back(new LLMutex);
+		sSSLMutex.push_back(new LLMutex());
 	}
 	CRYPTO_set_id_callback(&LLCurl::ssl_thread_id);
 	CRYPTO_set_locking_callback(&LLCurl::ssl_locking_callback);
@@ -1495,8 +1495,8 @@ void LLCurl::initClass(F32 curl_reuest_timeout, S32 max_number_handles, bool mul
 	sCurlThread = new LLCurlThread(multi_threaded) ;
 	if(multi_threaded)
 	{
-		sHandleMutexp = new LLMutex;
-		Easy::sHandleMutexp = new LLMutex;
+		sHandleMutexp = new LLMutex() ;
+		Easy::sHandleMutexp = new LLMutex() ;
 	}
 }
 
@@ -1535,7 +1535,8 @@ void LLCurl::cleanupClass()
 	delete sHandleMutexp ;
 	sHandleMutexp = NULL ;
 
-	llassert(Easy::sActiveHandles.empty());
+	// removed as per https://jira.secondlife.com/browse/SH-3115
+	//llassert(Easy::sActiveHandles.empty());
 }
 
 //static 
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h
index fa8465bfe..42ab93e58 100644
--- a/indra/llmessage/llcurl.h
+++ b/indra/llmessage/llcurl.h
@@ -318,7 +318,7 @@ public:
 	
 private:
 	void easyFree(LLCurl::Easy*);
-	void cleanup(bool deleted = false);
+	void cleanup(bool deleted = false) ;
 	
 	CURLM* mCurlMultiHandle;
 
@@ -378,11 +378,9 @@ private:
 	void cleanupMulti(LLCurl::Multi* multi) ;
 } ;
 
-//namespace boost
-//{
-	void intrusive_ptr_add_ref(LLCurl::Responder* p);
-	void intrusive_ptr_release(LLCurl::Responder* p);
-//};
+
+void intrusive_ptr_add_ref(LLCurl::Responder* p);
+void intrusive_ptr_release(LLCurl::Responder* p);
 
 
 class LLCurlRequest
diff --git a/indra/llmessage/lliosocket.h b/indra/llmessage/lliosocket.h
index 45c098bff..15ee5f2dc 100644
--- a/indra/llmessage/lliosocket.h
+++ b/indra/llmessage/lliosocket.h
@@ -37,6 +37,7 @@
  * OS poll indicates it will not block.
  */
 
+#include "llaprpool.h"
 #include "lliopipe.h"
 #include "apr_network_io.h"
 #include "llchainio.h"
diff --git a/indra/llmessage/llioutil.cpp b/indra/llmessage/llioutil.cpp
index 63dbf7b07..9fd49d23d 100644
--- a/indra/llmessage/llioutil.cpp
+++ b/indra/llmessage/llioutil.cpp
@@ -27,8 +27,8 @@
  */
 
 #include "linden_common.h"
-#include "llfasttimer.h"
 #include "llioutil.h"
+#include "llfasttimer.h"
 
 /**
  * LLIOFlush
diff --git a/indra/llmessage/llmail.cpp b/indra/llmessage/llmail.cpp
index 8a898ab1b..08b31e9c7 100644
--- a/indra/llmessage/llmail.cpp
+++ b/indra/llmessage/llmail.cpp
@@ -50,7 +50,6 @@
 #include "llstring.h"
 #include "lluuid.h"
 #include "net.h"
-#include "llaprpool.h"
 
 //
 // constants
@@ -58,7 +57,7 @@
 const size_t LL_MAX_KNOWN_GOOD_MAIL_SIZE = 4096;
 
 static bool gMailEnabled = true;
-static LLAPRPool gMailPool;
+static apr_pool_t* gMailPool;
 static apr_sockaddr_t* gSockAddr;
 static apr_socket_t* gMailSocket;
 
@@ -83,7 +82,7 @@ bool connect_smtp()
 		gSockAddr->sa.sin.sin_family,
 		SOCK_STREAM,
 		APR_PROTO_TCP,
-		gMailPool());
+		gMailPool);
 	if(ll_apr_warn_status(status)) return false;
 	status = apr_socket_connect(gMailSocket, gSockAddr);
 	if(ll_apr_warn_status(status))
@@ -140,19 +139,19 @@ BOOL LLMail::send(
 }
 
 // static
-void LLMail::init(const std::string& hostname)
+void LLMail::init(const std::string& hostname, apr_pool_t* pool)
 {
 	gMailSocket = NULL;
-	if (hostname.empty())
+	if(hostname.empty() || !pool)
 	{
+		gMailPool = NULL;
 		gSockAddr = NULL;
-		gMailPool.destroy();
 	}
 	else
 	{
-		gMailPool.create();
+		gMailPool = pool;
 
-		// Collect all the information into a sockaddr structure. the
+		// collect all the information into a socaddr sturcture. the
 		// documentation is a bit unclear, but I either have to
 		// specify APR_UNSPEC or not specify any flags. I am not sure
 		// which option is better.
@@ -162,7 +161,7 @@ void LLMail::init(const std::string& hostname)
 			APR_UNSPEC,
 			25,
 			APR_IPV4_ADDR_OK,
-			gMailPool());
+			gMailPool);
 		ll_apr_warn_status(status);
 	}
 }
diff --git a/indra/llmessage/llmail.h b/indra/llmessage/llmail.h
index 0a5c53208..379171436 100644
--- a/indra/llmessage/llmail.h
+++ b/indra/llmessage/llmail.h
@@ -27,13 +27,15 @@
 #ifndef LL_LLMAIL_H
 #define LL_LLMAIL_H
 
+typedef struct apr_pool_t apr_pool_t;
+
 #include "llsd.h"
 
 class LLMail
 {
 public:
 	// if hostname is NULL, then the host is resolved as 'mail'
-	static void init(const std::string& hostname);
+	static void init(const std::string& hostname, apr_pool_t* pool);
 
 	// Allow all email transmission to be disabled/enabled.
 	static void enable(bool mail_enabled);
diff --git a/indra/llmessage/llmime.cpp b/indra/llmessage/llmime.cpp
index 943a73492..9d9c4ebd6 100644
--- a/indra/llmessage/llmime.cpp
+++ b/indra/llmessage/llmime.cpp
@@ -388,7 +388,7 @@ bool LLMimeParser::Impl::parseHeaders(
 		// not to read past limit when we get() the newline.
 		S32 max_get = llmin((S32)LINE_BUFFER_LENGTH, limit - mScanCount - 1);
 		istr.getline(mBuffer, max_get, '\r');
-		mScanCount += istr.gcount();
+		mScanCount += (S32)istr.gcount();
 		int c = istr.get();
 		if(EOF == c)
 		{
@@ -496,7 +496,7 @@ void LLMimeParser::Impl::scanPastSeparator(
 		// past limit when we get() the newline.
 		S32 max_get = llmin((S32)LINE_BUFFER_LENGTH, limit - mScanCount - 1);
 		istr.getline(mBuffer, max_get, '\r');
-		mScanCount += istr.gcount();
+		mScanCount += (S32)istr.gcount();
 		if(istr.gcount() >= LINE_BUFFER_LENGTH - 1)
 		{
 			// that's way too long to be a separator, so ignore it.
diff --git a/indra/llmessage/llpumpio.cpp b/indra/llmessage/llpumpio.cpp
index 498914d33..48e581c64 100644
--- a/indra/llmessage/llpumpio.cpp
+++ b/indra/llmessage/llpumpio.cpp
@@ -4,25 +4,31 @@
  * @date 2004-11-21
  * @brief Implementation of the i/o pump and related functions.
  *
- * $LicenseInfo:firstyear=2004&license=viewerlgpl$
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
+ * Copyright (c) 2004-2009, Linden Research, Inc.
+ * 
  * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
+ * 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
  * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * 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.
  * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * 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$
  */
 
@@ -34,11 +40,12 @@
 #include "apr_poll.h"
 
 #include "llapr.h"
-#include "llfasttimer.h"
 #include "llmemtype.h"
 #include "llstl.h"
 #include "llstat.h"
 #include "llthread.h"
+#include "llfasttimer.h"
+#include <iterator> //VS2010
 
 // These should not be enabled in production, but they can be
 // intensely useful during development for finding certain kinds of
@@ -184,21 +191,10 @@ LLPumpIO::LLPumpIO(void) :
 LLPumpIO::~LLPumpIO()
 {
 	LLMemType m1(LLMemType::MTYPE_IO_PUMP);
-#if LL_THREADS_APR
-	if (mChainsMutex) apr_thread_mutex_destroy(mChainsMutex);
-	if (mCallbackMutex) apr_thread_mutex_destroy(mCallbackMutex);
-#endif
-	mChainsMutex = NULL;
-	mCallbackMutex = NULL;
-	if(mPollset)
-	{
-//		lldebugs << "cleaning up pollset" << llendl;
-		apr_pollset_destroy(mPollset);
-		mPollset = NULL;
-	}
+	cleanup();
 }
 
-bool LLPumpIO::addChain(const chain_t& chain, F32 timeout, bool has_curl_request)
+bool LLPumpIO::addChain(const chain_t& chain, F32 timeout)
 {
 	LLMemType m1(LLMemType::MTYPE_IO_PUMP);
 	if(chain.empty()) return false;
@@ -207,10 +203,8 @@ bool LLPumpIO::addChain(const chain_t& chain, F32 timeout, bool has_curl_request
 	LLScopedLock lock(mChainsMutex);
 #endif
 	LLChainInfo info;
-	info.mHasCurlRequest = has_curl_request;
 	info.setTimeoutSeconds(timeout);
 	info.mData = LLIOPipe::buffer_ptr_t(new LLBufferArray);
-	info.mData->setThreaded(has_curl_request);
 	LLLinkInfo link;
 #if LL_DEBUG_PIPE_TYPE_IN_PUMP
 	lldebugs << "LLPumpIO::addChain() " << chain[0] << " '"
@@ -444,15 +438,6 @@ void LLPumpIO::pump()
 
 static LLFastTimer::DeclareTimer FTM_PUMP_IO("Pump IO");
 
-LLPumpIO::current_chain_t LLPumpIO::removeRunningChain(LLPumpIO::current_chain_t& run_chain) 
-{
-	std::for_each(
-				(*run_chain).mDescriptors.begin(),
-				(*run_chain).mDescriptors.end(),
-				ll_delete_apr_pollset_fd_client_data());
-	return mRunningChains.erase(run_chain);
-}
-
 //timeout is in microseconds
 void LLPumpIO::pump(const S32& poll_timeout)
 {
@@ -598,16 +583,10 @@ void LLPumpIO::pump(const S32& poll_timeout)
 //						<< (*run_chain).mChainLinks[0].mPipe
 //						<< " because we reached the end." << llendl;
 #endif
-				run_chain = removeRunningChain(run_chain);
+				run_chain = mRunningChains.erase(run_chain);
 				continue;
 			}
 		}
-		else if(isChainExpired(*run_chain))
-		{
-			run_chain = removeRunningChain(run_chain);
-			continue;
-		}
-
 		PUMP_DEBUG;
 		if((*run_chain).mLock)
 		{
@@ -715,7 +694,11 @@ void LLPumpIO::pump(const S32& poll_timeout)
 			PUMP_DEBUG;
 			// This chain is done. Clean up any allocated memory and
 			// erase the chain info.
-			run_chain = removeRunningChain(run_chain);
+			std::for_each(
+				(*run_chain).mDescriptors.begin(),
+				(*run_chain).mDescriptors.end(),
+				ll_delete_apr_pollset_fd_client_data());
+			run_chain = mRunningChains.erase(run_chain);
 
 			// *NOTE: may not always need to rebuild the pollset.
 			mRebuildPollset = true;
@@ -850,6 +833,22 @@ void LLPumpIO::initialize(void)
 	apr_thread_mutex_create(&mCallbackMutex, APR_THREAD_MUTEX_UNNESTED, mPool());
 #endif
 }
+void LLPumpIO::cleanup()
+{
+	LLMemType m1(LLMemType::MTYPE_IO_PUMP);
+#if LL_THREADS_APR
+	if (mChainsMutex) apr_thread_mutex_destroy(mChainsMutex);
+	if (mCallbackMutex) apr_thread_mutex_destroy(mCallbackMutex);
+#endif
+	mChainsMutex = NULL;
+	mCallbackMutex = NULL;
+	if(mPollset)
+	{
+//		lldebugs << "cleaning up pollset" << llendl;
+		apr_pollset_destroy(mPollset);
+		mPollset = NULL;
+	}
+}
 
 void LLPumpIO::rebuildPollset()
 {
@@ -1084,24 +1083,6 @@ void LLPumpIO::processChain(LLChainInfo& chain)
 	PUMP_DEBUG;
 }
 
-bool LLPumpIO::isChainExpired(LLChainInfo& chain)
-{
-	if(!chain.mHasCurlRequest)
-	{
-		return false ;
-	}
-
-	for(links_t::iterator iter = chain.mChainLinks.begin(); iter != chain.mChainLinks.end(); ++iter)
-	{
-		if(!(*iter).mPipe->isValid())
-		{
-			return true ;
-		}
-	}
-
-	return false ;
-}
-
 bool LLPumpIO::handleChainError(
 	LLChainInfo& chain,
 	LLIOPipe::EStatus error)
@@ -1143,9 +1124,6 @@ bool LLPumpIO::handleChainError(
 #endif
 			keep_going = false;
 			break;
-		case LLIOPipe::STATUS_EXPIRED:
-			keep_going = false;
-			break ;
 		default:
 			if(LLIOPipe::isSuccess(error))
 			{
@@ -1168,7 +1146,6 @@ LLPumpIO::LLChainInfo::LLChainInfo() :
 	mInit(false),
 	mLock(0),
 	mEOS(false),
-	mHasCurlRequest(false),
 	mDescriptorsPool(new LLAPRPool(LLThread::tldata().mRootPool))
 {
 	LLMemType m1(LLMemType::MTYPE_IO_PUMP);
@@ -1180,9 +1157,7 @@ void LLPumpIO::LLChainInfo::setTimeoutSeconds(F32 timeout)
 	LLMemType m1(LLMemType::MTYPE_IO_PUMP);
 	if(timeout > 0.0f)
 	{
-		mTimer.start();
-		mTimer.reset();
-		mTimer.setTimerExpirySec(timeout);
+		mTimer.start(timeout);
 	}
 	else
 	{
diff --git a/indra/llmessage/llpumpio.h b/indra/llmessage/llpumpio.h
index 3771be9cf..4e6d59b39 100644
--- a/indra/llmessage/llpumpio.h
+++ b/indra/llmessage/llpumpio.h
@@ -4,25 +4,31 @@
  * @date 2004-11-19
  * @brief Declaration of pump class which manages io chains.
  *
- * $LicenseInfo:firstyear=2004&license=viewerlgpl$
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
+ * Copyright (c) 2004-2009, Linden Research, Inc.
+ * 
  * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
+ * 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
  * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * 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.
  * 
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * 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$
  */
 
@@ -100,10 +106,9 @@ public:
 	 * @param chain The pipes for the chain
 	 * @param timeout The number of seconds in the future to
 	 * expire. Pass in 0.0f to never expire.
-	 * @param has_curl_request The chain contains LLURLRequest if true.
 	 * @return Returns true if anything was added to the pump.
 	 */
-	bool addChain(const chain_t& chain, F32 timeout, bool has_curl_request = false);
+	bool addChain(const chain_t& chain, F32 timeout);
 	
 	/** 
 	 * @brief Struct to associate a pipe with it's buffer io indexes.
@@ -346,13 +351,12 @@ protected:
 
 		// basic member data
 		bool mInit;
-		bool mEOS;
-		bool mHasCurlRequest;
 		S32 mLock;
 		LLFrameTimer mTimer;
 		links_t::iterator mHead;
 		links_t mChainLinks;
-		LLIOPipe::buffer_ptr_t mData;		
+		LLIOPipe::buffer_ptr_t mData;
+		bool mEOS;
 		LLSD mContext;
 
 		// tracking inside the pump
@@ -393,8 +397,8 @@ protected:
 
 protected:
 	void initialize();
+	void cleanup();
 
-	current_chain_t removeRunningChain(current_chain_t& chain) ;
 	/** 
 	 * @brief Given the internal state of the chains, rebuild the pollset
 	 * @see setConditional()
@@ -421,9 +425,6 @@ protected:
 	 */
 	bool handleChainError(LLChainInfo& chain, LLIOPipe::EStatus error);
 
-	//if the chain is expired, remove it
-	bool isChainExpired(LLChainInfo& chain) ;
-
 public:
 	/** 
 	 * @brief Return number of running chains.
diff --git a/indra/llmessage/llsdmessage.cpp b/indra/llmessage/llsdmessage.cpp
index 9148c9dd1..1c93c12d9 100644
--- a/indra/llmessage/llsdmessage.cpp
+++ b/indra/llmessage/llsdmessage.cpp
@@ -88,7 +88,7 @@ bool LLSDMessage::httpListener(const LLSD& request)
                                                        request,
                                                        url, "POST", reply, error),
                        LLSD(),      // headers
-                       timeout);
+                       (F32)timeout);
     return false;
 }
 
diff --git a/indra/llmessage/llsdmessagebuilder.cpp b/indra/llmessage/llsdmessagebuilder.cpp
index 2698a271e..615221e0a 100644
--- a/indra/llmessage/llsdmessagebuilder.cpp
+++ b/indra/llmessage/llsdmessagebuilder.cpp
@@ -317,7 +317,7 @@ void LLSDMessageBuilder::copyFromMessageData(const LLMsgData& data)
 
 			// S64 not supported in LLSD so we just truncate it
 			case MVT_S64:
-				addS32(varname, *(S64*)mvci.getData());
+				addS32(varname, (S32)*(S64*)mvci.getData());
 				break;
 
 			case MVT_F32:
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index 7d21e35f9..e50bb604a 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -97,10 +97,8 @@ std::string get_shared_secret();
 class LLMessagePollInfo
 {
 public:
-	LLMessagePollInfo(void) : mPool(LLThread::tldata().mRootPool) { }
 	apr_socket_t *mAPRSocketp;
 	apr_pollfd_t mPollFD;
-	LLAPRPool mPool;
 };
 
 namespace
@@ -289,13 +287,15 @@ LLMessageSystem::LLMessageSystem(const std::string& filename, U32 port,
 	}
 //	LL_DEBUGS("Messaging") <<  << "*** port: " << mPort << llendl;
 
-	mPollInfop = new LLMessagePollInfo;
-
+	//
+	// Create the data structure that we can poll on
+	//
 	apr_socket_t *aprSocketp = NULL;
-	apr_os_sock_put(&aprSocketp, (apr_os_sock_t*)&mSocket, mPollInfop->mPool());
+	apr_os_sock_put(&aprSocketp, (apr_os_sock_t*)&mSocket, LLAPRRootPool::get()());
 
+	mPollInfop = new LLMessagePollInfo;
 	mPollInfop->mAPRSocketp = aprSocketp;
-	mPollInfop->mPollFD.p = mPollInfop->mPool();
+	mPollInfop->mPollFD.p = LLAPRRootPool::get()();
 	mPollInfop->mPollFD.desc_type = APR_POLL_SOCKET;
 	mPollInfop->mPollFD.reqevents = APR_POLLIN;
 	mPollInfop->mPollFD.rtnevents = 0;
@@ -3142,7 +3142,7 @@ bool LLMessageSystem::generateDigestForWindowAndUUIDs(char* digest, const S32 wi
 		LL_ERRS("Messaging") << "Trying to generate complex digest on a machine without a shared secret!" << llendl;
 	}
 
-	U32 now = time(NULL);
+	U32 now = (U32)time(NULL);
 
 	now /= window;
 
@@ -3162,7 +3162,7 @@ bool LLMessageSystem::isMatchingDigestForWindowAndUUIDs(const char* digest, cons
 	}
 	
 	char our_digest[MD5HEX_STR_SIZE];	/* Flawfinder: ignore */
-	U32 now = time(NULL);
+	U32 now = (U32)time(NULL);
 
 	now /= window;
 
@@ -3208,7 +3208,7 @@ bool LLMessageSystem::generateDigestForWindow(char* digest, const S32 window) co
 		LL_ERRS("Messaging") << "Trying to generate simple digest on a machine without a shared secret!" << llendl;
 	}
 
-	U32 now = time(NULL);
+	U32 now = (U32)time(NULL);
 
 	now /= window;
 

From db5a7578c9d6e70d45387dd8899fcd6230dfed48 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sun, 22 Jul 2012 21:44:41 +0200
Subject: [PATCH 077/199] Crash fix copy texture params

---
 indra/newview/llpanelface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 271ea92c4..a427529a5 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1246,7 +1246,7 @@ void LLPanelFace::onClickPaste(void* userdata)
 	LLPrimitive obj;
 	obj.setNumTEs(U8(textures.size()));
 	
-	for (int i = 0; i < textures.size(); i++)
+	for (int i = 0; i < textures.size() && i < objectp->getNumTEs(); i++)
 	{
 		llinfos << "Pasting params on face " << i << "." << llendl;
 		LLSD cur_tex = objectp->getTE(i)->asLLSD();

From a967f2b037760194707bd06f570c37ae374872c9 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sun, 22 Jul 2012 22:36:40 +0200
Subject: [PATCH 078/199] Updated 'Show Updates'

---
 indra/newview/CMakeLists.txt      |   2 -
 indra/newview/llviewermessage.cpp |  12 +-
 indra/newview/llviewerobject.cpp  |  29 +---
 indra/newview/llvotextbubble.cpp  | 268 ------------------------------
 indra/newview/llvotextbubble.h    |  72 --------
 indra/newview/pipeline.cpp        |  49 +++++-
 indra/newview/pipeline.h          |  16 ++
 7 files changed, 72 insertions(+), 376 deletions(-)
 delete mode 100644 indra/newview/llvotextbubble.cpp
 delete mode 100644 indra/newview/llvotextbubble.h

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 91203f19b..54d85e381 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -520,7 +520,6 @@ set(viewer_SOURCE_FILES
     llvopartgroup.cpp
     llvosky.cpp
     llvosurfacepatch.cpp
-    llvotextbubble.cpp
     llvotree.cpp
     llvovolume.cpp
     llvowater.cpp
@@ -1018,7 +1017,6 @@ set(viewer_HEADER_FILES
     llvopartgroup.h
     llvosky.h
     llvosurfacepatch.h
-    llvotextbubble.h
     llvotree.h
     llvotreenew.h
     llvovolume.h
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 00ec70cd1..3a4b25103 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -138,7 +138,6 @@
 #include "llviewerwindow.h"
 #include "llvlmanager.h"
 #include "llvoavatar.h"
-#include "llvotextbubble.h"
 #include "llweb.h"
 #include "llworld.h"
 #include "pipeline.h"
@@ -4763,15 +4762,8 @@ void process_kill_object(LLMessageSystem *mesgsys, void **user_data)
 				// Display green bubble on kill
 				if ( gShowObjectUpdates )
 				{
-					LLViewerObject* newobject;
-					newobject = gObjectList.createObjectViewer(LL_PCODE_LEGACY_TEXT_BUBBLE, objectp->getRegion());
-
-					LLVOTextBubble* bubble = (LLVOTextBubble*) newobject;
-
-					bubble->mColor.setVec(0.f, 1.f, 0.f, 1.f);
-					bubble->setScale( 2.0f * bubble->getScale() );
-					bubble->setPositionGlobal(objectp->getPositionGlobal());
-					gPipeline.addObject(bubble);
+					LLColor4 color(0.f,1.f,0.f,1.f);
+					gPipeline.addDebugBlip(objectp->getPositionAgent(), color);
 				}
 
 				// Do the kill
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 54ed9ac8d..c4692f38c 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -88,7 +88,6 @@
 #include "llvopartgroup.h"
 #include "llvosky.h"
 #include "llvosurfacepatch.h"
-#include "llvotextbubble.h"
 #include "llvotree.h"
 #include "llvovolume.h"
 #include "llvowater.h"
@@ -173,8 +172,6 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco
 // 	  llwarns << "Creating new tree!" << llendl;
 // 	  res = new LLVOTree(id, pcode, regionp); break;
 	  res = NULL; break;
-	case LL_PCODE_LEGACY_TEXT_BUBBLE:
-	  res = new LLVOTextBubble(id, pcode, regionp); break;
 #if ENABLE_CLASSIC_CLOUDS
 	case LL_VO_CLOUDS:
 	  res = new LLVOClouds(id, pcode, regionp); break;
@@ -2145,26 +2142,16 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 
 	if ( gShowObjectUpdates )
 	{
-		// <edit> We want to see updates from our own avatar
-		//if (!((mPrimitiveCode == LL_PCODE_LEGACY_AVATAR) && (((LLVOAvatar *) this)->mIsSelf))
-		//	&& mRegionp)
-		if(mRegionp)
-		// </edit>
+		LLColor4 color;
+		if (update_type == OUT_TERSE_IMPROVED)
 		{
-			LLViewerObject* object = gObjectList.createObjectViewer(LL_PCODE_LEGACY_TEXT_BUBBLE, mRegionp);
-			LLVOTextBubble* bubble = (LLVOTextBubble*) object;
-
-			if (update_type == OUT_TERSE_IMPROVED)
-			{
-				bubble->mColor.setVec(0.f, 0.f, 1.f, 1.f);
-			}
-			else
-			{
-				bubble->mColor.setVec(1.f, 0.f, 0.f, 1.f);
-			}
-			object->setPositionGlobal(getPositionGlobal());
-			gPipeline.addObject(object);
+			color.setVec(0.f, 0.f, 1.f, 1.f);
 		}
+		else
+		{
+			color.setVec(1.f, 0.f, 0.f, 1.f);
+		}
+		gPipeline.addDebugBlip(getPositionAgent(), color);
 	}
 
 	if ((0.0f == vel_mag_sq) && 
diff --git a/indra/newview/llvotextbubble.cpp b/indra/newview/llvotextbubble.cpp
deleted file mode 100644
index 6f73dae11..000000000
--- a/indra/newview/llvotextbubble.cpp
+++ /dev/null
@@ -1,268 +0,0 @@
-/** 
- * @file llvotextbubble.cpp
- * @brief Viewer-object text bubble.
- *
- * $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 "llvotextbubble.h"
-
-#include "imageids.h"
-#include "llviewercontrol.h"
-#include "llprimitive.h"
-#include "llrendersphere.h"
-
-#include "llagent.h"
-#include "llbox.h"
-#include "lldrawable.h"
-#include "llface.h"
-#include "llviewertexturelist.h"
-#include "llvolume.h"
-#include "pipeline.h"
-#include "llvector4a.h"
-#include "llviewerregion.h"
-
-LLVOTextBubble::LLVOTextBubble(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
-:	LLAlphaObject(id, pcode, regionp)
-{
-	setScale(LLVector3(1.5f, 1.5f, 0.25f));
-	mbCanSelect = FALSE;
-	mLOD = MIN_LOD;
-	mVolumeChanged = TRUE;
-	setVelocity(LLVector3(0.f, 0.f, 0.75f));
-	LLVolumeParams volume_params;
-	volume_params.setType(LL_PCODE_PROFILE_CIRCLE, LL_PCODE_PATH_LINE);
-	volume_params.setBeginAndEndS(0.f, 1.f);
-	volume_params.setBeginAndEndT(0.f, 1.f);
-	volume_params.setRatio(0.25f, 0.25f);
-	volume_params.setShear(0.f, 0.f);
-	setVolume(volume_params, 0);
-	mColor = LLColor4(1.0f, 0.0f, 0.0f, 1.f);
-	S32 i;
-	for (i = 0; i < getNumTEs(); i++)
-	{
-		setTEColor(i, mColor);
-		setTETexture(i, LLUUID(IMG_DEFAULT));
-	}
-}
-
-
-LLVOTextBubble::~LLVOTextBubble()
-{
-}
-
-
-BOOL LLVOTextBubble::isActive() const
-{
-	return TRUE;
-}
-
-BOOL LLVOTextBubble::idleUpdate(LLAgent &agent, LLWorld	&world, const F64 &time)
-{
-	F32 dt = mUpdateTimer.getElapsedTimeF32();
-	// Die after a few seconds.
-	if (dt > 1.5f)
-	{
-		return FALSE;
-	}
-
-	LLViewerObject::idleUpdate(agent, world, time);
-
-	setScale(0.5f * (1.f+dt) * LLVector3(1.5f, 1.5f, 0.5f));
-
-	F32 alpha = 0.35f*dt;
-
-	LLColor4 color = mColor;
-	color.mV[VALPHA] -= alpha;
-	if (color.mV[VALPHA] <= 0.05f)
-	{
-		return FALSE;
-	}
-	S32 i;
-	for (i = 0; i < getNumTEs(); i++)
-	{
-		setTEColor(i, color);
-		setTEFullbright(i, TRUE);
-	}
-
-	gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE);
-	return TRUE;
-}
-
-
-void LLVOTextBubble::updateTextures()
-{
-	// Update the image levels of all textures...
-
-	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);
-		LLViewerTexture *imagep = getTEImage(i);
-		if (imagep)
-		{
-			imagep->addTextureStats(mPixelArea / texel_area_ratio);
-		}
-	}
-}
-
-
-LLDrawable *LLVOTextBubble::createDrawable(LLPipeline *pipeline)
-{
-	pipeline->allocDrawable(this);
-	mDrawable->setLit(FALSE);
-	mDrawable->setRenderType(LLPipeline::RENDER_TYPE_VOLUME);
-	
-	for (U32 i = 0; i < getNumTEs(); i++)
-	{
-		LLViewerTexture *imagep;
-		const LLTextureEntry *texture_entry = getTE(i);
-		imagep = LLViewerTextureManager::getFetchedTexture(texture_entry->getID());
-
-		mDrawable->addFace((LLFacePool*) NULL, imagep);
-	}
-
-	return mDrawable;
-}
-
-// virtual
-BOOL LLVOTextBubble::setVolume(const LLVolumeParams &volume_params, const S32 detail, bool unique_volume)
-{
-	if (LLPrimitive::setVolume(volume_params, mLOD))
-	{
-		if (mDrawable)
-		{
-			gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE);
-			mVolumeChanged = TRUE;
-		}
-		return TRUE;
-	}
-	return FALSE;
-}
-
-
-BOOL LLVOTextBubble::updateLOD()
-{
-	return FALSE;
-}
-
-BOOL LLVOTextBubble::updateGeometry(LLDrawable *drawable)
-{
- 	if (!(gPipeline.hasRenderType(LLPipeline::RENDER_TYPE_VOLUME)))
-		return TRUE;
-	
-	if (mVolumeChanged)
-	{
-		LLVolumeParams volume_params = getVolume()->getParams();
-		setVolume(volume_params, 0);
-
-		LLPipeline::sCompiles++;
-
-		drawable->setNumFaces(getVolume()->getNumFaces(), drawable->getFace(0)->getPool(), getTEImage(0));
-	}
-
-	LLMatrix4 identity4;
-	LLMatrix3 identity3;
-	for (S32 i = 0; i < drawable->getNumFaces(); i++)
-	{
-		LLFace *face = drawable->getFace(i);
-		face->setTEOffset(i);
-		face->setTexture(LLViewerFetchedTexture::sSmokeImagep);
-		face->setState(LLFace::FULLBRIGHT);
-	}
-
-	mVolumeChanged = FALSE;
-
-	mDrawable->movePartition();
-	return TRUE;
-}
-
-void LLVOTextBubble::updateFaceSize(S32 idx)
-{
-	LLFace* face = mDrawable->getFace(idx);
-	
-	if (idx == 0 || idx == 2)
-	{
-		face->setSize(0,0);
-	}
-	else
-	{
-		const LLVolumeFace& vol_face = getVolume()->getVolumeFace(idx);
-		face->setSize(vol_face.mNumVertices, vol_face.mNumIndices);
-	}
-}
-
-void LLVOTextBubble::getGeometry(S32 idx,
-								LLStrider<LLVector4a>& verticesp,
-								LLStrider<LLVector3>& normalsp, 
-								LLStrider<LLVector2>& texcoordsp,
-								LLStrider<LLColor4U>& colorsp, 
-								LLStrider<U16>& indicesp) 
-{
-	if (idx == 0 || idx == 2)
-	{
-		return;
-	}
-
-	const LLVolumeFace& face = getVolume()->getVolumeFace(idx);
-	
-	LLVector4a pos;
-	pos.load3(getPositionAgent().mV);
-
-	LLVector4a scale;
-	scale.load3(getScale().mV);
-
-	LLColor4U color = LLColor4U(getTE(idx)->getColor());
-	U32 offset = mDrawable->getFace(idx)->getGeomIndex();
-	
-	LLVector4a::memcpyNonAliased16((F32*) normalsp.get(), (F32*) face.mNormals, face.mNumVertices*4*sizeof(F32));
-	//normalsp.assignArray((U8*)face.mNormals, sizeof(face.mNormals[0]), face.mNumVertices);
-	LLVector4a::memcpyNonAliased16((F32*) texcoordsp.get(), (F32*) face.mTexCoords, face.mNumVertices*2*sizeof(F32));
-	//texcoordsp.assignArray((U8*)face.mTexCoords, sizeof(face.mTexCoords[0]), face.mNumVertices);
-
-
-	for (U32 i = 0; i < (U32)face.mNumVertices; i++)
-	{
-		(verticesp++)->setMul(face.mPositions[i],scale);
-		verticesp->add(pos);
-		*colorsp++ = color;
-	}
-	
-	for (U32 i = 0; i < (U32)face.mNumIndices; i++)
-	{
-		*indicesp++ = face.mIndices[i] + offset;
-	}
-}
-
-U32 LLVOTextBubble::getPartitionType() const
-{ 
-	return LLViewerRegion::PARTITION_PARTICLE; 
-}
diff --git a/indra/newview/llvotextbubble.h b/indra/newview/llvotextbubble.h
deleted file mode 100644
index 0da5c4e64..000000000
--- a/indra/newview/llvotextbubble.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/** 
- * @file llvotextbubble.h
- * @brief Description of LLVORock class, which a derivation of LLViewerObject
- *
- * $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$
- */
-
-#ifndef LL_LLVOTEXTBUBBLE_H
-#define LL_LLVOTEXTBUBBLE_H
-
-#include "llviewerobject.h"
-#include "llframetimer.h"
-
-class LLVOTextBubble : public LLAlphaObject
-{
-public:
-	LLVOTextBubble(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp);
-
-	/*virtual*/ BOOL    isActive() const; // Whether this object needs to do an idleUpdate.
-	/*virtual*/ BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time);
-
-	/*virtual*/ void updateTextures();
-	/*virtual*/ LLDrawable* createDrawable(LLPipeline *pipeline);
-	/*virtual*/ BOOL		updateGeometry(LLDrawable *drawable);
-	/*virtual*/ BOOL		updateLOD();
-	/*virtual*/ void		updateFaceSize(S32 idx);
-	
-	/*virtual*/ void		getGeometry(S32 idx,
-								LLStrider<LLVector4a>& verticesp,
-								LLStrider<LLVector3>& normalsp, 
-								LLStrider<LLVector2>& texcoordsp,
-								LLStrider<LLColor4U>& colorsp, 
-								LLStrider<U16>& indicesp);
-
-	virtual U32 getPartitionType() const;
-
-	LLColor4 mColor;
-	S32 mLOD;
-	BOOL mVolumeChanged;
-
-protected:
-	~LLVOTextBubble();
-	BOOL setVolume(const LLVolumeParams &volume_params, const S32 detail, bool unique_volume = false);
-	LLFrameTimer mUpdateTimer;
-};
-
-#endif // LL_VO_TEXT_BUBBLE
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 27632dcfc..4e2abcf0d 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -4206,9 +4206,6 @@ void LLPipeline::renderDebug()
 {
 	LLMemType mt(LLMemType::MTYPE_PIPELINE);
 
-	if(!mRenderDebugMask)
-		return;
-
 	assertInitialized();
 
 	gGL.color4f(1,1,1,1);
@@ -4219,6 +4216,46 @@ void LLPipeline::renderDebug()
 
 	bool hud_only = hasRenderType(LLPipeline::RENDER_TYPE_HUD);
 
+	if (!hud_only && !mDebugBlips.empty())
+	{ //render debug blips
+		if (LLGLSLShader::sNoFixedFunction)
+		{
+			gUIProgram.bind();
+		}
+
+		gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sWhiteImagep, true);
+
+		glPointSize(8.f);
+		LLGLDepthTest depth(GL_TRUE, GL_TRUE, GL_ALWAYS);
+
+		gGL.begin(LLRender::POINTS);
+		for (std::list<DebugBlip>::iterator iter = mDebugBlips.begin(); iter != mDebugBlips.end(); )
+		{
+			DebugBlip& blip = *iter;
+
+			blip.mAge += gFrameIntervalSeconds;
+			if (blip.mAge > 2.f)
+			{
+				mDebugBlips.erase(iter++);
+			}
+			else
+			{
+				iter++;
+			}
+
+			blip.mPosition.mV[2] += gFrameIntervalSeconds*2.f;
+
+			gGL.color4fv(blip.mColor.mV);
+			gGL.vertex3fv(blip.mPosition.mV);
+		}
+		gGL.end();
+		gGL.flush();
+		glPointSize(1.f);
+	}
+
+	if(!mRenderDebugMask)
+		return;
+
 	// Debug stuff.
 	for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); 
 			iter != LLWorld::getInstance()->getRegionList().end(); ++iter)
@@ -9733,3 +9770,9 @@ void LLPipeline::clearRenderTypeMask(U32 type, ...)
 	}
 }
 
+void LLPipeline::addDebugBlip(const LLVector3& position, const LLColor4& color)
+{
+	DebugBlip blip(position, color);
+	mDebugBlips.push_back(blip);
+}
+
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h
index 4ad8a5e19..33e522bb9 100644
--- a/indra/newview/pipeline.h
+++ b/indra/newview/pipeline.h
@@ -366,6 +366,8 @@ public:
 
 	static void throttleNewMemoryAllocation(BOOL disable);
 
+	void addDebugBlip(const LLVector3& position, const LLColor4& color);
+
 private:
 	void unloadShaders();
 	void addToQuickLookup( LLDrawPool* new_poolp );
@@ -719,6 +721,20 @@ public:
 protected:
 	std::vector<LLFace*>		mSelectedFaces;
 
+	class DebugBlip
+	{
+	public:
+		LLColor4 mColor;
+		LLVector3 mPosition;
+		F32 mAge;
+
+		DebugBlip(const LLVector3& position, const LLColor4& color)
+			: mColor(color), mPosition(position), mAge(0.f)
+		{ }
+	};
+
+	std::list<DebugBlip> mDebugBlips;
+
 	LLPointer<LLViewerFetchedTexture>	mFaceSelectImagep;
 	
 	U32						mLightMask;

From d9cb2ce6c7e2b19c0f082c12099a59e6bf620425 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sun, 22 Jul 2012 23:30:34 +0200
Subject: [PATCH 079/199] Looks like a bit of edit crash fix got missed, thx
 Drake

---
 indra/newview/llselectmgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 223b6cf80..41b3c3f00 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -5624,7 +5624,7 @@ void pushWireframe(LLDrawable* drawable)
 			for (S32 i = 0; i < volume->getNumVolumeFaces(); ++i)
 			{
 				const LLVolumeFace& face = volume->getVolumeFace(i);
-				LLVertexBuffer::drawElements(LLRender::TRIANGLES, face.mPositions, face.mTexCoords, face.mNumIndices, face.mIndices);
+				LLVertexBuffer::drawElements(LLRender::TRIANGLES, face.mPositions, NULL, face.mNumIndices, face.mIndices);
 			}
 		}
 

From b2f513caae9d3a4635cd27b133a326e4166ca07d Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Mon, 23 Jul 2012 04:02:20 +0200
Subject: [PATCH 080/199] Safer settings, EOL fix

---
 indra/newview/featuretable.txt |  4 ++--
 indra/newview/pipeline.cpp     | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/indra/newview/featuretable.txt b/indra/newview/featuretable.txt
index 995506eab..fc9a175d9 100644
--- a/indra/newview/featuretable.txt
+++ b/indra/newview/featuretable.txt
@@ -63,8 +63,8 @@ RenderDeferred				1	1
 RenderDeferredSSAO			1	1
 RenderShadowDetail			1	2
 WatchdogDisabled				1	1
-ShyotlRenderUseStreamVBO			1	1
-RenderFSAASamples			1	16
+ShyotlRenderUseStreamVBO			1	0
+RenderFSAASamples			1	4
 RenderMaxTextureIndex		1	16
 RenderUseFBO				1	0
 
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 4e2abcf0d..d5f4d1561 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -4218,13 +4218,13 @@ void LLPipeline::renderDebug()
 
 	if (!hud_only && !mDebugBlips.empty())
 	{ //render debug blips
-		if (LLGLSLShader::sNoFixedFunction)
-		{
-			gUIProgram.bind();
-		}
-
-		gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sWhiteImagep, true);
-
+		if (LLGLSLShader::sNoFixedFunction)
+		{
+			gUIProgram.bind();
+		}
+
+		gGL.getTexUnit(0)->bind(LLViewerFetchedTexture::sWhiteImagep, true);
+
 		glPointSize(8.f);
 		LLGLDepthTest depth(GL_TRUE, GL_TRUE, GL_ALWAYS);
 

From efa970c6a57cbfc399216f680e610a57e727efb4 Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Sun, 22 Jul 2012 23:41:09 -0400
Subject: [PATCH 081/199] Uhm..

This fixes a build issue temp till can rebuild QT...*sigh*
---
 indra/plugins/webkit/media_plugin_webkit.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/plugins/webkit/media_plugin_webkit.cpp b/indra/plugins/webkit/media_plugin_webkit.cpp
index 4d6e91d90..9809a9e5e 100644
--- a/indra/plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/plugins/webkit/media_plugin_webkit.cpp
@@ -1312,7 +1312,7 @@ void MediaPluginWebKit::receiveMessage(const char *message_string)
 			else if(message_name == "javascript_enabled")
 			{
 				mJavascriptEnabled = message_in.getValueBoolean("enable");
-				LLQtWebKit::getInstance()->enableJavascript( mJavascriptEnabled );
+				//LLQtWebKit::getInstance()->enableJavascript( mJavascriptEnabled );
 			}
 			else if(message_name == "set_cookies")
 			{

From 9c5da9e42c3ad1fae4bc7484329dbdb01d8b2e80 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Mon, 23 Jul 2012 08:13:13 +0200
Subject: [PATCH 082/199] Build fixes VC10

---
 indra/newview/llviewermessage.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index fb7e28aae..0f4cfcc8b 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1938,7 +1938,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
     {
         static LLCachedControl<U32> SpamNewlines(gSavedSettings,"_NACL_AntiSpamNewlines");
         boost::sregex_iterator iter(message.begin(), message.end(), NEWLINES);
-        if(std::abs(std::distance(iter, boost::sregex_iterator())) > SpamNewlines)
+        if((U32)std::abs(std::distance(iter, boost::sregex_iterator())) > SpamNewlines)
         {
             NACLAntiSpamRegistry::blockOnQueue((U32)NACLAntiSpamRegistry::QUEUE_IM,from_id);
             LLSD args;
@@ -3511,7 +3511,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
         {
             static LLCachedControl<U32> SpamNewlines(gSavedSettings,"_NACL_AntiSpamNewlines");
             boost::sregex_iterator iter(mesg.begin(), mesg.end(), NEWLINES);
-            if(std::abs(std::distance(iter, boost::sregex_iterator())) > SpamNewlines)
+            if((U32)std::abs(std::distance(iter, boost::sregex_iterator())) > SpamNewlines)
             {
                 NACLAntiSpamRegistry::blockOnQueue((U32)NACLAntiSpamRegistry::QUEUE_CHAT,owner_id);
                 LLSD args;

From 3c23163a2931899defc0b453259e88a95d89443e Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Mon, 23 Jul 2012 09:54:00 +0200
Subject: [PATCH 083/199] Less intrusive notifications, by Tazy Scientist

---
 indra/newview/skins/default/xui/en-us/notifications.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml
index a6b797d34..7e3f668e4 100644
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -2626,7 +2626,7 @@ Display settings have been set to recommended levels based on your system config
   <notification
    icon="alertmodal.tga"
    name="AvatarMoved"
-   type="alertmodal">
+   type="notify">
 Your [TYPE] location is not currently available. [HELP]
 You have been moved into a nearby region.
   </notification>
@@ -5246,7 +5246,7 @@ You cannot edit or delete a default preset.
   <notification
    icon="alertmodal.tga"
    name="ChatterBoxSessionStartError"
-   type="alertmodal">
+   type="notifytip">
 Unable to start a new chat session with [RECIPIENT].
 [REASON]
     <usetemplate
@@ -5257,7 +5257,7 @@ Unable to start a new chat session with [RECIPIENT].
   <notification
    icon="alertmodal.tga"
    name="ChatterBoxSessionEventError"
-   type="alertmodal">
+   type="notifytip">
 [EVENT]
 [REASON]
     <usetemplate
@@ -5268,7 +5268,7 @@ Unable to start a new chat session with [RECIPIENT].
   <notification
    icon="alertmodal.tga"
    name="ForceCloseChatterBoxSession"
-   type="alertmodal">
+   type="notifytip">
 Your chat session with [NAME] must close.
 [REASON]
     <usetemplate

From c65b659538230372cde2f96c41b644fd0a7d6845 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Mon, 23 Jul 2012 10:50:05 +0200
Subject: [PATCH 084/199] Dirty potential mesh crash fix

---
 indra/newview/llvovolume.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index d8b34bd30..a72733f91 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3084,6 +3084,11 @@ void LLRiggedVolume::update(const LLMeshSkinInfo* skin, LLVOAvatar* avatar, cons
 		
 		LLVector4a* weight = vol_face.mWeights;
 
+		if(!weight)
+		{
+			continue;
+		}
+
 		LLMatrix4a bind_shape_matrix;
 		bind_shape_matrix.loadu(skin->mBindShapeMatrix);
 

From 1ad4597d7a19e841638d59074aa079b54af2873f Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Mon, 23 Jul 2012 12:00:33 +0200
Subject: [PATCH 085/199] Fix alpha flicker when Show Updates is enabled

---
 indra/newview/llvovolume.cpp | 2 +-
 indra/newview/pipeline.cpp   | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index a72733f91..b785f22f5 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -2390,7 +2390,7 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const
 		produces_light = 1;
 	}
 
-	for (S32 i = 0; i < num_faces; ++i)
+	for (U32 i = 0; i < num_faces; ++i)
 	{
 		const LLFace* face = drawablep->getFace(i);
 		if (!face) continue;
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index d5f4d1561..f2b0642e1 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -4251,6 +4251,12 @@ void LLPipeline::renderDebug()
 		gGL.end();
 		gGL.flush();
 		glPointSize(1.f);
+
+		if (LLGLSLShader::sNoFixedFunction)
+		{
+			gUIProgram.unbind();
+		}
+
 	}
 
 	if(!mRenderDebugMask)

From 89be317a0045105d8e22e486f822139dbded055d Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Mon, 23 Jul 2012 14:18:45 +0200
Subject: [PATCH 086/199] Fix measurement tool

---
 indra/newview/llagent.cpp      |  3 --
 indra/newview/llagent.h        |  3 --
 indra/newview/llviewermenu.cpp | 61 +++++++++++++++-------------------
 3 files changed, 27 insertions(+), 40 deletions(-)

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index ac99480f0..1d8b429ba 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -135,9 +135,6 @@ LLVector3 gReSitOffset;
 
 BOOL LLAgent::exlPhantom = 0;
 BOOL LLAgent::mForceTPose = 0;
-LLVector3 LLAgent::exlStartMeasurePoint = LLVector3::zero;
-LLVector3 LLAgent::exlEndMeasurePoint = LLVector3::zero;
-
 
 const F32 LLAgent::TYPING_TIMEOUT_SECS = 5.f;
 
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h
index bdb616695..82513766e 100644
--- a/indra/newview/llagent.h
+++ b/indra/newview/llagent.h
@@ -255,9 +255,6 @@ public:
 	SHLureRequest *mPendingLure;
 	void showLureDestination(const std::string fromname, const int global_x, const int global_y, const int x, const int y, const int z, const std::string maturity);
 	void onFoundLureDestination(LLSimInfo *siminfo = NULL);
-
-	static LLVector3 exlStartMeasurePoint;
-	static LLVector3 exlEndMeasurePoint;
 	// </edit>
 	
 private:
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 0135e4d1d..c359a356d 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -2683,44 +2683,37 @@ class LLObjectMeasure : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
-		if(object)
+		static LLVector3 startMeasurePoint = LLVector3::zero;
+		static bool startpoint_set = false;
+
+		LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
+		if(!object)
+			return false;
+
+		LLVector3 position = object->getPositionEdit();
+
+		LLChat chat;
+		chat.mSourceType = CHAT_SOURCE_SYSTEM;
+
+		if (!startpoint_set)
 		{
-			LLChat chat;
-			chat.mSourceType = CHAT_SOURCE_SYSTEM;
-			
-			if (LLAgent::exlStartMeasurePoint.isExactlyZero())
-			{
-				LLAgent::exlStartMeasurePoint = object->getPosition();
+			startMeasurePoint = position;
+			startpoint_set = true;
 
-				chat.mText = llformat("Start point set");
-				LLFloaterChat::addChat(chat);
-			}
-			else if (LLAgent::exlEndMeasurePoint.isExactlyZero())
-			{
-				LLAgent::exlEndMeasurePoint = object->getPosition();
-
-				chat.mText = llformat("End point set");
-				LLFloaterChat::addChat(chat);
-			}
-			else
-			{
-				LLAgent::exlStartMeasurePoint = LLVector3::zero;
-				LLAgent::exlEndMeasurePoint = LLVector3::zero;
-				return false;
-			}
-
-			if (!LLAgent::exlStartMeasurePoint.isExactlyZero() && !LLAgent::exlEndMeasurePoint.isExactlyZero())
-			{
-				F32 fdist = dist_vec(LLAgent::exlStartMeasurePoint, LLAgent::exlEndMeasurePoint);
-				LLAgent::exlStartMeasurePoint = LLVector3::zero;
-				LLAgent::exlEndMeasurePoint = LLVector3::zero;
-
-				chat.mText = llformat("Distance: %fm", fdist);
-				LLFloaterChat::addChat(chat);
-			}
+			chat.mText = llformat("Start point set");
+			LLFloaterChat::addChat(chat);
 		}
+		else
+		{
+			chat.mText = llformat("End point set");
+			LLFloaterChat::addChat(chat);
 
+			F32 fdist = dist_vec(startMeasurePoint, position);
+
+			chat.mText = llformat("Distance: %fm", fdist);
+			LLFloaterChat::addChat(chat);
+			startpoint_set = false;
+		}
 		return true;
 	}
 };

From 21f61748460223dc942bfdc1076b621e5ed5692c Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Tue, 24 Jul 2012 11:27:23 -0500
Subject: [PATCH 087/199] Use glFramebufferTexture2D to detach textures from
 FBOs before said textures are 'deleted'(set to NULL via zeroing dimensions).
 May avoid odd LLImageGL::deleteTextures crash on some apple systems.

---
 indra/llrender/llrendertarget.cpp | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp
index 589c0dc0d..93aaf0510 100644
--- a/indra/llrender/llrendertarget.cpp
+++ b/indra/llrender/llrendertarget.cpp
@@ -308,6 +308,8 @@ void LLRenderTarget::release()
 		}
 		else
 		{
+			//Release before delete.
+			glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, LLTexUnit::getInternalType(mUsage), 0, 0);
 			LLImageGL::deleteTextures(mUsage, 0, 0, 1, &mDepth, true);
 			stop_glerror();
 		}
@@ -339,6 +341,9 @@ void LLRenderTarget::release()
 
 	if (mTex.size() > 0)
 	{
+		//Release before delete.
+		for (U32 i = 0; i < mTex.size(); ++i)
+			glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0+i, LLTexUnit::getInternalType(mUsage), 0, 0);
 		sBytesAllocated -= mResX*mResY*4*mTex.size();
 		LLImageGL::deleteTextures(mUsage, mInternalFormat[0], 0, mTex.size(), &mTex[0], true);
 		mTex.clear();
@@ -490,10 +495,21 @@ void LLRenderTarget::flush(bool fetch_depth)
 			}
 			stop_glerror();		
 
+			//Following case never currently evalutes true, but it's still good to have.
 			if (mTex.size() > 1)
-			{		
+			{
 				for (U32 i = 1; i < mTex.size(); ++i)
 				{
+					glDrawBuffer(GL_COLOR_ATTACHMENT0 + i);
+					glReadBuffer(GL_COLOR_ATTACHMENT0 + i);
+					stop_glerror();
+					glBlitFramebuffer(0, 0, mResX, mResY, 0, 0, mResX, mResY, GL_COLOR_BUFFER_BIT, GL_NEAREST);
+					stop_glerror();
+				}
+
+				/*for (U32 i = 1; i < mTex.size(); ++i)
+				{
+
 					glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
 										LLTexUnit::getInternalType(mUsage), mTex[i], 0);
 					stop_glerror();
@@ -510,7 +526,7 @@ void LLRenderTarget::flush(bool fetch_depth)
 					stop_glerror();
 					glFramebufferRenderbuffer(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0+i, GL_RENDERBUFFER, mSampleBuffer->mTex[i]);
 					stop_glerror();
-				}
+				}*/
 			}
 			glBindFramebuffer(GL_FRAMEBUFFER, 0);
 		}

From eeea2b4de481c2ff5669f8c7b24cb945f1f6ddd9 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Tue, 24 Jul 2012 20:18:35 -0500
Subject: [PATCH 088/199] Don't batch faces that are animating, ever
 (hopefully). Should fix texture animations breaking when
 rendermaxtextureindex > 1

---
 indra/newview/llvovolume.cpp | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index ba9b6c994..6773e9fd3 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -4165,11 +4165,16 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std::
 				facep->setTextureIndex(cur_tex);
 				texture_list.push_back(tex);
 
-				//if (can_batch_texture(facep))
+				if (can_batch_texture(facep))
 				{
 					while (i != faces.end())
 					{
 						facep = *i;
+						if (!can_batch_texture(facep))
+						{ //face is bump mapped or has an animated texture matrix -- can't 
+							//batch more than 1 texture at a time
+							break;
+						}
 						if (facep->getTexture() != tex)
 						{
 							if (distance_sort)
@@ -4195,12 +4200,6 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std::
 								cur_tex++;
 							}
 
-							if (!can_batch_texture(facep))
-							{ //face is bump mapped or has an animated texture matrix -- can't 
-								//batch more than 1 texture at a time
-								break;
-							}
-
 							if (cur_tex >= texture_index_channels)
 							{ //cut batches when index channels are depleted
 								break;
@@ -4222,9 +4221,8 @@ void LLVolumeGeometryManager::genDrawInfo(LLSpatialGroup* group, U32 mask, std::
 
 						facep->setTextureIndex(cur_tex);
 					}
+					tex = texture_list[0];
 				}
-
-				tex = texture_list[0];
 			}
 			else
 			{

From 3190814265ac7b38eb4aedbe1a8d006c0f13135b Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 25 Jul 2012 09:03:41 -0400
Subject: [PATCH 089/199] Made AntiSpam better

AntiSpamNotify setting to turn off notifications, which seemed to become a new form of spam, otherwise.
Add tool_tips to UI explaining how to make the system less sensitive.
Made defaults for antispam a lot less sensitive, so users used to the old antispam defaults won't likely need to configure the new panel.
Pull in license from NaCl... (Why wasn't it already there, Ruby?!)
Fixed spaces being where tabs should be...
Added in selective Dialog disabling, instead of just all, nice little feature in itself.
Potentially fixed a bug where sounds would be blocked when they shouldn't be... but, if this still happens, I'll put in a debug setting to disable sound antispam.
---
 indra/newview/NACLantispam.cpp                |  19 +-
 indra/newview/NACLantispam.h                  |  18 +-
 indra/newview/app_settings/settings.xml       | 106 +++++++-
 indra/newview/ascentprefschat.cpp             |  42 ++++
 indra/newview/ascentprefschat.h               |   9 +
 indra/newview/llviewermessage.cpp             | 227 +++++++++---------
 .../en-us/panel_preferences_ascent_chat.xml   |  25 +-
 7 files changed, 311 insertions(+), 135 deletions(-)

diff --git a/indra/newview/NACLantispam.cpp b/indra/newview/NACLantispam.cpp
index 95aad581b..aac555a50 100644
--- a/indra/newview/NACLantispam.cpp
+++ b/indra/newview/NACLantispam.cpp
@@ -1,3 +1,18 @@
+/* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ *                   Version 2, December 2004
+ *
+ * Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+ *
+ * Everyone is permitted to copy and distribute verbatim or modified
+ * copies of this license document, and changing it is allowed as long
+ * as the name is changed.
+ *
+ *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ *
+ *  0. You just DO WHAT THE FUCK YOU WANT TO.
+ */
+
 #include "llviewerprecompiledheaders.h"
 #include "NACLantispam.h"
 #include "llviewercontrol.h"
@@ -263,7 +278,7 @@ void NACLAntiSpamRegistry::blockGlobalEntry(LLUUID& source)
 	}
 	globalEntries[source.asString()]->setBlocked();
 }
-bool NACLAntiSpamRegistry::checkQueue(U32 name, LLUUID& source, U32 multiplier, bool silent)
+bool NACLAntiSpamRegistry::checkQueue(U32 name, LLUUID& source, U32 multiplier)
 {
 	if(source.isNull()) return false;
 	if(gAgent.getID() == source) return false;
@@ -295,7 +310,7 @@ bool NACLAntiSpamRegistry::checkQueue(U32 name, LLUUID& source, U32 multiplier,
 	}
 	else
 	{
-		if(!silent)
+		if(gSavedSettings.getBOOL("AntiSpamNotify"))
 		{
 		LLSD args;
 		args["MESSAGE"] = std::string(getQueueName(name))+": Blocked object "+source.asString();
diff --git a/indra/newview/NACLantispam.h b/indra/newview/NACLantispam.h
index 2f65fc423..6da32f5c1 100644
--- a/indra/newview/NACLantispam.h
+++ b/indra/newview/NACLantispam.h
@@ -1,3 +1,18 @@
+/* DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ *                   Version 2, December 2004
+ *
+ * Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+ *
+ * Everyone is permitted to copy and distribute verbatim or modified
+ * copies of this license document, and changing it is allowed as long
+ * as the name is changed.
+ *
+ *            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ *   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ *
+ *  0. You just DO WHAT THE FUCK YOU WANT TO.
+ */
+
 #ifndef NACLANTISPAM_H
 #define NACLANTISPAM_H
 #include <boost/tr1/unordered_map.hpp>
@@ -48,7 +63,7 @@ public:
 	static void setRegisteredQueueAmount(U32 name,U32 amount);
 	static void setAllQueueTimes(U32 amount);
 	static void setAllQueueAmounts(U32 time);
-	static bool checkQueue(U32 name, LLUUID& source, U32 multiplier=1, bool silent=false);
+	static bool checkQueue(U32 name, LLUUID& source, U32 multiplier=1);
 	static bool handleNaclAntiSpamGlobalQueueChanged(const LLSD& newvalue);
 	static bool handleNaclAntiSpamTimeChanged(const LLSD& newvalue);
 	static bool handleNaclAntiSpamAmountChanged(const LLSD& newvalue);
@@ -86,7 +101,6 @@ private:
 	static void blockGlobalEntry(LLUUID& source);
 };
 
-
 extern const std::string COLLISION_SOUNDS[];
 extern const int COLLISION_SOUNDS_SIZE;
 
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 54f1e1402..92f6f1eaf 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -894,7 +894,95 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-	<key>_NACL_Antispam</key>
+    <key>AntiSpamAlerts</key>
+    <map>
+      <key>Comment</key>
+      <string>When true, dialogs from alerts will be blocked.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>AntiSpamFriendshipOffers</key>
+    <map>
+      <key>Comment</key>
+      <string>When true, dialogs from friendship requests will be blocked.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>AntiSpamGroupInvites</key>
+    <map>
+      <key>Comment</key>
+      <string>When true, dialogs from group invites will be blocked.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>AntiSpamGroupNotices</key>
+    <map>
+      <key>Comment</key>
+      <string>When true, dialogs from group notices will be blocked.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>AntiSpamItemOffers</key>
+    <map>
+      <key>Comment</key>
+      <string>When true, dialogs from inventory item offers will be blocked.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>AntiSpamNotify</key>
+    <map>
+      <key>Comment</key>
+      <string>When true, notifications will appear any time a spamtype is blocked.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
+    <key>AntiSpamScripts</key>
+    <map>
+      <key>Comment</key>
+      <string>When true, dialogs from scripts, including script-driven teleports and questions, and other interactive script stuff, will be blocked.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>AntiSpamTeleports</key>
+    <map>
+      <key>Comment</key>
+      <string>When true, dialogs from teleport requests from other residents will be blocked.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
+    <key>_NACL_Antispam</key>
     <map>
       <key>Comment</key>
       <string>When true, all dialogs will be blocked, resets on restart.</string>
@@ -908,7 +996,7 @@
     <key>_NACL_AntiSpamGlobalQueue</key>
     <map>
         <key>Comment</key>
-        <string> </string>
+        <string>Collect spamtypes together, instead of individually counting them</string>
         <key>Persist</key>
         <integer>1</integer>
         <key>Type</key>
@@ -919,24 +1007,24 @@
     <key>_NACL_AntiSpamTime</key>
     <map>
         <key>Comment</key>
-        <string> </string>
+        <string>Time in seconds for spamtype to accumulate the _NACL_AntiSpamAmount and be blocked</string>
         <key>Persist</key>
         <integer>1</integer>
         <key>Type</key>
         <string>U32</string>
         <key>Value</key>
-        <integer>2</integer>
+        <integer>1</integer>
     </map>
         <key>_NACL_AntiSpamAmount</key>
         <map>
         <key>Comment</key>
-        <string> </string>
+        <string>Amount of spamtype to be reached before the blocking will occur.</string>
         <key>Persist</key>
         <integer>1</integer>
         <key>Type</key>
         <string>U32</string>
         <key>Value</key>
-        <integer>10</integer>
+        <integer>30</integer>
     </map>
         <key>_NACL_AntiSpamSoundMulti</key>
         <map>
@@ -947,7 +1035,7 @@
         <key>Type</key>
         <string>U32</string>
         <key>Value</key>
-        <integer>4</integer>
+        <integer>20</integer>
     </map>
         <key>_NACL_AntiSpamNewlines</key>
         <map>
@@ -958,7 +1046,7 @@
         <key>Type</key>
         <string>U32</string>
         <key>Value</key>
-        <integer>30</integer>
+        <integer>20</integer>
     </map>
     <key>_NACL_AntiSpamSoundPreloadMulti</key>
     <map>
@@ -969,7 +1057,7 @@
         <key>Type</key>
         <string>U32</string>
         <key>Value</key>
-        <integer>4</integer>
+        <integer>20</integer>
     </map>
     <!-- Vanilla SL settings that are now optionally Account-Specific -->
     <key>AgentChatColor</key>
diff --git a/indra/newview/ascentprefschat.cpp b/indra/newview/ascentprefschat.cpp
index 29e5d3ff0..77bc6611e 100644
--- a/indra/newview/ascentprefschat.cpp
+++ b/indra/newview/ascentprefschat.cpp
@@ -95,6 +95,7 @@ LLPrefsAscentChat::LLPrefsAscentChat()
 
 	childSetEnabled("reset_antispam", started);
 	childSetCommitCallback("reset_antispam", onCommitResetAS, this);
+	childSetCommitCallback("antispam_checkbox", onCommitDialogBlock, this);
 
     childSetCommitCallback("KeywordsOn", onCommitKeywords, this);
     childSetCommitCallback("KeywordsList", onCommitKeywords, this);
@@ -248,6 +249,21 @@ void LLPrefsAscentChat::onCommitResetAS(LLUICtrl*, void*)
 	NACLAntiSpamRegistry::purgeAllQueues();
 }
 
+//static
+void LLPrefsAscentChat::onCommitDialogBlock(LLUICtrl* ctrl, void* user_data)
+{
+	LLPrefsAscentChat* self = (LLPrefsAscentChat*)user_data;
+	bool enabled = ctrl->getValue().asBoolean();
+	self->childSetEnabled("Block All Dialogs From", !enabled);
+	self->childSetEnabled("Alerts",                 !enabled);
+	self->childSetEnabled("Friendship Offers",      !enabled);
+	self->childSetEnabled("Group Invites",          !enabled);
+	self->childSetEnabled("Group Notices",          !enabled);
+	self->childSetEnabled("Item Offers",            !enabled);
+	self->childSetEnabled("Scripts",                !enabled);
+	self->childSetEnabled("Teleport Offers",        !enabled);
+}
+
 //static
 void LLPrefsAscentChat::onCommitKeywords(LLUICtrl* ctrl, void* user_data)
 {
@@ -331,6 +347,14 @@ void LLPrefsAscentChat::refreshValues()
     mChatSpamCount                  = gSavedSettings.getU32("_NACL_AntiSpamAmount");
     mChatSpamTime                   = gSavedSettings.getU32("_NACL_AntiSpamTime");
     mBlockDialogSpam                = gSavedSettings.getBOOL("_NACL_Antispam");
+    mBlockAlertSpam                 = gSavedSettings.getBOOL("AntiSpamAlerts");
+    mBlockFriendSpam                = gSavedSettings.getBOOL("AntiSpamFriendshipOffers");
+    mBlockGroupInviteSpam           = gSavedSettings.getBOOL("AntiSpamGroupInvites");
+    mBlockGroupNoticeSpam           = gSavedSettings.getBOOL("AntiSpamGroupNotices");
+    mBlockItemOfferSpam             = gSavedSettings.getBOOL("AntiSpamItemOffers");
+    mBlockScriptSpam                = gSavedSettings.getBOOL("AntiSpamScripts");
+    mBlockTeleportSpam              = gSavedSettings.getBOOL("AntiSpamTeleports");
+    mNotifyOnSpam                   = gSavedSettings.getBOOL("AntiSpamNotify");
     mSoundMulti                     = gSavedSettings.getU32("_NACL_AntiSpamSoundMulti");
     mNewLines                       = gSavedSettings.getU32("_NACL_AntiSpamNewlines");
     mPreloadMulti                   = gSavedSettings.getU32("_NACL_AntiSpamSoundPreloadMulti");
@@ -378,6 +402,16 @@ void LLPrefsAscentChat::refresh()
     LLWStringUtil::replaceChar(auto_response, '%', ' ');
     childSetText("im_response", wstring_to_utf8str(auto_response));
 
+    //Antispam ------------------------------------------------------------------------
+	childSetEnabled("Block All Dialogs From", !mBlockDialogSpam);
+	childSetEnabled("Alerts",                 !mBlockDialogSpam);
+	childSetEnabled("Friendship Offers",      !mBlockDialogSpam);
+	childSetEnabled("Group Invites",          !mBlockDialogSpam);
+	childSetEnabled("Group Notices",          !mBlockDialogSpam);
+	childSetEnabled("Item Offers",            !mBlockDialogSpam);
+	childSetEnabled("Scripts",                !mBlockDialogSpam);
+	childSetEnabled("Teleport Offers",        !mBlockDialogSpam);
+
     //Text Options ------------------------------------------------------------------------
     combo = getChild<LLComboBox>("SpellBase");
 
@@ -518,6 +552,14 @@ void LLPrefsAscentChat::cancel()
     gSavedSettings.setU32("_NACL_AntiSpamAmount",            mChatSpamCount);
     gSavedSettings.setU32("_NACL_AntiSpamTime",              mChatSpamTime);
     gSavedSettings.setBOOL("_NACL_Antispam",                 mBlockDialogSpam);
+	gSavedSettings.setBOOL("AntiSpamAlerts",                 mBlockAlertSpam);
+	gSavedSettings.setBOOL("AntiSpamFriendshipOffers",       mBlockFriendSpam);
+	gSavedSettings.setBOOL("AntiSpamGroupNotices",           mBlockGroupNoticeSpam);
+	gSavedSettings.setBOOL("AntiSpamGroupInvites",           mBlockGroupInviteSpam);
+	gSavedSettings.setBOOL("AntiSpamItemOffers",             mBlockItemOfferSpam);
+	gSavedSettings.setBOOL("AntiSpamScripts",                mBlockScriptSpam);
+	gSavedSettings.setBOOL("AntiSpamTeleports",              mBlockTeleportSpam);
+	gSavedSettings.setBOOL("AntiSpamNotify",                 mNotifyOnSpam);
     gSavedSettings.setU32("_NACL_AntiSpamSoundMulti",        mSoundMulti);
     gSavedSettings.setU32("_NACL_AntiSpamNewlines",          mNewLines);
     gSavedSettings.setU32("_NACL_AntiSpamSoundPreloadMulti", mPreloadMulti);
diff --git a/indra/newview/ascentprefschat.h b/indra/newview/ascentprefschat.h
index d83b5b2d9..936646164 100644
--- a/indra/newview/ascentprefschat.h
+++ b/indra/newview/ascentprefschat.h
@@ -57,6 +57,7 @@ protected:
     static void onCommitTimeDate(LLUICtrl* ctrl, void *userdata);
     static void onCommitAutoResponse(LLUICtrl* ctrl, void* user_data);
 	static void onCommitResetAS(LLUICtrl*,void*);
+	static void onCommitDialogBlock(LLUICtrl*, void*);
     static void onCommitKeywords(LLUICtrl* ctrl, void* user_data);
 
     //Chat/IM -----------------------------------------------------------------------------
@@ -89,6 +90,14 @@ protected:
     U32  mChatSpamCount;
     U32  mChatSpamTime;
     BOOL mBlockDialogSpam;
+    BOOL mBlockAlertSpam;
+    BOOL mBlockFriendSpam;
+    BOOL mBlockGroupNoticeSpam;
+    BOOL mBlockGroupInviteSpam;
+    BOOL mBlockItemOfferSpam;
+    BOOL mBlockScriptSpam;
+    BOOL mBlockTeleportSpam;
+    BOOL mNotifyOnSpam;
     BOOL mSoundMulti;
     U32  mNewLines;
     U32  mPreloadMulti;
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index f4f21f113..414c4bff2 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1638,7 +1638,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 
 void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
 {
-	//Until throttling is implmented, busy mode should reject inventory instead of silently
+	//Until throttling is implemented, busy mode should reject inventory instead of silently
 	//accepting it.  SEE SL-39554
 	if (gAgent.getBusy())
 	{
@@ -1648,7 +1648,7 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
 
 	// NaCl - Antispam Registry
 	static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
-	if(antispam || NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_INVENTORY,info->mFromID))
+	if(antispam || gSavedSettings.getBOOL("AntiSpamItemOffers") || NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_INVENTORY,info->mFromID))
 		return;
 	// NaCl End
 	//If muted, don't even go through the messaging stuff.  Just curtail the offer here.
@@ -1933,24 +1933,27 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	//msg->getData("MessageBlock", "Count",		&count);
 	msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_FromAgentName, name);
 	msg->getStringFast(_PREHASH_MessageBlock, _PREHASH_Message,		message);
-    // NaCl - Newline flood protection
-    LLViewerObject* obj=gObjectList.findObject(from_id);
-    if(!from_id.isNull() //Not from nothing.
-    && gAgent.getID() != from_id //Not from self.
-    && !(obj && obj->permYouOwner())) //Not from own object.
-    {
-        static LLCachedControl<U32> SpamNewlines(gSavedSettings,"_NACL_AntiSpamNewlines");
-        boost::sregex_iterator iter(message.begin(), message.end(), NEWLINES);
-        if((U32)std::abs(std::distance(iter, boost::sregex_iterator())) > SpamNewlines)
-        {
-            NACLAntiSpamRegistry::blockOnQueue((U32)NACLAntiSpamRegistry::QUEUE_IM,from_id);
-            LLSD args;
-            args["MESSAGE"] = "Message: Blocked newline flood from "+from_id.asString();
-            LLNotificationsUtil::add("SystemMessageTip", args);
-            return;
-        }
-    }
-    // NaCl End
+	// NaCl - Newline flood protection
+	LLViewerObject* obj=gObjectList.findObject(from_id);
+	if(!from_id.isNull() //Not from nothing.
+	&& gAgent.getID() != from_id //Not from self.
+	&& !(obj && obj->permYouOwner())) //Not from own object.
+	{
+		static LLCachedControl<U32> SpamNewlines(gSavedSettings,"_NACL_AntiSpamNewlines");
+		boost::sregex_iterator iter(message.begin(), message.end(), NEWLINES);
+		if((U32)std::abs(std::distance(iter, boost::sregex_iterator())) > SpamNewlines)
+		{
+			NACLAntiSpamRegistry::blockOnQueue((U32)NACLAntiSpamRegistry::QUEUE_IM,from_id);
+			if(gSavedSettings.getBOOL("AntiSpamNotify"))
+			{
+				LLSD args;
+				args["MESSAGE"] = "Message: Blocked newline flood from "+from_id.asString();
+				LLNotificationsUtil::add("SystemMessageTip", args);
+			}
+			return;
+		}
+	}
+	// NaCl End
 	msg->getU32Fast(_PREHASH_MessageBlock, _PREHASH_ParentEstateID, parent_estate_id);
 	msg->getUUIDFast(_PREHASH_MessageBlock, _PREHASH_RegionID, region_id);
 	msg->getVector3Fast(_PREHASH_MessageBlock, _PREHASH_Position, position);
@@ -1959,10 +1962,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	EInstantMessage dialog = (EInstantMessage)d;
 
 	// NaCl - Antispam Registry
-    if((dialog != IM_TYPING_START && dialog != IM_TYPING_STOP)
-    && NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_IM,from_id))
-        return;
-    // NaCl End
+	if((dialog != IM_TYPING_START && dialog != IM_TYPING_STOP)
+	&& NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_IM,from_id))
+		return;
+	// NaCl End
 
     // make sure that we don't have an empty or all-whitespace name
 	LLStringUtil::trim(name);
@@ -2427,7 +2430,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	case IM_GROUP_NOTICE_REQUESTED:
 		{
 			// NaCl - Antispam
-			if(antispam)
+			if(antispam || gSavedSettings.getBOOL("AntiSpamGroupNotices"))
 				return;
 			// NaCl End
 			LL_INFOS("Messaging") << "Received IM_GROUP_NOTICE message." << LL_ENDL;
@@ -2526,7 +2529,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	case IM_GROUP_INVITATION:
 		{
 			// NaCl - Antispam
-			if(antispam)
+			if(antispam || gSavedSettings.getBOOL("AntiSpamGroupInvites"))
 				return;
 			// NaCl End
 			//if (!is_linden && (is_busy || is_muted))
@@ -2574,7 +2577,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		// Someone has offered us some inventory.
 		{
 			// NaCl - Antispam
-			if(antispam)
+			if(antispam || gSavedSettings.getBOOL("AntiSpamItemOffers"))
 				return;
 			// NaCl End
 			LLOfferInfo* info = new LLOfferInfo;
@@ -2829,10 +2832,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		}
 		break;
 	case IM_FROM_TASK_AS_ALERT:
-			// NaCl - Antispam
-			if(antispam)
-				return;
-			// NaCl End
+		// NaCl - Antispam
+		if(antispam || (!is_owned_by_me &&  gSavedSettings.getBOOL("AntiSpamAlerts")))
+			return;
+		// NaCl End
 		if (is_busy && !is_owned_by_me)
 		{
 			return;
@@ -2870,7 +2873,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		
 	case IM_LURE_USER:
 		{
-			if(antispam)	return; //NaCl Antispam
+			if(antispam || gSavedSettings.getBOOL("AntiSpamTeleports"))	return; //NaCl Antispam
 // [RLVa:KB] - Checked: 2010-12-11 (RLVa-1.2.2c) | Added: RLVa-1.2.2c
 			// If the lure sender is a specific @accepttp exception they will override muted and busy status
 			bool fRlvSummon = (rlv_handler_t::isEnabled()) && (gRlvHandler.isException(RLV_BHVR_ACCEPTTP, from_id));
@@ -3011,10 +3014,6 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 
 	case IM_GOTO_URL:
 		{
-			// NaCl - Antispam
-			if(antispam)
-				return;
-			// NaCl End
 			LLSD args;
 			// n.b. this is for URLs sent by the system, not for
 			// URLs sent by scripts (i.e. llLoadURL)
@@ -3040,7 +3039,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	case IM_FRIENDSHIP_OFFERED:
 		{
 			// NaCl - Antispam
-			if(antispam)
+			if(antispam || gSavedSettings.getBOOL("AntiSpamFriendshipOffers"))
 				return;
 			// NaCl End
 			LLSD payload;
@@ -3179,7 +3178,7 @@ void process_offer_callingcard(LLMessageSystem* msg, void**)
 {
 	// NaCl - Antispam
 	static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
-	if(antispam)
+	if(antispam || gSavedSettings.getBOOL("AntiSpamFriendshipOffers"))
 		return;
 	// NaCl End
 	// someone has offered to form a friendship
@@ -3189,9 +3188,9 @@ void process_offer_callingcard(LLMessageSystem* msg, void**)
 	msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, source_id);
 
 	// NaCl - Antispam Registry
-    if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_CALLING_CARD,source_id))
-        return;
-    // NaCl End
+	if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_CALLING_CARD,source_id))
+		return;
+	// NaCl End
 
 	LLUUID tid;
 	msg->getUUIDFast(_PREHASH_AgentBlock, _PREHASH_TransactionID, tid);
@@ -3379,13 +3378,12 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 	msg->getU8("ChatData", "ChatType", type_temp);
 	chat.mChatType = (EChatType)type_temp;
 
-
-    // NaCL - Antispam Registry
-    if((chat.mChatType != CHAT_TYPE_START && chat.mChatType != CHAT_TYPE_STOP)    //Chat type isn't typing
-    &&((owner_id.isNull() && NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_CHAT,from_id))    //Spam from an object?
-    ||(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_CHAT,owner_id))))    //Spam from a resident?
-        return;
-    // NaCl End
+	// NaCL - Antispam Registry
+	if((chat.mChatType != CHAT_TYPE_START && chat.mChatType != CHAT_TYPE_STOP)	//Chat type isn't typing
+	&&((owner_id.isNull() && NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_CHAT,from_id))	//Spam from an object?
+	||(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_CHAT,owner_id))))	//Spam from a resident?
+		return;
+	// NaCl End
 
 	msg->getU8Fast(_PREHASH_ChatData, _PREHASH_Audible, audible_temp);
 	chat.mAudible = (EChatAudible)audible_temp;
@@ -3507,23 +3505,26 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 		msg->getStringFast(_PREHASH_ChatData, _PREHASH_Message, mesg);
 
 		// NaCl - Newline flood protection
-        LLViewerObject* obj=gObjectList.findObject(from_id);
-        if(!(from_id.isNull())    //Not from nothing.
-        || !(gAgent.getID() != from_id)    //Not from self.
-        || !(obj && obj->permYouOwner()))    //Not from own object.
-        {
-            static LLCachedControl<U32> SpamNewlines(gSavedSettings,"_NACL_AntiSpamNewlines");
-            boost::sregex_iterator iter(mesg.begin(), mesg.end(), NEWLINES);
-            if((U32)std::abs(std::distance(iter, boost::sregex_iterator())) > SpamNewlines)
-            {
-                NACLAntiSpamRegistry::blockOnQueue((U32)NACLAntiSpamRegistry::QUEUE_CHAT,owner_id);
-                LLSD args;
-                args["MESSAGE"] = "Chat: Blocked newline flood from "+owner_id.asString();
-                LLNotificationsUtil::add("SystemMessageTip", args);
-                return;
-            }
-        }
-        // NaCl End
+		LLViewerObject* obj=gObjectList.findObject(from_id);
+		if(!(from_id.isNull())	//Not from nothing.
+		|| !(gAgent.getID() != from_id)	//Not from self.
+		|| !(obj && obj->permYouOwner()))	//Not from own object.
+		{
+			static LLCachedControl<U32> SpamNewlines(gSavedSettings,"_NACL_AntiSpamNewlines");
+			boost::sregex_iterator iter(mesg.begin(), mesg.end(), NEWLINES);
+			if((U32)std::abs(std::distance(iter, boost::sregex_iterator())) > SpamNewlines)
+			{
+				NACLAntiSpamRegistry::blockOnQueue((U32)NACLAntiSpamRegistry::QUEUE_CHAT,owner_id);
+				if(gSavedSettings.getBOOL("AntiSpamNotify"))
+				{
+					LLSD args;
+					args["MESSAGE"] = "Chat: Blocked newline flood from "+owner_id.asString();
+					LLNotificationsUtil::add("SystemMessageTip", args);
+				}
+				return;
+			}
+		}
+		// NaCl End
 		
 		static std::map<LLUUID, bool> sChatObjectAuth;
 
@@ -4850,19 +4851,18 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
 	msg->getUUIDFast(_PREHASH_SoundData, _PREHASH_ObjectID, object_id);
 
 	// NaCl - Antispam Registry
-	/*if(owner_id.isNull())
-	{*/
-	bool bDoSpamCheck=1;
-	std::string sSound=sound_id.asString();
- 	static LLCachedControl<U32> _NACL_AntiSpamSoundMulti(gSavedSettings,"_NACL_AntiSpamSoundMulti");
-	for(int i=0;i< COLLISION_SOUNDS_SIZE;i++)
-		if(COLLISION_SOUNDS[i] == sSound)
-			bDoSpamCheck=0;
+	static LLCachedControl<U32> _NACL_AntiSpamSoundMulti(gSavedSettings,"_NACL_AntiSpamSoundMulti");
+	if(owner_id.isNull())
+	{
+		bool bDoSpamCheck=1;
+		std::string sSound=sound_id.asString();
+		for(int i=0;i< COLLISION_SOUNDS_SIZE;i++)
+			if(COLLISION_SOUNDS[i] == sSound)
+				bDoSpamCheck=0;
 		if(bDoSpamCheck)
-			if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND,object_id, _NACL_AntiSpamSoundMulti,true)) return;
-	/*}
-	else
-		if(NACLAntiSpamRegistry::checkQueue("Soundspam",owner_id)) return;*/
+			if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND,object_id, _NACL_AntiSpamSoundMulti)) return;
+	}
+	else if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND,owner_id, _NACL_AntiSpamSoundMulti)) return;
 	// NaCl End
 
 	msg->getUUIDFast(_PREHASH_SoundData, _PREHASH_ParentID, parent_id);
@@ -4928,13 +4928,13 @@ void process_preload_sound(LLMessageSystem *msg, void **user_data)
 	msg->getUUIDFast(_PREHASH_DataBlock, _PREHASH_ObjectID, object_id);
 	msg->getUUIDFast(_PREHASH_DataBlock, _PREHASH_OwnerID, owner_id);
 
-    // NaCl - Antispam Registry
-    static LLCachedControl<U32> _NACL_AntiSpamSoundPreloadMulti(gSavedSettings,"_NACL_AntiSpamSoundPreloadMulti");
-    if((owner_id.isNull()
-    && NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND_PRELOAD,object_id,_NACL_AntiSpamSoundPreloadMulti))
-    || NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND_PRELOAD,owner_id,_NACL_AntiSpamSoundPreloadMulti))
-        return;
-    // NaCl End
+	// NaCl - Antispam Registry
+	static LLCachedControl<U32> _NACL_AntiSpamSoundPreloadMulti(gSavedSettings,"_NACL_AntiSpamSoundPreloadMulti");
+	if((owner_id.isNull()
+	&& NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND_PRELOAD,object_id,_NACL_AntiSpamSoundPreloadMulti))
+	|| NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND_PRELOAD,owner_id,_NACL_AntiSpamSoundPreloadMulti))
+		return;
+	// NaCl End
 
 	LLViewerObject *objectp = gObjectList.findObject(object_id);
 	if (!objectp) return;
@@ -4972,12 +4972,12 @@ void process_attached_sound(LLMessageSystem *msg, void **user_data)
 	msg->getUUIDFast(_PREHASH_DataBlock, _PREHASH_ObjectID, object_id);
 	msg->getUUIDFast(_PREHASH_DataBlock, _PREHASH_OwnerID, owner_id);
 
-    // NaCl - Antispam Registry
-    if(/*owner_id.isNull()
-    &&*/ NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND,object_id))
-    /*|| (NACLAntiSpamRegistry::checkQueue("Soundspam",owner_id))*/
-        return;
-    // NaCl End
+	// NaCl - Antispam Registry
+	if((owner_id.isNull()
+	&& NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND,object_id))
+	|| NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SOUND,owner_id))
+		return;
+	// NaCl End
 
 	msg->getF32Fast(_PREHASH_DataBlock, _PREHASH_Gain, gain);
 	msg->getU8Fast(_PREHASH_DataBlock, _PREHASH_Flags, flags);
@@ -6243,7 +6243,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
 {
 	// NaCl - Antispam
 	static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
-	if(antispam)
+	if(antispam || gSavedSettings.getBOOL("AntiSpamScripts"))
 		return;
 	// NaCl End
 	// *TODO: Translate owner name -> [FIRST] [LAST]
@@ -6261,12 +6261,12 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
 	// itemid -> script asset key of script requesting permissions
 	msg->getUUIDFast(_PREHASH_Data, _PREHASH_ItemID, itemid );
 
-    // NaCl - Antispam Registry
-    if((taskid.isNull()
-    &&  NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,itemid))
-    || NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,taskid))
-        return;
-    // NaCl End
+	// NaCl - Antispam Registry
+	if((taskid.isNull()
+	&&  NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,itemid))
+	|| NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,taskid))
+		return;
+	// NaCl End
 
 	msg->getStringFast(_PREHASH_Data, _PREHASH_ObjectName, object_name);
 	msg->getStringFast(_PREHASH_Data, _PREHASH_ObjectOwner, owner_name);
@@ -6928,7 +6928,7 @@ void process_script_dialog(LLMessageSystem* msg, void**)
 {
 	// NaCl - Antispam
 	static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
-	if(antispam)
+	if(antispam || gSavedSettings.getBOOL("AntiSpamScripts"))
 		return;
 	// NaCl End
 	S32 i;
@@ -6938,9 +6938,9 @@ void process_script_dialog(LLMessageSystem* msg, void**)
 	msg->getUUID("Data", "ObjectID", object_id);
 
 	// NaCl - Antispam Registry
-    if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,object_id))
-        return;
-    // NaCl End
+	if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,object_id))
+		return;
+	// NaCl End
 
 	//	For compability with OS grids first check for presence of extended packet before fetching data.
     LLUUID owner_id;
@@ -6948,11 +6948,10 @@ void process_script_dialog(LLMessageSystem* msg, void**)
 	{
     msg->getUUID("OwnerData", "OwnerID", owner_id);
 
-        // NaCl - Antispam Registry
-        if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,owner_id))
-            return;
-        // NaCl End
-
+	// NaCl - Antispam Registry
+	if(NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,owner_id))
+		return;
+	// NaCl End
 	}
 
 	if (LLMuteList::getInstance()->isMuted(object_id) || LLMuteList::getInstance()->isMuted(owner_id))
@@ -7110,7 +7109,7 @@ void process_load_url(LLMessageSystem* msg, void**)
 {
 	// NaCl - Antispam
 	static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
-	if(antispam)
+	if(antispam || gSavedSettings.getBOOL("AntiSpamScripts"))
 		return;
 	// NaCl End
 	LLUUID object_id;
@@ -7124,12 +7123,12 @@ void process_load_url(LLMessageSystem* msg, void**)
 	msg->getUUID(  "Data", "ObjectID", object_id);
 	msg->getUUID(  "Data", "OwnerID", owner_id);
 
-    // NaCl - Antispam Registry
-    if((owner_id.isNull()
-    &&  NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,object_id))
-    || NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,owner_id))
-        return;
-    // NaCl End
+	// NaCl - Antispam Registry
+	if((owner_id.isNull()
+	&&  NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,object_id))
+	|| NACLAntiSpamRegistry::checkQueue((U32)NACLAntiSpamRegistry::QUEUE_SCRIPT_DIALOG,owner_id))
+		return;
+	// NaCl End
 
 	msg->getBOOL(  "Data", "OwnerIsGroup", owner_is_group);
 	msg->getString("Data", "Message", 256, message);
@@ -7205,7 +7204,7 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
 {
 	// NaCl - Antispam
 	static LLCachedControl<bool> antispam(gSavedSettings,"_NACL_Antispam");
-	if(antispam)
+	if(antispam || gSavedSettings.getBOOL("AntiSpamScripts"))
 		return;
 	// NaCl End
 	if (!gSavedSettings.getBOOL("ScriptsCanShowUI")) return;
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
index 0d5167818..1680634f5 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
@@ -16,7 +16,7 @@
 		 <view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"
 		left="235" name="CmdDivisor" width="0"/>
 	  -->
-      <text bottom="-15" left="250" name="objects_link_text_box2" width="300">Chat:</text>
+      <text bottom="-15" left="250" name="objects_link_text_box2" width="300">Chat:</text>
       <check_box bottom_delta="-25" left_delta="-5" follows="left|top" control_name="PlayTypingSound" initial_value="true"
         label="Play the typing sound for local chat" tool_tip="Silences the chatting type sound, making it quieter for things like performances." name="play_typing_sound_check"/>
       <check_box bottom_delta="-20" follows="left|top" control_name="HideNotificationsInChat" initial_value="false"
@@ -25,7 +25,7 @@
         label="Allow MU pose method." tool_tip="Allows the use of both /me and : to perform emotes." name="allow_mu_pose_check"/>
       <check_box bottom_delta="-20" follows="left|top" control_name="AscentAutoCloseOOC"
         label="Auto-close OOC comments." tool_tip="Will automatically append '))' to any message starting with '((', or visa versa." name="close_ooc_check"/>
-      <text bottom_delta="-15" follows="left|top" name="objects_link_text_box3">Show links on chatting object names in chat history for:</text>
+      <text bottom_delta="-15" follows="left|top" name="objects_link_text_box3">Show links on chatting object names in chat history for:</text>
       <radio_group bottom_delta="-26" control_name="LinksForChattingObjects" tool_tip="Enables a link to show you the owner of the speaking object."
         follows="top" height="20" left="20" name="objects_link" width="350">
         <radio_item bottom_delta="0" left_delta="5" name="no_object" width="48">No object</radio_item>
@@ -70,12 +70,21 @@
     <panel border="true" left="1" bottom="-408" height="408" width="500" label="Spam" name="Spam">
       <check_box control_name="_NACL_AntiSpamGlobalQueue" label="No messagetype-specific spam queues" name="spammsg_checkbox" width="256" left="6"/>
       <button height="23" label="Reset antispam queues" label_selected="Reset antispam queues" name="reset_antispam" width="230" bottom_delta="0" left="260"/>
-      <spinner control_name="_NACL_AntiSpamTime" decimal_digits="0" increment="1" min_val="1" max_val="60" label="Antispam time(seconds):" label_width="330" name="antispamtime" width="390" left="10"/>
-      <spinner control_name="_NACL_AntiSpamAmount" decimal_digits="0" increment="1" min_val="5" max_val="100" label="Antispam amount:" label_width="330" name="antispamamount" width="390"/>
-      <spinner control_name="_NACL_AntiSpamSoundMulti" decimal_digits="0" increment="1" min_val="1" max_val="100" label="Amount multiplicatior for sound antispam:" label_width="330" left="10" name="antispamsoundmulti" width="390"/>
-      <spinner control_name="_NACL_AntiSpamSoundPreloadMulti" decimal_digits="0" increment="1" min_val="1" max_val="99999" label="Amount multiplicatior for sound preload antispam:" label_width="330" name="antispamsoundpreloadmulti" width="390"/>
-      <spinner control_name="_NACL_AntiSpamNewlines" decimal_digits="0" increment="1" min_val="5" max_val="99999" label="Amount of newlines to instablock message:" label_width="330" name="antispamnewlines" width="390"/>
-      <check_box control_name="_NACL_Antispam" height="16" label="Disable -all- dialogs (resets on login)" name="antispam_checkbox" left="6"/>
+      <spinner control_name="_NACL_AntiSpamTime" decimal_digits="0" increment="1" min_val="1" max_val="60" label="Antispam time(seconds):" label_width="330" tool_tip="Lower is less sensitive" name="antispamtime" width="390" left="10"/>
+      <spinner control_name="_NACL_AntiSpamAmount" decimal_digits="0" increment="1" min_val="5" max_val="99999" label="Antispam amount:" label_width="330" tool_tip="Higher is less sensitive" name="antispamamount" width="390"/>
+      <spinner control_name="_NACL_AntiSpamSoundMulti" decimal_digits="0" increment="1" min_val="1" max_val="99999" label="Amount multiplicatior for sound antispam:" label_width="330" tool_tip="Higher is less sensitive" left="10" name="antispamsoundmulti" width="390"/>
+      <spinner control_name="_NACL_AntiSpamSoundPreloadMulti" decimal_digits="0" increment="1" min_val="1" max_val="99999" label="Amount multiplicatior for sound preload antispam:" label_width="330" tool_tip="Higher is less sensitive" name="antispamsoundpreloadmulti" width="390"/>
+      <spinner control_name="_NACL_AntiSpamNewlines" decimal_digits="0" increment="1" min_val="5" max_val="99999" label="Amount of newlines to instablock message:" label_width="330" tool_tip="Higher is less sensitive" name="antispamnewlines" width="390"/>
+	  <check_box control_name="_NACL_Antispam" height="16" label="Disable -all- dialogs (resets on login)" name="antispam_checkbox" left="6"/>
+	  <text name="Block All Dialogs From" left="10">Block All Dialogs From</text>
+      <check_box control_name="AntiSpamAlerts" height="16" label="Alerts" name="Alerts" left="14"/>
+      <check_box control_name="AntiSpamFriendshipOffers" height="16" label="Friendship Offers" name="Friendship Offers" bottom_delta="0" left_delta="120"/>
+      <check_box control_name="AntiSpamGroupInvites" height="16" label="Group Invites" name="Group Invites" bottom_delta="0" left_delta="120"/>
+      <check_box control_name="AntiSpamGroupNotices" height="16" label="Group Notices" name="Group Notices" bottom_delta="0" left_delta="120"/>
+      <check_box control_name="AntiSpamItemOffers" height="16" label="Item Offers" name="Item Offers" left="14"/>
+      <check_box control_name="AntiSpamScripts" height="16" label="Scripts" name="Scripts" bottom_delta="0" left_delta="120"/>
+      <check_box control_name="AntiSpamTeleports" height="16" label="Teleport Offers" name="Teleport Offers" bottom_delta="0" left_delta="120"/>
+      <check_box control_name="AntiSpamNotify" height="16" label="Notify when spam is blocked" name="Notify On Spam" tool_tip="When enabled, the bottom right corner may become a source of pseudo-spam whenever real spam is blocked." left="6"/>
     </panel>
 
     <panel border="true" bottom="-580" height="525" label="Text Options" left="1" name="TextOptions" width="418">

From e116548b505ec7068d9ef283cf592e098a571645 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 25 Jul 2012 09:19:22 -0400
Subject: [PATCH 090/199] Allow more flexible perm controls, from item
 properties floater.

TODO: Bring these permission flexibilities into build floater's general tab.
---
 indra/newview/llfloaterproperties.cpp         | 83 ++++++++++---------
 .../floater_inventory_item_properties.xml     | 41 ++++++---
 2 files changed, 76 insertions(+), 48 deletions(-)

diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp
index c9c8e0482..3e279936f 100644
--- a/indra/newview/llfloaterproperties.cpp
+++ b/indra/newview/llfloaterproperties.cpp
@@ -197,9 +197,12 @@ LLFloaterProperties::LLFloaterProperties(const std::string& name, const LLRect&
 	// owner permissions
 	// Permissions debug text
 	// group permissions
-	childSetCommitCallback("CheckShareWithGroup",&onCommitPermissions, this);
+	childSetCommitCallback("CheckGroupCopy",&onCommitPermissions, this);
+	childSetCommitCallback("CheckGroupMod",&onCommitPermissions, this);
+	childSetCommitCallback("CheckGroupMove",&onCommitPermissions, this);
 	// everyone permissions
 	childSetCommitCallback("CheckEveryoneCopy",&onCommitPermissions, this);
+	childSetCommitCallback("CheckEveryoneMove",&onCommitPermissions, this);
 	// next owner permissions
 	childSetCommitCallback("CheckNextOwnerModify",&onCommitPermissions, this);
 	childSetCommitCallback("CheckNextOwnerCopy",&onCommitPermissions, this);
@@ -261,8 +264,11 @@ void LLFloaterProperties::refresh()
 			"CheckOwnerModify",
 			"CheckOwnerCopy",
 			"CheckOwnerTransfer",
-			"CheckShareWithGroup",
+			"CheckGroupCopy",
+			"CheckGroupMod",
+			"CheckGroupMove",
 			"CheckEveryoneCopy",
+			"CheckEveryoneMove",
 			"CheckNextOwnerModify",
 			"CheckNextOwnerCopy",
 			"CheckNextOwnerTransfer",
@@ -530,13 +536,23 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
 	// Check for ability to change values.
 	if (!is_link && is_obj_modify && can_agent_manipulate)
 	{
-		childSetEnabled("CheckShareWithGroup",TRUE);
+		childSetEnabled("GroupLabel",       true);
+		childSetEnabled("CheckGroupCopy",owner_mask & PERM_TRANSFER);
+		childSetEnabled("CheckGroupMod", owner_mask & PERM_MODIFY);
+		childSetEnabled("CheckGroupMove",   true);
+		childSetEnabled("EveryoneLabel",    true);
 		childSetEnabled("CheckEveryoneCopy",(owner_mask & PERM_COPY) && (owner_mask & PERM_TRANSFER));
+		childSetEnabled("CheckEveryoneMove",true);
 	}
 	else
 	{
-		childSetEnabled("CheckShareWithGroup",FALSE);
+		childSetEnabled("GroupLabel",       false);
+		childSetEnabled("CheckGroupCopy",   false);
+		childSetEnabled("CheckGroupMod",    false);
+		childSetEnabled("CheckGroupMove",   false);
+		childSetEnabled("EveryoneLabel",    false);
 		childSetEnabled("CheckEveryoneCopy",FALSE);
+		childSetEnabled("CheckEveryoneMove",false);
 	}
 
 	// Set values.
@@ -544,36 +560,12 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
 	BOOL is_group_modify = (group_mask & PERM_MODIFY) ? TRUE : FALSE;
 	BOOL is_group_move = (group_mask & PERM_MOVE) ? TRUE : FALSE;
 
-	if (is_group_copy && is_group_modify && is_group_move)
-	{
-		childSetValue("CheckShareWithGroup",LLSD((BOOL)TRUE));
-
-		LLCheckBoxCtrl* ctl = getChild<LLCheckBoxCtrl>("CheckShareWithGroup");
-		if(ctl)
-		{
-			ctl->setTentative(FALSE);
-		}
-	}
-	else if (!is_group_copy && !is_group_modify && !is_group_move)
-	{
-		childSetValue("CheckShareWithGroup",LLSD((BOOL)FALSE));
-		LLCheckBoxCtrl* ctl = getChild<LLCheckBoxCtrl>("CheckShareWithGroup");
-		if(ctl)
-		{
-			ctl->setTentative(FALSE);
-		}
-	}
-	else
-	{
-		LLCheckBoxCtrl* ctl = getChild<LLCheckBoxCtrl>("CheckShareWithGroup");
-		if(ctl)
-		{
-			ctl->setTentative(TRUE);
-			ctl->set(TRUE);
-		}
-	}
+	childSetValue("CheckGroupCopy", is_group_copy);
+	childSetValue("CheckGroupMod",  is_group_modify);
+	childSetValue("CheckGroupMove", is_group_move);
 	
 	childSetValue("CheckEveryoneCopy",LLSD((BOOL)(everyone_mask & PERM_COPY)));
+	childSetValue("CheckEveryoneMove",LLSD((BOOL)(everyone_mask & PERM_MOVE)));
 
 	///////////////
 	// SALE INFO //
@@ -762,13 +754,30 @@ void LLFloaterProperties::onCommitPermissions(LLUICtrl* ctrl, void* data)
 	LLPermissions perm(item->getPermissions());
 
 
-	LLCheckBoxCtrl* CheckShareWithGroup = self->getChild<LLCheckBoxCtrl>("CheckShareWithGroup");
-
-	if(CheckShareWithGroup)
+	LLCheckBoxCtrl* CheckGroupCopy = self->getChild<LLCheckBoxCtrl>("CheckGroupCopy");
+	if(CheckGroupCopy)
 	{
 		perm.setGroupBits(gAgent.getID(), gAgent.getGroupID(),
-						CheckShareWithGroup->get(),
-						PERM_MODIFY | PERM_MOVE | PERM_COPY);
+						CheckGroupCopy->get(), PERM_COPY);
+	}
+	LLCheckBoxCtrl* CheckGroupMod = self->getChild<LLCheckBoxCtrl>("CheckGroupMod");
+	if(CheckGroupMod)
+	{
+		perm.setGroupBits(gAgent.getID(), gAgent.getGroupID(),
+						CheckGroupMod->get(), PERM_MODIFY);
+	}
+	LLCheckBoxCtrl* CheckGroupMove = self->getChild<LLCheckBoxCtrl>("CheckGroupMove");
+	if(CheckGroupMove)
+	{
+		perm.setGroupBits(gAgent.getID(), gAgent.getGroupID(),
+						CheckGroupMove->get(), PERM_MOVE);
+	}
+
+	LLCheckBoxCtrl* CheckEveryoneMove = self->getChild<LLCheckBoxCtrl>("CheckEveryoneMove");
+	if(CheckEveryoneMove)
+	{
+		perm.setEveryoneBits(gAgent.getID(), gAgent.getGroupID(),
+						 CheckEveryoneMove->get(), PERM_MOVE);
 	}
 	LLCheckBoxCtrl* CheckEveryoneCopy = self->getChild<LLCheckBoxCtrl>("CheckEveryoneCopy");
 	if(CheckEveryoneCopy)
diff --git a/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
index 501cda4a5..e29b362a2 100644
--- a/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
@@ -113,16 +113,35 @@
 	     mouse_opaque="true" name="NextMaskDebug" v_pad="0" width="90">
 		N:
 	</text>
-	<check_box bottom="-187" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Share with group" left="10"
-	     mouse_opaque="true" name="CheckShareWithGroup" radio_style="false"
-	     width="106" />
-	<check_box bottom_delta="-32" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Allow anyone to copy" left="10"
-	     mouse_opaque="true" name="CheckEveryoneCopy" radio_style="false"
-	     width="130" />
 	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-26" drop_shadow_visible="true" follows="left|top"
+	     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+	     mouse_opaque="true" name="GroupLabel" v_pad="0" width="198">
+		Group members can:
+	</text>
+	<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Modify" left="10" mouse_opaque="true"
+	     name="CheckGroupMod" radio_style="false" width="78" />
+	<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Copy" left_delta="78" mouse_opaque="true"
+	     name="CheckGroupCopy" radio_style="false" width="88" />
+	<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Move" left_delta="88" mouse_opaque="true"
+	     name="CheckGroupMove" radio_style="false" width="106" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-17" drop_shadow_visible="true" follows="left|top"
+	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
+	     mouse_opaque="true" name="EveryoneLabel" v_pad="0" width="88">
+		Anyone can:
+	</text>
+	<check_box bottom_delta="-8" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Copy" left="88" mouse_opaque="true"
+	     name="CheckEveryoneCopy" radio_style="false" width="88" />
+	<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
+	     initial_value="false" label="Move" left_delta="88" mouse_opaque="true"
+		 name="CheckEveryoneMove" radio_style="false" width="88" />
+	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+	     bottom_delta="-13" drop_shadow_visible="true" follows="left|top"
 	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
 	     mouse_opaque="true" name="NextOwnerLabel" v_pad="0" width="88">
 		Next owner can:
@@ -130,10 +149,10 @@
 	<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
 	     initial_value="false" label="Modify" left="10" mouse_opaque="true"
 	     name="CheckNextOwnerModify" radio_style="false" width="78" />
-	<check_box bottom="-265" follows="left|top" font="SansSerifSmall" height="16"
+	<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
 	     initial_value="false" label="Copy" left_delta="78" mouse_opaque="true"
 	     name="CheckNextOwnerCopy" radio_style="false" width="88" />
-	<check_box bottom="-265" follows="left|top" font="SansSerifSmall" height="16"
+	<check_box bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16"
 	     initial_value="false" label="Resell/Give away" left_delta="88"
 	     mouse_opaque="true" name="CheckNextOwnerTransfer" radio_style="false"
 	     width="106" />

From a7f02b3964536c55b4294ac17dbc1b8787d85447 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 25 Jul 2012 18:11:48 -0400
Subject: [PATCH 091/199] Migrate LLFloaterHardwareSettings into a tab in
 LLPanelDisplay

Still not translated, left the old translated floaters for easier translation.
New Hardware Tab is work in progress, it should be more populated in the future, but is fine for now.
---
 indra/newview/CMakeLists.txt                  |   2 -
 indra/newview/llfloaterhardwaresettings.cpp   | 224 ------------------
 indra/newview/llfloaterhardwaresettings.h     | 110 ---------
 indra/newview/llfloaterpreference.cpp         |   8 -
 indra/newview/llpaneldisplay.cpp              | 123 ++++++++--
 indra/newview/llpaneldisplay.h                |  13 +-
 .../xui/en-us/floater_hardware_settings.xml   |  32 ---
 .../xui/en-us/panel_preferences_graphics1.xml | 123 ++++++----
 8 files changed, 187 insertions(+), 448 deletions(-)
 delete mode 100644 indra/newview/llfloaterhardwaresettings.cpp
 delete mode 100644 indra/newview/llfloaterhardwaresettings.h
 delete mode 100644 indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 7e40b6560..e2f289679 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -217,7 +217,6 @@ set(viewer_SOURCE_FILES
     llfloatergroupinvite.cpp
     llfloatergroups.cpp
     llfloaterhandler.cpp
-    llfloaterhardwaresettings.cpp
     llfloaterhtmlcurrency.cpp
     llfloatermediabrowser.cpp
     llfloaterhtmlsimple.cpp
@@ -710,7 +709,6 @@ set(viewer_HEADER_FILES
     llfloatergroupinvite.h
     llfloatergroups.h
     llfloaterhandler.h
-    llfloaterhardwaresettings.h
     llfloaterhtmlcurrency.h
     llfloatermediabrowser.h
     llfloaterhtmlsimple.h
diff --git a/indra/newview/llfloaterhardwaresettings.cpp b/indra/newview/llfloaterhardwaresettings.cpp
deleted file mode 100644
index d1d19e86c..000000000
--- a/indra/newview/llfloaterhardwaresettings.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/** 
- * @file llfloaterhardwaresettings.cpp
- * @brief Menu of all the different graphics hardware settings
- *
- * $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 "llfloaterhardwaresettings.h"
-#include "llfloaterpreference.h"
-#include "llviewerwindow.h"
-#include "llwindow.h"
-#include "llviewercontrol.h"
-#include "llviewertexturelist.h"
-#include "llfeaturemanager.h"
-#include "llstartup.h"
-
-#include "llradiogroup.h"
-#include "lluictrlfactory.h"
-
-#include "llimagegl.h"
-#include "pipeline.h"
-
-LLFloaterHardwareSettings* LLFloaterHardwareSettings::sHardwareSettings = NULL;
-
-LLFloaterHardwareSettings::LLFloaterHardwareSettings() : LLFloater(std::string("Hardware Settings Floater"))
-{
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_hardware_settings.xml");
-	
-	// load it up
-	initCallbacks();
-}
-
-LLFloaterHardwareSettings::~LLFloaterHardwareSettings()
-{
-}
-
-void LLFloaterHardwareSettings::onClickHelp(void* data)
-{
-	const char* xml_alert = "HardwareSettingsHelpButton";
-	LLNotifications::instance().add(xml_alert);
-}
-
-void LLFloaterHardwareSettings::initCallbacks(void) 
-{
-}
-
-// menu maintenance functions
-
-void LLFloaterHardwareSettings::refresh()
-{
-	LLPanel::refresh();
-
-	mUseVBO = gSavedSettings.getBOOL("RenderVBOEnable");
-	mUseFBO = gSavedSettings.getBOOL("RenderUseFBO");
-	mUseAniso = gSavedSettings.getBOOL("RenderAnisotropic");
-	mFSAASamples = gSavedSettings.getU32("RenderFSAASamples");
-	mGamma = gSavedSettings.getF32("RenderGamma");
-	mVideoCardMem = gSavedSettings.getS32("TextureMemory");
-	mFogRatio = gSavedSettings.getF32("RenderFogRatio");
-	mProbeHardwareOnStartup = gSavedSettings.getBOOL("ProbeHardwareOnStartup");
-
-	childSetValue("fsaa", (LLSD::Integer) mFSAASamples);
-	refreshEnabledState();
-}
-
-void LLFloaterHardwareSettings::refreshEnabledState()
-{
-	S32 min_tex_mem = LLViewerTextureList::getMinVideoRamSetting();
-	S32 max_tex_mem = LLViewerTextureList::getMaxVideoRamSetting();
-	childSetMinValue("GrapicsCardTextureMemory", min_tex_mem);
-	childSetMaxValue("GrapicsCardTextureMemory", max_tex_mem);
-
-	mLastVBOState = LLVertexBuffer::sEnableVBOs;
-	if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable") ||
-		!gGLManager.mHasVertexBufferObject)
-	{
-		childSetEnabled("vbo", FALSE);
-		//Streaming VBOs -Shyotl
-		childSetEnabled("vbo_stream", FALSE);
-	}
-	else
-	{
-		childSetEnabled("vbo_stream", LLVertexBuffer::sEnableVBOs);
-	}
-
-	childSetEnabled("fbo",gGLManager.mHasFramebufferObject && !LLPipeline::sRenderDeferred);
-
-	// if no windlight shaders, turn off nighttime brightness, gamma, and fog distance
-	childSetEnabled("gamma", !gPipeline.canUseWindLightShaders());
-	childSetEnabled("(brightness, lower is brighter)", !gPipeline.canUseWindLightShaders());
-	childSetEnabled("fog", !gPipeline.canUseWindLightShaders());
-
-}
-
-// static instance of it
-LLFloaterHardwareSettings* LLFloaterHardwareSettings::instance()
-{
-	if (!sHardwareSettings)
-	{
-		sHardwareSettings = new LLFloaterHardwareSettings();
-		sHardwareSettings->close();
-	}
-	return sHardwareSettings;
-}
-void LLFloaterHardwareSettings::show()
-{
-	LLFloaterHardwareSettings* hardSettings = instance();
-	hardSettings->refresh();
-	hardSettings->center();
-
-	// comment in if you want the menu to rebuild each time
-	//LLUICtrlFactory::getInstance()->buildFloater(hardSettings, "floater_hardware_settings.xml");
-	//hardSettings->initCallbacks();
-
-	hardSettings->open();
-}
-
-bool LLFloaterHardwareSettings::isOpen()
-{
-	if (sHardwareSettings != NULL) 
-	{
-		return true;
-	}
-	return false;
-}
-
-// virtual
-void LLFloaterHardwareSettings::onClose(bool app_quitting)
-{
-	if (sHardwareSettings)
-	{
-		sHardwareSettings->setVisible(FALSE);
-	}
-}
-
-// virtual
-void LLFloaterHardwareSettings::draw()
-{
-	if(mLastVBOState == !LLVertexBuffer::sEnableVBOs)
-		refreshEnabledState();
-	LLFloater::draw();
-}
-
-//============================================================================
-
-BOOL LLFloaterHardwareSettings::postBuild()
-{
-	childSetAction("OK", onBtnOK, this);
-
-	refresh();
-
-	return TRUE;
-}
-
-
-void LLFloaterHardwareSettings::apply() 
-{
-	//Still do a bit of voodoo here. V2 forces restart to change FSAA with FBOs off.
-	//Let's not do that, and instead do pre-V2 FSAA change handling for that particular case
-	if(!LLRenderTarget::sUseFBO && (mFSAASamples != (U32)childGetValue("fsaa").asInteger()))
-	{
-		BOOL logged_in = (LLStartUp::getStartupState() >= STATE_STARTED);
-		LLWindow* window = gViewerWindow->getWindow();
-		LLCoordScreen size;
-		window->getSize(&size);
-		gViewerWindow->changeDisplaySettings(window->getFullscreen(), 
-															size,
-															gSavedSettings.getBOOL("DisableVerticalSync"),
-															logged_in);
-	}
-
-	refresh();
-}
-
-
-void LLFloaterHardwareSettings::cancel()
-{
-	gSavedSettings.setBOOL("RenderVBOEnable", mUseVBO);
-	gSavedSettings.setBOOL("RenderUseFBO", mUseFBO);
-	gSavedSettings.setBOOL("RenderAnisotropic", mUseAniso);
-	gSavedSettings.setU32("RenderFSAASamples", mFSAASamples);
-	gSavedSettings.setF32("RenderGamma", mGamma);
-	gSavedSettings.setS32("TextureMemory", mVideoCardMem);
-	gSavedSettings.setF32("RenderFogRatio", mFogRatio);
-	gSavedSettings.setBOOL("ProbeHardwareOnStartup", mProbeHardwareOnStartup );
-
-	close();
-}
-
-// static 
-void LLFloaterHardwareSettings::onBtnOK( void* userdata )
-{
-	LLFloaterHardwareSettings *fp =(LLFloaterHardwareSettings *)userdata;
-	fp->apply();
-	fp->close(false);
-}
-
diff --git a/indra/newview/llfloaterhardwaresettings.h b/indra/newview/llfloaterhardwaresettings.h
deleted file mode 100644
index 0d78d67a2..000000000
--- a/indra/newview/llfloaterhardwaresettings.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/** 
- * @file llfloaterhardwaresettings.h
- * @brief Menu of all the different graphics hardware settings
- *
- * $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$
- */
-
-#ifndef LL_LLFLOATER_HARDWARE_SETTINGS_H
-#define LL_LLFLOATER_HARDWARE_SETTINGS_H
-
-#include "llfloater.h"
-
-class LLSliderCtrl;
-
-/// Menuing system for all of windlight's functionality
-class LLFloaterHardwareSettings : public LLFloater
-{
-	friend class LLPreferenceCore;
-
-public:
-
-	LLFloaterHardwareSettings();
-	virtual ~LLFloaterHardwareSettings();
-	
-	virtual BOOL postBuild();
-
-	/// initialize all the callbacks for the menu
-	void initCallbacks(void);
-
-	/// one and one instance only
-	static LLFloaterHardwareSettings* instance();
-	
-	/// callback for the menus help button
-	static void onClickHelp(void* data);
-
-	/// OK button
-	static void onBtnOK( void* userdata );
-	
-	//// menu management
-
-	/// show off our menu
-	static void show();
-
-	/// return if the menu exists or not
-	static bool isOpen();
-
-	/// stuff to do on exit
-	virtual void onClose(bool app_quitting);
-
-	/// sync up menu with parameters
-	void refresh();
-
-	/// Draw the panel...
-	void draw();
-
-	/// Apply the changed values.
-	void apply();
-	
-	/// don't apply the changed values
-	void cancel();
-
-	/// refresh the enabled values
-	void refreshEnabledState();
-
-protected:
-	LLSliderCtrl*	mCtrlVideoCardMem;
-
-	//Retained values for cancel/reset
-	BOOL mUseVBO;
-	BOOL mUseFBO;
-	BOOL mUseAniso;
-	U32 mFSAASamples;
-	F32 mGamma;
-	S32 mVideoCardMem;
-	F32 mFogRatio;
-	BOOL mProbeHardwareOnStartup;
-
-	bool mLastVBOState; //track changes to LLVertexBuffer::sEnableVBOs every frame. Bleh.
-private:
-	// one instance on the inside
-	static LLFloaterHardwareSettings* sHardwareSettings;
-};
-
-#endif
-
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index d5e9702d7..e5646174e 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -79,7 +79,6 @@
 #include "llviewerwindow.h"
 #include "llkeyboard.h"
 #include "llscrollcontainer.h"
-#include "llfloaterhardwaresettings.h"
 #include "hippopanelgrids.h"
 
 const S32 PREF_BORDER = 4;
@@ -318,9 +317,6 @@ void LLPreferenceCore::apply()
 	mPrefsAscentSys->apply();
 	mPrefsAscentVan->apply();
 
-	// hardware menu apply
-	LLFloaterHardwareSettings::instance()->apply();
-
 	mWebPanel->apply();
 #if LL_LCD_COMPILE
 	// only add this option if we actually have a logitech keyboard / speaker set
@@ -350,9 +346,6 @@ void LLPreferenceCore::cancel()
 	mPrefsAscentSys->cancel();
 	mPrefsAscentVan->cancel();
 
-	// cancel hardware menu
-	LLFloaterHardwareSettings::instance()->cancel();
-
 	mWebPanel->cancel();
 #if LL_LCD_COMPILE
 	// only add this option if we actually have a logitech keyboard / speaker set
@@ -380,7 +373,6 @@ void LLPreferenceCore::setPersonalInfo(const std::string& visibility, bool im_vi
 
 void LLPreferenceCore::refreshEnabledGraphics()
 {
-	LLFloaterHardwareSettings::instance()->refreshEnabledState();
 	mDisplayPanel->refreshEnabledState();
 }
 
diff --git a/indra/newview/llpaneldisplay.cpp b/indra/newview/llpaneldisplay.cpp
index b9cf32442..a758c0a99 100644
--- a/indra/newview/llpaneldisplay.cpp
+++ b/indra/newview/llpaneldisplay.cpp
@@ -71,7 +71,6 @@
 #include "lluictrlfactory.h"
 #include "llfeaturemanager.h"
 #include "llviewershadermgr.h"
-#include "llfloaterhardwaresettings.h"
 #include "llboost.h"
 
 //RN temporary includes for resolution switching
@@ -111,9 +110,6 @@ BOOL LLPanelDisplay::postBuild()
 	// Help button
 	childSetAction("GraphicsPreferencesHelpButton", onOpenHelp, this);
 
-	// Hardware settings button
-	childSetAction("GraphicsHardwareButton", onOpenHardwareSettings, NULL);
-
 	//============================================================================
 	// Resolution
 	
@@ -359,6 +355,9 @@ BOOL LLPanelDisplay::postBuild()
 	mShadowDetailText = getChild<LLTextBox>("ShadowDetailText");
 	mTerrainScaleText = getChild<LLTextBox>("TerrainScaleText");
 
+	// Hardware tab
+	childSetCommitCallback("vbo", &LLPanelDisplay::onRenderVBOEnable, this);
+
 	refresh();
 
 	return TRUE;
@@ -463,6 +462,17 @@ void LLPanelDisplay::refresh()
 	updateSliderText(mCtrlPostProcess, mPostProcessText);
 	updateSliderText(mCtrlSkyFactor, mSkyFactorText);
 
+	// Hardware tab
+	mUseVBO = gSavedSettings.getBOOL("RenderVBOEnable");
+	mUseFBO = gSavedSettings.getBOOL("RenderUseFBO");
+	mUseAniso = gSavedSettings.getBOOL("RenderAnisotropic");
+	mFSAASamples = gSavedSettings.getU32("RenderFSAASamples");
+	mGamma = gSavedSettings.getF32("RenderGamma");
+	mVideoCardMem = gSavedSettings.getS32("TextureMemory");
+	mFogRatio = gSavedSettings.getF32("RenderFogRatio");
+
+	childSetValue("fsaa", (LLSD::Integer) mFSAASamples);
+
 	refreshEnabledState();
 }
 
@@ -503,10 +513,6 @@ void LLPanelDisplay::refreshEnabledState()
 	bool bumpshiny = gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps && LLFeatureManager::getInstance()->isFeatureAvailable("RenderObjectBump");
 	mCtrlBumpShiny->setEnabled(bumpshiny ? TRUE : FALSE);
 
-	// Avatar Mode
-	S32 max_avatar_shader = LLViewerShaderMgr::instance()->mMaxAvatarShaderLevel;
-	mCtrlAvatarVP->setEnabled((max_avatar_shader > 0) ? TRUE : FALSE);
-	
 	if (gSavedSettings.getBOOL("VertexShaderEnable") == FALSE || 
 		gSavedSettings.getBOOL("RenderAvatarVP") == FALSE)
 	{
@@ -517,6 +523,7 @@ void LLPanelDisplay::refreshEnabledState()
 		mCtrlAvatarCloth->setEnabled(true);
 	}
 
+	static LLCachedControl<bool> wlatmos("WindLightUseAtmosShaders",false);
 	//I actually recommend RenderUseFBO:FALSE for ati users when not using deferred, so RenderUseFBO shouldn't control visibility of the element.
 	// Instead, gGLManager.mHasFramebufferObject seems better as it is determined by hardware and not current user settings. -Shyotl
 	//Enabling deferred will force RenderUseFBO to TRUE.
@@ -524,13 +531,14 @@ void LLPanelDisplay::refreshEnabledState()
 		LLFeatureManager::getInstance()->isFeatureAvailable("RenderDeferred") && //Ensure it's enabled in the gpu feature table
 		LLFeatureManager::getInstance()->isFeatureAvailable("RenderAvatarVP") && //Hardware Skinning. Deferred forces RenderAvatarVP to true
 		LLFeatureManager::getInstance()->isFeatureAvailable("VertexShaderEnable") && gSavedSettings.getBOOL("VertexShaderEnable") && //Basic Shaders
-		LLFeatureManager::getInstance()->isFeatureAvailable("WindLightUseAtmosShaders") && gSavedSettings.getBOOL("WindLightUseAtmosShaders"); //Atmospheric Shaders
+		LLFeatureManager::getInstance()->isFeatureAvailable("WindLightUseAtmosShaders") && wlatmos; //Atmospheric Shaders
 
 
 	mCtrlDeferred->setEnabled(can_defer);
-	mCtrlShadowDetail->setEnabled(can_defer && gSavedSettings.getBOOL("RenderDeferred"));
-	mCtrlAmbientOcc->setEnabled(can_defer && gSavedSettings.getBOOL("RenderDeferred"));
-	mCtrlDeferredDoF->setEnabled(can_defer && gSavedSettings.getBOOL("RenderDeferred"));
+	static LLCachedControl<bool> render_deferred("RenderDeferred",false);
+	mCtrlShadowDetail->setEnabled(can_defer && render_deferred);
+	mCtrlAmbientOcc->setEnabled(can_defer && render_deferred);
+	mCtrlDeferredDoF->setEnabled(can_defer && render_deferred);
 
 	// Disable max non-impostors slider if avatar impostors are off
 	mCtrlNonImpostors->setEnabled(gSavedSettings.getBOOL("RenderUseImpostors"));
@@ -543,15 +551,15 @@ void LLPanelDisplay::refreshEnabledState()
 	mCtrlShaderEnable->setEnabled(fCtrlShaderEnable && (!gRlvHandler.hasBehaviour(RLV_BHVR_SETENV) || !mShaderEnable));
 // [/RLVa:KB]
 
-	BOOL shaders = mCtrlShaderEnable->get();
+	bool shaders = mCtrlShaderEnable->get();
 	if (shaders)
 	{
 		mRadioTerrainDetail->setValue(1);
-		mRadioTerrainDetail->setEnabled(FALSE);
+		mRadioTerrainDetail->setEnabled(false);
 	}
 	else
 	{
-		mRadioTerrainDetail->setEnabled(TRUE);
+		mRadioTerrainDetail->setEnabled(true);
 	}
 
 	// *HACK just checks to see if we can use shaders... 
@@ -563,9 +571,50 @@ void LLPanelDisplay::refreshEnabledState()
 	mCtrlWindLight->setEnabled(fCtrlWindLightEnable && (!gRlvHandler.hasBehaviour(RLV_BHVR_SETENV) || !mWindLight));
 // [/RLVa:KB]
 
-	// turn off sky detail if atmostpherics isn't on
-	mCtrlSkyFactor->setEnabled(gSavedSettings.getBOOL("WindLightUseAtmosShaders"));
-	mSkyFactorText->setEnabled(gSavedSettings.getBOOL("WindLightUseAtmosShaders"));
+	// turn off sky detail if atmospherics isn't on
+	mCtrlSkyFactor->setEnabled(wlatmos);
+	mSkyFactorText->setEnabled(wlatmos);
+
+	// Avatar Mode and FBO
+	childSetEnabled("fbo", gGLManager.mHasFramebufferObject && !LLPipeline::sRenderDeferred);
+	if (render_deferred && wlatmos && shaders)
+	{
+		childSetValue("fbo", true);
+		mCtrlAvatarVP->setEnabled(false);
+		mCtrlAvatarVP->setValue(true);
+	}
+	else if (!shaders)
+	{
+		mCtrlAvatarVP->setEnabled(false);
+		mCtrlAvatarVP->setValue(false);
+	}
+	else
+	{
+		mCtrlAvatarVP->setEnabled(true);
+	}
+
+	// Hardware tab
+	S32 min_tex_mem = LLViewerTextureList::getMinVideoRamSetting();
+	S32 max_tex_mem = LLViewerTextureList::getMaxVideoRamSetting();
+	childSetMinValue("GrapicsCardTextureMemory", min_tex_mem);
+	childSetMaxValue("GrapicsCardTextureMemory", max_tex_mem);
+
+	if (!LLFeatureManager::getInstance()->isFeatureAvailable("RenderVBOEnable") ||
+		!gGLManager.mHasVertexBufferObject)
+	{
+		childSetEnabled("vbo", false);
+		//Streaming VBOs -Shyotl
+		childSetEnabled("vbo_stream", false);
+	}
+	else
+	{
+		childSetEnabled("vbo_stream", LLVertexBuffer::sEnableVBOs);
+	}
+
+	// if no windlight shaders, enable gamma, and fog distance
+	childSetEnabled("gamma",!wlatmos);
+	childSetEnabled("fog",  !wlatmos);
+	childSetVisible("note",  wlatmos);
 
 	// now turn off any features that are unavailable
 	disableUnavailableSettings();
@@ -812,6 +861,15 @@ void LLPanelDisplay::cancel()
 	gSavedSettings.setU32("WLSkyDetail", mSkyLOD);
 	gSavedSettings.setS32("RenderMaxPartCount", mParticleCount);
 	gSavedSettings.setS32("RenderGlowResolutionPow", mPostProcess);
+
+	// Hardware tab
+	gSavedSettings.setBOOL("RenderVBOEnable", mUseVBO);
+	gSavedSettings.setBOOL("RenderUseFBO", mUseFBO);
+	gSavedSettings.setBOOL("RenderAnisotropic", mUseAniso);
+	gSavedSettings.setU32("RenderFSAASamples", mFSAASamples);
+	gSavedSettings.setF32("RenderGamma", mGamma);
+	gSavedSettings.setS32("TextureMemory", mVideoCardMem);
+	gSavedSettings.setF32("RenderFogRatio", mFogRatio);
 }
 
 void LLPanelDisplay::apply()
@@ -823,6 +881,21 @@ void LLPanelDisplay::apply()
 	{
 		applyWindowSize();
 	}
+
+	// Hardware tab
+	//Still do a bit of voodoo here. V2 forces restart to change FSAA with FBOs off.
+	//Let's not do that, and instead do pre-V2 FSAA change handling for that particular case
+	if(!LLRenderTarget::sUseFBO && (mFSAASamples != (U32)childGetValue("fsaa").asInteger()))
+	{
+		bool logged_in = (LLStartUp::getStartupState() >= STATE_STARTED);
+		LLWindow* window = gViewerWindow->getWindow();
+		LLCoordScreen size;
+		window->getSize(&size);
+		gViewerWindow->changeDisplaySettings(window->getFullscreen(),
+												size,
+												gSavedSettings.getBOOL("DisableVerticalSync"),
+												logged_in);
+	}
 }
 
 void LLPanelDisplay::onChangeQuality(LLUICtrl *ctrl, void *data)
@@ -856,11 +929,6 @@ void LLPanelDisplay::onOpenHelp(void* user_data)
 	LLNotifications::instance().add(parent_floater->contextualNotification(xml_alert));
 }
 
-void LLPanelDisplay::onOpenHardwareSettings(void* user_data)
-{
-	LLFloaterHardwareSettings::show();
-}
-
 void LLPanelDisplay::onApplyResolution(LLUICtrl* src, void* user_data)
 {
 	((LLPanelDisplay*) src)->applyResolution();
@@ -1037,6 +1105,15 @@ void LLPanelDisplay::onVertexShaderEnable(LLUICtrl* self, void* data)
 	LLFloaterPreference::refreshEnabledGraphics();
 }
 
+//static
+void LLPanelDisplay::onRenderVBOEnable(LLUICtrl* self, void* data)
+{
+	LLPanelDisplay* panel = (LLPanelDisplay*)data;
+	bool enable = panel->childGetValue("vbo").asBoolean();
+	panel->childSetEnabled("vbo_stream", enable);
+	if(!enable)	panel->childSetValue("vbo_stream", false);
+}
+
 void LLPanelDisplay::setHardwareDefaults(void* user_data)
 {
 	LLFeatureManager::getInstance()->applyRecommendedSettings();
diff --git a/indra/newview/llpaneldisplay.h b/indra/newview/llpaneldisplay.h
index 234c785b6..185263f9f 100644
--- a/indra/newview/llpaneldisplay.h
+++ b/indra/newview/llpaneldisplay.h
@@ -185,6 +185,15 @@ protected:
 	S32 mParticleCount;
 	S32 mPostProcess;
 
+	// Hardware tab
+	BOOL mUseVBO;
+	BOOL mUseFBO;
+	BOOL mUseAniso;
+	U32 mFSAASamples;
+	F32 mGamma;
+	S32 mVideoCardMem;
+	F32 mFogRatio;
+
 	static void setGraphicsSettings(LLControlGroup& group);
 	static void createGroup();
 
@@ -195,7 +204,6 @@ protected:
 	static void onChangeCustom(LLUICtrl *ctrl, void *data);
 	
 	static void onOpenHelp(void *data);
-	static void onOpenHardwareSettings(void *data);
 	static void onCommitAutoDetectAspect(LLUICtrl *ctrl, void *data);
 	static void onKeystrokeAspectRatio(LLLineEditor* caller, void* user_data);
 	static void onSelectAspectRatio(LLUICtrl*, void*);
@@ -210,6 +218,9 @@ protected:
 	// callback for when client turns on shaders
 	static void onVertexShaderEnable(LLUICtrl*, void*);
 
+	// callbacks for hardware tab
+	static void onRenderVBOEnable(LLUICtrl*, void*);
+
 	// helper function
 	static void fractionFromDecimal(F32 decimal_val, S32& numerator, S32& denominator);
 };
diff --git a/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
deleted file mode 100644
index 0a33c0ca8..000000000
--- a/indra/newview/skins/default/xui/en-us/floater_hardware_settings.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-400" height="244" left="50" name="Hardware Settings Floater" title="Hardware Settings" width="500">
-	<text bottom="-42" height="12" left="10" name="Filtering:">Filtering:</text>
-	<check_box bottom="-46" control_name="RenderAnisotropic" height="16" initial_value="false" label="Anisotropic Filtering (slower when enabled)" left="148" name="ani" width="256"/>
-  <text bottom="-61" height="12" left="10" name="Antialiasing:" width="128">Antialiasing:</text>
-  <combo_box bottom="-65" control_name="RenderFSAASamples" height="16" initial_value="false" label="Antialiasing" left="148" name="fsaa" width="64">
-    <combo_item name="FSAADisabled" value="0">Disabled</combo_item>
-	<combo_item name="2x" value="2">2x</combo_item>
-    <combo_item name="4x" value="4">4x</combo_item>
-    <combo_item name="8x" value="8">8x</combo_item>
-    <combo_item name="16x" value="16">16x</combo_item>
-  </combo_box>
-	<spinner bottom_delta="-21" control_name="RenderGamma" decimal_digits="2" height="16" increment="0.01" initial_val="1" label="Gamma:" label_width="138" left="10" max_val="2" min_val="0.0" name="gamma" width="202"/>
-	<text bottom_delta="2" height="12" left="222" name="(brightness, lower is brighter)">(brightness, lower is brighter, 0=use default)</text>
-	<text bottom_delta="-20" height="12" left="10" name="Enable VBO:">Enable VBO:</text>
-	<check_box bottom_delta="-5" control_name="RenderVBOEnable" height="16" initial_value="true" label="Enable OpenGL Vertex Buffer Objects" left="148" name="vbo"
-		tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."/>
-	<check_box bottom_delta="-18" control_name="ShyotlRenderUseStreamVBO" height="16" initial_value="false" label="Enable Streamed VBOs" left="157" name="vbo_stream"
-		tool_tip="Disabling this may improve performance when VBOs are enabled. Disabling produced observable improvement on various AMD GPUs."/>
-  <text bottom_delta="-20" height="12" left="10" name="Enable FBO:">Enable Framebuffer Objects:</text>
-  <check_box bottom_delta="-5" control_name="RenderUseFBO" enabled="false" height="16" initial_value="true" label="Enable OpenGL Frame Buffer Objects" left="148" name="fbo"
-	  tool_tip="Enabling this on modern hardware can provide a performance gain. However, enabling this when combined with antialiasing on AMD GPUs may cause edge artifacts. This setting is required for deferred rendering."/>
-	<slider bottom_delta="-21" control_name="TextureMemory"	decimal_digits="0" height="16" increment="16" initial_val="32" label="Texture Memory (MB):" label_width="135" left="10" max_val="4096" min_val="0" name="GrapicsCardTextureMemory"
-		tool_tip="Amount of memory to allocate for textures. Defaults to Video Card Memory. Reducing this may improve performance but may also make textures blurry." 
-		width="300"/>
-	<spinner bottom_delta="-24" control_name="RenderFogRatio" decimal_digits="1" height="16" increment="0.1" initial_val="4" label="Fog Distance Ratio:" label_width="138" left="10" max_val="10" min_val="0.5" name="fog" width="202"/>
-	<text bottom_delta="-50" height="40" left="10" name="note">
-		Note: the Gamma and Fog Distance Ratio settings are unavailable
-        (since useless) when the Atmospheric Shaders are enabled.
-	</text>
-	<button bottom="10" height="20" label="OK" label_selected="OK" left="-110" name="OK" scale_image="true" width="90"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index d56ab6e82..7625c82f1 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-439" height="438" label="Graphics" left="102" name="Display panel" width="517">
-	<button bottom="-22" height="18" label="?" left="470" name="GraphicsPreferencesHelpButton" width="22"/>
+<panel bottom="-449" height="438" label="Graphics" name="Display panel" width="517">
 	<check_box bottom="-23" height="16" initial_value="false" label="Run viewer in a window" left="10" name="windowed mode" width="120" tool_tip="If unchecked, viewer will display full-screen when logged in."/>
 	<text bottom="-62" height="12" name="WindowSizeLabel">Window Size:</text>
 	<combo_box bottom="-67" height="18" left="165" name="windowsize combo" width="150">
@@ -21,25 +20,29 @@
 		<combo_item name="8:5(Widescreen)" value="1.6">16:10 (Widescreen PC)</combo_item>
 		<combo_item name="16:9(Widescreen)" value="1.7777777">16:9 (Widescreen TV)</combo_item>
 	</combo_box>
-	<check_box bottom="-44" control_name="FullScreenAutoDetectAspectRatio" height="16" initial_value="false" label="Auto-detect ratio" left="358" name="aspect_auto_detect" width="256"/>
-	<text bottom="-91"  height="12" left="10" name="QualityText">Quality &amp; Performance:</text>
-	<text bottom="-91"  height="12" left="135" name="FasterText">Faster</text>
-	<text bottom="-107" height="12" left_delta="23" name="ShadersPrefText">Low</text>
-	<text bottom="-107" height="12" left_delta="47" name="ShadersPrefText2">Mid</text>
-	<text bottom="-107" height="12" left_delta="47" name="ShadersPrefText3">High</text>
-	<text bottom="-107" height="12" left_delta="47" name="ShadersPrefText4">Ultra</text>
-	<text bottom="-91"  height="12"	left_delta="14" name="QualityText2">Higher Quality</text>
+    <button bottom_delta="-20" height="20" label="Default" tool_tip="Reset to recommended graphics settings" left="355" name="Defaults" scale_image="true" width="100"/>
+	<check_box bottom="-44" control_name="FullScreenAutoDetectAspectRatio" height="16" initial_value="false" label="Auto-detect ratio" left="350" name="aspect_auto_detect" width="256"/>
+ <tab_container follows="all" bottom="0" border="false" left="0" height="360" width="518" name="graphics_tab" tab_position="bottom">
+	 <panel border="true" bottom="-439" height="438" label="Main" left="102" name="Main" width="517">
+	<button bottom="327" height="18" label="?" left="470" name="GraphicsPreferencesHelpButton" width="22"/>
+	<text bottom="330"  height="12" left="10" name="QualityText">Quality &amp; Performance:</text>
+	<text bottom_delta="0"  height="12" left="135" name="FasterText">Faster</text>
+	<text bottom_delta="-16" height="12" left_delta="23" name="ShadersPrefText">Low</text>
+	<text bottom_delta="0" height="12" left_delta="47" name="ShadersPrefText2">Mid</text>
+	<text bottom_delta="0" height="12" left_delta="47" name="ShadersPrefText3">High</text>
+	<text bottom_delta="0" height="12" left_delta="47" name="ShadersPrefText4">Ultra</text>
+	<text bottom_delta="16"  height="12"	left_delta="23" name="QualityText2">Higher Quality</text>
 <!-- Are these icons really necessary? 
 	<icon bottom="-89" height="14" image_name="rounded_square.tga" left="173" name="LowDivet" width="2"/>
 	<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="MidDivet" width="2"/>
 	<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="HighDivet" width="2"/>
 	<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="UltraDivet" width="2"/>
 -->
-	<slider bottom="-91" control_name="RenderQualityPerformance" increment="1" initial_val="0" left="165" max_val="3" min_val="0" name="QualityPerformanceSelection" show_text="false" width="150" />
-	<check_box bottom="-96" control_name="RenderCustomSettings" label="Custom" left="395" initial_value="true" name="CustomSettings"/>
+	<slider bottom_delta="0" control_name="RenderQualityPerformance" increment="1" initial_val="0" left="165" max_val="3" min_val="0" name="QualityPerformanceSelection" show_text="false" width="150" />
+	<check_box bottom_delta="-5" control_name="RenderCustomSettings" label="Custom" left="395" initial_value="true" name="CustomSettings"/>
 	<!--view_border bevel_style="none" bottom="-395" height="280" left="5" name="GraphicsBorder" width="485"/-->
-	<text bottom="-130" height="12" left="10" name="ShadersText">Shaders:</text>
-  <check_box bottom_delta="-23" control_name="RenderTransparentWater" height="16" initial_value="true" label="Transparent water" left="10" name="TransparentWater"/>
+	<text bottom="300" height="12" left="10" name="ShadersText">Shaders:</text>
+    <check_box bottom_delta="-23" control_name="RenderTransparentWater" height="16" initial_value="true" label="Transparent water" left="10" name="TransparentWater"/>
 	<check_box bottom_delta="-17" control_name="RenderObjectBump" height="16" initial_value="true" label="Bump mapping and shiny" left="10" name="BumpShiny"/>
     <check_box bottom_delta="-17" control_name="RenderLocalLights" height="16" label="Local Lights" name="LightingDetailRadio"/>
 	<check_box bottom_delta="-17" control_name="VertexShaderEnable" height="16" initial_value="true" label="Basic shaders" left_delta="0" name="BasicShaders" tool_tip="Disabling this option may prevent some graphics card drivers from crashing."/>
@@ -69,40 +72,64 @@
 		<combo_item name="4" value="4">Everything</combo_item>
 	</combo_box>
 
-  <slider bottom_delta="-20" left="5" control_name="RenderAvatarPhysicsLODFactor" increment="0.1" label="  Avatar Physics:" label_width="79" max_val="1" min_val="0" name="AvatarPhysicsDetail" show_text="false" width="160"/>
-  <text bottom_delta="-2" left="170" height="12" name="AvatarPhysicsDetailText">Off</text>
-  <!--text bottom="-131" height="12" left="464" name="DrawDistanceMeterText1">m</text-->
-  <text bottom="-131" height="12" left="470" name="DrawDistanceMeterText2">m</text>
-  <slider bottom="-135"      control_name="RenderFarClip"	  	  		  decimal_digits="0" height="16" increment="8" initial_val="160" label="Draw Distance:" label_width="101" left="215" max_val="1024" min_val="64" name="DrawDistance" width="262"/>
-  <slider bottom_delta="-15" control_name="RenderMaxPartCount"	  		  decimal_digits="0" height="16" increment="256" initial_val="4096"	  label="Max. Particle Count:" label_width="101"	  max_val="8192" min_val="0" name="MaxParticleCount" width="262"/>
-  <slider bottom_delta="-15" control_name="RenderAvatarMaxVisible" 	  	 decimal_digits="0" increment="1" initial_val="35" label="Max non-impostors" label_width="101" max_val="50" min_val="1" name="AvatarMaxVisible" width="250"/>
-  <slider bottom_delta="-25" control_name="RenderGlowResolutionPow" 	  decimal_digits="0" height="16" increment="1" initial_val="8" label="Post Process Quality:"	  label_width="101" max_val="9" min_val="8" name="RenderPostProcess" show_text="false" width="226"/>
-  <text bottom_delta="-20" height="12" left="215" name="MeshDetailText">Level of Detail:</text>
-  <slider bottom_delta="-20" control_name="RenderVolumeLODFactor" increment="0.09375" label="  Objects:" label_width="79" max_val="2" min_val="0.5" name="ObjectMeshDetail" show_text="false" width="223"/>
-  <slider bottom_delta="-20" control_name="RenderFlexTimeFactor" increment="0.1" label="  Flexiprims:" label_width="79" max_val="1" min_val="0" name="FlexibleMeshDetail" show_text="false" width="223"/>
-  <slider bottom_delta="-20" control_name="RenderTreeLODFactor"	increment="0.125" label="  Trees:" label_width="79" max_val="1" min_val="0" name="TreeMeshDetail" show_text="false" width="223"/>
-  <slider bottom_delta="-20" control_name="RenderAvatarLODFactor" increment="0.125" label="  Avatars:" label_width="79" max_val="1" min_val="0" name="AvatarMeshDetail" show_text="false" width="223"/>
-  <slider bottom_delta="-20" control_name="RenderTerrainLODFactor" increment="0.125" label="  Terrain:" label_width="79" max_val="2" min_val="1" name="TerrainMeshDetail" show_text="false" width="223"/>
-  <slider bottom_delta="-20" control_name="WLSkyDetail"			  		  decimal_digits="0" increment="8" label="  Sky:" label_width="79" max_val="128" min_val="16" name="SkyMeshDetail"   show_text="false" width="223"/>
-  <text bottom="-192" height="12" left="444" name="PostProcessText">Low</text>
-  <text bottom_delta="-38" height="12" name="ObjectMeshDetailText">Low</text>
-  <text bottom_delta="-20" height="12" name="FlexibleMeshDetailText">Low</text>
-  <text bottom_delta="-20" height="12" name="TreeMeshDetailText">Low</text>
-  <text bottom_delta="-20" height="12" name="AvatarMeshDetailText">Low</text>
-  <text bottom_delta="-20" height="12" name="TerrainMeshDetailText">Low</text>
-  <text bottom_delta="-20" height="12" name="SkyMeshDetailText">Low</text>
-  <text bottom="-360" height="12" left="230" name="AvatarRenderingText">Avatar Rendering:</text>
-  <check_box bottom_delta="-16" control_name="RenderUseImpostors" initial_value="true" label="Avatar impostors" name="AvatarImpostors"/>
-  <check_box bottom_delta="-16" control_name="RenderAvatarVP" initial_value="true" label="Hardware skinning" name="AvatarVertexProgram"/>
-  <check_box bottom_delta="-16" control_name="RenderAvatarCloth" initial_value="true" label="Avatar cloth" name="AvatarCloth"/>
-  <text bottom="-360" height="12" left="395" name="TerrainDetailText">Terrain detail:</text>
-  <radio_group bottom_delta="-40" control_name="RenderTerrainDetail" draw_border="false" height="38" name="TerrainDetailRadio" width="321">
+    <slider bottom_delta="-20" left="5" control_name="RenderAvatarPhysicsLODFactor" increment="0.1" label="  Avatar Physics:" label_width="79" max_val="1" min_val="0" name="AvatarPhysicsDetail" show_text="false" width="160"/>
+    <text bottom_delta="-2" left="170" height="12" name="AvatarPhysicsDetailText">Off</text>
+    <text bottom="299" left="470" height="12" name="DrawDistanceMeterText1">m</text>
+    <text bottom="299" left="470" height="12" name="DrawDistanceMeterText2">m</text>
+    <slider bottom="295" left="215" control_name="RenderFarClip" decimal_digits="0" height="16" increment="8" initial_val="160" label="Draw Distance:" label_width="101" max_val="1024" min_val="64" name="DrawDistance" width="262"/>
+    <slider bottom_delta="-15" control_name="RenderMaxPartCount" decimal_digits="0" height="16" increment="256" initial_val="4096"	  label="Max. Particle Count:" label_width="101"	  max_val="8192" min_val="0" name="MaxParticleCount" width="262"/>
+    <slider bottom_delta="-15" control_name="RenderAvatarMaxVisible" decimal_digits="0" increment="1" initial_val="35" label="Max non-impostors" label_width="101" max_val="50" min_val="1" name="AvatarMaxVisible" width="250"/>
+    <slider bottom_delta="-25" control_name="RenderGlowResolutionPow" decimal_digits="0" height="16" increment="1" initial_val="8" label="Post Process Quality:"	  label_width="101" max_val="9" min_val="8" name="RenderPostProcess" show_text="false" width="226"/>
+    <text bottom_delta="-15" height="12" left="215" name="MeshDetailText">Level of Detail:</text>
+    <slider bottom_delta="-20" control_name="RenderVolumeLODFactor" increment="0.09375" label="  Objects:" label_width="79" max_val="2" min_val="0.5" name="ObjectMeshDetail" show_text="false" width="223"/>
+    <slider bottom_delta="-20" control_name="RenderFlexTimeFactor" increment="0.1" label="  Flexiprims:" label_width="79" max_val="1" min_val="0" name="FlexibleMeshDetail" show_text="false" width="223"/>
+    <slider bottom_delta="-20" control_name="RenderTreeLODFactor"	increment="0.125" label="  Trees:" label_width="79" max_val="1" min_val="0" name="TreeMeshDetail" show_text="false" width="223"/>
+    <slider bottom_delta="-20" control_name="RenderAvatarLODFactor" increment="0.125" label="  Avatars:" label_width="79" max_val="1" min_val="0" name="AvatarMeshDetail" show_text="false" width="223"/>
+    <slider bottom_delta="-20" control_name="RenderTerrainLODFactor" increment="0.125" label="  Terrain:" label_width="79" max_val="2" min_val="1" name="TerrainMeshDetail" show_text="false" width="223"/>
+    <slider bottom_delta="-20" control_name="WLSkyDetail"	decimal_digits="0" increment="8" label="  Sky:" label_width="79" max_val="128" min_val="16" name="SkyMeshDetail"   show_text="false" width="223"/>
+    <text bottom_delta="100" left_delta="229" height="12" name="ObjectMeshDetailText">Low</text>
+    <text bottom_delta="-20" height="12" name="FlexibleMeshDetailText">Low</text>
+    <text bottom_delta="-20" height="12" name="TreeMeshDetailText">Low</text>
+    <text bottom_delta="-20" height="12" name="AvatarMeshDetailText">Low</text>
+    <text bottom_delta="-20" height="12" name="TerrainMeshDetailText">Low</text>
+    <text bottom_delta="-20" height="12" name="SkyMeshDetailText">Low</text>
+    <text bottom_delta="-30" height="12" left="230" name="AvatarRenderingText">Avatar Rendering:</text>
+    <check_box bottom_delta="-20" control_name="RenderUseImpostors" initial_value="true" label="Avatar impostors" name="AvatarImpostors"/>
+    <check_box bottom_delta="-16" control_name="RenderAvatarVP" initial_value="true" label="Hardware skinning" name="AvatarVertexProgram"/>
+    <check_box bottom_delta="-16" control_name="RenderAvatarCloth" initial_value="true" label="Avatar cloth" name="AvatarCloth"/>
+    <text bottom_delta="53" height="12" left="395" name="TerrainDetailText">Terrain detail:</text>
+    <radio_group bottom_delta="-44" control_name="RenderTerrainDetail" draw_border="false" height="38" name="TerrainDetailRadio" width="321">
 	  <radio_item bottom="-15" height="16" left="3" name="0" width="315">Low</radio_item>
 	  <radio_item bottom="-31" height="16" name="2" width="315">High</radio_item>
-  </radio_group>
-  <button bottom="-440" height="20" label="Reset to defaults" left="10" name="Defaults" scale_image="true" width="240"/>
-  <!--button bottom="-440" height="20" label="Advanced" left="230" name="CustomSettingsButton" scale_image="true" width="120" toggle="true" control_name="RenderCustomSettings"/-->
-  <button bottom="-440" height="20" label="Hardware" left="370" name="GraphicsHardwareButton" scale_image="true" width="120"/>
-  <string name="resolution_format">[RES_X] x [RES_Y]</string>
-  <string name="aspect_ratio_text">[NUM]:[DEN]</string>
+    </radio_group>
+    <text bottom="-106" height="12" left="444" name="PostProcessText">Low</text>
+  </panel>
+  <panel border="true" bottom="-400" height="244" left="50" name="Hardware" label="Hardware" width="500">
+	<check_box bottom="-22" control_name="RenderAnisotropic" height="16" initial_value="false" label="Anisotropic Filtering (slower when enabled)" left="5" name="ani" width="256"/>
+    <text bottom="-37" height="12" left="10" name="Antialiasing:" width="128">Antialiasing:</text>
+    <combo_box bottom="-41" control_name="RenderFSAASamples" height="16" initial_value="false" label="Antialiasing" left="148" name="fsaa" width="64">
+      <combo_item name="FSAADisabled" value="0">Disabled</combo_item>
+	  <combo_item name="2x" value="2">2x</combo_item>
+      <combo_item name="4x" value="4">4x</combo_item>
+      <combo_item name="8x" value="8">8x</combo_item>
+      <combo_item name="16x" value="16">16x</combo_item>
+    </combo_box>
+	<spinner bottom_delta="70" control_name="TextureMemory" decimal_digits="0" height="16" increment="16" initial_val="32" label="Texture Memory (MB):" label_width="138" left="10" max_val="4096" min_val="0" name="GrapicsCardTextureMemory" tool_tip="Amount of memory to allocate for textures. Defaults to Video Card Memory. Reducing this may improve performance but may also make textures blurry." width="202"/>
+	<check_box bottom_delta="-25" control_name="RenderVBOEnable" height="16" initial_value="true" label="Enable OpenGL Vertex Buffer Objects" left="5" name="vbo"
+		tool_tip="Enabling this on modern hardware gives a performance gain.  However, older hardware often has poor implementations of VBOs and you may get crashes when this is enabled."/>
+	<check_box bottom_delta="-18" control_name="ShyotlRenderUseStreamVBO" height="16" initial_value="false" label="Enable Streamed VBOs" left="14" name="vbo_stream"
+		tool_tip="Disabling this may improve performance when VBOs are enabled. Disabling produced observable improvement on various AMD GPUs."/>
+    <check_box bottom_delta="-25" control_name="RenderUseFBO" height="16" initial_value="true" label="Enable OpenGL Frame Buffer Objects" left="5" name="fbo"
+	  tool_tip="Enabling this on modern hardware can provide a performance gain. However, enabling this when combined with antialiasing on AMD GPUs may cause edge artifacts. This setting is required for deferred rendering."/>
+	<spinner bottom="-42" control_name="RenderGamma" decimal_digits="2" height="16" increment="0.01" initial_val="1" label="Gamma:" label_width="138" left="250" max_val="2" min_val="0.0" name="gamma" width="202" tool_tip="(brightness, lower is brighter)"/>
+	<spinner bottom_delta="70" control_name="RenderFogRatio" decimal_digits="1" height="16" increment="0.1" initial_val="4" label="Fog Distance Ratio:" label_width="138" max_val="10" min_val="0.5" name="fog" width="202"/>
+	<text bottom_delta="-50" height="40" name="note">
+Note: The Gamma and Fog Distance Ratio
+settings are unavailable (since useless)
+when the Atmospheric Shaders are enabled.
+	</text>
+  </panel>
+ </tab_container>
+ <string name="resolution_format">[RES_X] x [RES_Y]</string>
+ <string name="aspect_ratio_text">[NUM]:[DEN]</string>
 </panel>

From 081ae32d3508ae95d0c777c927b7a13559590f97 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Wed, 25 Jul 2012 23:08:37 -0500
Subject: [PATCH 092/199] Disable diagnostic fmodex stream allocation
 overrides. (will break on ogg streams. badly.)

---
 indra/llaudio/llaudioengine_fmodex.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp
index 3f90f9cb2..7a8e862e2 100644
--- a/indra/llaudio/llaudioengine_fmodex.cpp
+++ b/indra/llaudio/llaudioengine_fmodex.cpp
@@ -132,9 +132,9 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
 
 	LL_DEBUGS("AppInit") << "LLAudioEngine_FMODEX::init() initializing FMOD" << LL_ENDL;
 
-	result = FMOD::Memory_Initialize(NULL, 0, &decode_alloc, &decode_realloc, &decode_dealloc, FMOD_MEMORY_STREAM_DECODE | FMOD_MEMORY_STREAM_FILE);
-	if(Check_FMOD_Error(result, "FMOD::Memory_Initialize"))
-		return false;
+	//result = FMOD::Memory_Initialize(NULL, 0, &decode_alloc, &decode_realloc, &decode_dealloc, FMOD_MEMORY_STREAM_DECODE | FMOD_MEMORY_STREAM_FILE);
+	//if(Check_FMOD_Error(result, "FMOD::Memory_Initialize"))
+	//	return false;
 
 	result = FMOD::System_Create(&mSystem);
 	if(Check_FMOD_Error(result, "FMOD::System_Create"))

From 07a2c5a81de71bd2a2731c37df7c8047823e226f Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Tue, 24 Jul 2012 11:27:23 -0500
Subject: [PATCH 093/199] Use glFramebufferTexture2D to detach textures from
 FBOs before said textures are 'deleted'(set to NULL via zeroing dimensions).
 May avoid odd LLImageGL::deleteTextures crash on some apple systems.

---
 indra/llrender/llrendertarget.cpp | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp
index 589c0dc0d..93aaf0510 100644
--- a/indra/llrender/llrendertarget.cpp
+++ b/indra/llrender/llrendertarget.cpp
@@ -308,6 +308,8 @@ void LLRenderTarget::release()
 		}
 		else
 		{
+			//Release before delete.
+			glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, LLTexUnit::getInternalType(mUsage), 0, 0);
 			LLImageGL::deleteTextures(mUsage, 0, 0, 1, &mDepth, true);
 			stop_glerror();
 		}
@@ -339,6 +341,9 @@ void LLRenderTarget::release()
 
 	if (mTex.size() > 0)
 	{
+		//Release before delete.
+		for (U32 i = 0; i < mTex.size(); ++i)
+			glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0+i, LLTexUnit::getInternalType(mUsage), 0, 0);
 		sBytesAllocated -= mResX*mResY*4*mTex.size();
 		LLImageGL::deleteTextures(mUsage, mInternalFormat[0], 0, mTex.size(), &mTex[0], true);
 		mTex.clear();
@@ -490,10 +495,21 @@ void LLRenderTarget::flush(bool fetch_depth)
 			}
 			stop_glerror();		
 
+			//Following case never currently evalutes true, but it's still good to have.
 			if (mTex.size() > 1)
-			{		
+			{
 				for (U32 i = 1; i < mTex.size(); ++i)
 				{
+					glDrawBuffer(GL_COLOR_ATTACHMENT0 + i);
+					glReadBuffer(GL_COLOR_ATTACHMENT0 + i);
+					stop_glerror();
+					glBlitFramebuffer(0, 0, mResX, mResY, 0, 0, mResX, mResY, GL_COLOR_BUFFER_BIT, GL_NEAREST);
+					stop_glerror();
+				}
+
+				/*for (U32 i = 1; i < mTex.size(); ++i)
+				{
+
 					glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
 										LLTexUnit::getInternalType(mUsage), mTex[i], 0);
 					stop_glerror();
@@ -510,7 +526,7 @@ void LLRenderTarget::flush(bool fetch_depth)
 					stop_glerror();
 					glFramebufferRenderbuffer(GL_READ_FRAMEBUFFER, GL_COLOR_ATTACHMENT0+i, GL_RENDERBUFFER, mSampleBuffer->mTex[i]);
 					stop_glerror();
-				}
+				}*/
 			}
 			glBindFramebuffer(GL_FRAMEBUFFER, 0);
 		}

From 726d8248c5da697dd3ae3ba01bfa24c593c8b61c Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Thu, 26 Jul 2012 00:17:38 -0500
Subject: [PATCH 094/199] Trying alpha-face rebuild using LL's method.

---
 indra/newview/lldrawable.cpp | 14 +-------------
 indra/newview/llface.cpp     | 15 ++++++++++++++-
 indra/newview/llvovolume.h   |  1 +
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 89e26ccb1..97b9764ab 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -791,19 +791,7 @@ void LLDrawable::updateTexture()
 
 	if (getVOVolume())
 	{
-		/*if (isActive())
-		{
-			if (isRoot())
-			{
-				mQuietCount = 0;
-			}
-			else
-			{
-				getParent()->mQuietCount = 0;
-			}
-		}*/
-				
-		getVOVolume()->mFaceMappingChanged = TRUE;
+		//getVOVolume()->mFaceMappingChanged = TRUE;
 		gPipeline.markRebuild(this, LLDrawable::REBUILD_MATERIAL, TRUE);
 	}
 }
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index fc7a2ae49..ba818ed90 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -319,7 +319,20 @@ void LLFace::setTexture(LLViewerTexture* tex)
 
 void LLFace::dirtyTexture()
 {
-	gPipeline.markTextured(getDrawable());
+	LLDrawable* drawablep = getDrawable();
+
+	if (mVObjp.notNull() && mVObjp->getVolume() && 
+		mTexture.notNull() && mTexture->getComponents() == 4)
+	{ //dirty texture on an alpha object should be treated as an LoD update
+		LLVOVolume* vobj = drawablep->getVOVolume();
+		if (vobj)
+		{
+			vobj->mLODChanged = TRUE;
+		}
+		gPipeline.markRebuild(drawablep, LLDrawable::REBUILD_VOLUME, FALSE);
+	}		
+			
+	gPipeline.markTextured(drawablep);
 }
 
 void LLFace::switchTexture(LLViewerTexture* new_texture)
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index 9fbc50208..dbf9800db 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -297,6 +297,7 @@ public:
 	U8 mTexAnimMode;
 private:
 	friend class LLDrawable;
+	friend class LLFace;
 	
 	BOOL		mFaceMappingChanged;
 	LLFrameTimer mTextureUpdateTimer;

From 701230b49cffa1ca3144c4f98647731094308252 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Thu, 26 Jul 2012 03:05:22 -0500
Subject: [PATCH 095/199] Added LLRenderTarget::resize and did a little
 cleanup.

---
 indra/llrender/llrendertarget.cpp | 100 ++++++++++++++++++---
 indra/llrender/llrendertarget.h   |   8 ++
 indra/newview/pipeline.cpp        | 139 +++++++++++++++---------------
 3 files changed, 166 insertions(+), 81 deletions(-)

diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp
index 93aaf0510..27fec6843 100644
--- a/indra/llrender/llrendertarget.cpp
+++ b/indra/llrender/llrendertarget.cpp
@@ -76,6 +76,42 @@ LLRenderTarget::~LLRenderTarget()
 	release();
 }
 
+void LLRenderTarget::resize(U32 resx, U32 resy, U32 color_fmt)
+{
+	//for accounting, get the number of pixels added/subtracted
+	S32 pix_diff = (resx*resy)-(mResX*mResY);
+
+	mResX = resx;
+	mResY = resy;
+
+	for (U32 i = 0; i < mTex.size(); ++i)
+	{ //resize color attachments
+		gGL.getTexUnit(0)->bindManual(mUsage, mTex[i]);
+		LLImageGL::setManualImage(LLTexUnit::getInternalType(mUsage), 0, color_fmt, mResX, mResY, GL_RGBA, GL_UNSIGNED_BYTE, NULL, false);
+		sBytesAllocated += pix_diff*4;
+	}
+
+	if (mDepth)
+	{ //resize depth attachment
+		if (mStencil)
+		{
+			//use render buffers where stencil buffers are in play
+			glBindRenderbuffer(GL_RENDERBUFFER, mDepth);
+			glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8, mResX, mResY);
+			glBindRenderbuffer(GL_RENDERBUFFER, 0);
+		}
+		else
+		{
+			gGL.getTexUnit(0)->bindManual(mUsage, mDepth);
+			U32 internal_type = LLTexUnit::getInternalType(mUsage);
+			LLImageGL::setManualImage(internal_type, 0, GL_DEPTH_COMPONENT24, mResX, mResY, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL, false);
+		}
+
+		sBytesAllocated += pix_diff*4;
+	}
+	if(mSampleBuffer)
+		mSampleBuffer->resize(resx,resy);
+}
 
 void LLRenderTarget::setSampleBuffer(LLMultisampleBuffer* buffer)
 {
@@ -241,14 +277,14 @@ bool LLRenderTarget::allocateDepth()
 		gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_POINT);
 	}
 
-	sBytesAllocated += mResX*mResY*4;
-
 	if (glGetError() != GL_NO_ERROR)
 	{
 		llwarns << "Unable to allocate depth buffer for render target." << llendl;
 		return false;
 	}
 
+	sBytesAllocated += mResX*mResY*4;
+
 	return true;
 }
 
@@ -309,7 +345,11 @@ void LLRenderTarget::release()
 		else
 		{
 			//Release before delete.
-			glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, LLTexUnit::getInternalType(mUsage), 0, 0);
+			if(mFBO)
+			{
+				glBindFramebuffer(GL_FRAMEBUFFER, mFBO);
+				glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, LLTexUnit::getInternalType(mUsage), 0, 0);
+			}
 			LLImageGL::deleteTextures(mUsage, 0, 0, 1, &mDepth, true);
 			stop_glerror();
 		}
@@ -341,9 +381,6 @@ void LLRenderTarget::release()
 
 	if (mTex.size() > 0)
 	{
-		//Release before delete.
-		for (U32 i = 0; i < mTex.size(); ++i)
-			glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0+i, LLTexUnit::getInternalType(mUsage), 0, 0);
 		sBytesAllocated -= mResX*mResY*4*mTex.size();
 		LLImageGL::deleteTextures(mUsage, mInternalFormat[0], 0, mTex.size(), &mTex[0], true);
 		mTex.clear();
@@ -472,7 +509,7 @@ void LLRenderTarget::flush(bool fetch_depth)
 		stop_glerror();
 		glBindFramebuffer(GL_FRAMEBUFFER, 0);
 		stop_glerror();
-	
+
 		if (mSampleBuffer)
 		{
 			LLGLEnable multisample(GL_MULTISAMPLE);
@@ -482,7 +519,7 @@ void LLRenderTarget::flush(bool fetch_depth)
 			check_framebuffer_status();
 			glBindFramebuffer(GL_READ_FRAMEBUFFER, mSampleBuffer->mFBO);
 			check_framebuffer_status();
-			
+
 			stop_glerror();
 			if(gGLManager.mIsATI)
 			{
@@ -532,7 +569,6 @@ void LLRenderTarget::flush(bool fetch_depth)
 		}
 	}
 }
-
 void LLRenderTarget::copyContents(LLRenderTarget& source, S32 srcX0, S32 srcY0, S32 srcX1, S32 srcY1,
 						S32 dstX0, S32 dstY0, S32 dstX1, S32 dstY1, U32 mask, U32 filter)
 {
@@ -642,7 +678,8 @@ void LLRenderTarget::getViewport(S32* viewport)
 // LLMultisampleBuffer implementation
 //==================================================
 LLMultisampleBuffer::LLMultisampleBuffer() :
-	mSamples(0)
+	mSamples(0),
+	mColorFormat(0)
 {
 
 }
@@ -743,6 +780,7 @@ bool LLMultisampleBuffer::allocate(U32 resx, U32 resy, U32 color_fmt, bool depth
 	mUsage = usage;
 	mUseDepth = depth;
 	mStencil = stencil;
+	mColorFormat = color_fmt;
 
 	{
 
@@ -780,6 +818,42 @@ bool LLMultisampleBuffer::allocate(U32 resx, U32 resy, U32 color_fmt, bool depth
 	return addColorAttachment(color_fmt);
 }
 
+void LLMultisampleBuffer::resize(U32 resx, U32 resy)
+{
+	//for accounting, get the number of pixels added/subtracted
+	S32 pix_diff = (resx*resy)-(mResX*mResY);
+		
+	mResX = resx;
+	mResY = resy;
+
+	for (U32 i = 0; i < mTex.size(); ++i)
+	{ //resize color attachments
+		glBindRenderbuffer(GL_RENDERBUFFER, mTex[i]);
+		glRenderbufferStorageMultisample(GL_RENDERBUFFER, mSamples, mColorFormat, mResX, mResY);
+		glBindRenderbuffer(GL_RENDERBUFFER, 0);
+		sBytesAllocated += pix_diff*4;
+	}
+
+	if (mDepth)
+	{ //resize depth attachment
+		if (mStencil)
+		{
+			//use render buffers where stencil buffers are in play
+			glBindRenderbuffer(GL_RENDERBUFFER, mDepth);
+			glRenderbufferStorageMultisample(GL_RENDERBUFFER, mSamples, GL_DEPTH24_STENCIL8, mResX, mResY);
+			glBindRenderbuffer(GL_RENDERBUFFER, 0);
+		}
+		else
+		{
+			glBindRenderbuffer(GL_RENDERBUFFER, mDepth);
+			glRenderbufferStorageMultisample(GL_RENDERBUFFER, mSamples, GL_DEPTH_COMPONENT24, mResX, mResY);
+			glBindRenderbuffer(GL_RENDERBUFFER, 0);
+			
+		}
+		sBytesAllocated += pix_diff*4;
+	}
+}
+
 bool LLMultisampleBuffer::addColorAttachment(U32 color_fmt)
 {
 	if (color_fmt == 0)
@@ -829,12 +903,13 @@ bool LLMultisampleBuffer::allocateDepth()
 	clear_glerror();
 	if (mStencil)
 	{
-		glRenderbufferStorageMultisample(GL_RENDERBUFFER, mSamples, GL_DEPTH24_STENCIL8, mResX, mResY);	
+		glRenderbufferStorageMultisample(GL_RENDERBUFFER, mSamples, GL_DEPTH24_STENCIL8, mResX, mResY);
 	}
 	else
 	{
-		glRenderbufferStorageMultisample(GL_RENDERBUFFER, mSamples, GL_DEPTH_COMPONENT16_ARB, mResX, mResY);	
+		glRenderbufferStorageMultisample(GL_RENDERBUFFER, mSamples, GL_DEPTH_COMPONENT24, mResX, mResY);
 	}
+
 	if (glGetError() != GL_NO_ERROR)
 	{
 		llwarns << "Unable to allocate depth buffer for multisample render target." << llendl;
@@ -845,4 +920,3 @@ bool LLMultisampleBuffer::allocateDepth()
 	
 	return true;
 }
-
diff --git a/indra/llrender/llrendertarget.h b/indra/llrender/llrendertarget.h
index 9ed95770e..8268f1984 100644
--- a/indra/llrender/llrendertarget.h
+++ b/indra/llrender/llrendertarget.h
@@ -80,6 +80,12 @@ public:
 	//multiple calls will release previously allocated resources
 	bool allocate(U32 resx, U32 resy, U32 color_fmt, bool depth, bool stencil, LLTexUnit::eTextureType usage = LLTexUnit::TT_TEXTURE, bool use_fbo = FALSE);
 
+	//resize existing attachments to use new resolution and color format
+	// CAUTION: if the GL runs out of memory attempting to resize, this render target will be undefined
+	// DO NOT use for screen space buffers or for scratch space for an image that might be uploaded
+	// DO use for render targets that resize often and aren't likely to ruin someone's day if they break
+	void resize(U32 resx, U32 resy, U32 color_fmt);
+
 	//provide this render target with a multisample resource.
 	void setSampleBuffer(LLMultisampleBuffer* buffer);
 
@@ -168,6 +174,7 @@ protected:
 class LLMultisampleBuffer : public LLRenderTarget
 {
 	U32 mSamples;
+	U32 mColorFormat;
 public:
 	LLMultisampleBuffer();
 	virtual ~LLMultisampleBuffer();
@@ -180,6 +187,7 @@ public:
 	bool allocate(U32 resx, U32 resy, U32 color_fmt, bool depth, bool stencil, LLTexUnit::eTextureType usage, bool use_fbo, U32 samples);
 	virtual bool addColorAttachment(U32 color_fmt);
 	virtual bool allocateDepth();
+	void resize(U32 resx, U32 resy);
 };
 
 #endif //!LL_MESA_HEADLESS
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index a3f4374a4..9f4c7b1f7 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -693,9 +693,7 @@ bool LLPipeline::allocateScreenBuffer(U32 resX, U32 resY, U32 samples)
 
 
 		//allocate deferred rendering color buffers
-		static const LLCachedControl<bool> shadow_precision("DeferredHighPrecision",true);
-		const GLuint format = shadow_precision ? GL_RGBA : GL_RGBA16F_ARB;  //TO-DO: Profile 16bit format later
-		if (!mDeferredScreen.allocate(resX, resY, format, TRUE, TRUE, LLTexUnit::TT_RECT_TEXTURE, FALSE)) return false;
+		if (!mDeferredScreen.allocate(resX, resY, GL_RGBA, TRUE, TRUE, LLTexUnit::TT_RECT_TEXTURE, FALSE)) return false;
 		if (!mDeferredDepth.allocate(resX, resY, 0, TRUE, FALSE, LLTexUnit::TT_RECT_TEXTURE, FALSE)) return false;
 		if (!addDeferredAttachments(mDeferredScreen)) return false;
 
@@ -9409,81 +9407,86 @@ void LLPipeline::generateImpostor(LLVOAvatar* avatar)
 
 	stateSort(*LLViewerCamera::getInstance(), result);
 	
-	const LLVector4a* ext = avatar->mDrawable->getSpatialExtents();
-	LLVector3 pos(avatar->getRenderPosition()+avatar->getImpostorOffset());
-
 	LLCamera camera = *viewer_camera;
-
-	camera.lookAt(viewer_camera->getOrigin(), pos, viewer_camera->getUpAxis());
-	
 	LLVector2 tdim;
+	U32 resY = 0;
+	U32 resX = 0;
 
-
-	LLVector4a half_height;
-	half_height.setSub(ext[1], ext[0]);
-	half_height.mul(0.5f);
-
-	LLVector4a left;
-	left.load3(camera.getLeftAxis().mV);
-	left.mul(left);
-	left.normalize3fast();
-
-	LLVector4a up;
-	up.load3(camera.getUpAxis().mV);
-	up.mul(up);
-	up.normalize3fast();
-
-	tdim.mV[0] = fabsf(half_height.dot3(left).getF32());
-	tdim.mV[1] = fabsf(half_height.dot3(up).getF32());
-
-	gGL.matrixMode(LLRender::MM_PROJECTION);
-	gGL.pushMatrix();
-	
-	F32 distance = (pos-camera.getOrigin()).length();
-	F32 fov = atanf(tdim.mV[1]/distance)*2.f*RAD_TO_DEG;
-	F32 aspect = tdim.mV[0]/tdim.mV[1];
-	glh::matrix4f persp = gl_perspective(fov, aspect, 1.f, 256.f);
-	glh_set_current_projection(persp);
-	gGL.loadMatrix(persp.m);
-
-	gGL.matrixMode(LLRender::MM_MODELVIEW);
-	gGL.pushMatrix();
-	glh::matrix4f mat;
-	camera.getOpenGLTransform(mat.m);
-
-	mat = glh::matrix4f((GLfloat*) OGL_TO_CFR_ROTATION) * mat;
-
-	gGL.loadMatrix(mat.m);
-	glh_set_current_modelview(mat);
-
-	glClearColor(0.0f,0.0f,0.0f,0.0f);
-	gGL.setColorMask(true, true);
-	
-	// get the number of pixels per angle
-	F32 pa = gViewerWindow->getWindowHeightRaw() / (RAD_TO_DEG * viewer_camera->getView());
-
-	//get resolution based on angle width and height of impostor (double desired resolution to prevent aliasing)
-	U32 resY = llmin(nhpo2((U32) (fov*pa)), (U32) 512);
-	U32 resX = llmin(nhpo2((U32) (atanf(tdim.mV[0]/distance)*2.f*RAD_TO_DEG*pa)), (U32) 512);
-
-	if (!avatar->mImpostor.isComplete() || resX != avatar->mImpostor.getWidth() ||
-		resY != avatar->mImpostor.getHeight())
 	{
-		static const LLCachedControl<bool> shadow_precision("DeferredHighPrecision",true); //TO-DO: Profile 16bit format later
-		avatar->mImpostor.allocate(resX,resY, (!LLPipeline::sRenderDeferred || shadow_precision) ? GL_RGBA : GL_RGBA16F_ARB,TRUE,FALSE);
+		const LLVector4a* ext = avatar->mDrawable->getSpatialExtents();
+		LLVector3 pos(avatar->getRenderPosition()+avatar->getImpostorOffset());
 
-		if (LLPipeline::sRenderDeferred)
+		camera.lookAt(viewer_camera->getOrigin(), pos, viewer_camera->getUpAxis());
+	
+		LLVector4a half_height;
+		half_height.setSub(ext[1], ext[0]);
+		half_height.mul(0.5f);
+
+		LLVector4a left;
+		left.load3(camera.getLeftAxis().mV);
+		left.mul(left);
+		left.normalize3fast();
+
+		LLVector4a up;
+		up.load3(camera.getUpAxis().mV);
+		up.mul(up);
+		up.normalize3fast();
+
+		tdim.mV[0] = fabsf(half_height.dot3(left).getF32());
+		tdim.mV[1] = fabsf(half_height.dot3(up).getF32());
+
+		gGL.matrixMode(LLRender::MM_PROJECTION);
+		gGL.pushMatrix();
+	
+		F32 distance = (pos-camera.getOrigin()).length();
+		F32 fov = atanf(tdim.mV[1]/distance)*2.f*RAD_TO_DEG;
+		F32 aspect = tdim.mV[0]/tdim.mV[1];
+		glh::matrix4f persp = gl_perspective(fov, aspect, 1.f, 256.f);
+		glh_set_current_projection(persp);
+		gGL.loadMatrix(persp.m);
+
+		gGL.matrixMode(LLRender::MM_MODELVIEW);
+		gGL.pushMatrix();
+		glh::matrix4f mat;
+		camera.getOpenGLTransform(mat.m);
+
+		mat = glh::matrix4f((GLfloat*) OGL_TO_CFR_ROTATION) * mat;
+
+		gGL.loadMatrix(mat.m);
+		glh_set_current_modelview(mat);
+
+		glClearColor(0.0f,0.0f,0.0f,0.0f);
+		gGL.setColorMask(true, true);
+	
+		// get the number of pixels per angle
+		F32 pa = gViewerWindow->getWindowHeightRaw() / (RAD_TO_DEG * viewer_camera->getView());
+
+		//get resolution based on angle width and height of impostor (double desired resolution to prevent aliasing)
+		resY = llmin(nhpo2((U32) (fov*pa)), (U32) 512);
+		resX = llmin(nhpo2((U32) (atanf(tdim.mV[0]/distance)*2.f*RAD_TO_DEG*pa)), (U32) 512);
+
+		if (!avatar->mImpostor.isComplete())
 		{
-			addDeferredAttachments(avatar->mImpostor);
+			avatar->mImpostor.allocate(resX,resY,GL_RGBA,TRUE,FALSE);
+
+			if (LLPipeline::sRenderDeferred)
+			{
+				addDeferredAttachments(avatar->mImpostor);
+			}
+		
+			gGL.getTexUnit(0)->bind(&avatar->mImpostor);
+			gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_POINT);
+			gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+		}
+		else if(resX != avatar->mImpostor.getWidth() ||
+			resY != avatar->mImpostor.getHeight())
+		{
+			avatar->mImpostor.resize(resX,resY,GL_RGBA);
 		}
 
-		gGL.getTexUnit(0)->bind(&avatar->mImpostor);
-		gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_POINT);
-		gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+		avatar->mImpostor.bindTarget();
 	}
 
-	avatar->mImpostor.bindTarget();
-
 	if (LLPipeline::sRenderDeferred)
 	{
 		avatar->mImpostor.clear();

From 27d8d100c538eae39011ae5f33bd3bdd05d9dfa0 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Fri, 27 Jul 2012 12:55:13 -0400
Subject: [PATCH 096/199] Fix for log file name with datestamp checkbox on Comm
 Prefs Panel never enabling, and thus being intangible.

Also, enable local chat loggings by default.
---
 indra/newview/app_settings/settings_per_account.xml | 6 +++---
 indra/newview/llprefsim.cpp                         | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index ba157bd6a..b422fae32 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -461,7 +461,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>LogChatIM</key>
     <map>
@@ -472,7 +472,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>LogChatTimestamp</key>
     <map>
@@ -483,7 +483,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>LogInstantMessages</key>
     <map>
diff --git a/indra/newview/llprefsim.cpp b/indra/newview/llprefsim.cpp
index e0eee0c72..ac803a6e7 100644
--- a/indra/newview/llprefsim.cpp
+++ b/indra/newview/llprefsim.cpp
@@ -53,8 +53,6 @@
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
-class AIDirPicker;
-
 class LLPrefsIMImpl : public LLPanel
 {
 public:
@@ -269,6 +267,7 @@ void LLPrefsIMImpl::setPersonalInfo(const std::string& visibility, bool im_via_e
 	childEnable("log_chat_timestamp");
 	childEnable("log_chat_IM");
 	childEnable("log_date_timestamp");
+	childEnable("logfile_name_datestamp");
 	
 	//RN: get wide string so replace char can work (requires fixed-width encoding)
 	LLWString busy_response = utf8str_to_wstring( gSavedPerAccountSettings.getString("BusyModeResponse") );

From b987c025dbf4c8254a7efc5d9e66b38662041411 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sat, 28 Jul 2012 07:49:04 -0400
Subject: [PATCH 097/199] Update to notifications.xml, fix for Sound upload
 missing a string.

Notifications brought up to date from V-D, Tazy, and a few touchups of my own.
Added notification for status_SeeAVs from upstream, and hooked it into our icon.

Strings update from Tazy.
---
 indra/newview/llstatusbar.cpp                 |  7 ++
 .../skins/default/xui/en-us/notifications.xml | 64 +++++++++++--------
 .../skins/default/xui/en-us/strings.xml       |  3 +-
 3 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 987dbee5c..f9af3a2a9 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -122,6 +122,7 @@ static void onClickFly(void*);
 static void onClickPush(void*);
 static void onClickVoice(void*);
 static void onClickBuild(void*);
+static void onClickSeeAV(void*);
 static void onClickScripts(void*);
 static void onClickBuyLand(void*);
 static void onClickScriptDebug(void*);
@@ -168,6 +169,7 @@ mSquareMetersCommitted(0)
 	childSetAction("buyland", onClickBuyLand, this );
 	childSetAction("buycurrency", onClickBuyCurrency, this );
 	childSetAction("no_build", onClickBuild, this );
+	childSetAction("status_SeeAV", onClickSeeAV, this );
 	childSetAction("no_scripts", onClickScripts, this );
 	childSetAction("restrictpush", onClickPush, this );
 	childSetAction("status_no_voice", onClickVoice, this );
@@ -831,6 +833,11 @@ static void onClickBuild(void*)
 	LLNotificationsUtil::add("NoBuild");
 }
 
+static void onClickSeeAV(void*)
+{
+	LLNotificationsUtil::add("SeeAvatars");
+}
+
 static void onClickScripts(void*)
 {
 	LLViewerRegion* region = gAgent.getRegion();
diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml
index 7e3f668e4..83da40766 100644
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" ?><notifications>
-  
   <global name="skipnexttime">
 
 		Don&apos;t show me this again
@@ -180,7 +179,7 @@ The media filters have been cleared
    name="MissingAlert"
    label="Unknown Alert Message"
    type="alertmodal">
-Your version of [APP_NAME] does not know how to display the alert message it just received.
+Your version of [APP_NAME] does not know how to display the alert message it just received.  Please verify that you have the latest [APP_NAME] installed.
 
 Error details: The alert called &apos;[_NAME]&apos; was not found in notifications.xml.
     <usetemplate
@@ -254,7 +253,7 @@ An error occurred while updating [APP_NAME]. Please download the latest version
    icon="alertmodal.tga"
    name="LoginFailedNoNetwork"
    type="alertmodal">
-Could not connect to the [SECOND_LIFE_GRID]. 
+Could not connect to the [SECOND_LIFE_GRID].
 &apos;[DIAGNOSTIC]&apos;
 Make sure your Internet connection is working properly.
 	<usetemplate
@@ -415,7 +414,7 @@ Save all changes to clothing/body parts?
    icon="alertmodal.tga"
    name="GrantModifyRights"
    type="alertmodal">
-Granting modify rights to another resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission.
+Granting modify rights to another Resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission.
 Do you want to grant modify rights for [NAME]?
     <usetemplate
      name="okcancelbuttons"
@@ -427,7 +426,7 @@ Do you want to grant modify rights for [NAME]?
    icon="alertmodal.tga"
    name="GrantModifyRightsMultiple"
    type="alertmodal">
-Granting modify rights to another resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission.
+Granting modify rights to another Resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission.
 Do you want to grant modify rights for the selected Residents?
     <usetemplate
      name="okcancelbuttons"
@@ -1619,7 +1618,7 @@ Could not find &apos;data&apos; chunk in WAV header:
 Wrong chunk size in WAV file:
 [FILE]
   </notification>
-  
+
   <notification
    icon="alertmodal.tga"
    name="SoundFileInvalidTooLong"
@@ -1694,11 +1693,11 @@ Unable to upload [FILE] due to the following reason: [REASON]
 Please try again later.
   </notification>
 
-   <notification
-    icon="alertmodal.tga"
-    name="UploadCostConfirmation"
-    type="alertmodal">
-This upload will cost L$[PRICE], do you wish to continue with the upload?
+  <notification
+   icon="alertmodal.tga"
+   name="UploadCostConfirmation"
+   type="alertmodal">
+This upload will cost [CURRENCY][PRICE], do you wish to continue with the upload?
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -1831,7 +1830,7 @@ Sorry, but system was unable to locate landmark destination.
   <notification
    icon="alertmodal.tga"
    name="timeout_tport"
-   type="alertmodal">
+   type="notifytip">
 Sorry, but system was unable to complete the teleport connection.  Try again in a moment.
   </notification>
   <notification
@@ -1855,7 +1854,7 @@ The asset queue in this region is currently clogged so your teleport request wil
   <notification
    icon="alertmodal.tga"
    name="expired_tport"
-   type="alertmodal">
+   type="notifytip">
 Sorry, but the system was unable to complete your teleport request in a timely fashion. Please try again in a few minutes.
   </notification>
   <notification
@@ -1896,7 +1895,9 @@ Unable to force land ownership because selection spans multiple regions. Please
    icon="alertmodal.tga"
    name="ForceOwnerAuctionWarning"
    type="alertmodal">
-This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some residents unhappy if bidding has begun. Force ownership?
+This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some Residents unhappy if bidding has begun.
+Force ownership?
+    <tag>confirm</tag>
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -2634,7 +2635,7 @@ You have been moved into a nearby region.
   <notification
    icon="alertmodal.tga"
    name="ClothingLoading"
-   type="alertmodal">
+   type="notifytip">
 Your clothing is still downloading.
 You can use [SECOND_LIFE] normally and other people will see you correctly.
     <form name="form">
@@ -2860,7 +2861,7 @@ Can&apos;t add estate owner to estate &apos;Banned Resident&apos; list.
   <notification
    icon="alertmodal.tga"
    name="CanNotChangeAppearanceUntilLoaded"
-   type="alertmodal">
+   type="notifytip">
 Can&apos;t change appearance until clothing and shape are loaded.
   </notification>
 
@@ -3061,6 +3062,7 @@ Visit the [SECOND_LIFE] Public Issue Tracker, where you can report bugs and othe
    name="WebLaunchSinguIssue"
    type="alertmodal">
 Visit the Singularity Issue Tracker, to report bugs and issues with Singularity Viewer.
+Please be sure that your report won't be a duplicate of an existing one.
     <usetemplate
      ignoretext="When launching web browser to view Singularity Issue Tracker"
      name="okcancelignore"
@@ -3096,7 +3098,7 @@ Go to the Official [GRID_OWNER] Blog, for the latest news and information.
    icon="alertmodal.tga"
    name="WebLaunchLSLGuide"
    type="alertmodal">
-Go to the Scripting Guide for scripting help?
+Do you want to open the Scripting Guide for help with scripting?
     <usetemplate
      ignoretext="When launching web browser to view the Scripting Guide"
      name="okcancelignore"
@@ -3108,7 +3110,7 @@ Go to the Scripting Guide for scripting help?
    icon="alertmodal.tga"
    name="WebLaunchLSLWiki"
    type="alertmodal">
-Go to the LSL Portal for scripting help?
+Do you want to visit the LSL Portal for help with scripting?
     <usetemplate
      ignoretext="When launching web browser to view the LSL Portal"
      name="okcancelignore"
@@ -3715,7 +3717,7 @@ You can click &apos;Change Preference&apos; to raise your maturity Rating prefer
 	  icon="alertmodal.tga"
 	  name="TooManyPrimsSelected"
 	  type="alertmodal">
-		"There are too many prims selected.  Please select [MAX_PRIM_COUNT] or fewer prims and try again"
+There are too many prims selected.  Please select [MAX_PRIM_COUNT] or fewer prims and try again
 		<usetemplate
 		 name="okbutton"
 		 yestext="OK"/>
@@ -4231,7 +4233,7 @@ Default: off
    label="Voice Version Mismatch"
    name="VoiceVersionMismatch"
    type="alertmodal">
-This version of [APP_NAME] is not compatible with the Voice Chat feature in this region. Please upgrate to the latest version.
+This version of [APP_NAME] is not compatible with the Voice Chat feature in this region. In order for Voice Chat to function correctly you will need to update [APP_NAME].
   </notification>
 
   <notification
@@ -5520,7 +5522,7 @@ Terrain.raw downloaded
    icon="notifytip.tga"
    name="GestureMissing"
    type="notifytip">
-Gesture [NAME] is missing from database.
+Gesture [NAME] is missing from the database.
   </notification>
 
   <notification
@@ -5879,7 +5881,7 @@ The objects on the selected parcel of land that is owned by [NAME] have been ret
    icon="notify.tga"
    name="OtherObjectsReturned2"
    type="notify">
-The objects on the selected parcel of land owned by the resident &apos;[NAME]&apos; have been returned to their owner.
+The objects on the selected parcel of land owned by the Resident &apos;[NAME]&apos; have been returned to their owner.
   </notification>
 
   <notification
@@ -5912,7 +5914,7 @@ You can be hurt here. If you die, you will be teleported to your home location.
    name="NoFly"
    type="notify">
 This land has flying disabled (&apos;no fly&apos;).
-You cannot fly here.
+You cannot fly here, without Always allow fly enabled from System preferences.
     <unique/>
   </notification>
 
@@ -5942,6 +5944,14 @@ You cannot create objects here.
     <unique/>
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="SeeAvatars"
+   type="notify">
+    <unique/>    
+This parcel hides avatars and text chat from another parcel.   You can&apos;t see other residents outside the parcel, and those outside are not able to see you.  Regular text chat on channel 0 is also blocked.
+  </notification>
+
   <notification
    icon="notify.tga"
    name="ScriptsStopped"
@@ -5961,14 +5971,14 @@ This region is not running any scripts.
    name="NoOutsideScripts"
    type="notify">
 This land has outside scripts disabled (&apos;no outside scripts&apos;).
-No scripts will run except those belonging to the land owner.
+No scripts will work here except those belonging to the land owner.
   </notification>
 
   <notification
    icon="notify.tga"
    name="ClaimPublicLand"
    type="notify">
-Can only claim public land in region you&apos;re in.
+You can only claim public land in the Region you&apos;re in.
   </notification>
 
   <notification
@@ -6225,6 +6235,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
    name="GodMessage"
    type="notify">
 [NAME]
+
 [MESSAGE]
   </notification>
 
@@ -6253,7 +6264,7 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
    icon="notify.tga"
    name="TeleportOffered"
    type="notify">
-[NAME] has offered to teleport you to his or her location:
+[NAME] has offered to teleport you to their location:
 
 [MESSAGE]
     <form name="form">
@@ -7299,4 +7310,3 @@ Your shape, skin, hair or eyes might be defect.
 
 
 </notifications>
-
diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index 863827baa..3a74a841d 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -263,7 +263,8 @@
 	<string name="load_files">Load Files</string>
 	<string name="choose_the_directory">Choose Directory</string>
 
- 
+	<string name="Sound: ">Sound: </string>
+
 	<!-- LSL Usage Hover Tips -->
   <string name="LSLTipSleepTime">
 Sleeps script for [SLEEP_TIME] seconds.

From 6ed9a625011a706cc53dce83cc1f334891c34537 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sat, 28 Jul 2012 16:56:19 +0200
Subject: [PATCH 098/199] Disable texture auditing at start-up

---
 indra/newview/app_settings/settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 54f1e1402..a60999386 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1883,7 +1883,7 @@
       <key>Comment</key>
       <string>Enable texture auditting.</string>
       <key>Persist</key>
-      <integer>1</integer>
+      <integer>0</integer>
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>

From 1d1947c51a5599566318ba55cd09db71f388de73 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sun, 29 Jul 2012 04:28:11 -0500
Subject: [PATCH 099/199] Reworked LLPostProcess and implemented FBO support
 (much faster if multiple post shaders are enabled, or need a lot of passes).
 Tweaked LLRenderTarget to support depth textures if FBO support is lacking.
 Prefer LLRenderTarget::getFBO() over LLRenderTarget::sUseFBO when determining
 how to handle a specific LLRenderTarget object. (Decoupling to simplify logic
 without having to track a global)

---
 indra/llrender/llpostprocess.cpp              | 696 +++++++++++-------
 indra/llrender/llpostprocess.h                | 274 +++----
 indra/llrender/llrender.cpp                   |   2 +-
 indra/llrender/llrendertarget.cpp             |  37 +-
 indra/llrender/llrendertarget.h               |   2 +
 .../shaders/class1/effects/PosterizeF.glsl    |  23 +
 .../windlight/postprocesseffects.xml          |   6 +-
 indra/newview/llfloaterdaycycle.cpp           |   1 -
 indra/newview/llfloaterpostprocess.cpp        |  26 +-
 indra/newview/llfloaterwater.cpp              |   1 -
 indra/newview/llfloaterwindlight.cpp          |   1 -
 indra/newview/llstartup.cpp                   |   1 -
 indra/newview/llviewerdisplay.cpp             |  14 +-
 indra/newview/llviewershadermgr.cpp           |  18 +
 indra/newview/llviewerwindow.cpp              |   2 +-
 indra/newview/pipeline.cpp                    |  10 +-
 .../xui/en-us/floater_post_process.xml        |  19 +
 17 files changed, 660 insertions(+), 473 deletions(-)
 create mode 100644 indra/newview/app_settings/shaders/class1/effects/PosterizeF.glsl

diff --git a/indra/llrender/llpostprocess.cpp b/indra/llrender/llpostprocess.cpp
index 25e775c1e..e09d0f349 100644
--- a/indra/llrender/llpostprocess.cpp
+++ b/indra/llrender/llpostprocess.cpp
@@ -33,34 +33,247 @@
 #include "linden_common.h"
 
 #include "llpostprocess.h"
-#include "llglslshader.h"
-#include "llsdserialize.h"
-#include "llrender.h"
-#include "llvertexbuffer.h"
 
 #include "lldir.h"
+#include "llgl.h"
+#include "llglslshader.h"
+#include "llrender.h"
+#include "llsdserialize.h"
+#include "llsdutil.h"
+#include "llsdutil_math.h"
+#include "llvertexbuffer.h"
+#include "llfasttimer.h"
+
 extern LLGLSLShader			gPostColorFilterProgram;
 extern LLGLSLShader			gPostNightVisionProgram;
 extern LLGLSLShader			gPostGaussianBlurProgram;
+extern LLGLSLShader			gPostPosterizeProgram;
 
 static const unsigned int NOISE_SIZE = 512;
 
-/// CALCULATING LUMINANCE (Using NTSC lum weights)
-/// http://en.wikipedia.org/wiki/Luma_%28video%29
-static const float LUMINANCE_R = 0.299f;
-static const float LUMINANCE_G = 0.587f;
-static const float LUMINANCE_B = 0.114f;
-
 static const char * const XML_FILENAME = "postprocesseffects.xml";
 
-LLPostProcess::LLPostProcess(void) : 
-					mVBO(NULL),  
-					mAllEffects(LLSD::emptyMap()),
-					mScreenWidth(1), mScreenHeight(1)
+template<> LLSD LLPostProcessShader::LLShaderSetting<LLVector4>::getDefaultValue()
 {
-	mSceneRenderTexture = NULL ; 
-	mNoiseTexture = NULL ;
-					
+	return mDefault.getValue();
+}
+template<> void LLPostProcessShader::LLShaderSetting<LLVector4>::setValue(const LLSD& value)
+{
+	mValue = ll_vector4_from_sd(value); 
+}
+
+LLSD LLPostProcessShader::getDefaults()
+{
+	LLSD defaults;
+	for(std::vector<LLShaderSettingBase*>::iterator it=mSettings.begin();it!=mSettings.end();++it)
+	{
+		defaults[(*it)->mSettingName]=(*it)->getDefaultValue();
+	}
+	return defaults;
+}
+void LLPostProcessShader::loadSettings(const LLSD& settings)
+{
+	for(std::vector<LLShaderSettingBase*>::iterator it=mSettings.begin();it!=mSettings.end();++it)
+	{
+		LLSD value = settings[(*it)->mSettingName];
+		(*it)->setValue(value);
+	}
+}
+
+class LLColorFilterShader : public LLPostProcessShader
+{
+private:
+	LLShaderSetting<bool> mEnabled;
+	LLShaderSetting<F32> mGamma, mBrightness, mContrast, mSaturation;
+	LLShaderSetting<LLVector4> mContrastBase;
+public:
+	LLColorFilterShader() :
+		mEnabled("enable_color_filter",false),
+		mGamma("gamma",1.f),
+		mBrightness("brightness",1.f),
+		mContrast("contrast",1.f),
+		mSaturation("saturation",1.f),
+		mContrastBase("contrast_base",LLVector4(1.f,1.f,1.f,0.5f))
+	{
+		mSettings.push_back(&mEnabled);
+		mSettings.push_back(&mGamma);
+		mSettings.push_back(&mBrightness);
+		mSettings.push_back(&mContrast);
+		mSettings.push_back(&mSaturation);
+		mSettings.push_back(&mContrastBase);
+	}
+
+	bool isEnabled()	{ return mEnabled && gPostColorFilterProgram.mProgramObject; }
+	S32 getColorChannel()	{ return 0; }
+	S32 getDepthChannel()	{ return -1; }
+
+	QuadType bind()
+	{
+		if(!isEnabled())
+			return QUAD_NONE;
+
+		/// CALCULATING LUMINANCE (Using NTSC lum weights)
+		/// http://en.wikipedia.org/wiki/Luma_%28video%29
+		static const float LUMINANCE_R = 0.299f;
+		static const float LUMINANCE_G = 0.587f;
+		static const float LUMINANCE_B = 0.114f;
+
+		gPostColorFilterProgram.bind();
+
+		gPostColorFilterProgram.uniform1f("gamma", mGamma);
+		gPostColorFilterProgram.uniform1f("brightness", mBrightness);
+		gPostColorFilterProgram.uniform1f("contrast", mContrast);
+		float baseI = (mContrastBase.mValue[VX] + mContrastBase.mValue[VY] + mContrastBase.mValue[VZ]) / 3.0f;
+		baseI = mContrastBase.mValue[VW] / ((baseI < 0.001f) ? 0.001f : baseI);
+		float baseR = mContrastBase.mValue[VX] * baseI;
+		float baseG = mContrastBase.mValue[VY] * baseI;
+		float baseB = mContrastBase.mValue[VZ] * baseI;
+		gPostColorFilterProgram.uniform3fv("contrastBase", 1, LLVector3(baseR, baseG, baseB).mV);
+		gPostColorFilterProgram.uniform1f("saturation", mSaturation);
+		gPostColorFilterProgram.uniform3fv("lumWeights", 1, LLVector3(LUMINANCE_R, LUMINANCE_G, LUMINANCE_B).mV);
+		return QUAD_NORMAL;
+	}
+	bool draw(U32 pass) {return pass == 1;}
+	void unbind()
+	{
+		gPostColorFilterProgram.unbind();
+	}
+};
+
+class LLNightVisionShader : public LLPostProcessShader
+{
+private:
+	LLShaderSetting<bool> mEnabled;
+	LLShaderSetting<F32> mBrightnessMult, mNoiseStrength;
+public:
+	LLNightVisionShader() : 
+		mEnabled("enable_night_vision",false),
+		mBrightnessMult("brightness_multiplier",3.f),
+		mNoiseStrength("noise_strength",.4f)
+	{
+		mSettings.push_back(&mEnabled);
+		mSettings.push_back(&mBrightnessMult);
+		mSettings.push_back(&mNoiseStrength);
+	}
+	bool isEnabled()	{ return mEnabled && gPostNightVisionProgram.mProgramObject; }
+	S32 getColorChannel()	{ return 0; }
+	S32 getDepthChannel()	{ return -1; }
+	QuadType bind()
+	{
+		if(!isEnabled())
+			return QUAD_NONE;
+
+		gPostNightVisionProgram.bind();
+
+		LLPostProcess::getInstance()->bindNoise(1);
+	
+		gPostNightVisionProgram.uniform1f("brightMult", mBrightnessMult);
+		gPostNightVisionProgram.uniform1f("noiseStrength", mNoiseStrength);
+		
+		return QUAD_NOISE;
+		
+	}
+	bool draw(U32 pass) {return pass == 1;}
+	void unbind()
+	{
+		gPostNightVisionProgram.unbind();
+	}
+};
+
+class LLGaussBlurShader : public LLPostProcessShader
+{
+private:
+	LLShaderSetting<bool> mEnabled;
+	LLShaderSetting<S32> mNumPasses;
+	GLint mPassLoc;
+public:
+	LLGaussBlurShader() :
+		mEnabled("enable_gauss_blur",false),
+		mNumPasses("gauss_blur_passes",2),
+		mPassLoc(0)
+	{
+		mSettings.push_back(&mEnabled);
+		mSettings.push_back(&mNumPasses);
+	}
+	bool isEnabled()	{ return mEnabled && mNumPasses && gPostGaussianBlurProgram.mProgramObject; }
+	S32 getColorChannel()	{ return 0; }
+	S32 getDepthChannel()	{ return -1; }
+	QuadType bind()
+	{
+		if(!isEnabled())
+			return QUAD_NONE;
+
+		gPostGaussianBlurProgram.bind();
+
+		mPassLoc = gPostGaussianBlurProgram.getUniformLocation("horizontalPass");
+
+		return QUAD_NORMAL;
+	}
+	bool draw(U32 pass) 
+	{
+		if((S32)pass > mNumPasses*2)
+			return false;
+		glUniform1iARB(mPassLoc, (pass-1) % 2);
+		return true;
+	}
+	void unbind()
+	{
+		gPostGaussianBlurProgram.unbind();
+	}
+};
+
+class LLPosterizeShader : public LLPostProcessShader
+{
+private:
+	LLShaderSetting<bool> mEnabled;
+	LLShaderSetting<S32> mNumLayers;
+public:
+	LLPosterizeShader() :
+		mEnabled("enable_posterize",false),
+		mNumLayers("posterize_layers",2)
+	{
+		mSettings.push_back(&mEnabled);
+		mSettings.push_back(&mNumLayers);
+	}
+	bool isEnabled()	{ return mEnabled && gPostPosterizeProgram.mProgramObject; }
+	S32 getColorChannel()	{ return 0; }
+	S32 getDepthChannel()	{ return -1; }
+	QuadType bind()
+	{
+		if(!isEnabled())
+			return QUAD_NONE;
+
+		gPostPosterizeProgram.bind();
+
+		gPostPosterizeProgram.uniform1i("layerCount", mNumLayers);
+
+		return QUAD_NORMAL;
+	}
+	bool draw(U32 pass) 
+	{
+		return pass == 1;
+	}
+	void unbind()
+	{
+		gPostPosterizeProgram.unbind();
+	}
+};
+
+LLPostProcess::LLPostProcess(void) : 
+					mVBO(NULL),
+					mDepthTexture(0),
+					mNoiseTexture(NULL),
+					mScreenWidth(0),
+					mScreenHeight(0),
+					mNoiseTextureScale(0.f),
+					mSelectedEffectInfo(LLSD::emptyMap()),
+					mAllEffectInfo(LLSD::emptyMap())
+{
+	mShaders.push_back(new LLColorFilterShader());
+	mShaders.push_back(new LLNightVisionShader());
+	mShaders.push_back(new LLGaussBlurShader());
+	mShaders.push_back(new LLPosterizeShader());
+
 	/*  Do nothing.  Needs to be updated to use our current shader system, and to work with the move into llrender.*/
 	std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME));
 	LL_DEBUGS2("AppInit", "Shaders") << "Loading PostProcess Effects settings from " << pathName << LL_ENDL;
@@ -71,99 +284,43 @@ LLPostProcess::LLPostProcess(void) :
 	{
 		LLPointer<LLSDParser> parser = new LLSDXMLParser();
 
-		parser->parse(effectsXML, mAllEffects, LLSDSerialize::SIZE_UNLIMITED);
+		parser->parse(effectsXML, mAllEffectInfo, LLSDSerialize::SIZE_UNLIMITED);
 	}
 
-	if (!mAllEffects.has("default"))
+	if (!mAllEffectInfo.has("default"))
+		mAllEffectInfo["default"] = LLSD::emptyMap();
+
+	LLSD& defaults = mAllEffectInfo["default"];
+
+	for(std::list<LLPointer<LLPostProcessShader> >::iterator it=mShaders.begin();it!=mShaders.end();++it)
 	{
-		LLSD & defaultEffect = (mAllEffects["default"] = LLSD::emptyMap());
-
-		/*defaultEffect["enable_night_vision"] = LLSD::Boolean(false);
-		defaultEffect["enable_color_filter"] = LLSD::Boolean(false);*/
-
-		/// NVG Defaults
-		defaultEffect["brightness_multiplier"] = 3.0;
-		defaultEffect["noise_size"] = 25.0;
-		defaultEffect["noise_strength"] = 0.4;
-
-		// TODO BTest potentially add this to tweaks?
-		mNoiseTextureScale = 1.0f;
-
-		/// Color Filter Defaults
-		defaultEffect["gamma"] = 1.0;
-		defaultEffect["brightness"] = 1.0;
-		defaultEffect["contrast"] = 1.0;
-		defaultEffect["saturation"] = 1.0;
-
-		LLSD& contrastBase = (defaultEffect["contrast_base"] = LLSD::emptyArray());
-		contrastBase.append(1.0);
-		contrastBase.append(1.0);
-		contrastBase.append(1.0);
-		contrastBase.append(0.5);
-
-		defaultEffect["gauss_blur_passes"] = 2;
+		LLSD shader_defaults = (*it)->getDefaults();
+		for (LLSD::map_const_iterator it2 = defaults.beginMap();it2 != defaults.endMap();++it2)
+		{
+			if(!defaults.has(it2->first))
+				defaults[it2->first]=it2->second;
+		}
+	}
+	for(std::list<LLPointer<LLPostProcessShader> >::iterator it=mShaders.begin();it!=mShaders.end();++it)
+	{
+		(*it)->loadSettings(defaults);
 	}
-
 	setSelectedEffect("default");
-	// */
 }
 
 LLPostProcess::~LLPostProcess(void)
 {
-	invalidate() ;
-}
-
-/*static*/void LLPostProcess::cleanupClass()
-{
-	if(instanceExists())
-		getInstance()->invalidate() ;
-}
-
-void LLPostProcess::setSelectedEffect(std::string const & effectName)
-{
-	mSelectedEffectName = effectName;
-	static_cast<LLSD &>(tweaks) = mAllEffects[effectName];
-}
-
-void LLPostProcess::saveEffect(std::string const & effectName)
-{
-	mAllEffects[effectName] = tweaks;
-
-	std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME));
-	//llinfos << "Saving PostProcess Effects settings to " << pathName << llendl;
-
-	llofstream effectsXML(pathName);
-
-	LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
-
-	formatter->format(mAllEffects, effectsXML);
-}
-void LLPostProcess::invalidate()
-{
-	mSceneRenderTexture = NULL ;
-	mNoiseTexture = NULL ;
-	mVBO = NULL ;
-}
-
-void LLPostProcess::apply(unsigned int width, unsigned int height)
-{
-	if(shadersEnabled())
-	{
-		if (mVBO.isNull() || width != mScreenWidth || height != mScreenHeight)
-		{
-			initialize(width, height);
-		}
-		doEffects();
-	}
+	destroyGL() ;
 }
 
 void LLPostProcess::initialize(unsigned int width, unsigned int height)
 {
-	invalidate();
+	destroyGL();
 	mScreenWidth = width;
 	mScreenHeight = height;
 
-	createScreenTexture();
+	createScreenTextures();
+	createNoiseTexture();
 
 	//Setup our VBO.
 	{
@@ -185,127 +342,129 @@ void LLPostProcess::initialize(unsigned int width, unsigned int height)
 
 		mVBO->flush();
 	}
-
-	checkError();
-	createNoiseTexture();
-	checkError();
+	stop_glerror();
 }
 
-inline bool LLPostProcess::shadersEnabled(void)
+void LLPostProcess::createScreenTextures()
 {
-	return (tweaks.useColorFilter().asBoolean() ||
-			tweaks.useNightVisionShader().asBoolean() ||
-			tweaks.useGaussBlurFilter().asBoolean() );
+	const LLTexUnit::eTextureType type = LLTexUnit::TT_RECT_TEXTURE;
+
+	mRenderTarget[0].allocate(mScreenWidth,mScreenHeight,GL_RGBA,FALSE,FALSE,type,FALSE);
+	if(mRenderTarget[0].getFBO())//Only need pingpong between two rendertargets if FBOs are supported.
+		mRenderTarget[1].allocate(mScreenWidth,mScreenHeight,GL_RGBA,FALSE,FALSE,type,FALSE);
+	stop_glerror();
+
+	if(mDepthTexture)
+		LLImageGL::deleteTextures(type, 0, 0, 1, &mDepthTexture, true);
+
+	LLImageGL::generateTextures(type, GL_DEPTH_COMPONENT24, 1, &mDepthTexture);
+	gGL.getTexUnit(0)->bindManual(type, mDepthTexture);
+	LLImageGL::setManualImage(LLTexUnit::getInternalType(type), 0, GL_DEPTH_COMPONENT24, mScreenWidth, mScreenHeight, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL, false);
+	stop_glerror();
+	gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_POINT);
+	gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_CLAMP);
+	stop_glerror();
 }
 
-void LLPostProcess::applyShaders(void)
-{
-	bool copy_buffer = false;
-	if (tweaks.useColorFilter())
-	{
-		applyColorFilterShader();
-		checkError();
-		copy_buffer = true;
-	}
-	if (tweaks.useGaussBlurFilter())
-	{
-		/// If any of the above shaders have been called update the frame buffer;
-		if (copy_buffer)
-			copyFrameBuffer();
-		applyGaussBlurShader();
-		checkError();
-		copy_buffer = true;
-	}
-	if (tweaks.useNightVisionShader())
-	{
-		/// If any of the above shaders have been called update the frame buffer;
-		if (copy_buffer)
-			copyFrameBuffer();
-		applyNightVisionShader();
-		checkError();
-		copy_buffer = true;
-	}
-}
-
-void LLPostProcess::applyColorFilterShader(void)
+void LLPostProcess::createNoiseTexture()
 {	
-	if(gPostColorFilterProgram.mProgramObject == 0)
-		return;
-
-	gPostColorFilterProgram.bind();
-
-	gGL.getTexUnit(0)->bind(mSceneRenderTexture);
-
-	gPostColorFilterProgram.uniform1f("gamma", tweaks.getGamma());
-	gPostColorFilterProgram.uniform1f("brightness", tweaks.getBrightness());
-	gPostColorFilterProgram.uniform1f("contrast", tweaks.getContrast());
-	float baseI = (tweaks.getContrastBaseR() + tweaks.getContrastBaseG() + tweaks.getContrastBaseB()) / 3.0f;
-	baseI = tweaks.getContrastBaseIntensity() / ((baseI < 0.001f) ? 0.001f : baseI);
-	float baseR = tweaks.getContrastBaseR() * baseI;
-	float baseG = tweaks.getContrastBaseG() * baseI;
-	float baseB = tweaks.getContrastBaseB() * baseI;
-	gPostColorFilterProgram.uniform3fv("contrastBase", 1, LLVector3(baseR, baseG, baseB).mV);
-	gPostColorFilterProgram.uniform1f("saturation", tweaks.getSaturation());
-	gPostColorFilterProgram.uniform3fv("lumWeights", 1, LLVector3(LUMINANCE_R, LUMINANCE_G, LUMINANCE_B).mV);
-		
-	/// Draw a screen space quad
-	drawOrthoQuad(QUAD_NORMAL);
-	gPostColorFilterProgram.unbind();
-}
-
-void LLPostProcess::applyNightVisionShader(void)
-{	
-	if(gPostNightVisionProgram.mProgramObject == 0)
-		return;
-
-	gPostNightVisionProgram.bind();
-
-	gGL.getTexUnit(0)->bind(mSceneRenderTexture);
-	gGL.getTexUnit(1)->bind(mNoiseTexture);
-	
-	gPostNightVisionProgram.uniform1f("brightMult", tweaks.getBrightMult());
-	gPostNightVisionProgram.uniform1f("noiseStrength", tweaks.getNoiseStrength());
-	mNoiseTextureScale = 0.001f + ((100.f - tweaks.getNoiseSize()) / 100.f);
-	mNoiseTextureScale *= (mScreenHeight / NOISE_SIZE);
-	
-	/// Draw a screen space quad
-	drawOrthoQuad(QUAD_NOISE);
-	gPostNightVisionProgram.unbind();
-}
-
-void LLPostProcess::applyGaussBlurShader(void)
-{
-	int pass_count = tweaks.getGaussBlurPasses();
-	if(!pass_count || gPostGaussianBlurProgram.mProgramObject == 0)
-		return;
-
-	gPostGaussianBlurProgram.bind();
-
-	gGL.getTexUnit(0)->bind(mSceneRenderTexture);
-
-	GLint horiz_pass = gPostGaussianBlurProgram.getUniformLocation("horizontalPass");
-	for(int i = 0;i<pass_count;++i)
-	{
-		for(int j = 0;j<2;++j)
-		{
-			if(i || j)
-				copyFrameBuffer();		
-			glUniform1iARB(horiz_pass, j);
-			drawOrthoQuad(QUAD_NORMAL);
+	std::vector<GLubyte> buffer(NOISE_SIZE * NOISE_SIZE);
+	for (unsigned int i = 0; i < NOISE_SIZE; i++){
+		for (unsigned int k = 0; k < NOISE_SIZE; k++){
+			buffer[(i * NOISE_SIZE) + k] = (GLubyte)((double) rand() / ((double) RAND_MAX + 1.f) * 255.f);
+		}
+	}
+
+	for(std::list<LLPointer<LLPostProcessShader> >::iterator it=mShaders.begin();it!=mShaders.end();++it)
+	{
+		if((*it)->getDepthChannel()>=0)
+		{
+			mNoiseTexture = new LLImageGL(FALSE) ;
+			if(mNoiseTexture->createGLTexture())
+			{
+				gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, mNoiseTexture->getTexName());
+				LLImageGL::setManualImage(GL_TEXTURE_2D, 0, GL_LUMINANCE, NOISE_SIZE, NOISE_SIZE, GL_LUMINANCE, GL_UNSIGNED_BYTE, &buffer[0]);
+				stop_glerror();
+				gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_BILINEAR);
+				gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_WRAP);
+				stop_glerror();
+				break;
+			}
+		}
+	}
+}
+
+void LLPostProcess::destroyGL()
+{
+	mRenderTarget[0].release();
+	mRenderTarget[1].release();
+	if(mDepthTexture)
+		LLImageGL::deleteTextures(LLTexUnit::TT_RECT_TEXTURE, 0, 0, 1, &mDepthTexture, true);
+	mDepthTexture=0;
+	mNoiseTexture = NULL ;
+	mVBO = NULL ;
+}
+
+/*static*/void LLPostProcess::cleanupClass()
+{
+	if(instanceExists())
+		getInstance()->destroyGL() ;
+}
+
+void LLPostProcess::copyFrameBuffer()
+{
+	mRenderTarget[!!mRenderTarget[0].getFBO()].bindTexture(0,0);
+	glCopyTexSubImage2D(GL_TEXTURE_RECTANGLE_ARB,0,0,0,0,0,mScreenWidth, mScreenHeight);
+
+	if(mDepthTexture)
+	{
+		for(std::list<LLPointer<LLPostProcessShader> >::iterator it=mShaders.begin();it!=mShaders.end();++it)
+		{
+			if((*it)->isEnabled() && (*it)->getDepthChannel()>=0)
+			{
+				gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_RECT_TEXTURE, mDepthTexture);
+				glCopyTexSubImage2D(GL_TEXTURE_RECTANGLE_ARB,0,0,0,0,0,mScreenWidth, mScreenHeight);
+				break;
+			}
+		}
+	}
+
+}
+
+void LLPostProcess::bindNoise(U32 channel)
+{
+	gGL.getTexUnit(channel)->bind(mNoiseTexture);
+}
+
+void LLPostProcess::renderEffects(unsigned int width, unsigned int height)
+{
+	for(std::list<LLPointer<LLPostProcessShader> >::iterator it=mShaders.begin();it!=mShaders.end();++it)
+	{
+		if((*it)->isEnabled())
+		{
+			if (mVBO.isNull() || width != mScreenWidth || height != mScreenHeight)
+			{
+				initialize(width, height);
+			}
+			doEffects();
+			return;
 		}
 	}
-	gPostGaussianBlurProgram.unbind();
 }
 
 void LLPostProcess::doEffects(void)
 {
 	LLVertexBuffer::unbind();
 
+	mNoiseTextureScale = 0.001f + ((100.f - mSelectedEffectInfo["noise_size"].asFloat()) / 100.f);
+	mNoiseTextureScale *= (mScreenHeight / NOISE_SIZE);
+
 	/// Copy the screen buffer to the render texture
 	copyFrameBuffer();
+	stop_glerror();
 
 	//Disable depth. Set blendmode to replace.
-	LLGLDepthTest depth(GL_FALSE);
+	LLGLDepthTest depth(GL_FALSE,GL_FALSE);
 	LLGLEnable blend(GL_BLEND);
 	gGL.setSceneBlendType(LLRender::BT_REPLACE);
 
@@ -319,7 +478,6 @@ void LLPostProcess::doEffects(void)
 	gGL.loadIdentity();
 	
 	applyShaders();
-	checkError();
 
 	LLGLSLShader::bindNoShader();
 
@@ -333,13 +491,46 @@ void LLPostProcess::doEffects(void)
 	gGL.setSceneBlendType(LLRender::BT_ALPHA);	//Restore blendstate. Alpha is ASSUMED for hud/ui render, etc.
 
 	gGL.getTexUnit(1)->disable();
-	checkError();
 }
 
-void LLPostProcess::copyFrameBuffer()
+void LLPostProcess::applyShaders(void)
 {
-	gGL.getTexUnit(0)->bindManual(mSceneRenderTexture->getTarget(), mSceneRenderTexture->getTexName());
-	glCopyTexImage2D(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, 0, 0, mScreenWidth, mScreenHeight, 0);
+	QuadType quad;
+	bool primary_rendertarget = 1;
+	for(std::list<LLPointer<LLPostProcessShader> >::iterator it=mShaders.begin();it!=mShaders.end();++it)
+	{
+		if((quad = (*it)->bind()) != QUAD_NONE)
+		{
+			S32 color_channel = (*it)->getColorChannel();
+			S32 depth_channel = (*it)->getDepthChannel();
+
+			if(depth_channel >= 0)
+				gGL.getTexUnit(depth_channel)->bindManual(LLTexUnit::TT_RECT_TEXTURE, mDepthTexture);
+
+			U32 pass = 1;
+
+			while((*it)->draw(pass++))
+			{
+				mRenderTarget[!primary_rendertarget].bindTarget();
+
+				if(color_channel >= 0)
+					mRenderTarget[mRenderTarget[0].getFBO() ? primary_rendertarget : !primary_rendertarget].bindTexture(0,color_channel);
+
+				drawOrthoQuad(quad);
+				mRenderTarget[!primary_rendertarget].flush();
+				if(mRenderTarget[0].getFBO())
+					primary_rendertarget = !primary_rendertarget;
+			}
+			(*it)->unbind();
+		}
+	}
+	//Only need to copy to framebuffer if FBOs are supported, else we've already been drawing to the framebuffer to begin with.
+	if(mRenderTarget[0].getFBO())
+	{
+		//copyContentsToFramebuffer also binds the main framebuffer.
+		LLRenderTarget::copyContentsToFramebuffer(mRenderTarget[primary_rendertarget],0,0,mScreenWidth,mScreenHeight,0,0,mScreenWidth,mScreenHeight,GL_COLOR_BUFFER_BIT, GL_NEAREST);
+	}
+	stop_glerror();
 }
 
 void LLPostProcess::drawOrthoQuad(QuadType type)
@@ -364,64 +555,59 @@ void LLPostProcess::drawOrthoQuad(QuadType type)
 	mVBO->drawArrays(LLRender::TRIANGLE_STRIP, 0, 4);
 }
 
-void LLPostProcess::createScreenTexture()
+void LLPostProcess::setSelectedEffect(std::string const & effectName)
 {
-	std::vector<GLubyte> data(mScreenWidth * mScreenHeight * 3, 0) ;
-
-	mSceneRenderTexture = new LLImageGL(FALSE) ;	
-	if(mSceneRenderTexture->createGLTexture())
+	mSelectedEffectName = effectName;
+	mSelectedEffectInfo = mAllEffectInfo[effectName];
+	for(std::list<LLPointer<LLPostProcessShader> >::iterator it=mShaders.begin();it!=mShaders.end();++it)
 	{
-		gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_RECT_TEXTURE, mSceneRenderTexture->getTexName());
-		LLImageGL::setManualImage(GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGB, mScreenWidth, mScreenHeight, GL_RGB, GL_UNSIGNED_BYTE, &data[0]);
-		gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_POINT);
-		gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_CLAMP);
+		(*it)->loadSettings(mSelectedEffectInfo);
 	}
 }
 
-void LLPostProcess::createNoiseTexture()
-{	
-	std::vector<GLubyte> buffer(NOISE_SIZE * NOISE_SIZE);
-	for (unsigned int i = 0; i < NOISE_SIZE; i++){
-		for (unsigned int k = 0; k < NOISE_SIZE; k++){
-			buffer[(i * NOISE_SIZE) + k] = (GLubyte)((double) rand() / ((double) RAND_MAX + 1.f) * 255.f);
-		}
-	}
-
-	mNoiseTexture = new LLImageGL(FALSE) ;
-	if(mNoiseTexture->createGLTexture())
-	{
-		gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, mNoiseTexture->getTexName());
-		LLImageGL::setManualImage(GL_TEXTURE_2D, 0, GL_LUMINANCE, NOISE_SIZE, NOISE_SIZE, GL_LUMINANCE, GL_UNSIGNED_BYTE, &buffer[0]);
-		gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_BILINEAR);
-		gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_WRAP);
-	}
-}
-
-bool LLPostProcess::checkError(void)
+void LLPostProcess::setSelectedEffectValue(std::string const & setting, LLSD& value)
 {
-	GLenum glErr;
-    bool    retCode = false;
-
-    glErr = glGetError();
-    while (glErr != GL_NO_ERROR)
-    {
-		// shaderErrorLog << (const char *) gluErrorString(glErr) << std::endl;
-		char const * err_str_raw = (const char *) gluErrorString(glErr);
-
-		if(err_str_raw == NULL)
-		{
-			std::ostringstream err_builder;
-			err_builder << "unknown error number " << glErr;
-			mShaderErrorString = err_builder.str();
-		}
-		else
-		{
-			mShaderErrorString = err_str_raw;
-		}
-
-        retCode = true;
-        glErr = glGetError();
-    }
-    return retCode;
+	char buf[256];
+	S32 elem=0;
+	if(sscanf(setting.c_str(),"%255[^[][%d]", buf, &elem) == 2)
+	{
+		mSelectedEffectInfo[buf][elem] = value;
+	}
+	else
+	{
+		mSelectedEffectInfo[setting] = value;
+	}
+	for(std::list<LLPointer<LLPostProcessShader> >::iterator it=mShaders.begin();it!=mShaders.end();++it)
+	{
+		(*it)->loadSettings(mSelectedEffectInfo);
+	}
 }
 
+void LLPostProcess::resetSelectedEffect()
+{
+	if(!llsd_equals(mAllEffectInfo[mSelectedEffectName], mSelectedEffectInfo))
+	{
+		mSelectedEffectInfo = mAllEffectInfo[mSelectedEffectName];
+		for(std::list<LLPointer<LLPostProcessShader> >::iterator it=mShaders.begin();it!=mShaders.end();++it)
+		{
+			(*it)->loadSettings(mSelectedEffectInfo);
+		}
+	}
+}
+
+void LLPostProcess::saveEffectAs(std::string const & effectName)
+{
+	mAllEffectInfo[effectName] = mSelectedEffectInfo;
+
+	std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight", XML_FILENAME));
+	//llinfos << "Saving PostProcess Effects settings to " << pathName << llendl;
+
+	llofstream effectsXML(pathName);
+
+	LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
+
+	formatter->format(mAllEffectInfo, effectsXML);
+}
+
+
+
diff --git a/indra/llrender/llpostprocess.h b/indra/llrender/llpostprocess.h
index 459fa6851..830598a92 100644
--- a/indra/llrender/llpostprocess.h
+++ b/indra/llrender/llpostprocess.h
@@ -34,189 +34,123 @@
 #define LL_POSTPROCESS_H
 
 #include <map>
-#include <fstream>
-#include "llgl.h"
-#include "llglheaders.h"
+#include "llsd.h"
+#include "llrendertarget.h"
+
+class LLSD;
+
+typedef enum _QuadType {
+	QUAD_NONE,
+	QUAD_NORMAL,
+	QUAD_NOISE
+} QuadType;
+
+//LLPostProcessShader is an attempt to encapsulate the shaders a little better.
+class LLPostProcessShader : public LLRefCount //Abstract. PostProcess shaders derive off of this common base.
+{
+protected:
+	//LLShaderSetting is used to associate key names to member variables to avoid LLSD lookups when drawing.
+	//It also facilitates automating the assigning of defaults to, as well as parsing from, the effects LLSD list.
+	//This replaces the entire old PostProcessTweaks structure. More will be done in the future to move into a more
+	//xml-driven configuration.
+	struct LLShaderSettingBase
+	{
+		LLShaderSettingBase(const char* name) : mSettingName(name) {}
+		const char* mSettingName;							//LLSD key names as found in postprocesseffects.xml. eg 'contrast_base'
+		virtual LLSD getDefaultValue() = 0;					//Converts the member variable as an LLSD. Used to set defaults absent in postprocesseffects.xml
+		virtual void setValue(const LLSD& value) = 0;		//Connects the LLSD element to the member variable. Used when loading effects (such as default)
+	};
+	template<typename T>
+	struct LLShaderSetting : public LLShaderSettingBase
+	{
+		LLShaderSetting(const char* setting_name, T def) : LLShaderSettingBase(setting_name), mValue(def), mDefault(def) {}
+		T mValue;												//The member variable mentioned above.
+		T mDefault;												//Set via ctor. Value is inserted into the defaults LLSD list if absent from postprocesseffects.xml
+		LLSD getDefaultValue() { return mDefault; }				//See LLShaderSettingBase::getDefaultValue
+		void setValue(const LLSD& value) { mValue = value; }	//See LLShaderSettingBase::setValue
+		operator T() { return mValue; }							//Typecast operator overload so this object can be handled as if it was whatever T represents.
+	};
+	std::vector<LLShaderSettingBase*> mSettings;	//Contains a list of all the 'settings' this shader uses. Manually add via push_back in ctor.
+public:
+	virtual ~LLPostProcessShader() {};
+	virtual bool isEnabled() = 0;		//Returning false avoids bind/draw/unbind calls. If no shaders are enabled, framebuffer copying is skipped.
+	virtual S32 getColorChannel() = 0;	//If color buffer is used in this shader returns > -1 to cue LLPostProcess on copying it from the framebuffer. 
+	virtual S32 getDepthChannel() = 0;	//If depth buffer is used in this shader returns > -1 to cue LLPostProcess on copying it from the framebuffer.
+	virtual QuadType bind() = 0;		//Bind shader and textures, set up attribs. Returns the 'type' of quad to be drawn.
+	virtual bool draw(U32 pass) = 0;	//returning false means finished. Used to update per-pass attributes and such. LLPostProcess will call
+										//drawOrthoQuad when this returns true, increment pass, then call this again, and keep repeating this until false is returned.
+	virtual void unbind() = 0;			//Unbind shader and textures.
+
+	LLSD getDefaults();							//Returns a full LLSD kvp list filled with default values.
+	void loadSettings(const LLSD& settings);	//Parses the effects LLSD list and sets the member variables linked to them (via LLShaderSetting::setValue())
+};
+
+//LLVector4 does not implicitly convert to and from LLSD, so template specilizations are necessary.
+template<> LLSD LLPostProcessShader::LLShaderSetting<LLVector4>::getDefaultValue();
+template<> void LLPostProcessShader::LLShaderSetting<LLVector4>::setValue(const LLSD& value);
 
 class LLPostProcess : public LLSingleton<LLPostProcess>
 {
-public:
-
-	typedef enum _QuadType {
-		QUAD_NORMAL,
-		QUAD_NOISE
-	} QuadType;
-
-	/// GLSL Shader Encapsulation Struct
-	//typedef std::map<const char *, GLuint> glslUniforms;
-
-	struct PostProcessTweaks : public LLSD {
-		inline PostProcessTweaks() : LLSD(LLSD::emptyMap())
-		{
-		}
-
-		inline LLSD & brightMult() {
-			return (*this)["brightness_multiplier"];
-		}
-
-		inline LLSD & noiseStrength() {
-			return (*this)["noise_strength"];
-		}
-
-		inline LLSD & noiseSize() {
-			return (*this)["noise_size"];
-		}
-
-		inline LLSD & brightness() {
-			return (*this)["brightness"];
-		}
-
-		inline LLSD & contrast() {
-			return (*this)["contrast"];
-		}
-
-		inline LLSD & contrastBaseR() {
-			return (*this)["contrast_base"][0];
-		}
-
-		inline LLSD & contrastBaseG() {
-			return (*this)["contrast_base"][1];
-		}
-
-		inline LLSD & contrastBaseB() {
-			return (*this)["contrast_base"][2];
-		}
-
-		inline LLSD & contrastBaseIntensity() {
-			return (*this)["contrast_base"][3];
-		}
-
-		inline LLSD & saturation() {
-			return (*this)["saturation"];
-		}
-
-		inline LLSD & useNightVisionShader() {
-			return (*this)["enable_night_vision"];
-		}
-
-		inline LLSD & useColorFilter() {
-			return (*this)["enable_color_filter"];
-		}
-	
-		inline LLSD & useGaussBlurFilter() {
-			return (*this)["enable_gauss_blur"];
-		}
-
-		inline F32 getBrightMult() const {
-			return F32((*this)["brightness_multiplier"].asReal());
-		}
-
-		inline F32 getNoiseStrength() const {
-			return F32((*this)["noise_strength"].asReal());
-		}
-
-		inline F32 getNoiseSize() const {
-			return F32((*this)["noise_size"].asReal());
-		}
-
-		inline F32 getGamma() const {
-			return F32((*this)["gamma"].asReal());
-		}
-
-		inline F32 getBrightness() const {
-			return F32((*this)["brightness"].asReal());
-		}
-
-		inline F32 getContrast() const {
-			return F32((*this)["contrast"].asReal());
-		}
-
-		inline F32 getContrastBaseR() const {
-			return F32((*this)["contrast_base"][0].asReal());
-		}
-
-		inline F32 getContrastBaseG() const {
-			return F32((*this)["contrast_base"][1].asReal());
-		}
-
-		inline F32 getContrastBaseB() const {
-			return F32((*this)["contrast_base"][2].asReal());
-		}
-
-		inline F32 getContrastBaseIntensity() const {
-			return F32((*this)["contrast_base"][3].asReal());
-		}
-
-		inline F32 getSaturation() const {
-			return F32((*this)["saturation"].asReal());
-		}
-
-		inline LLSD & getGaussBlurPasses() {
-			return (*this)["gauss_blur_passes"];
-		}
-	};
-
-	PostProcessTweaks tweaks;
-
-	// the map of all availible effects
-	LLSD mAllEffects;
-
 private:
+	std::list<LLPointer<LLPostProcessShader> > mShaders;	//List of all registered LLPostProcessShader instances.
+
 	LLPointer<LLVertexBuffer> mVBO;
-	LLPointer<LLImageGL> mSceneRenderTexture ;
+	U32 mNextDrawTarget;	//Need to pingpong between two rendertargets. Cannot sample target texture of currently bound FBO.
+							// However this is ONLY the case if fbos are actually supported, else swapping isn't needed.
+	LLRenderTarget mRenderTarget[2];
+	U32 mDepthTexture;
 	LLPointer<LLImageGL> mNoiseTexture ;
+	
+	U32 mScreenWidth;
+	U32 mScreenHeight;
+	F32 mNoiseTextureScale;
+
+	//  The name of currently selected effect in mAllEffectInfo
+	std::string mSelectedEffectName;
+	//  The map of settings for currently selected effect.
+	LLSD mSelectedEffectInfo;
+	//  The map of all availible effects
+	LLSD mAllEffectInfo;
 
 public:
 	LLPostProcess(void);
-
 	~LLPostProcess(void);
+private:
+	// OpenGL initialization
+	void initialize(unsigned int width, unsigned int height);	//Sets mScreenWidth and mScreenHeight
+																// calls createScreenTextures and createNoiseTexture
+																// creates VBO
+	void createScreenTextures();								//Creates color texture and depth texture(if needed).
+	void createNoiseTexture();									//Creates 'random' noise texture.
 
-	void apply(unsigned int width, unsigned int height);
-	void invalidate() ;
-
-	// Cleanup of global data that's only inited once per class.
+public:
+	// Teardown
+	//  Called on destroyGL or cleanupClass. Releases VBOs, rendertargets and textures.
+	void destroyGL();
+	//  Cleanup of global data that's only inited once per class.
 	static void cleanupClass();
 
-	void setSelectedEffect(std::string const & effectName);
-
-	inline std::string const & getSelectedEffect(void) const {
-		return mSelectedEffectName;
-	}
-
-	void saveEffect(std::string const & effectName);
-
-private:
-		/// read in from file
-	std::string mShaderErrorString;
-	unsigned int mScreenWidth;
-	unsigned int mScreenHeight;
-
-	float mNoiseTextureScale;
-	
-	// the name of currently selected effect in mAllEffects
-	// invariant: tweaks == mAllEffects[mSelectedEffectName]
-	std::string mSelectedEffectName;
-
-	/// General functions
-	void initialize(unsigned int width, unsigned int height);
-	void doEffects(void);
-	void applyShaders(void);
-	bool shadersEnabled(void);
-
-	/// Night Vision Functions
-	void applyNightVisionShader(void);
-
-	/// Color Filter Functions
-	void applyColorFilterShader(void);
-
-	/// Gaussian blur Filter Functions
-	void applyGaussBlurShader(void);
-
-	/// OpenGL Helper Functions
+	// Setup for draw.
 	void copyFrameBuffer();
-	void createScreenTexture();
-	void createNoiseTexture();
-	bool checkError(void);
-	void drawOrthoQuad(QuadType type);
+	void bindNoise(U32 channel);
+	
+	// Draw
+	void renderEffects(unsigned int width, unsigned int height);	//Entry point for newview.
+private:
+	void doEffects(void);				//Sets up viewmatrix, blits the framebuffer, then calls applyShaders.
+	void applyShaders(void);			//Iterates over all active post shaders, manages binding, calls drawOrthoQuad for render.
+	void drawOrthoQuad(QuadType type);	//Finally draws fullscreen quad with the shader currently bound.
+
+public:
+	// UI interaction
+	//  Getters
+	inline LLSD const & getAllEffectInfo(void) const				{ return mAllEffectInfo; }
+	inline std::string const & getSelectedEffectName(void) const	{ return mSelectedEffectName; }
+	inline LLSD const & getSelectedEffectInfo(void) const			{ return mSelectedEffectInfo; }
+	//  Setters
+	void setSelectedEffect(std::string const & effectName);
+	void setSelectedEffectValue(std::string const & setting, LLSD& value);
+	void resetSelectedEffect();
+	void saveEffectAs(std::string const & effectName);
 };
 #endif // LL_POSTPROCESS_H
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index d73b17a51..b952a0e4b 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -380,7 +380,7 @@ bool LLTexUnit::bind(LLRenderTarget* renderTarget, bool bindDepth)
 
 	if (bindDepth)
 	{
-		if (renderTarget->hasStencil())
+		if (renderTarget->hasStencil() && renderTarget->getFBO())
 		{
 			llerrs << "Cannot bind a render buffer for sampling.  Allocate render target without a stencil buffer if sampling of depth buffer is required." << llendl;
 		}
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp
index 27fec6843..c75304957 100644
--- a/indra/llrender/llrendertarget.cpp
+++ b/indra/llrender/llrendertarget.cpp
@@ -93,7 +93,7 @@ void LLRenderTarget::resize(U32 resx, U32 resy, U32 color_fmt)
 
 	if (mDepth)
 	{ //resize depth attachment
-		if (mStencil)
+		if (mStencil && mFBO)
 		{
 			//use render buffers where stencil buffers are in play
 			glBindRenderbuffer(GL_RENDERBUFFER, mDepth);
@@ -104,7 +104,10 @@ void LLRenderTarget::resize(U32 resx, U32 resy, U32 color_fmt)
 		{
 			gGL.getTexUnit(0)->bindManual(mUsage, mDepth);
 			U32 internal_type = LLTexUnit::getInternalType(mUsage);
-			LLImageGL::setManualImage(internal_type, 0, GL_DEPTH_COMPONENT24, mResX, mResY, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL, false);
+			if(!mStencil)
+				LLImageGL::setManualImage(internal_type, 0, GL_DEPTH_COMPONENT24, mResX, mResY, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL, false);
+			else
+				LLImageGL::setManualImage(internal_type, 0, GL_DEPTH24_STENCIL8, mResX, mResY, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, NULL, false);
 		}
 
 		sBytesAllocated += pix_diff*4;
@@ -131,9 +134,10 @@ bool LLRenderTarget::allocate(U32 resx, U32 resy, U32 color_fmt, bool depth, boo
 	mUsage = usage;
 	mUseDepth = depth;
 
-
 	if ((sUseFBO || use_fbo) && gGLManager.mHasFramebufferObject)
 	{
+		glGenFramebuffers(1, (GLuint *) &mFBO);
+
 		if (depth)
 		{
 			if (!allocateDepth())
@@ -143,8 +147,6 @@ bool LLRenderTarget::allocate(U32 resx, U32 resy, U32 color_fmt, bool depth, boo
 			}
 		}
 
-		glGenFramebuffers(1, (GLuint *) &mFBO);
-
 		if (mDepth)
 		{
 			glBindFramebuffer(GL_FRAMEBUFFER, mFBO);
@@ -162,7 +164,7 @@ bool LLRenderTarget::allocate(U32 resx, U32 resy, U32 color_fmt, bool depth, boo
 			}
 			glBindFramebuffer(GL_FRAMEBUFFER, 0);
 		}
-		
+
 		stop_glerror();
 	}
 
@@ -255,7 +257,7 @@ bool LLRenderTarget::addColorAttachment(U32 color_fmt)
 
 bool LLRenderTarget::allocateDepth()
 {
-	if (mStencil)
+	if (mStencil && mFBO)
 	{
 		//use render buffers where stencil buffers are in play
 		glGenRenderbuffers(1, (GLuint *) &mDepth);
@@ -267,13 +269,19 @@ bool LLRenderTarget::allocateDepth()
 	}
 	else
 	{
-		LLImageGL::generateTextures(mUsage, GL_DEPTH_COMPONENT24, 1, &mDepth);
+		if(!mStencil)
+			LLImageGL::generateTextures(mUsage, GL_DEPTH_COMPONENT24, 1, &mDepth);
+		else
+			LLImageGL::generateTextures(mUsage, GL_DEPTH24_STENCIL8, 1, &mDepth);
 		gGL.getTexUnit(0)->bindManual(mUsage, mDepth);
 		
 		U32 internal_type = LLTexUnit::getInternalType(mUsage);
 		stop_glerror();
 		clear_glerror();
-		LLImageGL::setManualImage(internal_type, 0, GL_DEPTH_COMPONENT24, mResX, mResY, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL, false);
+		if(!mStencil)
+			LLImageGL::setManualImage(internal_type, 0, GL_DEPTH_COMPONENT24, mResX, mResY, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL, false);
+		else
+			LLImageGL::setManualImage(internal_type, 0, GL_DEPTH24_STENCIL8, mResX, mResY, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, NULL, false);
 		gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_POINT);
 	}
 
@@ -337,7 +345,7 @@ void LLRenderTarget::release()
 {
 	if (mDepth)
 	{
-		if (mStencil)
+		if (mStencil && mFBO)
 		{
 			glDeleteRenderbuffers(1, (GLuint*) &mDepth);
 			stop_glerror();
@@ -490,6 +498,7 @@ void LLRenderTarget::flush(bool fetch_depth)
 	{
 		gGL.getTexUnit(0)->bind(this);
 		glCopyTexSubImage2D(LLTexUnit::getInternalType(mUsage), 0, 0, 0, 0, 0, mResX, mResY);
+		stop_glerror();
 
 		if (fetch_depth)
 		{
@@ -498,8 +507,10 @@ void LLRenderTarget::flush(bool fetch_depth)
 				allocateDepth();
 			}
 
-			gGL.getTexUnit(0)->bind(this);
-			glCopyTexImage2D(LLTexUnit::getInternalType(mUsage), 0, GL_DEPTH24_STENCIL8, 0, 0, mResX, mResY, 0);
+			gGL.getTexUnit(0)->bind(this,true);
+			glCopyTexSubImage2D(LLTexUnit::getInternalType(mUsage), 0, 0, 0, 0, 0, mResX, mResY);
+			stop_glerror();
+			//glCopyTexImage2D(LLTexUnit::getInternalType(mUsage), 0, GL_DEPTH24_STENCIL8, 0, 0, mResX, mResY, 0);
 		}
 
 		gGL.getTexUnit(0)->disable();
@@ -589,7 +600,7 @@ void LLRenderTarget::copyContents(LLRenderTarget& source, S32 srcX0, S32 srcY0,
 	}
 	else
 	{
-		if (mask == GL_DEPTH_BUFFER_BIT && source.mStencil != mStencil)
+		if (mask == GL_DEPTH_BUFFER_BIT && !mStencil && source.mStencil != mStencil)
 		{
 			stop_glerror();
 		
diff --git a/indra/llrender/llrendertarget.h b/indra/llrender/llrendertarget.h
index 8268f1984..d9a529ff0 100644
--- a/indra/llrender/llrendertarget.h
+++ b/indra/llrender/llrendertarget.h
@@ -151,6 +151,8 @@ public:
 	//one renderable attachment (i.e. color buffer, depth buffer).
 	bool isComplete() const;
 
+	U32 getFBO() const {return mFBO;}
+
 	static LLRenderTarget* getCurrentBoundTarget() { return sBoundTarget; }
 
 protected:
diff --git a/indra/newview/app_settings/shaders/class1/effects/PosterizeF.glsl b/indra/newview/app_settings/shaders/class1/effects/PosterizeF.glsl
new file mode 100644
index 000000000..1da0cdbad
--- /dev/null
+++ b/indra/newview/app_settings/shaders/class1/effects/PosterizeF.glsl
@@ -0,0 +1,23 @@
+/**
+ * @file colorFilterF.glsl
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+ 
+#extension GL_ARB_texture_rectangle : enable
+ 
+#ifdef DEFINE_GL_FRAGCOLOR
+out vec4 gl_FragColor;
+#endif
+
+uniform sampler2DRect tex0;
+uniform int layerCount;
+
+VARYING vec2 vary_texcoord0;
+
+void main(void) 
+{
+	vec3 color = pow(floor(pow(vec3(texture2D(tex0, vary_texcoord0.st)),vec3(.6)) * layerCount)/layerCount,vec3(1.66666));
+	gl_FragColor = vec4(color, 1.0);
+}
diff --git a/indra/newview/app_settings/windlight/postprocesseffects.xml b/indra/newview/app_settings/windlight/postprocesseffects.xml
index 9261f3287..0914b275a 100644
--- a/indra/newview/app_settings/windlight/postprocesseffects.xml
+++ b/indra/newview/app_settings/windlight/postprocesseffects.xml
@@ -174,6 +174,8 @@
 			<boolean>0</boolean>
 			<key>enable_gauss_blur</key>
 			<boolean>0</boolean>
+      <key>enable_posterize</key>
+      <boolean>0</boolean>
 			<key>gauss_blur_passes</key>
 			<integer>2</integer>
 			<key>extract_high</key>
@@ -186,6 +188,8 @@
 			<real>0.40000000000000002</real>
 			<key>saturation</key>
 			<real>1</real>
-		</map>
+      <key>posterize_layers</key>
+      <real>10</real>
+    </map>
 	</map>
 </llsd>
\ No newline at end of file
diff --git a/indra/newview/llfloaterdaycycle.cpp b/indra/newview/llfloaterdaycycle.cpp
index 4f6b5fb5a..7028e5016 100644
--- a/indra/newview/llfloaterdaycycle.cpp
+++ b/indra/newview/llfloaterdaycycle.cpp
@@ -57,7 +57,6 @@
 #include "lldaycyclemanager.h"
 #include "llwlparamset.h"
 #include "llwlparammanager.h"
-#include "llpostprocess.h"
 #include "llfloaterwindlight.h"
 
 
diff --git a/indra/newview/llfloaterpostprocess.cpp b/indra/newview/llfloaterpostprocess.cpp
index 40eb5e048..dc4af9e94 100644
--- a/indra/newview/llfloaterpostprocess.cpp
+++ b/indra/newview/llfloaterpostprocess.cpp
@@ -115,17 +115,7 @@ LLFloaterPostProcess* LLFloaterPostProcess::instance()
 
 void LLFloaterPostProcess::onControlChanged(LLUICtrl* ctrl, void* userData)
 {
-	char const *VariableName = (char const *)userData;
-	char buf[256];
-	S32 elem=0;
-	if(sscanf(VariableName,"%255[^[][%d]", buf, &elem) == 2)
-	{
-		LLPostProcess::getInstance()->tweaks[(const char*)buf][elem] = ctrl->getValue();
-	}
-	else
-	{
-		LLPostProcess::getInstance()->tweaks[VariableName] = ctrl->getValue();
-	}
+	LLPostProcess::getInstance()->setSelectedEffectValue((char const *)userData,ctrl->getValue());
 }
 
 void LLFloaterPostProcess::onLoadEffect(void* userData)
@@ -145,7 +135,7 @@ void LLFloaterPostProcess::onSaveEffect(void* userData)
 
 	std::string effectName(editBox->getValue().asString());
 
-	if (LLPostProcess::getInstance()->mAllEffects.has(effectName))
+	if (LLPostProcess::getInstance()->getAllEffectInfo().has(effectName))
 	{
 		LLSD payload;
 		payload["effect_name"] = effectName;
@@ -153,7 +143,7 @@ void LLFloaterPostProcess::onSaveEffect(void* userData)
 	}
 	else
 	{
-		LLPostProcess::getInstance()->saveEffect(effectName);
+		LLPostProcess::getInstance()->saveEffectAs(effectName);
 		sPostProcess->syncMenu();
 	}
 }
@@ -175,7 +165,7 @@ bool LLFloaterPostProcess::saveAlertCallback(const LLSD& notification, const LLS
 	// if they choose save, do it.  Otherwise, don't do anything
 	if (option == 0)
 	{
-		LLPostProcess::getInstance()->saveEffect(notification["payload"]["effect_name"].asString());
+		LLPostProcess::getInstance()->saveEffectAs(notification["payload"]["effect_name"].asString());
 
 		sPostProcess->syncMenu();
 	}
@@ -209,17 +199,17 @@ void LLFloaterPostProcess::syncMenu()
 	comboBox->removeall();
 
 	LLSD::map_const_iterator currEffect;
-	for(currEffect = LLPostProcess::getInstance()->mAllEffects.beginMap();
-		currEffect != LLPostProcess::getInstance()->mAllEffects.endMap();
+	for(currEffect = LLPostProcess::getInstance()->getAllEffectInfo().beginMap();
+		currEffect != LLPostProcess::getInstance()->getAllEffectInfo().endMap();
 		++currEffect) 
 	{
 		comboBox->add(currEffect->first);
 	}
 
 	// set the current effect as selected.
-	comboBox->selectByValue(LLPostProcess::getInstance()->getSelectedEffect());
+	comboBox->selectByValue(LLPostProcess::getInstance()->getSelectedEffectName());
 
-	LLSD &tweaks = LLPostProcess::getInstance()->tweaks;
+	const LLSD &tweaks = LLPostProcess::getInstance()->getSelectedEffectInfo();
 	//Iterate down all uniforms handled by post-process shaders. Update any linked ui elements.
 	for (LLSD::map_const_iterator it = tweaks.beginMap(); it != tweaks.endMap(); ++it)
 	{
diff --git a/indra/newview/llfloaterwater.cpp b/indra/newview/llfloaterwater.cpp
index 04ef4e5af..0a72fdadf 100644
--- a/indra/newview/llfloaterwater.cpp
+++ b/indra/newview/llfloaterwater.cpp
@@ -62,7 +62,6 @@
 
 #include "llwaterparamset.h"
 #include "llwaterparammanager.h"
-#include "llpostprocess.h"
 
 #undef max
 
diff --git a/indra/newview/llfloaterwindlight.cpp b/indra/newview/llfloaterwindlight.cpp
index 942763ad8..d84eaf2a2 100644
--- a/indra/newview/llfloaterwindlight.cpp
+++ b/indra/newview/llfloaterwindlight.cpp
@@ -62,7 +62,6 @@
 
 #include "llwlparamset.h"
 #include "llwlparammanager.h"
-#include "llpostprocess.h"
 
 #undef max
 
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 18aaabef4..973ca7ad2 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -200,7 +200,6 @@
 #include "llnamelistctrl.h"
 #include "llnamebox.h"
 #include "llnameeditor.h"
-#include "llpostprocess.h"
 #include "llwlparammanager.h"
 #include "llwaterparammanager.h"
 #include "llagentlanguage.h"
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 8b8c8b703..2279197e5 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -1009,7 +1009,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot, boo
 			if (LLPipeline::sRenderDeferred && !LLPipeline::sUnderWaterRender)
 			{
 				gPipeline.mDeferredScreen.flush();
-				if(LLRenderTarget::sUseFBO)
+				if(gPipeline.mDeferredScreen.getFBO())
 				{
 					LLRenderTarget::copyContentsToFramebuffer(gPipeline.mDeferredScreen, 0, 0, gPipeline.mDeferredScreen.getWidth(), 
 															  gPipeline.mDeferredScreen.getHeight(), 0, 0, 
@@ -1021,7 +1021,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot, boo
 			else
 			{
 				gPipeline.mScreen.flush();
-				if(LLRenderTarget::sUseFBO)
+				if(gPipeline.mScreen.getFBO())
 				{				
 					LLRenderTarget::copyContentsToFramebuffer(gPipeline.mScreen, 0, 0, gPipeline.mScreen.getWidth(), 
 															  gPipeline.mScreen.getHeight(), 0, 0, 
@@ -1283,14 +1283,12 @@ void render_ui(F32 zoom_factor, int subfield, bool tiling)
 		if (to_texture)
 		{
 			gPipeline.renderBloom(gSnapshot, zoom_factor, subfield, tiling);
-			gPipeline.mScreen.flush(); //blit, etc.
 		}
-		/// We copy the frame buffer straight into a texture here,
-		/// and then display it again with compositor effects.
-		/// Using render to texture would be faster/better, but I don't have a 
-		/// grasp of their full display stack just yet.
+
 		if(gPipeline.canUseVertexShaders())
-			LLPostProcess::getInstance()->apply(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight());
+		{
+			LLPostProcess::getInstance()->renderEffects(gViewerWindow->getWindowDisplayWidth(), gViewerWindow->getWindowDisplayHeight());
+		}
 		
 		render_hud_elements();
 		render_hud_attachments();
diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp
index 6ab2cfd17..2b2de806f 100644
--- a/indra/newview/llviewershadermgr.cpp
+++ b/indra/newview/llviewershadermgr.cpp
@@ -170,6 +170,7 @@ LLGLSLShader			gGlowExtractProgram(LLViewerShaderMgr::SHADER_EFFECT);		//Not in
 LLGLSLShader			gPostColorFilterProgram(LLViewerShaderMgr::SHADER_EFFECT);	//Not in mShaderList
 LLGLSLShader			gPostNightVisionProgram(LLViewerShaderMgr::SHADER_EFFECT);	//Not in mShaderList
 LLGLSLShader			gPostGaussianBlurProgram(LLViewerShaderMgr::SHADER_EFFECT);	//Not in mShaderList
+LLGLSLShader			gPostPosterizeProgram(LLViewerShaderMgr::SHADER_EFFECT);	//Not in mShaderList
  
  // Deferred rendering shaders
 LLGLSLShader			gDeferredImpostorProgram(LLViewerShaderMgr::SHADER_DEFERRED);
@@ -958,6 +959,23 @@ BOOL LLViewerShaderMgr::loadShadersEffects()
 			gPostGaussianBlurProgram.uniform1i("tex0", 0);
 		}
 	}
+
+	{
+		vector<string> shaderUniforms;
+		shaderUniforms.reserve(1);
+		shaderUniforms.push_back("layerCount");
+
+		gPostPosterizeProgram.mName = "Posterize Shader (Post)";
+		gPostPosterizeProgram.mShaderFiles.clear();
+		gPostPosterizeProgram.mShaderFiles.push_back(make_pair("effects/PosterizeF.glsl", GL_FRAGMENT_SHADER_ARB));
+		gPostPosterizeProgram.mShaderFiles.push_back(make_pair("interface/onetexturenocolorV.glsl", GL_VERTEX_SHADER_ARB));
+		gPostPosterizeProgram.mShaderLevel = mVertexShaderLevel[SHADER_EFFECT];
+		if(gPostPosterizeProgram.createShader(NULL, &shaderUniforms))
+		{
+			gPostPosterizeProgram.bind();
+			gPostPosterizeProgram.uniform1i("tex0", 0);
+		}
+	}
 	#endif
 
 	return success;
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index acd55d913..d31c262ea 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4839,7 +4839,7 @@ void LLViewerWindow::stopGL(BOOL save_state)
 		
 		if(LLPostProcess::instanceExists())
 		{
-			LLPostProcess::getInstance()->invalidate();
+			LLPostProcess::getInstance()->destroyGL();
 		}
 
 		gTextureList.destroyGL(save_state);
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 9f4c7b1f7..ff866877d 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -54,6 +54,7 @@
 #include "llglheaders.h"
 #include "llrender.h"
 #include "llwindow.h"
+#include "llpostprocess.h"
 
 // newview includes
 #include "llagent.h"
@@ -863,6 +864,9 @@ void LLPipeline::releaseGLBuffers()
 
 	gBumpImageList.destroyGL();
 	LLVOAvatar::resetImpostors();
+
+	if(LLPostProcess::instanceExists())
+		LLPostProcess::getInstance()->destroyGL();
 }
 
 void LLPipeline::releaseLUTBuffers()
@@ -6111,12 +6115,14 @@ void LLPipeline::doResetVertexBuffers()
 
 	LLVOPartGroup::destroyGL();
 
+	if(LLPostProcess::instanceExists())
+		LLPostProcess::getInstance()->destroyGL();
+
 	LLVertexBuffer::cleanupClass();
 	
 	//delete all name pool caches
 	LLGLNamePool::cleanupPools();
 
-	
 	if (LLVertexBuffer::sGLCount > 0)
 	{
 		llwarns << "VBO wipe failed -- " << LLVertexBuffer::sGLCount << " buffers remaining." << llendl;
@@ -6923,7 +6929,7 @@ void LLPipeline::renderBloom(BOOL for_snapshot, F32 zoom_factor, int subfield, b
 	}
 
 	
-	if (LLRenderTarget::sUseFBO)
+	if (mScreen.getFBO())
 	{ //copy depth buffer from mScreen to framebuffer
 		LLRenderTarget::copyContentsToFramebuffer(mScreen, 0, 0, mScreen.getWidth(), mScreen.getHeight(), 
 			0, 0, mScreen.getWidth(), mScreen.getHeight(), GL_DEPTH_BUFFER_BIT, GL_NEAREST);
diff --git a/indra/newview/skins/default/xui/en-us/floater_post_process.xml b/indra/newview/skins/default/xui/en-us/floater_post_process.xml
index 179a40e2e..bde532911 100644
--- a/indra/newview/skins/default/xui/en-us/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_post_process.xml
@@ -146,6 +146,25 @@
 			     left="14" max_val="1" min_val="0" mouse_opaque="true"
 			     name="noise_strength" show_text="true" value="1.0" width="200" />
 		</panel>
+    <panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
+     label="Posterize" left="1" mouse_opaque="false"
+     name="PosterizePanel" width="398">
+      <check_box bottom="-20" follows="left|top"
+			     font="SansSerifSmall" height="16" initial_value="false" label="Enable"
+			     left="14" mouse_opaque="true" name="enable_posterize" width="200" />
+      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+			     bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
+			     font="SansSerif" h_pad="0" halign="left" height="16"
+			     left="10" mouse_opaque="true" name="PosterLayersText" v_pad="0"
+			     width="355">
+        Layer Count
+      </text>
+      <slider bottom_delta="-30" can_edit_text="true"
+			     decimal_digits="3" follows="left"
+			     height="18" increment="1" initial_val="10" label="" left="14"
+			     max_val="20" min_val="1" mouse_opaque="true"
+			     name="posterize_layers" show_text="true" value="10" width="200" />
+    </panel>
 		<!--<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
 		     label="Bloom" left="1" mouse_opaque="true"
 		     name="BloomPanel" width="398">

From f8c2087d740b24100e39176074f02e07a314a406 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sun, 29 Jul 2012 22:47:19 +0200
Subject: [PATCH 100/199] Preliminary Windows support for curlthreading

---
 indra/llmessage/aicurl.cpp       |   6 +-
 indra/llmessage/aicurlthread.cpp | 108 +++++++++++++++++++++++++++++--
 indra/newview/llcurlrequest.cpp  |   2 +-
 3 files changed, 106 insertions(+), 10 deletions(-)

diff --git a/indra/llmessage/aicurl.cpp b/indra/llmessage/aicurl.cpp
index 1d52afce9..9dda7bf5f 100644
--- a/indra/llmessage/aicurl.cpp
+++ b/indra/llmessage/aicurl.cpp
@@ -134,10 +134,10 @@ static unsigned long __cdecl apr_os_thread_current_wrapper()
 // OpenSSL uniq id function.
 void ssl_id_function(CRYPTO_THREADID* thread_id)
 {
-#if 1	// apr_os_thread_current() returns an unsigned long.
-  CRYPTO_THREADID_set_numeric(thread_id, apr_os_thread_current());
-#else	// if it would return a pointer.
+#if LL_WINDOWS	// apr_os_thread_current() returns an unsigned long.
   CRYPTO_THREADID_set_pointer(thread_id, apr_os_thread_current());
+#else	// if it would return a pointer.
+  CRYPTO_THREADID_set_numeric(thread_id, apr_os_thread_current());
 #endif
 }
 #endif // HAVE_CRYPTO_THREADID
diff --git a/indra/llmessage/aicurlthread.cpp b/indra/llmessage/aicurlthread.cpp
index c75912047..deea1b404 100644
--- a/indra/llmessage/aicurlthread.cpp
+++ b/indra/llmessage/aicurlthread.cpp
@@ -727,7 +727,10 @@ class AICurlThread : public LLThread
 	void create_wakeup_fds(void);
 	void cleanup_wakeup_fds(void);
 
+#if (!LL_WINDOWS)
+	//On Windows, single socket is used for communicating with itself! -SG
 	curl_socket_t mWakeUpFd_in;
+#endif
 	curl_socket_t mWakeUpFd;
 
 	int mZeroTimeOut;
@@ -740,7 +743,10 @@ AICurlThread* AICurlThread::sInstance = NULL;
 
 // MAIN-THREAD
 AICurlThread::AICurlThread(void) : LLThread("AICurlThread"),
-    mWakeUpFd_in(CURL_SOCKET_BAD), mWakeUpFd(CURL_SOCKET_BAD),
+#if (!LL_WINDOWS)
+    mWakeUpFd_in(CURL_SOCKET_BAD),
+#endif
+	mWakeUpFd(CURL_SOCKET_BAD),
 	mZeroTimeOut(0), mRunning(true), mWakeUpFlag(false)
 {
   create_wakeup_fds();
@@ -754,12 +760,65 @@ AICurlThread::~AICurlThread()
   cleanup_wakeup_fds();
 }
 
+#if LL_WINDOWS
+static std::string formatWSAError()
+{
+	std::ostringstream r;
+	int e = WSAGetLastError();
+	LPTSTR error_str = 0;
+	r << e;
+	if(FormatMessage(
+		FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+		NULL, e, 0, (LPTSTR)&error_str, 0, NULL))
+	{
+		r << " " << utf16str_to_utf8str(error_str);
+		LocalFree(error_str);
+	}
+	else
+	{
+		r << " Unknown WinSock error";
+	}
+	return r.str();
+}
+#endif
+
 // MAIN-THREAD
 void AICurlThread::create_wakeup_fds(void)
 {
 #if LL_WINDOWS
-  // Probably need to use sockets here, cause Windows select doesn't work for a pipe.
-  #error Missing implementation
+  mWakeUpFd = socket(AF_INET, SOCK_DGRAM, 0); //Maybe IPPROTO_UDP as last argument? -SG
+  if(mWakeUpFd == INVALID_SOCKET)
+  {
+	  llerrs << "Failed to create wake-up socket: " << formatWSAError() << llendl;
+  }
+  int error;
+  sockaddr_in addr;
+  addr.sin_family = AF_INET;
+  addr.sin_port = 0;
+  addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+  int addrlen = sizeof(addr);
+  error = bind(mWakeUpFd, (sockaddr*) &addr, addrlen);
+  if(error)
+  {
+	  llerrs << "Failed to bind wake-up socket: " << formatWSAError() << llendl;
+  }
+  error = getsockname(mWakeUpFd, (sockaddr*) &addr, &addrlen);
+  if(error)
+  {
+	  llerrs << "Failed to detect wake-up socket: " << formatWSAError() << llendl;
+  }
+  error = connect(mWakeUpFd, (sockaddr*) &addr, addrlen);
+  if(error)
+  {
+	  llerrs << "Failed to connect wake-up socket: " <<formatWSAError() << llendl;
+  }
+  u_long nonblocking_enable = TRUE;
+  error = ioctlsocket(mWakeUpFd, FIONBIO, &nonblocking_enable);
+  if(error)
+  {
+	  llerrs << "Failed to set wake-up socket nonblocking: " << formatWSAError() << llendl;
+  }
+
 #else
   int pipefd[2];
   if (pipe(pipefd))
@@ -783,7 +842,14 @@ void AICurlThread::create_wakeup_fds(void)
 void AICurlThread::cleanup_wakeup_fds(void)
 {
 #if LL_WINDOWS
-  #error Missing implementation
+  if (mWakeUpFd != CURL_SOCKET_BAD)
+  {
+	int error = closesocket(mWakeUpFd);
+	if (error)
+	{
+		llwarns << "Error closing wake-up socket" << formatWSAError() << llendl;
+	}
+  }
 #else
   if (mWakeUpFd_in != CURL_SOCKET_BAD)
 	close(mWakeUpFd_in);
@@ -807,7 +873,13 @@ void AICurlThread::wakeup_thread(void)
   }
 
 #ifdef LL_WINDOWS
-  #error Missing implementation
+  //SGTODO
+  int len = send(mWakeUpFd, "!", 1, 0);
+  if (len == SOCKET_ERROR)
+  {
+	  llerrs << "Send to wake-up socket failed: " << formatWSAError() << llendl;
+  }
+  llinfos << "Sent wakeup signal" << llendl;
 #else
   // If write() is interrupted by a signal before it writes any data, it shall return -1 with errno set to [EINTR].
   // If write() is interrupted by a signal after it successfully writes some data, it shall return the number of bytes written.
@@ -837,7 +909,31 @@ void AICurlThread::wakeup(AICurlMultiHandle_wat const& multi_handle_w)
   DoutEntering(dc::curl, "AICurlThread::wakeup");
 
 #ifdef LL_WINDOWS
-  #error Missing implementation
+  char buf;
+  int len;
+  bool got_data = false;
+  do
+  {
+	  len = recv(mWakeUpFd, &buf, sizeof(buf), 0);
+	  llinfos << "recv returns " << len << llendl;
+	  if(len != SOCKET_ERROR)
+	  {
+		  got_data = true;
+		  llinfos << "Received wakeup signal" << llendl;
+	  }
+  } while(len != SOCKET_ERROR);
+  int error = WSAGetLastError();
+  llinfos << "left loop, errorlevel " << error << llendl;
+  if(error != WSAEWOULDBLOCK)
+  {
+	  llerrs << "Wake-up socket drain error: " << formatWSAError() << llendl;
+  }
+  if(!got_data)
+  {
+	  llinfos << "Wakeup called but socket is empty" << llendl;
+	  return;
+  }
+  llinfos << "Passing control to process_commands" << llendl;
 #else
   // If a read() is interrupted by a signal before it reads any data, it shall return -1 with errno set to [EINTR].
   // If a read() is interrupted by a signal after it has successfully read some data, it shall return the number of bytes read.
diff --git a/indra/newview/llcurlrequest.cpp b/indra/newview/llcurlrequest.cpp
index 75706af6d..e50bd040e 100644
--- a/indra/newview/llcurlrequest.cpp
+++ b/indra/newview/llcurlrequest.cpp
@@ -37,7 +37,7 @@
  *   and hence I cannot change the license of it.
  */
 
-#include "linden_common.h"
+#include "llviewerprecompiledheaders.h"
 
 #include "llsdserialize.h"
 #include "llcurlrequest.h"

From 8945fe4857c78444bd3742a700bb77d803c70c3c Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Mon, 30 Jul 2012 01:47:27 +0200
Subject: [PATCH 101/199] Unbreak standalone install on 64bit linux

---
 indra/newview/viewer_manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 0c06505e4..5e85cdadc 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -858,7 +858,7 @@ class Linux_x86_64Manifest(LinuxManifest):
                 self.end_prefix("lib32")
 
         # 32bit libs needed for voice
-        if self.prefix("../../libraries/x86_64-linux/lib/release/32bit-compat", dst="lib32"):
+        if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"):
             self.path("libalut.so")
             self.path("libidn.so.11")
             self.path("libopenal.so.1")

From d19c5a4a4a35a0049a2042855280ed7bdfc0bf6d Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Mon, 30 Jul 2012 02:44:51 +0200
Subject: [PATCH 102/199] Move apr_os_thread_current_wrapper closer to where
 it's used, and fix a comment.

---
 indra/llmessage/aicurl.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/indra/llmessage/aicurl.cpp b/indra/llmessage/aicurl.cpp
index 9dda7bf5f..d079711d1 100644
--- a/indra/llmessage/aicurl.cpp
+++ b/indra/llmessage/aicurl.cpp
@@ -123,20 +123,13 @@ void ssl_locking_function(int mode, int n, char const* file, int line)
   }
 }
 
-#if LL_WINDOWS
-static unsigned long __cdecl apr_os_thread_current_wrapper()
-{
-	return (unsigned long)apr_os_thread_current();
-}
-#endif
-	
 #if HAVE_CRYPTO_THREADID
 // OpenSSL uniq id function.
 void ssl_id_function(CRYPTO_THREADID* thread_id)
 {
-#if LL_WINDOWS	// apr_os_thread_current() returns an unsigned long.
+#if LL_WINDOWS	// apr_os_thread_current() returns a pointer,
   CRYPTO_THREADID_set_pointer(thread_id, apr_os_thread_current());
-#else	// if it would return a pointer.
+#else			// else it returns an unsigned long.
   CRYPTO_THREADID_set_numeric(thread_id, apr_os_thread_current());
 #endif
 }
@@ -193,6 +186,13 @@ ssl_dyn_create_function_type  old_ssl_dyn_create_function;
 ssl_dyn_destroy_function_type old_ssl_dyn_destroy_function;
 ssl_dyn_lock_function_type    old_ssl_dyn_lock_function;
 
+#if LL_WINDOWS
+static unsigned long __cdecl apr_os_thread_current_wrapper()
+{
+	return (unsigned long)apr_os_thread_current();
+}
+#endif
+
 // Set for openssl-1.0.1...1.0.1c.
 static bool need_renegotiation_hack = false;
 

From ce2c6ab49e870db1bd9dbb9e45e0f70fc130fdb5 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Mon, 30 Jul 2012 02:45:39 +0200
Subject: [PATCH 103/199] Don't crash when libcurl wasn't compiled with support
 for libz

---
 indra/llmessage/aicurl.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/indra/llmessage/aicurl.cpp b/indra/llmessage/aicurl.cpp
index d079711d1..dc3c7e499 100644
--- a/indra/llmessage/aicurl.cpp
+++ b/indra/llmessage/aicurl.cpp
@@ -312,10 +312,19 @@ void initCurl(void (*flush_hook)())
 	{
 	  llwarns << "libcurl was not compiled with support for asynchronous name lookups!" << llendl;
 	}
+	if (!version_info->ssl_version)
+	{
+	  llerrs << "This libcurl has no SSL support!" << llendl;
+	}
 
 	llinfos << "Successful initialization of libcurl " <<
 		version_info->version << " (0x" << std::hex << version_info->version_num << "), (" <<
-	    version_info->ssl_version << ", libz/" << version_info->libz_version << ")." << llendl;
+	    version_info->ssl_version;
+	if (version_info->libz_version)
+	{
+	  llcont << ", libz/" << version_info->libz_version;
+	}
+	llcont << ")." << llendl;
 
 	// Detect SSL library used.
 	gSSLlib = ssl_unknown;

From 3de21156b56e341317e515ab37e51b1189ef00e7 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Mon, 30 Jul 2012 02:46:48 +0200
Subject: [PATCH 104/199] Windows code improvements and debugging.

Extended the DEBUG_WINDOWS_CODE_ON_LINUX hack to include ALL code.
memset-zero sockaddr_in, and use WSASocket as per suggestion of Shyotl.
---
 indra/llmessage/aicurlthread.cpp | 101 +++++++++++++++++++++++--------
 1 file changed, 75 insertions(+), 26 deletions(-)

diff --git a/indra/llmessage/aicurlthread.cpp b/indra/llmessage/aicurlthread.cpp
index deea1b404..3956e9f2f 100644
--- a/indra/llmessage/aicurlthread.cpp
+++ b/indra/llmessage/aicurlthread.cpp
@@ -143,8 +143,40 @@ static void FD_CLR(curl_socket_t s, windows_fd_set* fsp)
 #define fd_set windows_fd_set
 #define select windows_select
 
+int WSAGetLastError(void)
+{
+  return errno;
+}
+
+typedef char* LPTSTR;
+
+bool FormatMessage(int, void*, int e, int, LPTSTR error_str_ptr, int, void*)
+{
+  char* error_str = *(LPTSTR*)error_str_ptr;
+  error_str = strerror(e);
+  return true;
+}
+
+void LocalFree(LPTSTR)
+{
+}
+
+int const FORMAT_MESSAGE_ALLOCATE_BUFFER = 0;
+int const FORMAT_MESSAGE_FROM_SYSTEM = 0;
+int const FORMAT_MESSAGE_IGNORE_INSERTS = 0;
+int const INVALID_SOCKET = -1;
+int const SOCKET_ERROR = -1;
+int const WSAEWOULDBLOCK = EWOULDBLOCK;
+
+int closesocket(curl_socket_t fd)
+{
+  return close(fd);
+}
+
 #endif // DEBUG_WINDOWS_CODE_ON_LINUX
 
+#define WINDOWS_CODE (LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX)
+
 #undef AICurlPrivate
 
 namespace AICurlPrivate {
@@ -248,7 +280,7 @@ class PollSet
 	// Return a pointer to the underlaying fd_set.
 	fd_set* access(void) { return &mFdSet; }
 
-#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX)
+#if !WINDOWS_CODE
 	// Return the largest fd set in mFdSet by refresh.
 	curl_socket_t get_max_fd(void) const { return mMaxFdSet; }
 #endif
@@ -275,7 +307,7 @@ class PollSet
 
 	fd_set mFdSet;					// Output variable for select(). (Re)initialized by calling refresh().
 
-#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX)
+#if !WINDOWS_CODE
 	curl_socket_t mMaxFd;			// The largest filedescriptor in the array, or CURL_SOCKET_BAD when it is empty.
 	curl_socket_t mMaxFdSet;		// The largest filedescriptor set in mFdSet by refresh(), or CURL_SOCKET_BAD when it was empty.
 	std::vector<curl_socket_t> mCopiedFileDescriptors;	// Filedescriptors copied by refresh to mFdSet.
@@ -307,7 +339,7 @@ static size_t const MAXSIZE = llmax(1024, FD_SETSIZE);
 // Create an empty PollSet.
 PollSet::PollSet(void) : mFileDescriptors(new curl_socket_t [MAXSIZE]),
                          mNrFds(0), mNext(0)
-#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX)
+#if !WINDOWS_CODE
 						 , mMaxFd(-1), mMaxFdSet(-1)
 #endif
 {
@@ -319,7 +351,7 @@ void PollSet::add(curl_socket_t s)
 {
   llassert_always(mNrFds < (int)MAXSIZE);
   mFileDescriptors[mNrFds++] = s;
-#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX)
+#if !WINDOWS_CODE
   mMaxFd = llmax(mMaxFd, s);
 #endif
 }
@@ -356,7 +388,7 @@ void PollSet::remove(curl_socket_t s)
   // index: 0   1   2   3   4   5
   //        a   b   c   s   d   e
   curl_socket_t cur = mFileDescriptors[i];		// cur = 'e'
-#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX)
+#if !WINDOWS_CODE
   curl_socket_t max = -1;
 #endif
   while (cur != s)
@@ -364,7 +396,7 @@ void PollSet::remove(curl_socket_t s)
 	llassert(i > 0);
 	curl_socket_t next = mFileDescriptors[--i];	// next = 'd'
 	mFileDescriptors[i] = cur;					// Overwrite 'd' with 'e'.
-#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX)
+#if !WINDOWS_CODE
 	max = llmax(max, cur);					// max is the maximum value in 'i' or higher.
 #endif
 	cur = next;									// cur = 'd'
@@ -391,7 +423,7 @@ void PollSet::remove(curl_socket_t s)
   if (mNext > i)								// i is where s was.
 	--mNext;
 
-#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX)
+#if !WINDOWS_CODE
   // If s was the largest file descriptor, we have to update mMaxFd.
   if (s == mMaxFd)
   {
@@ -408,7 +440,7 @@ void PollSet::remove(curl_socket_t s)
 
   // ALSO make sure that s is no longer set in mFdSet, or we might confuse libcurl by
   // calling curl_multi_socket_action for a socket that it told us to remove.
-#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX)
+#if !WINDOWS_CODE
   clr(s);
 #else
   // We have to use a custom implementation here, because we don't want to invalidate mIter.
@@ -457,13 +489,13 @@ inline void PollSet::clr(curl_socket_t fd)
 refresh_t PollSet::refresh(void)
 {
   FD_ZERO(&mFdSet);
-#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX)
+#if !WINDOWS_CODE
   mCopiedFileDescriptors.clear();
 #endif
 
   if (mNrFds == 0)
   {
-#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX)
+#if !WINDOWS_CODE
 	mMaxFdSet = -1;
 #endif
 	return empty_and_complete;
@@ -478,7 +510,7 @@ refresh_t PollSet::refresh(void)
   if (mNrFds >= FD_SETSIZE)
   {
 	llwarns << "PollSet::reset: More than FD_SETSIZE (" << FD_SETSIZE << ") file descriptors active!" << llendl;
-#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX)
+#if !WINDOWS_CODE
 	// Calculate mMaxFdSet.
 	// Run over FD_SETSIZE - 1 elements, starting at mNext, wrapping to 0 when we reach the end.
 	int max = -1, i = mNext, count = 0;
@@ -489,7 +521,7 @@ refresh_t PollSet::refresh(void)
   else
   {
 	mNext = 0;				// Start at the beginning if we copy everything anyway.
-#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX)
+#if !WINDOWS_CODE
 	mMaxFdSet = mMaxFd;
 #endif
   }
@@ -503,7 +535,7 @@ refresh_t PollSet::refresh(void)
 	  return not_complete_not_empty;
 	}
 	FD_SET(mFileDescriptors[i], &mFdSet);
-#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX)
+#if !WINDOWS_CODE
 	mCopiedFileDescriptors.push_back(mFileDescriptors[i]);
 #endif
 	if (++i == mNrFds)
@@ -541,7 +573,7 @@ refresh_t PollSet::refresh(void)
 
 void PollSet::reset(void)
 {
-#if LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX
+#if WINDOWS_CODE
   mIter = 0;
 #else
   if (mCopiedFileDescriptors.empty())
@@ -557,7 +589,7 @@ void PollSet::reset(void)
 
 inline curl_socket_t PollSet::get(void) const
 {
-#if LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX
+#if WINDOWS_CODE
   return (mIter >= mFdSet.fd_count) ? CURL_SOCKET_BAD : mFdSet.fd_array[mIter];
 #else
   return (mIter == mCopiedFileDescriptors.end()) ? CURL_SOCKET_BAD : *mIter;
@@ -566,7 +598,7 @@ inline curl_socket_t PollSet::get(void) const
 
 void PollSet::next(void)
 {
-#if LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX
+#if WINDOWS_CODE
   llassert(mIter < mFdSet.fd_count);
   ++mIter;
 #else
@@ -727,7 +759,7 @@ class AICurlThread : public LLThread
 	void create_wakeup_fds(void);
 	void cleanup_wakeup_fds(void);
 
-#if (!LL_WINDOWS)
+#if !WINDOWS_CODE
 	//On Windows, single socket is used for communicating with itself! -SG
 	curl_socket_t mWakeUpFd_in;
 #endif
@@ -743,7 +775,7 @@ AICurlThread* AICurlThread::sInstance = NULL;
 
 // MAIN-THREAD
 AICurlThread::AICurlThread(void) : LLThread("AICurlThread"),
-#if (!LL_WINDOWS)
+#if !WINDOWS_CODE
     mWakeUpFd_in(CURL_SOCKET_BAD),
 #endif
 	mWakeUpFd(CURL_SOCKET_BAD),
@@ -760,7 +792,7 @@ AICurlThread::~AICurlThread()
   cleanup_wakeup_fds();
 }
 
-#if LL_WINDOWS
+#if WINDOWS_CODE
 static std::string formatWSAError()
 {
 	std::ostringstream r;
@@ -771,7 +803,11 @@ static std::string formatWSAError()
 		FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
 		NULL, e, 0, (LPTSTR)&error_str, 0, NULL))
 	{
+#if LL_LINUX
+		r << " " << error_str;
+#else
 		r << " " << utf16str_to_utf8str(error_str);
+#endif
 		LocalFree(error_str);
 	}
 	else
@@ -785,18 +821,26 @@ static std::string formatWSAError()
 // MAIN-THREAD
 void AICurlThread::create_wakeup_fds(void)
 {
-#if LL_WINDOWS
-  mWakeUpFd = socket(AF_INET, SOCK_DGRAM, 0); //Maybe IPPROTO_UDP as last argument? -SG
+#if WINDOWS_CODE
+#if LL_LINUX
+  mWakeUpFd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+#else
+  mWakeUpFd = WSASocket(AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, 0, 0);
+#endif
   if(mWakeUpFd == INVALID_SOCKET)
   {
 	  llerrs << "Failed to create wake-up socket: " << formatWSAError() << llendl;
   }
   int error;
   sockaddr_in addr;
+  memset(&addr, 0, sizeof(addr));
   addr.sin_family = AF_INET;
-  addr.sin_port = 0;
   addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+#if LL_LINUX
+  socklen_t addrlen = sizeof(addr);
+#else
   int addrlen = sizeof(addr);
+#endif
   error = bind(mWakeUpFd, (sockaddr*) &addr, addrlen);
   if(error)
   {
@@ -812,8 +856,13 @@ void AICurlThread::create_wakeup_fds(void)
   {
 	  llerrs << "Failed to connect wake-up socket: " <<formatWSAError() << llendl;
   }
+#if LL_LINUX
+  long flags = O_NONBLOCK;
+  error = fcntl(mWakeUpFd, F_SETFL, flags);
+#else
   u_long nonblocking_enable = TRUE;
   error = ioctlsocket(mWakeUpFd, FIONBIO, &nonblocking_enable);
+#endif
   if(error)
   {
 	  llerrs << "Failed to set wake-up socket nonblocking: " << formatWSAError() << llendl;
@@ -841,7 +890,7 @@ void AICurlThread::create_wakeup_fds(void)
 // MAIN-THREAD
 void AICurlThread::cleanup_wakeup_fds(void)
 {
-#if LL_WINDOWS
+#if WINDOWS_CODE
   if (mWakeUpFd != CURL_SOCKET_BAD)
   {
 	int error = closesocket(mWakeUpFd);
@@ -872,7 +921,7 @@ void AICurlThread::wakeup_thread(void)
 	return;
   }
 
-#ifdef LL_WINDOWS
+#if WINDOWS_CODE
   //SGTODO
   int len = send(mWakeUpFd, "!", 1, 0);
   if (len == SOCKET_ERROR)
@@ -908,7 +957,7 @@ void AICurlThread::wakeup(AICurlMultiHandle_wat const& multi_handle_w)
 {
   DoutEntering(dc::curl, "AICurlThread::wakeup");
 
-#ifdef LL_WINDOWS
+#if WINDOWS_CODE
   char buf;
   int len;
   bool got_data = false;
@@ -1050,7 +1099,7 @@ void AICurlThread::run(void)
 	  FD_SET(mWakeUpFd, read_fd_set);
 	  fd_set* write_fd_set = ((wres & empty)) ? NULL : multi_handle_w->mWritePollSet->access();
 	  // Calculate nfds (ignored on windows).
-#if !(LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX)
+#if !WINDOWS_CODE
 	  curl_socket_t const max_rfd = llmax(multi_handle_w->mReadPollSet->get_max_fd(), mWakeUpFd);
 	  curl_socket_t const max_wfd = multi_handle_w->mWritePollSet->get_max_fd();
 	  int nfds = llmax(max_rfd, max_wfd) + 1;

From 1b69994ffac5248d7f671f8db15e82847914f68e Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 29 Jul 2012 22:25:41 -0400
Subject: [PATCH 105/199] Respect graphics requirements for FBOs and Hardware
 Skinning in graphics preferences, properly.

---
 indra/newview/llpaneldisplay.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/indra/newview/llpaneldisplay.cpp b/indra/newview/llpaneldisplay.cpp
index a758c0a99..d5a888d12 100644
--- a/indra/newview/llpaneldisplay.cpp
+++ b/indra/newview/llpaneldisplay.cpp
@@ -576,20 +576,22 @@ void LLPanelDisplay::refreshEnabledState()
 	mSkyFactorText->setEnabled(wlatmos);
 
 	// Avatar Mode and FBO
-	childSetEnabled("fbo", gGLManager.mHasFramebufferObject && !LLPipeline::sRenderDeferred);
 	if (render_deferred && wlatmos && shaders)
 	{
+		childSetEnabled("fbo", false);
 		childSetValue("fbo", true);
 		mCtrlAvatarVP->setEnabled(false);
-		mCtrlAvatarVP->setValue(true);
+		gSavedSettings.setBOOL("RenderAvatarVP", true);
 	}
 	else if (!shaders)
 	{
+		childSetEnabled("fbo", gGLManager.mHasFramebufferObject);
 		mCtrlAvatarVP->setEnabled(false);
-		mCtrlAvatarVP->setValue(false);
+		gSavedSettings.setBOOL("RenderAvatarVP", false);
 	}
 	else
 	{
+		childSetEnabled("fbo", gGLManager.mHasFramebufferObject);
 		mCtrlAvatarVP->setEnabled(true);
 	}
 

From 594dc64a43ddf8c1e4b1536ee2268d76a756c606 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Mon, 30 Jul 2012 11:03:20 -0400
Subject: [PATCH 106/199] Made Post-Process Settings floater far better looking

---
 .../xui/en-us/floater_post_process.xml        | 308 +++++++++---------
 1 file changed, 154 insertions(+), 154 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/floater_post_process.xml b/indra/newview/skins/default/xui/en-us/floater_post_process.xml
index 179a40e2e..4f26382b1 100644
--- a/indra/newview/skins/default/xui/en-us/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_post_process.xml
@@ -1,211 +1,211 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-350" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="400" left="50" min_height="400"
-     min_width="300" mouse_opaque="true" name="Post-Process Floater"
-     title="Post-Process Settings" width="400">
+	can_resize="false" height="400" left="50" min_height="400"
+	min_width="300" mouse_opaque="true" name="Post-Process Floater"
+	title="Post-Process Settings" width="400">
 	<tab_container bottom="-400" follows="left|top" height="400" left="0"
-	     mouse_opaque="false" name="Post-Process Tabs" tab_position="top"
-	     width="400">
+		mouse_opaque="false" name="Post-Process Tabs" tab_position="bottom"
+		width="400">
 		<panel border="true" bottom="-400" follows="left|top|right|bottom" height="400"
-		     label="Color Filter" left="1" mouse_opaque="false"
-		     name="ColorFilterPanel" width="398">
-			<check_box bottom="-20" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="false" label="Enable"
-			     left="14" mouse_opaque="true" name="enable_color_filter" width="200" />
-      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="ColorFilterGammaText" v_pad="0"
-			     width="355">
-        Gamma
-      </text>
-      <slider bottom_delta="-30" can_edit_text="true" decimal_digits="2" follows="left"
-			     height="18" increment="0.01" initial_val="1.0" label="" left="14"
-			     max_val="10" min_val="-.25" mouse_opaque="true" name="gamma"
-			     show_text="true" value="1.0" width="200" />
+			label="Color Filter" left="1" mouse_opaque="false"
+			name="ColorFilterPanel" width="398">
+			<check_box bottom="-40" follows="left|top"
+				font="SansSerifSmall" height="16" initial_value="false" label="Enable"
+				left="4" mouse_opaque="true" name="enable_color_filter" width="200" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="ColorFilterBrightnessText" v_pad="0"
-			     width="355">
+				bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+				font="SansSerif" h_pad="0" halign="left" height="16"
+				left="10" mouse_opaque="true" name="ColorFilterGammaText" v_pad="0"
+				width="355">
+				Gamma
+			</text>
+			<slider bottom_delta="-30" can_edit_text="true" decimal_digits="2" follows="left"
+				height="18" increment="0.01" initial_val="1.0" label="" left="14" val_width="35"
+				max_val="10" min_val="-.25" mouse_opaque="true" name="gamma"
+				show_text="true" value="1.0" width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+				bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+				font="SansSerif" h_pad="0" halign="left" height="16"
+				left="10" mouse_opaque="true" name="ColorFilterBrightnessText" v_pad="0"
+				width="355">
 				Brightness
 			</text>
 			<slider bottom_delta="-30" can_edit_text="true" decimal_digits="2" follows="left"
-			     height="18" increment="0.01" initial_val="1.0" label="" left="14"
-			     max_val="4" min_val="0" mouse_opaque="true" name="brightness"
-			     show_text="true" value="1.0" width="200" />
+				height="18" increment="0.01" initial_val="1.0" label="" left="14" val_width="35"
+				max_val="4" min_val="0" mouse_opaque="true" name="brightness"
+				show_text="true" value="1.0" width="200" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="ColorFilterSaturationText" v_pad="0"
-			     width="355">
+				bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+				font="SansSerif" h_pad="0" halign="left" height="16"
+				left="10" mouse_opaque="true" name="ColorFilterSaturationText" v_pad="0"
+				width="355">
 				Saturation
 			</text>
 			<slider bottom_delta="-30" can_edit_text="true" decimal_digits="2" follows="left"
-			     height="18" increment="0.01" initial_val="1.0" label="" left="14"
-			     max_val="2" min_val="-1" mouse_opaque="true"
-			     name="saturation" show_text="true" value="1.0" width="200" />
+				height="18" increment="0.01" initial_val="1.0" label="" left="14" val_width="35"
+				max_val="2" min_val="-2" mouse_opaque="true"
+				name="saturation" show_text="true" value="1.0" width="200" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="ColorFilterContrastText" v_pad="0"
-			     width="355">
+				bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+				font="SansSerif" h_pad="0" halign="left" height="16"
+				left="10" mouse_opaque="true" name="ColorFilterContrastText" v_pad="0"
+				width="355">
 				Contrast
 			</text>
 			<slider bottom_delta="-30" can_edit_text="true"
-			     decimal_digits="2" follows="left" height="18" increment="0.01"
-			     initial_val="1.0" label="" left="14" max_val="4" min_val="0"
-			     mouse_opaque="true" name="contrast" show_text="true"
-			     value="1.0" width="200" />
+				decimal_digits="2" follows="left" height="18" increment="0.01" val_width="35"
+				initial_val="1.0" label="" left="14" max_val="4" min_val="0"
+				mouse_opaque="true" name="contrast" show_text="true"
+				value="1.0" width="200" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="ColorFilterBaseText" v_pad="0"
-			     width="355">
-				Contrast Base Colora
+				bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+				font="SansSerif" h_pad="0" halign="left" height="16"
+				left="10" mouse_opaque="true" name="ColorFilterBaseText" v_pad="0"
+				width="355">
+				Contrast Base Colors
 			</text>
 			<slider bottom_delta="-30" can_edit_text="true"
-			     decimal_digits="3" follows="left" height="18" increment="0.01"
-			     initial_val="1.0" label="R" left="14" max_val="1" min_val="0"
-			     mouse_opaque="true" name="contrast_base[0]" show_text="true" value="1.0"
-			     width="200" />
+				decimal_digits="3" follows="left" height="18" increment="0.01"
+				initial_val="1.0" label="R" label_width="7" left="14" max_val="1" min_val="0"
+				mouse_opaque="true" name="contrast_base[0]" show_text="true" value="1.0"
+				width="200" />
 			<slider bottom_delta="-20" can_edit_text="true"
-			     decimal_digits="3" follows="left" height="18" increment="0.01"
-			     initial_val="1.0" label="G" left="14" max_val="1" min_val="0"
-			     mouse_opaque="true" name="contrast_base[1]" show_text="true" value="1.0"
-			     width="200" />
+				decimal_digits="3" follows="left" height="18" increment="0.01"
+				initial_val="1.0" label="G" label_width="7" left="14" max_val="1" min_val="0"
+				mouse_opaque="true" name="contrast_base[1]" show_text="true" value="1.0"
+				width="200" />
 			<slider bottom_delta="-20" can_edit_text="true"
-			     decimal_digits="3" follows="left" height="18" increment="0.01"
-			     initial_val="1.0" label="B" left="14" max_val="1" min_val="0"
-			     mouse_opaque="true" name="contrast_base[2]" show_text="true" value="1.0"
-			     width="200" />
+				decimal_digits="3" follows="left" height="18" increment="0.01"
+				initial_val="1.0" label="B" label_width="7" left="14" max_val="1" min_val="0"
+				mouse_opaque="true" name="contrast_base[2]" show_text="true" value="1.0"
+				width="200" />
 			<slider bottom_delta="-20" can_edit_text="true"
-			     decimal_digits="3" follows="left" height="18" increment="0.01"
-			     initial_val="0.5" label="I" left="14" max_val="1" min_val="0"
-			     mouse_opaque="true" name="contrast_base[3]" show_text="true" value="1.0"
-			     width="200" />
+				decimal_digits="3" follows="left" height="18" increment="0.01"
+				initial_val="0.5" label="I" label_width="7" left="14" max_val="1" min_val="0"
+				mouse_opaque="true" name="contrast_base[3]" show_text="true" value="1.0"
+				width="200" />
 		</panel>
 		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
-		     label="Gauss Blur" left="1" mouse_opaque="false"
-		     name="GaussBlurPanel" width="398">
-			<check_box bottom="-20" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="false" label="Enable"
-			     left="14" mouse_opaque="true" name="enable_gauss_blur" width="200" />
+			label="Gauss Blur" left="1" mouse_opaque="false"
+			name="GaussBlurPanel" width="398">
+			<check_box bottom="-40" follows="left|top"
+				font="SansSerifSmall" height="16" initial_value="false" label="Enable"
+				left="4" mouse_opaque="true" name="enable_gauss_blur" width="200" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="GaussBlurPassesText" v_pad="0"
-			     width="355">
+				bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
+				font="SansSerif" h_pad="0" halign="left" height="16"
+				left="10" mouse_opaque="true" name="GaussBlurPassesText" v_pad="0"
+				width="355">
 				Passes to apply
 			</text>
 			<slider bottom_delta="-30" can_edit_text="true"
-			     decimal_digits="0" follows="left"
-			     height="18" increment="1" initial_val="9" label="" left="14"
-			     max_val="25" min_val="1" mouse_opaque="true"
-			     name="gauss_blur_passes" show_text="true" value="0.7" width="200" />
+				decimal_digits="0" follows="left"
+				height="18" increment="1" initial_val="9" label="" left="14"
+				max_val="25" min_val="1" mouse_opaque="true"
+				name="gauss_blur_passes" show_text="true" value="0.7" width="200" />
 		</panel>
 		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
-		     label="Night Vision" left="1" mouse_opaque="false"
-		     name="NightVisionPanel" width="398">
-			<check_box bottom="-20" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="false" label="Enable"
-			     left="14" mouse_opaque="true" name="enable_night_vision" width="200" />
+			label="Night Vision" left="1" mouse_opaque="false"
+			name="NightVisionPanel" width="398">
+			<check_box bottom="-40" follows="left|top"
+				font="SansSerifSmall" height="16" initial_value="false" label="Enable"
+				left="4" mouse_opaque="true" name="enable_night_vision" width="200" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="NightVisionBrightMultText" v_pad="0"
-			     width="355">
+				bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
+				font="SansSerif" h_pad="0" halign="left" height="16"
+				left="10" mouse_opaque="true" name="NightVisionBrightMultText" v_pad="0"
+				width="355">
 				Light Amplification Multiple
 			</text>
-			<slider bottom_delta="-30" can_edit_text="true"
-			     decimal_digits="3" follows="left"
-			     height="18" increment="0.01" initial_val="3.0" label="" left="14"
-			     max_val="10" min_val="1" mouse_opaque="true"
-			     name="brightness_multiplier" show_text="true" value="0.7" width="200" />
+			<slider bottom_delta="-30" can_edit_text="true" val_width="50"
+				decimal_digits="3" follows="left"
+				height="18" increment="0.01" initial_val="3.0" label="" left="14"
+				max_val="10" min_val="1" mouse_opaque="true"
+				name="brightness_multiplier" show_text="true" value="0.7" width="220" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="NightVisionNoiseSizeText" v_pad="0"
-			     width="355">
+				bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+				font="SansSerif" h_pad="0" halign="left" height="16"
+				left="10" mouse_opaque="true" name="NightVisionNoiseSizeText" v_pad="0"
+				width="355">
 				Noise Size
 			</text>
-			<slider bottom_delta="-30" can_edit_text="true"
-			     decimal_digits="3" follows="left" height="18" increment="0.1"
-			     initial_val="1" label="" left="14" max_val="100" min_val="1"
-			     mouse_opaque="true" name="noise_size" show_text="true"
-			     value="1.0" width="200" />
+			<slider bottom_delta="-30" can_edit_text="true" val_width="50"
+				decimal_digits="3" follows="left" height="18" increment="0.1"
+				initial_val="1" label="" left="14" max_val="100" min_val="1"
+				mouse_opaque="true" name="noise_size" show_text="true"
+				value="1.0" width="220" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="NightVisionNoiseStrengthText"
-			     v_pad="0" width="355">
+				bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+				font="SansSerif" h_pad="0" halign="left" height="16"
+				left="10" mouse_opaque="true" name="NightVisionNoiseStrengthText"
+				v_pad="0" width="355">
 				Noise Strength
 			</text>
-			<slider bottom_delta="-30" can_edit_text="true" decimal_digits="3"
-			     follows="left" height="18" increment="0.01" initial_val="0.3" label=""
-			     left="14" max_val="1" min_val="0" mouse_opaque="true"
-			     name="noise_strength" show_text="true" value="1.0" width="200" />
+			<slider bottom_delta="-30" can_edit_text="true" decimal_digits="3" val_width="50"
+				follows="left" height="18" increment="0.01" initial_val="0.3" label=""
+				left="14" max_val="1" min_val="0" mouse_opaque="true"
+				name="noise_strength" show_text="true" value="1.0" width="220" />
 		</panel>
 		<!--<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
-		     label="Bloom" left="1" mouse_opaque="true"
-		     name="BloomPanel" width="398">
-			<check_box bottom="-20" control_name="BloomToggle" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="false" label="Enable"
-			     left="14" mouse_opaque="true" name="BloomToggle" width="200" />
+			 label="Bloom" left="1" mouse_opaque="true"
+			 name="BloomPanel" width="398">
+			<check_box bottom="-40" control_name="BloomToggle" follows="left|top"
+				 font="SansSerifSmall" height="16" initial_value="false" label="Enable"
+				 left="4" mouse_opaque="true" name="BloomToggle" width="200" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="BloomExtractText" v_pad="0"
-			     width="355">
+				 bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
+				 font="SansSerif" h_pad="0" halign="left" height="16"
+				 left="10" mouse_opaque="true" name="BloomExtractText" v_pad="0"
+				 width="355">
 				Luminosity Extraction
 			</text>
 			<slider bottom_delta="-30" can_edit_text="true" control_name="BloomExtract"
-			     decimal_digits="3" follows="left" height="18" increment="0.01"
-			     initial_val="0.9" label="" left="14" max_val="1" min_val="0"
-			     mouse_opaque="true" name="BloomExtract" show_text="true" value="0.7"
-			     width="200" />
+				 decimal_digits="3" follows="left" height="18" increment="0.01"
+				 initial_val="0.9" label="" left="14" max_val="1" min_val="0" val_width="41"
+				 mouse_opaque="true" name="BloomExtract" show_text="true" value="0.7"
+				 width="200" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="BloomSizeText" v_pad="0" width="355">
+				 bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+				 font="SansSerif" h_pad="0" halign="left" height="16"
+				 left="10" mouse_opaque="true" name="BloomSizeText" v_pad="0" width="355">
 				Bloom Size
 			</text>
 			<slider bottom_delta="-30" can_edit_text="true" control_name="BloomSize"
-			     decimal_digits="3" follows="left" height="18" increment="0.01"
-			     initial_val="3.0" label="" left="14" max_val="20" min_val="0"
-			     mouse_opaque="true" name="BloomSize" show_text="true" value="1.0"
-			     width="200" />
+				 decimal_digits="3" follows="left" height="18" increment="0.01"
+				 initial_val="3.0" label="" left="14" max_val="20" min_val="0" val_width="41"
+				 mouse_opaque="true" name="BloomSize" show_text="true" value="1.0"
+				 width="200" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16" 
-			     left="10" mouse_opaque="true" name="BloomStrengthText" v_pad="0"
-			     width="355">
+				 bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
+				 font="SansSerif" h_pad="0" halign="left" height="16"
+				 left="10" mouse_opaque="true" name="BloomStrengthText" v_pad="0"
+				 width="355">
 				Bloom Strength
 			</text>
 			<slider bottom_delta="-30" can_edit_text="true" control_name="BloomStrength"
-			     decimal_digits="3" follows="left" height="18" increment="0.01"
-			     initial_val="1.2" label="" left="14" max_val="10" min_val="0"
-			     mouse_opaque="true" name="BloomStrength" show_text="true" value="1.0"
-			     width="200" />
-		</panel>-->
+				 decimal_digits="3" follows="left" height="18" increment="0.01"
+				 initial_val="1.2" label="" left="14" max_val="10" min_val="0" val_width="41"
+				 mouse_opaque="true" name="BloomStrength" show_text="true" value="1.0"
+				 width="200" />
+		 </panel>-->
 		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
-		     label="Extras" left="1" mouse_opaque="false" name="Extras"
-		     width="398">
-			<button bottom="-33" enabled="true" font="SansSerif" halign="center" height="20"
-			      label="LoadEffect" label_selected="LoadEffect" left="15"
-			     mouse_opaque="true" name="PPLoadEffect" scale_image="true" width="100" />
-			<button bottom="-60" enabled="true" font="SansSerif" halign="center" height="20"
-			      label="SaveEffect" label_selected="SaveEffect" left="15"
-			     mouse_opaque="true" name="PPSaveEffect" scale_image="true" width="100" />
-			<combo_box allow_text_entry="false" bottom="-33" follows="left|top" height="18"
-			     left_delta="120" max_chars="20" mouse_opaque="true" name="PPEffectsCombo"
-			     width="150" />
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-75"
-			     enabled="true" follows="left|right|bottom" font="SansSerif"
-			     handle_edit_keys_directly="false" height="20"
-			     label="Effect Name" left="135" max_length="40" mouse_opaque="true"
-			     name="PPEffectNameEditor" select_all_on_focus_received="false"
-			     select_on_focus="false" tab_group="1" width="150" />
+			label="Extras" left="1" mouse_opaque="false" name="Extras"
+			width="398">
+			<combo_box allow_text_entry="false" bottom="-43" follows="left|top" height="18"
+				left="15" max_chars="20" mouse_opaque="true" name="PPEffectsCombo"
+				width="150" />
+			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-86"
+				enabled="true" follows="left|right|bottom" font="SansSerif"
+				handle_edit_keys_directly="false" height="20"
+				label="Effect Name" left="15" max_length="40" mouse_opaque="true"
+				name="PPEffectNameEditor" select_all_on_focus_received="false"
+				select_on_focus="false" tab_group="1" width="150" />
+			<button bottom="-44" enabled="true" font="SansSerif" halign="center" height="20"
+				label="Load Effect" label_selected="Load Effect" left_delta="170"
+				mouse_opaque="true" name="PPLoadEffect" scale_image="true" width="100" />
+			<button bottom="-70" enabled="true" font="SansSerif" halign="center" height="20"
+				label="Save Effect" label_selected="Save Effect"
+				mouse_opaque="true" name="PPSaveEffect" scale_image="true" width="100" />
 		</panel>
 	</tab_container>
 </floater>

From dd47123bde223c7c088bcfe968919c5a5cc1a9e1 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Tue, 31 Jul 2012 04:56:03 +0200
Subject: [PATCH 107/199] Add possibility to suppress function name prefix in
 debug output.

Adds llinfos_nf et al.
---
 indra/llcommon/llerror.cpp | 18 +++++++++------
 indra/llcommon/llerror.h   | 46 +++++++++++++++++++++-----------------
 indra/llmessage/aicurl.cpp | 16 ++++++-------
 3 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index c537a76a8..7b362b230 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -963,10 +963,14 @@ namespace LLError
 		settings_w->shouldLogCallCounter += 1;
 		
 		std::string class_name = className(site.mClassInfo);
-		std::string function_name = functionName(site.mFunction);
-		if (site.mClassInfo != typeid(NoClassInfo))
+		std::string function_name;
+		if (site.mFunction)
 		{
-			function_name = class_name + "::" + function_name;
+		  function_name = functionName(site.mFunction);
+		  if (site.mClassInfo != typeid(NoClassInfo))
+		  {
+			  function_name = class_name + "::" + function_name;
+		  }
 		}
 
 		ELevel compareLevel = settings_w->defaultLevel;
@@ -976,7 +980,7 @@ namespace LLError
 		// So, in increasing order of importance:
 		// Default < Broad Tag < File < Class < Function < Narrow Tag
 		((site.mNarrowTag != NULL) ? checkLevelMap(settings_w->tagLevelMap, site.mNarrowTag, compareLevel) : false)
-		|| checkLevelMap(settings_w->functionLevelMap, function_name, compareLevel)
+		|| (site.mFunction && checkLevelMap(settings_w->functionLevelMap, function_name, compareLevel))
 		|| checkLevelMap(settings_w->classLevelMap, class_name, compareLevel)
 		|| checkLevelMap(settings_w->fileLevelMap, abbreviateFile(site.mFile), compareLevel)
 		|| ((site.mBroadTag != NULL) ? checkLevelMap(settings_w->tagLevelMap, site.mBroadTag, compareLevel) : false);
@@ -1083,8 +1087,8 @@ namespace LLError
 			default:				prefix << "XXX";		break;
 		};
 
-		bool need_function = true;
-		if (site.mBroadTag && *site.mBroadTag != '\0')
+		bool need_function = site.mFunction;
+		if (need_function && site.mBroadTag && *site.mBroadTag != '\0')
 		{
 			prefix << "(\"" << site.mBroadTag << "\")";
 #if LL_DEBUG
@@ -1112,7 +1116,7 @@ namespace LLError
 #if LL_WINDOWS
 			// DevStudio: __FUNCTION__ already includes the full class name
 #else
-			if (need_function && site.mClassInfo != typeid(NoClassInfo))
+			if (site.mClassInfo != typeid(NoClassInfo))
 			{
 				prefix << className(site.mClassInfo) << "::";
 			}
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index 34934c5c2..d0279f866 100644
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -238,10 +238,10 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
 	See top of file for common usage.	
 */
 
-#define lllog(level, broadTag, narrowTag, once) \
+#define lllog(level, broadTag, narrowTag, once, nofunction) \
 	do { \
 		static LLError::CallSite _site( \
-			level, __FILE__, __LINE__, typeid(_LL_CLASS_TO_LOG), __FUNCTION__, broadTag, narrowTag, once);\
+			level, __FILE__, __LINE__, typeid(_LL_CLASS_TO_LOG), nofunction ? NULL : __FUNCTION__, broadTag, narrowTag, once);\
 		if (LL_UNLIKELY(_site.shouldLog()))			\
 		{ \
 			std::ostringstream* _out = LLError::Log::out(); \
@@ -255,33 +255,39 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
 	} while(0)
 
 // DEPRECATED: Use the new macros that allow tags and *look* like macros.
-#define lldebugs	lllog(LLError::LEVEL_DEBUG, NULL, NULL, false)
-#define llinfos		lllog(LLError::LEVEL_INFO, NULL, NULL, false)
-#define llwarns		lllog(LLError::LEVEL_WARN, NULL, NULL, false)
-#define llerrs		lllog(LLError::LEVEL_ERROR, NULL, NULL, false)
+#define lldebugs	lllog(LLError::LEVEL_DEBUG, NULL, NULL, false, false)
+#define llinfos		lllog(LLError::LEVEL_INFO, NULL, NULL, false, false)
+#define llwarns		lllog(LLError::LEVEL_WARN, NULL, NULL, false, false)
+#define llerrs		lllog(LLError::LEVEL_ERROR, NULL, NULL, false, false)
 #define llcont		(*_out)
 
+// No function name
+#define lldebugs_nf	lllog(LLError::LEVEL_DEBUG, NULL, NULL, false, true)
+#define llinfos_nf	lllog(LLError::LEVEL_INFO, NULL, NULL, false, true)
+#define llwarns_nf	lllog(LLError::LEVEL_WARN, NULL, NULL, false, true)
+#define llerrs_nf	lllog(LLError::LEVEL_ERROR, NULL, NULL, false, true)
+
 // NEW Macros for debugging, allow the passing of a string tag
 
 // One Tag
-#define LL_DEBUGS(broadTag)	lllog(LLError::LEVEL_DEBUG, broadTag, NULL, false)
-#define LL_INFOS(broadTag)	lllog(LLError::LEVEL_INFO, broadTag, NULL, false)
-#define LL_WARNS(broadTag)	lllog(LLError::LEVEL_WARN, broadTag, NULL, false)
-#define LL_ERRS(broadTag)	lllog(LLError::LEVEL_ERROR, broadTag, NULL, false)
+#define LL_DEBUGS(broadTag)	lllog(LLError::LEVEL_DEBUG, broadTag, NULL, false, false)
+#define LL_INFOS(broadTag)	lllog(LLError::LEVEL_INFO, broadTag, NULL, false, false)
+#define LL_WARNS(broadTag)	lllog(LLError::LEVEL_WARN, broadTag, NULL, false, false)
+#define LL_ERRS(broadTag)	lllog(LLError::LEVEL_ERROR, broadTag, NULL, false, false)
 // Two Tags
-#define LL_DEBUGS2(broadTag, narrowTag)	lllog(LLError::LEVEL_DEBUG, broadTag, narrowTag, false)
-#define LL_INFOS2(broadTag, narrowTag)	lllog(LLError::LEVEL_INFO, broadTag, narrowTag, false)
-#define LL_WARNS2(broadTag, narrowTag)	lllog(LLError::LEVEL_WARN, broadTag, narrowTag, false)
-#define LL_ERRS2(broadTag, narrowTag)	lllog(LLError::LEVEL_ERROR, broadTag, narrowTag, false)
+#define LL_DEBUGS2(broadTag, narrowTag)	lllog(LLError::LEVEL_DEBUG, broadTag, narrowTag, false, false)
+#define LL_INFOS2(broadTag, narrowTag)	lllog(LLError::LEVEL_INFO, broadTag, narrowTag, false, false)
+#define LL_WARNS2(broadTag, narrowTag)	lllog(LLError::LEVEL_WARN, broadTag, narrowTag, false, false)
+#define LL_ERRS2(broadTag, narrowTag)	lllog(LLError::LEVEL_ERROR, broadTag, narrowTag, false, false)
 
 // Only print the log message once (good for warnings or infos that would otherwise
 // spam the log file over and over, such as tighter loops).
-#define LL_DEBUGS_ONCE(broadTag)	lllog(LLError::LEVEL_DEBUG, broadTag, NULL, true)
-#define LL_INFOS_ONCE(broadTag)	lllog(LLError::LEVEL_INFO, broadTag, NULL, true)
-#define LL_WARNS_ONCE(broadTag)	lllog(LLError::LEVEL_WARN, broadTag, NULL, true)
-#define LL_DEBUGS2_ONCE(broadTag, narrowTag)	lllog(LLError::LEVEL_DEBUG, broadTag, narrowTag, true)
-#define LL_INFOS2_ONCE(broadTag, narrowTag)	lllog(LLError::LEVEL_INFO, broadTag, narrowTag, true)
-#define LL_WARNS2_ONCE(broadTag, narrowTag)	lllog(LLError::LEVEL_WARN, broadTag, narrowTag, true)
+#define LL_DEBUGS_ONCE(broadTag)	lllog(LLError::LEVEL_DEBUG, broadTag, NULL, true, false)
+#define LL_INFOS_ONCE(broadTag)	lllog(LLError::LEVEL_INFO, broadTag, NULL, true, false)
+#define LL_WARNS_ONCE(broadTag)	lllog(LLError::LEVEL_WARN, broadTag, NULL, true, false)
+#define LL_DEBUGS2_ONCE(broadTag, narrowTag)	lllog(LLError::LEVEL_DEBUG, broadTag, narrowTag, true, false)
+#define LL_INFOS2_ONCE(broadTag, narrowTag)	lllog(LLError::LEVEL_INFO, broadTag, narrowTag, true, false)
+#define LL_WARNS2_ONCE(broadTag, narrowTag)	lllog(LLError::LEVEL_WARN, broadTag, narrowTag, true, false)
 
 #define LL_ENDL llendl
 #define LL_CONT	(*_out)
diff --git a/indra/llmessage/aicurl.cpp b/indra/llmessage/aicurl.cpp
index dc3c7e499..989c9aee6 100644
--- a/indra/llmessage/aicurl.cpp
+++ b/indra/llmessage/aicurl.cpp
@@ -547,12 +547,12 @@ LLAtomicU32 Stats::multi_errors;
 //static
 void Stats::print(void)
 {
-  llinfos << "============ CURL  STATS ============" << llendl;
-  llinfos << "  Curl multi       errors/calls      : " << std::dec << multi_errors << "/" << multi_calls << llendl;
-  llinfos << "  Curl easy        errors/calls      : " << std::dec << easy_errors << "/" << easy_calls << llendl;
-  llinfos << "  curl_easy_init() errors/calls      : " << std::dec << easy_init_errors << "/" << easy_init_calls << llendl;
-  llinfos << "  Current number of curl easy handles: " << std::dec << (easy_init_calls - easy_init_errors - easy_cleanup_calls) << llendl;
-  llinfos << "========= END OF CURL STATS =========" << llendl;
+  llinfos_nf << "============ CURL  STATS ============" << llendl;
+  llinfos_nf << "  Curl multi       errors/calls      : " << std::dec << multi_errors << "/" << multi_calls << llendl;
+  llinfos_nf << "  Curl easy        errors/calls      : " << std::dec << easy_errors << "/" << easy_calls << llendl;
+  llinfos_nf << "  curl_easy_init() errors/calls      : " << std::dec << easy_init_errors << "/" << easy_init_calls << llendl;
+  llinfos_nf << "  Current number of curl easy handles: " << std::dec << (easy_init_calls - easy_init_errors - easy_cleanup_calls) << llendl;
+  llinfos_nf << "========= END OF CURL STATS =========" << llendl;
 }
 
 // THREAD-SAFE
@@ -806,7 +806,7 @@ void CurlEasyRequest::setSSLCtxCallback(curl_ssl_ctx_callback callback, void* us
   setopt(CURLOPT_SSL_CTX_DATA, userdata ? this : NULL);
 }
 
-#define llmaybewarns lllog(LLApp::isExiting() ? LLError::LEVEL_INFO : LLError::LEVEL_WARN, NULL, NULL, false)
+#define llmaybewarns lllog(LLApp::isExiting() ? LLError::LEVEL_INFO : LLError::LEVEL_WARN, NULL, NULL, false, true)
 
 static size_t noHeaderCallback(char* ptr, size_t size, size_t nmemb, void* userdata)
 {
@@ -1127,7 +1127,7 @@ CurlResponderBuffer::CurlResponderBuffer()
   curl_easy_request_w->send_events_to(this);
 }
 
-#define llmaybeerrs lllog(LLApp::isRunning() ? LLError::LEVEL_ERROR : LLError::LEVEL_WARN, NULL, NULL, false)
+#define llmaybeerrs lllog(LLApp::isRunning() ? LLError::LEVEL_ERROR : LLError::LEVEL_WARN, NULL, NULL, false, true)
 
 // The callbacks need to be revoked when the CurlResponderBuffer is destructed (because that is what the callbacks use).
 // The AIThreadSafeSimple<CurlResponderBuffer> is destructed first (right to left), so when we get here then the

From c9715c5b0b7827d22acfea844cadff0c325d440a Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Tue, 31 Jul 2012 04:57:13 +0200
Subject: [PATCH 108/199] Print Dout() and DoutEntering() debug output on
 windows.

This is a bit of a hack currently and requires a
recompile with -DDEBUG_CURLIO.
---
 indra/cwdebug/CMakeLists.txt     |   2 +
 indra/cwdebug/debug.cc           |  69 +++++++++++++++++++-
 indra/cwdebug/debug.h            | 108 ++++++++++++++++++++++++++++++-
 indra/llmessage/aicurl.cpp       |  24 ++++++-
 indra/llmessage/aicurlthread.cpp |   4 +-
 indra/newview/llstartup.cpp      |   2 +-
 6 files changed, 199 insertions(+), 10 deletions(-)

diff --git a/indra/cwdebug/CMakeLists.txt b/indra/cwdebug/CMakeLists.txt
index 9f423c736..cb67f94f7 100644
--- a/indra/cwdebug/CMakeLists.txt
+++ b/indra/cwdebug/CMakeLists.txt
@@ -34,6 +34,8 @@ if(NOT WORD_SIZE EQUAL 32)
 	endif(WINDOWS)
 endif (NOT WORD_SIZE EQUAL 32)
 
+add_definitions(-Dcwdebug_EXPORTS)
+
 list(APPEND cwdebug_SOURCE_FILES ${cwdebug_HEADER_FILES})
 
 add_library (cwdebug ${cwdebug_SOURCE_FILES})
diff --git a/indra/cwdebug/debug.cc b/indra/cwdebug/debug.cc
index 5235ee8d6..2f25e5358 100644
--- a/indra/cwdebug/debug.cc
+++ b/indra/cwdebug/debug.cc
@@ -413,4 +413,71 @@ void cwdebug_backtrace(int n)
 }
 #endif
 
-#endif // CWDEBUG
+#elif defined(DEBUG_CURLIO)
+
+#include "debug.h"
+
+namespace debug
+{
+
+libcwd_do_type const libcw_do;
+AI_THREADLOCAL int Indent::S_indentation;
+
+std::ostream& operator<<(std::ostream& os, Indent::print_nt)
+{
+  if (Indent::S_indentation)
+	os << std::string(Indent::S_indentation, ' ');
+  return os;
+}
+
+std::ostream& operator<<(std::ostream& os, libcwd::buf2str const& b2s)
+{
+  static char const c2s_tab[7] = { 'a', 'b', 't', 'n', 'v', 'f', 'r' };
+  size_t size = b2s.mSize;
+  for (char const* p1 = b2s.mBuf; size > 0; --size, ++p1)
+  {
+	char c =*p1;
+	if ((c > 31 && c != 92 && c != 127) || (unsigned char)c > 159)
+	  os.put(c);
+	else
+	{
+	  os.put('\\');
+	  if (c > 6 && c < 14)
+	  {
+		os.put(c2s_tab[c - 7]);
+		return os;
+	  }
+	  else if (c == 27)
+	  {
+		os.put('e');
+		return os;
+	  }
+	  else if (c == '\\')
+	  {
+		os.put('\\');
+		return os;
+	  }
+	  short old_fill = os.fill('0');
+	  std::ios_base::fmtflags old_flgs = os.flags();
+	  os.width(3);
+	  os << std::oct << (int)((unsigned char)c);
+	  os.setf(old_flgs);
+	  os.fill(old_fill);
+	}
+  }
+  return os;
+}
+
+namespace dc
+{
+
+fake_channel const      warning(1, "WARNING     ");
+fake_channel const         curl(1, "CURL        ");
+fake_channel const       curlio(1, "CURLIO      ");
+fake_channel const statemachine(1, "STATEMACHINE");
+fake_channel const       notice(1, "NOTICE      ");
+
+} // namespace dc
+} // namespace debug
+
+#endif
diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h
index f148e7667..51fd95914 100644
--- a/indra/cwdebug/debug.h
+++ b/indra/cwdebug/debug.h
@@ -27,6 +27,111 @@
 
 #ifndef CWDEBUG
 
+#ifdef DEBUG_CURLIO
+
+#if LL_WINDOWS
+#define CWD_DLLEXPORT __declspec(dllexport)
+#define CWD_DLLIMPORT __declspec(dllimport)
+#elif LL_LINUX
+#define CWD_DLLEXPORT __attribute__ ((visibility("default")))
+#define CWD_DLLIMPORT
+#else
+#define CWD_DLLEXPORT
+#define CWD_DLLIMPORT
+#endif // LL_WINDOWS
+
+#if LL_COMMON_LINK_SHARED
+#if defined(cwdebug_EXPORTS)
+#define CWD_API CWD_DLLEXPORT
+#else // cwdebug_EXPORTS
+#define CWD_API CWD_DLLIMPORT
+#endif // cwdebug_EXPORTS
+#else // LL_COMMON_LINK_SHARED
+#error LL_COMMON_LINK_SHARED not defined
+#endif // LL_COMMON_LINK_SHARED
+
+// If CWDEBUG is not defined, but DEBUG_CURLIO is, then replace
+// some of the cwd macro's with something that generates viewer
+// specific debug output. Note that this generates a LOT of
+// output and should not normally be defined.
+
+#include <string>
+
+#if LL_WINDOWS
+#define AI_THREADLOCAL __declspec(thread)
+#else
+#define AI_THREADLOCAL __thread
+#endif
+
+namespace debug {
+namespace libcwd {
+
+struct buf2str {
+  buf2str(char const* buf, int size) : mBuf(buf), mSize(size) { }
+  char const* mBuf;
+  int mSize;
+};
+
+} // namespace libcwd
+
+extern CWD_API std::ostream& operator<<(std::ostream& os, libcwd::buf2str const& b2s);
+
+inline void init() { }
+struct libcwd_do_type {
+ void on() const { }
+};
+extern CWD_API libcwd_do_type const libcw_do;
+struct CWD_API Indent {
+  int M_indent;
+  static AI_THREADLOCAL int S_indentation;
+  enum print_nt { print };
+  Indent(int indent) : M_indent(indent) { S_indentation += M_indent; }
+  ~Indent() { S_indentation -= M_indent; }
+  friend CWD_API std::ostream& operator<<(std::ostream& os, print_nt);
+};
+
+namespace dc {
+
+struct fake_channel {
+  int mOn;
+  char const* mLabel;
+  fake_channel(int on, char const* label) : mOn(on), mLabel(label) { }
+  fake_channel(void) : mOn(0) { }
+  bool is_on() const { return mOn; }
+  bool is_off() const { return !mOn; }
+  void on() const { }
+  void off() const { }
+};
+extern CWD_API fake_channel const warning;
+extern CWD_API fake_channel const curl;
+extern CWD_API fake_channel const curlio;
+extern CWD_API fake_channel const statemachine;
+extern CWD_API fake_channel const notice;
+
+} // namespace dc
+} // namespace debug
+
+#define Debug(x) do { using namespace debug; x; } while(0)
+#define Dout(a, b) do { using namespace debug;  if ((a).mOn) { llinfos_nf << (a).mLabel << ": " << Indent::print << b << llendl; } } while(0)
+#define DoutEntering(a, b) \
+  int __slviewer_debug_indentation = 2; \
+  { \
+	using namespace debug; \
+	if ((a).mOn) \
+	  llinfos_nf << (a).mLabel << ": " << Indent::print << "Entering " << b << llendl; \
+    else \
+	  __slviewer_debug_indentation = 0; \
+  } \
+  debug::Indent __slviewer_debug_indent(__slviewer_debug_indentation);
+
+#else // !DEBUG_CURLIO
+
+#define Debug(x)
+#define Dout(a, b)
+#define DoutEntering(a, b)
+
+#endif // !DEBUG_CURLIO
+
 #ifndef DOXYGEN         // No need to document this.  See http://libcwd.sourceforge.net/ for more info.
 
 #include <iostream>
@@ -36,9 +141,6 @@
 #define AllocTag2(p, desc)
 #define AllocTag_dynamic_description(p, x)
 #define AllocTag(p, x)
-#define Debug(x)
-#define Dout(a, b)
-#define DoutEntering(a, b)
 #define DoutFatal(a, b) LibcwDoutFatal(::std, , a, b)
 #define ForAllDebugChannels(STATEMENT)
 #define ForAllDebugObjects(STATEMENT)
diff --git a/indra/llmessage/aicurl.cpp b/indra/llmessage/aicurl.cpp
index 989c9aee6..c68399059 100644
--- a/indra/llmessage/aicurl.cpp
+++ b/indra/llmessage/aicurl.cpp
@@ -886,9 +886,18 @@ void CurlEasyRequest::addHeader(char const* header)
   mHeaders = curl_slist_append(mHeaders, header);
 }
 
-#ifdef CWDEBUG
-static int curl_debug_callback(CURL*, curl_infotype infotype, char* buf, size_t size, void* user_ptr)
+#if defined(CWDEBUG) || defined(DEBUG_CURLIO)
+
+#ifndef CWDEBUG
+#define LIBCWD_DEBUGCHANNELS 0
+#define LibcwDoutScopeBegin(a, b, c) do { using namespace debug; llinfos_nf << dc::curlio.mLabel << ": ";
+#define LibcwDoutStream llcont
+#define LibcwDoutScopeEnd llcont << llendl; } while(0)
+#endif
+
+static int curl_debug_cb(CURL*, curl_infotype infotype, char* buf, size_t size, void* user_ptr)
 {
+#ifdef CWDEBUG
   using namespace ::libcwd;
 
   CurlEasyRequest* request = (CurlEasyRequest*)user_ptr;
@@ -898,6 +907,13 @@ static int curl_debug_callback(CURL*, curl_infotype infotype, char* buf, size_t
   libcw_do.marker().assign(marker.str().data(), marker.str().size());
   if (!debug::channels::dc::curlio.is_on())
 	debug::channels::dc::curlio.on();
+#else
+  if (infotype == CURLINFO_TEXT)
+  {
+	while (size > 0 && (buf[size - 1] == '\r' ||  buf[size - 1] == '\n'))
+	  --size;
+  }
+#endif
   LibcwDoutScopeBegin(LIBCWD_DEBUGCHANNELS, libcw_do, dc::curlio|cond_nonewline_cf(infotype == CURLINFO_TEXT))
   switch (infotype)
   {
@@ -976,7 +992,9 @@ static int curl_debug_callback(CURL*, curl_infotype infotype, char* buf, size_t
   else
 	LibcwDoutStream << size << " bytes";
   LibcwDoutScopeEnd;
+#ifdef CWDEBUG
   libcw_do.pop_marker();
+#endif
   return 0;
 }
 #endif
@@ -1041,7 +1059,7 @@ void CurlEasyRequest::applyDefaultOptions(void)
 	if (dc::curlio.is_on())
 	{
 	  setopt(CURLOPT_VERBOSE, 1);
-	  setopt(CURLOPT_DEBUGFUNCTION, &curl_debug_callback);
+	  setopt(CURLOPT_DEBUGFUNCTION, &curl_debug_cb);
 	  setopt(CURLOPT_DEBUGDATA, this);
 	}
   );
diff --git a/indra/llmessage/aicurlthread.cpp b/indra/llmessage/aicurlthread.cpp
index 3956e9f2f..c5348125b 100644
--- a/indra/llmessage/aicurlthread.cpp
+++ b/indra/llmessage/aicurlthread.cpp
@@ -39,7 +39,7 @@
 #endif
 #include <deque>
 
-#define DEBUG_WINDOWS_CODE_ON_LINUX 0
+#define DEBUG_WINDOWS_CODE_ON_LINUX 1
 
 #if DEBUG_WINDOWS_CODE_ON_LINUX
 
@@ -1262,7 +1262,7 @@ MultiHandle::~MultiHandle()
   delete mReadPollSet;
 }
 
-#ifdef CWDEBUG
+#if defined(CWDEBUG) || defined(DEBUG_CURLIO)
 #undef AI_CASE_RETURN
 #define AI_CASE_RETURN(x) do { case x: return #x; } while(0)
 char const* action_str(int action)
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 10f10cc90..1400da474 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -253,7 +253,7 @@ extern S32 gStartImageHeight;
 // local globals
 //
 
-#ifdef CWDEBUG
+#if defined(CWDEBUG) || defined(DEBUG_CURLIO)
 static bool gCurlIo;
 #endif
 

From 1c9f996248b5a0f2f4a1339f4e5472171486df18 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Tue, 31 Jul 2012 03:37:10 -0400
Subject: [PATCH 109/199] Make "Autorespond to people you have muted" an
 independent toggle for that type of autoresponse.

Trivial fix to carry users along, not needing to autorespond to anyone in order to autorespond to mutes.
I was working on a complete rewrite months ago, I have to dig that up, even still this system needs to be redone, ground up.
---
 indra/newview/llviewermessage.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 414c4bff2..3b61f7af5 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -2060,8 +2060,8 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		LLAvatarTracker::instance().getBuddyInfo(from_id) == NULL )
 		do_auto_response = true;
 
-	if( is_muted && !gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseMuted") )
-		do_auto_response = false;
+	if( is_muted )
+		do_auto_response = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseMuted");
 
 	if( offline != IM_ONLINE )
 		do_auto_response = false;

From 783e86990ce6318ce65fe11e62c3a1c9fbd99e15 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 31 Jul 2012 19:42:15 +0200
Subject: [PATCH 110/199] Compile fixes

---
 indra/cwdebug/debug.h            | 6 +++---
 indra/llmessage/aicurlthread.cpp | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h
index 51fd95914..0599d0598 100644
--- a/indra/cwdebug/debug.h
+++ b/indra/cwdebug/debug.h
@@ -81,12 +81,12 @@ struct libcwd_do_type {
  void on() const { }
 };
 extern CWD_API libcwd_do_type const libcw_do;
-struct CWD_API Indent {
+struct Indent {
   int M_indent;
   static AI_THREADLOCAL int S_indentation;
   enum print_nt { print };
-  Indent(int indent) : M_indent(indent) { S_indentation += M_indent; }
-  ~Indent() { S_indentation -= M_indent; }
+  CWD_API Indent(int indent) : M_indent(indent) { S_indentation += M_indent; }
+  CWD_API ~Indent() { S_indentation -= M_indent; }
   friend CWD_API std::ostream& operator<<(std::ostream& os, print_nt);
 };
 
diff --git a/indra/llmessage/aicurlthread.cpp b/indra/llmessage/aicurlthread.cpp
index c5348125b..ea1c4b5ba 100644
--- a/indra/llmessage/aicurlthread.cpp
+++ b/indra/llmessage/aicurlthread.cpp
@@ -39,7 +39,11 @@
 #endif
 #include <deque>
 
-#define DEBUG_WINDOWS_CODE_ON_LINUX 1
+// On linux, add -DDEBUG_WINDOWS_CODE_ON_LINUX to test the windows code used in this file.
+#if !defined(DEBUG_WINDOWS_CODE_ON_LINUX) || !defined(LL_LINUX) || defined(LL_RELEASE)
+#undef DEBUG_WINDOWS_CODE_ON_LINUX
+#define DEBUG_WINDOWS_CODE_ON_LINUX 0
+#endif
 
 #if DEBUG_WINDOWS_CODE_ON_LINUX
 

From 0208942b840b631e4bd1bd8c9834d0be36f975a0 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 31 Jul 2012 21:28:37 +0200
Subject: [PATCH 111/199] Compile warning fix

---
 indra/cwdebug/debug.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/cwdebug/debug.cc b/indra/cwdebug/debug.cc
index 2f25e5358..34ce73738 100644
--- a/indra/cwdebug/debug.cc
+++ b/indra/cwdebug/debug.cc
@@ -457,7 +457,7 @@ std::ostream& operator<<(std::ostream& os, libcwd::buf2str const& b2s)
 		os.put('\\');
 		return os;
 	  }
-	  short old_fill = os.fill('0');
+	  std::ostream::char_type old_fill = os.fill('0');
 	  std::ios_base::fmtflags old_flgs = os.flags();
 	  os.width(3);
 	  os << std::oct << (int)((unsigned char)c);

From 7f64668e551070f7f2596bd7943addf804db6034 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 31 Jul 2012 21:29:22 +0200
Subject: [PATCH 112/199] Compile warning fix

---
 indra/cwdebug/debug.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h
index 0599d0598..ce35a0e34 100644
--- a/indra/cwdebug/debug.h
+++ b/indra/cwdebug/debug.h
@@ -97,7 +97,7 @@ struct fake_channel {
   char const* mLabel;
   fake_channel(int on, char const* label) : mOn(on), mLabel(label) { }
   fake_channel(void) : mOn(0) { }
-  bool is_on() const { return mOn; }
+  bool is_on() const { return !!mOn; }
   bool is_off() const { return !mOn; }
   void on() const { }
   void off() const { }

From 9c4f22d85b2ef93645e23995c8c43360d48b5f19 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 31 Jul 2012 21:30:05 +0200
Subject: [PATCH 113/199] Attempt at fixing linker errors...

---
 indra/cwdebug/debug.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h
index ce35a0e34..9501cd60c 100644
--- a/indra/cwdebug/debug.h
+++ b/indra/cwdebug/debug.h
@@ -74,8 +74,6 @@ struct buf2str {
 
 } // namespace libcwd
 
-extern CWD_API std::ostream& operator<<(std::ostream& os, libcwd::buf2str const& b2s);
-
 inline void init() { }
 struct libcwd_do_type {
  void on() const { }
@@ -84,12 +82,14 @@ extern CWD_API libcwd_do_type const libcw_do;
 struct Indent {
   int M_indent;
   static AI_THREADLOCAL int S_indentation;
-  enum print_nt { print };
+  enum CWD_API print_nt { print };
   CWD_API Indent(int indent) : M_indent(indent) { S_indentation += M_indent; }
   CWD_API ~Indent() { S_indentation -= M_indent; }
-  friend CWD_API std::ostream& operator<<(std::ostream& os, print_nt);
 };
 
+extern CWD_API std::ostream& operator<<(std::ostream& os, libcwd::buf2str const& b2s);
+extern CWD_API std::ostream& operator<<(std::ostream& os, Indent::print_nt);
+
 namespace dc {
 
 struct fake_channel {

From 32be05fa6ca53123a114542c6b189629af769b8c Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Tue, 31 Jul 2012 22:37:49 +0200
Subject: [PATCH 114/199] Compile warning fixes. Type fix (SLL -> SSL)

---
 indra/llmessage/aicurl.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/indra/llmessage/aicurl.cpp b/indra/llmessage/aicurl.cpp
index 6d3cbf4b0..2f90b8e6e 100644
--- a/indra/llmessage/aicurl.cpp
+++ b/indra/llmessage/aicurl.cpp
@@ -200,15 +200,15 @@ static bool need_renegotiation_hack = false;
 void ssl_init(void)
 {
   // The version identifier format is: MMNNFFPPS: major minor fix patch status.
-  int const compiled_openSLL_major = (OPENSSL_VERSION_NUMBER >> 28) & 0xff;
-  int const compiled_openSLL_minor = (OPENSSL_VERSION_NUMBER >> 20) & 0xff;
+  int const compiled_openSSL_major = (OPENSSL_VERSION_NUMBER >> 28) & 0xff;
+  int const compiled_openSSL_minor = (OPENSSL_VERSION_NUMBER >> 20) & 0xff;
   unsigned long const ssleay = SSLeay();
-  int const linked_openSLL_major = (ssleay >> 28) & 0xff;
-  int const linked_openSLL_minor = (ssleay >> 20) & 0xff;
+  int const linked_openSSL_major = (ssleay >> 28) & 0xff;
+  int const linked_openSSL_minor = (ssleay >> 20) & 0xff;
   // Check if dynamically loaded version is compatible with the one we compiled against.
   // As off version 1.0.0 also minor versions are compatible.
-  if (linked_openSLL_major != compiled_openSLL_major ||
-	  (compiled_openSLL_major == 0 && linked_openSLL_minor != compiled_openSLL_minor))
+  if (linked_openSSL_major != compiled_openSSL_major ||
+	  (linked_openSSL_major == 0 && linked_openSSL_minor != compiled_openSSL_minor))
   {
 	llerrs << "The viewer was compiled against " << OPENSSL_VERSION_TEXT <<
 	    " but linked against " << SSLeay_version(SSLEAY_VERSION) <<
@@ -949,7 +949,7 @@ static int curl_debug_cb(CURL*, curl_infotype infotype, char* buf, size_t size,
   {
 	LibcwDoutStream << size << " bytes";
 	bool finished = false;
-	int i = 0;
+	size_t i = 0;
 	while (i < size)
 	{
 	  char c = buf[i];

From 048c57cf0c3c3265b6594384bd8e76d70a1e667a Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 31 Jul 2012 22:40:20 +0200
Subject: [PATCH 115/199] Linktime fix

---
 indra/cwdebug/debug.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h
index 9501cd60c..e20ddda77 100644
--- a/indra/cwdebug/debug.h
+++ b/indra/cwdebug/debug.h
@@ -41,7 +41,7 @@
 #endif // LL_WINDOWS
 
 #if LL_COMMON_LINK_SHARED
-#if defined(cwdebug_EXPORTS)
+#if defined(cwdebug_EXPORTS) || defined(llcommon_EXPORTS)
 #define CWD_API CWD_DLLEXPORT
 #else // cwdebug_EXPORTS
 #define CWD_API CWD_DLLIMPORT

From 725cdc2d69d734f6b457ee426882f3be1af4b7c8 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Tue, 31 Jul 2012 23:04:45 +0200
Subject: [PATCH 116/199] Linux compile fixes

---
 indra/cwdebug/debug.cc | 2 +-
 indra/cwdebug/debug.h  | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/indra/cwdebug/debug.cc b/indra/cwdebug/debug.cc
index 34ce73738..18b51aad0 100644
--- a/indra/cwdebug/debug.cc
+++ b/indra/cwdebug/debug.cc
@@ -421,7 +421,7 @@ namespace debug
 {
 
 libcwd_do_type const libcw_do;
-AI_THREADLOCAL int Indent::S_indentation;
+CWD_TLS int Indent::S_indentation;
 
 std::ostream& operator<<(std::ostream& os, Indent::print_nt)
 {
diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h
index e20ddda77..d49a61512 100644
--- a/indra/cwdebug/debug.h
+++ b/indra/cwdebug/debug.h
@@ -58,9 +58,11 @@
 #include <string>
 
 #if LL_WINDOWS
-#define AI_THREADLOCAL __declspec(thread)
+#define CWD_API_TLS __declspec(thread)
+#define CWD_TLS __declspec(thread)
 #else
-#define AI_THREADLOCAL __thread
+#define CWD_API_TLS CWD_API __thread
+#define CWD_TLS __thread
 #endif
 
 namespace debug {
@@ -81,7 +83,7 @@ struct libcwd_do_type {
 extern CWD_API libcwd_do_type const libcw_do;
 struct Indent {
   int M_indent;
-  static AI_THREADLOCAL int S_indentation;
+  static CWD_API_TLS int S_indentation;
   enum CWD_API print_nt { print };
   CWD_API Indent(int indent) : M_indent(indent) { S_indentation += M_indent; }
   CWD_API ~Indent() { S_indentation -= M_indent; }

From 73fedf453c7f23a4231f39bfb6545b8ac474ebdf Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 1 Aug 2012 09:13:40 -0400
Subject: [PATCH 117/199] Compile fixies~

---
 indra/llmath/lloctree.h          | 2 +-
 indra/llrender/llpostprocess.cpp | 4 ++--
 indra/llrender/llpostprocess.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index 07ca00913..cc1482b18 100644
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -457,7 +457,7 @@ public:
 			mDataEnd = NULL;
 		}
 
-		notifyRemoval(data);
+		this->notifyRemoval(data);
 		checkAlive();
 	}
 
diff --git a/indra/llrender/llpostprocess.cpp b/indra/llrender/llpostprocess.cpp
index e09d0f349..dd54b8b6c 100644
--- a/indra/llrender/llpostprocess.cpp
+++ b/indra/llrender/llpostprocess.cpp
@@ -565,13 +565,13 @@ void LLPostProcess::setSelectedEffect(std::string const & effectName)
 	}
 }
 
-void LLPostProcess::setSelectedEffectValue(std::string const & setting, LLSD& value)
+void LLPostProcess::setSelectedEffectValue(std::string const & setting, LLSD value)
 {
 	char buf[256];
 	S32 elem=0;
 	if(sscanf(setting.c_str(),"%255[^[][%d]", buf, &elem) == 2)
 	{
-		mSelectedEffectInfo[buf][elem] = value;
+		mSelectedEffectInfo[static_cast<const char*>(buf)][elem] = value;
 	}
 	else
 	{
diff --git a/indra/llrender/llpostprocess.h b/indra/llrender/llpostprocess.h
index 830598a92..ec076842d 100644
--- a/indra/llrender/llpostprocess.h
+++ b/indra/llrender/llpostprocess.h
@@ -149,7 +149,7 @@ public:
 	inline LLSD const & getSelectedEffectInfo(void) const			{ return mSelectedEffectInfo; }
 	//  Setters
 	void setSelectedEffect(std::string const & effectName);
-	void setSelectedEffectValue(std::string const & setting, LLSD& value);
+	void setSelectedEffectValue(std::string const & setting, LLSD value);
 	void resetSelectedEffect();
 	void saveEffectAs(std::string const & effectName);
 };

From be8b838334cba53542e67e436814f3c56192f3c9 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 1 Aug 2012 09:21:38 -0400
Subject: [PATCH 118/199] Make new Posterize Effect fit in with the cleaned
 look of post-process floater.

---
 .../xui/en-us/floater_post_process.xml        | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/floater_post_process.xml b/indra/newview/skins/default/xui/en-us/floater_post_process.xml
index 8280d1f84..12e3d8ad6 100644
--- a/indra/newview/skins/default/xui/en-us/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_post_process.xml
@@ -146,25 +146,25 @@
 				left="14" max_val="1" min_val="0" mouse_opaque="true"
 				name="noise_strength" show_text="true" value="1.0" width="220" />
 		</panel>
-    <panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
-     label="Posterize" left="1" mouse_opaque="false"
-     name="PosterizePanel" width="398">
-      <check_box bottom="-20" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="false" label="Enable"
-			     left="14" mouse_opaque="true" name="enable_posterize" width="200" />
-      <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="PosterLayersText" v_pad="0"
-			     width="355">
-        Layer Count
-      </text>
-      <slider bottom_delta="-30" can_edit_text="true"
-			     decimal_digits="3" follows="left"
-			     height="18" increment="1" initial_val="10" label="" left="14"
-			     max_val="20" min_val="1" mouse_opaque="true"
-			     name="posterize_layers" show_text="true" value="10" width="200" />
-    </panel>
+		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
+			label="Posterize" left="1" mouse_opaque="false"
+			name="PosterizePanel" width="398">
+			<check_box bottom="-40" follows="left|top"
+				font="SansSerifSmall" height="16" initial_value="false" label="Enable"
+				left="4" mouse_opaque="true" name="enable_posterize" width="200" />
+			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+				bottom_delta="-21" drop_shadow_visible="true" follows="left|top|right"
+				font="SansSerif" h_pad="0" halign="left" height="16"
+				left="10" mouse_opaque="true" name="PosterLayersText" v_pad="0"
+				width="355">
+				Layer Count
+			</text>
+			<slider bottom_delta="-30" can_edit_text="true"
+				decimal_digits="3" follows="left"
+				height="18" increment="1" initial_val="10" label="" left="14"
+				max_val="20" min_val="1" mouse_opaque="true"
+				name="posterize_layers" show_text="true" value="10" width="200" />
+		</panel>
 		<!--<panel border="true" bottom="-180" follows="left|top|right|bottom" height="400"
 			 label="Bloom" left="1" mouse_opaque="true"
 			 name="BloomPanel" width="398">

From b151796e0e8c558e07e26041cbe473c945660ea2 Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Thu, 2 Aug 2012 05:38:23 -0400
Subject: [PATCH 119/199] Updated LSL Funtions

Updated the functions, constants, tooltips, etc for os,aa, and secondlife
---
 indra/llcommon/lllslconstants.h               |  177 +
 indra/lscript/lscript_compile/indra.l         |   79 +-
 indra/lscript/lscript_http.h                  |    3 +-
 .../lscript_library/lscript_library.cpp       |  271 +-
 indra/newview/app_settings/keywords.ini       |  310 +-
 .../skins/default/xui/en-us/strings.xml       | 3223 +++++++++--------
 6 files changed, 2311 insertions(+), 1752 deletions(-)

diff --git a/indra/llcommon/lllslconstants.h b/indra/llcommon/lllslconstants.h
index 06af6dd29..42aaad985 100644
--- a/indra/llcommon/lllslconstants.h
+++ b/indra/llcommon/lllslconstants.h
@@ -73,6 +73,15 @@ const S32 LSL_PRIM_TEXGEN		= 22;
 const S32 LSL_PRIM_POINT_LIGHT	= 23;
 const S32 LSL_PRIM_CAST_SHADOWS	= 24;
 const S32 LSL_PRIM_GLOW     	= 25;
+const S32 LSL_PRIM_TEXT			= 26;
+const S32 LSL_PRIM_NAME			= 27;
+const S32 LSL_PRIM_DESC			= 28;
+const S32 LSL_PRIM_ROT_LOCAL	= 29;
+const S32 LSL_PRIM_PHYSICS_SHAPE_TYPE = 30;
+const S32 LSL_PRIM_OMEGA		= 32;
+const S32 LSL_PRIM_POS_LOCAL	= 33;
+const S32 LSL_PRIM_LINK_TARGET	= 34;
+const S32 LSL_PRIM_SLICE	    = 35;
 
 const S32 LSL_PRIM_TYPE_BOX		= 0;
 const S32 LSL_PRIM_TYPE_CYLINDER= 1;
@@ -132,6 +141,15 @@ const S32 LSL_PRIM_SCULPT_TYPE_MASK     = 7;
 const S32 LSL_PRIM_SCULPT_FLAG_INVERT   = 64;
 const S32 LSL_PRIM_SCULPT_FLAG_MIRROR   = 128;
 
+const S32 LSL_PRIM_PHYSICS_SHAPE_PRIM	= 0;
+const S32 LSL_PRIM_PHYSICS_SHAPE_NONE	= 1;
+const S32 LSL_PRIM_PHYSICS_SHAPE_CONVEX = 2;
+
+const S32 LSL_DENSITY				= 1;
+const S32 LSL_FRICTION				= 2;
+const S32 LSL_RESTITUTION			= 4;
+const S32 LSL_GRAVITY_MULTIPLIER	= 8;
+
 const S32 LSL_ALL_SIDES				= -1;
 const S32 LSL_LINK_ROOT				= 1;
 const S32 LSL_LINK_FIRST_CHILD		= 2;
@@ -189,6 +207,13 @@ const S32 OBJECT_RUNNING_SCRIPT_COUNT = 9;
 const S32 OBJECT_TOTAL_SCRIPT_COUNT = 10;
 const S32 OBJECT_SCRIPT_MEMORY = 11;
 const S32 OBJECT_SCRIPT_TIME = 12;
+const S32 OBJECT_PRIM_EQUIVALENCE = 13;
+const S32 OBJECT_SERVER_COST = 14;
+const S32 OBJECT_STREAMING_COST = 15;
+const S32 OBJECT_PHYSICS_COST = 16;
+
+// llTextBox() magic token string - yes it's a hack. 
+char const* const TEXTBOX_MAGIC_TOKEN = "!!llTextBox!!"; 
 
 // changed() event flags
 const U32	CHANGED_NONE = 0x0;
@@ -216,4 +241,156 @@ const U32 LSL_STATUS_INTERNAL_ERROR     = 1999;
 
 // Start per-function errors below, starting at 2000:
 const U32 LSL_STATUS_WHITELIST_FAILED   = 2001;
+
+// Memory profiling support
+const S32 LSL_PROFILE_SCRIPT_NONE		= 0;
+const S32 LSL_PROFILE_SCRIPT_MEMORY		= 1;
+
+// HTTP responses contents type
+const S32 LSL_CONTENT_TYPE_TEXT = 0;
+const S32 LSL_CONTENT_TYPE_HTML = 1;
+
+// Ray casting
+const S32 LSL_RCERR_UNKNOWN				= -1;
+const S32 LSL_RCERR_SIM_PERF_LOW		= -2;
+const S32 LSL_RCERR_CAST_TIME_EXCEEDED	= -3;
+
+const S32 LSL_RC_REJECT_TYPES			= 0;
+const S32 LSL_RC_DETECT_PHANTOM			= 1;
+const S32 LSL_RC_DATA_FLAGS				= 2;
+const S32 LSL_RC_MAX_HITS				= 3;
+
+const S32 LSL_RC_REJECT_AGENTS			= 1;
+const S32 LSL_RC_REJECT_PHYSICAL		= 2;
+const S32 LSL_RC_REJECT_NONPHYSICAL		= 4;
+const S32 LSL_RC_REJECT_LAND			= 8;
+
+const S32 LSL_RC_GET_NORMAL				= 1;
+const S32 LSL_RC_GET_ROOT_KEY			= 2;
+const S32 LSL_RC_GET_LINK_NUM			= 4;
+
+// Estate management
+const S32 LSL_ESTATE_ACCESS_ALLOWED_AGENT_ADD		= 4;
+const S32 LSL_ESTATE_ACCESS_ALLOWED_AGENT_REMOVE	= 8;
+const S32 LSL_ESTATE_ACCESS_ALLOWED_GROUP_ADD		= 16;
+const S32 LSL_ESTATE_ACCESS_ALLOWED_GROUP_REMOVE	= 32;
+const S32 LSL_ESTATE_ACCESS_BANNED_AGENT_ADD		= 64;
+const S32 LSL_ESTATE_ACCESS_BANNED_AGENT_REMOVE		= 128;
+
+// Key Frame Motion:
+const S32 LSL_KFM_COMMAND		= 0;
+const S32 LSL_KFM_MODE			= 1;
+const S32 LSL_KFM_DATA			= 2;
+const S32 LSL_KFM_FORWARD		= 0;
+const S32 LSL_KFM_LOOP			= 1;
+const S32 LSL_KFM_PING_PONG		= 2;
+const S32 LSL_KFM_REVERSE		= 3;
+const S32 LSL_KFM_ROTATION		= 1;
+const S32 LSL_KFM_TRANSLATION	= 2;
+const S32 LSL_KFM_CMD_PLAY		= 0;
+const S32 LSL_KFM_CMD_STOP		= 1;
+const S32 LSL_KFM_CMD_PAUSE		= 2;
+
+// Second Life Server/12 12.04.30.255166  constants for llGetAgentList
+const S32 AGENT_LIST_PARCEL               = 1;
+const S32 AGENT_LIST_PARCEL_OWNER         = 2; 
+const S32 AGENT_LIST_REGION               = 4;
+
+
+// --- SL Constants ABOVE this line ---
+// --- OpenSim / Aurora-Sim constants Below ---
+// OpenSim Constants (\OpenSim\Region\ScriptEngine\Shared\Api\Runtime\LSL_Constants.cs) 
+// Constants for cmWindlight (\OpenSim\Region\ScriptEngine\Shared\Api\Runtime\CM_Constants.cs) 
+const S32 CHANGED_ANIMATION	        = 16384;
+const S32 PARCEL_DETAILS_CLAIMDATE = 10; // used by OpenSim osSetParcelDetails
+const S32 STATS_TIME_DILATION	    = 0;
+const S32 STATS_SIM_FPS 	        = 1;
+const S32 STATS_PHYSICS_FPS 	    = 2;
+const S32 STATS_AGENT_UPDATES 	    = 3;
+const S32 STATS_ROOT_AGENTS 	    = 4;
+const S32 STATS_CHILD_AGENTS        = 5;
+const S32 STATS_TOTAL_PRIMS         = 6;
+const S32 STATS_ACTIVE_PRIMS	    = 7;
+const S32 STATS_FRAME_MS 	        = 8;
+const S32 STATS_NET_MS 	            = 9;
+const S32 STATS_PHYSICS_MS 	        = 10;
+const S32 STATS_IMAGE_MS 	        = 11;
+const S32 STATS_OTHER_MS            = 12;
+const S32 STATS_IN_PACKETS_PER_SECOND   = 13;
+const S32 STATS_OUT_PACKETS_PER_SECOND 	= 14;
+const S32 STATS_UNACKED_BYTES 	    = 15;
+const S32 STATS_AGENT_MS 	        = 16;
+const S32 STATS_PENDING_DOWNLOADS   = 17;
+const S32 STATS_PENDING_UPLOADS 	= 18;
+const S32 STATS_ACTIVE_SCRIPTS 	    = 19;
+const S32 STATS_SCRIPT_LPS          = 20;
+// osNPC
+const S32 OS_NPC_FLY 	            = 0;
+const S32 OS_NPC_NO_FLY 	        = 1;
+const S32 OS_NPC_LAND_AT_TARGET 	= 2;
+const S32 OS_NPC_SIT_NOW 	        = 0;
+const U32 OS_NPC_CREATOR_OWNED 	    = 0x1;
+const U32 OS_NPC_NOT_OWNED          = 0x2;
+const U32 OS_NPC_SENSE_AS_AGENT     = 0x4;
+const U32 OS_NPC_RUNNING            = 4;
+// Lightshare / Windlight
+const S32 WL_WATER_COLOR                = 0;
+const S32 WL_WATER_FOG_DENSITY_EXPONENT	= 1;
+const S32 WL_UNDERWATER_FOG_MODIFIER	= 2;
+const S32 WL_REFLECTION_WAVELET_SCALE	= 3;
+const S32 WL_FRESNEL_SCALE	            = 4;
+const S32 WL_FRESNEL_OFFSET	            = 5;
+const S32 WL_REFRACT_SCALE_ABOVE	    = 6;
+const S32 WL_REFRACT_SCALE_BELOW	    = 7;
+const S32 WL_BLUR_MULTIPLIER	        = 8;
+const S32 WL_BIG_WAVE_DIRECTION	        = 9;
+const S32 WL_LITTLE_WAVE_DIRECTION	    = 10;
+const S32 WL_NORMAL_MAP_TEXTURE	        = 11;
+const S32 WL_HORIZON	                = 12;
+const S32 WL_HAZE_HORIZON	            = 13;
+const S32 WL_BLUE_DENSITY	            = 14;
+const S32 WL_HAZE_DENSITY	            = 15;
+const S32 WL_DENSITY_MULTIPLIER	        = 16;
+const S32 WL_DISTANCE_MULTIPLIER	    = 17;
+const S32 WL_MAX_ALTITUDE	            = 18;
+const S32 WL_SUN_MOON_COLOR	            = 19;
+const S32 WL_AMBIENT	                = 20;
+const S32 WL_EAST_ANGLE	                = 21;
+const S32 WL_SUN_GLOW_FOCUS	            = 22;
+const S32 WL_SUN_GLOW_SIZE	            = 23;
+const S32 WL_SCENE_GAMMA	            = 24;
+const S32 WL_STAR_BRIGHTNESS	        = 25;
+const S32 WL_CLOUD_COLOR	            = 26;
+const S32 WL_CLOUD_XY_DENSITY         	= 27;
+const S32 WL_CLOUD_COVERAGE           	= 28;
+const S32 WL_CLOUD_SCALE	            = 29;
+const S32 WL_CLOUD_DETAIL_XY_DENSITY	= 30;
+const S32 WL_CLOUD_SCROLL_X	            = 31;
+const S32 WL_CLOUD_SCROLL_Y	            = 32;
+const S32 WL_CLOUD_SCROLL_Y_LOCK	    = 33;
+const S32 WL_CLOUD_SCROLL_X_LOCK	    = 34;
+const S32 WL_DRAW_CLASSIC_CLOUDS	    = 35;
+const S32 WL_SUN_MOON_POSITION	        = 36;
+// Aurora-Sim Constants  (\Aurora\AuroraDotNetEngine\APIs\AA_Constants.cs) -->
+const S32 BOT_FOLLOW_FLAG_NONE	        = 0;  
+const S32 BOT_FOLLOW_FLAG_INDEFINITELY  = 1;  
+const S32 BOT_FOLLOW_WALK	            = 0;  
+const S32 BOT_FOLLOW_RUN	            = 1;  
+const S32 BOT_FOLLOW_FLY	            = 2;  
+const S32 BOT_FOLLOW_TELEPORT	        = 3;  
+const S32 BOT_FOLLOW_WAIT	            = 4;  
+const S32 BOT_FOLLOW_TRIGGER_HERE_EVENT	= 1;
+const S32 BOT_FOLLOW_FLAG_FORCEDIRECTPATH = 4;
+// string constants from Aurora-Sim
+char const* const ENABLE_GRAVITY = "enable_gravity";
+char const* const GRAVITY_FORCE_X = "gravity_force_x";
+char const* const GRAVITY_FORCE_Y = "gravity_force_y";
+char const* const GRAVITY_FORCE_Z = "gravity_force_z";
+char const* const ADD_GRAVITY_POINT = "add_gravity_point";
+char const* const ADD_GRAVITY_FORCE = "add_gravity_force";
+char const* const START_TIME_REVERSAL_SAVING = "start_time_reversal_saving";
+char const* const STOP_TIME_REVERSAL_SAVING = "stop_time_reversal_saving";
+char const* const START_TIME_REVERSAL = "start_time_reversal";
+char const* const STOP_TIME_REVERSAL = "stop_time_reversal";    
+
 #endif
diff --git a/indra/lscript/lscript_compile/indra.l b/indra/lscript/lscript_compile/indra.l
index aeb976399..60245757a 100644
--- a/indra/lscript/lscript_compile/indra.l
+++ b/indra/lscript/lscript_compile/indra.l
@@ -254,6 +254,10 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "OBJECT_TOTAL_SCRIPT_COUNT"		{ count(); yylval.ival = OBJECT_TOTAL_SCRIPT_COUNT; return(INTEGER_CONSTANT); }
 "OBJECT_SCRIPT_MEMORY"		{ count(); yylval.ival = OBJECT_SCRIPT_MEMORY; return(INTEGER_CONSTANT); }
 "OBJECT_SCRIPT_TIME"		{ count(); yylval.ival = OBJECT_SCRIPT_TIME; return(INTEGER_CONSTANT); }
+"OBJECT_PRIM_EQUIVALENCE"	{ count(); yylval.ival = OBJECT_PRIM_EQUIVALENCE; return(INTEGER_CONSTANT); }
+"OBJECT_SERVER_COST"	{ count(); yylval.ival = OBJECT_SERVER_COST; return(INTEGER_CONSTANT); }
+"OBJECT_STREAMING_COST"	{ count(); yylval.ival = OBJECT_STREAMING_COST; return(INTEGER_CONSTANT); }
+"OBJECT_PHYSICS_COST"	{ count(); yylval.ival = OBJECT_SCRIPT_TIME; return(INTEGER_CONSTANT); }
 
 "TYPE_INTEGER"			{ count(); yylval.ival = LST_INTEGER; return(INTEGER_CONSTANT); }	
 "TYPE_FLOAT"			{ count(); yylval.ival = LST_FLOATINGPOINT; return(INTEGER_CONSTANT); }	
@@ -347,7 +351,6 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "REMOTE_DATA_REQUEST"	{ count(); yylval.ival = LSL_REMOTE_DATA_REQUEST; return(INTEGER_CONSTANT); }
 "REMOTE_DATA_REPLY"		{ count(); yylval.ival = LSL_REMOTE_DATA_REPLY; return(INTEGER_CONSTANT); }
 
-
 "PSYS_PART_FLAGS"		{ count(); yylval.ival = LLPS_PART_FLAGS; return(INTEGER_CONSTANT); }
 "PSYS_PART_START_COLOR"	{ count(); yylval.ival = LLPS_PART_START_COLOR; return (INTEGER_CONSTANT); }
 "PSYS_PART_START_ALPHA"	{ count(); yylval.ival = LLPS_PART_START_ALPHA; return (INTEGER_CONSTANT); }
@@ -357,7 +360,6 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "PSYS_PART_END_SCALE"	{ count(); yylval.ival = LLPS_PART_END_SCALE; return (INTEGER_CONSTANT); }
 "PSYS_PART_MAX_AGE"		{ count(); yylval.ival = LLPS_PART_MAX_AGE; return (INTEGER_CONSTANT); }
 
-
 "PSYS_PART_WIND_MASK"				{ count(); yylval.ival = LLPartData::LL_PART_WIND_MASK; return(INTEGER_CONSTANT); }
 "PSYS_PART_INTERP_COLOR_MASK"		{ count(); yylval.ival = LLPartData::LL_PART_INTERP_COLOR_MASK; return(INTEGER_CONSTANT); }
 "PSYS_PART_INTERP_SCALE_MASK"		{ count(); yylval.ival = LLPartData::LL_PART_INTERP_SCALE_MASK; return(INTEGER_CONSTANT); }
@@ -368,7 +370,6 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "PSYS_PART_EMISSIVE_MASK"			{ count(); yylval.ival = LLPartData::LL_PART_EMISSIVE_MASK; return(INTEGER_CONSTANT); }
 "PSYS_PART_TARGET_LINEAR_MASK"		{ count(); yylval.ival = LLPartData::LL_PART_TARGET_LINEAR_MASK; return(INTEGER_CONSTANT); }
 
-
 "PSYS_SRC_MAX_AGE"					{ count(); yylval.ival = LLPS_SRC_MAX_AGE; return(INTEGER_CONSTANT); }
 "PSYS_SRC_PATTERN"					{ count(); yylval.ival = LLPS_SRC_PATTERN; return(INTEGER_CONSTANT); }
 "PSYS_SRC_INNERANGLE"				{ count(); yylval.ival = LLPS_SRC_INNERANGLE; return(INTEGER_CONSTANT); }
@@ -393,7 +394,6 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "PSYS_SRC_PATTERN_ANGLE_CONE"		{ count(); yylval.ival = LLPartSysData::LL_PART_SRC_PATTERN_ANGLE_CONE; return(INTEGER_CONSTANT); }
 "PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY"	{ count(); yylval.ival = LLPartSysData::LL_PART_SRC_PATTERN_ANGLE_CONE_EMPTY; return(INTEGER_CONSTANT); }
 
-
 "VEHICLE_TYPE_NONE"		{ count(); yylval.ival = VEHICLE_TYPE_NONE; return(INTEGER_CONSTANT); }
 "VEHICLE_TYPE_SLED"		{ count(); yylval.ival = VEHICLE_TYPE_SLED; return(INTEGER_CONSTANT); }
 "VEHICLE_TYPE_CAR"		{ count(); yylval.ival = VEHICLE_TYPE_CAR; return(INTEGER_CONSTANT); }
@@ -408,8 +408,6 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "VEHICLE_ANGULAR_MOTOR_DIRECTION"	{ count(); yylval.ival = VEHICLE_ANGULAR_MOTOR_DIRECTION; return(INTEGER_CONSTANT); }
 "VEHICLE_LINEAR_MOTOR_OFFSET"	    { count(); yylval.ival = VEHICLE_LINEAR_MOTOR_OFFSET; return(INTEGER_CONSTANT); }
 
-
-
 "VEHICLE_HOVER_HEIGHT"		{ count(); yylval.ival = VEHICLE_HOVER_HEIGHT; return(INTEGER_CONSTANT); }
 "VEHICLE_HOVER_EFFICIENCY"	{ count(); yylval.ival = VEHICLE_HOVER_EFFICIENCY; return(INTEGER_CONSTANT); }
 "VEHICLE_HOVER_TIMESCALE"	{ count(); yylval.ival = VEHICLE_HOVER_TIMESCALE; return(INTEGER_CONSTANT); }
@@ -444,8 +442,6 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "VEHICLE_FLAG_MOUSELOOK_BANK"		{ count(); yylval.ival = VEHICLE_FLAG_MOUSELOOK_BANK; return(INTEGER_CONSTANT); }
 "VEHICLE_FLAG_CAMERA_DECOUPLED"		{ count(); yylval.ival = VEHICLE_FLAG_CAMERA_DECOUPLED; return(INTEGER_CONSTANT); }
 
-
-
 "PRIM_TYPE"				{ count(); yylval.ival = LSL_PRIM_TYPE; return(INTEGER_CONSTANT); }
 "PRIM_MATERIAL"			{ count(); yylval.ival = LSL_PRIM_MATERIAL; return(INTEGER_CONSTANT); }
 "PRIM_PHYSICS"			{ count(); yylval.ival = LSL_PRIM_PHYSICS; return(INTEGER_CONSTANT); }
@@ -463,6 +459,15 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "PRIM_FULLBRIGHT"		{ count(); yylval.ival = LSL_PRIM_FULLBRIGHT; return(INTEGER_CONSTANT); }
 "PRIM_TEXGEN"			{ count(); yylval.ival = LSL_PRIM_TEXGEN; return(INTEGER_CONSTANT); }
 "PRIM_GLOW"	     		{ count(); yylval.ival = LSL_PRIM_GLOW; return(INTEGER_CONSTANT); }
+"PRIM_TEXT"				{ count(); yylval.ival = LSL_PRIM_TEXT; return(INTEGER_CONSTANT); }
+"PRIM_NAME"				{ count(); yylval.ival = LSL_PRIM_NAME; return(INTEGER_CONSTANT); }
+"PRIM_DESC"				{ count(); yylval.ival = LSL_PRIM_DESC; return(INTEGER_CONSTANT); }
+"PRIM_ROT_LOCAL"		{ count(); yylval.ival = LSL_PRIM_ROT_LOCAL; return(INTEGER_CONSTANT); }
+"PRIM_PHYSICS_SHAPE_TYPE" { count(); yylval.ival = LSL_PRIM_PHYSICS_SHAPE_TYPE; return(INTEGER_CONSTANT); }
+"PRIM_OMEGA"			{ count(); yylval.ival = LSL_PRIM_OMEGA; return(INTEGER_CONSTANT); }
+"PRIM_POS_LOCAL"		{ count(); yylval.ival = LSL_PRIM_POS_LOCAL; return(INTEGER_CONSTANT); }
+"PRIM_LINK_TARGET"		{ count(); yylval.ival = LSL_PRIM_LINK_TARGET; return(INTEGER_CONSTANT); }
+"PRIM_SLICE"			{ count(); yylval.ival = LSL_PRIM_SLICE; return(INTEGER_CONSTANT); }
 
 "PRIM_TYPE_BOX"			{ count(); yylval.ival = LSL_PRIM_TYPE_BOX; return(INTEGER_CONSTANT); }
 "PRIM_TYPE_CYLINDER"	{ count(); yylval.ival = LSL_PRIM_TYPE_CYLINDER; return(INTEGER_CONSTANT); }
@@ -522,6 +527,15 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "PRIM_SCULPT_FLAG_MIRROR" 	{ count(); yylval.ival = LSL_PRIM_SCULPT_FLAG_MIRROR; return(INTEGER_CONSTANT); }
 "PRIM_SCULPT_FLAG_INVERT" 	{ count(); yylval.ival = LSL_PRIM_SCULPT_FLAG_INVERT; return(INTEGER_CONSTANT); }
 
+"PRIM_PHYSICS_SHAPE_PRIM"   { count(); yylval.ival = LSL_PRIM_PHYSICS_SHAPE_PRIM; return(INTEGER_CONSTANT); }
+"PRIM_PHYSICS_SHAPE_NONE"   { count(); yylval.ival = LSL_PRIM_PHYSICS_SHAPE_NONE; return(INTEGER_CONSTANT); }
+"PRIM_PHYSICS_SHAPE_CONVEX" { count(); yylval.ival = LSL_PRIM_PHYSICS_SHAPE_CONVEX; return(INTEGER_CONSTANT); }
+
+"DENSITY"               { count(); yylval.ival = LSL_DENSITY; return(INTEGER_CONSTANT); }
+"FRICTION"              { count(); yylval.ival = LSL_FRICTION; return(INTEGER_CONSTANT); }
+"RESTITUTION"           { count(); yylval.ival = LSL_RESTITUTION; return(INTEGER_CONSTANT); }
+"GRAVITY_MULTIPLIER"    { count(); yylval.ival = LSL_GRAVITY_MULTIPLIER; return(INTEGER_CONSTANT); }
+
 "MASK_BASE"				{ count(); yylval.ival = 0; return(INTEGER_CONSTANT); }
 "MASK_OWNER"			{ count(); yylval.ival = 1; return(INTEGER_CONSTANT); }
 "MASK_GROUP"			{ count(); yylval.ival = 2; return(INTEGER_CONSTANT); }
@@ -595,6 +609,7 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "HTTP_BODY_MAXLENGTH" { count(); yylval.ival = HTTP_BODY_MAXLENGTH; return(INTEGER_CONSTANT); }
 "HTTP_BODY_TRUNCATED" { count(); yylval.ival = HTTP_BODY_TRUNCATED; return(INTEGER_CONSTANT); }
 "HTTP_VERIFY_CERT" { count(); yylval.ival = HTTP_VERIFY_CERT; return(INTEGER_CONSTANT); }
+"HTTP_VERBOSE_THROTTLE" { count(); yylval.ival = HTTP_VERBOSE_THROTTLE; return(INTEGER_CONSTANT); }
 
 "PARCEL_COUNT_TOTAL"		{ count(); yylval.ival = OC_TOTAL; return(INTEGER_CONSTANT); }
 "PARCEL_COUNT_OWNER"		{ count(); yylval.ival = OC_OWNER; return(INTEGER_CONSTANT); }
@@ -675,6 +690,54 @@ extern "C" { int yyerror(const char *fmt, ...); }
 "STATUS_INTERNAL_ERROR"              { count(); yylval.ival = LSL_STATUS_INTERNAL_ERROR; return(INTEGER_CONSTANT); }
 "STATUS_WHITELIST_FAILED"            { count(); yylval.ival = LSL_STATUS_WHITELIST_FAILED; return(INTEGER_CONSTANT); }
 
+"PROFILE_SCRIPT_NONE"                { count(); yylval.ival = LSL_PROFILE_SCRIPT_NONE; return(INTEGER_CONSTANT); }
+"PROFILE_SCRIPT_MEMORY"              { count(); yylval.ival = LSL_PROFILE_SCRIPT_MEMORY; return(INTEGER_CONSTANT); }
+
+"CONTENT_TYPE_TEXT"                  { count(); yylval.ival = LSL_CONTENT_TYPE_TEXT; return(INTEGER_CONSTANT); }
+"CONTENT_TYPE_HTML"                  { count(); yylval.ival = LSL_CONTENT_TYPE_HTML; return(INTEGER_CONSTANT); }
+
+"RCERR_UNKNOWN"                      { count(); yylval.ival = LSL_RCERR_UNKNOWN; return(INTEGER_CONSTANT); }
+"RCERR_SIM_PERF_LOW"                 { count(); yylval.ival = LSL_RCERR_SIM_PERF_LOW; return(INTEGER_CONSTANT); }
+"RCERR_CAST_TIME_EXCEEDED"           { count(); yylval.ival = LSL_RCERR_CAST_TIME_EXCEEDED; return(INTEGER_CONSTANT); }
+
+"RC_REJECT_TYPES"                    { count(); yylval.ival = LSL_RC_REJECT_TYPES; return(INTEGER_CONSTANT); }
+"RC_DETECT_PHANTOM"                  { count(); yylval.ival = LSL_RC_DETECT_PHANTOM; return(INTEGER_CONSTANT); }
+"RC_DATA_FLAGS"                      { count(); yylval.ival = LSL_RC_DATA_FLAGS; return(INTEGER_CONSTANT); }
+"RC_MAX_HITS"                        { count(); yylval.ival = LSL_RC_MAX_HITS; return(INTEGER_CONSTANT); }
+
+"RC_REJECT_AGENTS"                   { count(); yylval.ival = LSL_RC_REJECT_AGENTS; return(INTEGER_CONSTANT); }
+"RC_REJECT_PHYSICAL"                 { count(); yylval.ival = LSL_RC_REJECT_PHYSICAL; return(INTEGER_CONSTANT); }
+"RC_REJECT_NONPHYSICAL"              { count(); yylval.ival = LSL_RC_REJECT_NONPHYSICAL; return(INTEGER_CONSTANT); }
+"RC_REJECT_LAND"                     { count(); yylval.ival = LSL_RC_REJECT_LAND; return(INTEGER_CONSTANT); }
+
+"RC_GET_NORMAL"                      { count(); yylval.ival = LSL_RC_GET_NORMAL; return(INTEGER_CONSTANT); }
+"RC_GET_ROOT_KEY"                    { count(); yylval.ival = LSL_RC_GET_ROOT_KEY; return(INTEGER_CONSTANT); }
+"RC_GET_LINK_NUM"                    { count(); yylval.ival = LSL_RC_GET_LINK_NUM; return(INTEGER_CONSTANT); }
+
+"ESTATE_ACCESS_ALLOWED_AGENT_ADD"    { count(); yylval.ival = LSL_ESTATE_ACCESS_ALLOWED_AGENT_ADD; return(INTEGER_CONSTANT); }
+"ESTATE_ACCESS_ALLOWED_AGENT_REMOVE" { count(); yylval.ival = LSL_ESTATE_ACCESS_ALLOWED_AGENT_REMOVE; return(INTEGER_CONSTANT); }
+"ESTATE_ACCESS_ALLOWED_GROUP_ADD"    { count(); yylval.ival = LSL_ESTATE_ACCESS_ALLOWED_GROUP_ADD; return(INTEGER_CONSTANT); }
+"ESTATE_ACCESS_ALLOWED_GROUP_REMOVE" { count(); yylval.ival = LSL_ESTATE_ACCESS_ALLOWED_GROUP_REMOVE; return(INTEGER_CONSTANT); }
+"ESTATE_ACCESS_BANNED_AGENT_ADD"     { count(); yylval.ival = LSL_ESTATE_ACCESS_BANNED_AGENT_ADD; return(INTEGER_CONSTANT); }
+"ESTATE_ACCESS_BANNED_AGENT_REMOVE"  { count(); yylval.ival = LSL_ESTATE_ACCESS_BANNED_AGENT_REMOVE; return(INTEGER_CONSTANT); }
+
+"KFM_COMMAND"		{ count(); yylval.ival = LSL_KFM_COMMAND; return(INTEGER_CONSTANT); }
+"KFM_MODE"			{ count(); yylval.ival = LSL_KFM_MODE; return(INTEGER_CONSTANT); }
+"KFM_DATA"			{ count(); yylval.ival = LSL_KFM_DATA; return(INTEGER_CONSTANT); }
+"KFM_FORWARD"		{ count(); yylval.ival = LSL_KFM_FORWARD; return(INTEGER_CONSTANT); }
+"KFM_LOOP"			{ count(); yylval.ival = LSL_KFM_LOOP; return(INTEGER_CONSTANT); }
+"KFM_PING_PONG"		{ count(); yylval.ival = LSL_KFM_PING_PONG; return(INTEGER_CONSTANT); }
+"KFM_REVERSE"		{ count(); yylval.ival = LSL_KFM_REVERSE; return(INTEGER_CONSTANT); }
+"KFM_ROTATION"		{ count(); yylval.ival = LSL_KFM_ROTATION; return(INTEGER_CONSTANT); }
+"KFM_TRANSLATION"	{ count(); yylval.ival = LSL_KFM_TRANSLATION; return(INTEGER_CONSTANT); }
+"KFM_CMD_PLAY"		{ count(); yylval.ival = LSL_KFM_CMD_PLAY; return(INTEGER_CONSTANT); }
+"KFM_CMD_STOP"		{ count(); yylval.ival = LSL_KFM_CMD_STOP; return(INTEGER_CONSTANT); }
+"KFM_CMD_PAUSE"		{ count(); yylval.ival = LSL_KFM_CMD_PAUSE; return(INTEGER_CONSTANT); }
+
+"AGENT_LIST_PARCEL"         { count(); yylval.ival = 1; return(INTEGER_CONSTANT); }
+"AGENT_LIST_PARCEL_OWNER"   { count(); yylval.ival = 2; return(INTEGER_CONSTANT); }
+"AGENT_LIST_REGION"         { count(); yylval.ival = 4; return(INTEGER_CONSTANT); }
+
 {L}({L}|{N})*		{ count(); yylval.sval = new char[strlen(yytext) + 1]; strcpy(yylval.sval, yytext); return(IDENTIFIER); }
 
 {N}+{E}					{ count(); yylval.fval = (F32)atof(yytext); return(FP_CONSTANT); }
diff --git a/indra/lscript/lscript_http.h b/indra/lscript/lscript_http.h
index 86b2d29b9..971ecbae7 100644
--- a/indra/lscript/lscript_http.h
+++ b/indra/lscript/lscript_http.h
@@ -40,7 +40,8 @@ enum LLScriptHTTPRequestParameterKey
   HTTP_METHOD,
   HTTP_MIMETYPE,
   HTTP_BODY_MAXLENGTH,
-  HTTP_VERIFY_CERT
+  HTTP_VERIFY_CERT,
+  HTTP_VERBOSE_THROTTLE
 };
 
 enum LLScriptHTTPResponseMetadataKey
diff --git a/indra/lscript/lscript_library/lscript_library.cpp b/indra/lscript/lscript_library/lscript_library.cpp
index b4a708f87..4599aa135 100644
--- a/indra/lscript/lscript_library/lscript_library.cpp
+++ b/indra/lscript/lscript_library/lscript_library.cpp
@@ -469,102 +469,109 @@ void LLScriptLibrary::init()
 
 	addFunction(10.f, 0.f, dummy_func, "llGetEnv", "s", "s");
 	addFunction(10.f, 0.f, dummy_func, "llRegionSayTo", NULL, "kis");
+    
+	// energy, sleep, dummy_func, name, return type, parameters, help text, gods-only
 
-  // Adding missing (more recent) LSL functions.
-
-	addFunction(10.f, 0.f, dummy_func, "llCastRay", "l", "vvl");
-	addFunction(10.f, 0.f, dummy_func, "llGetSPMaxMemory", "i", NULL);
-	addFunction(10.f, 0.f, dummy_func, "llGetUsedMemory", "i", NULL);
-	addFunction(10.f, 0.f, dummy_func, "llGodLikeRezObject", NULL, "kv");
-	addFunction(10.f, 0.f, dummy_func, "llScriptProfiler", NULL, "i");
-	addFunction(10.f, 0.f, dummy_func, "llSetInventoryPermMask", NULL, "sii");
-	addFunction(10.f, 0.f, dummy_func, "llSetObjectPermMask", NULL, "ii");
-	// Even more recent
+	// Server v11.08.10.238207 new functions:
 	addFunction(10.f, 0.f, dummy_func, "llSetMemoryLimit", "i", "i");
+	addFunction(10.f, 0.f, dummy_func, "llGetMemoryLimit", "i", NULL);
 	addFunction(10.f, 0.f, dummy_func, "llSetLinkMedia", "i", "iil");
 	addFunction(10.f, 0.f, dummy_func, "llGetLinkMedia", "l", "iil");
 	addFunction(10.f, 0.f, dummy_func, "llClearLinkMedia", "i", "ii");
 	addFunction(10.f, 0.f, dummy_func, "llSetLinkCamera", NULL, "ivv");
 	addFunction(10.f, 0.f, dummy_func, "llSetContentType", NULL, "ki");
-	addFunction(10.f, 0.f, dummy_func, "llLinkSitTarget", NULL, "ivr");
+	addFunction(10.f, 0.f, dummy_func, "llLinkSitTarget", NULL, "ivq");
 	addFunction(10.f, 0.f, dummy_func, "llAvatarOnLinkSitTarget", "k", "i");
-	addFunction(10.f, 0.f, dummy_func, "llGetMassMKS", "f", NULL);
-	addFunction(10.f, 0.f, dummy_func, "llGetMemoryLimit", "i", NULL);
-	addFunction(10.f, 0.f, dummy_func, "llGetParcelMusicURL", "s", NULL);
-	addFunction(10.f, 0.f, dummy_func, "llGetPhysicsMaterial", "l", NULL);
-	addFunction(10.f, 0.f, dummy_func, "llManageEstateAccess", "i", "ik");
-	addFunction(10.f, 0.f, dummy_func, "llSetAngularVelocity", NULL, "vi");
-	addFunction(10.f, 0.f, dummy_func, "llSetKeyframedMotion", NULL, "ll");
-	addFunction(10.f, 0.f, dummy_func, "llSetPhysicsMaterial", NULL, "iffff");
-	addFunction(10.f, 0.f, dummy_func, "llSetRegionPos", "i", "v");
 	addFunction(10.f, 0.f, dummy_func, "llSetVelocity", NULL, "vi");
+	// Server v11.09.09.240509 new functions:
+	addFunction(10.f, 0.f, dummy_func, "llCastRay", "l", "vvl");
+	addFunction(10.f, 0.f, dummy_func, "llGetMassMKS", "f", NULL);
+	addFunction(10.f, 0.f, dummy_func, "llSetPhysicsMaterial", NULL, "iffff");
+	addFunction(10.f, 0.f, dummy_func, "llGetPhysicsMaterial", "l", NULL);
+	// Server v11.10.18.243270 new functions:
+	addFunction(10.f, 0.f, dummy_func, "llManageEstateAccess", "i", "ik");
+	// Server RC magnum v11.10.31.244254 new function:
+	addFunction(10.f, 0.f, dummy_func, "llSetKeyframedMotion", NULL, "ll");
+	// Server RC Le Tigre v11.10.30.245889 new function:
 	addFunction(10.f, 0.f, dummy_func, "llTransferLindenDollars", "k", "ki");
 
+	// llGenerateKey officially implemented now added
+	addFunction(10.f, 0.f, dummy_func, "llGenerateKey", "k", NULL);
 
-	//Pathfinder functions. Current state: alpha, thus subject to change.
-	//This and the preceding line are to be removed in future revisions of this file.
+	// Server new function 2011-12-13:
+	addFunction(10.f, 0.f, dummy_func, "llGetParcelMusicURL", "s", NULL);
+
+	// Missing script functions as of 2011-12-13
+	addFunction(10.f, 0.f, dummy_func, "llScriptProfiler", NULL, "i");
+	addFunction(10.f, 0.f, dummy_func, "llGetSPMaxMemory", "i", NULL);
+	addFunction(10.f, 0.f, dummy_func, "llGetUsedMemory", "i", NULL);
+	addFunction(10.f, 0.f, dummy_func, "llSetAngularVelocity", NULL, "vi");
+
+	// Server 12.01.24.248357 new functions
+	addFunction(0.f, 0.f, dummy_func, "llSetRegionPos", "i", "v");
+
+	// Server 12.04.13.253827 new function
+	addFunction(0.f, 0.f, dummy_func, "llGetAgentList", "l", "il");
+	
+	// Server RC Magnum 12.05.25.258071 new functions:
+	addFunction(0.f, 0.f, dummy_func, "llAttachToAvatarTemp", NULL, "i");
+	addFunction(0.f, 0.f, dummy_func, "llTeleportAgent", NULL, "ksvv");
+	addFunction(0.f, 0.f, dummy_func, "llTeleportAgentGlobalCoords", NULL, "kvvv");
+
+	// Pathfinding functions
 	addFunction(10.f, 0.f, dummy_func, "llCreateCharacter", NULL, "l");
 	addFunction(10.f, 0.f, dummy_func, "llDeleteCharacter", NULL, NULL);
 	addFunction(10.f, 0.f, dummy_func, "llEvade", NULL, "kl");
 	addFunction(10.f, 0.f, dummy_func, "llExecCharacterCmd", NULL, "il");
-	addFunction(10.f, 0.f, dummy_func, "llGetClosestNavPoint", "l", "vl");
 	addFunction(10.f, 0.f, dummy_func, "llFleeFrom", NULL, "vfl");
+	addFunction(10.f, 0.f, dummy_func, "llGetClosestNavPoint", NULL, "vl");
+	addFunction(10.f, 0.f, dummy_func, "llGetStaticPath", NULL, "vvfl");
 	addFunction(10.f, 0.f, dummy_func, "llNavigateTo", NULL, "vl");
 	addFunction(10.f, 0.f, dummy_func, "llPatrolPoints", NULL, "ll");
 	addFunction(10.f, 0.f, dummy_func, "llPursue", NULL, "kl");
 	addFunction(10.f, 0.f, dummy_func, "llUpdateCharacter", NULL, "l");
-	addFunction(10.f, 0.f, dummy_func, "llWanderWithin", NULL, "vfl");
+	addFunction(10.f, 0.f, dummy_func, "llWanderWithin", NULL, "vvl");
 
-
-
-	// REGARDING OSSL FUNCTIONS
+	// SL-LSL Functions to be added above this line
+	// ---------------------------------------------
+	// NOTE bytecode placement no longer applies, viewers do not compile scripts anymore (confirmed with LL, also noted by Phoenix/Firestorm team.)
+	// REGARDING NON SL-LSL FUNCTIONS (OSSL, aaFunctions, botFunctions)
 	// These additions should be posted underneath the llFunctions
 	// These functions pertain to OpenSimulator and are in no part applicable to SecondLife by Linden Labs
 	// The Current State of these functions are in flux and development is ongoing.  Not all the functions are presently
-	// documented and therefore the description may be incomplete and require further attention.
-	// OpenSimulator is written in C# and not CPP therefore some values for example "double = float" etc. are different.
-
-	// OSSL corrections and syntax additions added + set in same order as found in OSSL_stub.cs of OpenSim Source (Updated PM October-21-2010
-	// based on OpenSimulator Ver. 0.7.x DEV/Master Git # a7acb650d400a280a7b9edabd304376dff9c81af - a7acb65-r/14142
+	// fully documented and therefore the description may be incomplete and require further attention.
+	// OpenSim & Aurora-Sim are written in C# and not CPP therefore some values for example "double = float" etc. are different.
+	//
+	// OSSL corrections and syntax additions added + set initially in same order as found in IOSSL_Api.cs of Aurora-Sim & OpenSim Source
+	// updates added @ end of each subsection for update timeline maint.
 	// Updates by WhiteStar Magic
-	
-	// It should be noted though, that the order of OSSL functions is not important for correct functionality. 
-
-	addFunction(10.f, 0.f, dummy_func, "osSetRegionWaterHeight", NULL, "f");
-	addFunction(10.f, 0.f, dummy_func, "osSetRegionSunSettings", NULL, "iif");
-	addFunction(10.f, 0.f, dummy_func, "osSetEstateSunSettings", NULL, "if");
-	addFunction(10.f, 0.f, dummy_func, "osGetCurrentSunHour", "f", NULL);
-	addFunction(10.f, 0.f, dummy_func, "osSunGetParam","f", "s");  // Deprecated. Use osGetSunParam instead
-	addFunction(10.f, 0.f, dummy_func, "osSunSetParam", "sf", NULL);  // Deprecated. Use osSetSunParam instead
-	addFunction(10.f, 0.f, dummy_func, "osWindActiveModelPluginName", "s", NULL);
-	addFunction(10.f, 0.f, dummy_func, "osParcelJoin", NULL, "vv");
-	addFunction(10.f, 0.f, dummy_func, "osParcelSubdivide", NULL, "vv");
-	addFunction(10.f, 0.f, dummy_func, "osParcelSetDetails", NULL, "vv"); // Deprecated. Use osSetParcelDetails instead.
-	// addFunction(10.f, 0.f, dummy_func, "osWindParamSet", NULL, "ssf"); // This function was renamed before it was implemented. Leaving this in for now.
-	// addFunction(10.f, 0.f, dummy_func, "osWindParamGet", "f", "ss");  // This function was renamed before it was implemented. Leaving this in for now.
-	addFunction(10.f, 0.f, dummy_func, "osList2Double", "f", "li");
+	//
+	// OSSL Functions COMMON to OpenSim & Aurora-Sim 
 	addFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureURL", NULL, "ksssi");
-	addFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureData", NULL, "ksssi");
 	addFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureURLBlend", NULL, "ksssii");
-	addFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureDataBlend", NULL, "ksssii");
 	addFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureURLBlendFace", NULL, "ksssfiiii");
+	addFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureData", NULL, "ksssi");
+	addFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureDataBlend", NULL, "ksssii");
 	addFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureDataBlendFace", NULL, "ksssfiiii");
-	addFunction(10.f, 0.f, dummy_func, "osTerrainGetHeight", "f", "ii");   // Deprecated. Use osGetTerrainHeight instead
-	addFunction(10.f, 0.f, dummy_func, "osTerrainSetHeight", NULL, "iif");   // Deprecated. Use osSetTerrainHeight instead
+	addFunction(10.f, 0.f, dummy_func, "osGetTerrainHeight", "f", "ii");
+	addFunction(10.f, 0.f, dummy_func, "osSetTerrainHeight", NULL, "iif");
 	addFunction(10.f, 0.f, dummy_func, "osTerrainFlush", NULL, NULL);
 	addFunction(10.f, 0.f, dummy_func, "osRegionRestart", "i", "f");
 	addFunction(10.f, 0.f, dummy_func, "osRegionNotice",NULL, "s");
 	addFunction(10.f, 0.f, dummy_func, "osConsoleCommand", NULL, "s");
 	addFunction(10.f, 0.f, dummy_func, "osSetParcelMediaURL", NULL, "s");
-	addFunction(10.f, 0.f, dummy_func, "osSetParcelSIPAddress", NULL, "s");
 	addFunction(10.f, 0.f, dummy_func, "osSetPrimFloatOnWater", NULL, "i");
-	addFunction(10.f, 0.f, dummy_func, "osTeleportAgent", NULL, "ksvv");
+	addFunction(10.f, 0.f, dummy_func, "osSetParcelSIPAddress", NULL, "s");
 	addFunction(10.f, 0.f, dummy_func, "osGetAgentIP", "s", "k");
 	addFunction(10.f, 0.f, dummy_func, "osGetAgents", "l", NULL);
+	addFunction(10.f, 0.f, dummy_func, "osTeleportAgent", NULL, "ksvv");  // Polymorphic
+	addFunction(10.f, 0.f, dummy_func, "osTeleportOwner", NULL, "svv");   // Polymorphic
 	addFunction(10.f, 0.f, dummy_func, "osAvatarPlayAnimation", NULL, "ks");
 	addFunction(10.f, 0.f, dummy_func, "osAvatarStopAnimation", NULL, "ks");
+	addFunction(10.f, 0.f, dummy_func, "osForceAttachToAvatar", NULL, "i");  // May.03.2012
+	addFunction(10.f, 0.f, dummy_func, "osForceDetachFromAvatar", NULL, NULL);  // May.03.2012
 	addFunction(10.f, 0.f, dummy_func, "osMovePen", NULL, "sii");
-	addFunction(10.f, 0.f, dummy_func, "osDrawLine", NULL, "siiii");
+	addFunction(10.f, 0.f, dummy_func, "osDrawLine", NULL, "siiii");      // Polymorphic
 	addFunction(10.f, 0.f, dummy_func, "osDrawText", NULL, "ss");
 	addFunction(10.f, 0.f, dummy_func, "osDrawEllipse", NULL, "sii");
 	addFunction(10.f, 0.f, dummy_func, "osDrawRectangle", NULL, "sii");
@@ -574,14 +581,27 @@ void LLScriptLibrary::init()
 	addFunction(10.f, 0.f, dummy_func, "osSetFontSize", NULL, "si");
 	addFunction(10.f, 0.f, dummy_func, "osSetFontName", NULL, "ss");
 	addFunction(10.f, 0.f, dummy_func, "osSetPenSize", NULL, "si");
+	addFunction(10.f, 0.f, dummy_func, "osSetPenColor", NULL, "ss");
 	addFunction(10.f, 0.f, dummy_func, "osSetPenCap", NULL, "sss");
-	addFunction(10.f, 0.f, dummy_func, "osSetPenColour", NULL, "ss"); // Deprecated. Use osSetPenColor instead
 	addFunction(10.f, 0.f, dummy_func, "osDrawImage", NULL, "siis");
 	addFunction(10.f, 0.f, dummy_func, "osGetDrawStringSize", "v", "sssi");
-	addFunction(10.f, 0.f, dummy_func, "osSetStateEvents", NULL, "i");
+	addFunction(10.f, 0.f, dummy_func, "osList2Double", "f", "li");
+	addFunction(10.f, 0.f, dummy_func, "osSetRegionWaterHeight", NULL, "f");
+	addFunction(10.f, 0.f, dummy_func, "osSetRegionSunSettings", NULL, "iif");
+	addFunction(10.f, 0.f, dummy_func, "osSetEstateSunSettings", NULL, "if");
+	addFunction(10.f, 0.f, dummy_func, "osGetCurrentSunHour", "f", NULL);
+	addFunction(10.f, 0.f, dummy_func, "osGetSunParam","f", "s");
+	addFunction(10.f, 0.f, dummy_func, "osSetSunParam", "sf", NULL);
+	addFunction(10.f, 0.f, dummy_func, "osWindActiveModelPluginName", "s", NULL);
+	addFunction(10.f, 0.f, dummy_func, "osSetWindParam", NULL, "ssf");
+	addFunction(10.f, 0.f, dummy_func, "osGetWindParam", "f", "ss");
+	addFunction(10.f, 0.f, dummy_func, "osParcelJoin", NULL, "vv");
+	addFunction(10.f, 0.f, dummy_func, "osParcelSubdivide", NULL, "vv");
+	addFunction(10.f, 0.f, dummy_func, "osSetParcelDetails", NULL, "vl");
 	addFunction(10.f, 0.f, dummy_func, "osGetScriptEngineName", "s", NULL);
 	addFunction(10.f, 0.f, dummy_func, "osGetSimulatorVersion", "s", NULL);
 	addFunction(10.f, 0.f, dummy_func, "osParseJSON", "s", "s");
+	addFunction(10.f, 0.f, dummy_func, "osParseJSONNew", "s", "s"); // mar.5.2012
 	addFunction(10.f, 0.f, dummy_func, "osMessageObject", NULL, "ks");
 	addFunction(10.f, 0.f, dummy_func, "osMakeNotecard", NULL, "sl");
 	addFunction(10.f, 0.f, dummy_func, "osGetNotecardLine", "s", "si");
@@ -592,16 +612,16 @@ void LLScriptLibrary::init()
 	addFunction(10.f, 0.f, dummy_func, "osGetGridNick", "s", NULL);
 	addFunction(10.f, 0.f, dummy_func, "osGetGridName", "s", NULL);
 	addFunction(10.f, 0.f, dummy_func, "osGetGridLoginURI", "s", NULL);
+	addFunction(10.f, 0.f, dummy_func, "osGetGridHomeURI","s",NULL); // mar.5.2012
+	addFunction(10.f, 0.f, dummy_func, "osGetGridGatekeeperURI", "s", "NULL");  //mar.11.2012
+	addFunction(10.f, 0.f, dummy_func, "osGetGridCustom","s","k"); // mar.5.2012
 	addFunction(10.f, 0.f, dummy_func, "osFormatString", "s", "sl");
 	addFunction(10.f, 0.f, dummy_func, "osMatchString", "l", "ssi");
+	addFunction(10.f, 0.f, dummy_func, "osReplaceString", "s", "sssi"); // mar.5.2012
 	addFunction(10.f, 0.f, dummy_func, "osLoadedCreationDate", "s", NULL);
 	addFunction(10.f, 0.f, dummy_func, "osLoadedCreationTime", "s", NULL);
 	addFunction(10.f, 0.f, dummy_func, "osLoadedCreationID", "s", NULL);
 	addFunction(10.f, 0.f, dummy_func, "osGetLinkPrimitiveParams", "l", "il");
-	addFunction(10.f, 0.f, dummy_func, "osNpcCreate", "k", "ssvk");
-	addFunction(10.f, 0.f, dummy_func, "osNpcMoveTo", NULL, "kv");
-	addFunction(10.f, 0.f, dummy_func, "osNpcSay", NULL, "ks");
-	addFunction(10.f, 0.f, dummy_func, "osNpcRemove", NULL, "k");
 	addFunction(10.f, 0.f, dummy_func, "osGetMapTexture", "k", NULL);
 	addFunction(10.f, 0.f, dummy_func, "osGetRegionMapTexture", "k", "s");
 	addFunction(10.f, 0.f, dummy_func, "osGetRegionStats", "l", NULL);
@@ -613,52 +633,105 @@ void LLScriptLibrary::init()
 	addFunction(10.f, 0.f, dummy_func, "osGetPrimitiveParams", "l", "kl");
 	addFunction(10.f, 0.f, dummy_func, "osSetPrimitiveParams", NULL, "kl");
 	addFunction(10.f, 0.f, dummy_func, "osSetProjectionParams", NULL, "kikfff");
-	addFunction(10.f, 0.f, dummy_func, "osUnixTimeToTimestamp", "s", "i");
-	addFunction(10.f, 0.f, dummy_func, "osSetPenColor", NULL, "ss");
-	addFunction(10.f, 0.f, dummy_func, "osGetSunParam","f", "s");
-	addFunction(10.f, 0.f, dummy_func, "osSetSunParam", NULL, "sf");
-	addFunction(10.f, 0.f, dummy_func, "osSetParcelDetails", NULL, "vl");
-	addFunction(10.f, 0.f, dummy_func, "osGetTerrainHeight", "f", "ii");
-	addFunction(10.f, 0.f, dummy_func, "osSetTerrainHeight", NULL, "iif");
 	addFunction(10.f, 0.f, dummy_func, "osGetAvatarList", "l", NULL);
-	addFunction(10.f, 0.f, dummy_func, "osTeleportOwner", NULL, "svv");
-	addFunction(10.f, 0.f, dummy_func, "osGetWindParam","f", "ss");
-	addFunction(10.f, 0.f, dummy_func, "osSetWindParam", NULL, "ssf");
-	
+	addFunction(10.f, 0.f, dummy_func, "osUnixTimeToTimestamp", "s", "i");
+	addFunction(10.f, 0.f, dummy_func, "osGetInventoryDesc", "s", "s");    //mar.17.2012
+	addFunction(10.f, 0.f, dummy_func, "osInviteToGroup", "i", "k");  // May.03.2012
+	addFunction(10.f, 0.f, dummy_func, "osEjectFromGroup", "i", "k");  // May.03.2012
+	addFunction(10.f, 0.f, dummy_func, "osSetTerrainTexture", NULL, "ik");  // May.03.2012
+	addFunction(10.f, 0.f, dummy_func, "osSetTerrainTextureHeight", NULL, "iff");  // May.03.2012
 
-	// LightShare functions
+//
+// OSSL Functions OpenSim Unique
+	addFunction(10.f, 0.f, dummy_func, "osSetStateEvents", NULL, "i");
+	addFunction(10.f, 0.f, dummy_func, "osIsNpc","i","k"); // mar.5.2012
+	addFunction(10.f, 0.f, dummy_func, "osNpcCreate", "k", "ssvk");
+	addFunction(10.f, 0.f, dummy_func, "osNpcSaveAppearance", NULL, "ks");
+	addFunction(10.f, 0.f, dummy_func, "osNpcLoadAppearance", NULL, "ks");
+	addFunction(10.f, 0.f, dummy_func, "osNpcGetPos","k","k");
+	addFunction(10.f, 0.f, dummy_func, "osNpcMoveTo", NULL, "kv");
+	addFunction(10.f, 0.f, dummy_func, "osNpcMoveToTarget", NULL, "kvi");
+	addFunction(10.f, 0.f, dummy_func, "osNpcGetOwner","k","k"); // mar.5.2012
+	addFunction(10.f, 0.f, dummy_func, "osNpcGetRot", "r", "k");
+	addFunction(10.f, 0.f, dummy_func, "osNpcSetRot", NULL, "kr");
+	addFunction(10.f, 0.f, dummy_func, "osNpcStopMoveToTarget", NULL, "k");
+	addFunction(10.f, 0.f, dummy_func, "osNpcSay", NULL, "ks");
+	addFunction(10.f, 0.f, dummy_func, "osNpcSay", NULL, "kis");  // May.03.2012
+	addFunction(10.f, 0.f, dummy_func, "osNpcSit", NULL, "kki");
+	addFunction(10.f, 0.f, dummy_func, "osNpcStand", NULL, "k");
+	addFunction(10.f, 0.f, dummy_func, "osNpcRemove", NULL, "k");
+	addFunction(10.f, 0.f, dummy_func, "osNpcPlayAnimation",NULL,"ks"); // mar.5.2012
+	addFunction(10.f, 0.f, dummy_func, "osNpcStopAnimation",NULL,"ks"); // mar.5.2012
+	addFunction(10.f, 0.f, dummy_func, "osOwnerSaveAppearance", NULL, "s");
+	addFunction(10.f, 0.f, dummy_func, "osAgentSaveAppearance", NULL, "ks");
+	addFunction(10.f, 0.f, dummy_func, "osNpcShout", NULL, "kis");  // May.03.2012
+	addFunction(10.f, 0.f, dummy_func, "osNpcWhisper", NULL, "kis");  // May.03.2012
+//
+// OSSL Functions Aurora-Sim Unique
+	addFunction(10.f, 0.f, dummy_func, "osReturnObject", NULL, "k");
+	addFunction(10.f, 0.f, dummy_func, "osReturnObjects", NULL, "f");
+	addFunction(10.f, 0.f, dummy_func, "osShutDown", NULL, NULL);
+	addFunction(10.f, 0.f, dummy_func, "osAddAgentToGroup", NULL, "kss");
+	addFunction(10.f, 0.f, dummy_func, "osRezObject", NULL, "svvriiiii");
+//
+// LightShare functions (Careminster Variant)
 	addFunction(10.f, 0.f, dummy_func, "cmSetWindlightScene", "i", "l");
 	addFunction(10.f, 0.f, dummy_func, "cmSetWindlightSceneTargeted", "i", "lk");
 	addFunction(10.f, 0.f, dummy_func, "cmGetWindlightScene", "l", "l");
-	// LightShare functions - alternate versions
-	// don't ask me why they renamed 'em, but we need to include both versions -- MC
+// LightShare functions - alternate versions (os & aa variant)
 	addFunction(10.f, 0.f, dummy_func, "lsSetWindlightScene", "i", "l");
 	addFunction(10.f, 0.f, dummy_func, "lsSetWindlightSceneTargeted", "i", "lk");
 	addFunction(10.f, 0.f, dummy_func, "lsGetWindlightScene", "l", "l");
-
-	// New OSSL functions 08-10-2011
-	addFunction(10.f, 0.f, dummy_func, "osNpcSaveAppearance", "k", "ks");
-	addFunction(10.f, 0.f, dummy_func, "osNpcLoadAppearance", NULL, "ks");
-	addFunction(10.f, 0.f, dummy_func, "osNpcMoveToTarget", NULL, "kvi");
-	addFunction(10.f, 0.f, dummy_func, "osOwnerSaveAppearance", "k", "s");
-
-	// More new stuffs
-	addFunction(10.f, 0.f, dummy_func, "osNpcGetRot", "r", "k");
-	addFunction(10.f, 0.f, dummy_func, "osNpcSetRot", NULL, "kr");
-	addFunction(10.f, 0.f, dummy_func, "osAgentSaveAppearance", "k", "ks");
-	addFunction(10.f, 0.f, dummy_func, "osNpcGetPos", "v", "k");
-	addFunction(10.f, 0.f, dummy_func, "osNpcStopMoveToTarget", NULL, "k");
-
-	addFunction(10.f, 0.f, dummy_func, "osIsNpc", "i", "k");
-	addFunction(10.f, 0.f, dummy_func, "osNpcGetOwner", "k", "k");
-	addFunction(10.f, 0.f, dummy_func, "osGetGridCustom", "s", "s");
-	addFunction(10.f, 0.f, dummy_func, "osGetGridHomeURI", "s", NULL);
-	addFunction(10.f, 0.f, dummy_func, "osNpcPlayAnimation", NULL, "ks");
-	addFunction(10.f, 0.f, dummy_func, "osNpcSit", NULL, "kki");
-	addFunction(10.f, 0.f, dummy_func, "osNpcStand", NULL, "k");
-	addFunction(10.f, 0.f, dummy_func, "osNpcStopAnimation", NULL, "ks");
-	addFunction(10.f, 0.f, dummy_func, "osSetRot", NULL, "kq");
-
+//
+// aaFunctions   Aurora-Sim ONLY
+	addFunction(10.f, 0.f, dummy_func, "aaSetCloudDensity", NULL, "f");
+	addFunction(10.f, 0.f, dummy_func, "aaUpdateDatabase", NULL, "sss");
+	addFunction(10.f, 0.f, dummy_func, "aaQueryDatabase", "l", "ss");
+	addFunction(10.f, 0.f, dummy_func, "aaDeserializeXMLValues", "l", "s");
+	addFunction(10.f, 0.f, dummy_func, "aaDeserializeXMLKeys","l", "s");
+	addFunction(10.f, 0.f, dummy_func, "aaSetConeOfSilence", NULL, "f");
+	addFunction(10.f, 0.f, dummy_func, "aaSerializeXML", "s", "ll");
+	addFunction(10.f, 0.f, dummy_func, "aaGetTeam", "s", "k");
+	addFunction(10.f, 0.f, dummy_func, "aaGetHealth", "f", "k");
+	addFunction(10.f, 0.f, dummy_func, "aaJoinCombat", NULL, "k");
+	addFunction(10.f, 0.f, dummy_func, "aaLeaveCombat", NULL, "k");
+	addFunction(10.f, 0.f, dummy_func, "aaJoinCombatTeam", NULL, "ks");
+	addFunction(10.f, 0.f, dummy_func, "aaRequestCombatPermission", NULL, "s");
+	addFunction(10.f, 0.f, dummy_func, "aaThawAvatar", NULL, "s");
+	addFunction(10.f, 0.f, dummy_func, "aaFreezeAvatar", NULL, "s");
+	addFunction(10.f, 0.f, dummy_func, "aaGetTeamMembers", "l", "s");
+	addFunction(10.f, 0.f, dummy_func, "aaGetLastOwner", "s", NULL);
+	addFunction(10.f, 0.f, dummy_func, "aaSayDistance", NULL, "ifs");
+	addFunction(10.f, 0.f, dummy_func, "aaSayTo", NULL, "ss");
+	addFunction(10.f, 0.f, dummy_func, "aaGetWalkDisabled ", "i", "s");
+	addFunction(10.f, 0.f, dummy_func, "aaSetWalkDisabled", NULL, "si");
+	addFunction(10.f, 0.f, dummy_func, "aaGetFlyDisabled ", "i", "s");
+	addFunction(10.f, 0.f, dummy_func, "aaSetFlyDisabled", NULL, "sf");
+	addFunction(10.f, 0.f, dummy_func, "aaAvatarFullName2Key ", "s", "s");
+	addFunction(10.f, 0.f, dummy_func, "aaRaiseError", NULL, "s");
+	addFunction(10.f, 0.f, dummy_func, "aaGetText ", "s", NULL);
+	addFunction(10.f, 0.f, dummy_func, "aaGetTextColor ", "r", NULL);
+	addFunction(10.f, 0.f, dummy_func, "aaSetEnv ", NULL, "sl");
+	addFunction(10.f, 0.f, dummy_func, "aaGetIsInfiniteRegion", "i", NULL);
+// botFunctions   Aurora-Sim ONLY
+	addFunction(10.f, 0.f, dummy_func, "botGetWaitingTime", "v", "i");
+	addFunction(10.f, 0.f, dummy_func, "botSetMap", NULL, "slii");
+	addFunction(10.f, 0.f, dummy_func, "botCreateBot", "s", "sssv");
+	addFunction(10.f, 0.f, dummy_func, "botRemoveBot", NULL, "s");
+	addFunction(10.f, 0.f, dummy_func, "botPauseMovement", NULL, "s");
+	addFunction(10.f, 0.f, dummy_func, "botResumeMovement", NULL, "s");
+	addFunction(10.f, 0.f, dummy_func, "botFollowAvatar", NULL, "ssff");
+	addFunction(10.f, 0.f, dummy_func, "botStopFollowAvatar", NULL, "s");
+	addFunction(10.f, 0.f, dummy_func, "botSendChatMessage", NULL, "ssii");
+	addFunction(10.f, 0.f, dummy_func, "botSendIM",NULL,"sss");
+	addFunction(10.f, 0.f, dummy_func, "botSetShouldFly", NULL, "si");
+	addFunction(10.f, 0.f, dummy_func, "botSitObject", NULL, "ssv");
+	addFunction(10.f, 0.f, dummy_func, "botStandUp", NULL, "s");
+	addFunction(10.f, 0.f, dummy_func, "botTouchObject", NULL, "ss");
+	addFunction(10.f, 0.f, dummy_func, "botAddTag", NULL, "ss");
+	addFunction(10.f, 0.f, dummy_func, "botGetBotsWithTag", "l", "s");
+	addFunction(10.f, 0.f, dummy_func, "botRemoveBotsWithTag", NULL, "s");
+	// energy, sleep, dummy_func, name, return type, parameters
 }
 
 LLScriptLibraryFunction::LLScriptLibraryFunction(F32 eu, F32 st, void (*exec_func)(LLScriptLibData *, LLScriptLibData *, const LLUUID &), const char *name, const char *ret_type, const char *args, BOOL god_only)
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini
index b264e08e3..dd50567cd 100644
--- a/indra/newview/app_settings/keywords.ini
+++ b/indra/newview/app_settings/keywords.ini
@@ -14,7 +14,7 @@ key				Key type.  Use NULL_KEY to test for empty keys
 vector			Vector type of 3 floats.  Used to represent 3D motion, Euler angles, and color.:Access components by .x, .y. or .z
 rotation		Rotation type of 4 floats.  Used to represent rotation.:Access components by .x, .y., .z, or .w
 list			List of various data types
-quaternion      Rotation type of 4 floats. Used to represent rotation.:Access components by .x, .y, .z, or .w
+quaternion		Rotation type of 4 floats. Used to represent rotation.:Access components by .x, .y, .z, or .w
 
 # events
 [word 0, .3, .5]
@@ -52,7 +52,7 @@ changed			changed( integer change ):Triggered various event change the task:(tes
 remote_data     remote_data(integer event_type, key channel, key message_id, string sender,integer idata, string sdata):Triggered by various XML-RPC calls (event_type will be one of REMOTE_DATA_CHANNEL, REMOTE_DATA_REQUEST, REMOTE_DATA_REPLY)
 http_response   http_response(key request_id, integer status, list metadata, string body):Triggered when task receives a response to one of its llHTTPRequests
 http_request	http_request(key id, string method, string body):Triggered when task receives an http request against a public URL
-transaction_result	transaction_result(key id, integer success, string data):Triggered when task receives asynchronous data.
+transaction_result		transaction_result(key id, integer success, string data):Triggered when task receives asynchronous data.
 path_update		path_update(integer type, list reserved):Triggered when the state of a pathfinder character changes. Note; "list reserved" is not currently used
 
 # integer constants
@@ -70,9 +70,10 @@ STATUS_BLOCK_GRAB_OBJECT This status flag keeps the object from being moved by g
 STATUS_DIE_AT_EDGE Passed in the llSetStatus library function.  If TRUE, objects that reach the edge of the world just die:rather than teleporting back to the owner
 STATUS_RETURN_AT_EDGE Passed in the llSetStatus library function.  If TRUE, script rezzed objects that reach the edge of the world:are returned rather than killed:STATUS_RETURN_AT_EDGE trumps STATUS_DIE_AT_EDGE if both are set
 STATUS_CAST_SHADOWS	Passed in the llSetStatus library function.  If TRUE, object casts shadows on other objects
+
 AGENT			Passed in llSensor library function to look for other Agents; DEPRECATED: Use AGENT_BY_LEGACY_NAME
-AGENT_BY_USERNAME			Passed in llSensor library function to look for other Agents by username
-AGENT_BY_LEGACY_NAME			Passed in llSensor library function to look for other Agents by legacy name
+AGENT_BY_LEGACY_NAME	Passed in llSensor library function to look for other Agents by legacy name
+AGENT_BY_USERNAME	Passed in llSensor library function to look for other Agents by username
 ACTIVE			Passed in llSensor library function to look for moving objects
 PASSIVE			Passed in llSensor library function to look for objects that aren't moving
 SCRIPTED		Passed in llSensor library function to look for scripted objects
@@ -171,10 +172,10 @@ OBJECT_VELOCITY			Used with llGetObjectDetails to get an object's velocity
 OBJECT_OWNER			Used with llGetObjectDetails to get an object's owner's key.  Will be NULL_KEY if group owned
 OBJECT_GROUP			Used with llGetObjectDetails to get an object's group's key
 OBJECT_CREATOR			Used with llGetObjectDetails to get an object's creator's key
-OBJECT_RUNNING_SCRIPT_COUNT			Used with llGetObjectDetails to get an object's velocity.
-OBJECT_TOTAL_SCRIPT_COUNT			Used with llGetObjectDetails to get an object's owner's key.  Will be NULL_KEY if group owned.
-OBJECT_SCRIPT_MEMORY			Used with llGetObjectDetails to get an object's group's key.
-OBJECT_SCRIPT_TIME			Used with llGetObjectDetails to get an object's creator's key.
+OBJECT_RUNNING_SCRIPT_COUNT	Gets the number of running scripts attached to the object or agent
+OBJECT_TOTAL_SCRIPT_COUNT	Gets the number of scripts, both running and stopped, attached to the object or agent.
+OBJECT_SCRIPT_MEMORY		Gets the total amount of script memory allocated to the object or agent, in bytes. 
+OBJECT_SCRIPT_TIME		Gets the total amount of average script CPU time used by the object or agent, in seconds. 
 OBJECT_PRIM_EQUIVALENCE		Gets the prim equivalence of the object.
 OBJECT_SERVER_COST			Used with llGetObjectDetails to get the server cost.
 OBJECT_STREAMING_COST		Used with llGetObjectDetails to get the streaming (download) cost.
@@ -185,8 +186,8 @@ VEHICLE_TYPE_NONE		Used with llSetVehicleType to turn off vehicle support
 VEHICLE_TYPE_SLED		Used with llSetVehicleType to make a simple vehicle that bumps along the ground, and likes to move along its local x-axis
 VEHICLE_TYPE_CAR		Used with llSetVehicleType to make a vehicle that bounces along the ground but needs the motors to be driven from external controls or timer events
 VEHICLE_TYPE_BOAT		Used with llSetVehicleType to make a vehicle that hovers over water with lots of friction and some angular deflection
-VEHICLE_TYPE_AIRPLANE	Used with llSetVehicleType to make a vehicle that uses linear deflection for lift, and banking to turn, but doesn't hover
-VEHICLE_TYPE_BALLOON	Used with llSetVehicleType to make a vehicle that uses hover, and friction, but doesn't use deflection
+VEHICLE_TYPE_AIRPLANE		Used with llSetVehicleType to make a vehicle that uses linear deflection for lift, and banking to turn, but doesn't hover
+VEHICLE_TYPE_BALLOON		Used with llSetVehicleType to make a vehicle that uses hover, and friction, but doesn't use deflection
 
 VEHICLE_REFERENCE_FRAME		Rotation of vehicle axes relative to local frame
 
@@ -289,14 +290,14 @@ ATTACH_LLLEG		Passed to llAttachToAvatar to attach task to left lower leg
 ATTACH_BELLY		Passed to llAttachToAvatar to attach task to belly
 ATTACH_LEFT_PEC		Passed to llAttachToAvatar to attach task to left pectoral
 ATTACH_RIGHT_PEC	Passed to llAttachToAvatar to attach task to right pectoral
+ATTACH_HUD_BOTTOM	Passed to llAttachToAvatar to attach task to bottom hud area
+ATTACH_HUD_BOTTOM_LEFT	Passed to llAttachToAvatar to attach task to bottom left hud area
+ATTACH_HUD_BOTTOM_RIGHT Passed to llAttachToAvatar to attach task to bottom right hud area
+ATTACH_HUD_CENTER_1	Passed to llAttachToAvatar to attach task to center 1 hud area
 ATTACH_HUD_CENTER_2	Passed to llAttachToAvatar to attach task to center 2 hud area
-ATTACH_HUD_TOP_RIGHT	Passed to llAttachToAvatar to attach task to top right hud area
 ATTACH_HUD_TOP_CENTER	Passed to llAttachToAvatar to attach task to top center hud area
 ATTACH_HUD_TOP_LEFT	Passed to llAttachToAvatar to attach task to top left hud area
-ATTACH_HUD_CENTER_1	Passed to llAttachToAvatar to attach task to center 1 hud area
-ATTACH_HUD_BOTTOM_LEFT	Passed to llAttachToAvatar to attach task to bottom left hud area
-ATTACH_HUD_BOTTOM	Passed to llAttachToAvatar to attach task to bottom hud area
-ATTACH_HUD_BOTTOM_RIGHT	Passed to llAttachToAvatar to attach task to bottom right hud area
+ATTACH_HUD_TOP_RIGHT	Passed to llAttachToAvatar to attach task to top right hud area
 ##The following attachment points exist only as numbers thus far, but will be ready when the time comes.
 #ATTACH_NECK		Passed to llAttachToAvatar to attach task to neck
 #ATTACH_ROOT		Passed to llAttachToAvatar to attach task to avatar center/root
@@ -369,29 +370,28 @@ REMOTE_DATA_REPLY	Value of event_type in remote_event if XML-RPC reply is receiv
 PRIM_NAME			For primitive name (from server v1.40 onwards). Followed by a string.
 PRIM_DESC			For primitive description (from server v1.40 onwards). Followed by a string.
 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_SLICE			Get and set the 'slice' parameter of all shapes. Takes a vector parameter of the form <start_slice, end_slice, 0>
-PRIM_PHYSICS_SHAPE_TYPE		For primitive physics shape type. Followed with either PRIM_PHYSICS_SHAPE_PRIM, PRIM_PHYSICS_SHAPE_NONE or PRIM_PHYSICS_SHAPE_CONVEX.
 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		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_TEMP_ON_REZ	Sets temporary 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
 PRIM_POSITION		Sets primitive position to a vector position
-PRIM_POS_LOCAL		Sets the prim's local position
 PRIM_SIZE			Sets primitive size to a vector size
 PRIM_ROTATION		Sets primitive rotation
-PRIM_ROT_LOCAL		Sets the prim's local rotation
+PRIM_TEXT		Used to get or set the object's floating text. 
 PRIM_TEXTURE		Followed by an integer face, key id, vector repeats, vector offsets,:and float rotation in radians
-PRIM_TEXT			For primitive hovertext. Followed by a string, a vector color and a float alpha
 PRIM_COLOR			Followed by an integer face, vector color, and float alpha
 PRIM_BUMP_SHINY		Followed by an integer face, one of PRIM_SHINY_NONE, PRIM_SHINY_LOW,:PRIM_SHINY_MEDIUM, or PRIM_SHINY_HIGH,:and one of PRIM_BUMP_NONE, PRIM_BUMP_BRIGHT, PRIM_BUMP_DARK, etc
 PRIM_FULLBRIGHT		Followed by an integer face, and TRUE or FALSE
 PRIM_TEXGEN			Followed by an integer face, and one of PRIM_TEXGEN_DEFAULT or PRIM_TEXGEN_PLANAR
 PRIM_GLOW			Followed by an integer face, and a float from 0.0 to 1.0 specifying glow amount
-PRIM_OMEGA			Makes the object spin at the specified axis and rate
+PRIM_POS_LOCAL		Sets the prim's local position
+PRIM_ROT_LOCAL		Sets the prim's local rotation
+PRIM_OMEGA		Makes the object spin at the specified axis and rate
 PRIM_LINK_TARGET	Used to get or set multiple links with a single PrimParameters call
+PRIM_SLICE         Get and set the 'slice' parameter of all shapes. Takes a vector parameter of the form <start_slice, end_slice, 0>
 
 PROFILE_NONE		Disables profiling
 PROFILE_SCRIPT_MEMORY	Enables memory profiling
@@ -454,9 +454,10 @@ PRIM_SCULPT_TYPE_MASK		Mask used to determine stitching type
 PRIM_SCULPT_FLAG_INVERT     Flag to specify that the surface normals should be inverted
 PRIM_SCULPT_FLAG_MIRROR     Flag to specify that the prim should be reflected along X axis
 
+PRIM_PHYSICS_SHAPE_TYPE		For primitive physics shape type. Followed with either PRIM_PHYSICS_SHAPE_PRIM, PRIM_PHYSICS_SHAPE_NONE or PRIM_PHYSICS_SHAPE_CONVEX.
 PRIM_PHYSICS_SHAPE_PRIM		Use the normal prim shape for physics (this is the default for all non-mesh objects)
-PRIM_PHYSICS_SHAPE_CONVEX	Ignore this prim in the physics shape. This cannot be applied to the root prim.
 PRIM_PHYSICS_SHAPE_NONE		Use the convex hull of the prim shape for physics (this is the default for mesh objects)
+PRIM_PHYSICS_SHAPE_CONVEX	Ignore this prim in the physics shape. This cannot be applied to the root prim.
 
 MASK_BASE				Base permissions
 MASK_OWNER				Owner permissions
@@ -526,19 +527,13 @@ REGION_FLAG_BLOCK_FLY				Used with llGetRegionFlags to find if a region blocks f
 REGION_FLAG_ALLOW_DIRECT_TELEPORT	Used with llGetRegionFlags to find if a region allows direct teleports
 REGION_FLAG_RESTRICT_PUSHOBJECT		Used with llGetRegionFlags to find if a region restricts llPushObject() calls
 
-ESTATE_ACCESS_ALLOWED_AGENT_ADD		Used with llManageEstateAccess to add an agent to this estate's allowed residents list.
-ESTATE_ACCESS_ALLOWED_AGENT_REMOVE	Used with llManageEstateAccess to remove an agent from this estate's allowed residents list.
-ESTATE_ACCESS_ALLOWED_GROUP_ADD		Used with llManageEstateAccess to add a group to this estate's allowed groups list.
-ESTATE_ACCESS_ALLOWED_GROUP_REMOVE	Used with llManageEstateAccess to remove a group from this estate's allowed groups list.
-ESTATE_ACCESS_BANNED_AGENT_ADD		Used with llManageEstateAccess to add an agent to this estate's banned residents list.
-ESTATE_ACCESS_BANNED_AGENT_REMOVE	Used with llManageEstateAccess to remove an agent from this estate's banned residents list.
-
 HTTP_METHOD                         Used with llHTTPRequest to specify the method, "GET", "POST", "PUT", or "DELETE"
 HTTP_MIMETYPE                       Used with llHTTPRequest to specify the MIME type, defaults to "text/plain"
 HTTP_BODY_MAXLENGTH                 Used with llHTTPRequest to specify the maximum response body to return
 HTTP_VERIFY_CERT                    Used with llHTTPRequest to specify SSL certificate verification
 HTTP_BODY_TRUNCATED                 Used with http_response to indicate truncation point in bytes
 HTTP_VERBOSE_THROTTLE               Used with llHTTPRequest to shout error messages to DEBUG_CHANNEL if the outgoing request rate exceeds the server limit.
+HTTP_BODY_MAXLENGTH                 Used with llHTTPRequest to specify the maximum body size for the date returned from the request. Mono scripts can request from 1byte to 16k, non-mono scripts can request from 1byte to 4k. The default is 2k.
 
 PARCEL_COUNT_TOTAL		Used with llGetParcelPrimCount to get the total number of prims on the parcel
 PARCEL_COUNT_OWNER		Used with llGetParcelPrimCount to get the number of prims on the parcel owned by the owner
@@ -613,7 +608,132 @@ STATUS_NOT_SUPPORTED                   Feature not supported
 STATUS_INTERNAL_ERROR                  An internal error occurred
 STATUS_WHITELIST_FAILED                URL failed to pass whitelist
 
-# windlight constants
+RC_DATA_FLAGS				Option for llCastRay() followed with a bitwise combination of RC_GET_NORMAL, RC_GET_ROOT_KEY and RC_GET_LINK_NUM.
+RC_DETECT_PHANTOM			Option for llCastRay() followed with TRUE to detect phantom AND volume detect objects, FASLE otherwise.
+RC_GET_LINK_NUM				Flag used in the RC_DATA_FLAGS mask to get link numbers in llCastRay() results.
+RC_GET_NORMAL				Flag used in the RC_DATA_FLAGS mask to get hit normals in llCastRay() results.
+RC_GET_ROOT_KEY				Flag used in the RC_DATA_FLAGS mask to get root keys in llCastRay() results.
+RC_MAX_HITS					Option for llCastRay() followed with an integer specifying the maximum number of hits to return (must be <= 256).
+RC_REJECT_TYPES				Option for llCastRay() used to ignore specific types of objects, followed with a bitwise combination of RC_REJECT_AGENTS, RC_REJECT_PHYSICAL, RC_REJECT_NONPHYSICAL and RC_REJECT_LAND.
+RC_REJECT_AGENTS			Flag used in the RC_REJECT_TYPES mask to reject agents in llCastRay().
+RC_REJECT_PHYSICAL			Flag used in the RC_REJECT_TYPES mask to reject physical objects in llCastRay().
+RC_REJECT_NONPHYSICAL		Flag used in the RC_REJECT_TYPES mask to reject non-physical objects in llCastRay().
+RC_REJECT_LAND				Flag used in the RC_REJECT_TYPES mask to reject land in llCastRay().
+
+RCERR_CAST_TIME_EXCEEDED	Returned by llCastRay() when the raycast failed because the parcel or agent has exceeded the maximum time allowed for raycasting.
+RCERR_SIM_PERF_LOW			Returned by llCastRay() when the raycast failed because simulator performance is low.
+RCERR_UNKNOWN				Returned by llCastRay() when the raycast failed for an unspecified reason.
+
+ESTATE_ACCESS_ALLOWED_AGENT_ADD		Used with llManageEstateAccess to add an agent to this estate's allowed residents list.
+ESTATE_ACCESS_ALLOWED_AGENT_REMOVE	Used with llManageEstateAccess to remove an agent from this estate's allowed residents list.
+ESTATE_ACCESS_ALLOWED_GROUP_ADD		Used with llManageEstateAccess to add a group to this estate's allowed groups list.
+ESTATE_ACCESS_ALLOWED_GROUP_REMOVE	Used with llManageEstateAccess to remove a group from this estate's allowed groups list.
+ESTATE_ACCESS_BANNED_AGENT_ADD		Used with llManageEstateAccess to add an agent to this estate's banned residents list.
+ESTATE_ACCESS_BANNED_AGENT_REMOVE	Used with llManageEstateAccess to remove an agent from this estate's banned residents list.
+
+DENSITY 			For use with llSetPhysicsMaterial() as a bitwise value in its material_bits parameter, to set the density.
+FRICTION 			For use with llSetPhysicsMaterial() as a bitwise value in its material_bits parameter, to set the friction.
+RESTITUTION 		For use with llSetPhysicsMaterial() as a bitwise value in its material_bits parameter, to set the restitution.
+GRAVITY_MULTIPLIER 	For use with llSetPhysicsMaterial() as a bitwise value in its material_bits parameter, to set the gravity multiplier.
+
+KFM_COMMAND			Option for llSetKeyframedMotion(), followed by one of KFM_CMD_STOP, KFM_CMD_PLAY, KFM_CMD_PAUSE. Note that KFM_COMMAND must be the only option in the list, and cannot be specified in the same function call that sets the keyframes list.
+KFM_CMD_PLAY		Option for llSetKeyframedMotion(), used after KFM_COMMAND to play the motion.
+KFM_CMD_STOP		Option for llSetKeyframedMotion(), used after KFM_COMMAND to stop the motion.
+KFM_CMD_PAUSE		Option for llSetKeyframedMotion(), used after KFM_COMMAND to pause the motion.
+KFM_CMD_SET_MODE	TODO: add documentation
+KFM_MODE			Option for llSetKeyframedMotion(), used to specify the playback mode, followed by one of KFM_FORWARD, KFM_LOOP, KFM_PING_PONG or KFM_REVERSE.
+KFM_FORWARD			Option for llSetKeyframedMotion(), used after KFM_MODE to specify the forward playback mode.
+KFM_LOOP			Option for llSetKeyframedMotion(), used after KFM_MODE to specify the loop playback mode.
+KFM_PING_PONG		Option for llSetKeyframedMotion(), used after KFM_MODE to specify the ping pong playback mode.
+KFM_REVERSE			Option for llSetKeyframedMotion(), used after KFM_MODE to specify the reverse playback mode.
+KFM_DATA			Option for llSetKeyframedMotion(), followed by a bitwise combination of KFM_TRANSLATION and KFM_ROTATION. If you specify one or the other, you should only include translations or rotations in your keyframe list.
+KFM_ROTATION 		Option for llSetKeyframedMotion(), used after KFM_DATA, possibly as a bitwise combination with KFM_TRANSLATION.
+KFM_TRANSLATION		Option for llSetKeyframedMotion(), used after KFM_DATA, possibly as a bitwise combination with KFM_ROTATION.
+
+CHARACTER_CMD_STOP	TODO: add documentation
+CHARACTER_CMD_JUMP	TODO: add documentation
+
+CHARACTER_DESIRED_SPEED		TODO: add documentation
+CHARACTER_RADIUS			TODO: add documentation
+CHARACTER_LENGTH			TODO: add documentation
+CHARACTER_ORIENTATION		TODO: add documentation
+CHARACTER_AVOIDANCE_MODE	TODO: add documentation
+PURSUIT_OFFSET				TODO: add documentation
+REQUIRE_LINE_OF_SIGHT		TODO: add documentation
+PURSUIT_FUZZ_FACTOR			TODO: add documentation
+PURSUIT_INTERCEPT			TODO: add documentation
+FORCE_DIRECT_PATH			TODO: add documentation
+VERTICAL					TODO: add documentation
+HORIZONTAL					TODO: add documentation
+AVOID_CHARACTERS			TODO: add documentation
+AVOID_DYNAMIC_OBSTACLES		TODO: add documentation
+
+PU_EVADE_HIDDEN                  Triggered when an llEvade character thinks it has hidden from its pursuer.
+PU_EVADE_SPOTTED                 Triggered when an llEvade character switches from hiding to running
+PU_FAILURE_INVALID_GOAL          Goal is not on the navigation-mesh and cannot be reached.
+PU_FAILURE_INVALID_START         Character cannot navigate from the current location - e.g., the character is off the navmesh or too high above it.
+PU_FAILURE_NO_VALID_DESTINATION  There's no good place for the character to go - e.g., it is patrolling and all the patrol points are now unreachable.
+PU_FAILURE_OTHER			     Unknown failure
+PU_FAILURE_TARGET_GONE           Target (for llPursue or llEvade) can no longer be tracked - e.g., it left the region or is an avatar that is now more than about 30m outside the region.
+PU_FAILURE_UNREACHABLE           Goal is no longer reachable for some reason - e.g., an obstacle blocks the path.
+PU_GOAL_REACHED                  Character has reached the goal and will stop or choose a new goal (if wandering).
+PU_SLOWDOWN_DISTANCE_REACHED     Character is near current goal.
+
+CHARACTER_TYPE			TODO: add documentation
+CHARACTER_TYPE_A		TODO: add documentation
+CHARACTER_TYPE_B		TODO: add documentation
+CHARACTER_TYPE_C		TODO: add documentation
+CHARACTER_TYPE_D		TODO: add documentation
+CHARACTER_TYPE_NONE		TODO: add documentation
+
+TRAVERSAL_TYPE			TODO: add documentation
+TRAVERSAL_TYPE_SLOW		TODO: add documentation
+TRAVERSAL_TYPE_FAST		TODO: add documentation
+TRAVERSAL_TYPE_NONE		TODO: add documentation
+
+CHARACTER_MAX_ACCEL				TODO: add documentation
+CHARACTER_MAX_DECEL				TODO: add documentation
+CHARACTER_MAX_ANGULAR_SPEED		TODO: add documentation
+CHARACTER_MAX_ANGULAR_ACCEL		TODO: add documentation
+CHARACTER_TURN_SPEED_MULTIPLIER	TODO: add documentation
+CHARACTER_DESIRED_TURN_SPEED	TODO: add documentation
+CHARACTER_MAX_TURN_RADIUS		TODO: add documentation
+# --- OpenSim and Aurora-Sim constants Below ---
+# OpenSim Constants (\OpenSim\Region\ScriptEngine\Shared\Api\Runtime\LSL_Constants.cs)
+# Constants for cmWindlight (\OpenSim\Region\ScriptEngine\Shared\Api\Runtime\CM_Constants.cs)
+CHANGED_ANIMATION           OpenSim change event animation change detection.
+# osGetRegionStats
+STATS_TIME_DILATION      returned value from osGetRegionStats(), 1st of 21 items in returned list.
+STATS_SIM_FPS	         returned value from osGetRegionStats(), 2nd of 21 items in returned list.
+STATS_PHYSICS_FPS	     returned value from osGetRegionStats(), 3rd of 21 items in returned list.
+STATS_AGENT_UPDATES      returned value from osGetRegionStats(), 4th of 21 items in returned list.
+STATS_ROOT_AGENTS 	     returned value from osGetRegionStats(), 5th of 21 items in returned list.
+STATS_CHILD_AGENTS 	     returned value from osGetRegionStats(), 6th of 21 items in returned list.
+STATS_TOTAL_PRIMS 	     returned value from osGetRegionStats(), 7th of 21 items in returned list.
+STATS_ACTIVE_PRIMS 	     returned value from osGetRegionStats(), 8th of 21 items in returned list.
+STATS_FRAME_MS 	         returned value from osGetRegionStats(), 9th of 21 items in returned list.
+STATS_NET_MS 	         returned value from osGetRegionStats(), 10th of 21 items in returned list.
+STATS_PHYSICS_MS 	     returned value from osGetRegionStats(), 11th of 21 items in returned list.
+STATS_IMAGE_MS 	         returned value from osGetRegionStats(), 12th of 21 items in returned list.
+STATS_OTHER_MS 	         returned value from osGetRegionStats(), 13th of 21 items in returned list.
+STATS_IN_PACKETS_PER_SECOND   returned value from osGetRegionStats(), 14th of 21 items in returned list.
+STATS_OUT_PACKETS_PER_SECOND  returned value from osGetRegionStats(), 15th of 21 items in returned list.
+STATS_UNACKED_BYTES      returned value from osGetRegionStats(), 16th of 21 items in returned list.
+STATS_AGENT_MS	         returned value from osGetRegionStats(), 17th of 21 items in returned list.
+STATS_PENDING_DOWNLOADS	 returned value from osGetRegionStats(), 18th of 21 items in returned list.
+STATS_PENDING_UPLOADS	 returned value from osGetRegionStats(), 19th of 21 items in returned list.
+STATS_ACTIVE_SCRIPTS	 returned value from osGetRegionStats(), 20th of 21 items in returned list.
+STATS_SCRIPT_LPS	     returned value from osGetRegionStats(), 21st of 21 items in returned list.
+# OpenSim NPC
+OS_NPC_FLY	            used by osNPC.
+OS_NPC_NO_FLY	        used by osNPC.
+OS_NPC_LAND_AT_TARGET   used by osNPC.
+OS_NPC_SIT_NOW	        used by osNPC.
+OS_NPC_CREATOR_OWNED    used by osNPC.
+OS_NPC_NOT_OWNED	    used by osNPC.
+OS_NPC_SENSE_AS_AGENT   used by osNPC.
+OS_NPC_RUNNING          used by osNPC.
+# Windlight/Lightshare
 WL_WATER_COLOR					Windlight Water Colour
 WL_WATER_FOG_DENSITY_EXPONENT	Windlight Water Fog Density Exponent
 WL_UNDERWATER_FOG_MODIFIER		Windlight Underwater Fog Modifier
@@ -651,112 +771,28 @@ WL_CLOUD_SCROLL_Y				Windlight Cloud Scroll Y
 WL_CLOUD_SCROLL_Y_LOCK			Windlight Cloud Scroll Y Lock
 WL_CLOUD_SCROLL_X_LOCK			Windlight Cloud Scroll X Lock
 WL_DRAW_CLASSIC_CLOUDS			Windlight Draw Classic Clouds
-
-# keyframe constants
-KFM_COMMAND			Option for llSetKeyframedMotion(), followed by one of KFM_CMD_STOP, KFM_CMD_PLAY, KFM_CMD_PAUSE. Note that KFM_COMMAND must be the only option in the list, and cannot be specified in the same function call that sets the keyframes list.
-KFM_MODE			Option for llSetKeyframedMotion(), used to specify the playback mode, followed by one of KFM_FORWARD, KFM_LOOP, KFM_PING_PONG or KFM_REVERSE.
-KFM_DATA			Option for llSetKeyframedMotion(), followed by a bitwise combination of KFM_TRANSLATION and KFM_ROTATION. If you specify one or the other, you should only include translations or rotations in your keyframe list.
-KFM_FORWARD			Option for llSetKeyframedMotion(), used after KFM_MODE to specify the forward playback mode.
-KFM_LOOP			Option for llSetKeyframedMotion(), used after KFM_MODE to specify the loop playback mode.
-KFM_PING_PONG		Option for llSetKeyframedMotion(), used after KFM_MODE to specify the ping pong playback mode.
-KFM_REVERSE			Option for llSetKeyframedMotion(), used after KFM_MODE to specify the reverse playback mode.
-KFM_ROTATION 		Option for llSetKeyframedMotion(), used after KFM_DATA, possibly as a bitwise combination with KFM_TRANSLATION.
-KFM_TRANSLATION		Option for llSetKeyframedMotion(), used after KFM_DATA, possibly as a bitwise combination with KFM_ROTATION.
-KFM_CMD_PLAY		Option for llSetKeyframedMotion(), used after KFM_COMMAND to play the motion.
-KFM_CMD_STOP		Option for llSetKeyframedMotion(), used after KFM_COMMAND to stop the motion.
-KFM_CMD_PAUSE		Option for llSetKeyframedMotion(), used after KFM_COMMAND to pause the motion.
-
-# OSSL constants
-STATS_TIME_DILATION
-STATS_SIM_FPS
-STATS_PHYSICS_FPS
-STATS_AGENT_UPDATES
-STATS_ROOT_AGENTS
-STATS_CHILD_AGENTS
-STATS_TOTAL_PRIMS
-STATS_ACTIVE_PRIMS
-STATS_FRAME_MS
-STATS_NET_MS
-STATS_PHYSICS_MS
-STATS_IMAGE_MS
-STATS_OTHER_MS
-STATS_IN_PACKETS_PER_SECOND
-STATS_OUT_PACKETS_PER_SECOND
-STATS_UNACKED_BYTES
-STATS_AGENT_MS
-STATS_PENDING_DOWNLOADS
-STATS_PENDING_UPLOADS
-STATS_ACTIVE_SCRIPTS
-STATS_SCRIPT_LPS
-
-## Constants for osNpc* functions
-NPC
-OS_NPC_CREATOR_OWNED
-OS_NPC_NOT_OWNED
-OS_NPC_SENSE_AS_AGENT
-OS_NPC_FLY
-OS_NPC_NO_FLY
-OS_NPC_LAND_AT_TARGET
-OS_NPC_SIT_NOW
-
-## Missing LSL constants (from http://wiki.secondlife.com/wiki/Category:LSL_Constants)
-
-# physics constants
-DENSITY						For use with llSetPhysicsMaterial() as a bitwise value in its material_bits parameter, to set the density.
-FRICTION					For use with llSetPhysicsMaterial() as a bitwise value in its material_bits parameter, to set the friction.
-RESTITUTION					For use with llSetPhysicsMaterial() as a bitwise value in its material_bits parameter, to set the restitution.
-GRAVITY_MULTIPLIER			For use with llSetPhysicsMaterial() as a bitwise value in its material_bits parameter, to set the gravity multiplier.
-
-##Even more missing constants, thanks to Justin Clark Casey for pointing me into the right direction
-##Liru: Were these supposed to be LSL? They're undocumented, commenting out for now.
-#CAMERA_FOCUS_OFFSET_X
-#CAMERA_FOCUS_OFFSET_Y
-#CAMERA_FOCUS_OFFSET_Z
-#CAMERA_FOCUS_X
-#CAMERA_FOCUS_Y
-#CAMERA_FOCUS_Z
-#CAMERA_POSITION_X
-#CAMERA_POSITION_Y
-#CAMERA_POSITION_Z
-#CHANGED_ANIMATION
-#CHANGED_REGION_RESTART
-#DATA_SIM_RELEASE
-#LIST_STAT_HARMONIC_MEAN
-#PARCEL_DETAILS_CLAIMDATE
-#VEHICLE_FLAG_LOCK_HOVER_HEIGHT
-#VEHICLE_FLAG_LOCK_ROTATION
-#VEHICLE_FLAG_NO_X
-#VEHICLE_FLAG_NO_Y
-#VEHICLE_FLAG_NO_Z
-#VEHICLE_RANGE_BLOCK
-#VEHICLE_ROLL_FRAME
-#LSL_STATUS_BOUNDS_ERROR
-#LSL_STATUS_INTERNAL_ERROR
-#LSL_STATUS_MALFORMED_PARAMS
-#LSL_STATUS_NOT_FOUND
-#LSL_STATUS_NOT_SUPPORTED
-#LSL_STATUS_OK
-#LSL_STATUS_TYPE_MISMATCH
-#LSL_STATUS_WHITELIST_FAILED
-
-# castray constants
-RCERR_UNKNOWN				Returned by llCastRay() when the raycast failed for an unspecified reason.
-RCERR_SIM_PERF_LOW			Returned by llCastRay() when the raycast failed because simulator performance is low.
-RCERR_CAST_TIME_EXCEEDED	Returned by llCastRay() when the raycast failed because the parcel or agent has exceeded the maximum time allowed for raycasting.
-
-RC_REJECT_TYPES				Option for llCastRay() used to ignore specific types of objects, followed with a bitwise combination of RC_REJECT_AGENTS, RC_REJECT_PHYSICAL, RC_REJECT_NONPHYSICAL and RC_REJECT_LAND.
-RC_DETECT_PHANTOM			Option for llCastRay() followed with TRUE to detect phantom AND volume detect objects, FASLE otherwise.
-RC_DATA_FLAGS				Option for llCastRay() followed with a bitwise combination of RC_GET_NORMAL, RC_GET_ROOT_KEY and RC_GET_LINK_NUM.
-RC_MAX_HITS					Option for llCastRay() followed with an integer specifying the maximum number of hits to return (must be <= 256).
-
-RC_REJECT_AGENTS			Flag used in the RC_REJECT_TYPES mask to reject agents in llCastRay().
-RC_REJECT_PHYSICAL			Flag used in the RC_REJECT_TYPES mask to reject physical objects in llCastRay().
-RC_REJECT_NONPHYSICAL		Flag used in the RC_REJECT_TYPES mask to reject non-physical objects in llCastRay().
-RC_REJECT_LAND				Flag used in the RC_REJECT_TYPES mask to reject land in llCastRay().
-
-RC_GET_NORMAL				Flag used in the RC_DATA_FLAGS mask to get hit normals in llCastRay() results.
-RC_GET_ROOT_KEY				Flag used in the RC_DATA_FLAGS mask to get root keys in llCastRay() results.
-RC_GET_LINK_NUM				Flag used in the RC_DATA_FLAGS mask to get link numbers in llCastRay() results.
+# Aurora-Sim Constants  (\Aurora\AuroraDotNetEngine\APIs\AA_Constants.cs) -->
+ENABLE_GRAVITY	                enable_gravity.
+GRAVITY_FORCE_X	                gravity_force_x.
+GRAVITY_FORCE_Y	                gravity_force_y.
+GRAVITY_FORCE_Z	                gravity_force_z.
+ADD_GRAVITY_POINT	            add_gravity_point.
+ADD_GRAVITY_FORCE	            add_gravity_force.
+START_TIME_REVERSAL_SAVING	    start_time_reversal_saving.
+STOP_TIME_REVERSAL_SAVING	    stop_time_reversal_saving.
+START_TIME_REVERSAL	            start_time_reversal.
+STOP_TIME_REVERSAL	            stop_time_reversal.
+# Aurora botFunctions
+BOT_FOLLOW_FLAG_NONE	        value 0.
+BOT_FOLLOW_FLAG_INDEFINITELY    value 1.
+BOT_TAG_FIND_ALL	            value AllBots.
+BOT_FOLLOW_WALK	                value 0.
+BOT_FOLLOW_RUN	                value 1.
+BOT_FOLLOW_FLY	                value 2.
+BOT_FOLLOW_TELEPORT	            value 3.
+BOT_FOLLOW_WAIT	                value 4.
+BOT_FOLLOW_TRIGGER_HERE_EVENT	value 1.
+BOT_FOLLOW_FLAG_FORCEDIRECTPATH value 4.
 
 # string constants
 [word .1, .3, .5]
diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index 863827baa..9e099ed11 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -263,1571 +263,2483 @@
 	<string name="load_files">Load Files</string>
 	<string name="choose_the_directory">Choose Directory</string>
 
- 
-	<!-- LSL Usage Hover Tips -->
-  <string name="LSLTipSleepTime">
+  <!-- LSL Usage Hover Tips -->
+	<string name="LSLTipSleepTime">
 Sleeps script for [SLEEP_TIME] seconds.
-  </string>
+	</string>
 
-  <string name="LSLTipText_llSin">
+	<string name="LSLTipText_llSin">
 float llSin(float theta)
 Returns the sine of theta (theta in radians)
-  </string>
-  <string name="LSLTipText_llCos">
+	</string>
+	<string name="LSLTipText_llCos">
 float llCos(float theta)
 Returns the cosine of theta (theta in radians)
-  </string>
-  <string name="LSLTipText_llTan">
+	</string>
+	<string name="LSLTipText_llTan">
 float llTan(float theta)
 Returns the tangent of theta (theta in radians)
-  </string>
-  <string name="LSLTipText_llAtan2">
+	</string>
+	<string name="LSLTipText_llAtan2">
 float llAtan2(float y, float x)
 Returns the arctangent2 of y, x
-  </string>
-  <string name="LSLTipText_llSqrt">
+	</string>
+	<string name="LSLTipText_llSqrt">
 float llSqrt(float val)
 Returns the square root of val, or returns 0 and triggers a Math Error for imaginary results
-  </string>
-  <string name="LSLTipText_llPow">
+	</string>
+	<string name="LSLTipText_llPow">
 float llPow(float base, float exponent)
 Returns the base raised to the power exponent, or returns 0 and triggers Math Error for imaginary results
-  </string>
-  <string name="LSLTipText_llAbs">
+	</string>
+	<string name="LSLTipText_llAbs">
 integer llAbs(integer val)
 Returns the positive version of val
-  </string>
-  <string name="LSLTipText_llFabs">
+	</string>
+	<string name="LSLTipText_llFabs">
 float llFabs(float val)
 Returns the positive version of val
-  </string>
-  <string name="LSLTipText_llFrand">
+	</string>
+	<string name="LSLTipText_llFrand">
 float llFrand(float mag)
 Returns a pseudo random number in the range [0,mag) or (mag,0]
-  </string>
-  <string name="LSLTipText_llFloor">
+	</string>
+	<string name="LSLTipText_llFloor">
 integer llFloor(float val)
 Returns largest integer value &lt;= val
-  </string>
-  <string name="LSLTipText_llCeil">
+	</string>
+	<string name="LSLTipText_llCeil">
 integer llCeil(float val)
 Returns smallest integer value &gt;= val
-  </string>
-  <string name="LSLTipText_llRound">
+	</string>
+	<string name="LSLTipText_llRound">
 integer llRound(float val)
 Returns val rounded to the nearest integer
-  </string>
-  <string name="LSLTipText_llVecMag">
+	</string>
+	<string name="LSLTipText_llVecMag">
 float llVecMag(vector v)
 Returns the magnitude of v
-  </string>
-  <string name="LSLTipText_llVecNorm">
+	</string>
+	<string name="LSLTipText_llVecNorm">
 vector llVecNorm(vector v)
 Returns the v normalized
-  </string>
-  <string name="LSLTipText_llVecDist">
+	</string>
+	<string name="LSLTipText_llVecDist">
 float llVecDist(vector v1, vector v2)
 Returns the 3D distance between v1 and v2
-  </string>
-  <string name="LSLTipText_llRot2Euler">
+	</string>
+	<string name="LSLTipText_llRot2Euler">
 vector llRot2Euler(rotation q)
 Returns the Euler representation (roll, pitch, yaw) of q
-  </string>
-  <string name="LSLTipText_llEuler2Rot">
+	</string>
+	<string name="LSLTipText_llEuler2Rot">
 rotation llEuler2Rot(vector v)
 Returns the rotation representation of Euler Angles v
-  </string>
-  <string name="LSLTipText_llAxes2Rot">
+	</string>
+	<string name="LSLTipText_llAxes2Rot">
 rotation llAxes2Rot(vector fwd, vector left, vector up)
 Returns the rotation defined by the coordinate axes
-  </string>
-  <string name="LSLTipText_llRot2Fwd">
+	</string>
+	<string name="LSLTipText_llRot2Fwd">
 vector llRot2Fwd(rotation q)
 Returns the forward vector defined by q
-  </string>
-  <string name="LSLTipText_llRot2Left">
+	</string>
+	<string name="LSLTipText_llRot2Left">
 vector llRot2Left(rotation q)
 Returns the left vector defined by q
-  </string>
-  <string name="LSLTipText_llRot2Up">
+	</string>
+	<string name="LSLTipText_llRot2Up">
 vector llRot2Up(rotation q)
 Returns the up vector defined by q
-  </string>
-  <string name="LSLTipText_llRotBetween">
+	</string>
+	<string name="LSLTipText_llRotBetween">
 rotation llRotBetween(vector v1, vector v2)
 Returns the rotation to rotate v1 to v2
-  </string>
-  <string name="LSLTipText_llWhisper">
+	</string>
+	<string name="LSLTipText_llWhisper">
 llWhisper(integer channel, string msg)
 Whispers the text of msg on channel
-  </string>
-  <string name="LSLTipText_llSay">
+	</string>
+	<string name="LSLTipText_llSay">
 llSay(integer channel, string msg)
 Says the text of msg on channel
-  </string>
-  <string name="LSLTipText_llShout">
+	</string>
+	<string name="LSLTipText_llShout">
 llShout(integer channel, string msg)
 Shouts the text of msg on channel
-  </string>
-  <string name="LSLTipText_llListen">
+	</string>
+	<string name="LSLTipText_llListen">
 integer llListen(integer channel, string name, key id, string msg)
 Sets a callback for msg on channel from name and id (name, id, and/or msg can be empty) and returns an identifier that can be used to deactivate or remove the listen
-  </string>
-  <string name="LSLTipText_llListenControl">
+	</string>
+	<string name="LSLTipText_llListenControl">
 llListenControl(integer number, integer active)
 Makes a listen event callback active or inactive
-  </string>
-  <string name="LSLTipText_llListenRemove">
+	</string>
+	<string name="LSLTipText_llListenRemove">
 llListenRemove(integer number)
 Removes listen event callback number
-  </string>
-  <string name="LSLTipText_llSensor">
+	</string>
+	<string name="LSLTipText_llSensor">
 llSensor(string name, key id, integer type, float range, float arc)
 Performs a single scan for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0)
-  </string>
-  <string name="LSLTipText_llSensorRepeat">
+	</string>
+	<string name="LSLTipText_llSensorRepeat">
 llSensorRepeat(string name, key id, integer type, float range, float arc, float rate)
 Sets a callback for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0) and repeats every rate seconds
-  </string>
-  <string name="LSLTipText_llSensorRemove">
+	</string>
+	<string name="LSLTipText_llSensorRemove">
 llSensorRemove()
 Removes the sensor setup by llSensorRepeat
-  </string>
-  <string name="LSLTipText_llDetectedName">
+	</string>
+	<string name="LSLTipText_llDetectedName">
 string llDetectedName(integer number)
 Returns the name of detected object number (returns empty string if number is not a valid sensed object)
-  </string>
-  <string name="LSLTipText_llDetectedKey">
+	</string>
+	<string name="LSLTipText_llDetectedKey">
 key llDetectedKey(integer number)
 Returns the key of detected object number (returns empty key if number is not a valid sensed object)
-  </string>
-  <string name="LSLTipText_llDetectedOwner">
+	</string>
+	<string name="LSLTipText_llDetectedOwner">
 key llDetectedOwner(integer number)
 Returns the key of detected object&apos;s owner (returns empty key if number is not a valid sensed object)
-  </string>
-  <string name="LSLTipText_llDetectedType">
+	</string>
+	<string name="LSLTipText_llDetectedType">
 integer llDetectedType(integer number)
 Returns the type (AGENT, ACTIVE, PASSIVE, SCRIPTED) of detected object (returns 0 if number is not a valid sensed object)
-  </string>
-  <string name="LSLTipText_llDetectedPos">
+	</string>
+	<string name="LSLTipText_llDetectedPos">
 vector llDetectedPos(integer number)
 Returns the position of detected object number (returns &lt;0,0,0&gt; if number is not a valid sensed object)
-  </string>
-  <string name="LSLTipText_llDetectedVel">
+	</string>
+	<string name="LSLTipText_llDetectedVel">
 vector llDetectedVel(integer number)
 Returns the velocity of detected object number (returns &lt;0,0,0&gt; if number is not a valid sensed object)
-  </string>
-  <string name="LSLTipText_llDetectedGrab">
+	</string>
+	<string name="LSLTipText_llDetectedGrab">
 vector llDetectedGrab(integer number)
 Returns the grab offset of the user touching object (returns &lt;0,0,0&gt; if number is not a valid sensed object)
-  </string>
-  <string name="LSLTipText_llDetectedRot">
+	</string>
+	<string name="LSLTipText_llDetectedRot">
 rotation llDetectedRot(integer number)
 Returns the rotation of detected object number (returns &lt;0,0,0,1&gt; if number is not a valid sensed object)
-  </string>
-  <string name="LSLTipText_llDetectedGroup">
+	</string>
+	<string name="LSLTipText_llDetectedGroup">
 integer llDetectedGroup(integer number)
 Returns TRUE if detected object is part of same group as owner
-  </string>
-  <string name="LSLTipText_llDetectedLinkNumber">
+	</string>
+	<string name="LSLTipText_llDetectedLinkNumber">
 integer llDetectedLinkNumber(integer number)
 Returns the link position of the triggered event for touches and collisions only
-  </string>
-  <string name="LSLTipText_llDie">
+	</string>
+	<string name="LSLTipText_llDie">
 llDie()
 Deletes the object
-  </string>
-  <string name="LSLTipText_llGround">
+	</string>
+	<string name="LSLTipText_llGround">
 float llGround(vector offset)
 Returns the ground height below the object position + offset
-  </string>
-  <string name="LSLTipText_llCloud">
+	</string>
+	<string name="LSLTipText_llCloud">
 float llCloud(vector offset)
 Returns the cloud density at the object position + offset
-  </string>
-  <string name="LSLTipText_llWind">
+	</string>
+	<string name="LSLTipText_llWind">
 vector llWind(vector offset)
 Returns the wind velocity at the object position + offset
-  </string>
-  <string name="LSLTipText_llSetStatus">
+	</string>
+	<string name="LSLTipText_llSetStatus">
 llSetStatus(integer status, integer value)
 Sets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value
-  </string>
-  <string name="LSLTipText_llGetStatus">
+	</string>
+	<string name="LSLTipText_llGetStatus">
 integer llGetStatus(integer status)
 Returns value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z)
-  </string>
-  <string name="LSLTipText_llSetScale">
+	</string>
+	<string name="LSLTipText_llSetScale">
 llSetScale(vector scale)
 Sets the scale of the prim
-  </string>
-  <string name="LSLTipText_llGetScale">
+	</string>
+	<string name="LSLTipText_llGetScale">
 vector llGetScale()
 Returns the scale of the prim
-  </string>
-  <string name="LSLTipText_llSetColor">
+	</string>
+	<string name="LSLTipText_llSetColor">
 llSetColor(vector color, integer face)
 Sets the color on face of the prim
-  </string>
-  <string name="LSLTipText_llGetAlpha">
+	</string>
+	<string name="LSLTipText_llGetAlpha">
 float llGetAlpha(integer face)
 Returns the alpha of face
-  </string>
-  <string name="LSLTipText_llSetAlpha">
+	</string>
+	<string name="LSLTipText_llSetAlpha">
 llSetAlpha(float alpha, integer face)
 Sets the alpha on face
-  </string>
-  <string name="LSLTipText_llGetColor">
+	</string>
+	<string name="LSLTipText_llGetColor">
 vector llGetColor(integer face)
 Returns the color on face
-  </string>
-  <string name="LSLTipText_llSetTexture">
+	</string>
+	<string name="LSLTipText_llSetTexture">
 llSetTexture(string texture, integer face)
 Sets the texture of face or ALL_SIDES
-  </string>
-  <string name="LSLTipText_llScaleTexture">
+	</string>
+	<string name="LSLTipText_llScaleTexture">
 llScaleTexture(float u, float v, integer face)
 Sets the texture u &amp; v scales for the chosen face or ALL_SIDES
-  </string>
-  <string name="LSLTipText_llOffsetTexture">
+	</string>
+	<string name="LSLTipText_llOffsetTexture">
 llOffsetTexture(float u, float v, integer face)
 Sets the texture u &amp; v offsets for the chosen face or ALL_SIDES
-  </string>
-  <string name="LSLTipText_llRotateTexture">
+	</string>
+	<string name="LSLTipText_llRotateTexture">
 llRotateTexture(float rotation, integer face)
 Sets the texture rotation for the chosen face
-  </string>
-  <string name="LSLTipText_llGetTexture">
+	</string>
+	<string name="LSLTipText_llGetTexture">
 string llGetTexture(integer face)
 Returns a string that is the texture on face (the inventory name if it is a texture in the prim&apos;s inventory, otherwise the key)
-  </string>
-  <string name="LSLTipText_llSetPos">
+	</string>
+	<string name="LSLTipText_llSetPos">
 llSetPos(vector pos)
 Moves the object or prim towards pos without using physics (if the script isn&apos;t physical)
-  </string>
-  <string name="LSLTipText_llGetPos">
+	</string>
+	<string name="LSLTipText_llGetPos">
 vector llGetPos()
 Returns the position of the task in region coordinates
-  </string>
-  <string name="LSLTipText_llGetLocalPos">
+	</string>
+	<string name="LSLTipText_llGetLocalPos">
 vector llGetLocalPos()
 Returns the position relative to the root
-  </string>
-  <string name="LSLTipText_llSetRot">
+	</string>
+	<string name="LSLTipText_llSetRot">
 llSetRot(rotation rot)
 Sets the rotation
-  </string>
-  <string name="LSLTipText_llGetRot">
+	</string>
+	<string name="LSLTipText_llGetRot">
 rotation llGetRot()
 Returns the rotation relative to the region&apos;s axes
-  </string>
-  <string name="LSLTipText_llGetLocalRot">
+	</string>
+	<string name="LSLTipText_llGetLocalRot">
 rotation llGetLocalRot()
 Returns the rotation local to the root
-  </string>
-  <string name="LSLTipText_llSetForce">
+	</string>
+	<string name="LSLTipText_llSetForce">
 llSetForce(vector force, integer local)
 Applies force to the object (if the script is physical), in local coords if local == TRUE
-  </string>
-  <string name="LSLTipText_llGetForce">
+	</string>
+	<string name="LSLTipText_llGetForce">
 vector llGetForce()
 Returns the force (if the script is physical)
-  </string>
-  <string name="LSLTipText_llTarget">
+	</string>
+	<string name="LSLTipText_llTarget">
 integer llTarget(vector position, float range)
 Sets positions within range of position as a target and return an ID for the target
-  </string>
-  <string name="LSLTipText_llTargetRemove">
+	</string>
+	<string name="LSLTipText_llTargetRemove">
 llTargetRemove(integer number)
 Removes positional target number registered with llTarget
-  </string>
-  <string name="LSLTipText_llRotTarget">
+	</string>
+	<string name="LSLTipText_llRotTarget">
 integer llRotTarget(rotation rot, float error)
 Set rotations with error of rot as a rotational target and return an ID for the rotational target
-  </string>
-  <string name="LSLTipText_llRotTargetRemove">
+	</string>
+	<string name="LSLTipText_llRotTargetRemove">
 llRotTargetRemove(integer number)
 Removes rotational target number registered with llRotTarget
-  </string>
-  <string name="LSLTipText_llMoveToTarget">
+	</string>
+	<string name="LSLTipText_llMoveToTarget">
 llMoveToTarget(vector target, float tau)
 Critically damps to target in tau seconds (if the script is physical)
-  </string>
-  <string name="LSLTipText_llStopMoveToTarget">
+	</string>
+	<string name="LSLTipText_llStopMoveToTarget">
 llStopMoveToTarget()
 Stops critically damped motion
-  </string>
-  <string name="LSLTipText_llApplyImpulse">
+	</string>
+	<string name="LSLTipText_llApplyImpulse">
 llApplyImpulse(vector force, integer local)
 Applies impulse to object (if the script is physical), in local coords if local == TRUE
-  </string>
-  <string name="LSLTipText_llApplyRotationalImpulse">
+	</string>
+	<string name="LSLTipText_llApplyRotationalImpulse">
 llApplyRotationalImpulse(vector force, integer local)
 Applies rotational impulse to object (if the script is physical), in local coords if local == TRUE
-  </string>
-  <string name="LSLTipText_llSetTorque">
+	</string>
+	<string name="LSLTipText_llSetTorque">
 llSetTorque(vector torque, integer local)
 Sets the torque of object (if the script is physical), in local coords if local == TRUE
-  </string>
-  <string name="LSLTipText_llGetTorque">
+	</string>
+	<string name="LSLTipText_llGetTorque">
 vector llGetTorque()
 Returns the torque (if the script is physical)
-  </string>
-  <string name="LSLTipText_llSetForceAndTorque">
+	</string>
+	<string name="LSLTipText_llSetForceAndTorque">
 llSetForceAndTorque(vector force, vector torque, integer local)
 Sets the force and torque of object (if the script is physical), in local coords if local == TRUE
-  </string>
-  <string name="LSLTipText_llGetVel">
+	</string>
+	<string name="LSLTipText_llGetVel">
 vector llGetVel()
 Returns the velocity of the object
-  </string>
-  <string name="LSLTipText_llGetAccel">
+	</string>
+	<string name="LSLTipText_llGetAccel">
 vector llGetAccel()
 Returns the acceleration of the object relative to the region&apos;s axes
-  </string>
-  <string name="LSLTipText_llGetOmega">
+	</string>
+	<string name="LSLTipText_llGetOmega">
 vector llGetOmega()
 Returns the rotation velocity in radians per second
-  </string>
-  <string name="LSLTipText_llGetTimeOfDay">
+	</string>
+	<string name="LSLTipText_llGetTimeOfDay">
 float llGetTimeOfDay()
 Returns the time in seconds since [SECOND_LIFE] server midnight or since region up-time, whichever is smaller
-  </string>
-  <string name="LSLTipText_llGetWallclock">
+	</string>
+	<string name="LSLTipText_llGetWallclock">
 float llGetWallclock()
 Returns the time in seconds since midnight California Pacific time (PST/PDT)
-  </string>
-  <string name="LSLTipText_llGetTime">
+	</string>
+	<string name="LSLTipText_llGetTime">
 float llGetTime()
 Returns the time in seconds since the last region reset, script reset, or call to either llResetTime or llGetAndResetTime
-  </string>
-  <string name="LSLTipText_llResetTime">
+	</string>
+	<string name="LSLTipText_llResetTime">
 llResetTime()
 Sets the script timer to zero
-  </string>
-  <string name="LSLTipText_llGetAndResetTime">
+	</string>
+	<string name="LSLTipText_llGetAndResetTime">
 float llGetAndResetTime()
 Returns the script time in seconds and then resets the script timer to zero
-  </string>
-  <string name="LSLTipText_llSound">
+	</string>
+	<string name="LSLTipText_llSound">
 llSound(string sound, float volume, integer queue, integer loop)
 Plays sound at volume and whether it should loop or not
-  </string>
-  <string name="LSLTipText_llPlaySound">
+	</string>
+	<string name="LSLTipText_llPlaySound">
 llPlaySound(string sound, float volume)
 Plays attached sound once at volume (0.0 - 1.0)
-  </string>
-  <string name="LSLTipText_llLoopSound">
+	</string>
+	<string name="LSLTipText_llLoopSound">
 llLoopSound(string sound, float volume)
 Plays attached sound looping indefinitely at volume (0.0 - 1.0)
-  </string>
-  <string name="LSLTipText_llLoopSoundMaster">
+	</string>
+	<string name="LSLTipText_llLoopSoundMaster">
 llLoopSoundMaster(string sound, float volume)
 Plays attached sound looping at volume (0.0 - 1.0), declares it a sync master
-  </string>
-  <string name="LSLTipText_llLoopSoundSlave">
+	</string>
+	<string name="LSLTipText_llLoopSoundSlave">
 llLoopSoundSlave(string sound, float volume)
 Plays attached sound looping at volume (0.0 - 1.0), synced to most audible sync master
-  </string>
-  <string name="LSLTipText_llPlaySoundSlave">
+	</string>
+	<string name="LSLTipText_llPlaySoundSlave">
 llPlaySoundSlave(string sound, float volume)
 Plays attached sound once at volume (0.0 - 1.0), synced to next loop of most audible sync master
-  </string>
-  <string name="LSLTipText_llTriggerSound">
+	</string>
+	<string name="LSLTipText_llTriggerSound">
 llTriggerSound(string sound, float volume)
 Plays sound at volume (0.0 - 1.0), centered at but not attached to object
-  </string>
-  <string name="LSLTipText_llStopSound">
+	</string>
+	<string name="LSLTipText_llStopSound">
 llStopSound()
 Stops currently attached sound
-  </string>
-  <string name="LSLTipText_llPreloadSound">
+	</string>
+	<string name="LSLTipText_llPreloadSound">
 llPreloadSound(string sound)
 Preloads a sound on viewers within range
-  </string>
-  <string name="LSLTipText_llGetSubString">
+	</string>
+	<string name="LSLTipText_llGetSubString">
 string llGetSubString(string src, integer start, integer end)
 Returns the indicated substring
-  </string>
-  <string name="LSLTipText_llDeleteSubString">
+	</string>
+	<string name="LSLTipText_llDeleteSubString">
 string llDeleteSubString(string src, integer start, integer end)
 Removes the indicated substring and returns the result
-  </string>
-  <string name="LSLTipText_llInsertString">
+	</string>
+	<string name="LSLTipText_llInsertString">
 string llInsertString(string dst, integer position, string src)
 Returns a destination string dst with the string src inserted starting at position pos
-  </string>
-  <string name="LSLTipText_llToUpper">
+	</string>
+	<string name="LSLTipText_llToUpper">
 string llToUpper(string src)
 Returns a string that is src with all upper-case characters
-  </string>
-  <string name="LSLTipText_llToLower">
+	</string>
+	<string name="LSLTipText_llToLower">
 string llToLower(string src)
 Returns a string that is src with all lower-case characters
-  </string>
-  <string name="LSLTipText_llGiveMoney">
+	</string>
+	<string name="LSLTipText_llGiveMoney">
 llGiveMoney(key destination, integer amount)
 Transfers amount of [CURRENCY] from script owner to destination
-  </string>
-  <string name="LSLTipText_llMakeExplosion">
+	</string>
+	<string name="LSLTipText_llMakeExplosion">
 llMakeExplosion(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
 Makes a round explosion of particles
-  </string>
-  <string name="LSLTipText_llMakeFountain">
+	</string>
+	<string name="LSLTipText_llMakeFountain">
 llMakeFountain(integer particles, float scale, float vel, float lifetime, float arc, integer bounce, string texture, vector offset, float bounce_offset)
 Makes a fountain of particles
-  </string>
-  <string name="LSLTipText_llMakeSmoke">
+	</string>
+	<string name="LSLTipText_llMakeSmoke">
 llMakeSmoke(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
 Makes smoke like particles
-  </string>
-  <string name="LSLTipText_llMakeFire">
+	</string>
+	<string name="LSLTipText_llMakeFire">
 llMakeFire(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
 Makes fire like particles
-  </string>
-  <string name="LSLTipText_llRezObject">
+	</string>
+	<string name="LSLTipText_llRezObject">
 llRezObject(string inventory, vector pos, vector vel, rotation rot, integer param)
 Instantiates owner&apos;s inventory object at pos with velocity vel and rotation rot with start parameter param
-  </string>
-  <string name="LSLTipText_llLookAt">
+	</string>
+	<string name="LSLTipText_llLookAt">
 llLookAt(vector target, float strength, float damping)
 Causes object to point its up axis (positive z) towards target, while keeping its forward axis (positive x) below the horizon
-  </string>
-  <string name="LSLTipText_llStopLookAt">
+	</string>
+	<string name="LSLTipText_llStopLookAt">
 llStopLookAt()
 Stops causing object to point at a target
-  </string>
-  <string name="LSLTipText_llSetTimerEvent">
+	</string>
+	<string name="LSLTipText_llSetTimerEvent">
 llSetTimerEvent(float sec)
 Causes the timer event to be triggered a maximum of once every sec seconds
-  </string>
-  <string name="LSLTipText_llSleep">
+	</string>
+	<string name="LSLTipText_llSleep">
 llSleep(float sec)
 Puts the script to sleep for sec seconds
-  </string>
-  <string name="LSLTipText_llGetMass">
+	</string>
+	<string name="LSLTipText_llGetMass">
 float llGetMass()
 Returns the mass of object that the script is attached to
-  </string>
-  <string name="LSLTipText_llCollisionFilter">
+	</string>
+	<string name="LSLTipText_llCollisionFilter">
 llCollisionFilter(string name, key id, integer accept)
 Sets the collision filter, exclusively or inclusively. If accept == TRUE, only accept collisions with objects name and id (either is optional), otherwise with objects not name or id
-  </string>
-  <string name="LSLTipText_llTakeControls">
+	</string>
+	<string name="LSLTipText_llTakeControls">
 llTakeControls(integer controls, integer accept, integer pass_on)
 Allows for intercepting keyboard and mouse clicks from the agent the script has permissions for
-  </string>
-  <string name="LSLTipText_llReleaseControls">
+	</string>
+	<string name="LSLTipText_llReleaseControls">
 llReleaseControls()
 Stops taking inputs that were taken with llTakeControls
-  </string>
-  <string name="LSLTipText_llAttachToAvatar">
+	</string>
+	<string name="LSLTipText_llAttachToAvatar">
 llAttachToAvatar(integer attach_point)
 Attaches the object to the avatar who has granted permission to the script
-  </string>
-  <string name="LSLTipText_llDetachFromAvatar">
+	</string>
+	<string name="LSLTipText_llDetachFromAvatar">
 llDetachFromAvatar()
 Detaches object from avatar
-  </string>
-  <string name="LSLTipText_llTakeCamera">
+	</string>
+	<string name="LSLTipText_llTakeCamera">
 llTakeCamera(key avatar)
 Moves avatar&apos;s viewpoint to task
-  </string>
-  <string name="LSLTipText_llReleaseCamera">
+	</string>
+	<string name="LSLTipText_llReleaseCamera">
 llReleaseCamera(key avatar)
 Returns camera to agent avatar
-  </string>
-  <string name="LSLTipText_llGetOwner">
+	</string>
+	<string name="LSLTipText_llGetOwner">
 key llGetOwner()
 Returns the object owner&apos;s UUID
-  </string>
-  <string name="LSLTipText_llInstantMessage">
+	</string>
+	<string name="LSLTipText_llInstantMessage">
 llInstantMessage(key user, string message)
 Sends the specified string as an Instant Message to the user
-  </string>
+	</string>
   <string name="LSLTipText_llEmail">
 llEmail(string address, string subject, string message)
 Sends an email to address with the subject and message
   </string>
-  <string name="LSLTipText_llGetNextEmail">
+	<string name="LSLTipText_llGetNextEmail">
 llGetNextEmail(string address, string subject)
 Gets the next waiting email that comes from address, with specified subject
-  </string>
-  <string name="LSLTipText_llGetKey">
+	</string>
+	<string name="LSLTipText_llGetKey">
 key llGetKey()
 Returns the key of the prim the script is attached to
-  </string>
-  <string name="LSLTipText_llSetBuoyancy">
+	</string>
+	<string name="LSLTipText_llSetBuoyancy">
 llSetBuoyancy(float buoyancy)
 Sets the buoyancy of the task or object (0 is disabled, &lt; 1.0 sinks, 1.0 floats, &gt; 1.0 rises)
-  </string>
-  <string name="LSLTipText_llSetHoverHeight">
+	</string>
+	<string name="LSLTipText_llSetHoverHeight">
 llSetHoverHeight(float height, integer water, float tau)
 Critically damps to a height above the ground (or water) in tau seconds
-  </string>
-  <string name="LSLTipText_llStopHover">
+	</string>
+	<string name="LSLTipText_llStopHover">
 llStopHover()
 Stops hovering to a height
-  </string>
-  <string name="LSLTipText_llMinEventDelay">
+	</string>
+	<string name="LSLTipText_llMinEventDelay">
 llMinEventDelay(float delay)
 Sets the minimum time between events being handled
-  </string>
-  <string name="LSLTipText_llSoundPreload">
+	</string>
+	<string name="LSLTipText_llSoundPreload">
 llSoundPreload(string sound)
 Preloads a sound on viewers within range
-  </string>
-  <string name="LSLTipText_llRotLookAt">
+	</string>
+	<string name="LSLTipText_llRotLookAt">
 llRotLookAt(rotation target, float strength, float damping)
 Causes object to point its forward axis towards target
-  </string>
-  <string name="LSLTipText_llStringLength">
+	</string>
+	<string name="LSLTipText_llStringLength">
 integer llStringLength(string str)
 Returns the length of string
-  </string>
-  <string name="LSLTipText_llStartAnimation">
+	</string>
+	<string name="LSLTipText_llStartAnimation">
 llStartAnimation(string anim)
 Starts animation anim for agent that granted PERMISSION_TRIGGER_ANIMATION if the permission has not been revoked
-  </string>
-  <string name="LSLTipText_llStopAnimation">
+	</string>
+	<string name="LSLTipText_llStopAnimation">
 llStopAnimation(string anim)
 Stops animation anim for agent that granted permission
-  </string>
-  <string name="LSLTipText_llPointAt">
+	</string>
+	<string name="LSLTipText_llPointAt">
 llPointAt(vector pos)
 Makes agent that owns object point at pos
-  </string>
-  <string name="LSLTipText_llStopPointAt">
+	</string>
+	<string name="LSLTipText_llStopPointAt">
 llStopPointAt()
 Stops pointing agent that owns object
-  </string>
-  <string name="LSLTipText_llTargetOmega">
+	</string>
+	<string name="LSLTipText_llTargetOmega">
 llTargetOmega(vector axis, float spinrate, float gain)
 Rotates the object around axis at spinrate with strength gain
-  </string>
-  <string name="LSLTipText_llGetStartParameter">
+	</string>
+	<string name="LSLTipText_llGetStartParameter">
 integer llGetStartParameter()
 Returns an integer that is the script start/rez parameter
-  </string>
-  <string name="LSLTipText_llGodLikeRezObject">
+	</string>
+	<string name="LSLTipText_llGodLikeRezObject">
 llGodLikeRezObject(key inventory, vector pos)
 Rezzes directly off of UUID if owner is in God Mode
-  </string>
-  <string name="LSLTipText_llRequestPermissions">
+	</string>
+	<string name="LSLTipText_llRequestPermissions">
 llRequestPermissions(key agent, integer perm)
 Asks the agent for permission to run certain classes of functions
-  </string>
-  <string name="LSLTipText_llGetPermissionsKey">
+	</string>
+	<string name="LSLTipText_llGetPermissionsKey">
 key llGetPermissionsKey()
 Returns the key of the avatar that last granted permissions to the script
-  </string>
-  <string name="LSLTipText_llGetPermissions">
+	</string>
+	<string name="LSLTipText_llGetPermissions">
 integer llGetPermissions()
 Returns an integer bitfield with the permissions that have been granted
-  </string>
-  <string name="LSLTipText_llGetLinkNumber">
+	</string>
+	<string name="LSLTipText_llGetLinkNumber">
 integer llGetLinkNumber()
 Returns the link number of the prim containing the script (0 means not linked, 1 the prim is the root, 2 the prim is the first child, etc)
-  </string>
-  <string name="LSLTipText_llSetLinkColor">
+	</string>
+	<string name="LSLTipText_llSetLinkColor">
 llSetLinkColor(integer linknumber, vector color, integer face)
 Sets face to color if a task exists in the link chain at linknumber
-  </string>
-  <string name="LSLTipText_llCreateLink">
+	</string>
+	<string name="LSLTipText_llCreateLink">
 llCreateLink(key target, integer parent)
 Attempts to link the script&apos;s object with the target (requires that PERMISSION_CHANGE_LINKS be granted). If parent == TRUE, then the script&apos;s object becomes the root
-  </string>
-  <string name="LSLTipText_llBreakLink">
+	</string>
+	<string name="LSLTipText_llBreakLink">
 llBreakLink(integer linknum)
 Delinks the prim with the given link number in a linked object set (requires that PERMISSION_CHANGE_LINKS be granted)
-  </string>
-  <string name="LSLTipText_llBreakAllLinks">
+	</string>
+	<string name="LSLTipText_llBreakAllLinks">
 llBreakAllLinks()
 Delinks all prims in the link set (requires that PERMISSION_CHANGE_LINKS be granted)
-  </string>
-  <string name="LSLTipText_llGetLinkKey">
+	</string>
+	<string name="LSLTipText_llGetLinkKey">
 key llGetLinkKey(integer linknumber)
 Returns the key of the linked prim linknumber
-  </string>
-  <string name="LSLTipText_llGetLinkName">
+	</string>
+	<string name="LSLTipText_llGetLinkName">
 string llGetLinkName(integer linknumber)
 Returns the name of linknumber in a link set
-  </string>
-  <string name="LSLTipText_llGetInventoryNumber">
+	</string>
+	<string name="LSLTipText_llGetInventoryNumber">
 integer llGetInventoryNumber(integer type)
 Returns the number of items of a given type (INVENTORY_* flag) in the prim&apos;s inventory
-  </string>
-  <string name="LSLTipText_llGetInventoryName">
+	</string>
+	<string name="LSLTipText_llGetInventoryName">
 string llGetInventoryName(integer type, integer number)
 Returns the name of the inventory item number of a given type
-  </string>
-  <string name="LSLTipText_llSetScriptState">
+	</string>
+	<string name="LSLTipText_llSetScriptState">
 llSetScriptState(string name, integer run)
 Sets the running state of the specified script
-  </string>
-  <string name="LSLTipText_llGetEnergy">
+	</string>
+	<string name="LSLTipText_llGetEnergy">
 float llGetEnergy()
 Returns how much energy is in the object as a percentage of maximum
-  </string>
-  <string name="LSLTipText_llGiveInventory">
+	</string>
+	<string name="LSLTipText_llGiveInventory">
 llGiveInventory(key destination, string inventory)
 Gives inventory to destination
-  </string>
-  <string name="LSLTipText_llRemoveInventory">
+	</string>
+	<string name="LSLTipText_llRemoveInventory">
 llRemoveInventory(string item)
 Removes the named inventory item
-  </string>
-  <string name="LSLTipText_llSetText">
+	</string>
+	<string name="LSLTipText_llSetText">
 llSetText(string text, vector color, float alpha)
 Displays text that hovers over the prim with specific color and translucency specified with alpha
-  </string>
-  <string name="LSLTipText_llWater">
+	</string>
+	<string name="LSLTipText_llWater">
 float llWater(vector offset)
 Returns the water height below the object position + offset
-  </string>
-  <string name="LSLTipText_llPassTouches">
+	</string>
+	<string name="LSLTipText_llPassTouches">
 llPassTouches(integer pass)
 If pass == TRUE, touches are passed from children on to parents
-  </string>
-  <string name="LSLTipText_llRequestAgentData">
+	</string>
+	<string name="LSLTipText_llRequestAgentData">
 key llRequestAgentData(key id, integer data)
 Requests data about agent id. When data is available the dataserver event will be raised.
-  </string>
-  <string name="LSLTipText_llRequestInventoryData">
+	</string>
+	<string name="LSLTipText_llRequestInventoryData">
 key llRequestInventoryData(string name)
 Requests data from object&apos;s inventory object. When data is available the dataserver event will be raised.
-  </string>
-  <string name="LSLTipText_llSetDamage">
+	</string>
+	<string name="LSLTipText_llSetDamage">
 llSetDamage(float damage)
 Sets the amount of damage that will be done when this object hits an avatar.
-  </string>
-  <string name="LSLTipText_llTeleportAgentHome">
+	</string>
+	<string name="LSLTipText_llTeleportAgentHome">
 llTeleportAgentHome(key id)
 Teleports avatar on the owner&apos;s land to their home location without any warning
-  </string>
-  <string name="LSLTipText_llModifyLand">
+	</string>
+	<string name="LSLTipText_llModifyLand">
 llModifyLand(integer action, integer brush)
 Modifies land using the specified action on the specified brush size of land
-  </string>
-  <string name="LSLTipText_llCollisionSound">
+	</string>
+	<string name="LSLTipText_llCollisionSound">
 llCollisionSound(string impact_sound, float impact_volume)
 Suppresses default collision sounds, replaces default impact sounds with impact_sound at the volume impact_volume
-  </string>
-  <string name="LSLTipText_llCollisionSprite">
+	</string>
+	<string name="LSLTipText_llCollisionSprite">
 llCollisionSprite(string impact_sprite)
 Suppresses default collision sprites, replaces default impact sprite with impact_sprite (use an empty string to just suppress)
-  </string>
-  <string name="LSLTipText_llGetAnimation">
+	</string>
+	<string name="LSLTipText_llGetAnimation">
 string llGetAnimation(key id)
 Returns the name of the currently playing locomotion animation for avatar id
-  </string>
-  <string name="LSLTipText_llResetScript">
+	</string>
+	<string name="LSLTipText_llResetScript">
 llResetScript()
 Resets the script
-  </string>
-  <string name="LSLTipText_llMessageLinked">
+	</string>
+	<string name="LSLTipText_llMessageLinked">
 llMessageLinked(integer linknum, integer num, string str, key id)
 Allows scripts in the same object to communicate. Triggers a link_message event with the same parameters num, str, and id in all scripts in the prim(s) described by linknum.
-  </string>
-  <string name="LSLTipText_llPushObject">
+	</string>
+	<string name="LSLTipText_llPushObject">
 llPushObject(key id, vector impulse, vector ang_impulse, integer local)
 Applies impulse and ang_impulse to object id
-  </string>
-  <string name="LSLTipText_llPassCollisions">
+	</string>
+	<string name="LSLTipText_llPassCollisions">
 llPassCollisions(integer pass)
 If pass == TRUE, collisions are passed from children on to parents (default is FALSE)
-  </string>
-  <string name="LSLTipText_llGetScriptName">
+	</string>
+	<string name="LSLTipText_llGetScriptName">
 string llGetScriptName()
 Returns the name of the script that this function is used in
-  </string>
-  <string name="LSLTipText_llGetNumberOfSides">
+	</string>
+	<string name="LSLTipText_llGetNumberOfSides">
 integer llGetNumberOfSides()
 Returns the number of faces (or sides) of the prim
-  </string>
-  <string name="LSLTipText_llAxisAngle2Rot">
+	</string>
+	<string name="LSLTipText_llAxisAngle2Rot">
 rotation llAxisAngle2Rot(vector axis, float angle)
 Returns the rotation that is a generated angle about axis
-  </string>
-  <string name="LSLTipText_llRot2Axis">
+	</string>
+	<string name="LSLTipText_llRot2Axis">
 vector llRot2Axis(rotation rot)
 Returns the rotation axis represented by rot
-  </string>
-  <string name="LSLTipText_llRot2Angle">
+	</string>
+	<string name="LSLTipText_llRot2Angle">
 float llRot2Angle(rotation rot)
 Returns the rotation angle represented by rot
-  </string>
-  <string name="LSLTipText_llAcos">
+	</string>
+	<string name="LSLTipText_llAcos">
 float llAcos(float val)
 Returns the arccosine in radians of val
-  </string>
-  <string name="LSLTipText_llAsin">
+	</string>
+	<string name="LSLTipText_llAsin">
 float llAsin(float val)
 Returns the arcsine in radians of val
-  </string>
-  <string name="LSLTipText_llAngleBetween">
+	</string>
+	<string name="LSLTipText_llAngleBetween">
 float llAngleBetween(rotation a, rotation b)
 Returns angle between rotation a and b
-  </string>
-  <string name="LSLTipText_llGetInventoryKey">
+	</string>
+	<string name="LSLTipText_llGetInventoryKey">
 key llGetInventoryKey(string name)
 Returns the key that is the UUID of the inventory name
-  </string>
-  <string name="LSLTipText_llAllowInventoryDrop">
+	</string>
+	<string name="LSLTipText_llAllowInventoryDrop">
 llAllowInventoryDrop(integer add)
 If add == TRUE, users without modify permissions can still drop inventory items onto a prim
-  </string>
-  <string name="LSLTipText_llGetSunDirection">
+	</string>
+	<string name="LSLTipText_llGetSunDirection">
 vector llGetSunDirection()
 Returns a normalized vector of the direction of the sun in the region
-  </string>
-  <string name="LSLTipText_llGetTextureOffset">
+	</string>
+	<string name="LSLTipText_llGetTextureOffset">
 vector llGetTextureOffset(integer face)
 Returns the texture offset of face in the x and y components of a vector
-  </string>
-  <string name="LSLTipText_llGetTextureScale">
+	</string>
+	<string name="LSLTipText_llGetTextureScale">
 vector llGetTextureScale(integer side)
 Returns the texture scale of side in the x and y components of a vector
-  </string>
-  <string name="LSLTipText_llGetTextureRot">
+	</string>
+	<string name="LSLTipText_llGetTextureRot">
 float llGetTextureRot(integer side)
 Returns the texture rotation of side
-  </string>
-  <string name="LSLTipText_llSubStringIndex">
+	</string>
+	<string name="LSLTipText_llSubStringIndex">
 integer llSubStringIndex(string source, string pattern)
 Returns an integer that is the index in source where pattern first appears.
 (Returns -1 if not found)
-  </string>
-  <string name="LSLTipText_llGetOwnerKey">
+	</string>
+	<string name="LSLTipText_llGetOwnerKey">
 key llGetOwnerKey(key id)
 Returns the owner of object id
-  </string>
-  <string name="LSLTipText_llGetCenterOfMass">
+	</string>
+	<string name="LSLTipText_llGetCenterOfMass">
 vector llGetCenterOfMass()
 Returns the prim&apos;s center of mass (unless called from the root prim, where it returns the object&apos;s center of mass)
-  </string>
-  <string name="LSLTipText_llListSort">
+	</string>
+	<string name="LSLTipText_llListSort">
 list llListSort(list src, integer stride, integer ascending)
 Sorts the list into blocks of stride, in ascending order if ascending == TRUE.
 The sort order is affected by type.
-  </string>
-  <string name="LSLTipText_llGetListLength">
+	</string>
+	<string name="LSLTipText_llGetListLength">
 integer llGetListLength(list src)
 Returns the number of elements in the list
-  </string>
-  <string name="LSLTipText_llList2Integer">
+	</string>
+	<string name="LSLTipText_llList2Integer">
 integer llList2Integer(list src, integer index)
 Copies the integer at index in the list
-  </string>
-  <string name="LSLTipText_llList2Float">
+	</string>
+	<string name="LSLTipText_llList2Float">
 float llList2Float(list src, integer index)
 Copies the float at index in the list
-  </string>
-  <string name="LSLTipText_llList2String">
+	</string>
+	<string name="LSLTipText_llList2String">
 string llList2String(list src, integer index)
 Copies the string at index in the list
-  </string>
-  <string name="LSLTipText_llList2Key">
+	</string>
+	<string name="LSLTipText_llList2Key">
 key llList2Key(list src, integer index)
 Copies the key at index in the list
-  </string>
-  <string name="LSLTipText_llList2Vector">
+	</string>
+	<string name="LSLTipText_llList2Vector">
 vector llList2Vector(list src, integer index)
 Copies the vector at index in the list
-  </string>
-  <string name="LSLTipText_llList2Rot">
+	</string>
+	<string name="LSLTipText_llList2Rot">
 rotation llList2Rot(list src, integer index)
 Copies the rotation at index in the list
-  </string>
-  <string name="LSLTipText_llList2List">
+	</string>
+	<string name="LSLTipText_llList2List">
 list llList2List(list src, integer start, integer end)
 Copies the slice of the list from start to end
-  </string>
-  <string name="LSLTipText_llDeleteSubList">
+	</string>
+	<string name="LSLTipText_llDeleteSubList">
 list llDeleteSubList(list src, integer start, integer end)
 Removes the slice from start to end and returns the remainder of the list
-  </string>
-  <string name="LSLTipText_llGetListEntryType">
+	</string>
+	<string name="LSLTipText_llGetListEntryType">
 integer llGetListEntryType(list src, integer index)
 Returns the type of the index entry in the list
 (TYPE_INTEGER, TYPE_FLOAT, TYPE_STRING, TYPE_KEY, TYPE_VECTOR, TYPE_ROTATION, or TYPE_INVALID if index is off list)
-  </string>
-  <string name="LSLTipText_llList2CSV">
+	</string>
+	<string name="LSLTipText_llList2CSV">
 string llList2CSV(list src)
 Creates a string of comma separated values from list
-  </string>
-  <string name="LSLTipText_llCSV2List">
+	</string>
+	<string name="LSLTipText_llCSV2List">
 list llCSV2List(string src)
 Creates a list from a string of comma separated values
-  </string>
-  <string name="LSLTipText_llListRandomize">
+	</string>
+	<string name="LSLTipText_llListRandomize">
 list llListRandomize(list src, integer stride)
 Returns a randomized list of blocks of size stride
-  </string>
-  <string name="LSLTipText_llList2ListStrided">
+	</string>
+	<string name="LSLTipText_llList2ListStrided">
 list llList2ListStrided(list src, integer start, integer end, integer stride)
 Copies the strided slice of the list from start to end
-  </string>
-  <string name="LSLTipText_llGetRegionCorner">
+	</string>
+	<string name="LSLTipText_llGetRegionCorner">
 vector llGetRegionCorner()
 Returns a vector in meters that is the global location of the south-west corner of the region which the object is in
-  </string>
-  <string name="LSLTipText_llListInsertList">
+	</string>
+	<string name="LSLTipText_llListInsertList">
 list llListInsertList(list dest, list src, integer start)
 Returns a list that contains all the elements from dest but with the elements from src inserted at position start
-  </string>
-  <string name="LSLTipText_llListFindList">
+	</string>
+	<string name="LSLTipText_llListFindList">
 integer llListFindList(list src, list test)
 Returns the index of the first instance of test in src.
 (Returns -1 if not found)
-  </string>
-  <string name="LSLTipText_llGetObjectName">
+	</string>
+	<string name="LSLTipText_llGetObjectName">
 string llGetObjectName()
 Returns the name of the prim which the script is attached to
-  </string>
-  <string name="LSLTipText_llSetObjectName">
+	</string>
+	<string name="LSLTipText_llSetObjectName">
 llSetObjectName(string name)
 Sets the prim&apos;s name to the name parameter
-  </string>
-  <string name="LSLTipText_llGetDate">
+	</string>
+	<string name="LSLTipText_llGetDate">
 string llGetDate()
 Returns the current date in the UTC time zone in the format YYYY-MM-DD
-  </string>
-  <string name="LSLTipText_llEdgeOfWorld">
+	</string>
+	<string name="LSLTipText_llEdgeOfWorld">
 integer llEdgeOfWorld(vector pos, vector dir)
 Checks to see whether the border hit by dir from pos is the edge of the world (has no neighboring region)
-  </string>
-  <string name="LSLTipText_llGetAgentInfo">
+	</string>
+	<string name="LSLTipText_llGetAgentInfo">
 integer llGetAgentInfo(key id)
 Returns an integer bitfield containing the agent information about id.
 Returns AGENT_FLYING, AGENT_ATTACHMENTS, AGENT_SCRIPTED, AGENT_SITTING, AGENT_ON_OBJECT, AGENT_MOUSELOOK, AGENT_AWAY, AGENT_BUSY, AGENT_TYPING, AGENT_CROUCHING, AGENT_ALWAYS_RUN, AGENT_WALKING and/or AGENT_IN_AIR.
-  </string>
-  <string name="LSLTipText_llAdjustSoundVolume">
+	</string>
+	<string name="LSLTipText_llAdjustSoundVolume">
 llAdjustSoundVolume(float volume)
 Adjusts volume of attached sound (0.0 - 1.0)
-  </string>
-  <string name="LSLTipText_llSetSoundQueueing">
+	</string>
+	<string name="LSLTipText_llSetSoundQueueing">
 llSetSoundQueueing(integer queue)
 Sets whether attached sounds wait for the current sound to finish (If queue == TRUE then queuing is enabled, if FALSE queuing is disabled [default])
-  </string>
-  <string name="LSLTipText_llSetSoundRadius">
+	</string>
+	<string name="LSLTipText_llSetSoundRadius">
 llSetSoundRadius(float radius)
 Establishes a hard cut-off radius for audibility of scripted sounds (both attached and triggered)
-  </string>
-  <string name="LSLTipText_llKey2Name">
+	</string>
+	<string name="LSLTipText_llKey2Name">
 string llKey2Name(key id)
 Returns the name of the prim or avatar specified by id.
 (The id must be a valid rezzed prim or avatar key in the current simulator, otherwise an empty string is returned.)
-  </string>
-  <string name="LSLTipText_llSetTextureAnim">
+	</string>
+	<string name="LSLTipText_llSetTextureAnim">
 llSetTextureAnim(integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate)
 Animates the texture on the specified face/faces
-  </string>
-  <string name="LSLTipText_llTriggerSoundLimited">
+	</string>
+	<string name="LSLTipText_llTriggerSoundLimited">
 llTriggerSoundLimited(string sound, float volume, vector top_north_east, vector bottom_south_west)
 Plays sound at volume (0.0 - 1.0), centered at but not attached to object, limited to the box defined by vectors top_north_east and bottom_south_west
-  </string>
-  <string name="LSLTipText_llEjectFromLand">
+	</string>
+	<string name="LSLTipText_llEjectFromLand">
 llEjectFromLand(key avatar)
 Ejects avatar from the parcel
-  </string>
-  <string name="LSLTipText_llParseString2List">
+	</string>
+	<string name="LSLTipText_llParseString2List">
 list llParseString2List(string src, list separators, list spacers)
 Breaks src into a list, discarding separators, keeping spacers
 (separators and spacers must be lists of strings, maximum of 8 each)
-  </string>
-  <string name="LSLTipText_llOverMyLand">
+	</string>
+	<string name="LSLTipText_llOverMyLand">
 integer llOverMyLand(key id)
 Returns TRUE if id is over land owned by the script owner, otherwise FALSE
-  </string>
-  <string name="LSLTipText_llGetLandOwnerAt">
+	</string>
+	<string name="LSLTipText_llGetLandOwnerAt">
 key llGetLandOwnerAt(vector pos)
 Returns the key of the land owner, returns NULL_KEY if public
-  </string>
-  <string name="LSLTipText_llGetNotecardLine">
+	</string>
+	<string name="LSLTipText_llGetNotecardLine">
 key llGetNotecardLine(string name, integer line)
 Returns line line of notecard name via the dataserver event
-  </string>
-  <string name="LSLTipText_llGetAgentSize">
+	</string>
+	<string name="LSLTipText_llGetAgentSize">
 vector llGetAgentSize(key id)
 If the avatar is in the same region, returns the size of the bounding box of the requested avatar by id, otherwise returns ZERO_VECTOR
-  </string>
-  <string name="LSLTipText_llSameGroup">
+	</string>
+	<string name="LSLTipText_llSameGroup">
 integer llSameGroup(key id)
 Returns TRUE if avatar id is in the same region and has the same active group, otherwise FALSE
-  </string>
-  <string name="LSLTipText_llUnSit">
+	</string>
+	<string name="LSLTipText_llUnSit">
 key llUnSit(key id)
 If avatar identified by id is sitting on the object the script is attached to or is over land owned by the object&apos;s owner, the avatar is forced to stand up
-  </string>
-  <string name="LSLTipText_llGroundSlope">
+	</string>
+	<string name="LSLTipText_llGroundSlope">
 vector llGroundSlope(vector offset)
 Returns the ground slope below the object position + offset
-  </string>
-  <string name="LSLTipText_llGroundNormal">
+	</string>
+	<string name="LSLTipText_llGroundNormal">
 vector llGroundNormal(vector offset)
 Returns the ground normal below the object position + offset
-  </string>
-  <string name="LSLTipText_llGroundContour">
+	</string>
+	<string name="LSLTipText_llGroundContour">
 vector llGroundCountour(vector offset)
 Returns the ground contour direction below the object position + offset
-  </string>
-  <string name="LSLTipText_llGetAttached">
+	</string>
+	<string name="LSLTipText_llGetAttached">
 integer llGetAttached()
 Returns the object&apos;s attachment point, or 0 if not attached
-  </string>
-  <string name="LSLTipText_llGetFreeMemory">
+	</string>
+	<string name="LSLTipText_llGetFreeMemory">
 integer llGetFreeMemory()
 Returns the number of free bytes of memory the script can use
-  </string>
-  <string name="LSLTipText_llGetRegionName">
+	</string>
+	<string name="LSLTipText_llGetRegionName">
 string llGetRegionName()
 Returns the current region name
-  </string>
-  <string name="LSLTipText_llGetRegionTimeDilation">
+	</string>
+	<string name="LSLTipText_llGetRegionTimeDilation">
 float llGetRegionTimeDilation()
 Returns the current time dilation as a float between 0.0 (full dilation) and 1.0 (no dilation)
-  </string>
-  <string name="LSLTipText_llGetRegionFPS">
+	</string>
+	<string name="LSLTipText_llGetRegionFPS">
 float llGetRegionFPS()
 Returns the mean region frames per second
-  </string>
-  <string name="LSLTipText_llParticleSystem">
+	</string>
+	<string name="LSLTipText_llParticleSystem">
 llParticleSystem(list rules)
-Creates a particle system based on rules.  An empty list removes the particle system.
+Creates a particle system based on rules.	An empty list removes the particle system.
 List format is [ rule1, data1, rule2, data2 . . . rulen, datan ]
-  </string>
-  <string name="LSLTipText_llGroundRepel">
+	</string>
+	<string name="LSLTipText_llGroundRepel">
 llGroundRepel(float height, integer water, float tau)
 Critically damps to height if within height*0.5 of level (either above ground level, or above the higher of land and water if water == TRUE)
-  </string>
-  <string name="LSLTipText_llGiveInventoryList">
+	</string>
+	<string name="LSLTipText_llGiveInventoryList">
 llGiveInventoryList(key target, string folder, list inventory)
 Gives inventory items to target, creating a new folder to put them in
-  </string>
-  <string name="LSLTipText_llSetVehicleType">
+	</string>
+	<string name="LSLTipText_llSetVehicleType">
 llSetVehicleType(integer type)
 Sets the vehicle to one of the default types
-  </string>
-  <string name="LSLTipText_llSetVehicleFloatParam">
+	</string>
+	<string name="LSLTipText_llSetVehicleFloatParam">
 llSetVehicleFloatParam(integer param, float value)
 Sets the specified vehicle float parameter
-  </string>
-  <string name="LSLTipText_llSetVehicleVectorParam">
+	</string>
+	<string name="LSLTipText_llSetVehicleVectorParam">
 llSetVehicleVectorParam(integer param, vector vec)
 Sets the specified vehicle vector parameter
-  </string>
-  <string name="LSLTipText_llSetVehicleRotationParam">
+	</string>
+	<string name="LSLTipText_llSetVehicleRotationParam">
 llSetVehicleVectorParam(integer param, rotation rot)
 Sets the specified vehicle rotation parameter
-  </string>
-  <string name="LSLTipText_llSetVehicleFlags">
+	</string>
+	<string name="LSLTipText_llSetVehicleFlags">
 llSetVehicleFlags(integer flags)
 Sets the enabled bits in &apos;flags&apos;
-  </string>
-  <string name="LSLTipText_llRemoveVehicleFlags">
+	</string>
+	<string name="LSLTipText_llRemoveVehicleFlags">
 llRemoveVehicleFlags(integer flags)
 Removes the enabled bits in &apos;flags&apos;
-  </string>
-  <string name="LSLTipText_llSitTarget">
+	</string>
+	<string name="LSLTipText_llSitTarget">
 llSitTarget(vector offset, rotation rot)
-Sets the sit location for the prim.  If offset == &lt;0,0,0&gt; then the sit target is removed.
-  </string>
-  <string name="LSLTipText_llAvatarOnSitTarget">
+Sets the sit location for the prim.	If offset == &lt;0,0,0&gt; then the sit target is removed.
+	</string>
+	<string name="LSLTipText_llAvatarOnSitTarget">
 key llAvatarOnSitTarget()
 If an avatar is seated on the sit target, returns the avatar&apos;s key, otherwise NULL_KEY
-  </string>
-  <string name="LSLTipText_llAddToLandPassList">
+	</string>
+	<string name="LSLTipText_llAddToLandPassList">
 llAddToLandPassList(key avatar, float hours)
 Adds avatar to the land pass list for hours, or indefinitely if hours is 0
-  </string>
-  <string name="LSLTipText_llSetTouchText">
+	</string>
+	<string name="LSLTipText_llSetTouchText">
 llSetTouchText(string text)
 Displays text rather than the default &apos;Touch&apos; in the pie menu
-  </string>
-  <string name="LSLTipText_llSetSitText">
+	</string>
+	<string name="LSLTipText_llSetSitText">
 llSetSitText(string text)
 Displays text rather than the default &apos;Sit Here&apos; in the pie menu
-  </string>
-  <string name="LSLTipText_llSetCameraEyeOffset">
+	</string>
+	<string name="LSLTipText_llSetCameraEyeOffset">
 llSetCameraEyeOffset(vector offset)
 Sets the camera eye offset for avatars that sit on the object
-  </string>
-  <string name="LSLTipText_llSetCameraAtOffset">
+	</string>
+	<string name="LSLTipText_llSetCameraAtOffset">
 llSetCameraAtOffset(vector offset)
 Sets the point the camera is looking at to offset for avatars that sit on the object
-  </string>
-  <string name="LSLTipText_llDumpList2String">
+	</string>
+	<string name="LSLTipText_llDumpList2String">
 string llDumpList2String(list src, string separator)
 Returns the list in a single string, using separator between the entries
-  </string>
-  <string name="LSLTipText_llScriptDanger">
+	</string>
+	<string name="LSLTipText_llScriptDanger">
 integer llScriptDanger(vector pos)
 Returns TRUE if pos is over public land, sandbox land, land that doesn&apos;t allow everyone to edit and build, or land that doesn&apos;t allow outside scripts
-  </string>
-  <string name="LSLTipText_llDialog">
+	</string>
+	<string name="LSLTipText_llDialog">
 llDialog(key avatar, string message, list buttons, integer chat_channel
 Shows a dialog box on the avatar&apos;s screen with a message and up to 12 buttons.
 If a button is pressed, the avatar says the text of the button label on chat_channel.
-  </string>
-  <string name="LSLTipText_llVolumeDetect">
+	</string>
+	<string name="LSLTipText_llVolumeDetect">
 llVolumeDetect(integer detect)
 If detect = TRUE, object works much like Phantom, but triggers collision_start and collision_end events when other objects start and stop interpenetrating.
 Must be applied to the root prim.
-  </string>
-  <string name="LSLTipText_llResetOtherScript">
+	</string>
+	<string name="LSLTipText_llResetOtherScript">
 llResetOtherScript(string name)
 Resets script name
-  </string>
-  <string name="LSLTipText_llGetScriptState">
+	</string>
+	<string name="LSLTipText_llGetScriptState">
 integer llGetScriptState(string name)
 Returns TRUE if the script name is running
-  </string>
-  <string name="LSLTipText_llRemoteLoadScript">
+	</string>
+	<string name="LSLTipText_llRemoteLoadScript">
 DEPRECATED!  Please use llRemoteLoadScriptPin instead.
-  </string>
-  <string name="LSLTipText_llSetRemoteScriptAccessPin">
+	</string>
+	<string name="LSLTipText_llSetRemoteScriptAccessPin">
 llSetRemoteScriptAccessPin(integer pin)
 If pin is set to a non-zero number, allows a prim to have scripts remotely loaded via llRemoteLoadScriptPin when it passes in the correct pin. Otherwise, llRemoteLoadScriptPin is ignored.
-  </string>
-  <string name="LSLTipText_llRemoteLoadScriptPin">
+	</string>
+	<string name="LSLTipText_llRemoteLoadScriptPin">
 llRemoteLoadScriptPin(key target, string name, integer pin, integer running, integer start_param)
 Copies script name onto target, if the owner of this scripted object can modify target and is in the same region, and the matching pin is used.
 If running == TRUE, starts the script with start_param
-  </string>
-  <string name="LSLTipText_llOpenRemoteDataChannel">
+	</string>
+	<string name="LSLTipText_llOpenRemoteDataChannel">
 llOpenRemoteDataChannel()
 Creates a channel to listen for XML-RPC calls, and will trigger a remote_data event with channel id once it is available
-  </string>
-  <string name="LSLTipText_llSendRemoteData">
+	</string>
+	<string name="LSLTipText_llSendRemoteData">
 key llSendRemoteData(key channel, string dest, integer idata, string sdata)
 Sends an XML-RPC request to dest through channel with payload of channel (in a string), integer idata and string sdata.
 Returns a key that is the message_id for the resulting remote_data events.
-  </string>
-  <string name="LSLTipText_llRemoteDataReply">
+	</string>
+	<string name="LSLTipText_llRemoteDataReply">
 llRemoteDataReply(key channel, key message_id, string sdata, integer idata)
 Sends an XML-RPC reply to message_id on channel with payload of string sdata and integer idata
-  </string>
-  <string name="LSLTipText_llCloseRemoteDataChannel">
+	</string>
+	<string name="LSLTipText_llCloseRemoteDataChannel">
 llCloseRemoteDataChannel(key channel)
 Closes XML-RPC channel
-  </string>
-  <string name="LSLTipText_llMD5String">
+	</string>
+	<string name="LSLTipText_llMD5String">
 string llMD5String(string src, integer nonce)
 Returns a string of 32 hex characters that is a RSA Data Security, Inc. MD5 Message-Digest Algorithm of src with nonce
-  </string>
-  <string name="LSLTipText_llSetPrimitiveParams">
+	</string>
+	<string name="LSLTipText_llSetPrimitiveParams">
 llSetPrimitiveParams(list rules)
 Sets the prim&apos;s parameters according to rules
-  </string>
-  <string name="LSLTipText_llStringToBase64">
+	</string>
+	<string name="LSLTipText_llStringToBase64">
 string llStringToBase64(string str)
 Converts a string to the Base64 representation of the string
-  </string>
-  <string name="LSLTipText_llBase64ToString">
+	</string>
+	<string name="LSLTipText_llBase64ToString">
 string llBase64ToString(string str)
 Converts a Base64 string to a conventional string.
 If the conversion creates any unprintable characters, they are converted to spaces.
-  </string>
-  <string name="LSLTipText_llXorBase64Strings">
+	</string>
+	<string name="LSLTipText_llXorBase64Strings">
 string llXorBase64Strings(string s1, string s2)
 DEPRECATED!  Please use llXorBase64StringsCorrect instead.
 Incorrectly performs an exclusive or on two Base64 strings and returns a Base64 string.  s2 repeats if it is shorter than s1.  Retained for backwards compatability.
-  </string>
-  <string name="LSLTipText_llRemoteDataSetRegion">
+	</string>
+	<string name="LSLTipText_llRemoteDataSetRegion">
 llRemoteDataSetRegion()
 DEPRECATED!  Please use llOpenRemoteDataChannel instead.
 If an object using remote data channels changes regions, you must call this function to reregister the remote data channels. This call is not needed if the prim does not change regions.
-  </string>
-  <string name="LSLTipText_llLog10">
+	</string>
+	<string name="LSLTipText_llLog10">
 float llLog10(float val)
 Returns the base 10 logarithm of val.  Returns zero if val &lt;= 0.
-  </string>
-  <string name="LSLTipText_llLog">
+	</string>
+	<string name="LSLTipText_llLog">
 float llLog(float val)
 Returns the natural logarithm of val.  Returns zero if val &lt;= 0.
-  </string>
-  <string name="LSLTipText_llGetAnimationList">
+	</string>
+	<string name="LSLTipText_llGetAnimationList">
 list llGetAnimationList(key id)
 Returns a list of keys of playing animations for avatar described by id
-  </string>
-  <string name="LSLTipText_llSetParcelMusicURL">
+	</string>
+	<string name="LSLTipText_llSetParcelMusicURL">
 llSetParcelMusicURL(string url)
 Sets the streaming audio URL for the parcel which the object is on
-  </string>
-  <string name="LSLTipText_llGetRootPosition">
+	</string>
+	<string name="LSLTipText_llGetRootPosition">
 vector llGetRootPosition()
 Returns the position (in region coordinates) of the root prim of the object which the script is attached to
-  </string>
-  <string name="LSLTipText_llGetRootRotation">
+	</string>
+	<string name="LSLTipText_llGetRootRotation">
 rotation llGetRootRotation()
 Returns the rotation (relative to the region) of the root prim of the object which the script is attached to
-  </string>
-  <string name="LSLTipText_llGetObjectDesc">
+	</string>
+	<string name="LSLTipText_llGetObjectDesc">
 string llGetObjectDesc()
 Returns the description of the prim the script is attached to
-  </string>
-  <string name="LSLTipText_llSetObjectDesc">
+	</string>
+	<string name="LSLTipText_llSetObjectDesc">
 llSetObjectDesc(string name)
 Sets the prim&apos;s description
-  </string>
-  <string name="LSLTipText_llGetCreator">
+	</string>
+	<string name="LSLTipText_llGetCreator">
 key llGetCreator()
 Returns a key for the creator of the prim
-  </string>
-  <string name="LSLTipText_llGetTimestamp">
+	</string>
+	<string name="LSLTipText_llGetTimestamp">
 string llGetTimestamp()
 Returns the timestamp in the UTC time zone in the format: YYYY-MM-DDThh:mm:ss.ff..fZ
-  </string>
-  <string name="LSLTipText_llSetLinkAlpha">
+	</string>
+	<string name="LSLTipText_llSetLinkAlpha">
 llSetLinkAlpha(integer linknumber, float alpha, integer face)
 If a prim exists in the link chain at linknumber, sets face to alpha
-  </string>
-  <string name="LSLTipText_llGetNumberOfPrims">
+	</string>
+	<string name="LSLTipText_llGetNumberOfPrims">
 integer llGetNumberOfPrims()
 Returns the number of prims in a link set the script is attached to
-  </string>
-  <string name="LSLTipText_llGetNumberOfNotecardLines">
+	</string>
+	<string name="LSLTipText_llGetNumberOfNotecardLines">
 key llGetNumberOfNotecardLines(string name)
 Returns number of lines in notecard name via the dataserver event (cast return value to integer)
-  </string>
-  <string name="LSLTipText_llGetBoundingBox">
+	</string>
+	<string name="LSLTipText_llGetBoundingBox">
 list llGetBoundingBox(key object)
 Returns the bounding box around the object (including any linked prims) relative to its root prim, in a list in the format [ (vector) min_corner, (vector) max_corner ]
-  </string>
-  <string name="LSLTipText_llGetGeometricCenter">
+	</string>
+	<string name="LSLTipText_llGetGeometricCenter">
 vector llGetGeometricCenter()
 Returns the geometric center of the linked set the script is attached to.
-  </string>
-  <string name="LSLTipText_llGetPrimitiveParams">
+	</string>
+	<string name="LSLTipText_llGetPrimitiveParams">
 list llGetPrimitiveParams(list params)
 Returns the primitive parameters specified in the params list.
-  </string>
-  <string name="LSLTipText_llIntegerToBase64">
+	</string>
+	<string name="LSLTipText_llIntegerToBase64">
 string llIntegerToBase64(integer number)
 Returns a string that is a Base64 big endian encode of number
-  </string>
-  <string name="LSLTipText_llBase64ToInteger">
+	</string>
+	<string name="LSLTipText_llBase64ToInteger">
 integer llBase64ToInteger(string str)
 Returns an integer that is the str Base64 decoded as a big endian integer
-  </string>
-  <string name="LSLTipText_llGetGMTclock">
+	</string>
+	<string name="LSLTipText_llGetGMTclock">
 float llGetGMTclock()
 Returns the time in seconds since midnight GMT
-  </string>
-  <string name="LSLTipText_llGetSimulatorHostname">
+	</string>
+	<string name="LSLTipText_llGetSimulatorHostname">
 string llGetSimulatorHostname()
 Returns the hostname of the machine which the script is running on (same as string in viewer Help dialog)
-  </string>
-  <string name="LSLTipText_llSetLocalRot">
+	</string>
+	<string name="LSLTipText_llSetLocalRot">
 llSetLocalRot(rotation rot)
 Sets the rotation of a child prim relative to the root prim
-  </string>
-  <string name="LSLTipText_llParseStringKeepNulls">
+	</string>
+	<string name="LSLTipText_llParseStringKeepNulls">
 list llParseStringKeepNulls(string src, list separators, list spacers)
 Breaks src into a list, discarding separators, keeping spacers, keeping any null values generated.
 (separators and spacers must be lists of strings, maximum of 8 each)
-  </string>
-  <string name="LSLTipText_llRezAtRoot">
+	</string>
+	<string name="LSLTipText_llRezAtRoot">
 llRezAtRoot(string inventory, vector pos, vector vel, rotation rot, integer param)
 Instantiates owner&apos;s inventory object rotated to rot with its root at pos, moving at vel, using param as the start parameter
-  </string>
-  <string name="LSLTipText_llGetObjectPermMask">
+	</string>
+	<string name="LSLTipText_llGetObjectPermMask">
 integer llGetObjectPermMask(integer mask)
 Returns the requested permission mask for the root object the task is attached to
-  </string>
-  <string name="LSLTipText_llSetObjectPermMask">
+	</string>
+	<string name="LSLTipText_llSetObjectPermMask">
 llSetObjectPermMask(integer mask, integer value)
 Sets the given permission mask to the new value on the root object the task is attached to (requires God Mode)
-  </string>
-  <string name="LSLTipText_llGetInventoryPermMask">
+	</string>
+	<string name="LSLTipText_llGetInventoryPermMask">
 integer llGetInventoryPermMask(string item, integer mask)
 Returns the requested permission mask for the inventory item
-  </string>
-  <string name="LSLTipText_llSetInventoryPermMask">
+	</string>
+	<string name="LSLTipText_llSetInventoryPermMask">
 llSetInventoryPermMask(string item, integer mask, integer value)
 Sets the given permission mask to the new value on the inventory item (requires God Mode)
-  </string>
-  <string name="LSLTipText_llGetInventoryCreator">
+	</string>
+	<string name="LSLTipText_llGetInventoryCreator">
 key llGetInventoryCreator(string item)
 Returns a key for the creator of the inventory item
-  </string>
-  <string name="LSLTipText_llOwnerSay">
+	</string>
+	<string name="LSLTipText_llOwnerSay">
 llOwnerSay(string msg)
 Says msg to owner only.  (Owner must be in the same region.)
-  </string>
-  <string name="LSLTipText_llRequestSimulatorData">
+	</string>
+	<string name="LSLTipText_llRequestSimulatorData">
 key llRequestSimulatorData(string simulator, integer data)
 Requests data about simulator.  When data is available the dataserver event will be raised.
-  </string>
-  <string name="LSLTipText_llForceMouselook">
+	</string>
+	<string name="LSLTipText_llForceMouselook">
 llForceMouselook(integer mouselook)
 If mouselook is TRUE, any avatar that sits upon the prim will be forced into mouselook mode
-  </string>
-  <string name="LSLTipText_llGetObjectMass">
+	</string>
+	<string name="LSLTipText_llGetObjectMass">
 float llGetObjectMass(key id)
 Returns the mass of the avatar or object in the region
-  </string>
-  <string name="LSLTipText_llListReplaceList">
+	</string>
+	<string name="LSLTipText_llListReplaceList">
 list llListReplaceList(list dest, list src, integer start, integer end)
 Returns a list that is dest with start through end removed and src inserted at start
-  </string>
-  <string name="LSLTipText_llLoadURL">
+	</string>
+	<string name="LSLTipText_llLoadURL">
 llLoadURL(key avatar, string message, string url)
 Shows a dialog to avatar offering to load the web page at url with a message.
 If user clicks yes, launches the page in their web browser.
-  </string>
-  <string name="LSLTipText_llParcelMediaCommandList">
+	</string>
+	<string name="LSLTipText_llParcelMediaCommandList">
 llParcelMediaCommandList(list command)
 Sends a list of commands, some with arguments, to a parcel to control the playback of movies and other media
-  </string>
-  <string name="LSLTipText_llParcelMediaQuery">
+	</string>
+	<string name="LSLTipText_llParcelMediaQuery">
 list llParcelMediaQuery(list query)
 Returns a list containing results of the sent query
-  </string>
-  <string name="LSLTipText_llModPow">
+	</string>
+	<string name="LSLTipText_llModPow">
 integer llModPow(integer a, integer b, integer c)
 Returns a raised to the b power, mod c. ( (a**b)%c )
 b is capped at 0xFFFF (16 bits).
-  </string>
-  <string name="LSLTipText_llGetInventoryType">
+	</string>
+	<string name="LSLTipText_llGetInventoryType">
 integer llGetInventoryType(string name)
 Returns the type of the inventory item name
-  </string>
-  <string name="LSLTipText_llSetPayPrice">
+	</string>
+	<string name="LSLTipText_llSetPayPrice">
 llSetPayPrice(integer price, list quick_pay_buttons)
 Sets the default amount on the dialog that appears when someone chooses to pay this prim
-  </string>
-  <string name="LSLTipText_llGetCameraPos">
+	</string>
+	<string name="LSLTipText_llGetCameraPos">
 vector llGetCameraPos()
 Returns the current camera position for the agent the task has permissions for
-  </string>
-  <string name="LSLTipText_llGetCameraRot">
+	</string>
+	<string name="LSLTipText_llGetCameraRot">
 rotation llGetCameraRot()
 Returns the current camera orientation for the agent the task has permissions for
-  </string>
-  <string name="LSLTipText_llSetPrimURL">
+	</string>
+	<string name="LSLTipText_llSetPrimURL">
 llSetPrimURL(string url)
 Updates the URL for the web page shown on the sides of the object
-  </string>
-  <string name="LSLTipText_llRefreshPrimURL">
+	</string>
+	<string name="LSLTipText_llRefreshPrimURL">
 llRefreshPrimURL()
 Reloads the web page shown on the sides of the object
-  </string>
-  <string name="LSLTipText_llEscapeURL">
+	</string>
+	<string name="LSLTipText_llEscapeURL">
 string llEscapeURL(string url)
 Returns an escaped/encoded version of url, replacing spaces with %20 etc.
-  </string>
-  <string name="LSLTipText_llUnescapeURL">
+	</string>
+	<string name="LSLTipText_llUnescapeURL">
 string llUnescapeURL(string url)
 Returns an unescaped/ unencoded version of url, replacing %20 with spaces etc.
-  </string>
-  <string name="LSLTipText_llMapDestination">
+	</string>
+	<string name="LSLTipText_llMapDestination">
 llMapDestination(string simname, vector pos, vector look_at)
 Opens the World Map centered on the region simname with pos highlighted. (NOTE: look_at currently does nothing.)
 Only works for scripts attached to avatar, or during touch events.
-  </string>
-  <string name="LSLTipText_llAddToLandBanList">
+	</string>
+	<string name="LSLTipText_llAddToLandBanList">
 llAddToLandBanList(key avatar, float hours)
 Adds avatar to the land ban list for hours, or indefinitely if hours is 0
-  </string>
-  <string name="LSLTipText_llRemoveFromLandPassList">
+	</string>
+	<string name="LSLTipText_llRemoveFromLandPassList">
 llRemoveFromLandPassList(key avatar)
 Removes avatar from the land pass list
-  </string>
-  <string name="LSLTipText_llRemoveFromLandBanList">
+	</string>
+	<string name="LSLTipText_llRemoveFromLandBanList">
 llRemoveFromLandBanList(key avatar)
 Removes avatar from the land ban list
-  </string>
-  <string name="LSLTipText_llSetCameraParams">
+	</string>
+	<string name="LSLTipText_llSetCameraParams">
 llSetCameraParams(list rules)
 Sets multiple camera parameters at once.
 List format is [ rule1, data1, rule2, data2 . . . rulen, datan ]
-  </string>
-  <string name="LSLTipText_llClearCameraParams">
+	</string>
+	<string name="LSLTipText_llClearCameraParams">
 llClearCameraParams()
 Resets all camera parameters to default values and turns off scripted camera control
-  </string>
-  <string name="LSLTipText_llListStatistics">
+	</string>
+	<string name="LSLTipText_llListStatistics">
 float llListStatistics(integer operation, list src)
 Performs statistical aggregate functions on list src using LIST_STAT_* operations
-  </string>
-  <string name="LSLTipText_llGetUnixTime">
+	</string>
+	<string name="LSLTipText_llGetUnixTime">
 integer llGetUnixTime()
 Returns the number of seconds elapsed since 00:00 hours, Jan 1, 1970 UTC from the system clock
-  </string>
-  <string name="LSLTipText_llGetParcelFlags">
+	</string>
+	<string name="LSLTipText_llGetParcelFlags">
 integer llGetParcelFlags(vector pos)
 Returns a mask of the parcel flags (PARCEL_FLAG_*) for the parcel that includes the point pos
-  </string>
-  <string name="LSLTipText_llGetRegionFlags">
+	</string>
+	<string name="LSLTipText_llGetRegionFlags">
 integer llGetRegionFlags()
 Returns the region flags (REGION_FLAG_*) for the region the object is in
-  </string>
-  <string name="LSLTipText_llXorBase64StringsCorrect">
+	</string>
+	<string name="LSLTipText_llXorBase64StringsCorrect">
 string llXorBase64StringsCorrect(string s1, string s2)
 Correctly performs an exclusive or on two Base64 strings and returns a Base64 string.
 s2 repeats if it is shorter than s1.
-  </string>
-  <string name="LSLTipText_llHTTPRequest">
+	</string>
+	<string name="LSLTipText_llHTTPRequest">
 llHTTPRequest(string url, list parameters, string body)
 Sends an HTTP request to the specified url with the body of the request and parameters
-  </string>
-  <string name="LSLTipText_llResetLandBanList">
+	</string>
+	<string name="LSLTipText_llResetLandBanList">
 llResetLandBanList()
-Removes all residents from the land ban list
-  </string>
-  <string name="LSLTipText_llResetLandPassList">
+Removes all Residents from the land ban list
+	</string>
+	<string name="LSLTipText_llResetLandPassList">
 llResetLandPassList()
-Removes all residents from the land access/pass list
-  </string>
-  <string name="LSLTipText_llGetObjectPrimCount">
+Removes all Residents from the land access/pass list
+	</string>
+	<string name="LSLTipText_llGetObjectPrimCount">
 integer llGetObjectPrimCount(key object_id)
 Returns the total number of prims for an object in the region
-  </string>
-  <string name="LSLTipText_llGetParcelPrimOwners">
+	</string>
+	<string name="LSLTipText_llGetParcelPrimOwners">
 list llGetParcelPrimOwners(vector pos)
-Returns a list of all residents who own objects on the parcel at pos and with individual prim counts.
+Returns a list of all Residents who own objects on the parcel at pos and with individual prim counts.
 Requires owner-like permissions for the parcel.
-  </string>
-  <string name="LSLTipText_llGetParcelPrimCount">
+	</string>
+	<string name="LSLTipText_llGetParcelPrimCount">
 integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide)
 Returns the number of prims on the parcel at pos of the given category.
 Categories: PARCEL_COUNT_TOTAL, _OWNER, _GROUP, _OTHER, _SELECTED, _TEMP
-  </string>
-  <string name="LSLTipText_llGetParcelMaxPrims">
+	</string>
+	<string name="LSLTipText_llGetParcelMaxPrims">
 integer llGetParcelMaxPrims(vector pos, integer sim_wide)
 Returns the maximum number of prims allowed on the parcel at pos
-  </string>
-  <string name="LSLTipText_llGetParcelDetails">
+	</string>
+	<string name="LSLTipText_llGetParcelDetails">
 list llGetParcelDetails(vector pos, list params)
 Returns the parcel details specified in params for the parcel at pos.
-Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA
-  </string>
-  <string name="LSLTipText_llSetLinkPrimitiveParams">
+Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA, _ID, _SEE_AVATARS
+	</string>
+	<string name="LSLTipText_llSetLinkPrimitiveParams">
 llSetLinkPrimitiveParams(integer linknumber, list rules)
 Sets primitive parameters for linknumber based on rules
-  </string>
-  <string name="LSLTipText_llSetLinkTexture">
+	</string>
+	<string name="LSLTipText_llSetLinkTexture">
 llSetLinkTexture(integer linknumber, string texture, integer face)
 Sets the texture of face for a task that exists in the link chain at linknumber
-  </string>
-  <string name="LSLTipText_llStringTrim">
+	</string>
+	<string name="LSLTipText_llStringTrim">
 string llStringTrim(string src, integer trim_type)
 Trims the leading and/or trailing white spaces from a string.
 trim_type can be STRING_TRIM, STRING_TRIM_HEAD or STRING_TRIM_TAIL.
-  </string>
-  <string name="LSLTipText_llRegionSay">
+	</string>
+	<string name="LSLTipText_llRegionSay">
 llRegionSay(integer channel, string msg)
 Broadcasts msg on channel (not 0) that can be heard anywhere in the region by a script listening on channel
-  </string>
-  <string name="LSLTipText_llGetObjectDetails">
+	</string>
+	<string name="LSLTipText_llGetObjectDetails">
 list llGetObjectDetails(key id, list params)
 Returns the object details specified in params for the object with key id.
 Params are OBJECT_NAME, _DESC, _POS, _ROT, _VELOCITY, _OWNER, _GROUP, _CREATOR
-  </string>
-  <string name="LSLTipText_llSetClickAction">
+	</string>
+	<string name="LSLTipText_llSetClickAction">
 llSetClickAction(integer action)
 Sets the action performed when a prim is clicked upon
-  </string>
-  <string name="LSLTipText_llGetRegionAgentCount">
+	</string>
+	<string name="LSLTipText_llGetRegionAgentCount">
 integer llGetRegionAgentCount()
 Returns the number of avatars in the region
-  </string>
-  <string name="LSLTipText_llTextBox">
+	</string>
+	<string name="LSLTipText_llTextBox">
 llTextBox(key avatar, string message, integer chat_channel
 Shows a dialog box on the avatar&apos;s screen with the message.
 It contains a text box for input, and if entered that text is chatted on chat_channel.
-  </string>
-  <string name="LSLTipText_llGetAgentLanguage">
+	</string>
+	<string name="LSLTipText_llGetAgentLanguage">
 string llGetAgentLanguage(key avatar)
 Returns the language code of the preferred interface language of the avatar
-  </string>
-  <string name="LSLTipText_llDetectedTouchUV">
+	</string>
+	<string name="LSLTipText_llDetectedTouchUV">
 vector llDetectedTouchUV(integer index)
 Returns the u and v coordinates in the first two components of a vector, for the texture coordinates where the prim was touched in a triggered touch event
-  </string>
-  <string name="LSLTipText_llDetectedTouchFace">
+	</string>
+	<string name="LSLTipText_llDetectedTouchFace">
 integer llDetectedTouchFace(integer index)
 Returns the index of the face where the avatar clicked in a triggered touch event
-  </string>
-  <string name="LSLTipText_llDetectedTouchPos">
+	</string>
+	<string name="LSLTipText_llDetectedTouchPos">
 vector llDetectedTouchPos(integer index)
 Returns the position where the object was touched in a triggered touch event
-  </string>
-  <string name="LSLTipText_llDetectedTouchNormal">
+	</string>
+	<string name="LSLTipText_llDetectedTouchNormal">
 vector llDetectedTouchNormal(integer index)
 Returns the surface normal for a triggered touch event
-  </string>
-  <string name="LSLTipText_llDetectedTouchBinormal">
+	</string>
+	<string name="LSLTipText_llDetectedTouchBinormal">
 vector llDetectedTouchBinormal(integer index)
 Returns the surface binormal for a triggered touch event
-  </string>
-  <string name="LSLTipText_llDetectedTouchST">
+	</string>
+	<string name="LSLTipText_llDetectedTouchST">
 vector llDetectedTouchST(integer index)
 Returns the s and t coordinates in the first two components of a vector, for the surface coordinates where the prim was touched in a triggered touch event
-  </string>
-  <string name="LSLTipText_llSHA1String">
+	</string>
+	<string name="LSLTipText_llSHA1String">
 string llSHA1String(string src)
 Returns a string of 40 hex characters that is the SHA1 security Hash of src
-  </string>
-  <string name="LSLTipText_llGetFreeURLs">
+	</string>
+	<string name="LSLTipText_llGetFreeURLs">
 integer llGetFreeURLs()
 Returns the number of available URLs for the current script
-  </string>
-  <string name="LSLTipText_llRequestURL">
+	</string>
+	<string name="LSLTipText_llRequestURL">
 key llRequestURL()
 Requests one HTTP:// url for use by this object.
 An http_request event is triggered with the results.
-  </string>
-  <string name="LSLTipText_llRequestSecureURL">
+	</string>
+	<string name="LSLTipText_llRequestSecureURL">
 key llRequestSecureURL()
 Requests one HTTPS:// (SSL) url for use by this object.
 An http_request event is triggered with the results.
-  </string>
-  <string name="LSLTipText_llReleaseURL">
+	</string>
+	<string name="LSLTipText_llReleaseURL">
 llReleaseURL(string url)
 Releases the specified URL, it will no longer be usable
-  </string>
-  <string name="LSLTipText_llHTTPResponse">
+	</string>
+	<string name="LSLTipText_llHTTPResponse">
 llHTTPResponse(key request_id, integer status, string body)
 Responds to request_id with status and body
-  </string>
-  <string name="LSLTipText_llGetHTTPHeader">
+	</string>
+	<string name="LSLTipText_llGetHTTPHeader">
 string llGetHTTPHeader(key request_id, string header)
 Returns the value for header for request_id
-  </string>
-  <string name="LSLTipText_llSetPrimMediaParams">
+	</string>
+	<string name="LSLTipText_llSetPrimMediaParams">
 integer llSetPrimMediaParams(integer face, list params)
-Returns an integer that is a STATUS_* flag which details the success/failure of the operation(s).
-  </string>
-  <string name="LSLTipText_llGetPrimMediaParams">
-    list llGetPrimMediaParams(integer face, list params)
+Sets the media params for a particular face on an object. If media is not already on this object, add it.
+List is a set of name/value pairs in no particular order.  Params not specified are unchanged, or if new media is added then set to the default specified.
+The possible names are below, along with the types of values and what they mean.
+	</string>
+	<string name="LSLTipText_llGetPrimMediaParams">
+list llGetPrimMediaParams(integer face, list params)
 Returns the media params for a particular face on an object, given the desired list of names, in the order requested.
 (Returns an empty list if no media exists on the face.)
-  </string>
-  <string name="LSLTipText_llClearPrimMedia">
+	</string>
+	<string name="LSLTipText_llClearPrimMedia">
 integer llClearPrimMedia(integer face)
-Returns an integer that is a STATUS_* flag which details the success/failure of the operation.
-  </string>
-  <string name="LSLTipText_llSetLinkPrimitiveParamsFast">
+Clears (deletes) the media and all params from the given face.	</string>
+	<string name="LSLTipText_llSetLinkPrimitiveParamsFast">
 llSetLinkPrimitiveParamsFast(integer linknumber, list rules)
 Set primitive parameters for linknumber based on rules with no built-in script sleep.
-  </string>
-  <string name="LSLTipText_llGetLinkPrimitiveParams">
+	</string>
+	<string name="LSLTipText_llGetLinkPrimitiveParams">
 list llGetLinkPrimitiveParams(integer linknumber,list rules)
 Get primitive parameters for linknumber based on rules.
-  </string>
-  <string name="LSLTipText_llLinkParticleSystem">
+	</string>
+	<string name="LSLTipText_llLinkParticleSystem">
 list llLinkParticleSystem(integer linknumber, list rules)
 Creates a particle system based on rules.  Empty list removes particle system from object.
 List format is [ rule1, data1, rule2, data2 . . . rulen, datan ].
-  </string>
-  <string name="LSLTipText_llSetLinkTextureAnim">
+	</string>
+	<string name="LSLTipText_llSetLinkTextureAnim">
 llSetLinkTextureAnim(integer link, integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate)
 Animate the texture on the specified face/faces of the specified prim/prims by setting the texture scale and offset.
-  </string>
-  <string name="LSLTipText_llGetLinkNumberOfSides">
+	</string>
+	<string name="LSLTipText_llGetLinkNumberOfSides">
 integer llGetLinkNumberOfSides(integer link)
 Returns the number of sides of the specified linked prim.
-  </string>
-  <string name="LSLTipText_llGetUsername">
+	</string>
+	<string name="LSLTipText_llGetUsername">
 string llGetUsername(key id)
 Returns the single-word username of an avatar, if the avatar is in the current region, otherwise the empty string.
-  </string>
-  <string name="LSLTipText_llRequestUsername">
+	</string>
+	<string name="LSLTipText_llRequestUsername">
 key llRequestUsername(key id)
 Requests single-word username of an avatar.  When data is available the dataserver event will be raised.
-  </string>
-  <string name="LSLTipText_llGetDisplayName">
+	</string>
+	<string name="LSLTipText_llGetDisplayName">
 string llGetDisplayName(key id)
 Returns the name of an avatar, if the avatar is in the current simulator, and the name has been cached, otherwise the same as llGetUsername. Use llRequestDisplayName if you absolutely must have the display name.
-  </string>
-  <string name="LSLTipText_llRequestDisplayName">
+	</string>
+	<string name="LSLTipText_llRequestDisplayName">
 key llRequestDisplayName(key id)
 Requests name of an avatar.  When data is available the dataserver event will be raised.
-  </string>
-  <string name="LSLTipText_llRegionSayTo">
-llRegionSayTo(key target, integer channel, string msg)
-Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region
-  </string>
-  <string name="LSLTipText_llGetEnv">
+	</string>
+	<string name="LSLTipText_llGetEnv">
 string llGetEnv(string name)
 Returns a string with the requested data about the region
-  </string>
-
-
-  <string name="LSLTipText_llCastRay">
-list llCastRay( Vector start, Vector end, list options )
+	</string>
+	<string name="LSLTipText_llCastRay">
+list llCastRay(vector start, vector end, list params)
 Returns a list consisting of the following three values for each hit: UUID, Link number, Hit position.
-  </string>
-  <string name="LSLTipText_llGetSPMaxMemory">
-integer llGetSPMaxMemory( )
+	</string>
+	<string name="LSLTipText_llRegionSayTo">
+llRegionSayTo(key target, integer channel, string msg)
+Sends msg on channel (not DEBUG_CHANNEL) directly to prim or avatar target anywhere within the region
+	</string>
+	<string name="LSLTipText_llGetSPMaxMemory">
+integer llGetSPMaxMemory()
 Returns the integer of the most bytes used while llScriptProfiler was last active.
-  </string>
-  <string name="LSLTipText_llGetUsedMemory">
-integer llGetUsedMemory( )
+	</string>
+	<string name="LSLTipText_llGetUsedMemory">
+integer llGetUsedMemory()
 Returns the integer of the number of bytes of memory currently in use by the script.
-  </string>
-  <string name="LSLTipText_llGodLikeRezObject">
+	</string>
+	<string name="LSLTipText_llScriptProfiler">
+llScriptProfiler(integer flags)
+Enables or disables script profiling options. Currently only supports PROFILE_SCRIPT_MEMORY (mono only) and PROFILE_NONE.
+MAY SIGNIFICANTLY REDUCE SCRIPT PERFORMANCE!
+	</string>
+	<string name="LSLTipText_llSetMemoryLimit">
+integer llSetMemoryLimit(integer mem)
+Request ''limit'' bytes to be reserved for this script.
+	</string>
+	<string name="LSLTipText_llGetMemoryLimit">
+integer llGetMemoryLimit()
+	</string>
+	<string name="LSLTipText_llSetLinkMedia">
+llSetLinkMedia(integer link, integer face, list params)
+Set the media params for a particular face on linked prim.  List is a set of name/value pairs (in no particular order). The possible names are below, along with the types of values and what they mean.  If media is not already on this object, add it. Params not specified are unchanged, or if new media is added set to the default specified.
+	</string>
+	<string name="LSLTipText_llGetLinkMedia">
+list llGetLinkMedia(integer link, integer face, list params)
+Get the media params for a particular face on linked prim, given the desired list of names. Returns a list of values in the order requested.  Returns an empty list if no media exists on the face.
+	</string>
+	<string name="LSLTipText_llClearLinkMedia">
+integer llClearLinkMedia(integer link, integer face)
+Clears (deletes) the media and all params from the given face on linked prim(s).
+	</string>
+	<string name="LSLTipText_llSetContentType">
+llSetContentType(key request_id, integer content_type)
+Set the Internet media type of an LSL HTTP server response.
+	</string>
+	<string name="LSLTipText_llLinkSitTarget">
+llLinkSitTarget(integer link, vector offset, rotation rot );
+Set the sit location for the linked prim(s). The sit location is relative to the prim's position and rotation.
+	</string>
+	<string name="LSLTipText_llAvatarOnLinkSitTarget">
+key llAvatarOnLinkSitTarget(integer link)
+If an avatar is sitting on the sit target, return the avatar&apos;s key, NULL_KEY otherwise
+	</string>
+	<string name="LSLTipText_llSetLinkCamera">
+llSetLinkCamera(integer link, vector eye, vector at)
+Sets the camera eye offset, and the offset that the camera is looking at, for avatars that sit on the linked prim.
+	</string>
+	<string name="LSLTipText_llSetVelocity">
+llSetVelocity(vector velocity, integer local)
+Sets an objects velocity, in local coords if local == TRUE (if the script is physical)
+	</string>
+	<string name="LSLTipText_llSetAngularVelocity">
+llSetAngularVelocity(vector angular_velocity, integer local)
+Sets an objects angular velocity, in local coords if local == TRUE (if the script is physical)
+	</string>
+	<string name="LSLTipText_llSetPhysicsMaterial">
+llSetPhysicsMaterial(integer flags, float gravity_multiplier, float restitution, float friction, float density )
+Sets the requested attributes of the root object&apos;s physics material.
+	</string>
+	<string name="LSLTipText_llGetPhysicsMaterial">
+llGetPhysicsMaterial() returns the gravity multiplier, restitution, friction, and density of the linkset as a list in that order.
+	</string>
+	<string name="LSLTipText_llGetMassMKS">
+llGetMassMKS() returns the mass of the linkset in kilograms.
+	</string>
+	<string name="LSLTipText_llGenerateKey">
+llGenerateKey()
+Retun a unique generated key
+	</string>
+	<string name="LSLTipText_llSetKeyframedMotion">
+llSetKeyframedMotion(list keyframes, list options)
+Requests that a nonphysical object be keyframed according to keyframe list.
+	</string>
+	<string name="LSLTipText_llTransferLindenDollars">
+key llTransferLindenDollars(key destination, integer amount)
+Transfer amount of linden dollars (L$) from script owner to destination. Returns a key to a corresponding transaction_result event for the success of the transfer.
+	</string>
+	<string name="LSLTipText_llGetParcelMusicURL">
+string llGetParcelMusicURL()
+Gets the streaming audio URL for the parcel of land on which the object is located.
+	</string>
+	<string name="LSLTipText_llSetRegionPos">
+integer llSetRegionPos(vector pos)
+Sets the position anywhere within the region (if the object isn&apos;t physical)
+	</string>
+	<string name="LSLTipText_llNavigateTo">
+llNavigateTo(vector point, list options)
+For AI Character: Navigate to destination.
+	</string>
+	<string name="LSLTipText_llCreateCharacter">
+llCreateCharacter(list options)
+Convert linkset to AI Character which can navigate the world.
+	</string>
+	<string name="LSLTipText_llPursue">
+llPursue(key target, list options)
+For AI Character: Chase after a target.
+	</string>
+	<string name="LSLTipText_llWanderWithin">
+llWanderWithin(vector center, vector dist, list options)
+For AI Character: Wander within a specified volume.
+	</string>
+	<string name="LSLTipText_llFleeFrom">
+llFleeFrom(vector source, float radius, list options)
+For AI Character: Flee from a point.
+	</string>
+	<string name="LSLTipText_llPatrolPoints">
+llPatrolPoints(list points, list options)
+For AI Character: Patrol a list of points.
+	</string>
+	<string name="LSLTipText_llExecCharacterCmd">
+llExecCharacterCmd(integer cmd, list options)
+For AI Character: Execute a character command.
+	</string>
+	<string name="LSLTipText_llDeleteCharacter">
+llDeleteCharacter()
+Convert linkset from AI Character to Physics object.
+	</string>
+	<string name="LSLTipText_llUpdateCharacter">
+llUpdateCharacter(list options)
+Change the AI Character&apos;s settings.
+	</string>
+	<string name="LSLTipText_llEvade">
+llEvade(key target, list options)
+For AI Character: Evade a specified target.
+	</string>
+	<string name="LSLTipText_llGetClosestNavPoint">
+list llGetClosestNavPoint(vector point, list options)
+For AI Character: Get the closest navigable point to the point provided.
+	</string>
+	<string name="LSLTipText_llGetStaticPath">
+list llGetStaticPath(vector start, vector end, float radius, list params)
+Returns a list of position vectors indicating pathfinding waypoints between positions at start and end, for a character of a given radius. The waypoints this function returns are for the 'static' nav mesh, meaning that dynamic objects are ignored.
+	</string>
+<!-- Not in LL list yes -->
+<string name="LSLTipText_llManageEstateAccess" translate="false">
+integer llManageEstateAccess(integer action, key id)
+To add or remove agents from the estate's agent access or ban lists or groups from the estate's group access list.
+Only works for objects owned by the Estate Owner or an Estate Manager.
+Returns TRUE if successful and FALSE if throttled, on invalid action, on invalid or null id, or if object owner is not allowed to manage the estate.
+'action' can be any of: ESTATE_ACCESS_ALLOWED_[AGENT/GROUP]_[ADD/REMOVE] or ESTATE_ACCESS_BANNED_AGENT_[ADD/REMOVE]
+</string>
+<string name="LSLTipText_llGetAgentList" translate="false">
+list llGetAgentList(integer scope, list options)
+Requests a list of agents currently in the region, limited by the scope parameter.
+</string>
+<string name="LSLTipText_llAttachToAvatarTemp" translate="false">
+llAttachToAvatarTemp(integer attach_point)
+Attaches the object to the avatar who has granted permission to the script, with the exception that the object will not create new inventory for the user, and will disappear on detach or disconnect.
+</string>
+<string name="LSLTipText_llTeleportAgent" translate="false">
+llTeleportAgent(key avatar, string landmark, vector position, vector look_at)
+Requests a teleport of avatar to a landmark stored in the object's inventory. If no landmark is provided (an empty string), the avatar is teleported to the location position in the current region. In either case, the avatar is turned to face the position given by look_at in local coordinates.
+</string>
+<string name="LSLTipText_llTeleportAgentGlobalCoords" translate="false">
+llTeleportAgentGlobalCoords(key agent, vector global_coordinates, vector region_coordinates, vector look_at)
+Teleports an agent to set of a region_coordinates within a region at the specified global_coordinates. The agent lands facing the position defined by look_at local coordinates.
+A region's global coordinates can be retrieved using llRequestSimulatorData(region_name, DATA_SIM_POS)
+</string>
+<!-- GOD FUNCTIONS -->
+	<string name="LSLTipText_llGodLikeRezObject">
 llGodLikeRezObject( key inventory, vector pos )
 Rez directly off of UUID if owner has god-bit set.
 (Requires god mode)
-  </string>
-  <string name="LSLTipText_llScriptProfiler">
-llScriptProfiler( integer flags )
-Enables or disables the scripts profiling state.
-  </string>
-  <string name="LSLTipText_llSetInventoryPermMask">
+	</string>
+	<string name="LSLTipText_llSetInventoryPermMask">
 llSetInventoryPermMask( string item, integer mask, integer value )
 Sets the given permission mask to the new value on the inventory item.
 (Requires god mode)
-  </string>
-  <string name="LSLTipText_llSetObjectPermMask">
+	</string>
+	<string name="LSLTipText_llSetObjectPermMask">
 llSetObjectPermMask( integer mask, integer value )
 Sets the given permission mask to the new value on the root object the task is attached to.
 (Requires god mode)
-  </string>
-  <string name="LSLTipText_llSetMemoryLimit">
-integer llSetMemoryLimit( integer limit )
-Request ''limit'' bytes to be reserved for this script.
-  </string>
-  <string name="LSLTipText_llSetLinkMedia">
-integer llSetLinkMedia( integer link, integer face, list params )
-Set the media params for a particular face on the linked prim(s) without a delay.
-  </string>
-  <string name="LSLTipText_llGetLinkMedia">
-list llGetLinkMedia( integer link, integer face, list params )
-Returns a list with the media params for a particular face on a linked prim, given the desired list of named params.
-  </string>
-  <string name="LSLTipText_llClearLinkMedia">
-integer llClearLinkMedia( integer link, integer face )
-Clears the media and all params from the given face on the linked prim(s).
-  </string>
-  <string name="LSLTipText_llSetLinkCamera">
-llSetLinkCamera( integer link, vector eye, vector at )
-Sets the camera eye offset, and the offset that the camera is looking at, for avatars that sit on the linked prim.
-  </string>
-  <string name="LSLTipText_llSetContentType">
-llSetContentType( key request_id, integer content_type )
-Set the Internet media type of an LSL HTTP server response.
-  </string>
-  <string name="LSLTipText_llLinkSitTarget">
-llLinkSitTarget( integer link, vector offset, rotation rot );
-Set the sit location for the linked prim(s). The sit location is relative to the prim's position and rotation.
-  </string>
-  <string name="LSLTipText_llAvatarOnLinkSitTarget">
-key llAvatarOnLinkSitTarget( integer link )
-Returns a key that is the UUID of the user seated on the prim.
-  </string>
+	</string>
 
-
-<!-- No info on these functions yet....
-  <string name="LSLTipText_llSetVelocity">
-  </string>
-  <string name="LSLTipText_llSetRotationalVelocity">
-  </string>
+<!-- 
+    Please keep LL-LSL above this section
+    ** DATA SOURCES **
+       OpenSim OS Functions:      \OpenSim\Region\ScriptEngine\Shared\Api\Interface\IOSSL_Api.cs
+       Aurora-Sim AA Functions:   \Aurora\AuroraDotNetEngine\APIs\AA_API.cs
+       Aurora-Sim BOT Functions:  \Aurora\BotManager\Bot_API.cs
 -->
+
+	<string name="LSLTipText_osSetDynamicTextureURL">
+osSetDynamicTextureURL(key dynamicID, string contentType, string url, string extraParams, integer timer )
+Renders a web texture on the prim containing the script, and returns the UUID of the newly created texture.
+	</string>
+	<string name="LSLTipText_osSetDynamicTextureURLBlend">
+osSetDynamicTextureURLBlend(key dynamicID, string contentType, string url, string extraParams, integer timer, integer alpha)
+Allows for two dynamic textures to blend on the prim containing this script.
+	</string>
+	<string name="LSLTipText_osSetDynamicTextureURLBlendFace">
+osSetDynamicTextureURLBlendFace(key dynamicID, string contentType, string url, string extraParams, integer blend, integer disp, integer timer, integer alpha, integer face)
+Loads a web texture on a prim.
+	</string>
+	<string name="LSLTipText_osSetDynamicTextureData">
+osSetDynamicTextureData(key dynamicID, string contentType, string data, string extraParams, integer timer)
+Writes text and vector graphics onto a prim face.
+	</string>
+	<string name="LSLTipText_osSetDynamicTextureDataBlend">
+osSetDynamicTextureDataBlend(key dynamicID, string contentType, string data, string extraParams, integer timer, integer alpha)
+Allows for two dynamic textures to blend on the prim containing this script.
+	</string>
+	<string name="LSLTipText_osSetDynamicTextureDataBlendFace">
+osSetDynamicTextureDataBlendFace(key dynamicID, string contentType, string data, string extraParams, integer blend, integer disp, integer timer, integer alpha, integer face)
+Allows for two dynamic textures to blend on the specified face of the prim containing this script.
+	</string>
+	<string name="LSLTipText_osGetTerrainHeight">
+osGetTerrainHeight(integer x, integer y)
+Returns current terrain height as float at the given coordinates.
+	</string>
+	<string name="LSLTipText_osSetTerrainHeight">
+osSetTerrainHeight(integer x, integer y, float val)
+Sets terrain height at the given coordinates. Use osTerrainFlush() afterwards.
+	</string>
+	<string name="LSLTipText_osTerrainFlush">
+osTerrainFlush()
+Updates terrain data. Call this after you are done using osTerrainSetHeight.
+	</string>
+	<string name="LSLTipText_osRegionRestart">
+osRegionRestart(float seconds)
+Restart the current region in the specified number of seconds from now.
+	</string>
+	<string name="LSLTipText_osRegionNotice">
+osRegionNotice(string msg)
+Broadcasts a notification message to all agents on the current region.
+	</string>
+	<string name="LSLTipText_osConsoleCommand">
+osConsoleCommand(string command)
+Issues commands directly to the OpenSim server console.
+	</string>
+	<string name="LSLTipText_osSetParcelMediaURL">
+osSetParcelMediaURL(string url)
+Sets parcel media URL.
+	</string>
+	<string name="LSLTipText_osSetPrimFloatOnWater">
+osSetPrimFloatOnWater(integer floatYN)
+Make physical prims float at the water level, TRUE or FALSE.
+	</string>
+	<string name="LSLTipText_osSetParcelSIPAddress">
+osSetParcelSIPAddress(string SIPAddress)
+Sets parcel SIP Address for Voice.
+	</string>
+	<string name="LSLTipText_osGetAgentIP">
+osGetAgentIP(key agent)
+Returns the Avatars IP Address as a string.	Allows in-world tools be used to coordinate out of world network services that need access to client IP addresses.
+Should *ONLY* be used by Region Server Owner.
+	</string>
+	<string name="LSLTipText_osGetAgents">
+osGetAgents()
+Returns a list of all avatars in the region in which the script is running.
+	</string>
+	<string name="LSLTipText_osTeleportAgent">
+    POLYMORPHIC COMMAND
+osTeleportAgent(key agent, integer regionX, integer regionY, vector position, vector lookat)
+osTeleportAgent(key agent, string regionName, vector position, vector lookat)
+osTeleportAgent(key agent, vector position, vector lookat)
+
+Teleports the specified agent to a specified location in the region, the grid, or the hypergrid.
+	</string>
+	<string name="LSLTipText_osTeleportOwner">
+    POLYMORPHIC COMMAND
+osTeleportOwner(integer regionX, integer regionY, vector position, vector lookat)
+osTeleportOwner(string regionName, vector position, vector lookat)
+osTeleportOwner(vector position, vector lookat)
+
+Teleports the owner of the object that holds the script to a specified location in the region, the grid, or the hypergrid.
+	</string>
+	<string name="LSLTipText_osAvatarPlayAnimation">
+osAvatarPlayAnimation(key UUID, string animation)
+Triggers animations contained within the same prim as the script. Does not need the target avatar's permission.
+	</string>
+	<string name="LSLTipText_osAvatarStopAnimation">
+osAvatarStopAnimation(key UUID, string animation)
+Stops specified animation on the specified avatar.
+	</string>
+	<string name="LSLTipText_osMovePen">
+osMovePen(string drawList, integer x, integer y)
+Moves the pen's location to the coordinates specified by the x and y parameters, without drawing anything.
+	</string>
+	<string name="LSLTipText_osDrawLine">
+    POLYMORPHIC COMMAND
+osDrawLine(string drawList, integer startX, integer startY, integer endX, integer endY)
+osDrawLine(string drawList, integer endX, integer endY)
+Draws a line on a dynamic texture.
+	</string>
+	<string name="LSLTipText_osDrawText">
+osDrawText(string drawList, string text)
+Renders text on a dynamic texture.
+	</string>
+	<string name="LSLTipText_osDrawEllipse">
+osDrawEllipse(string drawList, integer width, integer height)
+Draws an ellipse on a dynamic texture.
+	</string>
+	<string name="LSLTipText_osDrawRectangle">
+osDrawRectangle(string drawList, integer width, integer height)
+Draws a rectangle on a dynamic texture.
+	</string>
+	<string name="LSLTipText_osDrawFilledRectangle">
+osDrawFilledRectangle(string drawList, integer width, integer height)
+Draws a rectangle on a dynamic texture, and fills it with the current pen color.
+	</string>
+	<string name="LSLTipText_osDrawPolygon">
+osDrawPolygon (string drawList, list x, list y)
+Draws a polygon on a dynamic texture.
+	</string>
+	<string name="LSLTipText_osDrawFilledPolygon">
+osDrawFilledPolygon (string drawList, list x, list y)
+Draws a polygon on a dynamic texture, and fills it with the current pen color.
+	</string>
+	<string name="LSLTipText_osSetFontName">
+osSetFontName(string drawList, string fontName)
+Sets current font to be used by osDrawText. Font must exist on region server to display.
+	</string>
+	<string name="LSLTipText_osSetFontSize">
+osSetFontSize(string drawList, integer fontSize)
+Sets the font size to be used in osDrawText.
+	</string>
+	<string name="LSLTipText_osSetPenSize">
+osSetPenSize(string drawList, integer penSize)
+Sets the pen size (line thickness) that is to be used when drawing dynamic textures.
+	</string>
+	<string name="LSLTipText_osSetPenColor">
+osSetPenColor(string drawList, string color)
+Sets the pen color that is to be used when drawing dynamic textures.
+	</string>
+	<string name="LSLTipText_osSetPenCap">
+osSetPenCap(string drawList, string direction, string type)
+Apply a shape on the end of a line. This allows using arrow, diamond, round and flat caps.
+	</string>
+	<string name="LSLTipText_osDrawImage">
+osDrawImage(string drawList, integer width, integer height, string imageUrl)
+Retrieves an image specified by the imageUrl parameter and draws it at the specified height and width.
+	</string>
+	<string name="LSLTipText_osGetDrawStringSize">
+vector osGetDrawStringSize(string contentType, string text, string fontName, integer fontSize)
+Returns a vector containing the horizontal and vertical dimensions in pixels of the specified text.
+	</string>
+	<string name="LSLTipText_osSetStateEvents">
+osSetStateEvents(integer events)
+Used in the past as a workaround for a bug with Opensim, which has long since been fixed.
+	</string>
+	<string name="LSLTipText_osList2Double">
+double osList2Double(list src, integer index)
+Returns double-precision value from src at index.
+	</string>
+	<string name="LSLTipText_osSetRegionWaterHeight">
+osSetRegionWaterHeight(float height)
+Adjusts water height on region.
+	</string>
+	<string name="LSLTipText_osSetRegionSunSettings">
+osSetRegionSunSettings(integer useEstateSun, integer sunFixed, float sunHour)
+Changes the estate sun settings, then triggers a sun update
+'sunFixed' TRUE to keep the sun stationary, FALSE to use global time
+'sunHour' The sun hour that is desired, 0...24, 0 is sunrise.
+	</string>
+	<string name="LSLTipText_osSetEstateSunSettings">
+osSetEstateSunSettings(integer sunFixed, float sunHour)
+sunFixed = TRUE or FALSE, sunHour = 00.00 to 24.00.
+	</string>
+	<string name="LSLTipText_osGetCurrentSunHour">
+float osGetCurrentSunHour()
+Returns float value of current sun hour 0...24 0 is sunrise.
+	</string>
+	<string name="LSLTipText_osGetSunParam">
+float osGetSunParam(string param)
+Returns current float values for param, where param = day_length, year_length, day_night_offset, update_interval.
+	</string>
+	<string name="LSLTipText_osSetSunParam">
+osSetSunParam(string param, float value)
+Sets region's sun parameters, where param = day_length, year_length, day_night_offset, update_interval.
+	</string>
+	<string name="LSLTipText_osWindActiveModelPluginName">
+string osWindActiveModelPluginName()
+Returns the current working wind module installed
+These are SimpleRandomWind or ConfigurableWind.
+	</string>
+	<string name="LSLTipText_osSetWindParam">
+osSetWindParam(string plugin, string param, float value)
+Sets value of param for plugin.  SimpleRandomWind plugin param = strength.
+ConfigurableWind plugin params = avgStrength, avgDirection, varStrength, varDirection, rateChange.
+	</string>
+	<string name="LSLTipText_osGetWindParam">
+float osGetWindParam(string plugin, string param)
+Returns float value of param for plugin.  SimpleRandomWind plugin param = strength.
+ConfigurableWind plugin params = avgStrength, avgDirection, varStrength, varDirection, rateChange.
+	</string>
+	<string name="LSLTipText_osParcelJoin">
+osParcelJoin(vector start, vector end)
+Where start = top corner, end = bottom corner.
+Subdivides from start vector to end vector.  Z is ignored but must exist in syntax
+	</string>
+	<string name="LSLTipText_osParcelSubdivide">
+osParcelSubdivide(vector start, vector end)
+Where start = top corner, end = bottom corner.
+Subdivides from start vector to end vector.  Z is ignored but must exist in syntax
+	</string>
+	<string name="LSLTipText_osSetParcelDetails">
+osSetParcelDetails(vector pos, list rules)
+Set parcel details at position x,y,x.
+Rules = PARCEL_DETAILS_NAME, PARCEL_DETAILS_DESC, PARCEL_DETAILS_OWNER, PARCEL_DETAILS_GROUP
+	</string>
+	<string name="LSLTipText_osGetScriptEngineName">
+string osGetScriptEngineName()
+Returns the name of the script engine which is currently enabled on the server.
+	</string>
+	<string name="LSLTipText_osGetSimulatorVersion">
+string osGetSimulatorVersion()
+Returns current server version information as a string.
+	</string>
+	<string name="LSLTipText_osParseJSON">
+string osParseJSON(string JSON)
+Returns a deserialized JSON.
+	</string>
+	<string name="LSLTipText_osParseJSONNew">
+string osParseJSON(string JSON)
+Returns a deserialized JSON object.
+	</string>
+	<string name="LSLTipText_osMessageObject">
+osMessageObject(key UUID, string message)
+Sends string to object identified by UUID.
+Receiving object requires a dataserver(key queryid, string data) in a contained script(s).
+The queryid passed will be the id of the calling object.
+	</string>
+	<string name="LSLTipText_osMakeNotecard">
+osMakeNotecard(string notecardName, list contents)
+Write a Notecard contained in Prim with contents of list.
+	</string>
+	<string name="LSLTipText_osGetNotecardLine">
+string osGetNotecardLine(string name, integer line)
+Reads the requested notecard line and return its data as a string.
+	</string>
+	<string name="LSLTipText_osGetNotecard">
+string osGetNotecard(string name)
+Reads the entire notecard and return its data as a string.
+	</string>
+	<string name="LSLTipText_osGetNumberOfNotecardLines">
+integer osGetNumberOfNotecardLines(string name)
+Returns total number of lines in a notecard.
+	</string>
+	<string name="LSLTipText_osAvatarName2Key">
+key osAvatarName2Key(string firstname, string lastname)
+Returns the avatar's UUID from their firstname, lastname.
+	</string>
+	<string name="LSLTipText_osKey2Name">
+string osKey2Name(key UUID)
+Returns avatar name from their UUID key.
+	</string>
+	<string name="LSLTipText_osGetGridNick">
+string osGetGridNick()
+Returns the grid's nickname.
+	</string>
+	<string name="LSLTipText_osGetGridName">
+string osGetGridName()
+Returns the grid's name.
+	</string>
+	<string name="LSLTipText_osGetGridLoginURI">
+string osGetGridLoginURI()
+Returns the grid's LoginURI.
+	</string>
+	<string name="LSLTipText_osGetGridHomeURI">
+string osGetGridHomeURI()
+Returns the current grid URI.
+	</string>
+	<string name="LSLTipText_osGetGridCustom">
+string osGetGridCustom(string key)
+Returns the grid's Grid Info.
+	</string>
+	<string name="LSLTipText_osFormatString">
+string osFormatString(string to_format, list strings)
+Returns string. OsFormatString("My name is {0}, I'm located in {1}�, [llGetObjectName(), llGetRegionName()])
+Where {num} parameters must be incremented for each list item, starting at zero, surrounded by curly brackets.
+	</string>
+	<string name="LSLTipText_osMatchString">
+list osMatchString(string src, string pattern, integer start)
+Returns list of matches for the pattern and its components inside the source string. The pattern is a regular expression.
+Each match in the result is the string that matched and its position in the source.
+	</string>
+	<string name="LSLTipText_osReplaceString">
+string osReplaceString(string src, string pattern, string replace, integer count, integer start)
+Returns new string with replacements completed.
+	</string>
+	<string name="LSLTipText_osLoadedCreationDate">
+string osLoadedCreationDate()
+Returns Creation Date from meta data of OAR.
+	</string>
+	<string name="LSLTipText_osLoadedCreationTime">
+string osLoadedCreationTime()
+Returns Creation Time from meta data of OAR.
+	</string>
+	<string name="LSLTipText_osLoadedCreationID">
+string osLoadedCreationID()
+Returns creation ID from meta data of OAR. Can not be used to identify a machine.
+	</string>
+	<string name="LSLTipText_osGetLinkPrimitiveParams">
+list osGetLinkPrimitiveParams(integer linknumber, list rules)
+Returns prim params for the linkset prims specified by linknum.
+If using linkset constants (e.g. LINK_SET, LINK_ALL_CHILDREN, etc), the requested params of each relevant prim are concatenated to the end of the list.
+Otherwise, usage is identical to llGetPrimitiveParams().
+	</string>
+	<string name="LSLTipText_osIsNpc">
+key osIsNpc(key NPC)
+Returns TRUE if 'key' is an NPC (non-player-character).
+	</string>
+  <string name="LSLTipText_osNpcCreate">
+    POLYMORPHIC
+osNpcCreate(string firstname, string lastname, vector position, string notecard)
+osNpcCreate(string firstname, string lastname, vector position, string notecard, integer options)
+Creates an NPC (Non Player Character) clone named firstname lastname at position from a notecard containing the specifications.
+	</string>
+	<string name="LSLTipText_osNpcSaveAppearance">
+osNpcSaveAppearance(key npc, string notecard)
+Save NPC's current body part, clothing and attachments data to notecard in prim inventory.
+The avatar must be present in the region when this function is invoked.
+The baked textures for the avatar (necessary to recreate appearance) are saved permanently.)
+	</string>
+	<string name="LSLTipText_osNpcLoadAppearance">
+osNpcLoadAppearance(key npc, string notecard)
+Load NPC appearance from notecard.
+This notecard must contain appearance data created with the save appearance function.
+	</string>
+	<string name="LSLTipText_osNpcGetPos">
+vector osNpcGetPos(key npc)
+Returns current position vector of the NPC.
+	</string>
+	<string name="LSLTipText_osNpcMoveTo">
+osNpcMoveTo(key npc, vector position)
+Moves an NPC to a location within the region.
+	</string>
+	<string name="LSLTipText_osNpcMoveToTarget">
+osNpcMoveToTarget(key npc, vector target, integer options)
+Moves NPC to given target over time.
+Options = OS_NPC_FLY, OS_NPC_NO_FLY, OS_NPC_LAND_AT_TARGET, OS_NPC_RUNNING 
+	</string>
+	<string name="LSLTipText_osNpcGetOwner">
+rotation osNpcGetOwner(key npc)
+Returns the NPC owner UUID.
+	</string>
+	<string name="LSLTipText_osNpcGetRot">
+rotation osNpcGetRot(key npc)
+Gets the rotation of the avatar. Only the rotation around the Z plane in Euler rotation (horizontal rotation) has any meaning.
+	</string>
+	<string name="LSLTipText_osNpcSetRot">
+osNpcSetRot(key npc, rotation rot)
+Set the rotation of the NPC. Only setting the rotation in the Z plane in Euler rotation will have any meaningful effect (turning NPC facing direction).
+Setting X or Y Euler values will result in the avatar rotating in an undefined manner.
+	</string>
+	<string name="LSLTipText_osNpcStopMoveToTarget">
+osNpcStopMoveToTarget(key npc)
+Stop a current move to a target.
+	</string>
+	<string name="LSLTipText_osNpcSay">
+osNpcSay(key npc, string message)
+Makes an NPC say something.
+	</string>
+	<string name="LSLTipText_osNpcSit">
+osNpcSit(key npc, key primkey, integer options)
+Makes NPC sit on prim/item.
+	</string>
+	<string name="LSLTipText_osNpcStand">
+osNpcStand(key npc)
+Makes NPC identified by UUID to stand.
+	</string>
+	<string name="LSLTipText_osNpcRemove">
+osNpcRemove(key npc)
+Removes an NPC.
+	</string>
+	<string name="LSLTipText_osNpcPlayAnimation">
+osNpcPlayAnimation(key npc, string animation)
+Makes NPC identified by key npc to play animation.
+	</string>
+	<string name="LSLTipText_osNpcStopAnimation">
+osNpcStopAnimation(key npc, string animation)
+Makes NPC identified by key npc stop playing animation.
+	</string>
+	<string name="LSLTipText_osOwnerSaveAppearance">
+osOwnerSaveAppearance(string notecard)
+Save Owner's current body part, clothing and attachments data to notecard in prim inventory.
+The avatar must be present in the region when this function is invoked.
+The baked textures for the avatar (necessary to recreate appearance) are saved permanently.)
+	</string>
+	<string name="LSLTipText_osAgentSaveAppearance">
+osAgentSaveAppearance(key agentId, string notecard)
+Save an Avatar's current body part, clothing and attachments data to specified notecard in prim inventory.
+The avatar must be present in the region when this function is invoked.
+The baked textures for the avatar (necessary to recreate appearance) are saved permanently.)
+	</string>
+	<string name="LSLTipText_osGetMapTexture">
+key osGetMapTexture()
+Returns the map texture UUID of current region.
+	</string>
+	<string name="LSLTipText_osGetRegionMapTexture">
+key osGetRegionMapTexture(string regionName)
+Returns the map texture UUID for the regionName requested.
+	</string>
+	<string name="LSLTipText_osGetRegionStats">
+list osGetRegionStats()
+Returns a list of float values representing a number of region statistics (21 of the values shown in the statistics bar of LL-based clients).
+	</string>
+	<string name="LSLTipText_osGetSimulatorMemory">
+integer osGetSimulatorMemory()
+Returns integer of current memory used by simulator instance.
+	</string>
+	<string name="LSLTipText_osKickAvatar">
+osKickAvatar(string FirstName, string LastName, string alert)
+Kicks avatar from region with an alert message.
+	</string>
+	<string name="LSLTipText_osSetSpeed">
+osSetSpeed(key UUID, float SpeedModifier)
+Multiplies the normal running, walking, and flying speed of the specified avatar.
+	</string>
+	<string name="LSLTipText_osCauseHealing">
+osCauseHealing(key UUID, float healing)
+Causes healing to specified avatar.
+	</string>
+	<string name="LSLTipText_osCauseDamage">
+osCauseDamage(key UUID, float damage)
+Causes damage to specified avatar.  Region must be damage enabled.
+	</string>
+	<string name="LSLTipText_osGetPrimitiveParams">
+list osGetPrimitiveParams(key prim, list rules)
+Gets the parameters of the primitive, specified by key.
+	</string>
+	<string name="LSLTipText_osSetPrimitiveParams">
+osSetPrimitiveParams(key prim, list rules)
+Sets primitive Params.
+	</string>
+	<string name="LSLTipText_osSetProjectionParams">
+    POLYMORPHIC COMMAND
+osSetProjectionParams(key prim. integer projection, key texture, float fov, float focus, float ambience)
+osSetProjectionParams(integer projection, key texture, float fov, float focus, float ambience)
+osSetProjectionParams(key prim, integer projection, key texture, float fov, float focus, float ambience)
+	</string>
+	<string name="LSLTipText_osGetAvatarList">
+list osGetAvatarList()
+Returns strided list of the UUID, position, and name of each avatar in the region, except the owner.
+	</string>
+	<string name="LSLTipText_osUnixTimeToTimestamp">
+string osUnixTimeToTimestamp(integer unixtime)
+Converts unixtime to an llGetTimeStamp() formated string.
+	</string>
+	<string name="LSLTipText_osGetGridGatekeeperURI">
+string osGetGridGatekeeperURI()
+returns the value of Gatekeeper in [GridService] section for both standalone and grids.
+	</string>
+	<string name="LSLTipText_osGetInventoryDesc">
+string osGetInventoryDesc(string itemName)
+returns the description of an inventory item contained within a prim.
+	</string>
+	<string name="LSLTipText_osForceAttachToAvatar">
+Attach the object containing this script to the avatar that owns it without checking for PERMISSION_ATTACH
+For example, osForceAttachToAvatar(ATTACH_CHEST)
+	</string>
+	<string name="LSLTipText_osForceDetachFromAvatar">
+Detach the object containing this script from the avatar it is attached to without checking for PERMISSION_ATTACH
+Nothing happens if the object is not attached
+	</string>
+	<string name="LSLTipText_osNpcSay">
+osNpcSay(key npc, integer channel, string message)
+	</string>
+	<string name="LSLTipText_osNpcShout">
+osNpcShout(key npc, integer channel, string message)
+	</string>
+	<string name="LSLTipText_osNpcWhisper">
+osNpcWhisper(key npc, integer channel, string message)
+	</string>
+	<string name="LSLTipText_osSetTerrainTexture">
+osSetTerrainTexture(integer level, key texture)
+sets terrain texture to level specified using the specific UUID of the texture
+	</string>
+	<string name="LSLTipText_osSetTerrainTextureHeight">
+osSetTerrainTextureHeight(int corner, float low, float high)
+sets terrain texture in corner specified between the low and high levels.  Identical to setting textures in Region Manager within the viewer.
+	</string>
+	<string name="LSLTipText_osInviteToGroup">
+integer osInviteToGroup(key agentId)
+Returns True / False if user identified by agentID is successfully added to group. (Object containing script must be attached to a group)
+	</string>
+	<string name="LSLTipText_osEjectFromGroup">
+integer osEjectFromGroup(key agentId)
+Returns True / False if user identified by agentID is successfully removed from group. (Object containing script must be attached to a group)
+	</string>
+	<string name="LSLTipText_cmSetWindlightScene">
+cmSetWindlightScene(list rules)
+Set the current WindLight scene. Estate managers and owners only.
+(Reguires LightShare Enabled Viewer)
+	</string>
+	<string name="LSLTipText_cmSetWindlightSceneTargeted">
+cmSetWindlightSceneTargeted(list rules, key target)
+Set the current WindLight scene directed at a specific avatar. Estate managers and owners only.
+(Reguires LightShare Enabled Viewer)
+	</string>
+	<string name="LSLTipText_cmGetWindlightScene">
+list cmGetWindlightScene(list rules)
+Get the current LightShare settings.
+(Reguires LightShare Enabled Viewer)
+	</string>
+	<string name="LSLTipText_lsSetWindlightScene">
+lsSetWindlightScene(list rules)
+Set the current WindLight scene. Estate managers and owners only.
+(Reguires LightShare Enabled Viewer)
+	</string>
+	<string name="LSLTipText_lsSetWindlightSceneTargeted">
+lsSetWindlightSceneTargeted(list rules, key target)
+Set the current WindLight scene directed at a specific avatar. Estate managers and owners only.
+(Reguires LightShare Enabled Viewer)
+	</string>
+	<string name="LSLTipText_lsGetWindlightScene">
+list lsGetWindlightScene(list rules)
+Get the current WindLight settings.
+(Reguires LightShare Enabled Viewer)
+	</string>
+<!-- Aurora-Sim OSSL-Functions  (unique to Aurora Only)  'osReturnObject', 'osReturnObjects', 'osShutDown', 'osaddAgentToGroup', 'osRezObject',
+   Aurora-Sim aaFunctions (\Aurora\AuroraDotNetEngine\APIs\IAA_Api.cs)
+   Aurora-Sim botFunctions (\Aurora\BotManager\IBot_Api.cs) 
+-->
+	<string name="LSLTipText_osReturnObject">
+osReturnObject(key userID)
+Returns object to specified avatars UUID.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_osReturnObjects">
+osReturnObjects(float Parameter)
+Returns group of objects. Parameter's are numeric, values are owner objects = 0, everyone except owner objects = 1, group objects = 2.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_osShutDown">
+osShutDown()
+Shut's down current Simulator.  Authorized Admin Only by config.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_osAddAgentToGroup">
+osAddAgentToGroup(key avatarID, string group_name, string role_name)
+Adds an avatar to a group.  Where group_name = name of the target group, role_name = role to assign within the group.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_osRezObject">
+osRezObject(string inventory, vector position, vector velocity, rotation rot, integer param, integer isRezAtRoot, integer doRecoil, integer SetDieAtEdge, integer CheckPos)
+Where inventory = object to rez.  Position = vector to rez object.  Velocity = initial velocity.  Rot = initial rotation.  Param = onrez event.
+IzAtRoot = TRUE/FALSE flag changes llRezAtRoot to llRezObject.  doRecoil =TRUE/FALSE to push avatar.  SetDieAtEdge = TRUE/FALSE for rezzed object to die at edge of region.
+CheckPos = TRUE/FALSE enable/disable 10m rez limit.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaSetCloudDensity">
+aaSetCloudDensity(float density)
+AaSetCloudDensity(0.5)  Where float density values are 0.0 =  no cloud to 1.0 = 100% cloud.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaUpdateDatabase">
+aUpdateDatabase(string Key, string value, string token)
+Where Key = database field name, xmlDataToPutIntoTheDatabase = serialized XML data,  Token = data-password
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaQueryDatabase">
+aaQueryDatabase(string Key, string Token)
+Returns a list with first value is the token, the second the Key, and the third the value
+Where Key = database field name, Token = data-password
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaDeserializeXMLValues">
+aaDeserializeXMLValues(string xmlData)
+Returns a list of Values from XML data. Where xmlData = xml formatted data Values.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaDeserializeXMLKeys">
+aaDeserializeXMLKeys(string xmlData)
+Returns a list of keys from XML data. Where xmlData = xml formatted data keys.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaSetConeOfSilence">
+aaSetConeOfSilence(float radius)
+Where radius = metres radius from centre of scripted item.  This creates an area that sounds can only be heard by the people within the area(radius) and not heard outside and visa-versa.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaSerializeXML">
+aaSerializeXML(list keys, list values)
+Returns xml formatted string of the keys and values.  Where keys = list of keys in the database, values = fields to retrieve from database.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaGetTeam">
+aaGetTeam(key uuid)
+Returns a string of avatars team name.  Where uuid = avatar key.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaGetHealth">
+aaGetHealth(key uuid)
+Returns float value (0.0 to 100.0) of current health.  Where uuid = avatar key.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaJoinCombat">
+aaJoinCombat(key uuid)
+Where uuid = avatar key.  If (PERMISSION_COMBAT == PERMISSION_COMBAT) and permission is granted then join combat.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaLeaveCombat">
+aaLeaveCombat(key uuid)
+Where uuid = avatar key.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaJoinCombatTeam">
+aaJoinCombatTeam(key uuid, string team)
+Where uuid = key of avatar, team = string of the team name.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaRequestCombatPermission">
+aaRequestCombatPermission(key ID)
+Where ID = avatar uuid.  Requests target avatar for Permissions to enter into combat mode.
+Raises a run_time_permissions event. (PERMISSION_COMBAT == PERMISSION_COMBAT).
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaThawAvatar">
+aaThawAvatar(key ID)
+Where ID = avatar uuid. If combat permission are granted then avatar can be un-frozen (movement re-enabled).
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaFreezeAvatar">
+aaFreezeAvatar(key ID)
+Where ID = avatar uuid. If combat permission are granted then avatar can be frozen (no movement).
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaGetTeamMembers">
+aaGetTeamMembers(string team)
+Return a list of team members.  Where team = string of team name.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaGetLastOwner">
+    POLYMORPHIC FUNCTION.
+aaGetLastOwner(string PrimID)  returns last owner UUID of PrimID where PrimID = uuid of prim.
+AaGetLastOwner()  returns last owner uuid of prim containg script.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaSayDistance">
+aaSayDistance(integer channelID, float Distance, string text)
+Where channelID = channel to say on, Distance = float in meters  for distance to say, text = string to say.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaSayTo">
+aaSayTo(key userID, string text)
+Where userID = avatar key, text = string msg.  Similar to llOwnerSay but can be directly targeted to an avatar.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaGetWalkDisabled ">
+aaGetWalkDisabled(key ID)
+Returns integer of TRUE or FALSE for specifid ID.  Where ID = avatar uuid.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaSetWalkDisabled">
+aaSetWalkDisabled(key ID, integer Value)
+Where ID = avatar uuid, Value = TRUE or FALSE. If PERMISSION_COMBAT is accepted, this disables walk, forcing avatar to fly.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaGetFlyDisabled ">
+aaGetFlyDisabled(key ID)
+Returns integer of TRUE or FALSE for specifid ID. Where ID = avatar uuid.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaSetFlyDisabled">
+aaSetFlyDisabled(key ID, integer Value)
+Where ID = avatar uuid, Value = TRUE or FALSE. If PERMISSION_COMBAT is accepted, this disables flying, forcing avatar to walk.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaAvatarFullName2Key ">
+aaAvatarFullName2Key(string FullName)
+Returns the avatar uuid from their fullname.  Where FullName = "Firstname Lastname�.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaRaiseError">
+aaRaiseError(string message)
+Allows you to have errors that end the execution of the event and fire another event in the script.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaGetText ">
+aaGetText()
+Returns a string of the hover text of an object.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaGetTextColor ">
+aaGetTextColor()
+Returns the hovertext color in rotation. Use Ex: rotation color = aaGetTextColor() to separate color.x, color.y, color.z, color.s  Where s = value of alpha in llSetText.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaSetEnv ">
+aaSetEnv(string EnvName, list Value)
+Sets environment values.  Where EnvName = ENABLE_GRAVITY, GRAVITY_FORCE_X, GRAVITY_FORCE_Y, GRAVITY_FORCE_Z, ADD_GRAVITY_POINT, ADD_GRAVITY_FORCE, START_TIME_REVERSAL_SAVING,
+STOP_TIME_REVERSAL_SAVING, START_TIME_REVERSAL, STOP_TIME_REVERSAL.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_aaGetIsInfiniteRegion">
+aaGetIsInfiniteRegion()
+Returns TRUE or FALSE if region is an infinite region.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botGetWaitingTime">
+botGetWaitingTime(integer waitTime)
+Returns waitTime as vector.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botSetMap">
+botSetMap(key keyOfBot, list positions, list movementType, integer flags)
+keyOfBot = bot uuid, positions = list of position vectors, movementType = corresponding list of move modes:  0 – walk, 1 – fly,
+flags = BOT_FOLLOW_FLAG_NONE and BOT_FOLLOW_FLAG_INDEFINITELY.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botCreateBot">
+botCreateBot(string FirstName, string LastName, key idToClone, vector startPos)
+Where FirstName and LastName = strings for new bot name.  idToClone = uuid of prebuild avatar to clone OR another existing avatar.  startPos = vector of starting position on region.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botRemoveBot">
+botRemoveBot(key botID)
+Where botID = uuid of bot.  Removes bot identified by botID.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botPauseMovement">
+botPauseMovement(key botID)
+Where botID = bot uuid.  Pauses bot at current position.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botResumeMovement">
+botResumeMovement(key botID)
+Where botID = bot uuid.  Resumes bot movement.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botFollowAvatar">
+botFollowAvatar(key botID, string avName, float startFollowDistance, float endFollowDistance)
+Where botID = bot uuid.  AvName = sting of avatar name OR avatar uuid.  StartFollowDistance = distance to start following from.  EndFollowDistance = distance to stop following avatar.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botStopFollowAvatar">
+botStopFollowAvatar(key botID)
+Where botID = bot uuid.  Stops bot from following an avatar.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botSendChatMessage">
+botSendChatMessage(key botID, string message, integer channel, integer sayType)
+Where  botID = bot uuid.  Message = string msg.  Channel = channel to speak on.  SayType = (0=whisper, 1=say, 2=shout).
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botSendIM">
+botSendIM(string bot, string user, string message)
+Send IM to bot.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botSetShouldFly">
+botSetShouldFly(key botID, integer ShouldFly)
+Where botID = bot uuid.  ShouldFly = TRUE/FALSE.  Enables or disables flight mode.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botSitObject">
+botSitObject(key botID, key objectID, vector offset)
+Where botID = bot uuid,  objectID = uuid of object to sit on,  offset = Vector for sit position (note that VECTOR_ZERO = default sit pos).
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botStandUp">
+botStandUp(key botID)
+Where botID = bot uuid.  Command bot to stand up.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botTouchObject">
+botTouchObject(key botID, key objectID)
+Where botID = bot uuid,  objectID = object uuid.  Causes bot to touch object identified.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botAddTag">
+botAddTag(key botID, string tag)
+Where botID = bot uuid,  tag = string tag over bot.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botGetBotsWithTag">
+botGetBotsWithTag(string tag)
+Where tag = tag string to match.  Return a list of bot UUID's in region with the matching tag.
+(Aurora-Sim only)
+	</string>
+	<string name="LSLTipText_botRemoveBotsWithTag">
+botRemoveBotsWithTag(string tag)
+Where tag = tag string to match.  Removes bot's matching the tag.
+(Aurora-Sim only)
+	</string>
+<!-- *** END OF OpenSimulator & Aurora-Sim syntax section *** -->
+
   <!-- Avatar busy/away mode -->
 	<string name="AvatarSetNotAway">Not Away</string>
 	<string name="AvatarSetAway">Away</string>
@@ -1845,7 +2757,7 @@ Returns a key that is the UUID of the user seated on the prim.
 	<string name="no_copy"     value=" (no copy)" />
 	<string name="temporary"   value=" (temporary)" />
 	<string name="worn"        value=" (worn)" />
-	<string name="locked" value=" (locked)" />
+	<string name="locked"      value=" (locked)" />
 	<string name="link"        value=" (link)" />
 	<string name="broken_link" value=" (broken_link)" />
 	<string name="LoadingContents">Loading contents...</string>
@@ -1854,9 +2766,9 @@ Returns a key that is the UUID of the user seated on the prim.
 	<string name="LockedOnAttachmentPoint" value=" (locked to [ATTACHMENT_POINT])" />
 	<string name="ActiveGesture" value="[GESLABEL] (active)"/>
 	<!-- Gestures labels -->
-    <!-- use value="" because they have preceding spaces -->
-    <string name="Chat Message"  value=" Chat : " />
-    <string name="Sound"         value=" Sound : " />
+	<!-- use value="" because they have preceding spaces -->
+	<string name="Chat Message"  value=" Chat : " />
+	<string name="Sound"         value=" Sound : " />
 	<string name="Wait"          value=" --- Wait : " />
 	<string name="AnimFlagStop"  value=" Stop Animation :    " />
 	<string name="AnimFlagStart" value=" Start Animation :   " />
@@ -1966,707 +2878,4 @@ Try enclosing path to the editor with double quotes.
  <string name="ExternalEditorCommandParseError">Error parsing the external editor command.</string>
  <string name="ExternalEditorFailedToRun">External editor failed to run.</string>
 
-<!-- Addition of OSSL commands for use in OpenSimulator based regions, including Aurora -->
-  <string name="LSLTipText_osSetRegionWaterHeight">
-osSetRegionWaterHeight(float height)
-Adjusts water height on region.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetRegionSunSettings">
-osSetRegionSunSettings(integer useEstateSun, integer sunFixed, float sunHour)
-Changes the estate sun settings, then triggers a sun update
-'sunFixed' TRUE to keep the sun stationary, FALSE to use global time
-'sunHour' The sun hour that is desired, 0...24, 0 is sunrise.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetEstateSunSettings">
-osSetEstateSunSettings(integer sunFixed, float sunHour)
-sunFixed = TRUE or FALSE, sunHour = 00.00 to 24.00.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetCurrentSunHour">
-float osGetCurrentSunHour()
-Returns float value of current sun hour 0...24 0 is sunrise.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSunGetParam">
-*DEPRECATED* Use osGetSunParam instead.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSunSetParam">
-*DEPRECATED* Use osSetSunParam instead.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osWindActiveModelPluginName">
-string osWindActiveModelPluginName()
-Returns the current working wind module installed
-These are SimpleRandomWind or ConfigurableWind.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osParcelJoin">
-osParcelJoin(vector pos1, vector pos2))
-Joins parcels @ X,Y coordinates.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osParcelSubdivide">
-osParcelSubdivide(vector pos1, vector pos2))
-Subdivides parcels @ X,Y coordinates.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osParcelSetDetails">
-*DEPRECATED* Use osSetParcelDetails instead.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osWindParamSet">
-*DEPRECATED* Use osSetWindParam instead.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osWindParamGet">
-*DEPRECATED* Use osGetWindParam instead.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osList2Double">
-double osList2Double(list src, integer index)
-Returns double-precision value from src at index.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetDynamicTextureURL">
-osSetDynamicTextureURL(key dynamicID, string contentType, string url, string extraParams, integer timer )
-Renders a web texture on the prim containing the script, and returns the UUID of the newly created texture.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetDynamicTextureData">
-osSetDynamicTextureData(key dynamicID, string contentType, string data, string extraParams, integer timer)
-Writes text and vector graphics onto a prim face.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetDynamicTextureURLBlend">
-osSetDynamicTextureURLBlend(key dynamicID, string contentType, string url, string extraParams, integer timer, integer alpha)
-Allows for two dynamic textures to blend on the prim containing this script.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetDynamicTextureDataBlend">
-osSetDynamicTextureDataBlend(key dynamicID, string contentType, string data, string extraParams, integer timer, integer alpha)
-Allows for two dynamic textures to blend on the prim containing this script.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetDynamicTextureURLBlendFace">
-osSetDynamicTextureURLBlendFace(key dynamicID, string contentType, string url, string extraParams, integer blend, integer disp, integer timer, integer alpha, integer face)
-Loads a web texture on a prim.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetDynamicTextureDataBlendFace">
-osSetDynamicTextureDataBlendFace(key dynamicID, string contentType, string data, string extraParams, integer blend, integer disp, integer timer, integer alpha, integer face)
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osTerrainGetHeight">
-*DEPRECATED* Use osGetTerrainHeight instead.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osTerrainSetHeight">
-*DEPRECATED* Use osSetTerrainHeight instead.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osTerrainFlush">
-osTerrainFlush()
-Updates terrain data. Call this after you are done using osTerrainSetHeight.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osRegionRestart">
-integer osRegionRestart(float seconds)
-Restart the current region in the specified number of seconds from now.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osRegionNotice">
-osRegionNotice(string msg)
-Broadcasts a notification message to all agents on the current region.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osConsoleCommand">
-osConsoleCommand(string command)
-Issues commands directly to the OpenSim server console.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetParcelMediaURL">
-osSetParcelMediaURL(string url)
-Sets parcel media URL.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetParcelSIPAddress">
-osSetParcelSIPAddress(string SIPAddress)
-Sets parcel SIP Address for Voice.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetPrimFloatOnWater">
-osSetPrimFloatOnWater(integer floatYN)
-Make physical prims float at the water level, TRUE or FALSE.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osTeleportAgent">
-osTeleportAgent(key agent, integer regionX, integer regionY, vector position, vector lookat)
-  or
-osTeleportAgent(key agent, string regionName, vector position, vector lookat)
-  or
-osTeleportAgent(key agent, vector position, vector lookat)
-Teleports the specified agent to a specified location in the region, the grid, or the hypergrid. See documentation for details.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetAgentIP">
-string osGetAgentIP(key agent)
-Returns the Avatars IP Address
-Allows in-world tools be used to coordinate out of world network services that need access to client IP addresses.
-Should *ONLY* be used by Region Server Owner.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetAgents">
-list osGetAgents()
-Returns a list of all avatars in the region in which the script is running.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osAvatarPlayAnimation">
-osAvatarPlayAnimation(key UUID, string animation)
-Triggers animations contained within the same prim as the script. Does not need the target avatar's permission.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osAvatarStopAnimation">
-osAvatarStopAnimation(key UUID, string animation)
-Stops specified animation on the specified avatar.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osMovePen">
-osMovePen(string drawList, integer x, integer y)
-Moves the pen's location to the coordinates specified by the x and y parameters, without drawing anything.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osDrawLine">
-osDrawLine(string drawList, integer startX, integer startY, integer endX, integer endY)
-osDrawLine(string drawList, integer endX, integer endY)
-Draws a line on a dynamic texture.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osDrawText">
-osDrawText(string drawList, string text)
-Renders text on a dynamic texture.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osDrawEllipse">
-osDrawEllipse(string drawList, integer width, integer height)
-Draws an ellipse on a dynamic texture.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osDrawRectangle">
-osDrawRectangle(string drawList, integer width, integer height)
-Draws a rectangle on a dynamic texture.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osDrawFilledRectangle">
-osDrawFilledRectangle(string drawList, integer width, integer height)
-Draws a rectangle on a dynamic texture, and fills it with the current pen color.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osDrawPolygon">
-string osDrawPolygon (string drawList, list x, list y)
-Draws a polygon on a dynamic texture.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osDrawFilledPolygon">
-string osDrawFilledPolygon (string drawList, list x, list y)
-Draws a polygon on a dynamic texture, and fills it with the current pen color.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetFontSize">
-osSetFontSize(string drawList, integer fontSize)
-Sets the font size to be used in osDrawText.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetFontName">
-osSetFontName(string drawList, string fontName)
-Sets current font to be used by osDrawText.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetPenSize">
-osSetPenSize(string drawList, integer penSize)
-Sets the pen size (line thickness) that is to be used when drawing dynamic textures.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetPenCap">
-osSetPenCap(string drawList, string direction, string type)
-Apply a shape on the end of a line. This allows using arrow, diamond, round and flat caps.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetPenColour">
-*DEPRECATED* Use osSetPenColor instead
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osDrawImage">
-osDrawImage(string drawList, integer width, integer height, string imageUrl)
-Retrieves an image specified by the imageUrl parameter and draws it at the specified height and width.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetDrawStringSize">
-vector osGetDrawStringSize(string contentType, string text, string fontName, integer fontSize)
-Returns a vector containing the horizontal and vertical dimensions in pixels of the specified text
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetStateEvents">
-osSetStateEvents(integer events)
-Used in the past as a workaround for a bug with Opensim, which has long since been fixed.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetScriptEngineName">
-string osGetScriptEngineName()
-Returns the name of the script engine which is currently enabled on the server.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetSimulatorVersion">
-string osGetSimulatorVersion()
-Returns OpenSim server version information as a string.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osParseJSON">
-string osParseJSON(string JSON)
-Returns a hashtable containing the structured JSON contents.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osMessageObject">
-osMessageObject(key UUID, string message)
-Sends a string to the object identified by UUID.
-The receiving object requires a dataserver(key queryid, string data) in a contained script(s).
-The queryid passed will be the id of the calling object.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osMakeNotecard">
-osMakeNotecard(string notecardName, list contents)
-Write a Notecard contained in Prim with contents of list.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetNotecardLine">
-string osGetNotecardLine(string name, integer line)
-Reads the requested notecard line and return its data as a string.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetNotecard">
-string osGetNotecard(string name)
-Reads the entire notecard and return its data as a string.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetNumberOfNotecardLines">
-integer osGetNumberOfNotecardLines(string name)
-Returns total number of lines in a notecard.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osAvatarName2Key">
-key osAvatarName2Key(string firstname, string lastname)
-Returns the avatar's UUID from their firstname, lastname.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osKey2Name">
-string osKey2Name(key UUID)
-Returns avatar name from their UUID key.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetGridNick">
-string osGetGridNick()
-Returns the grid's nickname.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetGridName">
-string osGetGridName()
-Returns the grid's name.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetGridLoginURI">
-string osGetGridLoginURI()
-Returns the grid's LoginURI.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osFormatString">
-string osFormatString(string str, list strings)
-Return the string with parameters substituted into it (format comes from .NET String.Format class)
-Parameters are specified positionally.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osMatchString">
-list osMatchString(string src, string pattern, integer start)
-Return a list of matches for the pattern and its components inside the source string.
-The pattern is a regular expression. Each match in the result is the string that matched and its position in the source.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osLoadedCreationDate">
-string osLoadedCreationDate()
-Returns Creation Date from meta data of OAR.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osLoadedCreationTime">
-string osLoadedCreationTime()
-Returns Creation Time from meta data of OAR.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osLoadedCreationID">
-string osLoadedCreationID()
-Returns creation ID from meta data of OAR. Can not be used to identify a machine.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetLinkPrimitiveParams">
-list osGetLinkPrimitiveParams(integer linknumber, list rules)
-Returns the primitive parameters for the linkset prims specified by linknumber. If using linkset constants (e.g. LINK_SET, LINK_ALL_CHILDREN, etc), the requested parameters of each relevant prim are concatenated to the end of the list. Otherwise, usage is identical to llGetPrimitiveParams().
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcCreate">
-key osNpcCreate(string firstname, string lastname, vector position, key UUID)
-Creates an NPC (Non Player Character) clone named firstname lastname at position from an already existing avatar specified by UUID.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcMoveTo">
-osNpcMoveTo(key npc, vector position)
-Moves an NPC to a location within the region.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcSay">
-osNpcSay(key npc, string message)
-Makes an NPC say something.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcRemove">
-osNpcRemove(key npc)
-Removes an NPC.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetMapTexture">
-key osGetMapTexture()
-Returns the map texture UUID.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetRegionMapTexture">
-key osGetRegionMapTexture(string regionName)
-Returns the map texture UUID for the regionName requested.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetRegionStats">
-list osGetRegionStats()
-Returns a list of float values representing a number of region statistics (21 of the values shown in the statistics bar of LL-based clients).
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetSimulatorMemory">
-integer osGetSimulatorMemory()
-Returns the current amount of RAM used by the current OpenSim instance.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osKickAvatar">
-osKickAvatar(string FirstName, string LastName, string alert)
-Kicks avatar from region with an alert message.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetSpeed">
-osSetSpeed(key UUID, float SpeedModifier)
-Multiplies the normal running, walking, and flying speed of the specified avatar.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osCauseDamage">
-osCauseDamage(key UUID, float damage)
-Causes damage to specified avatar.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osCauseHealing">
-osCauseHealing(key UUID, float healing)
-Causes healing to specified avatar.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetPrimitiveParams">
-list osGetPrimitiveParams(key prim, list rules)
-Gets the parameters of the primitive, specified by key.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetPrimitiveParams">
-osSetPrimitiveParams(key prim, list rules)
-Sets primitive Params.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetProjectionParams">
-osSetProjectionParams(key prim. integer projection, key texture, float fov, float focus, float amb)
-Set projection paramaters for light sources.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osUnixTimeToTimestamp">
-string osUnixTimeToTimestamp(integer unixtime)
-Converts unixtime to an llGetTimeStamp() formated string.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetPenColor">
-osSetPenColor(string drawList, string color)
-Sets the pen color that is to be used when drawing dynamic textures.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetSunParam">
-float osGetSunParam(string param)
-Returns current float values for param, where param = day_length, year_length, day_night_offset, update_interval.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetSunParam">
-osSetSunParam(string param, float value)
-Sets region's sun parameters, where param = day_length, year_length, day_night_offset, update_interval.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetParcelDetails">
-osSetParcelDetails(vector pos, list rules)
-Set parcel details.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetTerrainHeight">
-float osGetTerrainHeight(integer x, integer y)
-Returns current terrain height at the given coordinates.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetTerrainHeight">
-osSetTerrainHeight(integer x, integer y, float val)
-Sets terrain height at the given coordinates. Use osTerrainFlush() afterwards.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetAvatarList">
-list osGetAvatarList()
-Returns a strided list of the UUID, position, and name of each avatar in the region, except the owner.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osTeleportOwner">
-osTeleportOwner(integer regionX, integer regionY, vector position, vector lookat)
-  or
-osTeleportOwner(string regionName, vector position, vector lookat)
-  or
-osTeleportOwner(vector position, vector lookat)
-Teleports the owner of the object that holds the script to a specified location in the region, the grid, or the hypergrid. See documentation for details.
-(OpenSim only.)
-  </string>
-
-  <!-- LightShare functions -->
-  <string name="LSLTipText_cmSetWindlightScene">
-integer cmSetWindlightScene(list rules)
-Set the current WindLight scene. Estate managers and owners only.
-(Reguires LightShare)
-  </string>
-  <string name="LSLTipText_cmSetWindlightSceneTargeted">
-integer cmSetWindlightSceneTargeted(list rules, key target)
-Set the current WindLight scene directed at a specific avatar. Estate managers and owners only.
-(Reguires LightShare)
-  </string>
-  <string name="LSLTipText_cmGetWindlightScene">
-list cmGetWindlightScene(list rules)
-Get the current WindLight settings.
-(Reguires LightShare)
-  </string>
-  <!-- LightShare functions - alternate versions -->
-  <!-- don't ask me why they renamed 'em, but we need to include both versions - -  MC -->
-  <string name="LSLTipText_lsSetWindlightScene">
-integer lsSetWindlightScene(list rules)
-Set the current WindLight scene. Estate managers and owners only.
-(Reguires LightShare)
-  </string>
-  <string name="LSLTipText_lsSetWindlightSceneTargeted">
-integer lsSetWindlightSceneTargeted(list rules, key target)
-Set the current WindLight scene directed at a specific avatar. Estate managers and owners only.
-(Reguires LightShare)
-  </string>
-  <string name="LSLTipText_lsGetWindlightScene">
-list lsGetWindlightScene(list rules)
-Get the current WindLight settings.
-(Reguires LightShare)
-  </string>
-
-  <!-- New OSSL Functions as of 8-10-2011 -->
-  <string name="LSLTipText_osNpcSaveAppearance">
-key osNpcSaveAppearance(key npc, string notecardName)
-Saves the NPC's appearance to a notecard.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcLoadAppearance">
-osNpcLoadAppearance(key npc, string notecardName)
-Loads the NPC's appearance from a notecard with appearance data.
-Notecards can also be loaded by UUID.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcMoveToTarget">
-osNpcMoveToTarget(key npc, vector position, integer options)
-Moves the NPC to a target at a given vector, using options to walk or to fly there.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osOwnerSaveAppearance">
-key osOwnerSaveAppearance(string notecardName)
-Saves the owner's appearance to a notecard inside the prim that holds the script.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcGetRot">
-rotation osNpcGetRot(key npc)
-Retrieves the rotation of an NPC
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcSetRot">
-osNpcSetRot(key npc, rotation rot)
-Sets an NPC's rotation.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osAgentSaveAppearance">
-key osOwnerSaveAppearance(key avatarId, string notecardName)
-Saves an avatar's appearance to a notecard inside the prim that holds the script.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcGetPos">
-vector osNpcGetPos(key npc)
-Retrieves the vector of an NPC's position within a region.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcStopMoveToTarget">
-osNpcStopMoveToTarget(key npc)
-Makes an NPC stop moving to a target.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetWindParam">
-float osGetWindParam(string plugin, string param)
-Gets the value of param property for plugin module.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetWindParam">
-osSetWindParam(string plugin, string param, float value)
-Sets value of param property for plugin module.
-(OpenSim only.)
-  </string>
-  <string name="Unnamed">(Unnamed)</string>
-  <string name="LSLTipText_llGetMassMKS">
-float llGetMassMKS()
-Returns a float that is the mass (in
-Kilograms) of the object that the
-script is attached to.
-  </string>
-  <string name="LSLTipText_llGetMemoryLimit">
-integer llGetMemoryLimit()
-Get the maximum memory a script can use.
-  </string>
-  <string name="LSLTipText_llGetParcelMusicURL">
-string llGetParcelMusicURL()
-Returns a string containing the parcel streaming audio URL.
-The object owner must also be the land owner.
-  </string>
-  <string name="LSLTipText_llGetPhysicsMaterial">
-list llGetPhysicsMaterial()
-Used to get the physical characteristics of an object.
-Returns a list in the form [ float gravity_multiplier, float restitution, float friction, float density ]
-  </string>
-  <string name="LSLTipText_llManageEstateAccess">
-integer llManageEstateAccess(integer action, key avatar)
-Used to add or remove agents from the estate's agent access or ban lists or groups from the estate's group access list.
-  </string>
-  <string name="LSLTipText_llSetAngularVelocity">
-llSetAngularVelocity(vector force, integer local)
-Applies rotational velocity to object.
-  </string>
-  <string name="LSLTipText_llSetKeyframedMotion">
-llSetKeyframedMotion(list keyframes, list options)
-Specify a list of times, positions, and orientations to be followed by an object. The object will be  smoothly moved between keyframes by the simulator.
-  </string>
-  <string name="LSLTipText_llSetPhysicsMaterial">
-llSetPhysicsMaterial(integer material, float gravity,
-float restitution, float friction, float density)
-Used for setting the physical characteristics of an object.
-  </string>
-  <string name="LSLTipText_llSetRegionPos">
-integer llSetRegionPos(vector position)
-Tries to move the entire object so that the root prim is within 0.1m of position
-  </string>
-  <string name="LSLTipText_llSetVelocity">
-llSetVelocity(vector force, integer local)
-Applies velocity to an object
-  </string>
-  <string name="LSLTipText_llTransferLindenDollars">
-key llTransferLindenDollars(key destination, integer amount)
-Transfer amount of L$ money from script owner to destination avatar.
-  </string>
-
-<!-- Pathfinder functions. Current state: alpha -->
-  <string name="LSLTipText_llCreateCharacter">
-llCreateCharacter(list options)
-Creates a pathfinding entity, known as a "character" from the object containing the script.
-  </string>
-  <string name="LSLTipText_llDeleteCharacter">
-llDeleteCharacter()
-Convert the current linkset back to a standard object, removing all pathfinding properties.
-  </string>
-  <string name="LSLTipText_llEvade">
-llEvade(key target, list options)
-Characters will try to hide from their pursuers if there is a good hiding spot along their fleeing path.
-  </string>
-  <string name="LSLTipText_llExecCharacterCmd">
-llExecCharacterCmd(integer command, list options)
-Send a command to the pathing system.
-  </string>
-  <string name="LSLTipText_llGetClosestNavPoint">
-list llGetClosestNavPoint(vector point, list options)
-Finds the closest navpoint and returns a list with a single vector if succesful. Returns empty list when no navpoints found.
-  </string>
-  <string name="LSLTipText_llFleeFrom">
-llFleeFrom(vector source, float distance, list options)
-Tells an object to keep away from a defined position in the region or adjacent regions.
-  </string>
-  <string name="LSLTipText_llNavigateTo">
-llNavigateTo(vector pos, list options)
-Tells an object to travel to a defined position in the region or adjacent regions.
-  </string>
-  <string name="LSLTipText_llPatrolPoints">
-llPatrolPoints(list patrolPoints, list options)
-Sets the object patrolling between the points specified in patrolPoints.
-  </string>
-  <string name="LSLTipText_llPursue">
-llPursue(key target, list options)
-Causes the object to pursue a target.
-  </string>
-  <string name="LSLTipText_llUpdateCharacter">
-llUpdateCharacter(list options)
-Updates settings for a character.
-  </string>
-  <string name="LSLTipText_llWanderWithin">
-llWanderWithin(vector origin, float dist, list options)
-Sets a character to wander about a central spot within a specified radius.
-  </string>
-  <string name="LSLTipText_osIsNpc">
-integer osIsNpc(key npc)
-Returns TRUE if the given key is an NPC, false otherwise.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcGetOwner">
-key osNpcGetOwner(key npc)
-Return the owner key of the given NPC. If the NPC is unowned or the input key does not belong to an NPC then it returns NULL_KEY.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetGridCustom">
-string osGetGridCustom(string key)
-Reads configuration strings from the [GridInfo] setion in OpenSim.ini.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osGetGridHomeURI">
-string osGetGridHomeURI()
-Returns the hypergrid URI of the grid where the user logged in.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcPlayAnimation">
-osNpcPlayAnimation(key npc, string animation)
-Get an NPC to play an animation. The animation can either be a key or the name of an animation in the same object as the script.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcSit">
-osNpcSit(key npc, key target, integer options)
-Sit an NPC on a prim target. No options have been implemented yet, so always input 0.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcStand">
-osNpcStand(key npc)
-Make an NPC stand up.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osNpcStopAnimation">
-osNpcStopAnimation(key npc, string animation)
-Get an NPC to stop playing an animation. The animation can either be a key or the name of an animation in the same inventory as the script.
-(OpenSim only.)
-  </string>
-  <string name="LSLTipText_osSetRot">
-osSetRot(key target, quaternion rotation)
-Rotates an object or avatar.
-(OpenSim only.)
-  </string>
 </strings>

From af2a49afa72c5aa629e803627ae41e3e8fef7d46 Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Thu, 2 Aug 2012 05:39:02 -0400
Subject: [PATCH 120/199] Fixed linux64 libpng copying

---
 indra/newview/viewer_manifest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 0c06505e4..e595d9e13 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -837,7 +837,7 @@ class Linux_x86_64Manifest(LinuxManifest):
             self.path("libSDL-1.2.so*")
             self.path("libELFIO.so")
             self.path("libjpeg.so*")
-            self.path("libpng.so*")
+            self.path("libpng*.so*")
             self.path("libz.so*")
 
             # OpenAL

From a673496ed329182fc6066eec2a798bc3acecb6c9 Mon Sep 17 00:00:00 2001
From: Damian Zhaoying <damian.zhaoying@avataresargentinos.com.ar>
Date: Thu, 2 Aug 2012 09:08:57 -0300
Subject: [PATCH 121/199] Update Spanish Translation, All files translated and
 up to date

---
 .../skins/default/xui/es/floater_about.xml    |    30 +-
 .../skins/default/xui/es/floater_ao.xml       |   188 +-
 .../xui/es/floater_asset_text_editor.xml      |    12 +-
 .../default/xui/es/floater_blacklist.xml      |    34 +-
 .../xui/es/floater_chatterbox_wolf.xml        |     4 +-
 .../skins/default/xui/es/floater_clothing.xml |    14 +-
 .../default/xui/es/floater_contact_groups.xml |    37 +-
 .../default/xui/es/floater_directory.xml      |    13 +-
 .../default/xui/es/floater_directory2.xml     |   787 +-
 .../default/xui/es/floater_directory3.xml     |   960 +-
 .../default/xui/es/floater_display_name.xml   |     2 -
 .../xui/es/floater_explore_animations.xml     |     8 +-
 .../default/xui/es/floater_explore_sounds.xml |    44 +-
 .../default/xui/es/floater_fast_timers.xml    |    14 +-
 .../default/xui/es/floater_font_test.xml      |   168 +-
 .../default/xui/es/floater_god_tools.xml      |   333 +-
 .../default/xui/es/floater_group_titles.xml   |    14 +-
 .../xui/es/floater_hardware_settings.xml      |    47 -
 .../skins/default/xui/es/floater_hex.xml      |    14 +-
 .../default/xui/es/floater_html_simple.xml    |     2 +-
 .../skins/default/xui/es/floater_hud.xml      |     6 +-
 .../default/xui/es/floater_image_preview.xml  |     4 +-
 .../xui/es/floater_instant_message_group.xml  |    26 +-
 .../default/xui/es/floater_inventory.xml      |   292 +-
 .../xui/es/floater_inventory_backup.xml       |    12 +-
 .../es/floater_inventory_backup_settings.xml  |    24 +-
 .../es/floater_inventory_item_properties.xml  |    15 +-
 .../xui/es/floater_local_asset_browse.xml     |    95 +-
 .../default/xui/es/floater_media_filter.xml   |    48 +-
 .../xui/es/floater_message_builder.xml        |    20 +-
 .../default/xui/es/floater_message_log.xml    |    46 +-
 .../skins/default/xui/es/floater_mute.xml     |     8 +-
 .../xui/es/floater_new_local_inventory.xml    |   181 +-
 .../default/xui/es/floater_object_backup.xml  |     6 +-
 .../default/xui/es/floater_post_process.xml   |     4 +-
 .../xui/es/floater_preview_new_landmark.xml   |     4 +-
 .../default/xui/es/floater_preview_sound.xml  |    11 +-
 .../xui/es/floater_preview_texture.xml        |    14 +-
 .../skins/default/xui/es/floater_radar.xml    |     1 -
 .../default/xui/es/floater_script_search.xml  |    45 +-
 .../default/xui/es/floater_sculpt_preview.xml |    31 +-
 .../default/xui/es/floater_search_replace.xml |    45 +-
 .../default/xui/es/floater_select_key.xml     |    16 +-
 .../default/xui/es/floater_sell_land.xml      |   118 +-
 .../default/xui/es/floater_settings_debug.xml |    39 +-
 .../xui/es/floater_sim_release_message.xml    |    13 +-
 .../xui/es/floater_skin_preview_template.xml  |   109 +-
 .../skins/default/xui/es/floater_snapshot.xml |   204 +-
 .../default/xui/es/floater_sound_preview.xml  |    32 +-
 .../default/xui/es/floater_statistics.xml     |    13 +-
 .../skins/default/xui/es/floater_telehub.xml  |    58 +-
 .../skins/default/xui/es/floater_teleport.xml |    57 +-
 .../xui/es/floater_teleport_history.xml       |    35 +-
 .../skins/default/xui/es/floater_test.xml     |     4 +-
 .../default/xui/es/floater_texture_ctrl.xml   |   139 +-
 .../skins/default/xui/es/floater_tools.xml    |  1784 +--
 .../default/xui/es/floater_top_objects.xml    |   104 +-
 .../skins/default/xui/es/floater_tos.xml      |    36 +-
 .../default/xui/es/floater_url_entry.xml      |    26 +-
 .../skins/default/xui/es/floater_vfs.xml      |     5 +-
 .../default/xui/es/floater_vfs_explorer.xml   |     5 +-
 .../default/xui/es/floater_voice_license.xml  |    56 +-
 .../default/xui/es/floater_voice_wizard.xml   |    25 +-
 .../skins/default/xui/es/floater_water.xml    |   294 +-
 .../xui/es/floater_wearable_save_as.xml       |    28 +-
 .../xui/es/floater_windlight_options.xml      |   657 +-
 .../default/xui/es/floater_world_map.xml      |   208 +-
 indra/newview/skins/default/xui/es/fonts.xml  |    71 +-
 .../skins/default/xui/es/menu_login.xml       |     4 +-
 .../skins/default/xui/es/menu_mini_map.xml    |     7 +-
 .../default/xui/es/menu_pie_attachment.xml    |     6 +-
 .../skins/default/xui/es/menu_pie_object.xml  |     4 +-
 .../skins/default/xui/es/menu_pie_self.xml    |     2 +-
 .../skins/default/xui/es/menu_slurl.xml       |     3 +-
 .../skins/default/xui/es/mime_types_linux.xml |   134 +-
 .../skins/default/xui/es/mime_types_mac.xml   |   134 +-
 .../default/xui/es/mime_types_windows.xml     |   130 +-
 .../skins/default/xui/es/notifications.xml    | 10724 +++++-----------
 .../default/xui/es/panel_audio_device.xml     |     2 +-
 .../skins/default/xui/es/panel_classified.xml |    56 +-
 .../skins/default/xui/es/panel_event.xml      |   134 +-
 .../skins/default/xui/es/panel_friends.xml    |    68 +-
 .../skins/default/xui/es/panel_group.xml      |    34 +-
 .../default/xui/es/panel_group_finder.xml     |    26 +-
 .../default/xui/es/panel_group_general.xml    |   154 +-
 .../default/xui/es/panel_group_land_money.xml |    32 +-
 .../default/xui/es/panel_group_notices.xml    |   122 +-
 .../default/xui/es/panel_group_roles.xml      |   292 +-
 .../default/xui/es/panel_group_voting.xml     |   237 +-
 .../skins/default/xui/es/panel_groups.xml     |    68 +-
 .../skins/default/xui/es/panel_hud.xml        |     4 +-
 .../default/xui/es/panel_land_covenant.xml    |    63 +-
 .../skins/default/xui/es/panel_login.xml      |    90 +-
 .../default/xui/es/panel_master_volume.xml    |    17 +-
 .../default/xui/es/panel_media_controls.xml   |   100 +-
 .../skins/default/xui/es/panel_media_hud.xml  |    80 +-
 .../default/xui/es/panel_media_remote.xml     |     8 +-
 .../xui/es/panel_media_remote_expanded.xml    |    29 +-
 .../skins/default/xui/es/panel_mini_map.xml   |    50 +-
 .../xui/es/panel_notifications_channel.xml    |    28 +-
 .../skins/default/xui/es/panel_overlaybar.xml |    95 +-
 .../skins/default/xui/es/panel_place.xml      |    54 +-
 .../default/xui/es/panel_place_small.xml      |    60 +-
 .../xui/es/panel_preferences_ascent_chat.xml  |   252 +-
 .../es/panel_preferences_ascent_system.xml    |   329 +-
 .../es/panel_preferences_ascent_vanity.xml    |   127 +-
 .../xui/es/panel_preferences_audio.xml        |    38 +-
 .../default/xui/es/panel_preferences_chat.xml |   107 +-
 .../xui/es/panel_preferences_general.xml      |   300 +-
 .../xui/es/panel_preferences_graphics1.xml    |   399 +-
 .../xui/es/panel_preferences_grids.xml        |   137 +-
 .../xui/es/panel_preferences_input.xml        |    52 +-
 .../xui/es/panel_preferences_network.xml      |   118 +-
 .../xui/es/panel_preferences_skins.xml        |    52 +-
 .../xui/es/panel_preferences_voice.xml        |    74 +-
 .../skins/default/xui/es/panel_progress.xml   |    34 +-
 .../default/xui/es/panel_region_covenant.xml  |   154 +-
 .../default/xui/es/panel_region_debug.xml     |   106 +-
 .../default/xui/es/panel_region_estate.xml    |   188 +-
 .../default/xui/es/panel_region_general.xml   |   127 +-
 .../default/xui/es/panel_region_terrain.xml   |    79 +-
 .../default/xui/es/panel_region_texture.xml   |   117 +-
 .../default/xui/es/panel_scrolling_param.xml  |    46 +-
 .../default/xui/es/panel_speaker_controls.xml |    57 +-
 .../skins/default/xui/es/panel_status_bar.xml |    10 +-
 .../skins/default/xui/es/panel_toolbar.xml    |    32 +-
 .../skins/default/xui/es/panel_top_pick.xml   |    33 +-
 .../default/xui/es/panel_voice_controls.xml   |    22 +-
 .../default/xui/es/panel_voice_enable.xml     |    42 +-
 .../default/xui/es/panel_voice_options.xml    |    49 +-
 .../default/xui/es/panel_voice_remote.xml     |     9 +-
 .../xui/es/panel_voice_remote_expanded.xml    |    25 +-
 .../skins/default/xui/es/rlva_strings.xml     |   215 +-
 .../skins/default/xui/es/role_actions.xml     |   337 +-
 .../xui/es/sh_floater_media_ticker.xml        |    25 +-
 .../es/sh_floater_media_ticker_visualizer.xml |    25 +-
 .../newview/skins/default/xui/es/strings.xml  |   710 +-
 .../skins/default/xui/es/teleport_strings.xml |    84 +-
 .../skins/default/xui/es/ui_strings.xml       |     4 +-
 .../xui/es/wlfPanel_AdvSettings_expanded.xml  |    38 +-
 140 files changed, 9118 insertions(+), 16285 deletions(-)
 delete mode 100644 indra/newview/skins/default/xui/es/floater_hardware_settings.xml

diff --git a/indra/newview/skins/default/xui/es/floater_about.xml b/indra/newview/skins/default/xui/es/floater_about.xml
index 48ddb47ea..64b953cf9 100644
--- a/indra/newview/skins/default/xui/es/floater_about.xml
+++ b/indra/newview/skins/default/xui/es/floater_about.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_about" title="Acerca de Singularity Viewer">
-  <tab_container name="about_tab">
-    <panel label="Información" help_topic="about_support_tab" name="support_panel">
-      <button label="Copiar al portapapeles" name="copy_btn"/>
-    </panel>
+	<tab_container name="about_tab">
+		<panel label="Información" help_topic="about_support_tab" name="support_panel">
+			<button label="Copiar al portapapeles" name="copy_btn"/>
+		</panel>
 
-    <panel label="Créditos" help_topic="about_credits_tab" name="credits_panel">
-      <text_editor name="credits_editor">
+		<panel label="Créditos" help_topic="about_credits_tab" name="credits_panel">
+			<text_editor name="credits_editor">
 Singularity Viewer es desarrollado y mantenido por Siana Gearz, Shyotl Kuhr, Aleric Inglewood, Narv Czervik, Tigh MacFanatic, Inusaito Kanya, Sovereign Engineer y Latif Khalifa, con contribuciones de Fractured Crystal, Fritigern Gothly, Henri Beauchamp, McCabe Maxsted, Kadah Coba, Kitty Barnett, nhede Core, Nomade Zhao, Revolution Smythe, Selvone Franizzi, Thickbrick Sleaford, Zauber Parecelsus, Wolfspirit Magic y otros. Singularity está basado en el código fuente del Visor Ascent. Los créditos del Visor Ascent incluyen a Hg Beeks, Charley Levenque, Hazim Gazov, Zwagoth Klaar, Qarl Fizz, y otros. El Visor Ascent está basado en el código fuente del visor Inertia.
 
 Singularity Viewer incluye código fuente aportado por los siguientes residentes: Able Whitman, Adam Marker, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Argent Stonecutter, Asuka Neely, Balp Allen, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fractured Crystal, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kunnis Basiat, Lisa Lowe, Lockhart Cordoso, 
-maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas, Franxisco Romano, Damian Zhaoying
+maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas, Damian Zhaoying
 
 Second Life llega a ti gracias a 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, 
@@ -19,11 +19,11 @@ Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira,
 
 Linden Lab agradece a los siguientes residentes: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota 
 Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
-      </text_editor>
-    </panel>
+			</text_editor>
+		</panel>
 
-    <panel label="Licenses" name="licenses_panel">
-      <text_editor name="licenses_editor"> 
+		<panel label="Licenses" name="licenses_panel">
+			<text_editor name="licenses_editor"> 
 3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
 APR Copyright (C) 2000-2012 The Apache Software Foundation
 Collada DOM Copyright 2006 Sony Computer Entertainment Inc.
@@ -50,8 +50,8 @@ zlib Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler.
 All rights reserved.  Ver licenses.txt para mayor información.
 
 Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
-      </text_editor>
-    </panel>
-  </tab_container>  
-  <string name="you_are_at">Estás en [POSITION]</string>
+			</text_editor>
+		</panel>
+	</tab_container>  
+	<string name="you_are_at">Estás en [POSITION]</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_ao.xml b/indra/newview/skins/default/xui/es/floater_ao.xml
index 06925ab5d..fa0ca7565 100644
--- a/indra/newview/skins/default/xui/es/floater_ao.xml
+++ b/indra/newview/skins/default/xui/es/floater_ao.xml
@@ -1,97 +1,97 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="geminifloater" title="Animation Overrider">
-	  <view_border name="ao_notecard"/>
-	  <view_border name="ao_notecard_vis"/>
-	  <text name="Give inventory" tool_tip="Arrastra aquí una nota de configuración de ZHAO. Las animaciones tienen que estar en la misma carpeta que la nota de configuración">
-			 Arrastra aquí la nota del ZHAO II
-	  </text>
-	  <view_border name="ao_notecard_disp"/>
-	  <text name="ao_nc_text" tool_tip="">
-			 Utilizando: ITEM
-	  </text>
-	  <button name="opencard" label="Ver Notecard"/>
-	  <button name="reloadcard" label="Recargar"/>
-	  <check_box control_name="AOEnabled" label="Activar animations override" name="AOEnabled"/>
-	  <check_box control_name="AOSitsEnabled" label="Activar sits override" name="AOSitsEnabled"/>
-	  <text name="buttons_desc">
-			 De Pie:
-	  </text>
-	  <combo_box name="stands" label=""/>
-	  <button name="prevstand" tool_tip="Vista Previa de Pie" label="&lt;&lt;"/>
-	  <button name="nextstand" tool_tip="Siguiente Animación de Pie" label="&gt;&gt;"/>
-	  <check_box control_name="AOStandRandomize" label="Orden de Reprodución al azar" name="AOStandRandomize"/>
-	  <check_box control_name="AONoStandsInMouselook" label="Desactiva De Pie en Vista Subjetiva" name="AONoStandsInMouselook"/>
-	  <check_box control_name="EnableAORemote" label="Mostrar AO En Barra de Herram." name="ao_remote_checkbox"/>
-	  <spinner control_name="AOStandInterval" name="standtime" label="Tiempo de Ejecución:" label_width="120" tool_tip="Tiempo de ejecuón de la animación, en segundos" />
-	  <button name="newcard" label="Nueva Plantilla de Nota" />
-	  <button label="Más &gt;&gt;" name="more_btn" tool_tip="Opciones Avanzadas" />
-	  <button label="&lt;&lt; Menos" name="less_btn" tool_tip="Opciones Avanzadas" />
-	  <tab_container label="Por Defecto" name="tabcontainer" >
-			 <panel label="Animaciones por Defecto" name="tabdefaultanims">
-					<text name="textdefaultwalk">
-						  Caminar:
-					</text>
-					<combo_box name="walks" label="" control_name="AODefaultWalk" />
-					<text name="textdefaultrun">
-						  Correr:
-					</text>
-					<combo_box name="runs" label="" control_name="AODefaultRun" />
-					<text name="textdefaultjump">
-						  Saltar:
-					</text>
-					<combo_box name="jumps" label="" control_name="AODefaultJump" />
-					<text name="textdefaultsit">
-						  Sentado:
-					</text>
-					<combo_box name="sits" label="" control_name="AODefaultSit" />
-					<text name="textdefaultgsit">
-						  Sentado en el Suelo:
-					</text>
-					<combo_box name="gsits" label="" control_name="AODefaultGroundSit" />
-					<text name="textdefaultcrouch">
-						  Agachado:
-					</text>
-					<combo_box name="crouchs" label="" control_name="AODefaultCrouch" />
-					<text name="textdefaultcrouchwalk">
-						  Caminar Agachado:
-					</text>
-					<combo_box name="cwalks" label="" control_name="AODefaultCrouchWalk" />
-					<text name="textdefaultfall">
-						  Caer:
-					</text>
-					<combo_box name="falls" label="" control_name="AODefaultFall" />
-					<text name="textdefaulthover">
-						  Flotar:
-					</text>
-					<combo_box name="hovers" label="" control_name="AODefaultHover" />
-					<text name="textdefaultfly">
-						  Volar:
-					</text>
-					<combo_box name="flys" label="" control_name="AODefaultFly" />
-					<text name="textdefaultflyslow">
-						  Vuelo Lento:
-					</text>
-					<combo_box name="flyslows" label="" control_name="AODefaultFlySlow" />
-					<text name="textdefaultflyup">
-						  Volar Subiendo:
-					</text>
-					<combo_box name="flyups" label="" control_name="AODefaultFlyUp" />
-					<text name="textdefaultflydown">
-						  Volar Bajando:
-					</text>
-					<combo_box name="flydowns" label="" control_name="AODefaultFlyDown" />
-					<text name="textdefaultland">
-						  Aterrizar:
-					</text>
-					<combo_box name="lands" label="" control_name="AODefaultLand" />
-					<text name="textdefaultstandup">
-						  Ponerse de Pie:
-					</text>
-					<combo_box name="standups" label="" control_name="AODefaultStandUp" />
-					<text name="textdefaultprejump">
-						  Antes de Saltar:
-					</text>
-					<combo_box name="prejumps" label="" control_name="AODefaultPreJump" />
-			 </panel>
-	  </tab_container>
+	<view_border name="ao_notecard"/>
+	<view_border name="ao_notecard_vis"/>
+	<text name="Give inventory" tool_tip="Arrastra aquí una nota de configuración de ZHAO. Las animaciones tienen que estar en la misma carpeta que la nota de configuración">
+		Arrastra aquí la nota del ZHAO II
+	</text>
+	<view_border name="ao_notecard_disp"/>
+	<text name="ao_nc_text" tool_tip="">
+		Utilizando: ITEM
+	</text>
+	<button name="opencard" label="Ver Notecard"/>
+	<button name="reloadcard" label="Recargar"/>
+	<check_box control_name="AOEnabled" label="Activar animations override" name="AOEnabled"/>
+	<check_box control_name="AOSitsEnabled" label="Activar sits override" name="AOSitsEnabled"/>
+	<text name="buttons_desc">
+		De Pie:
+	</text>
+	<combo_box name="stands" label=""/>
+	<button name="prevstand" tool_tip="Vista Previa de Pie" label="&lt;&lt;"/>
+	<button name="nextstand" tool_tip="Siguiente Animación de Pie" label="&gt;&gt;"/>
+	<check_box control_name="AOStandRandomize" label="Orden de Reprodución al azar" name="AOStandRandomize"/>
+	<check_box control_name="AONoStandsInMouselook" label="Desactiva De Pie en Vista Subjetiva" name="AONoStandsInMouselook"/>
+	<check_box control_name="EnableAORemote" label="Mostrar AO En Barra de Herram." name="ao_remote_checkbox"/>
+	<spinner control_name="AOStandInterval" name="standtime" label="Tiempo de Ejecución:" label_width="120" tool_tip="Tiempo de ejecuón de la animación, en segundos" />
+	<button name="newcard" label="Nueva Plantilla de Nota" />
+	<button label="Más &gt;&gt;" name="more_btn" tool_tip="Opciones Avanzadas" />
+	<button label="&lt;&lt; Menos" name="less_btn" tool_tip="Opciones Avanzadas" />
+	<tab_container label="Por Defecto" name="tabcontainer" >
+		<panel label="Animaciones por Defecto" name="tabdefaultanims">
+			<text name="textdefaultwalk">
+				Caminar:
+			</text>
+			<combo_box name="walks" label="" control_name="AODefaultWalk" />
+			<text name="textdefaultrun">
+				Correr:
+			</text>
+			<combo_box name="runs" label="" control_name="AODefaultRun" />
+			<text name="textdefaultjump">
+				Saltar:
+			</text>
+			<combo_box name="jumps" label="" control_name="AODefaultJump" />
+			<text name="textdefaultsit">
+				Sentado:
+			</text>
+			<combo_box name="sits" label="" control_name="AODefaultSit" />
+			<text name="textdefaultgsit">
+				Sentado en el Suelo:
+			</text>
+			<combo_box name="gsits" label="" control_name="AODefaultGroundSit" />
+			<text name="textdefaultcrouch">
+				Agachado:
+			</text>
+			<combo_box name="crouchs" label="" control_name="AODefaultCrouch" />
+			<text name="textdefaultcrouchwalk">
+				Caminar Agachado:
+			</text>
+			<combo_box name="cwalks" label="" control_name="AODefaultCrouchWalk" />
+			<text name="textdefaultfall">
+				Caer:
+			</text>
+			<combo_box name="falls" label="" control_name="AODefaultFall" />
+			<text name="textdefaulthover">
+				Flotar:
+			</text>
+			<combo_box name="hovers" label="" control_name="AODefaultHover" />
+			<text name="textdefaultfly">
+				Volar:
+			</text>
+			<combo_box name="flys" label="" control_name="AODefaultFly" />
+			<text name="textdefaultflyslow">
+				Vuelo Lento:
+			</text>
+			<combo_box name="flyslows" label="" control_name="AODefaultFlySlow" />
+			<text name="textdefaultflyup">
+				Volar Subiendo:
+			</text>
+			<combo_box name="flyups" label="" control_name="AODefaultFlyUp" />
+			<text name="textdefaultflydown">
+				Volar Bajando:
+			</text>
+			<combo_box name="flydowns" label="" control_name="AODefaultFlyDown" />
+			<text name="textdefaultland">
+				Aterrizar:
+			</text>
+			<combo_box name="lands" label="" control_name="AODefaultLand" />
+			<text name="textdefaultstandup">
+				Ponerse de Pie:
+			</text>
+			<combo_box name="standups" label="" control_name="AODefaultStandUp" />
+			<text name="textdefaultprejump">
+				Antes de Saltar:
+			</text>
+			<combo_box name="prejumps" label="" control_name="AODefaultPreJump" />
+		</panel>
+	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_asset_text_editor.xml b/indra/newview/skins/default/xui/es/floater_asset_text_editor.xml
index 55cd428e0..52bfdf455 100644
--- a/indra/newview/skins/default/xui/es/floater_asset_text_editor.xml
+++ b/indra/newview/skins/default/xui/es/floater_asset_text_editor.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_asset_text_editor" title="Editor de Textos">
-	  <text name="status_text">
-			 Cargando...
-	  </text>
-	  <button name="upload_btn" label="[UPLOAD]"/>
-	  <button name="save_btn" label="Grabar"/>
-	  <simple_text_editor name="text_editor" />
+	<text name="status_text">
+		Cargando...
+	</text>
+	<button name="upload_btn" label="[UPLOAD]"/>
+	<button name="save_btn" label="Grabar"/>
+	<simple_text_editor name="text_editor" />
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_blacklist.xml b/indra/newview/skins/default/xui/es/floater_blacklist.xml
index cbdd77af3..3e87bdc3c 100644
--- a/indra/newview/skins/default/xui/es/floater_blacklist.xml
+++ b/indra/newview/skins/default/xui/es/floater_blacklist.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_blacklist" title="Lista Negra">
-	  <button name="add_btn" label="Agregar..."/>
-	  <button name="remove_btn" label="Borrar"/>
-	  <combo_box name="asset_combo" label="Tipo de Asset"/>
-	  <line_editor name="id_edit" label="Colocar aquí el UUID del Asset UUID." />
-	  <line_editor name="name_edit" label="Colocar aquí el Nombre de la entrada."/>
-	  <scroll_list name="file_list">
-			 <column name="asset_id" label="ID del Asset"/>
-			 <column name="entry_name" label="Nombre" />
-			 <column name="entry_type" label="Tipo"/>
-			 <column name="entry_agent" label="Agregado por"/>
-			 <column name="entry_date" label="Fecha"/>
-			 <!--column dynamicwidth="false" name="asset_id" label="Asset-ID" width="130"/-->
-	  </scroll_list>
-	  <button name="save_btn" label="Guardar XML" width="100" />
-	  <button name="load_btn" label="Cargar XML" left_delta="110" width="100"/>
-	  <button name="clear_btn" label="Limpiar" left_delta="110" />
-	  <!--button name="rerender_btn" follows="right|bottom" width="150" bottom_delta="0" left_delta="400" height="20" label="Rerender all Objects"/-->
-	  <button name="copy_uuid_btn" label="Copiar UUID"/>
+	<button name="add_btn" label="Agregar..."/>
+	<button name="remove_btn" label="Borrar"/>
+	<combo_box name="asset_combo" label="Tipo de Asset"/>
+	<line_editor name="id_edit" label="Colocar aquí el UUID del Asset UUID." />
+	<line_editor name="name_edit" label="Colocar aquí el Nombre de la entrada."/>
+	<scroll_list name="file_list">
+		<column name="asset_id" label="ID del Asset"/>
+		<column name="entry_name" label="Nombre" />
+		<column name="entry_type" label="Tipo"/>
+		<column name="entry_agent" label="Agregado por"/>
+		<column name="entry_date" label="Fecha"/>
+	</scroll_list>
+	<button name="save_btn" label="Guardar XML" width="100" />
+	<button name="load_btn" label="Cargar XML" left_delta="110" width="100"/>
+	<button name="clear_btn" label="Limpiar" left_delta="110" />
+	<button name="copy_uuid_btn" label="Copiar UUID"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_chatterbox_wolf.xml b/indra/newview/skins/default/xui/es/floater_chatterbox_wolf.xml
index 7c49ab088..e1763b10c 100644
--- a/indra/newview/skins/default/xui/es/floater_chatterbox_wolf.xml
+++ b/indra/newview/skins/default/xui/es/floater_chatterbox_wolf.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <multi_floater name="floater_chatterbox" title="Comunicarse">
-	  <tab_container name="chatterbox_tabs"/>
-</multi_floater>
+	<tab_container name="chatterbox_tabs"/>
+</multi_floater>1
 
diff --git a/indra/newview/skins/default/xui/es/floater_clothing.xml b/indra/newview/skins/default/xui/es/floater_clothing.xml
index 5877a02c2..74f644c8b 100644
--- a/indra/newview/skins/default/xui/es/floater_clothing.xml
+++ b/indra/newview/skins/default/xui/es/floater_clothing.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="clothing" title="Ropas">
-	  <scroll_list name="clothing_list">
-			 <column label="" name="icon"/>
-			 <column label="Nombre" name="name"/>
-			 <column name="sort" width="-1" />
-	  </scroll_list>
-	  <button label="Quitarse" name="take_off_btn"/>
-	  <button label="Vestirse" name="wear_btn"/>
+	<scroll_list name="clothing_list">
+		<column label="" name="icon"/>
+		<column label="Nombre" name="name"/>
+		<column name="sort" width="-1" />
+	</scroll_list>
+	<button label="Quitarse" name="take_off_btn"/>
+	<button label="Vestirse" name="wear_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_contact_groups.xml b/indra/newview/skins/default/xui/es/floater_contact_groups.xml
index 116e0a978..56b649395 100644
--- a/indra/newview/skins/default/xui/es/floater_contact_groups.xml
+++ b/indra/newview/skins/default/xui/es/floater_contact_groups.xml
@@ -1,23 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<!-- All our XML is utf-8 encoded. -->
-
-<!-- Floaters can optionally have their titlebar drag handle on the left.
-			 If so, the title is not visible.
-			 When a floater is resizable, a min_width and min_height must be specified. -->
-	  <floater name="floater_contact_groups" title="Administrar Grupos">
-	  <text name="InstructManageContacts">
-			 Selecciona un Grupo (o Presiona Nuevo para crear uno):
-	  </text>
-	  <combo_box tool_tip="Grupos de Contactos" name="buddy_group_combobox">
-			 <combo_item name="All" value="All">
-					Todos
-			 </combo_item>
-	  </combo_box>
-	  <button label="+" name="combo_group_add"/>
-	  <button label="-" name="combo_group_remove"/>
-	  <button label="Nuevo" name="combo_group_create"/>
-	  <text name="contact_list_text">
-			 Actualmente en:
-	  </text>
-	  <scroll_list name="group_scroll_list"/>
+<floater name="floater_contact_groups" title="Administrar Grupos">
+	<text name="InstructManageContacts">
+		Selecciona un Grupo (o Presiona Nuevo para crear uno):
+	</text>
+	<combo_box tool_tip="Grupos de Contactos" name="buddy_group_combobox">
+		<combo_item name="All" value="All">
+			Todos
+		</combo_item>
+	</combo_box>
+	<button label="+" name="combo_group_add"/>
+	<button label="-" name="combo_group_remove"/>
+	<button label="Nuevo" name="combo_group_create"/>
+	<text name="contact_list_text">
+		Actualmente en:
+	</text>
+	<scroll_list name="group_scroll_list"/>
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_directory.xml b/indra/newview/skins/default/xui/es/floater_directory.xml
index d9d8ff2c6..325e472a4 100644
--- a/indra/newview/skins/default/xui/es/floater_directory.xml
+++ b/indra/newview/skins/default/xui/es/floater_directory.xml
@@ -6,7 +6,7 @@
 				Buscando...
 			</string>
 			<string name="not_found_text">
-				Nada encontrado.
+				Nada hallado.
 			</string>
 			<text name="find">
 				Buscar:
@@ -167,10 +167,10 @@
 					Arte y Cultura
 				</combo_item>
 				<combo_item name="Charity/SupportGroups">
-					Representaciones
+					Grupos de Ayuda y Caridad
 				</combo_item>
 				<combo_item name="Miscellaneous">
-					Miscelaneos
+					Misceláneos
 				</combo_item>
 			</combo_box>
 			<check_box label="Contenido PG" name="incpg"/>
@@ -180,7 +180,7 @@
 			<button label="Borrar" label_selected="Borrar" name="Delete"/>
 			<scroll_list name="results">
 				<column label="Nombre" name="name"/>
-				<column label="Hora (PT)" name="date"/>
+				<column label="Día (PT)" name="date"/>
 				<column label="Hora" name="time"/>
 			</scroll_list>
 			<button label="Siguiente &gt;" label_selected="Siguiente &gt;" name="Next &gt;"/>
@@ -247,8 +247,6 @@ subasta. Para comprarlo directamente, visítalo y pulsa en el nombre del terreno
 			<text name="areacheck_symbol">
 				m²
 			</text>
-			<line_editor name="priceedit"/>
-			<line_editor name="areaedit"/>
 			<button label="Buscar" label_selected="Buscar" name="Search"/>
 			<scroll_list name="results">
 				<column label="Nombre" name="name"/>
@@ -270,7 +268,6 @@ subasta. Para comprarlo directamente, visítalo y pulsa en el nombre del terreno
 			<text name="find">
 				  Buscar:
 			</text>
-			<line_editor name="name"/>
 			<check_box label="Contenido PG" name="incpg"/>
 			<check_box label="Contenido Mature" name="incmature"/>
 			<check_box label="Contenido Adulto" name="incadult"/>
@@ -380,7 +377,6 @@ subasta. Para comprarlo directamente, visítalo y pulsa en el nombre del terreno
 			<text name="find">
 				Buscar:
 			</text>
-			<line_editor name="name"/>
 			<button label="Buscar" label_selected="Buscar" name="Search"/>
 			<scroll_list name="results">
 				<column label="Nombre" name="name"/>
@@ -409,7 +405,6 @@ subasta. Para comprarlo directamente, visítalo y pulsa en el nombre del terreno
 				<column label="Nombre" name="name"/>
 				<column label="Miembros" name="members"/>
 			</scroll_list>
-			<text name="result_text"/>
 		</panel>
 	</tab_container>
 	<panel name="Panel Avatar"/>
diff --git a/indra/newview/skins/default/xui/es/floater_directory2.xml b/indra/newview/skins/default/xui/es/floater_directory2.xml
index 8e33522e1..6a3e87fc1 100644
--- a/indra/newview/skins/default/xui/es/floater_directory2.xml
+++ b/indra/newview/skins/default/xui/es/floater_directory2.xml
@@ -1,638 +1,387 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="570" min_height="570" min_width="780"
-     name="directory" rect_control="FloaterFindRect2" title="Search Second Life"
-     width="780">
-	<tab_container bottom="-570" follows="left|top|right|bottom" height="550" left="0"
-	     mouse_opaque="false" name="Directory Tabs" tab_position="top" width="780">
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="All" left="1" mouse_opaque="false" name="find_all_old_panel" width="778">
+<floater name="directory" title="Buscar en Second Life">
+	<tab_container name="Directory Tabs">
+		<panel label="Todo" name="find_all_old_panel">
 			<string name="searching_text">
-				Searching...
+				Buscando...
 			</string>
 			<string name="not_found_text">
-				None Found.
+				Nada Encontrado.
 			</string>
-			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev" left="80"
-			     mouse_opaque="true" name="&lt; Prev" width="60" />
-			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;"
-			     mouse_opaque="true" name="Next &gt;" width="60" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="find" v_pad="0" width="50">
-				Find:
+			<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
+			<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
+			<text name="find">
+				Buscar:
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-			     follows="left|top" font="SansSerif" height="18" left_delta="38"
-			     max_length="63" mouse_opaque="true" name="name" width="128" spell_check="true" />
-			<button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
-			     name="Search" width="70" />
-			<check_box bottom="-22" control_name="ShowPGSearchAll" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="PG content" left_delta="78" mouse_opaque="true"
-			     name="incpg" width="156" />
-			<check_box bottom="-22" control_name="ShowMatureSearchAll" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Mature content" left_delta="100" mouse_opaque="true"
-			     name="incmature" width="156" />
-			<check_box bottom="-22" control_name="ShowAdultSearchAll" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Adult content" left_delta="120" mouse_opaque="true"
-			     name="incadult" width="156" />
-			<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
-			     draw_heading="false" fg_disable_color="1, 1, 1, 1"
-			     follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
-			     multi_select="false" name="results" search_column="1" width="339">
-				<column label="" name="icon" width="24" />
-				<column label="Name" name="name" width="235" />
-				<column label="Price" name="price" width="90" />
-				<column label="Time (PT)" name="date" width="90" />
-				<column label="Time" name="time" width="-1" />
-				<column label="Traffic" name="dwell" width="90" />
-				<column label="Area" name="area" width="90" />
-				<column label="L$/sq.m" name="per_meter" width="90" />
-				<column label="Online" name="online" width="90" />
-				<column label="Members" name="members" width="90" />
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Contenido Mature" name="incmature"/>
+			<check_box label="Contenido Adulto" name="incadult"/>
+			<scroll_list name="results">
+				<column label="" name="icon"/>
+				<column label="Nombre" name="name"/>
+				<column label="Precio" name="price"/>
+				<column label="Día (PT)" name="date"/>
+				<column label="Hora" name="time"/>
+				<column label="Tráfico" name="dwell"/>
+				<column label="Superfice" name="area"/>
+				<column label="L$/m²" name="per_meter"/>
+				<column label="Conectado" name="online"/>
+				<column label="Miembros" name="members"/>
 			</scroll_list>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
 		</panel>
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="Classifieds" left="1" left_delta="68" mouse_opaque="false"
-		     name="classified_panel" width="778">
+		<panel label="Clasificados" name="classified_panel">
 			<string name="searching_text">
-				Searching...
+				Buscando...
 			</string>
 			<string name="not_found_text">
-				None Found.
+				Nada Encontrado.
 			</string>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="find" v_pad="0" width="50">
-				Find:
+			<text name="find">
+				Buscar:
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-			     follows="left|right|top" font="SansSerif" height="18" left="56"
-			     max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
-			<check_box bottom="-22" control_name="ShowPGClassifieds" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="PG content" left="420" mouse_opaque="true"
-			     name="incpg" width="156" />
-			<check_box bottom="-40" control_name="ShowMatureClassifieds" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Mature content" left="420" mouse_opaque="true"
-			     name="incmature" width="156" />
-			<check_box bottom="-58" control_name="ShowAdultClassifieds" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Adult content" left="420" mouse_opaque="true"
-			     name="incadult" width="156" />
-			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
-			     max_chars="20" mouse_opaque="true" name="Category" width="158">
-				<combo_item name="AnyCategory" value="0">
-					Any Category
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Contenido Mature" name="incmature"/>
+			<check_box label="Contenido Adulto" name="incadult"/>
+			<combo_box name="Category">
+				<combo_item name="AnyCategory">
+					Cualquier Categoría
 				</combo_item>
-				<combo_item name="Shopping" value="1">
-					Shopping
+				<combo_item name="Shopping">
+					Compra
 				</combo_item>
-				<combo_item name="LandRental" value="2">
-					Land Rental
+				<combo_item name="LandRental">
+					Terreno en alquiler
 				</combo_item>
-				<combo_item name="PropertyRental" value="3">
-					Property Rental
+				<combo_item name="PropertyRental">
+					Propiedad en alquiler
 				</combo_item>
-				<combo_item name="SpecialAttraction" value="4">
-					Special Attraction
+				<combo_item name="SpecialAttraction">
+					Atracciones especiales
 				</combo_item>
-				<combo_item name="NewProducts" value="5">
-					New Products
+				<combo_item name="NewProducts">
+					Nuevos Productos
 				</combo_item>
-				<combo_item name="Employment" value="6">
-					Employment
+				<combo_item name="Employment">
+					Empleos
 				</combo_item>
-				<combo_item name="Wanted" value="7">
-					Wanted
+				<combo_item name="Wanted">
+					Se Busca
 				</combo_item>
-				<combo_item name="Service" value="8">
-					Service
+				<combo_item name="Service">
+					Servicios
 				</combo_item>
-				<combo_item name="Personal" value="9">
+				<combo_item name="Personal">
 					Personal
 				</combo_item>
 			</combo_box>
-			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Browse" label_selected="Browse" left="121" mouse_opaque="true"
-			     name="Browse" width="95" />
-			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
-			     visible="false" width="95" />
-			<button bottom="-46" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Place an Ad..." label_selected="Place an Ad..." left="630"
-			     mouse_opaque="true" name="Place an Ad..." width="145" />
-			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Delete" label_selected="Delete" left="80"
-			     mouse_opaque="true" name="Delete" width="80" />
-			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" 
-				 draw_heading="true" follows="left|top|right|bottom" height="450" left="4" 
-				 mouse_opaque="true" multi_select="false" name="results" search_column="2" width="339">
-				<column label="" name="icon" width="24" />
-				<column label="" name="type" width="-1" />
-				<column label="Name" name="name" width="225" />
-				<column label="Price" name="price" width="55" />
+			<button label="Navegar" label_selected="Navegar" name="Browse"/>
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<button label="Poner un Anuncio..." label_selected="Poner un Anuncio..." name="Place an Ad..."/>
+			<button label="Borrar" label_selected="Borrar" name="Delete"/>
+			<scroll_list name="results">
+				<column label="" name="icon"/>
+				<column label="" name="type"/>
+				<column label="Nombre" name="name"/>
+				<column label="Precio" name="price"/>
 			</scroll_list>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="result_text" v_pad="0" width="80" />
-			<button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;"
-			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-			<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
-			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+			<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
+			<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
 		</panel>
-		<panel border="true" bottom="-549" default_tab_group="1"
-		     follows="left|top|right|bottom" height="533" label="Events" left="1"
-		     mouse_opaque="false" name="events_panel" width="778">
+		<panel label="Eventos" name="events_panel">
 			<string name="searching_text">
-				Searching...
+				Buscando...
 			</string>
 			<string name="not_found_text">
-				None Found.
+				Ninguno Encontrado.
 			</string>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="text2" v_pad="0" width="50">
-				Find:
+			<text name="text2">
+				Buscar:
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-			     follows="left|right|top" font="SansSerif" height="18" left="56"
-			     max_length="63" mouse_opaque="true" name="event_search_text" width="160" spell_check="true" />
-			<radio_group bottom="-40" draw_border="false" follows="right|top" height="40" left="560"
-			     mouse_opaque="true" name="date_mode" width="300">
-				<radio_item bottom="-20" follows="left|top" height="20" left="0" mouse_opaque="true"
-				     name="current" width="174">
-					In-Progress and Upcoming
+			<radio_group name="date_mode">
+				<radio_item name="current">
+					En curso y próximos
 				</radio_item>
-				<radio_item bottom_delta="-10" follows="left|top" height="20" left="0" mouse_opaque="true"
-				     name="date" width="56">
-					Date
+				<radio_item name="date">
+					Fecha
 				</radio_item>
 			</radio_group>
-			<button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="&lt;&lt;" label_selected="&lt;&lt;" left_delta="54"
-			     mouse_opaque="true" name="&lt;&lt;" tool_tip="Go back a day" width="24" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-36" drop_shadow_visible="true" follows="right|top" font="SansSerif"
-			     h_pad="0" halign="center" height="14" left_delta="22" mouse_opaque="true"
-			     name="date_text" v_pad="0" width="48">
+			<button label="&lt;&lt;" label_selected="&lt;&lt;" name="&lt;&lt;" tool_tip="Retroceder un día"/>
+			<text name="date_text">
 				6/6
 			</text>
-			<button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="&gt;&gt;" label_selected="&gt;&gt;" left_delta="50"
-			     mouse_opaque="true" name="&gt;&gt;" tool_tip="Go forward a day" width="24" />
-			<button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Today" label_selected="Today" left_delta="28" mouse_opaque="true"
-			     name="Today" tool_tip="Show today&apos;s events" width="60" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="289"
-			     mouse_opaque="true" name="text" v_pad="0" width="90" visible="false">
-				Category:
+			<button label="&gt;&gt;" label_selected="&gt;&gt;" name="&gt;&gt;" tool_tip="Avanzar un día"/>
+			<button label="Hoy" label_selected="Hoy" name="Today" tool_tip="Mostrar los eventos del día de hoy"/>
+			<text name="text">
+				Categoría:
 			</text>
-			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
-			     max_chars="20" mouse_opaque="true" name="category combo" width="158">
-				<combo_item name="All" value="0">
-					Any Category
+			<combo_box name="category combo">
+				<combo_item name="All">
+					Cualquier categoría
 				</combo_item>
-				<combo_item name="Discussion" value="18">
-					Discussion
+				<combo_item name="Discussion">
+					Debates
 				</combo_item>
-				<combo_item name="Sports" value="19">
-					Sports
+				<combo_item name="Sports">
+					Deportes
 				</combo_item>
-				<combo_item name="LiveMusic" value="20">
-					Live Music
+				<combo_item name="LiveMusic">
+					Música en vivo
 				</combo_item>
-				<combo_item name="Commercial" value="22">
-					Commercial
+				<combo_item name="Commercial">
+					Comercial
 				</combo_item>
-				<combo_item name="Nightlife/Entertainment" value="23">
-					Nightlife/Entertainment
+				<combo_item name="Nightlife/Entertainment">
+					Vida nocturna/Entretenimiento
 				</combo_item>
-				<combo_item name="Games/Contests" value="24">
-					Games/Contests
+				<combo_item name="Games/Contests">
+					Juegos/Concursos
 				</combo_item>
-				<combo_item name="Pageants" value="25">
-					Pageants
+				<combo_item name="Pageants">
+					Representaciones
 				</combo_item>
-				<combo_item name="Education" value="26">
-					Education
+				<combo_item name="Education">
+					Educación
 				</combo_item>
-				<combo_item name="ArtsandCulture" value="27">
-					Arts and Culture
+				<combo_item name="ArtsandCulture">
+					Arte y Cultura
 				</combo_item>
-				<combo_item name="Charity/SupportGroups" value="28">
-					Charity/Support Groups
+				<combo_item name="Charity/SupportGroups">
+					Grupos de Ayuda y Caridad
 				</combo_item>
 				<combo_item name="Miscellaneous" value="29">
-					Miscellaneous
+					Misceláneos
 				</combo_item>
 			</combo_box>
-			<check_box bottom="-22" control_name="ShowPGEvents" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="PG content" left="420" mouse_opaque="true"
-			     name="incpg" width="156" />
-			<check_box bottom="-40" control_name="ShowMatureEvents" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Mature content" left="420" mouse_opaque="true"
-			     name="incmature" width="156" />
-			<check_box bottom="-58" control_name="ShowAdultEvents" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Adult content" left="420" mouse_opaque="true"
-			     name="incadult" width="156" />
-			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
-			     visible="true" width="95" />
-			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Delete" label_selected="Delete" left="80"
-			     mouse_opaque="true" name="Delete" width="80" />
-			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true" 
-			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
-			     multi_select="false" name="results" search_column="2" width="339">
-				<column label="" name="icon" width="24" />
-				<column label="" name="type" width="-1" />
-				<column dynamicwidth="true" label="Name" name="name" />
-				<column label="Time (PT)" name="date" sort="time" width="106" />
-				<column label="" name="event_id" width="-1" />
-				<column label="Time" name="time" width="-1" />
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Contenido Mature" name="incmature"/>
+			<check_box label="Contenido Adult" name="incadult"/>
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<button label="Borrar" label_selected="Borrar" name="Delete"/>
+			<scroll_list name="results">
+				<column label="" name="icon"/>
+				<column label="" name="type"/>
+				<column label="Nombre" name="name" />
+				<column label="Día (PT)" name="date"/>
+				<column label="" name="event_id"/>
+				<column label="Hora" name="time"/>
 			</scroll_list>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="result_text" v_pad="0" width="80" />
-			<button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;"
-			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-			<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
-			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+			<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
+			<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
 		</panel>
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="Land Sales" left="1" mouse_opaque="false" name="land_sales_panel"
-		     width="778" default_tab_group="1">
+		<panel label="Venta de Terrenos" name="land_sales_panel">
 			<string name="searching_text">
-				Searching...
+				Buscando...
 			</string>
 			<string name="not_found_text">
-				None Found.
+				Ninguno Encontrado.
 			</string>
 			<string name="land_help_text">
-			Land can be bought direct for in-world money ([CURRENCY]) or at auction for either [CURRENCY] or [REALCURRENCY].
-To buy direct, visit the land and click on the place name in the title bar.
+				El terreno puede comprarse directamente en la moneda del mundo ([CURRENCY]) , o con [CURRENCY] o [REALCURRENCY]. en una
+subasta. Para comprarlo directamente, visítalo y pulsa en el nombre del terreno en la barra superior del visor.				
 			</string>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="find" v_pad="0" width="50">
-				Find:
+			<text name="find">
+				Buscar:
 			</text>
-			<check_box bottom="-22" control_name="ShowPGLand" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="PG content" left="420" mouse_opaque="true"
-			     name="incpg" tab_group="7" width="156" />
-			<check_box bottom="-40" control_name="ShowMatureLand" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Mature content" left="420" mouse_opaque="true"
-			     name="incmature" tab_group="8" width="156" />
-			<check_box bottom="-58" control_name="ShowAdultLand" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Adult content" left="420" mouse_opaque="true"
-			     name="incadult" tab_group="9" width="156" />
-			<combo_box allow_text_entry="false" bottom="-46" follows="left|top|right" height="18" left="282"
-			     max_chars="20" mouse_opaque="true" name="type" tab_group="6" width="128">
-				<combo_item name="AllTypes" value="All Types">
-					All Types
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Contenido Mature" name="incmature"/>
+			<check_box label="Contenido Adult" name="incadult"/>
+			<combo_box name="type">
+				<combo_item name="AllTypes">
+					Todos los tipos
 				</combo_item>
-				<combo_item name="Auction" value="Auction">
-					Auction
+				<combo_item name="Auction">
+					Subasta
 				</combo_item>
-				<combo_item name="MainlandSales" value="Mainland Sales">
-					For Sale - Mainland
+				<combo_item name="MainlandSales">
+					En Venta - Mainland
 				</combo_item>
-				<combo_item name="EstateSales" value="Estate Sales">
-					For Sale - Estate
+				<combo_item name="EstateSales">
+					En Venta - Estado
 				</combo_item>
 			</combo_box>
-			<check_box bottom="-24" control_name="FindLandPrice" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Price &#8804; " left="56" mouse_opaque="true" name="pricecheck"
-			     tab_group="1" width="88" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
-			     bottom="-24" font="SansSerifSmall" halign="left" height="16" left="116" mouse_opaque="true"
-			     name="pricecheck_symbol" width="15">
-				L$
+			<check_box label="Precio &#8804; " name="pricecheck"/>
+			<text name="pricecheck_symbol">
+				[CURRENCY]
 			</text>
-			<check_box bottom_delta="-18" control_name="FindLandArea" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Area &#8805; " left="56" mouse_opaque="true" name="areacheck"
-			     tab_group="3" width="80" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
-			     bottom="-42" font="SansSerifSmall" halign="left" height="16" left="170" mouse_opaque="true"
-			     name="areacheck_symbol" width="15">
+			<check_box label="Superficie &#8805; " name="areacheck"/>
+			<text name="areacheck_symbol">
 				m²
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-22"
-			     follows="left|top" font="SansSerifSmall" height="16" left="132"
-			     max_length="10" mouse_opaque="true" name="priceedit" tab_group="2" width="50" spell_check="true" />
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-18"
-			     follows="left|top" font="SansSerifSmall" height="16" left="117"
-			     max_length="10" mouse_opaque="true" name="areaedit" tab_group="4" width="50" spell_check="true" />
-			<button bottom="-48" follows="left|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" left="208" mouse_opaque="true"
-			     name="Search" tab_group="5" width="70" />
-			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true" 
-			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
-			     multi_select="false" name="results" search_column="2" tab_group="10" width="387">
-				<column label="" name="icon" width="24" />
-				<column label="" name="type" width="-1" />
-				<column dynamicwidth="true" label="Name" name="name" />
-				<column label="Type" name="landtype" width="50" />
-				<column label="L$ Price" name="price" width="65" />
-				<column label="Area" name="area" width="50" />
-				<column label="L$/m²" name="per_meter" width="65" />
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<scroll_list name="results">
+				<column label="" name="icon"/>
+				<column label="" name="type"/>
+				<column label="Nombre" name="name" />
+				<column label="Tipo" name="landtype"/>
+				<column label="[CURRENCY] Precio" name="price"/>
+				<column label="Superficie" name="area"/>
+				<column label="[CURRENCY]/m²" name="per_meter"/>
 			</scroll_list>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
-			<button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;"
-			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-			<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
-			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+			<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
+			<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
 		</panel>
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="Places" left="1" mouse_opaque="false" name="places_panel"
-		     width="778">
+		<panel label="Lugares" name="places_panel">
 			<string name="searching_text">
-				Searching...
+				Buscando...
 			</string>
 			<string name="not_found_text">
-				None Found.
+				Ninguno Encontrado.
 			</string>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="find" v_pad="0" width="50">
-				Find:
+			<text name="find">
+				Buscar:
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-			     follows="left|right|top" font="SansSerif" height="18" left="56"
-			     max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
-			<check_box bottom="-22" control_name="ShowPGSims" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="PG content" left="420" mouse_opaque="true"
-			     name="incpg" width="156" />
-			<check_box bottom="-40" control_name="ShowMatureSims" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Mature content" left="420" mouse_opaque="true"
-			     name="incmature" width="156" />
-			<check_box bottom="-58" control_name="ShowAdultSims" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Adult content" left="420" mouse_opaque="true"
-			     name="incadult" width="156" />
-			<combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
-			     max_chars="20" mouse_opaque="true" name="Category" width="128" visible="false">
-				<combo_item name="AnyCategory" value="any">
-					Any Category
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Contenido Mature" name="incmature"/>
+			<check_box label="Contenido Adulto" name="incadult"/>
+			<combo_box name="Category">
+				<combo_item name="AnyCategory">
+					Cualquier Categoría
 				</combo_item>
-				<combo_item name="LindenLocation" value="linden">
-					Official Location
+				<combo_item name="LindenLocation">
+					Localización Linden
 				</combo_item>
-				<combo_item name="Arts&amp;Culture" value="arts">
-					Artsand Culture
+				<combo_item name="Arts&amp;Culture">
+					Arte y Cultura
 				</combo_item>
-				<combo_item name="Business" value="store">
-					Business
+				<combo_item name="Business">
+					Negocios
 				</combo_item>
-				<combo_item name="Educational" value="educational">
-					Educational
+				<combo_item name="Educational">
+					Educacional
 				</combo_item>
-				<combo_item name="Gaming" value="game">
-					Gaming
+				<combo_item name="Gaming">
+					Juegos de Azar
 				</combo_item>
-				<combo_item name="Hangout" value="gather">
-					Hangout
+				<combo_item name="Hangout">
+					Entretenimiento
 				</combo_item>
-				<combo_item name="NewcomerFriendly" value="newcomer">
-					Newcomer Friendly
+				<combo_item name="NewcomerFriendly">
+					Para recién llegados
 				</combo_item>
-				<combo_item name="Parks&amp;Nature" value="park">
-					Parks and Nature
+				<combo_item name="Parks&amp;Nature">
+					Parques y Naturaleza
 				</combo_item>
-				<combo_item name="Residential" value="home">
-					Residential
+				<combo_item name="Residential">
+					Residencial
 				</combo_item>
-				<combo_item name="Shopping" value="shopping">
-					Shopping
+				<combo_item name="Shopping">
+					Compras
 				</combo_item>
-				<combo_item name="Other" value="other">
-					Other
+				<combo_item name="Other">
+					Otra
+				</combo_item>
+				<combo_item name="Rental" value="rental">
+					Alquiler
 				</combo_item>
-        <combo_item name="Rental" value="rental">
-          Rental
-        </combo_item>
 			</combo_box>
 			<!-- This is used only during the AO transition and can be deleted once the AO transition is
 			complete. It is identical to the combo box above except that it has the Adult category. 
 			You might also want to set it back to default visible and enabled. -->
-			<combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
-			     max_chars="20" mouse_opaque="true" name="Category_Adult" width="128" visible="false">
-				<combo_item name="AnyCategory" value="any">
-					Any Category
+			<combo_box name="Category_Adult">
+				<combo_item name="AnyCategory">
+					Cualquier Categoría
 				</combo_item>
-				<combo_item name="LindenLocation" value="linden">
-					Linden Location
+				<combo_item name="LindenLocation">
+					Localización Linden
 				</combo_item>
 				<combo_item name="Adult" value="adult">
-					Adult
+					Adulto
 				</combo_item>
-				<combo_item name="Arts&amp;Culture" value="arts">
-					Arts and Culture
+				<combo_item name="Arts&amp;Culture">
+					Arte y Cultura
 				</combo_item>
-				<combo_item name="Business" value="store">
-					Business
+				<combo_item name="Business">
+					Negocios
 				</combo_item>
-				<combo_item name="Educational" value="educational">
-					Educational
+				<combo_item name="Educational">
+					Educacional
 				</combo_item>
-				<combo_item name="Gaming" value="game">
-					Gaming
+				<combo_item name="Gaming">
+					Juegos de Azar
 				</combo_item>
-				<combo_item name="Hangout" value="gather">
-					Hangout
+				<combo_item name="Hangout">
+					Entretenimiento
 				</combo_item>
-				<combo_item name="NewcomerFriendly" value="newcomer">
-					Newcomer Friendly
+				<combo_item name="NewcomerFriendly">
+					Para recién llegados
 				</combo_item>
-				<combo_item name="Parks&amp;Nature" value="park">
-					Parks and Nature
+				<combo_item name="Parks&amp;Nature">
+					Parques y Naturaleza
 				</combo_item>
-				<combo_item name="Residential" value="home">
-					Residential
+				<combo_item name="Residential">
+					Residencial
 				</combo_item>
-				<combo_item name="Shopping" value="shopping">
-					Shopping
+				<combo_item name="Shopping">
+					Compras
 				</combo_item>
-				<combo_item name="Other" value="other">
-					Other
+				<combo_item name="Other">
+					Otra
+				</combo_item>
+				<combo_item name="Rental" value="rental">
+					Alquiler
 				</combo_item>
-        <combo_item name="Rental" value="rental">
-          Rental
-        </combo_item>
 			</combo_box>
-			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" left="121" mouse_opaque="true"
-			     name="Search" width="95" />
-			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
-			     draw_heading="true" 
-			     
-			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
-			     multi_select="false" name="results" search_column="2" width="339">
-				<column label="" name="icon" width="24" />
-				<column label="" name="type" width="-1" />
-				<column dynamicwidth="true" label="Name" name="name" />
-				<column label="Traffic" name="dwell" width="75" />
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<scroll_list name="results">
+				<column label="" name="icon"/>
+				<column label="" name="type"/>
+				<column abel="Nombre" name="name" />
+				<column label="Tráfico" name="dwell"/>
 			</scroll_list>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
-			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;"
-			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-			<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
-			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+			<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
+			<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
 		</panel>
-    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="People" left="1" mouse_opaque="false" name="people_panel"
-		     width="778">
+		<panel label="Personas" name="people_panel">
 			<string name="searching_text">
-				Searching...
+				Buscando...
 			</string>
 			<string name="not_found_text">
-				None Found.
+				Nadie encontrado.
 			</string>
-      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="find" v_pad="0" width="50">
-        Find:
-      </text>
-	  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-			     follows="left|right|top" font="SansSerif" height="18" left="56"
-			     max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
-		<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" left="121" mouse_opaque="true"
-			     name="Search" width="95" />
-      <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
-			     draw_heading="true" 
-                               
-			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
-			     multi_select="false" name="results" search_column="2" width="326">
-        <column label="" name="icon" width="24" />
-        <column label="" name="type" width="-1" />
-        <column label="Name" name="name" width="274" />
-      </scroll_list>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
-			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;"
-			     mouse_opaque="true" name="Next &gt;" right="330" width="80" />
-      		<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
-			     mouse_opaque="true" name="&lt; Prev" right="244" width="80" />
-		</panel>
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="Groups" left="1" mouse_opaque="false" name="groups_panel"
-		     width="778">
-			<string name="searching_text">
-				Searching...
-			</string>
-			<string name="not_found_text">
-				None Found.
-			</string>
-			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;"
-			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-			<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
-			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="find" v_pad="0" width="50">
-				Find:
+			<text name="find">
+				Buscar:
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-			     follows="left|top" font="SansSerif" height="18" left_delta="38"
-			     max_length="63" mouse_opaque="true" name="name" width="200" spell_check="true" />
-			<button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"
-			     name="Search" width="70" />
-			<check_box bottom="-46" control_name="ShowPGGroups" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="PG content" left="4" mouse_opaque="true"
-			     name="incpg" width="204" />
-			<check_box bottom="-46" control_name="ShowMatureGroups" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Mature content" left_delta="90" mouse_opaque="true"
-			     name="incmature" width="204" />
-			<check_box bottom="-46" control_name="ShowAdultGroups" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Adult content" left_delta="110" mouse_opaque="true"
-			     name="incadult" width="204" />
-			<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
-			     draw_heading="true"
-			     follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
-			     multi_select="false" name="results" search_column="2" width="339">
-				<column label="" name="icon" sort="score" sort_ascending="false" width="24" />
-				<column label="" name="type" width="-1" />
-				<column dynamicwidth="true" label="Name" name="name" />
-				<column halign="left" label="Members" name="members" sort_ascending="false" width="100" />
-				<column label="" name="score" width="-1" />
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<scroll_list name="results">
+				<column label="" name="icon"/>
+				<column label="" name="type"/>
+				<column label="Nombre" name="name"/>
+			</scroll_list>
+			<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
+			<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
+		</panel>
+		<panel label="Grupos" name="groups_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+				Ninguno Encontrado.
+			</string>
+			<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
+			<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
+			<text name="find">
+				Buscar:
+			</text>
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Contenido Mature" name="incmature"/>
+			<check_box label="Contenido Adulto" name="incadult"/>
+			<scroll_list name="results">
+				<column label="" name="icon"/>
+				<column label="" name="type"/>
+				<column label="Nombre" name="name" />
+				<column label="Miembros" name="members"/>
+				<column label="" name="score"/>
 			</scroll_list>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
 		</panel>
 	</tab_container>
-	<panel bottom="-560" follows="right|top" height="470" left="340"
-	     name="classified_details_panel" width="440" />
-	<panel bottom="-560" follows="right|top" height="486" left="350" name="Panel Avatar"
-	     width="430" />
-	<panel bottom="-560" follows="right|top" height="470" left="340"
-	     name="event_details_panel" width="440" />
-	<panel bottom="-580" follows="right|top" height="515" left="350"
-	     name="group_details_panel_holder" width="430">
-		<panel bottom="0" follows="right|top" height="470" left="0" name="group_details_panel"
-		     width="430" />
+	<panel name="classified_details_panel"/>
+	<panel name="Panel Avatar"/>
+	<panel name="event_details_panel"/>
+	<panel name="group_details_panel_holder">
+		<panel name="group_details_panel"/>
 	</panel>
-	<panel bottom="-560" follows="right|top" height="470" left="340"
-	     name="place_details_panel" width="440" />
-	<panel bottom="-560" follows="right|top" height="470" left="385"
-	     name="place_details_small_panel" width="395" />
+	<panel name="place_details_panel"/>
+	<panel name="place_details_small_panel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_directory3.xml b/indra/newview/skins/default/xui/es/floater_directory3.xml
index 8823c5ba9..065a5b697 100644
--- a/indra/newview/skins/default/xui/es/floater_directory3.xml
+++ b/indra/newview/skins/default/xui/es/floater_directory3.xml
@@ -1,759 +1,467 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="true" height="570" min_height="570" min_width="780"
-     name="directory" rect_control="FloaterFindRect2" title="Search Second Life"
-     width="780">
-	<tab_container bottom="-570" follows="left|top|right|bottom" height="550" left="0"
-	     mouse_opaque="false" name="Directory Tabs" tab_position="top" width="780">
-		 <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-			  label="All Classic" left="1" mouse_opaque="false" name="find_all_old_panel" width="778">
-			 <string name="searching_text">
-				 Searching...
-			 </string>
-			 <string name="not_found_text">
-				 None Found.
-			 </string>
-			 <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-				  height="20" label="&lt; Prev" label_selected="&lt; Prev" left="80"
-				  mouse_opaque="true" name="&lt; Prev" width="60" />
-			 <button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-				  height="20" label="Next &gt;" label_selected="Next &gt;"
-				  mouse_opaque="true" name="Next &gt;" width="60" />
-			 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				  bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-				  h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-				  name="find" v_pad="0" width="50">
-				 Find:
-			 </text>
-			 <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-				  follows="left|top" font="SansSerif" height="18" left_delta="38"
-				  max_length="63" mouse_opaque="true" name="name" width="128" spell_check="true" />
-			 <button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
-				  label="Search" label_selected="Search" left_delta="136" mouse_opaque="true"
-				  name="Search" width="70" />
-			 <check_box bottom="-22" control_name="ShowPGSearchAll" follows="left|top"
-				  font="SansSerifSmall" height="16" initial_value="true"
-				  label="PG content" left_delta="78" mouse_opaque="true"
-				  name="incpg" width="156" />
-			 <check_box bottom="-22" control_name="ShowMatureSearchAll" follows="left|top"
-				  font="SansSerifSmall" height="16" initial_value="false"
-				  label="Mature content" left_delta="100" mouse_opaque="true"
-				  name="incmature" width="156" />
-			 <check_box bottom="-22" control_name="ShowAdultSearchAll" follows="left|top"
-				  font="SansSerifSmall" height="16" initial_value="false"
-				  label="Adult content" left_delta="120" mouse_opaque="true"
-				  name="incadult" width="156" />
-			 <scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
-				  draw_heading="false" fg_disable_color="1, 1, 1, 1"
-				  follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
-				  multi_select="false" name="results" search_column="1" width="339">
-				 <column label="" name="icon" width="24" />
-				 <column label="Name" name="name" width="235" />
-				 <column label="Price" name="price" width="90" />
-				 <column label="Time (PT)" name="date" width="90" />
-				 <column label="Time" name="time" width="-1" />
-				 <column label="Traffic" name="dwell" width="90" />
-				 <column label="Area" name="area" width="90" />
-				 <column label="L$/sq.m" name="per_meter" width="90" />
-				 <column label="Online" name="online" width="90" />
-				 <column label="Members" name="members" width="90" />
-			 </scroll_list>
-			 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				  bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-				  font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-				  mouse_opaque="true" name="result_text" v_pad="0" width="328" />
-		</panel>		 
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="All" left="1" mouse_opaque="false" name="find_all_panel" width="778">
+<floater name="directory" title="Buscar en Second Life">
+	<tab_container name="Directory Tabs">
+		<panel label="Todos (Clásico)" name="find_all_old_panel">
 			<string name="searching_text">
-				Searching...
+				Buscando...
 			</string>
 			<string name="not_found_text">
-				None Found.
+				Nada Encontrado.
 			</string>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="find" v_pad="0" width="50">
-				Find:
+			<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
+			<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
+			<text name="find">
+				Buscar:
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-			     commit_on_focus_lost="false" enabled="true" follows="top|left|right"
-			     font="SansSerif" handle_edit_keys_directly="false" height="18"
-			     label="Search" left_delta="56" max_length="254" mouse_opaque="true"
-			     name="search_editor" select_all_on_focus_received="false"
-			     select_on_focus="false" tab_group="1" tool_tip="Search Second Life"
-			     width="160" spell_check="true" />
-			<button bottom="-26" follows="top|right" font="SansSerifSmall" height="25" 
-            label="" left="230" name="back_btn" width="25" image_overlay="go-previous-4.png"/>
-			<button bottom="-26" follows="top|right" font="SansSerifSmall" height="25"
-			     label="" left_delta="27" name="forward_btn" width="25" image_overlay="go-next-4.png" />
-      <button bottom="-26" follows="top|right" font="SansSerifSmall" height="25"
-			     label="" left_delta="27" name="reload_btn" width="25" image_overlay="view-refresh-5.png"/>
-			<button bottom="-48" follows="top|right" font="SansSerif" height="20"
-			     label="Search" left="121" name="search_btn" width="95" />
-			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18"
-			     left="230" max_chars="20" mouse_opaque="true" name="Category"
-			     width="158">
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Contenido Mature" name="incmature"/>
+			<check_box label="Contenido Adulto" name="incadult"/>
+			<scroll_list name="results">
+				<column label="" name="icon"/>
+				<column label="Nombre" name="name"/>
+				<column label="Precio" name="price"/>
+				<column label="Día (PT)" name="date"/>
+				<column label="Hora" name="time"/>
+				<column label="Tráfico" name="dwell"/>
+				<column label="Superfice" name="area"/>
+				<column label="L$/m²" name="per_meter"/>
+				<column label="Conectado" name="online"/>
+				<column label="Miembros" name="members"/>
+			</scroll_list>
+		</panel>		 
+		<panel label="Todo" name="find_all_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+				Nada Encontrado.
+			</string>
+			<text name="find">
+				Buscar:
+			</text>
+			<line_editor label="Buscar" name="search_editor" tool_tip="Buscar en Second Life"/>
+			<button label="" name="back_btn"/>
+			<button label="" name="forward_btn"/>
+			<button label="" name="reload_btn"/>
+			<button label="Buscar" name="search_btn"/>
+			<combo_box name="Category">
 				<combo_item name="AnyCategory" value="All">
-					Any Category
+					Cualquier Categoría
 				</combo_item>
-				<combo_item name="Events" value="Events">
-					Events
+				<combo_item name="Events">
+					Eventos
 				</combo_item>
-				<combo_item name="Groups" value="Groups">
-					Groups
+				<combo_item name="Groups">
+					Grupos
 				</combo_item>
-				<combo_item name="People" value="People">
-					People
+				<combo_item name="People">
+					Personas
 				</combo_item>
-				<combo_item name="Places" value="Places">
-					Places
+				<combo_item name="Places">
+					Lugares
 				</combo_item>
-				<combo_item name="Wiki" value="Wiki">
+				<combo_item name="Wiki">
 					Wiki
 				</combo_item>
 			</combo_box>
-			<check_box bottom="-22" control_name="ShowPGSearchAll" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="PG content" left="450" mouse_opaque="true"
-			     name="incpg" width="156" />
-			<check_box bottom="-40" control_name="ShowMatureSearchAll" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Mature content" left="450" mouse_opaque="true"
-			     name="incmature" width="156" />
-			<check_box bottom="-58" control_name="ShowAdultSearchAll" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Adult content" left="450" mouse_opaque="true"
-			     name="incadult" width="156" />
-	                <button bottom="-22" enabled="true" follows="right|top" font="SansSerif"
-                             halign="center" height="18" label="?" label_selected="?" left="-25"
-                             mouse_opaque="true" name="?" width="18" />
-			<web_browser bottom="25" follows="top|left|bottom|right" font="SansSerifSmall" left="10"
-			     name="find_browser" right="-10" top="-60" />
-			<text bottom="5" follows="bottom|left" halign="left" height="16" left="10"
-			     name="status_text" width="150" />
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Conenido Mature" name="incmature"/>
+			<check_box label="Contenido Adulto" name="incadult"/>
+			<button label="?" label_selected="?" name="?"/>
 			<string name="loading_text">
-				Loading...
+				Cargando...
 			</string>
 			<string name="done_text">
-				Done
+				Listo
 			</string>
 			<string name="redirect_404_url">
 				http://secondlife.com/app/search/notfound.html
 			</string>
-      <string name="default_search_page">"http://secondlife.com/app/search/index.php?"</string>
-    </panel>
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="Classifieds" left="1" left_delta="68" mouse_opaque="false"
-		     name="classified_panel" width="778">
+			<string name="default_search_page">
+				"http://secondlife.com/app/search/index.php?"
+			</string>
+		</panel>
+		<panel label="Clasificadosname="classified_panel">
 			<string name="searching_text">
-				Searching...
+				Buscando...
 			</string>
 			<string name="not_found_text">
-				None Found.
+				Ninguno Encontrado.
 			</string>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="find" v_pad="0" width="50">
-				Find:
+			<text name="find">
+				Buscar:
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-			     follows="left|right|top" font="SansSerif" height="18" left="56"
-			     max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
-			<check_box bottom="-22" control_name="ShowPGClassifieds" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="PG content" left="420" mouse_opaque="true"
-			     name="incpg" width="156" />
-			<check_box bottom="-40" control_name="ShowMatureClassifieds" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Mature content" left="420" mouse_opaque="true"
-			     name="incmature" width="156" />
-			<check_box bottom="-58" control_name="ShowAdultClassifieds" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Adult content" left="420" mouse_opaque="true"
-			     name="incadult" width="156" />
-			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
-			     max_chars="20" mouse_opaque="true" name="Category" width="158">
-				<combo_item name="AnyCategory" value="0">
-					Any Category
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Contenido Mature" name="incmature"/>
+			<check_box label="Contenido Adult" name="incadult"/>
+			<combo_box name="Category">
+			<combo_box name="Category">
+				<combo_item name="AnyCategory">
+					Cualquier Categoría
 				</combo_item>
-				<combo_item name="Shopping" value="1">
-					Shopping
+				<combo_item name="Shopping">
+					Compra
 				</combo_item>
-				<combo_item name="LandRental" value="2">
-					Land Rental
+				<combo_item name="LandRental">
+					Terreno en alquiler
 				</combo_item>
-				<combo_item name="PropertyRental" value="3">
-					Property Rental
+				<combo_item name="PropertyRental">
+					Propiedad en alquiler
 				</combo_item>
-				<combo_item name="SpecialAttraction" value="4">
-					Special Attraction
+				<combo_item name="SpecialAttraction">
+					Atracciones especiales
 				</combo_item>
-				<combo_item name="NewProducts" value="5">
-					New Products
+				<combo_item name="NewProducts">
+					Nuevos Productos
 				</combo_item>
-				<combo_item name="Employment" value="6">
-					Employment
+				<combo_item name="Employment">
+					Empleos
 				</combo_item>
-				<combo_item name="Wanted" value="7">
-					Wanted
+				<combo_item name="Wanted">
+					Se Busca
 				</combo_item>
-				<combo_item name="Service" value="8">
-					Service
+				<combo_item name="Service">
+					Servicios
 				</combo_item>
-				<combo_item name="Personal" value="9">
+				<combo_item name="Personal">
 					Personal
 				</combo_item>
 			</combo_box>
-			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Browse" label_selected="Browse" left="121" mouse_opaque="true"
-			     name="Browse" width="95" />
-			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
-			     visible="false" width="95" />
-			<button bottom="-46" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Place an Ad..." label_selected="Place an Ad..." left="630"
-			     mouse_opaque="true" name="Place an Ad..." width="145" />
-			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Delete" label_selected="Delete" left="80"
-			     mouse_opaque="true" name="Delete" width="80" />
-			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" 
-				 draw_heading="true" follows="left|top|right|bottom" height="450" left="4" 
-				 mouse_opaque="true" multi_select="false" name="results" search_column="2" width="339">
-				<column label="" name="icon" width="24" />
-				<column label="" name="type" width="-1" />
-				<column label="Name" name="name" width="225" />
-				<column label="Price" name="price" width="55" />
+			<button label="Navegar" label_selected="Navegar" name="Browse"/>
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<button label="Poner un Anuncio..." label_selected="Poner un Anuncio..." name="Place an Ad..."/>
+			<button label="Borrar" label_selected="Borrar" name="Delete"/>
+			<scroll_list name="results">
+				<column label="" name="icon"/>
+				<column label="" name="type"/>
+				<column label="Nombre" name="name"/>
+				<column label="Precio" name="price"/>
 			</scroll_list>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="result_text" v_pad="0" width="80" />
-			<button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;"
-			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-			<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
-			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+			<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
+			<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
 		</panel>
-		<panel border="true" bottom="-549" default_tab_group="1"
-		     follows="left|top|right|bottom" height="533" label="Events" left="1"
-		     mouse_opaque="false" name="events_panel" width="778">
+		<panel label="Eventos" name="events_panel">
 			<string name="searching_text">
-				Searching...
+				Buscando...
 			</string>
 			<string name="not_found_text">
-				None Found.
+				Ninguno Encontrado.
 			</string>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="text2" v_pad="0" width="50">
-				Find:
+			<text name="text2">
+				Buscar:
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-			     follows="left|right|top" font="SansSerif" height="18" left="56"
-			     max_length="63" mouse_opaque="true" name="event_search_text" width="160" spell_check="true" />
-			<radio_group bottom="-40" draw_border="false" follows="right|top" height="40" left="560"
-			     mouse_opaque="true" name="date_mode" width="300">
-				<radio_item bottom="-20" follows="left|top" height="20" left="0" mouse_opaque="true"
-				     name="current" width="174">
-					In-Progress and Upcoming
+			<radio_group name="date_mode">
+				<radio_item name="current">
+					En curso y próximos
 				</radio_item>
-				<radio_item bottom_delta="-10" follows="left|top" height="20" left="0" mouse_opaque="true"
-				     name="date" width="56">
-					Date
+				<radio_item name="date">
+					Fecha
 				</radio_item>
 			</radio_group>
-			<button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="&lt;&lt;" label_selected="&lt;&lt;" left_delta="54"
-			     mouse_opaque="true" name="&lt;&lt;" tool_tip="Go back a day" width="24" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-36" drop_shadow_visible="true" follows="right|top" font="SansSerif"
-			     h_pad="0" halign="center" height="14" left_delta="22" mouse_opaque="true"
-			     name="date_text" v_pad="0" width="48">
+			<button label="&lt;&lt;" label_selected="&lt;&lt;" name="&lt;&lt;" tool_tip="Retroceder un día"/>
+			<text name="date_text">
 				6/6
 			</text>
-			<button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="&gt;&gt;" label_selected="&gt;&gt;" left_delta="50"
-			     mouse_opaque="true" name="&gt;&gt;" tool_tip="Go forward a day" width="24" />
-			<button bottom="-40" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Today" label_selected="Today" left_delta="28" mouse_opaque="true"
-			     name="Today" tool_tip="Show today&apos;s events" width="60" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="289"
-			     mouse_opaque="true" name="text" v_pad="0" width="90" visible="false">
-				Category:
+			<button label="&gt;&gt;" label_selected="&gt;&gt;" name="&gt;&gt;" tool_tip="Avanzar un día"/>
+			<button label="Hoy" label_selected="Hoy" name="Today" tool_tip="Mostrar los eventos del día de hoy"/>
+			<text name="text">
+				Categoría:
 			</text>
-			<combo_box allow_text_entry="false" bottom="-46" follows="right|top" height="18" left="230"
-			     max_chars="20" mouse_opaque="true" name="category combo" width="158">
-				<combo_item name="All" value="0">
-					Any Category
+			<combo_box name="category combo">
+				<combo_item name="All">
+					Cualquier categoría
 				</combo_item>
-				<combo_item name="Discussion" value="18">
-					Discussion
+				<combo_item name="Discussion">
+					Debates
 				</combo_item>
-				<combo_item name="Sports" value="19">
-					Sports
+				<combo_item name="Sports">
+					Deportes
 				</combo_item>
-				<combo_item name="LiveMusic" value="20">
-					Live Music
+				<combo_item name="LiveMusic">
+					Música en vivo
 				</combo_item>
-				<combo_item name="Commercial" value="22">
-					Commercial
+				<combo_item name="Commercial">
+					Comercial
 				</combo_item>
-				<combo_item name="Nightlife/Entertainment" value="23">
-					Nightlife/Entertainment
+				<combo_item name="Nightlife/Entertainment">
+					Vida nocturna/Entretenimiento
 				</combo_item>
-				<combo_item name="Games/Contests" value="24">
-					Games/Contests
+				<combo_item name="Games/Contests">
+					Juegos/Concursos
 				</combo_item>
-				<combo_item name="Pageants" value="25">
-					Pageants
+				<combo_item name="Pageants">
+					Representaciones
 				</combo_item>
-				<combo_item name="Education" value="26">
-					Education
+				<combo_item name="Education">
+					Educación
 				</combo_item>
-				<combo_item name="ArtsandCulture" value="27">
-					Arts and Culture
+				<combo_item name="ArtsandCulture">
+					Arte y Cultura
 				</combo_item>
-				<combo_item name="Charity/SupportGroups" value="28">
-					Charity/Support Groups
+				<combo_item name="Charity/SupportGroups">
+					Grupos de Ayuda y Caridad
 				</combo_item>
 				<combo_item name="Miscellaneous" value="29">
-					Miscellaneous
+					Misceláneos
 				</combo_item>
 			</combo_box>
-			<check_box bottom="-22" control_name="ShowPGEvents" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="PG content" left="420" mouse_opaque="true"
-			     name="incpg" width="156" />
-			<check_box bottom="-40" control_name="ShowMatureEvents" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Mature content" left="420" mouse_opaque="true"
-			     name="incmature" width="156" />
-			<check_box bottom="-58" control_name="ShowAdultEvents" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Adult content" left="420" mouse_opaque="true"
-			     name="incadult" width="156" />
-			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" left="121" mouse_opaque="true" name="Search"
-			     visible="true" width="95" />
-			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Delete" label_selected="Delete" left="80"
-			     mouse_opaque="true" name="Delete" width="80" />
-			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true" 
-			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
-			     multi_select="false" name="results" search_column="2" width="339">
-				<column label="" name="icon" width="24" />
-				<column label="" name="type" width="-1" />
-				<column dynamicwidth="true" label="Name" name="name" />
-				<column label="Time (PT)" name="date" sort="time" width="106" />
-				<column label="" name="event_id" width="-1" />
-				<column label="Time" name="time" width="-1" />
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Contenido Mature" name="incmature"/>
+			<check_box label="Contenido Adult" name="incadult"/>
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<button label="Borrar" label_selected="Borrar" name="Delete"/>
+			<scroll_list name="results">
+				<column label="" name="icon"/>
+				<column label="" name="type"/>
+				<column label="Nombre" name="name" />
+				<column label="Día (PT)" name="date"/>
+				<column label="" name="event_id"/>
+				<column label="Hora" name="time"/>
 			</scroll_list>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="result_text" v_pad="0" width="80" />
-			<button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;"
-			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-			<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
-			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+			<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
+			<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
 		</panel>
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="Showcase" left="1" mouse_opaque="false" name="showcase_panel"
-		     width="778">
-        <string name="searching_text">Searching...</string>
-        <string name="not_found_text">None Found.</string>
-        <button bottom="-30" follows="top|left" font="SansSerifSmall" height="25"
-          label=""
-          image_overlay="go-previous-4.png"
-          left="10"
-          name="back_btn" width="25" />
-        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="25"
-          label=""
-          image_overlay="go-next-4.png"
-          left_delta="27"
-          name="forward_btn" width="25" />
-        <button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="25"
-         label=""
-         image_overlay="view-refresh-5.png"
-         left_delta="27"
-         name="reload_btn" width="25" />
-        <!-- No mature content checkbox, showcase is all PG -->
-        <web_browser name="showcase_browser"
-          bottom="25"
-          follows="top|left|bottom|right"
-          font="SansSerifSmall"
-          left="10"
-          right="-10"
-          top="-40" />
-        <text bottom="5"
-          follows="bottom|left"
-          halign="left"
-          left="10"
-          width="150"
-          name="status_text"
-          height="16" />
-        <string name="loading_text">Loading...</string>
-        <string name="done_text">Done</string>
-        <string name="redirect_404_url">http://secondlife.com/app/search/notfound.html</string>
-        <string name="default_search_page">"http://secondlife.com/app/showcase/index.php?"</string>
-    </panel>
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="Land Sales" left="1" mouse_opaque="false" name="land_sales_panel"
-		     width="778" default_tab_group="1">
+		<panel label="Escaparate" name="showcase_panel">
 			<string name="searching_text">
-				Searching...
+				Buscando...
 			</string>
 			<string name="not_found_text">
-				None Found.
+				Nignuno Encontrado.
+			</string>
+			<button label="" name="back_btn"/>
+			<button label="" name="forward_btn"/>
+			<button label="" name="reload_btn"/>
+			<!-- No mature content checkbox, showcase is all PG -->
+			<string name="loading_text">
+				Cargando...
+			</string>
+			<string name="done_text">
+				Listo
+			</string>
+			<string name="redirect_404_url">
+				http://secondlife.com/app/search/notfound.html
+			</string>
+			<string name="default_search_page">
+				"http://secondlife.com/app/showcase/index.php?"
+			</string>
+		</panel>
+		<panel label="Venta de Terrenos" name="land_sales_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+				Ninguno Encontrado.
 			</string>
 			<string name="land_help_text">
-				Land can be bought direct for in-world money ([CURRENCY]) or at auction for either [CURRENCY] or [REALCURRENCY].
-To buy direct, visit the land and click on the place name in the title bar.
+				El terreno puede comprarse directamente en la moneda del mundo ([CURRENCY]) , o con [CURRENCY] o [REALCURRENCY]. en una
+subasta. Para comprarlo directamente, visítalo y pulsa en el nombre del terreno en la barra superior del visor.
 			</string>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="find" v_pad="0" width="50">
-				Find:
+			<text name="find">
+				Buscar:
 			</text>
-			<check_box bottom="-22" control_name="ShowPGLand" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="PG content" left="420" mouse_opaque="true"
-			     name="incpg" tab_group="7" width="156" />
-			<check_box bottom="-40" control_name="ShowMatureLand" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Mature content" left="420" mouse_opaque="true"
-			     name="incmature" tab_group="8" width="156" />
-			<check_box bottom="-58" control_name="ShowAdultLand" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Adult content" left="420" mouse_opaque="true"
-			     name="incadult" tab_group="9" width="156" />
-			<combo_box allow_text_entry="false" bottom="-46" follows="left|top|right" height="18" left="282"
-			     max_chars="20" mouse_opaque="true" name="type" tab_group="6" width="128">
-				<combo_item name="AllTypes" value="All Types">
-					All Types
+				<text name="find">
+				Buscar:
+			</text>
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Contenido Mature" name="incmature"/>
+			<check_box label="Contenido Adult" name="incadult"/>
+			<combo_box name="type">
+				<combo_item name="AllTypes">
+					Todos los tipos
 				</combo_item>
-				<combo_item name="Auction" value="Auction">
-					Auction
+				<combo_item name="Auction">
+					Subasta
 				</combo_item>
-				<combo_item name="MainlandSales" value="Mainland Sales">
-					For Sale - Mainland
+				<combo_item name="MainlandSales">
+					En Venta - Mainland
 				</combo_item>
-				<combo_item name="EstateSales" value="Estate Sales">
-					For Sale - Estate
+				<combo_item name="EstateSales">
+					En Venta - Estado
 				</combo_item>
 			</combo_box>
-			<check_box bottom="-24" control_name="FindLandPrice" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Price &#8804; " left="56" mouse_opaque="true" name="pricecheck"
-			     tab_group="1" width="88" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
-			     bottom="-24" font="SansSerifSmall" halign="left" height="16" left="116" mouse_opaque="true"
-			     name="pricecheck_symbol" width="15">
+			<check_box label="Precio &#8804; " name="pricecheck"/>
+			<text name="pricecheck_symbol">
 				[CURRENCY]
 			</text>
-			<check_box bottom_delta="-18" control_name="FindLandArea" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Area &#8805; " left="56" mouse_opaque="true" name="areacheck"
-			     tab_group="3" width="80" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
-			     bottom="-42" font="SansSerifSmall" halign="left" height="16" left="170" mouse_opaque="true"
-			     name="areacheck_symbol" width="15">
+			<check_box label="Superficie &#8805; " name="areacheck"/>
+			<text name="areacheck_symbol">
 				m²
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-22"
-			     follows="left|top" font="SansSerifSmall" height="16" left="132"
-			     max_length="10" mouse_opaque="true" name="priceedit" tab_group="2" width="50" spell_check="true" />
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-18"
-			     follows="left|top" font="SansSerifSmall" height="16" left="117"
-			     max_length="10" mouse_opaque="true" name="areaedit" tab_group="4" width="50" spell_check="true" />
-			<button bottom="-48" follows="left|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" left="208" mouse_opaque="true"
-			     name="Search" tab_group="5" width="70" />
-			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true" draw_heading="true" 
-			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
-			     multi_select="false" name="results" search_column="2" tab_group="10" width="387">
-				<column label="" name="icon" width="24" />
-				<column label="" name="type" width="-1" />
-				<column dynamicwidth="true" label="Name" name="name" />
-				<column label="Type" name="landtype" width="50" />
-				<column label="[CURRENCY] Price" name="price" width="65" />
-				<column label="Area" name="area" width="50" />
-				<column label="[CURRENCY]/m²" name="per_meter" width="65" />
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<scroll_list name="results">
+				<column label="" name="icon"/>
+				<column label="" name="type"/>
+				<column label="Nombre" name="name" />
+				<column label="Tipo" name="landtype"/>
+				<column label="[CURRENCY] Precio" name="price"/>
+				<column label="Superficie" name="area"/>
+				<column label="[CURRENCY]/m²" name="per_meter"/>
 			</scroll_list>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
-			<button bottom="-533" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;"
-			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-			<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
-			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+			<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
+			<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
 		</panel>
-		<panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="Places" left="1" mouse_opaque="false" name="places_panel"
-		     width="778">
+		<panel label="Lugares" name="places_panel">
 			<string name="searching_text">
-				Searching...
+				Buscando...
 			</string>
 			<string name="not_found_text">
-				None Found.
+				Ninguno Encontrado.
 			</string>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="find" v_pad="0" width="50">
-				Find:
+			<text name="find">
+				Buscar:
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-			     follows="left|right|top" font="SansSerif" height="18" left="56"
-			     max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
-			<check_box bottom="-22" control_name="ShowPGSims" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="PG content" left="420" mouse_opaque="true"
-			     name="incpg" width="156" />
-			<check_box bottom="-40" control_name="ShowMatureSims" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Mature content" left="420" mouse_opaque="true"
-			     name="incmature" width="156" />
-			<check_box bottom="-58" control_name="ShowAdultSims" follows="right|top"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Adult content" left="420" mouse_opaque="true"
-			     name="incadult" width="156" />
-			<combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
-			     max_chars="20" mouse_opaque="true" name="Category" width="128" visible="false">
-				<combo_item name="AnyCategory" value="any">
-					Any Category
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Contenido Mature" name="incmature"/>
+			<check_box label="Contenido Adulto" name="incadult"/>
+			<combo_box name="Category">
+				<combo_item name="AnyCategory">
+					Cualquier Categoría
 				</combo_item>
-				<combo_item name="LindenLocation" value="linden">
-					Official Location
+				<combo_item name="LindenLocation">
+					Localización Linden
 				</combo_item>
-				<combo_item name="Arts&amp;Culture" value="arts">
-					Arts and Culture
+				<combo_item name="Arts&amp;Culture">
+					Arte y Cultura
 				</combo_item>
-				<combo_item name="Business" value="store">
-					Business
+				<combo_item name="Business">
+					Negocios
 				</combo_item>
-				<combo_item name="Educational" value="educational">
-					Educational
+				<combo_item name="Educational">
+					Educacional
 				</combo_item>
-				<combo_item name="Gaming" value="game">
-					Gaming
+				<combo_item name="Gaming">
+					Juegos de Azar
 				</combo_item>
-				<combo_item name="Hangout" value="gather">
-					Hangout
+				<combo_item name="Hangout">
+					Entretenimiento
 				</combo_item>
-				<combo_item name="NewcomerFriendly" value="newcomer">
-					Newcomer Friendly
+				<combo_item name="NewcomerFriendly">
+					Para recién llegados
 				</combo_item>
-				<combo_item name="Parks&amp;Nature" value="park">
-					Parks and Nature
+				<combo_item name="Parks&amp;Nature">
+					Parques y Naturaleza
 				</combo_item>
-				<combo_item name="Residential" value="home">
-					Residential
+				<combo_item name="Residential">
+					Residencial
 				</combo_item>
-				<combo_item name="Shopping" value="shopping">
-					Shopping
+				<combo_item name="Shopping">
+					Compras
 				</combo_item>
-				<combo_item name="Other" value="other">
-					Other
+				<combo_item name="Other">
+					Otra
+				</combo_item>
+				<combo_item name="Rental" value="rental">
+					Alquiler
 				</combo_item>
-        <combo_item name="Rental" value="rental">
-          Rental
-        </combo_item>
 			</combo_box>
 			<!-- This is used only during the AO transition and can be deleted once the AO transition is
 			complete. It is identical to the combo box above except that it has the Adult category. 
 			You might also want to set it back to default visible and enabled. -->
-			<combo_box allow_text_entry="false" bottom="-46" enabled="false" follows="right|top" height="18" left="230"
-			     max_chars="20" mouse_opaque="true" name="Category_Adult" width="128" visible="false">
-				<combo_item name="AnyCategory" value="any">
-					Any Category
+			<combo_box name="Category_Adult">
+				<combo_item name="AnyCategory">
+					Cualquier Categoría
 				</combo_item>
-				<combo_item name="LindenLocation" value="linden">
-					Linden Location
+				<combo_item name="LindenLocation">
+					Localización Linden
 				</combo_item>
 				<combo_item name="Adult" value="adult">
-					Adult
+					Adulto
 				</combo_item>
-				<combo_item name="Arts&amp;Culture" value="arts">
-					Arts and Culture
+				<combo_item name="Arts&amp;Culture">
+					Arte y Cultura
 				</combo_item>
-				<combo_item name="Business" value="store">
-					Business
+				<combo_item name="Business">
+					Negocios
 				</combo_item>
-				<combo_item name="Educational" value="educational">
-					Educational
+				<combo_item name="Educational">
+					Educacional
 				</combo_item>
-				<combo_item name="Gaming" value="game">
-					Gaming
+				<combo_item name="Gaming">
+					Juegos de Azar
 				</combo_item>
-				<combo_item name="Hangout" value="gather">
-					Hangout
+				<combo_item name="Hangout">
+					Entretenimiento
 				</combo_item>
-				<combo_item name="NewcomerFriendly" value="newcomer">
-					Newcomer Friendly
+				<combo_item name="NewcomerFriendly">
+					Para recién llegados
 				</combo_item>
-				<combo_item name="Parks&amp;Nature" value="park">
-					Parks and Nature
+				<combo_item name="Parks&amp;Nature">
+					Parques y Naturaleza
 				</combo_item>
-				<combo_item name="Residential" value="home">
-					Residential
+				<combo_item name="Residential">
+					Residencial
 				</combo_item>
-				<combo_item name="Shopping" value="shopping">
-					Shopping
+				<combo_item name="Shopping">
+					Compras
 				</combo_item>
-				<combo_item name="Other" value="other">
-					Other
+				<combo_item name="Other">
+					Otra
+				</combo_item>
+				<combo_item name="Rental" value="rental">
+					Alquiler
 				</combo_item>
-        <combo_item name="Rental" value="rental">
-          Rental
-        </combo_item>
 			</combo_box>
-			<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" left="121" mouse_opaque="true"
-			     name="Search" width="95" />
-			<scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
-			     draw_heading="true" 
-			     
-			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
-			     multi_select="false" name="results" search_column="2" width="339">
-				<column label="" name="icon" width="24" />
-				<column label="" name="type" width="-1" />
-				<column dynamicwidth="true" label="Name" name="name" />
-				<column label="Traffic" name="dwell" width="75" />
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<scroll_list name="results">
+				<column label="" name="icon"/>
+				<column label="" name="type"/>
+				<column abel="Nombre" name="name" />
+				<column label="Tráfico" name="dwell"/>
 			</scroll_list>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
-			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;"
-			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-			<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
-			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
+			<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
+			<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
 		</panel>
-    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="People" left="1" mouse_opaque="false" name="people_panel"
-		     width="778">
+		<panel label="Personas" name="people_panel">
 			<string name="searching_text">
-				Searching...
+				Buscando...
 			</string>
 			<string name="not_found_text">
-				None Found.
+				Nadie Encontrado.
 			</string>
-      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="find" v_pad="0" width="50">
-        Find:
-      </text>
-	  <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-			     follows="left|right|top" font="SansSerif" height="18" left="56"
-			     max_length="63" mouse_opaque="true" name="name" width="160" spell_check="true" />
-		<button bottom="-48" follows="right|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" left="121" mouse_opaque="true"
-			     name="Search" width="95" />
-      <scroll_list background_visible="true" bottom="-510" column_padding="0" draw_border="true"
-			     draw_heading="true" 
-                               
-			     follows="left|top|right|bottom" height="450" left="4" mouse_opaque="true"
-			     multi_select="false" name="results" search_column="2" width="326">
-        <column label="" name="icon" width="24" />
-        <column label="" name="type" width="-1" />
-        <column label="Name" name="name" width="274" />
-      </scroll_list>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
-			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;"
-			     mouse_opaque="true" name="Next &gt;" right="330" width="80" />
-      		<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
-			     mouse_opaque="true" name="&lt; Prev" right="244" width="80" />
-		</panel>
-    <panel border="true" bottom="-549" follows="left|top|right|bottom" height="533"
-		     label="Groups" left="1" mouse_opaque="false" name="groups_panel"
-		     width="778">
-			<string name="searching_text">
-				Searching...
-			</string>
-			<string name="not_found_text">
-				None Found.
-			</string>
-			<button bottom="-533" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="Next &gt;" label_selected="Next &gt;"
-			     mouse_opaque="true" name="Next &gt;" right="344" width="80" />
-			<button bottom_delta="0" follows="left|bottom" font="SansSerif" halign="center"
-			     height="20" label="&lt; Prev" label_selected="&lt; Prev"
-			     mouse_opaque="true" name="&lt; Prev" right="258" width="80" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-24" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="4" mouse_opaque="true"
-			     name="find" v_pad="0" width="50">
-				Find:
+			<text name="find">
+				Buscar:
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-24"
-			     follows="left|top" font="SansSerif" height="18" left_delta="38"
-			     max_length="63" mouse_opaque="true" name="name" width="200" spell_check="true" />
-			<button bottom="-26" follows="left|top" font="SansSerif" halign="center" height="20"
-			     label="Search" label_selected="Search" left_delta="210" mouse_opaque="true"
-			     name="Search" width="70" />
-			<check_box bottom="-46" control_name="ShowPGGroups" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="PG content" left="4" mouse_opaque="true"
-			     name="incpg" width="204" />
-			<check_box bottom="-46" control_name="ShowMatureGroups" follows="left|top"
-			     font="SansSerifSmall" height="16" initial_value="true"
-			     label="Mature content" left_delta="90" mouse_opaque="true"
-			     name="incmature" width="204" />
-			<check_box bottom="-46" control_name="ShowAdultGroups" follows="left|top"
-		     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Adult content" left_delta="110" mouse_opaque="true"
-			     name="incadult" width="204" />
-			<scroll_list background_visible="true" bottom="-513" column_padding="0" draw_border="true"
-			     draw_heading="true"
-			     follows="left|top|right|bottom" height="464" left="4" mouse_opaque="true"
-			     multi_select="false" name="results" search_column="2" width="339">
-				<column label="" name="icon" sort="score" sort_ascending="false" width="24" />
-				<column label="" name="type" width="-1" />
-				<column dynamicwidth="true" label="Name" name="name" />
-				<column halign="left" label="Members" name="members" sort_ascending="false" width="100" />
-				<column label="" name="score" width="-1" />
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<scroll_list name="results">
+				<column label="" name="icon"/>
+				<column label="" name="type"/>
+				<column label="Nombre" name="name"/>
 			</scroll_list>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-			     mouse_opaque="true" name="result_text" v_pad="0" width="328" />
-    </panel>
+			<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
+			<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
+		</panel>
+		<panel label="Grupos" name="groups_panel">
+			<string name="searching_text">
+				Buscando...
+			</string>
+			<string name="not_found_text">
+				Ninguno Encontrado.
+			</string>
+			<button label="Sig. &gt;" label_selected="Sig. &gt;" name="Next &gt;"/>
+			<button label="&lt; Ant." label_selected="&lt; Ant." name="&lt; Prev"/>
+			<text name="find">
+				Buscar:
+			</text>
+			<button label="Buscar" label_selected="Buscar" name="Search"/>
+			<check_box label="Contenido PG" name="incpg"/>
+			<check_box label="Contenido Mature" name="incmature"/>
+			<check_box label="Contenido Adulto" name="incadult"/>
+			<scroll_list name="results">
+				<column label="" name="icon"/>
+				<column label="" name="type"/>
+				<column label="Nombre" name="name" />
+				<column label="Miembros" name="members"/>
+				<column label="" name="score"/>
+			</scroll_list>
+		</panel>
 	</tab_container>
-	<panel bottom="-560" follows="right|top" height="470" left="340"
-	     name="classified_details_panel" width="440" />
-	<panel bottom="-560" follows="right|top" height="486" left="350" name="Panel Avatar"
-	     width="430" />
-	<panel bottom="-560" follows="right|top" height="470" left="340"
-	     name="event_details_panel" width="440" />
-	<panel bottom="-580" follows="right|top" height="515" left="350"
-	     name="group_details_panel_holder" width="430">
-		<panel bottom="0" follows="right|top" height="470" left="0" name="group_details_panel"
-		     width="430" />
+	<panel name="classified_details_panel"/>
+	<panel name="Panel Avatar"/>
+	<panel name="event_details_panel"/>
+	<panel name="group_details_panel_holder">
+		<panel name="group_details_panel"/>
 	</panel>
-	<panel bottom="-560" follows="right|top" height="470" left="340"
-	     name="place_details_panel" width="440" />
-	<panel bottom="-560" follows="right|top" height="470" left="385"
-	     name="place_details_small_panel" width="395" />
+	<panel name="place_details_panel"/>
+	<panel name="place_details_small_panel"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_display_name.xml b/indra/newview/skins/default/xui/es/floater_display_name.xml
index d108278c2..74a052e9c 100644
--- a/indra/newview/skins/default/xui/es/floater_display_name.xml
+++ b/indra/newview/skins/default/xui/es/floater_display_name.xml
@@ -6,11 +6,9 @@
 	<text name="set_name_label">
 		Nuevo Nombre a Mostrar:
 	</text>
-	<line_editor name="display_name_editor"/>
 	<text name="name_confirm_label">
 		Vuelve a escribir tu nombre nuevo para confirmarlo:
 	</text>
-	<line_editor name="display_name_confirm"/>
 	<button label="Guardar" name="save_btn" tool_tip="Guardar tu nuevo Nombre a Mostrar" />
 	<button label="Restablecer" name="reset_btn" tool_tip="Hacer que tu Nombre a Mostrar sea el mismo que tu nombre de usuario" />
 	<button label="Cancelar" name="cancel_btn" tool_tip="Cancelar y cerrar esta ventana" />
diff --git a/indra/newview/skins/default/xui/es/floater_explore_animations.xml b/indra/newview/skins/default/xui/es/floater_explore_animations.xml
index 423f89de8..e445ac3f1 100644
--- a/indra/newview/skins/default/xui/es/floater_explore_animations.xml
+++ b/indra/newview/skins/default/xui/es/floater_explore_animations.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_explore_animations" title="Animaciones">
-	  <scroll_list name="anim_list">
-			 <column label="Nombre" name="name" />
-			 <column label="" name="info" />
-	  </scroll_list>
+	<scroll_list name="anim_list">
+		<column label="Nombre" name="name" />
+		<column label="" name="info" />
+	</scroll_list>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_explore_sounds.xml b/indra/newview/skins/default/xui/es/floater_explore_sounds.xml
index 7b7d26742..393b7f4c0 100644
--- a/indra/newview/skins/default/xui/es/floater_explore_sounds.xml
+++ b/indra/newview/skins/default/xui/es/floater_explore_sounds.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_explore_sounds" title="Sonidos">
-	  <text name="result_label">
-			 Fuentes:
-	  </text>
-	  <check_box name="avatars_chk"  label="Avatares"/>
-	  <check_box name="objects_chk"  label="Objetos"/>
-	  <check_box name="collision_chk"  label="Sonido de Colisión por Defecto" />
-	  <text name="result_label">
-			 Controles:
-	  </text>	
-	  <check_box name="repeated_asset_chk"  label="Mostrar Repeticiones"/>
-	  <check_box name="pause_chk"  label="Pausar Registro"  left_delta="130" />
-	  <scroll_list name="sound_list">
-			 <column tool_tip="Tipo" name="type" />
-			 <column label="Tiempo" name="playing" width="60" />
-			 <column label="Propietario" name="owner" />
-			 <column label="Sonido" name="sound" />
-	  </scroll_list>
-	  <button label="Mirar Hacia" name="look_at_btn" />
-	  <button label="Reproducir Localmente" name="play_locally_btn" width="150"/>
-	  <button label="Reproducir en el Mundo" name="play_ambient_btn" left_delta="155" width="155"/>
-	  <button label="Detener" name="stop_btn"/>
-	  <button label="Agregar a Lista Negra" name="bl_btn" />
+	<text name="result_label">
+		Fuentes:
+	</text>
+	<check_box name="avatars_chk"  label="Avatares"/>
+	<check_box name="objects_chk"  label="Objetos"/>
+	<check_box name="collision_chk"  label="Sonido de Colisión por Defecto" />
+	<text name="result_label">
+		Controles:
+	</text>	
+	<check_box name="repeated_asset_chk"  label="Mostrar Repeticiones"/>
+	<check_box name="pause_chk"  label="Pausar Registro"  left_delta="130" />
+	<scroll_list name="sound_list">
+		<column tool_tip="Tipo" name="type" />
+		<column label="Tiempo" name="playing" width="60" />
+		<column label="Propietario" name="owner" />
+		<column label="Sonido" name="sound" />
+	</scroll_list>
+	<button label="Mirar Hacia" name="look_at_btn" />
+	<button label="Reproducir Localmente" name="play_locally_btn" width="150"/>
+	<button label="Reproducir en el Mundo" name="play_ambient_btn" left_delta="155" width="155"/>
+	<button label="Detener" name="stop_btn"/>
+	<button label="Agregar a Lista Negra" name="bl_btn" />
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_fast_timers.xml b/indra/newview/skins/default/xui/es/floater_fast_timers.xml
index 4c0c9581e..2918c754a 100644
--- a/indra/newview/skins/default/xui/es/floater_fast_timers.xml
+++ b/indra/newview/skins/default/xui/es/floater_fast_timers.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="fast_timers">
-	  <string name="pause" >
-			 Pausa
-	  </string>
-	  <string name="run">
-			 Ejecutar
-	  </string>
-	  <button name="pause_btn"label="Pausa"/>
+	<string name="pause" >
+		Pausa
+	</string>
+	<string name="run">
+		Ejecutar
+	</string>
+	<button name="pause_btn" label="Pausa"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_font_test.xml b/indra/newview/skins/default/xui/es/floater_font_test.xml
index f8c01dc4e..c9f3ed586 100644
--- a/indra/newview/skins/default/xui/es/floater_font_test.xml
+++ b/indra/newview/skins/default/xui/es/floater_font_test.xml
@@ -1,87 +1,87 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="contents" title="Prueba de Fuentes">
-	  <text font="SansSerifSmall">
-			 SansSerifSmall
-	  </text>
-	  <text font="SansSerifMedium">
-			 SansSerifMedium
-	  </text>
-	  <text font="SansSerif">
-			 SansSerif, sin tamaño ni estilo (Debería ser igual a Medium)
-	  </text>
-	  <text font="SansSerifLarge">
-			 SansSerifLarge
-	  </text>
-	  <text font="SansSerifHuge">
-			 SansSerifHuge
-	  </text>
-	  <text font="Monospace">
-			 Monospace
-	  </text>
-	  <text font="Monospace" font_size="Large">
-			 Monospace tamaño=Grande
-	  </text>
-	  <text font="SansSerifLarge" font_style="BOLD">
-			 SansSerifLarge estilo=NEGRITA
-	  </text>
-	  <text font="SansSerifBold">
-			 SansSerifBold
-	  </text>
-	  <text font="SansSerif" font_style="BOLD">
-			 SansSerif estilo=NEGRITA (debería ser igual a SansSerifBold)
-	  </text>
-	  <text font="SansSerif" font-style="ITALIC">
-			 SansSerif estilo=IT�LICA
-	  </text>
-	  <text font="SansSerif" font-style="BOLD|ITALIC">
-			 SansSerif estilo=NEGRITA|IT�LICA
-	  </text>
-	  <text font="SansSerif" font-style="BOLD|ITALIC" font-shadow="soft">
-			 SansSerif estilo=NEGRITA|IT�LICA sombreado = DROP_SHADOW_SOFT
-	  </text>
-	  <text font="SansSerif" font-style="UNDERLINE">
-			 SansSerif estilo=SUBRAYADO
-	  </text>
-	  <text font="SansSerif" font-shadow="hard">
-			 SansSerif sombreado =DROP_SHADOW
-	  </text>
-	  <text font="SansSerif" font-shadow="soft">
-			 SansSerif sombreado=DROP_SHADOW_SOFT
-	  </text>
-	  <text font="DejaVu">
-			 DejaVu
-	  </text>
-	  <text font="DejaVu" font-style="BOLD">
-			 DejaVu estilo=NEGRITA
-	  </text>
-	  <text font="DejaVu" font-style="ITALIC">
-			 DejaVu estilo=ITALIC
-	  </text>
-	  <text font="DejaVu" font-style="BOLD|ITALIC">
-			 DejaVu estilo=NEGRITA|IT�LICA
-	  </text>
-	  <text font="DejaVu" font_size="Large" font-style="BOLD|ITALIC">
-			 DejaVu tamaño=grande estilo=NEGRITA|IT�LICA
-	  </text>
-	  <text font="Helvetica">
-			 Helvetica
-	  </text>
-	  <text font="Helvetica" font-style="BOLD">
-			 Helvetica estilo=NEGRITA
-	  </text>
-	  <text font="Helvetica" font-style="ITALIC">
-			 Helvetica estilo=ITALIC
-	  </text>
-	  <text font="Helvetica" font-style="BOLD|ITALIC">
-			 Helvetica estilo=NEGRITA|IT�LICA
-	  </text>
-	  <text font="Helvetica" font_size="Large" font-style="BOLD|ITALIC">
-			 Helvetica tamaño=grande estilo=NEGRITA|IT�LICA
-	  </text>
-	  <text name="linea">
-			 OverrideTest, debería de aparecer aquí en Times. (Desde default/xui/en-us)
-	  </text>
-	  <text font="BogusFontName">
-			 BogusFontName
-	  </text>
+	<text font="SansSerifSmall">
+		SansSerifSmall
+	</text>
+	<text font="SansSerifMedium">
+		SansSerifMedium
+	</text>
+	<text font="SansSerif">
+		SansSerif, sin tamaño ni estilo (Debería ser igual a Medium)
+	</text>
+	<text font="SansSerifLarge">
+		SansSerifLarge
+	</text>
+	<text font="SansSerifHuge">
+		SansSerifHuge
+	</text>
+	<text font="Monospace">
+		Monospace
+	</text>
+	<text font="Monospace" font_size="Large">
+		Monospace tamaño=Grande
+	</text>
+	<text font="SansSerifLarge" font_style="BOLD">
+		SansSerifLarge estilo=NEGRITA
+	</text>
+	<text font="SansSerifBold">
+		SansSerifBold
+	</text>
+	<text font="SansSerif" font_style="BOLD">
+		SansSerif estilo=NEGRITA (debería ser igual a SansSerifBold)
+	</text>
+	<text font="SansSerif" font-style="ITALIC">
+		SansSerif estilo=IT�LICA
+	</text>
+	<text font="SansSerif" font-style="BOLD|ITALIC">
+		SansSerif estilo=NEGRITA|IT�LICA
+	</text>
+	<text font="SansSerif" font-style="BOLD|ITALIC" font-shadow="soft">
+		SansSerif estilo=NEGRITA|IT�LICA sombreado = DROP_SHADOW_SOFT
+	</text>
+	<text font="SansSerif" font-style="UNDERLINE">
+		SansSerif estilo=SUBRAYADO
+	</text>
+	<text font="SansSerif" font-shadow="hard">
+		SansSerif sombreado =DROP_SHADOW
+	</text>
+	<text font="SansSerif" font-shadow="soft">
+		SansSerif sombreado=DROP_SHADOW_SOFT
+	</text>
+	<text font="DejaVu">
+		DejaVu
+	</text>
+	<text font="DejaVu" font-style="BOLD">
+		DejaVu estilo=NEGRITA
+	</text>
+	<text font="DejaVu" font-style="ITALIC">
+		DejaVu estilo=ITALIC
+	</text>
+	<text font="DejaVu" font-style="BOLD|ITALIC">
+		DejaVu estilo=NEGRITA|IT�LICA
+	</text>
+	<text font="DejaVu" font_size="Large" font-style="BOLD|ITALIC">
+		DejaVu tamaño=grande estilo=NEGRITA|IT�LICA
+	</text>
+	<text font="Helvetica">
+		Helvetica
+	</text>
+	<text font="Helvetica" font-style="BOLD">
+		Helvetica estilo=NEGRITA
+	</text>
+	<text font="Helvetica" font-style="ITALIC">
+		Helvetica estilo=ITALIC
+	</text>
+	<text font="Helvetica" font-style="BOLD|ITALIC">
+		Helvetica estilo=NEGRITA|IT�LICA
+	</text>
+	<text font="Helvetica" font_size="Large" font-style="BOLD|ITALIC">
+		Helvetica tamaño=grande estilo=NEGRITA|IT�LICA
+	</text>
+	<text name="linea">
+		OverrideTest, debería de aparecer aquí en Times. (Desde default/xui/en-us)
+	</text>
+	<text font="BogusFontName">
+		BogusFontName
+	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_god_tools.xml b/indra/newview/skins/default/xui/es/floater_god_tools.xml
index c4dd40f74..94b6d7595 100644
--- a/indra/newview/skins/default/xui/es/floater_god_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_god_tools.xml
@@ -1,285 +1,106 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-534" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="384" left="433" min_height="384" min_width="400"
-     mouse_opaque="true" name="godtools floater" title="God Tools" width="400">
-	<tab_container bottom="-384" follows="left|top" height="364" left="0" mouse_opaque="false"
-	     name="GodTools Tabs" tab_position="top" width="400">
-		<panel border="true" bottom="-363" follows="left|top|right|bottom" height="347"
-		     label="Grid" left="1" mouse_opaque="false" name="grid" width="398">
-			<button bottom="-28" follows="left|top" font="SansSerif" halign="center" height="20"
-			     label="Kick all users" label_selected="Kick all users" left="10"
-			     mouse_opaque="true" name="Kick all users" width="100" />
-			<button bottom_delta="-28" follows="left|top" font="SansSerif" halign="center"
-			     height="20" label="Flush This Region&apos;s Map Visibility Caches"
-			     label_selected="Flush This Region&apos;s Map Visibility Caches" left="10"
-			     mouse_opaque="true" name="Flush This Region&apos;s Map Visibility Caches"
-			     width="250" />
+<floater name="godtools floater" title="Herramientas de Dios">
+	<tab_container name="GodTools Tabs">
+		<panel label="Grid" name="grid">
+			<button label="Expulsar a todos los usuarios" label_selected="Expulsar a todos los usuarios" name="Kick all users" width="200"/>
+			<button label="Vaciar caché de visibilidad del Mapa de esta Región" label_selected="Vaciar caché de visibilidad del Mapa de esta Región" name="Flush This Region&apos;s Map Visibility Caches" width="350"/>
 		</panel>
-		<panel border="true" bottom="-363" follows="left|top|right|bottom" height="347"
-		     label="Region" left="1" mouse_opaque="false" name="region" width="398">
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="Sim Name:" v_pad="0" width="50">
-				Sim Name:
+		<panel label="Región" name="region">
+			<text name="Sim Name:">
+				Nombre del Sim:
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-26"
-			     follows="left|top|right" font="SansSerifSmall" height="16" left="70"
-			     max_length="63" mouse_opaque="true" name="region name" width="208" />
-			<check_box bottom="-46" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Prelude" left="10" mouse_opaque="true"
-			     name="check prelude" tool_tip="Set this to make the region a prelude."
-			     width="180" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Fixed Sun" left="10" mouse_opaque="true"
-			     name="check fixed sun"
-			     tool_tip="Fix the sun position (like in Region/Estate &gt; Terrain."
-			     width="180" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Reset Home On Teleport" left="10"
-			     mouse_opaque="true" name="check reset home"
-			     tool_tip="When resident teleports out, reset their home to the destination position."
-			     width="180" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Visible" left="10" mouse_opaque="true"
-			     name="check visible"
-			     tool_tip="Set this to make the region visible to non-gods." width="180" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Damage" left="10" mouse_opaque="true"
-			     name="check damage" tool_tip="Set this to enable damage in this region."
-			     width="180" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Block Traffic Tracking" left="10"
-			     mouse_opaque="true" name="block dwell"
-			     tool_tip="Set this to make the region not compute traffic." width="180" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Block Terraform" left="10" mouse_opaque="true"
-			     name="block terraform"
-			     tool_tip="Set this to disallow people terraforming their land" width="180" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Sandbox" left="10" mouse_opaque="true"
-			     name="is sandbox" tool_tip="Toggle whether this is a sandbox region."
-			     width="180" />
-			<button bottom_delta="-52" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" label="Bake Terrain" label_selected="Bake Terrain" left="8"
-			     mouse_opaque="true" name="Bake Terrain"
-			     tool_tip="Save the current terrain as default." width="110" />
-			<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" label="Revert Terrain" label_selected="Revert Terrain" left="8"
-			     mouse_opaque="true" name="Revert Terrain"
-			     tool_tip="Replace the current terrain with default." width="110" />
-			<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" label="Swap Terrain" label_selected="Swap Terrain" left="8"
-			     mouse_opaque="true" name="Swap Terrain"
-			     tool_tip="Swap current terrain with default." width="110" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-46" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="200" mouse_opaque="true"
-			     name="estate id" v_pad="0" width="190">
-				Estate ID:
+			<check_box label="Preludio" name="check prelude" tool_tip="Marcar aqui para hacer un preludio de esta Región."/>
+			<check_box label="Sol Fijo" name="check fixed sun" tool_tip="Fijar la posición del sol (Así como en Región/Estado &gt; Terreno."/>
+			<check_box label="Reiniciar Base al Teleportar" name="check reset home" tool_tip="Cuando un residente se teleporta a otro lugar, reiniciar su base al punto de destino."/>
+			<check_box label="Visible" name="check visible" tool_tip="Marcar aquí para hacer esta región visible para todos"/>
+			<check_box label="Daño" name="check damage" tool_tip="Marcar aquí para habilitar el daño en esta región"/>
+			<check_box label="Bloquear Seguimiento de Tráfico" name="block dwell" tool_tip="Marcar aquí para que esta región no compute el tráfico"/>
+			<check_box label="Bloquear Terraformado" name="block terraform" tool_tip="Marcar aquí para impedir que los usuarios puedan terraformar sus terrenos"/>
+			<check_box label="Sandbox" name="is sandbox" tool_tip="Definir cuando esta región es o no un sandbox."/>
+			<button label="Resguardar Terreno" label_selected="Resguardar Terreno" name="Bake Terrain" tool_tip="Guardar el terreno actual como predefinido"/>
+			<button label="Revertir Terreno" label_selected="Revertir Terreno" name="Revert Terrain" tool_tip="Sustituir el terreno actual por el predefinido"/>
+			<button label="Intercambiar Terreno" label_selected="Intercambiar Terreno" name="Swap Terrain" tool_tip="Intercambiar terreno por el predefinido"/>
+			<text name="estate id">
+				ID del Estado:
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-46"
-			     follows="top|right" font="SansSerifSmall" height="16" left_delta="108"
-			     max_length="10" mouse_opaque="true" name="estate" width="50" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-66" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-			     h_pad="0" halign="left" height="16" left="200" mouse_opaque="true"
-			     name="parent id" v_pad="0" width="190">
-				Parent ID:
+			<text name="parent id">
+				ID del padre:
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-66"
-			     follows="top|right" font="SansSerifSmall" height="16" left_delta="108"
-			     max_length="10" mouse_opaque="true" name="parentestate"
-			     tool_tip="This is the parent estate for this region" width="50" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-86" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="200"
-			     mouse_opaque="true" name="Grid Pos: " v_pad="0" width="190">
-				Grid Pos:
+			<line_editor name="parentestate" tool_tip="Esta es una propiedad padre para esta región"/>
+			<text name="Grid Pos: ">
+				Pos. del Grid:
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-86"
-			     follows="top|right" font="SansSerifSmall" height="16" left_delta="88"
-			     max_length="10" mouse_opaque="true" name="gridposx"
-			     tool_tip="This is the grid x position for this region" width="50" />
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-86"
-			     follows="top|right" font="SansSerifSmall" height="16" left_delta="60"
-			     max_length="10" mouse_opaque="true" name="gridposy"
-			     tool_tip="This is the grid y position for this region" width="40" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-106" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="200"
-			     mouse_opaque="true" name="Redirect to Grid: " v_pad="0" width="190">
-				Redirect to Grid:
+			<line_editor name="gridposx" tool_tip="Esta es la posición X para esta región en el grid"/>
+			<line_editor name="gridposy" tool_tip="Esta es la posición Y para esta región en el grid"/>
+			<text name="Redirect to Grid: ">
+				Redireccionar al Grid:
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-106"
-			     follows="top|right" font="SansSerifSmall" height="16" left_delta="88"
-			     max_length="10" mouse_opaque="true" name="redirectx" width="50" />
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-106"
-			     follows="top|right" font="SansSerifSmall" height="16" left_delta="60"
-			     max_length="10" mouse_opaque="true" name="redirecty" width="40" />
-			<spinner bottom="-126" decimal_digits="3" follows="top|right" height="16"
-			     increment="0.1" initial_val="1" left="308" max_val="4" min_val="0"
-			     mouse_opaque="true" name="billable factor" width="80" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-126" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerif" h_pad="0" halign="left" height="16" left_delta="-108"
-			     mouse_opaque="true" name="billable factor text" v_pad="0" width="110">
-				Billable Factor:
+			<text name="billable factor text">
+				Factor de cobro:
 			</text>
-			<spinner bottom="-146" decimal_digits="3" follows="top|right" height="16" increment="1"
-			     initial_val="1" left="308" max_val="100" min_val="0" mouse_opaque="true"
-			     name="land cost" width="80" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-146" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerif" h_pad="0" halign="left" height="16" left_delta="-108"
-			     mouse_opaque="true" name="land cost text" v_pad="0" width="110">
-				[CURRENCY] per sq. meter:
+			<text name="land cost text">
+				[CURRENCY] por m2:
 			</text>
-			<button bottom="-170" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" label="Refresh" label_selected="Refresh" left="278"
-			     mouse_opaque="true" name="Refresh"
-			     tool_tip="Click here to refresh the above information." width="110" />
-			<button bottom_delta="-56" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" label="Apply" label_selected="Apply" left="278"
-			     mouse_opaque="true" name="Apply"
-			     tool_tip="Click here to apply any changes from above." width="110" />
-			<button bottom="-258" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" label="Select Region" label_selected="Select Region" left="128"
-			     mouse_opaque="true" name="Select Region"
-			     tool_tip="Select the whole region with the land tool." width="110" />
-			<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" label="Autosave now" label_selected="Autosave now" left="128"
-			     mouse_opaque="true" name="Autosave now"
-			     tool_tip="Save gzipped state to autosave directory." width="110" />
+			<button label="Actualizar" label_selected="Actualizar" name="Refresh" tool_tip="Pulsa aqui para actualizar la información superior"/>
+			<button label="Aplicar" label_selected="Aplicar" name="Apply" tool_tip="Pulsa aqui para aplicar los cambios superiores"/>
+			<button label="Seleccionar Región" label_selected="Seleccionar Región" name="Select Region" tool_tip="Seccionar toda la región con la herramienta de terreno"/>
+			<button label="Guardado Automático Ahora" label_selected="Guardado Automático Ahora" name="Autosave now" tool_tip="Guardar con gzip el estado actual en el directorio de guardado automático"/>
 		</panel>
-		<panel border="true" bottom="-363" follows="left|top|right|bottom" height="347"
-		     label="Objects" left="1" mouse_opaque="false" name="objects" width="398">
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="Sim Name:" v_pad="0" width="50">
-				Sim Name:
+		<panel label="Objetos" name="objects">
+			<text name="Sim Name:">
+				Nombre del Sim:
 			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="60"
-			     mouse_opaque="true" name="region name" v_pad="0" width="320">
-				Welsh
+			<text name="region name">
+				Galés
 			</text>
-			<check_box bottom="-46" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Disable Scripts" left="10" mouse_opaque="true"
-			     name="disable scripts"
-			     tool_tip="Set this to disable all scripts in this region" width="110" />
-			<check_box bottom="-46" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Disable Collisions" left_delta="120"
-			     mouse_opaque="true" name="disable collisions"
-			     tool_tip="Set this to disable non-agent collisions in this region"
-			     width="121" />
-			<check_box bottom="-46" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Disable Physics" left_delta="120"
-			     mouse_opaque="true" name="disable physics"
-			     tool_tip="Set this to disable all physics in this region" width="130" />
-			<button bottom="-74" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" label="Apply" label_selected="Apply" left="278"
-			     mouse_opaque="true" name="Apply"
-			     tool_tip="Click here to apply any changes from above." width="110" />
-			<button bottom="-98" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" label="Set Target" label_selected="Set Target" left="8"
-			     mouse_opaque="true" name="Set Target"
-			     tool_tip="Set the target avatar for object deletion." width="110" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-88" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="130"
-			     mouse_opaque="true" name="target_avatar_name" v_pad="0" width="260">
-				(no target)
+			<check_box label="Desactivar Scripts" name="disable scripts" tool_tip="Marca aquí para desactivar todos los scripts en esta región"/>
+			<check_box label="Desactivar Colisiones" name="disable collisions" tool_tip="Marca aquí para desactivar las colisiones entre no agentes para esta región"/>
+			<check_box label="Desactivar Física" name="disable physics" tool_tip="Marca aquí para desactivar toda la física de esta región"/>
+			<button label="Aplicar" label_selected="Aplicar" name="Apply" tool_tip="Pulsa aquí para aplicar los cambios superiores"/>
+			<button label="Definir Objetivo" label_selected="Definir Objetivo" name="Set Target" tool_tip="Define el avatar objetivo para la eliminación del objeto."/>
+			<text name="target_avatar_name">
+				(sin objetivo)
 			</text>
-			<button bottom="-146" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" label="Delete Target&apos;s Scripted Objects On Others Land"
-			     label_selected="Delete Target&apos;s Scripted Objects On Others Land"
-			     left="8" mouse_opaque="true"
-			     name="Delete Target&apos;s Scripted Objects On Others Land"
-			     tool_tip="Delete all scripted objects owned by the target on land not owned by the target. (no copy) objects will be returned."
-			     width="380" />
-			<button bottom_delta="-48" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" label="Delete Target&apos;s Scripted Objects On *Any* Land"
-			     label_selected="Delete Target&apos;s Scripted Objects On *Any* Land"
-			     left="8" mouse_opaque="true"
-			     name="Delete Target&apos;s Scripted Objects On *Any* Land"
-			     tool_tip="Delete all scripted objects owned by the target in this region. (no copy) objects will be returned."
-			     width="380" />
-			<button bottom_delta="-48" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" label="Delete *ALL* Of Target&apos;s Objects"
-			     label_selected="Delete *ALL* Of Target&apos;s Objects" left="8"
-			     mouse_opaque="true" name="Delete *ALL* Of Target&apos;s Objects"
-			     tool_tip="Delete all objects owned by the target in this region. (no copy) objects will be returned."
-			     width="380" />
-			<button bottom_delta="-48" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" label="Get Top Colliders" label_selected="Get Top Colliders"
-			     left="8" mouse_opaque="true" name="Get Top Colliders"
-			     tool_tip="Gets list of objects experiencing the most narrowphase callbacks."
-			     width="110" />
-			<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" label="Get Top Scripts" label_selected="Get Top Scripts"
-			     left="8" mouse_opaque="true" name="Get Top Scripts"
-			     tool_tip="Gets list of objects spending the most time running scripts."
-			     width="110" />
-			<button bottom_delta="-24" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" label="Scripts digest" label_selected="Scripts digest" left="8"
-			     mouse_opaque="true" name="Scripts digest"
-			     tool_tip="Gets a list of all scripts and number of occurences of each."
-			     width="110" />
+			<button label="Borrar objetos con scripts del Objetivo en otros terrenos" label_selected="Borrar objetos con scripts del Objetivo en otros terrenos" name="Delete Target&apos;s Scripted Objects On Others Land" tool_tip="Borrar todos los objetivos con scripts propiedad del Objetivo en terrenos que no son propiedad del Objetivo. Los Objetos (No Copiables) serán retornados"/>
+			<button label="Borrar los objetos con scripts del Objetivo en *Cualquier* terreno" label_selected="Borrar los objetos con scripts del Objetivo en *Cualquier* terreno" name="Delete Target&apos;s Scripted Objects On *Any* Land" tool_tip="Borra todos los objetos con scripts propiedad del Objetivo en esta región. Los objetos (no copiables) serán retornados"/>
+			<button label="Borrar *TODOS* los objetos del Objetivo" label_selected="Borrar *TODOS* los objetos del Objetivo" name="Delete *ALL* Of Target&apos;s Objects" tool_tip="Borra todos los objetos propiedad del Objetivo en esta región. Los objetos (no copiables) serán retornados"/>
+			<button label="Obtener Principales Colisionadores" label_selected="Obtener Principales Colisionadores" name="Get Top Colliders" tool_tip="Obtiene una lista  de los objetos que experimentan llamadas de fase estrecha."/>
+			<button label="Obtener Principales Scripts" label_selected="Obtener Principales Scripts" name="Get Top Scripts" tool_tip="Obtiene una lista de los objetos que consumen mas tiempo ejecutando scripts"/>
+			<button label="Compilación de Scripts" label_selected="Compilación de Scripts" name="Scripts digest" tool_tip="Obtener un listado de todos los scripts y número de ocurrencias de cada uno."/>
 		</panel>
-		<panel border="true" bottom="-363" follows="left|top|right|bottom" height="347"
-		     label="Request" left="1" mouse_opaque="true" name="request" width="398">
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="Destination:" v_pad="0" width="80">
-				Destination:
+		<panel label="Solicitar" name="request">
+			<text name="Destination:">
+				Destino:
 			</text>
-			<combo_box allow_text_entry="false" bottom="-20" follows="left|top" height="16" left="100"
-			     max_chars="20" mouse_opaque="true" name="destination" width="290">
-				<combo_item name="Selection" value="Selection">
-					Selection
+			<combo_box name="destination">
+				<combo_item name="Selection">
+					Selección
 				</combo_item>
-				<combo_item name="AgentRegion" value="Agent Region">
-					Agent Region
+				<combo_item name="AgentRegion">
+					Agente de Region
 				</combo_item>
 			</combo_box>
-			<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="10" left="10"
-			     mouse_opaque="true" name="Request:" v_pad="0" width="80">
-				Request:
+			<text name="Request:">
+				Requerimiento:
 			</text>
-			<combo_box allow_text_entry="true" bottom="-44" follows="left|top" height="16" left="100"
-			     max_chars="20" mouse_opaque="true" name="request" width="290">
-				<combo_item name="colliders&lt;steps&gt;" value="colliders &lt;steps&gt;">
-					colliders &lt;steps&gt;
+			<combo_box name="request">
+				<combo_item name="colliders&lt;steps&gt;" >
+					Colisionadores &lt;pasos&gt;
 				</combo_item>
-				<combo_item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;"
-				     value="scripts &lt;count&gt;,&lt;optional pattern&gt;">
-					scripts &lt;count&gt;,&lt;optional pattern&gt;
+				<combo_item name="scripts&lt;count&gt;,&lt;optionalpattern&gt;">
+					scripts &lt;conteo&gt;,&lt;patrón opcional&gt;
 				</combo_item>
-				<combo_item name="objects&lt;pattern&gt;" value="objects &lt;pattern&gt;">
-					objects &lt;pattern&gt;
+				<combo_item name="objects&lt;pattern&gt;">
+					objetos &lt;patrón&gt;
 				</combo_item>
-				<combo_item name="rez&lt;asset_id&gt;" value="rez &lt;asset_id&gt;">
+				<combo_item name="rez&lt;asset_id&gt;">
 					rez &lt;asset_id&gt;
 				</combo_item>
 			</combo_box>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-62" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="Parameter:" v_pad="0" width="80">
-				Parameter:
+			<text name="Parameter:">
+				Parámetro:
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-68"
-			     follows="left|top" font="SansSerifSmall" height="16" left="100"
-			     max_length="63" mouse_opaque="true" name="parameter" width="290" />
-			<button bottom="-116" follows="left|top" font="SansSerif" halign="center" height="20"
-			     label="Make Request" label_selected="Make Request" left="10"
-			     mouse_opaque="true" name="Make Request" width="100" />
+			<button label="Hacer Solicitud" label_selected="Hacer Solicitud" name="Make Request"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_group_titles.xml b/indra/newview/skins/default/xui/es/floater_group_titles.xml
index 5e381ccff..1397a6ccb 100644
--- a/indra/newview/skins/default/xui/es/floater_group_titles.xml
+++ b/indra/newview/skins/default/xui/es/floater_group_titles.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="goup titles" title="Títulos del Grupo (Tags)" >
-	  <scroll_list name="titles_list">
-			 <column name="title" label="Título" />
-			 <column name="group_name" label="Grupo"/>
-			 <!--Hidden field, used as storage for UUID, please keep at width 0-->
-			 <column name="group_id" label="" width="0" />
-	  </scroll_list>
-	  <button name="activate" label="Activar" tool_tip="Activa el título de Grupo Seleccionado"/>
+	<scroll_list name="titles_list">
+		<column name="title" label="Título" />
+		<column name="group_name" label="Grupo"/>
+		<!--Hidden field, used as storage for UUID, please keep at width 0-->
+		<column name="group_id" label=""/>
+	</scroll_list>
+	<button name="activate" label="Activar" tool_tip="Activa el título de Grupo Seleccionado"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml b/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
deleted file mode 100644
index 831158db6..000000000
--- a/indra/newview/skins/default/xui/es/floater_hardware_settings.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Hardware Settings Floater" title="Opciones del Dispositivo">
-	<text name="Filtering:">
-		Filtrado:
-	</text>
-	<check_box label="Filtrado Anisotrópico (más lento si se activa)" name="ani"/>
-	<text name="Antialiasing:">
-		Antialiasing:
-	</text>
-	<combo_box label="Antialiasing" name="fsaa">
-		<combo_item name="FSAADisabled" value="0">
-			Desactivado
-		</combo_item>
-		<combo_item name="2x" value="2">
-			2x
-		</combo_item>
-		<combo_item name="4x" value="4">
-			4x
-		</combo_item>
-		<combo_item name="8x" value="8">
-			8x
-		</combo_item>
-		<combo_item name="16x" value="16">
-			16x
-		</combo_item>
-	</combo_box>
-	<spinner label="Gama:" name="gamma"/>
-	<text name="(brightness, lower is brighter)">
-		(brillo; menor es más brillante, 0=predeterminado)
-	</text>
-	<text name="Enable VBO:">
-		Activar VBO:
-	</text>
-	<check_box label="Activar OpenGL Vertex Buffer Objects" name="vbo" tool_tip="En hardware moderno, habilitar esta opción mejora el rendimiento. Pero en hardware antiguo, el habilitarlo hace que, frecuentemente, se obtenga una implementación pobre de VBO, lo que puede provocarle caídas."/>
-	<check_box label="Activar Streamed VBOs" left="157" name="vbo_stream" tool_tip="Desactivar esta opción puede mejorar el rendimiento cuando se habilita VBO. Desactivarlo produce una mejora visible en diversas GPUs de AMD."/>
-	<text name="Enable FBO:">
-		Activar Framebuffer Objects:
-	</text>
-	<check_box label="Activar OpenGL Frame Buffer Objects" name="fbo" tool_tip="Habilitar esta opción en hardware moderno puede proporcionar una mejora en el rendimiento. Sin embargo, si se habilita en combinacoón con el antialiasing en GPUs de AMD pueden causar problemas de mezcla de texturas. Este ajuste es necesario para renderizado diferido.."/>
-	<slider label="Memoria para Texturas (MB):" name="GrapicsCardTextureMemory" tool_tip="Cantidad de memoria asignada a las texturas. Por defecto es la memoria de la tarjeta de vídeo. Reducir esta cantidad puede mejorar el rendimiento, pero también puede hacer que las texturas se vean borrosas."/>
-	<spinner label="Intensidad de la Niebla:" name="fog"/>
-	<text name="note">
-		Nota: Las configuraciones de Gama e Intensidad de la Niebla no están
-disponibles cuando se activan las Sombras de la Atmósfera.
-	</text>
-	<button label="OK" label_selected="OK" name="OK"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_hex.xml b/indra/newview/skins/default/xui/es/floater_hex.xml
index 11523c830..d928755db 100644
--- a/indra/newview/skins/default/xui/es/floater_hex.xml
+++ b/indra/newview/skins/default/xui/es/floater_hex.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_hex" title="Editor Hexadecimal" >
-	  <text name="status_text" >
-			 Cargando...
-	  </text>
-	  <slider label="Columnas" name="column_count"/>
-	  <button name="upload_btn" label="[UPLOAD]"/>
-	  <button name="save_btn" label="Guardar"/>
-	  <hex_editor name="hex"/>
+	<text name="status_text" >
+		Cargando...
+	</text>
+	<slider label="Columnas" name="column_count"/>
+	<button name="upload_btn" label="[UPLOAD]"/>
+	<button name="save_btn" label="Guardar"/>
+	<hex_editor name="hex"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_html_simple.xml b/indra/newview/skins/default/xui/es/floater_html_simple.xml
index ae3a13efe..fa7909478 100644
--- a/indra/newview/skins/default/xui/es/floater_html_simple.xml
+++ b/indra/newview/skins/default/xui/es/floater_html_simple.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_html_simple" title="">
-	  <web_browser name="browser"/>
+	<web_browser name="browser"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_hud.xml b/indra/newview/skins/default/xui/es/floater_hud.xml
index 88737c9b9..e1d9ddcdb 100644
--- a/indra/newview/skins/default/xui/es/floater_hud.xml
+++ b/indra/newview/skins/default/xui/es/floater_hud.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_hud" title="Tutorial">
-	  <!-- NOTE: Height and width must match values in settings.xml for 
+	<!-- NOTE: Height and width must match values in settings.xml for 
 					FloaterHUDRect because this floater is resized to those values 
 					in LLViewerWindow initialization. JC -->
-	  <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%0ALoading...%3C/tt%3E%3C/h1%3E%3C/body%3E%3C/html%3E"
-	  />
+	<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%0ALoading...%3C/tt%3E%3C/h1%3E%3C/body%3E%3C/html%3E"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_image_preview.xml b/indra/newview/skins/default/xui/es/floater_image_preview.xml
index 5057dd73d..b8fa8d31c 100644
--- a/indra/newview/skins/default/xui/es/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_image_preview.xml
@@ -3,13 +3,11 @@
 	<text name="name_label">
 		Nombre:
 	</text>
-	<line_editor name="name_form"/>
 	<text name="description_label">
 		Descripción:
 	</text>
-	<line_editor name="description_form"/>
 	<text name="preview_label">
-			 Vista Previa como:
+		Vista Previa como:
 	</text>
 	<combo_box label="Ropa" name="clothing_type_combo">
 		<combo_item name="Image">
diff --git a/indra/newview/skins/default/xui/es/floater_instant_message_group.xml b/indra/newview/skins/default/xui/es/floater_instant_message_group.xml
index 24bc78978..6159f07e6 100644
--- a/indra/newview/skins/default/xui/es/floater_instant_message_group.xml
+++ b/indra/newview/skins/default/xui/es/floater_instant_message_group.xml
@@ -1,42 +1,42 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater label="(desconocido)" name="im_floater" title="(desconocido)">
 	<string name="ringing">
-		Joining Voice Chat...
+		Uniéndose al Chat de Voz...
 	</string>
 	<string name="connected">
-		Connected, click End Call to hang up
+		Conectado, pulsa Colgar para terminar
 	</string>
 	<string name="hang_up">
-		Left Voice Chat
+		Abandonando Chat de Voz
 	</string>
 	<string name="voice_icon">
 		icn_voice-groupfocus.tga
 	</string>
 	<string name="title_string">
-		Instant Message with [NAME]
+		Mensaje Instantáneo con [NAME]
 	</string>
 	<string name="typing_start_string">
-		[NAME] is typing...
+		[NAME] está escribiendo...
 	</string>
 	<string name="session_start_string">
-		Starting session with [NAME], please wait.
+		Iniciando sesión con [NAME], espera por favor.
 	</string>
 	<string name="default_text_label">
-		Click here to instant message.
+		Pulsa aquí para enviar un Mensaje Instantáneo.
 	</string>
 	<string name="moderated_chat_label">
-		(Moderated: Voices off by default)
+		(Moderado: Voz apagada por defecto)
 	</string>
 	<string name="muted_text_label">
-		Your text chat has been disabled by a Group Moderator.
+		Tu chat de texto ha sido deshabilitado por un Moderador del Grupo.
 	</string>
 	<layout_stack name="panels">
 		<layout_panel name="im_contents_panel">
-			<button label="Group Info" name="group_info_btn"/>
-			<button label="Join Call" name="start_call_btn"/>
-			<button label="End Call" name="end_call_btn"/>
+			<button label="Info del Grupo" name="group_info_btn"/>
+			<button label="Unirse" name="start_call_btn"/>
+			<button label="Finalizar" name="end_call_btn"/>
 			<button label="Historial" name="history_btn"/>
-			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Click here to toggle a list of active participants in this IM session."/>
+			<button label="&lt; &lt;" label_selected="&gt; &gt;" name="toggle_active_speakers_btn" tool_tip="Pulsa aquí para mostrar/ocultar la lista de participantes activos en esta sesión de MI."/>
 			<button label="Enviar" name="send_btn"/>
 		</layout_panel>
 	</layout_stack>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory.xml b/indra/newview/skins/default/xui/es/floater_inventory.xml
index 4a398cbee..f3d2c9180 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory.xml
@@ -1,149 +1,149 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Inventory" title="Inventario">
-	  <search_editor label="Escribe aquí para buscar" name="inventory search editor"/>
-	  <button label="" name="collapse_btn" tool_tip="Cerrar Todo" />
-	  <button label="" name="Inventory.ExpandAll" tool_tip="Expandir Todo"/>	  
-	  <text name="group_titles_textbox">
-			 Filtro Rápido:
-	  </text>
-	  <!-- Inventory Type Filter Labels -->
-	  <string name="filter_type_all">
-			 Todos los Tipos
-	  </string>
-	  <string name="filter_type_animation">
-			 Animaciones
-	  </string>
-	  <string name="filter_type_callingcard">
-			 Tarjetas de Llamada
-	  </string>
-	  <string name="filter_type_wearable">
-			 Ropas / Partes de Cuerpo
-	  </string>
-	  <string name="filter_type_gesture">
-			 Gestos
-	  </string>
-	  <string name="filter_type_landmark">
-			 Hitos
-	  </string>
-	  <string name="filter_type_notecard">
-			 Notas
-	  </string>
-	  <string name="filter_type_object">
-			 Objetos
-	  </string>
-	  <string name="filter_type_script">
-			 Scripts
-	  </string>
-	  <string name="filter_type_sound">
-			 Sonidos
-	  </string>
-	  <string name="filter_type_texture">
-			 Texturas
-	  </string>
-	  <string name="filter_type_snapshot">
-			 Fotos
-	  </string>
-	  <string name="filter_type_custom">
-			 Personalizado...
-	  </string>
-	  <combo_box name="Quick Filter" label="Filtro Rápido">
-			 <combo_item name="filter_type_all">
-					Todos los Tipos
-			 </combo_item>
-			 <separator />
-			 <combo_item name="filter_type_animation">
-					Animaciones
-			 </combo_item>
-			 <combo_item name="filter_type_callingcard">
-					Tarjetas de Llamada
-			 </combo_item>
-			 <combo_item name="filter_type_wearable">
-					Ropas / Partes de Cuerpo
-			 </combo_item>
-			 <combo_item name="filter_type_gesture">
-					Gestos
-			 </combo_item>
-			 <combo_item name="filter_type_landmark">
-					Hitos
-			 </combo_item>
-			 <combo_item name="filter_type_notecard">
-					Notas
-			 </combo_item>
-			 <combo_item name="filter_type_object">
-					Objetos
-			 </combo_item>
-			 <combo_item name="filter_type_script">
-					Scripts
-			 </combo_item>
-			 <combo_item name="filter_type_sound">
-					Sonidos
-			 </combo_item>
-			 <combo_item name="filter_type_texture">
-					Texturas
-			 </combo_item>
-			 <combo_item name="filter_type_snapshot">
-					Fotos
-			 </combo_item>
-			 <separator />
-			 <combo_item name="filter_type_custom">
-					Personalizado...
-			 </combo_item>
-	  </combo_box>
-	  <tab_container name="inventory filter tabs" >
-			 <inventory_panel label="Todos los Items" name="All Items"/>
-			 <inventory_panel label="Items Recientes" name="Recent Items"/>
-			 <inventory_panel label="Items Vestidos" name="Worn Items"/>
-	  </tab_container>
-	  <menu_bar name="Inventory Menu">
-			 <menu label="Archivo" name="File">
-					<menu_item_call label="Abrir" name="Open"></menu_item_call>
-					<menu_item_separator name="separator"/>
-					<menu_item_call label="Nueva Ventana" name="New Window"></menu_item_call>
-					<menu_item_separator name="separator2"/>
-					<menu_item_call label="Mostrar Filtros" name="Show Filters"></menu_item_call>
-					<menu_item_call label="Restablecer Filtros" name="Reset Current"></menu_item_call>
-					<menu_item_call label="Cerrar todas las Carpetas" name="Close All Folders"></menu_item_call>
-					<menu_item_separator name="separator3"/>
-					<menu_item_call label="Vaciar la Papelera" name="Empty Trash"></menu_item_call>
-					<menu_item_call label="Actualizar Inventario" name="Refresh Inventory"></menu_item_call>
-			 </menu>
-			 <menu label="Crear" name="Create">
-					<menu_item_call label="Nueva Carpeta" name="New Folder"></menu_item_call>
-					<menu_item_call label="Nuevo Script" name="New Script"></menu_item_call>
-					<menu_item_call label="Nueva Nota" name="New Note"></menu_item_call>
-					<menu_item_call label="Nuevo Gesto" name="New Gesture"></menu_item_call>
-					<menu label="Ropas Nuevas" name="New Clothes">
-						  <menu_item_call label="Nueva Camisa" name="New Shirt"></menu_item_call>
-						  <menu_item_call label="Nuevos Pantalones" name="New Pants"></menu_item_call>
-						  <menu_item_call label="Nuevos Zapatos" name="New Shoes"></menu_item_call>
-						  <menu_item_call label="Nuevas Medias" name="New Socks"></menu_item_call>
-						  <menu_item_call label="Nueva Chaqueta" name="New Jacket"></menu_item_call>
-						  <menu_item_call label="Nueva Falda" name="New Skirt"></menu_item_call>
-						  <menu_item_call label="Nuevos Guantes" name="New Gloves"></menu_item_call>
-						  <menu_item_call label="Nueva Camiseta" name="New Undershirt"></menu_item_call>
-						  <menu_item_call label="Nueva Ropa Interior" name="New Underpants"></menu_item_call>
-						  <menu_item_call label="Nuevo Tatuaje" name="New Tattoo"></menu_item_call>
-						  <menu_item_call label="Nueva Capa Alfa" name="New Alpha"></menu_item_call>
-						  <menu_item_call label="Nueva Física" name="New Physics"></menu_item_call>
-					</menu>
-					<menu label="Partes de Cuerpo Nuevas" name="New Body Parts">
-						  <menu_item_call label="Nueva Forma" name="New Shape"></menu_item_call>
-						  <menu_item_call label="Nueva Piel" name="New Skin"></menu_item_call>
-						  <menu_item_call label="Nuevo Pelo" name="New Hair"></menu_item_call>
-						  <menu_item_call label="Nuevos Ojos" name="New Eyes"></menu_item_call>
-					</menu>
-			 </menu>
-			 <menu label="Ordenar" name="Sort">
-					<menu_item_check label="Por Nombre" name="By Name"></menu_item_check>
-					<menu_item_check label="Por Fecha" name="By Date"></menu_item_check>
-					<menu_item_separator name="separator"/>
-					<menu_item_check label="Carpetas, siempre por Nombre" name="Folders Always By Name"></menu_item_check>
-					<menu_item_check label="Carpeta de Sistema al Principio" name="System Folders To Top"></menu_item_check>
-			 </menu>
-			 <menu label="Buscar" name="Search">
-					<menu_item_check label="Nombre del Item" name="Item name"></menu_item_check>
-					<menu_item_check label="Descripción del Item" name="Item description"></menu_item_check>
-					<menu_item_check label="Creador del Item" name="Item creatorr"></menu_item_check>
-			 </menu>
-	  </menu_bar>
+	<search_editor label="Escribe aquí para buscar" name="inventory search editor"/>
+	<button label="" name="collapse_btn" tool_tip="Cerrar Todo" />
+	<button label="" name="Inventory.ExpandAll" tool_tip="Expandir Todo"/>	  
+	<text name="group_titles_textbox">
+		Filtro Rápido:
+	</text>
+	<!-- Inventory Type Filter Labels -->
+	<string name="filter_type_all">
+		Todos los Tipos
+	</string>
+	<string name="filter_type_animation">
+		Animaciones
+	</string>
+	<string name="filter_type_callingcard">
+		Tarjetas de Llamada
+	</string>
+	<string name="filter_type_wearable">
+		Ropas / Partes de Cuerpo
+	</string>
+	<string name="filter_type_gesture">
+		Gestos
+	</string>
+	<string name="filter_type_landmark">
+		Hitos
+	</string>
+	<string name="filter_type_notecard">
+		Notas
+	</string>
+	<string name="filter_type_object">
+		Objetos
+	</string>
+	<string name="filter_type_script">
+		Scripts
+	</string>
+	<string name="filter_type_sound">
+		Sonidos
+	</string>
+	<string name="filter_type_texture">
+		Texturas
+	</string>
+	<string name="filter_type_snapshot">
+		Fotos
+	</string>
+	<string name="filter_type_custom">
+		Personalizado...
+	</string>
+	<combo_box name="Quick Filter" label="Filtro Rápido">
+		<combo_item name="filter_type_all">
+			Todos los Tipos
+		</combo_item>
+		<separator />
+		<combo_item name="filter_type_animation">
+			Animaciones
+		</combo_item>
+		<combo_item name="filter_type_callingcard">
+			Tarjetas de Llamada
+		</combo_item>
+		<combo_item name="filter_type_wearable">
+			Ropas / Partes de Cuerpo
+		</combo_item>
+		<combo_item name="filter_type_gesture">
+			Gestos
+		</combo_item>
+		<combo_item name="filter_type_landmark">
+			Hitos
+		</combo_item>
+		<combo_item name="filter_type_notecard">
+			Notas
+		</combo_item>
+		<combo_item name="filter_type_object">
+			Objetos
+		</combo_item>
+		<combo_item name="filter_type_script">
+			Scripts
+		</combo_item>
+		<combo_item name="filter_type_sound">
+			Sonidos
+		</combo_item>
+		<combo_item name="filter_type_texture">
+			Texturas
+		</combo_item>
+		<combo_item name="filter_type_snapshot">
+			Fotos
+		</combo_item>
+		<separator />
+		<combo_item name="filter_type_custom">
+			Personalizado...
+		</combo_item>
+	</combo_box>
+	<tab_container name="inventory filter tabs" >
+		<inventory_panel label="Todos los Items" name="All Items"/>
+		<inventory_panel label="Items Recientes" name="Recent Items"/>
+		<inventory_panel label="Items Vestidos" name="Worn Items"/>
+	</tab_container>
+	<menu_bar name="Inventory Menu">
+		<menu label="Archivo" name="File">
+			<menu_item_call label="Abrir" name="Open"></menu_item_call>
+			<menu_item_separator name="separator"/>
+			<menu_item_call label="Nueva Ventana" name="New Window"></menu_item_call>
+			<menu_item_separator name="separator2"/>
+			<menu_item_call label="Mostrar Filtros" name="Show Filters"></menu_item_call>
+			<menu_item_call label="Restablecer Filtros" name="Reset Current"></menu_item_call>
+			<menu_item_call label="Cerrar todas las Carpetas" name="Close All Folders"></menu_item_call>
+			<menu_item_separator name="separator3"/>
+			<menu_item_call label="Vaciar la Papelera" name="Empty Trash"></menu_item_call>
+			<menu_item_call label="Actualizar Inventario" name="Refresh Inventory"></menu_item_call>
+		</menu>
+		<menu label="Crear" name="Create">
+			<menu_item_call label="Nueva Carpeta" name="New Folder"></menu_item_call>
+			<menu_item_call label="Nuevo Script" name="New Script"></menu_item_call>
+			<menu_item_call label="Nueva Nota" name="New Note"></menu_item_call>
+			<menu_item_call label="Nuevo Gesto" name="New Gesture"></menu_item_call>
+			<menu label="Ropas Nuevas" name="New Clothes">
+			<menu_item_call label="Nueva Camisa" name="New Shirt"></menu_item_call>
+			<menu_item_call label="Nuevos Pantalones" name="New Pants"></menu_item_call>
+			<menu_item_call label="Nuevos Zapatos" name="New Shoes"></menu_item_call>
+			<menu_item_call label="Nuevas Medias" name="New Socks"></menu_item_call>
+			<menu_item_call label="Nueva Chaqueta" name="New Jacket"></menu_item_call>
+			<menu_item_call label="Nueva Falda" name="New Skirt"></menu_item_call>
+			<menu_item_call label="Nuevos Guantes" name="New Gloves"></menu_item_call>
+			<menu_item_call label="Nueva Camiseta" name="New Undershirt"></menu_item_call>
+			<menu_item_call label="Nueva Ropa Interior" name="New Underpants"></menu_item_call>
+			<menu_item_call label="Nuevo Tatuaje" name="New Tattoo"></menu_item_call>
+			<menu_item_call label="Nueva Capa Alfa" name="New Alpha"></menu_item_call>
+			<menu_item_call label="Nueva Física" name="New Physics"></menu_item_call>
+		</menu>
+		<menu label="Partes de Cuerpo Nuevas" name="New Body Parts">
+			<menu_item_call label="Nueva Forma" name="New Shape"></menu_item_call>
+			<menu_item_call label="Nueva Piel" name="New Skin"></menu_item_call>
+			<menu_item_call label="Nuevo Pelo" name="New Hair"></menu_item_call>
+			<menu_item_call label="Nuevos Ojos" name="New Eyes"></menu_item_call>
+		</menu>
+		</menu>
+		<menu label="Ordenar" name="Sort">
+			<menu_item_check label="Por Nombre" name="By Name"></menu_item_check>
+			<menu_item_check label="Por Fecha" name="By Date"></menu_item_check>
+			<menu_item_separator name="separator"/>
+			<menu_item_check label="Carpetas, siempre por Nombre" name="Folders Always By Name"></menu_item_check>
+			<menu_item_check label="Carpeta de Sistema al Principio" name="System Folders To Top"></menu_item_check>
+		</menu>
+		<menu label="Buscar" name="Search">
+			<menu_item_check label="Nombre del Item" name="Item name"></menu_item_check>
+			<menu_item_check label="Descripción del Item" name="Item description"></menu_item_check>
+			<menu_item_check label="Creador del Item" name="Item creatorr"></menu_item_check>
+		</menu>
+	</menu_bar>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_backup.xml b/indra/newview/skins/default/xui/es/floater_inventory_backup.xml
index 34e8fa1dd..227b6e552 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory_backup.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_backup.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floater_inventory_backup" title="Respaldar Inventario">
-	  <scroll_list name="item_list">
-			 <column name="type" width="20" />
-			 <column label="Nombre" name="name" />
-			 <column label="Estado" name="status"/>
-	  </scroll_list>
-	  <line_editor name="progress_background" />
-	  <line_editor name="progress_foreground"/>
+	<scroll_list name="item_list">
+		<column name="type" width="20" />
+		<column label="Nombre" name="name" />
+		<column label="Estado" name="status"/>
+	</scroll_list>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_backup_settings.xml b/indra/newview/skins/default/xui/es/floater_inventory_backup_settings.xml
index 4c1f50ab2..e35d0fbd8 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory_backup_settings.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_backup_settings.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="inventory_backup_settings" title="Opciones de Descarga">
-	  <check_box name="chk_textures" label="Texturas" />
-	  <check_box name="chk_sounds" label="Sonidos" />
-	  <check_box name="chk_callingcards" label="Tarjetas de LLamada" />
-	  <check_box name="chk_landmarks" label="Hitos" />
-	  <check_box name="chk_scripts" label="Scripts" />
-	  <check_box name="chk_wearables" label="Wearables" />
-	  <check_box name="chk_objects" label="Objetos" />
-	  <check_box name="chk_notecards" label="Notas" />
-	  <check_box name="chk_animations" label="Animaciones" />
-	  <check_box bottom_delta="-20" follows="left|top" left="10" ="chk_gestures" label="Gestos" />
-	  <!--<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_others" label="Others" />-->
-	  <button label="Siguiente >>" name="next_btn" />
+	<check_box name="chk_textures" label="Texturas" />
+	<check_box name="chk_sounds" label="Sonidos" />
+	<check_box name="chk_callingcards" label="Tarjetas de LLamada" />
+	<check_box name="chk_landmarks" label="Hitos" />
+	<check_box name="chk_scripts" label="Scripts" />
+	<check_box name="chk_wearables" label="Wearables" />
+	<check_box name="chk_objects" label="Objetos" />
+	<check_box name="chk_notecards" label="Notas" />
+	<check_box name="chk_animations" label="Animaciones" />
+	<check_box name="chk_gestures" label="Gestos" />
+	<!--<check_box bottom_delta="-20" follows="left|top" left="10" name="chk_others" label="Others" />-->
+	<button label="Siguiente >>" name="next_btn" />
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
index b82689d35..d669b47db 100644
--- a/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
+++ b/indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
@@ -47,8 +47,17 @@
 	<text name="NextMaskDebug">
 		N:
 	</text>
-	<check_box label="Compartir con el Grupo" name="CheckShareWithGroup"/>
-	<check_box label="Permitir a cualquiera que lo copie" name="CheckEveryoneCopy"/>
+	<text name="GroupLabel">
+		Los miembros del grupo pueden:
+	</text>
+	<check_box label="Modificarlo" name="CheckGroupMod"/>
+	<check_box label="Copiarlo" name="CheckGroupCopy"/>
+	<check_box label="Moverlo" name="CheckGroupMove"/>
+	<text name="EveryoneLabel">
+		Cualquiera puede:
+	</text>
+	<check_box label="Copiarlo" name="CheckEveryoneCopy"/>
+	<check_box label="Moverlo" name="CheckEveryoneMove"/>
 	<text name="NextOwnerLabel" width="250">
 		El próximo propietario puede:
 	</text>
@@ -56,7 +65,7 @@
 	<check_box label="Copiarlo" name="CheckNextOwnerCopy"/>
 	<check_box label="Venderlo/Darlo" name="CheckNextOwnerTransfer"/>
 	<text name="SaleLabel" width="150">
-		Marcar Item como:
+		Marcar �tem como:
 	</text>
 	<check_box label="En Venta" name="CheckPurchase"/>
 	<radio_group name="RadioSaleType">
diff --git a/indra/newview/skins/default/xui/es/floater_local_asset_browse.xml b/indra/newview/skins/default/xui/es/floater_local_asset_browse.xml
index fecb59a41..e250a7eab 100644
--- a/indra/newview/skins/default/xui/es/floater_local_asset_browse.xml
+++ b/indra/newview/skins/default/xui/es/floater_local_asset_browse.xml
@@ -2,52 +2,51 @@
 <!-- Local Asset Browser: xui -->
 <!-- floater definition start -->
 <floater name="local_bitmap_browser_floater" title="Navegador Local de Bitmap" >
-<!-- floater definition end, left side begin -->
-	  <button name="add_btn" label="Agregar"/>
-	  <button name="del_btn" label="Quitar"/>
-	  <button name="upload_btn" label="Subir"/>
-	  <button name="more_btn" label="Mas"/>
-	  <button name="less_btn" label="Menos"/>
-	  <scroll_list name="bitmap_list" >
-			 <column name="bitmap_name" label="Nombre"/>
-			 <column name="bitmap_uuid" label="UUID"/>
-	  </scroll_list>
-	  <!-- left side done, right side begin -->
-	  <line_editor  name="path_text"/>
-	  <text name="path_caption_text">
-			 Ruta Local:
-	  </text>
-	  <line_editor name="uuid_text" />
-	  <text name="uuid_caption_text">
-			 Local UdddUID:
-	  </text>
-	  <texture_picker label="Textura" name="texture_view"/>
-	  <check_box label="Mantener Actualizado" name="keep_updating_checkbox" tool_tip="Activar o desactivar el control periódico de las fuentes de bitmaps en tu disco duro para ver si han sido actualizadas"/>
-	  <combo_box name="type_combobox">
-			 <combo_item name="type_texture" value="type_texture">
-					Textura
-			 </combo_item>
-			 <combo_item name="type_sculptie" value="type_sculptie">
-					Sculptmap
-			 </combo_item>
-			 <combo_item name="type_layer" value="type_layer">
-					Ropas
-			 </combo_item>
-	  </combo_box>
-	  <text name="time_caption_text">
-			 Hora:
-	  </text>
-	  <text name="time_text">
-			 (aqui la fecha)
-	  </text>
-	  <text name="link_caption_text">
-			 Enlace:
-	  </text>
-	  <text name="link_text">
-			 (Estado del Link)
-	  </text>
-	  <text name="name_caption_text">
-			 Nombre:
-	  </text>
-	  <line_editor name="name_text"/>
+	<!-- floater definition end, left side begin -->
+	<button name="add_btn" label="Agregar"/>
+	<button name="del_btn" label="Quitar"/>
+	<button name="upload_btn" label="Subir"/>
+	<button name="more_btn" label="Mas"/>
+	<button name="less_btn" label="Menos"/>
+	<scroll_list name="bitmap_list" >
+		<column name="bitmap_name" label="Nombre"/>
+		<column name="bitmap_uuid" label="UUID"/>
+	</scroll_list>
+	<!-- left side done, right side begin -->
+	<line_editor  name="path_text"/>
+	<text name="path_caption_text">
+		Ruta Local:
+	</text>
+	<line_editor name="uuid_text" />
+	<text name="uuid_caption_text">
+		Local UdddUID:
+	</text>
+	<texture_picker label="Textura" name="texture_view"/>
+	<check_box label="Mantener Actualizado" name="keep_updating_checkbox" tool_tip="Activar o desactivar el control periódico de las fuentes de bitmaps en tu disco duro para ver si han sido actualizadas"/>
+	<combo_box name="type_combobox">
+		<combo_item name="type_texture" value="type_texture">
+			Textura
+		</combo_item>
+		<combo_item name="type_sculptie" value="type_sculptie">
+			Sculptmap
+		</combo_item>
+		<combo_item name="type_layer" value="type_layer">
+			Ropas
+		</combo_item>
+	</combo_box>
+	<text name="time_caption_text">
+		Hora:
+	</text>
+	<text name="time_text">
+		(aqui la fecha)
+	</text>
+	<text name="link_caption_text">
+		Enlace:
+	</text>
+	<text name="link_text">
+		(Estado del Link)
+	</text>
+	<text name="name_caption_text">
+		Nombre:
+	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_media_filter.xml b/indra/newview/skins/default/xui/es/floater_media_filter.xml
index 088b7abb2..a2f22ce92 100644
--- a/indra/newview/skins/default/xui/es/floater_media_filter.xml
+++ b/indra/newview/skins/default/xui/es/floater_media_filter.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="floatermediafilter" title="Filtro de Medios">
-	  <text name="info1" >
-			 Los dominios en Negrita están en la lista permanente (ej.: en lista blanca o lista negra).
-	  </text>
-	  <text name="info2" >
-			 Los dominios en itálica están en la lista de sesión (ej: permitidos o denegados temporariamente).
-	  </text>
-	  <scroll_list name="whitelist_list" >
-			 <column name="whitelist_col" label="Dominios Permitidos u objetos del servidor" />
-	  </scroll_list>
-	  <scroll_list name="blacklist_list" >
-			 <column name="blacklist_col" label="Dominios bloqueados u objetos del servidor" />
-	  </scroll_list>
-	  <button name="add_whitelist" label="Añadir..." tool_tip="Añadir un servidor a la Lista Blanca"/>
-	  <button name="remove_whitelist" label="Quitar" tool_tip="Quitar el servidor seleccionado de la Lista Blanca"/>
-	  <button name="clear_lists" label="Limpiar Listas" tool_tip="Limpiar todas las Listas" />
-	  <button name="show_ips" label="Mostrar IPs" tool_tip="Mostrar las direcciones IP asociadas a cada nombre de dominio (Hace que el visor entre en paus mientras actualiza la lista debido a la búsqueda de DNSs)"/>
-	  <button name="add_blacklist" label="Añadir..." tool_tip="Añadir un server a la Lista Negra"/>
-	  <button name="remove_blacklist" label="Quitar" tool_tip="Quitar el servidor seleccionado de la Lista Negra"/>
-	  <text name="add_text">
-			 Nuevo dominio:
-	  </text>
-	  <check_box name="match_ip" label="Añadir/Quitar IP coincidente" tool_tip="Añadir o Quitar cualquier IP asociada con un nombre de dominio agregado o quitado"/>
-	  <line_editor name="input_domain" tool_tip="Ingresa la nueva URL, nombre de dominio, IP o ruta HTTP del servidor del objeto con script"/>
-	  <button name="commit_domain" label="Añadir" tool_tip="Añadir a la Lista"/>
+	<text name="info1" >
+		Los dominios en Negrita están en la lista permanente (ej.: en lista blanca o lista negra).
+	</text>
+	<text name="info2" >
+		Los dominios en itálica están en la lista de sesión (ej: permitidos o denegados temporariamente).
+	</text>
+	<scroll_list name="whitelist_list" >
+		<column name="whitelist_col" label="Dominios Permitidos u objetos del servidor" />
+	</scroll_list>
+	<scroll_list name="blacklist_list" >
+		<column name="blacklist_col" label="Dominios bloqueados u objetos del servidor" />
+	</scroll_list>
+	<button name="add_whitelist" label="Añadir..." tool_tip="Añadir un servidor a la Lista Blanca"/>
+	<button name="remove_whitelist" label="Quitar" tool_tip="Quitar el servidor seleccionado de la Lista Blanca"/>
+	<button name="clear_lists" label="Limpiar Listas" tool_tip="Limpiar todas las Listas" />
+	<button name="show_ips" label="Mostrar IPs" tool_tip="Mostrar las direcciones IP asociadas a cada nombre de dominio (Hace que el visor entre en paus mientras actualiza la lista debido a la búsqueda de DNSs)"/>
+	<button name="add_blacklist" label="Añadir..." tool_tip="Añadir un server a la Lista Negra"/>
+	<button name="remove_blacklist" label="Quitar" tool_tip="Quitar el servidor seleccionado de la Lista Negra"/>
+	<text name="add_text">
+		Nuevo dominio:
+	</text>
+	<check_box name="match_ip" label="Añadir/Quitar IP coincidente" tool_tip="Añadir o Quitar cualquier IP asociada con un nombre de dominio agregado o quitado"/>
+	<line_editor name="input_domain" tool_tip="Ingresa la nueva URL, nombre de dominio, IP o ruta HTTP del servidor del objeto con script"/>
+	<button name="commit_domain" label="Añadir" tool_tip="Añadir a la Lista"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_message_builder.xml b/indra/newview/skins/default/xui/es/floater_message_builder.xml
index e75916d4e..e1375ab09 100644
--- a/indra/newview/skins/default/xui/es/floater_message_builder.xml
+++ b/indra/newview/skins/default/xui/es/floater_message_builder.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Message Builder" title="Constructor de Mensajes" >
-	  <scroll_list name="net_list">
-			 <column name="text" label="texto" />
-			 <column name="state" label="Estado" />
-	  </scroll_list>
-	  <combo_box name="untrusted_message_combo" tool_tip="No Seguro">
-	  </combo_box>
-	  <combo_box name="trusted_message_combo" tool_tip="Seguro">
-	  </combo_box>
-	  <text_editor name="message_edit" >
-	  </text_editor>
-	  <button name="send_btn" label="Enviar" tool_tip="Enviar (Ctrl+Intro)"/>
+	<scroll_list name="net_list">
+		<column name="text" label="texto" />
+		<column name="state" label="Estado" />
+	</scroll_list>
+	<combo_box name="untrusted_message_combo" tool_tip="No Seguro">
+	</combo_box>
+	<combo_box name="trusted_message_combo" tool_tip="Seguro">
+	</combo_box>
+	<button name="send_btn" label="Enviar" tool_tip="Enviar (Ctrl+Intro)"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_message_log.xml b/indra/newview/skins/default/xui/es/floater_message_log.xml
index 1e87c654c..7a5f2d04f 100644
--- a/indra/newview/skins/default/xui/es/floater_message_log.xml
+++ b/indra/newview/skins/default/xui/es/floater_message_log.xml
@@ -1,28 +1,24 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Message Log" title="Registro de Mensajes" >
-	  <scroll_list name="net_list">
-			 <column name="text" label="texto" />
-			 <column name="icon0" label="icon0"/>
-			 <column name="icon1" label="icon1"/>
-	  </scroll_list>
-	  <button name="filter_choice_btn" label="…"/>
-	  <line_editor name="filter_edit" />
-	  <button name="filter_apply_btn" label="✔"/>
-	  <button name="clear_log_btn" label="C"/>
-	  <scroll_list name="message_log">
-			 <column name="sequence" label="secuencia"/>
-			 <column name="type" label="tipo"/>
-			 <column name="direction" label="dirección"/>
-			 <column name="net" label="red"/>
-			 <column name="name" label="nombre"/>
-			 <!--<column name="flag_zer" label="zer" width="8"/>
-			 <column name="flag_rel" label="rel" width="8"/>
-			 <column name="flag_rsd" label="rsd" width="8"/>
-			 <column name="flag_ack" label="ack" width="8"/>-->
-			 <column name="summary" label="sumario"/>
-	  </scroll_list>
-	  <text name="log_status_text">
-	  </text>
-	  <text_editor name="net_info" >
-	  </text_editor>
+	<scroll_list name="net_list">
+		<column name="text" label="texto" />
+		<column name="icon0" label="icon0"/>
+		<column name="icon1" label="icon1"/>
+	</scroll_list>
+	<button name="filter_choice_btn" label="…"/>
+	<line_editor name="filter_edit" />
+	<button name="filter_apply_btn" label="✔"/>
+	<button name="clear_log_btn" label="C"/>
+	<scroll_list name="message_log">
+		<column name="sequence" label="secuencia"/>
+		<column name="type" label="tipo"/>
+		<column name="direction" label="dirección"/>
+		<column name="net" label="red"/>
+		<column name="name" label="nombre"/>
+		<!--<column name="flag_zer" label="zer" width="8"/>
+		<column name="flag_rel" label="rel" width="8"/>
+		<column name="flag_rsd" label="rsd" width="8"/>
+		<column name="flag_ack" label="ack" width="8"/>-->
+		<column name="summary" label="sumario"/>
+	</scroll_list>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_mute.xml b/indra/newview/skins/default/xui/es/floater_mute.xml
index 491b34091..2be7c1488 100644
--- a/indra/newview/skins/default/xui/es/floater_mute.xml
+++ b/indra/newview/skins/default/xui/es/floater_mute.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="mute floater" short_title="Lista de Ignorados" title="Residentes y Objetos Ignorados">
-	  <scroll_list name="mutes" tool_tip="Lista de residentes ignorados actualmente" />
-	  <button label="Residente Ignorado..." label_selected="Residente Ignorado..." name="Mute resident..." tool_tip="Selecciona un residente para ignorar" />
-	  <button label="Ignorar objeto por su nombre..." label_selected="Ignorar objeto por su nombre..." name="Mute object by name..."/>
-	  <button label="No Ignorar" label_selected="No Ignorar" name="Unmute" tool_tip="Quitar un residente u objeto de la lista de ignorados" />
+	<scroll_list name="mutes" tool_tip="Lista de residentes ignorados actualmente" />
+	<button label="Residente Ignorado..." label_selected="Residente Ignorado..." name="Mute resident..." tool_tip="Selecciona un residente para ignorar" />
+	<button label="Ignorar objeto por su nombre..." label_selected="Ignorar objeto por su nombre..." name="Mute object by name..."/>
+	<button label="No Ignorar" label_selected="No Ignorar" name="Unmute" tool_tip="Quitar un residente u objeto de la lista de ignorados" />
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_new_local_inventory.xml b/indra/newview/skins/default/xui/es/floater_new_local_inventory.xml
index e86cb1a2a..da5b3ee4c 100644
--- a/indra/newview/skins/default/xui/es/floater_new_local_inventory.xml
+++ b/indra/newview/skins/default/xui/es/floater_new_local_inventory.xml
@@ -1,96 +1,91 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="item properties" title="Propiedades de los Items del Inventario">
-	  <text name="LabelItemNameTitle">
-			 Nombre:
-	  </text>
-	  <line_editor name="name_line"/>
-	  <text name="LabelItemDescTitle">
-			 Descripción:
-	  </text>
-	  <line_editor name="desc_line"/>
-	  <text name="LabelAssetTitle">
-			 Asset:
-	  </text>
-	  <line_editor name="asset_id_line"/>
-	  <text name="LabelCreatorTitle">
-			 Creador:
-	  </text>
-	  <line_editor name="creator_id_line"/>
-	  <text name="LabelOwnerTitle">
-			 Propietario:
-	  </text>
-	  <line_editor name="owner_id_line"/>
-	  <combo_box name="type_combo">
-			 <combo_item name="texture" value="texture">
-					textura
-			 </combo_item>
-			 <combo_item name="sound" value="sound">
-					sonido
-			 </combo_item>
-			 <combo_item name="callcard" value="callcard">
-					tarjeta de llamada
-			 </combo_item>
-			 <combo_item name="landmark" value="landmark">
-					hito
-			 </combo_item>
-			 <combo_item name="script" value="script">
-					script
-			 </combo_item>
-			 <combo_item name="clothing" value="clothing">
-					Ropa
-			 </combo_item>
-			 <combo_item name="object" value="object">
-					objeto
-			 </combo_item>
-			 <combo_item name="notecard" value="notecard">
-					nota
-			 </combo_item>
-			 <combo_item name="category" value="category">
-					categoría
-			 </combo_item>
-			 <combo_item name="root" value="root">
-					raíz
-			 </combo_item>
-			 <combo_item name="lsltext" value="lsltext">
-					lsltext
-			 </combo_item>
-			 <combo_item name="lslbyte" value="lslbyte">
-					lslbyte
-			 </combo_item>
-			 <combo_item name="txtr_tga" value="txtr_tga">
-					txtr_tga
-			 </combo_item>
-			 <combo_item name="bodypart" value="bodypart">
-					parte de cuerpo
-			 </combo_item>
-			 <combo_item name="trash" value="trash">
-					papelera
-			 </combo_item>
-			 <combo_item name="snapshot" value="snapshot">
-					foto
-			 </combo_item>
-			 <combo_item name="lstndfnd" value="lstndfnd">
-					lstndfnd
-			 </combo_item>
-			 <combo_item name="snd_wav" value="snd_wav">
-					snd_wav
-			 </combo_item>
-			 <combo_item name="img_tga" value="img_tga">
-					img_tga
-			 </combo_item>
-			 <combo_item name="jpeg" value="jpeg">
-					jpeg
-			 </combo_item>
-			 <combo_item name="animatn" value="animatn">
-					animación
-			 </combo_item>
-			 <combo_item name="gesture" value="gesture">
-					gesto
-			 </combo_item>
-			 <combo_item name="simstate" value="simstate">
-					simstate
-			 </combo_item>
-	  </combo_box>
-	  <check_box label="Abrir inmediatamente" name="chk_open"/>
-	  <button label="OK" name="ok_btn"/>
+	<text name="LabelItemNameTitle">
+		Nombre:
+	</text>
+	<text name="LabelItemDescTitle">
+		Descripción:
+	</text>
+	<text name="LabelAssetTitle">
+		Asset:
+	</text>
+	<text name="LabelCreatorTitle">
+		Creador:
+	</text>
+	<text name="LabelOwnerTitle">
+		Propietario:
+	</text>
+	<combo_box name="type_combo">
+		<combo_item name="texture">
+			Textura
+		</combo_item>
+		<combo_item name="sound">
+			Sonido
+		</combo_item>
+		<combo_item name="callcard">
+			Tarjeta de llamada
+		</combo_item>
+		<combo_item name="landmark">
+			Hito
+		</combo_item>
+		<combo_item name="script">
+			Script
+		</combo_item>
+		<combo_item name="clothing">
+			Ropa
+		</combo_item>
+		<combo_item name="object">
+			Objeto
+		</combo_item>
+		<combo_item name="notecard">
+			Nota
+		</combo_item>
+		<combo_item name="category">
+			Categoría
+		</combo_item>
+		<combo_item name="root">
+			Raíz
+		</combo_item>
+		<combo_item name="lsltext">
+			lsltext
+		</combo_item>
+		<combo_item name="lslbyte">
+			lslbyte
+		</combo_item>
+		<combo_item name="txtr_tga">
+			txtr_tga
+		</combo_item>
+		<combo_item name="bodypart">
+			Parte de cuerpo
+		</combo_item>
+		<combo_item name="trash">
+			Papelera
+		</combo_item>
+		<combo_item name="snapshot">
+			Foto
+		</combo_item>
+		<combo_item name="lstndfnd">
+			lstndfnd
+		</combo_item>
+		<combo_item name="snd_wav">
+			Sonido_wav
+		</combo_item>
+		<combo_item name="img_tga">
+			Imagen tga
+		</combo_item>
+		<combo_item name="jpeg">
+			jpeg
+		</combo_item>
+		<combo_item name="animatn">
+			Animación
+		</combo_item>
+		<combo_item name="gesture">
+			Gesto
+		</combo_item>
+		<combo_item name="simstate">
+			simstate
+		</combo_item>
+	</combo_box>
+	<check_box label="Abrir inmediatamente" name="chk_open"/>
+	<button label="OK" name="ok_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_object_backup.xml b/indra/newview/skins/default/xui/es/floater_object_backup.xml
index 990f8d5e3..3d73edf99 100644
--- a/indra/newview/skins/default/xui/es/floater_object_backup.xml
+++ b/indra/newview/skins/default/xui/es/floater_object_backup.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="Import" title="Progreso de la Importación">
-	  <text name="name_label"> 
-			 Progreso
-	  </text>  
+	<text name="name_label"> 
+		Progreso
+	</text>  
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_post_process.xml b/indra/newview/skins/default/xui/es/floater_post_process.xml
index 138856077..7d296d79c 100644
--- a/indra/newview/skins/default/xui/es/floater_post_process.xml
+++ b/indra/newview/skins/default/xui/es/floater_post_process.xml
@@ -50,10 +50,10 @@
 			<slider label="" name="noise_strength"/>
 		</panel>
 		<panel label="Extras" name="Extras">
+			<combo_box name="PPEffectsCombo"/>
+			<line_editor label="Nombre del Efecto" name="PPEffectNameEditor"/>		
 			<button label="Cargar Efecto" label_selected="Cargar Efecto" name="PPLoadEffect"/>
 			<button label="Guardar Efecto" label_selected="Guardar Efecto" name="PPSaveEffect"/>
-			<combo_box name="PPEffectsCombo"/>
-			<line_editor label="Nombre del Efecto" name="PPEffectNameEditor"/>
 		</panel>
 	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_new_landmark.xml b/indra/newview/skins/default/xui/es/floater_preview_new_landmark.xml
index 9e4bcc2e9..94d7e0828 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_new_landmark.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_new_landmark.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="existing_landmark_preview">
-  <panel name="place_details_panel"/>
-    <button label="Descartar" name="Discard btn"/>
+	<panel name="place_details_panel"/>
+	<button label="Descartar" name="Discard btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_sound.xml b/indra/newview/skins/default/xui/es/floater_preview_sound.xml
index e390e8075..87896f1e7 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_sound.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_sound.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="preview_sound">
+	<text name="name_label">
+		Nombre:
+	</text>
 	<text name="desc txt">
 		Descripción:
 	</text>
-	<button label="Reproducir Localmente" label_selected="Reproducir Localmente" left="150"
-	     mouse_opaque="true" name="Sound audition btn" scale_image="true"
-	     sound_flags="0" tool_tip="Play this sound so that only you can hear it."
-	     width="148" />
-	<button label="Reproducir en Mundo" label_selected="Reproducir en Mundo" left_delta="-146" name="Sound play btn" tool_tip="Play this sound so that others can hear it."
-	     width="142" />
+	<button label="Reproducir Localmente" label_selected="Reproducir Localmente" left="150" name="Sound audition btn" tool_tip="Reproducir reste sonido sólo para ti."/>
+	<button label="Reproducir en Mundo" label_selected="Reproducir en Mundo" left_delta="-146" name="Sound play btn" tool_tip="Reproducir este sonido para que todos puedan escucharlo"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_preview_texture.xml b/indra/newview/skins/default/xui/es/floater_preview_texture.xml
index b76719394..056b239bb 100644
--- a/indra/newview/skins/default/xui/es/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/es/floater_preview_texture.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="preview_texture">
 	<text name="desc txt">
-			Descripción:
+		Descripción:
 	</text>
 	<text name="uuid txt">
-			UUID:
+		UUID:
 	</text>
 	<text name="uploader txt">
-			Subida por:
+		Subida por:
 	</text>
 	<button label="Perfil" name="openprofile"/>
 	<text name="uploadtime txt">
-			Subida el:
+		Subida el:
 	</text>
 	<text name="alphanote">
-			Cargando...
+		Cargando...
 	</text>
 	<button label="Mantener" label_selected="Mantener" name="Keep"/>
 	<button label="Descartar" label_selected="Descartar" name="Discard"/>
 	<button label="Copiar al Inventario" name="Copy To Inventory"/>
 	<text name="dimensions">
-			Tamaño: [WIDTH] x [HEIGHT]
+		Tamaño: [WIDTH] x [HEIGHT]
 	</text>
 	<text name="aspect_ratio">
-			Aspecto Vista Previa
+		Aspecto Vista Previa
 	</text>
 	<combo_box name="combo_aspect_ratio" tool_tip="Vista Previa en aspecto fijo">
 		<combo_item name="Unconstrained">
diff --git a/indra/newview/skins/default/xui/es/floater_radar.xml b/indra/newview/skins/default/xui/es/floater_radar.xml
index 0fb55cb12..18179705c 100644
--- a/indra/newview/skins/default/xui/es/floater_radar.xml
+++ b/indra/newview/skins/default/xui/es/floater_radar.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="radar" title="Radar">
-
 	<scroll_list name="avatar_list" tool_tip="Mantén presionada la tecla Mayús o la tecla Ctrl al  pulsar con el mouse para seleccionar multiples avatares">
 		<column name="marked" label="Marcar" tool_tip="Avatares Marcados"/>
 		<column name="avatar_name" label="Nombre" tool_tip="Mantén presionada la tecla Mayús o la tecla Ctrl al  pulsar con el mouse para seleccionar multiples avatares"/>
diff --git a/indra/newview/skins/default/xui/es/floater_script_search.xml b/indra/newview/skins/default/xui/es/floater_script_search.xml
index d8e6cb547..96c9187ca 100644
--- a/indra/newview/skins/default/xui/es/floater_script_search.xml
+++ b/indra/newview/skins/default/xui/es/floater_script_search.xml
@@ -1,40 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-423" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" can_tear_off="true" enabled="true" height="120"
-     left="223" min_height="100" min_width="100" mouse_opaque="true"
-     name="script search" title="Script Search" width="300">
-	<check_box bottom="-77" control_name="LSLFindCaseInsensitivity" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" initial_value="false" label="Case Insensitive" left="55"
-	     mouse_opaque="true" name="case_text" radio_style="false" width="240" />
-	<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
-	     label="Search" label_selected="Search" left="10" mouse_opaque="true"
-	     name="search_btn" scale_image="true" width="90" />
-	<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
-	     label="Replace" label_selected="Replace" left="105" mouse_opaque="true"
-	     name="replace_btn" scale_image="true" width="90" />
-	<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
-	     label="Replace All" label_selected="Replace All" left="200"
-	     mouse_opaque="true" name="replace_all_btn" scale_image="true" width="90" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-37" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="5"
-	     mouse_opaque="true" name="txt" v_pad="0" width="45">
-		Search
+<floater name="script search" title="Búsqueda en Script">
+	<check_box label="Mayúscylas/Minúsculas" name="case_text"/>
+	<button label="Buscar" label_selected="Buscar" name="search_btn"/>
+	<button label="Reemplazar" label_selected="Reemplazar" name="replace_btn"/>
+	<button label="Reemplazar Todo" label_selected="Reemplazar Todo" name="replace_all_btn"/>
+	<text name="txt">
+		Buscar
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-58" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="5"
-	     mouse_opaque="true" name="txt2" v_pad="0" width="45">
-		Replace
+	<text name="txt2">
+		Reemplazar
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-37"
-	     enabled="true" follows="left|top" font="SansSerifSmall"
-	     handle_edit_keys_directly="false" height="16" left="55" max_length="254"
-	     mouse_opaque="true" name="search_text" select_all_on_focus_received="false"
-	     select_on_focus="false" width="240" />
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-58"
-	     enabled="true" follows="left|top" font="SansSerifSmall"
-	     handle_edit_keys_directly="false" height="16" left="55" max_length="254"
-	     mouse_opaque="true" name="replace_text"
-	     select_all_on_focus_received="false" select_on_focus="false" width="240" />
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_sculpt_preview.xml b/indra/newview/skins/default/xui/es/floater_sculpt_preview.xml
index cc4071f3b..72b6371c1 100644
--- a/indra/newview/skins/default/xui/es/floater_sculpt_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_sculpt_preview.xml
@@ -1,41 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="550" min_height="140" min_width="300"
-     name="Image Preview" title="" width="550">
-	<text left ="20" bottom_delta="-25" follows="top|left" height="15" name="preview_label" font="SansSerifLarge">
-		Preview image as:
+<floater name="Image Preview" title="">
+	<text name="preview_label">
+		Vista Previa de la imagen como:
 	</text>
-	<combo_box bottom_delta="-8" follows="left|top" height="24" label="Clothing Type"
-	     left="145" name="clothing_type_combo" width="160">
+	<combo_box label="Ropas" name="clothing_type_combo">
 		<combo_item name="Image">
-			Image
+			Imagen
 		</combo_item>
 		<combo_item name="Hair">
-			Hair
+			Pelo
 		</combo_item>
 		<combo_item name="FemaleHead">
-			Female Head
+			Cabeza Femenina
 		</combo_item>
 		<combo_item name="FemaleUpperBody">
-			Female Upper Body
+			Cuerpo Superior Femenino
 		</combo_item>
 		<combo_item name="FemaleLowerBody">
-			Female Lower Body
+			Cuerpo Inferior Femenino
 		</combo_item>
 		<combo_item name="MaleHead">
-			Male Head
+			Cabeza Masculina
 		</combo_item>
 		<combo_item name="MaleUpperBody">
-			Male Upper Body
+			Cuerpo Superior Masculino
 		</combo_item>
 		<combo_item name="MaleLowerBody">
-			Male Lower Body
+			Cuerpo Inferior Masculino
 		</combo_item>
 		<combo_item name="Skirt">
-			Skirt
+			Falda
 		</combo_item>
 		<combo_item name="SculptedPrim">
-			Sculpted Prim
+			Prim Sculpt
 		</combo_item>
 	</combo_box>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_search_replace.xml b/indra/newview/skins/default/xui/es/floater_search_replace.xml
index 930cf37b6..e93da440e 100644
--- a/indra/newview/skins/default/xui/es/floater_search_replace.xml
+++ b/indra/newview/skins/default/xui/es/floater_search_replace.xml
@@ -1,40 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-423" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" can_tear_off="true" enabled="true" height="120"
-     left="223" min_height="100" min_width="100" mouse_opaque="true"
-     name="script search" title="Search / Replace" width="300">
-	<check_box bottom="-77" control_name="LSLFindCaseInsensitivity" enabled="true" follows="left|top" font="SansSerifSmall"
-	     height="16" initial_value="false" label="Case Insensitive" left="55"
-	     mouse_opaque="true" name="case_text" radio_style="false" width="240" />
-	<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
-	     label="Search" label_selected="Search" left="10" mouse_opaque="true"
-	     name="search_btn" scale_image="true" width="90" />
-	<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
-	     label="Replace" label_selected="Replace" left="105" mouse_opaque="true"
-	     name="replace_btn" scale_image="true" width="90" />
-	<button bottom="-108" enabled="true" font="SansSerif" halign="center" height="24"
-	     label="Replace All" label_selected="Replace All" left="200"
-	     mouse_opaque="true" name="replace_all_btn" scale_image="true" width="90" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-37" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="5"
-	     mouse_opaque="true" name="search_label" v_pad="0" width="45">
-		Search
+<floater name="script search" title="Buscar / Reemplazar">
+	<check_box label="Mayúsculas/Minúsculas" name="case_text"/>
+	<button label="Buscar" label_selected="Buscar" name="search_btn"/>
+	<button label="Reemplazar" label_selected="Reemplazar" name="replace_btn"/>
+	<button label="Reemplazar Todo" label_selected="Reemplazar Todo" name="replace_all_btn"/>
+	<text name="search_label">
+		Buscar
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-58" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="5"
-	     mouse_opaque="true" name="replace_label" v_pad="0" width="45">
-		Replace
+	<text name="replace_label">
+		 Reemplazar
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-37"
-	     enabled="true" follows="left|top" font="SansSerifSmall"
-	     handle_edit_keys_directly="false" height="16" left="55" max_length="254"
-	     mouse_opaque="true" name="search_text" select_all_on_focus_received="false"
-	     select_on_focus="false" width="240" />
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-58"
-	     enabled="true" follows="left|top" font="SansSerifSmall"
-	     handle_edit_keys_directly="false" height="16" left="55" max_length="254"
-	     mouse_opaque="true" name="replace_text"
-	     select_all_on_focus_received="false" select_on_focus="false" width="240" />
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_select_key.xml b/indra/newview/skins/default/xui/es/floater_select_key.xml
index e68ced28a..a0e6de231 100644
--- a/indra/newview/skins/default/xui/es/floater_select_key.xml
+++ b/indra/newview/skins/default/xui/es/floater_select_key.xml
@@ -1,15 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater border="true" bottom="372" can_close="false" can_drag_on_left="false"
-     can_minimize="false" can_resize="false" can_tear_off="true" enabled="true"
-     height="100" left="415" min_height="100" min_width="100"
-     mouse_opaque="true" name="modal container" title="" width="240">
-	<button bottom="-90" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Cancel" label_selected="Cancel" left="138" mouse_opaque="true"
-	     name="Cancel" scale_image="true" width="82" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-26" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="16" left="20"
-	     mouse_opaque="true" name="Save item as:" v_pad="0" width="200">
-		Press a key to select
+<floater name="modal container">
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<text name="Save item as:">
+		Pulsa una tecla para seleccionar
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_sell_land.xml b/indra/newview/skins/default/xui/es/floater_sell_land.xml
index d91b5ffcf..b2394ee67 100644
--- a/indra/newview/skins/default/xui/es/floater_sell_land.xml
+++ b/indra/newview/skins/default/xui/es/floater_sell_land.xml
@@ -1,99 +1,69 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="485" min_height="485" min_width="450"
-     name="sell land" title="Sell Land" width="450">
-	<texture_picker bottom_delta="-175" enabled="false" follows="top|left" height="135" left="244"
-	     name="info_image" right="424" width="180" />
-	<text bottom_delta="144" follows="top|left" font="SansSerifSmall" left="16"
-	     name="info_parcel_label"  width="64">
-		Parcel:
+<floater name="sell land" title="Vender Terreno">
+	<text name="info_parcel_label">
+		Parcela:
 	</text>
-	<text bottom_delta="-5" follows="top|left" font="SansSerif" height="16" left="72"
-	     name="info_parcel" right="-20" >
+	<text name="info_parcel">
 		PARCEL NAME
 	</text>
-	<text follows="top|left" font="SansSerifSmall" left="16" name="info_size_label"
-	      width="64">
-		Size:
+	<text name="info_size_label">
+		Tamaño:
 	</text>
-	<text bottom_delta="-21" follows="top|left" font="SansSerif" height="32" left="72"
-	     name="info_size" right="-20" >
-		[AREA] sq.m.
+	<text name="info_size">
+		[AREA] m²
 	</text>
-	<text bottom_delta="-94" follows="top|left" font="SansSerifHuge" height="24"
-	     left="16" name="info_action" text_color="white" width="210">
-		To sell this parcel:
+	<text name="info_action">
+		Vender esta parcela:
 	</text>
-	<icon bottom_delta="-66" follows="top|left" height="64" image_name="badge_note.j2c"
-	     left="0" name="step_price" width="64" />
-	<text bottom_delta="38" follows="top|left" height="16" left="72" name="price_label"
-	     right="-20" font="SansSerifBig" >
-		Set a price:
+	<text name="price_label">
+		Definir el precio:
 	</text>
-	<text follows="top|left" height="16" left="72" name="price_text" right="-20">
-		Choose an appropriate price for this land.
+	<text name="price_text">
+		Escoge un precio apropiado para este terreno.
 	</text>
-	<text height="16" left="72" name="price_ld" width="20">
+	<text name="price_ld">
 		[CURRENCY]
 	</text>
-	<line_editor bottom_delta="0" follows="top|left" height="16" increment="1" initial_val="0"
-	     left_delta="20" max_val="999999999" min_val="0" name="price" width="100" />
-	<text bottom_delta="0" height="16" left_delta="110" name="price_per_m" width="200">
-		([CURRENCY][PER_METER] per square meter)
+	<text name="price_per_m">
+		([CURRENCY][PER_METER] por metro cuadro)
 	</text>
-	<icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
-	     name="step_sell_to" width="64" />
-	<text bottom_delta="38" follows="top|left" height="16" left="72" name="sell_to_label"
-	     right="-20" font="SansSerifBig" >
-		Sell the land to:
+	<text name="sell_to_label">
+		Vender este terreno a:
 	</text>
-	<text follows="top|left" height="16" left="72" name="sell_to_text" right="-20">
-		Choose whether to sell to anyone or a particular buyer.
+	<text name="sell_to_text">
+		Elige si quieres vender este terreno a cualquiera o a alguien en particular.
 	</text>
-	<combo_box bottom_delta="-16" follows="top|right" height="16" left="72" name="sell_to"
-	     width="140">
-		<combo_item enabled="false" name="--selectone--" value="select">
-			-- select one --
+	<combo_box name="sell_to">
+		<combo_item name="--selectone--">
+			-- Escoge a alguien--
 		</combo_item>
-		<combo_item name="Anyone" value="anyone">
-			Anyone
+		<combo_item name="Anyone">
+			Cualquiera
 		</combo_item>
-		<combo_item name="Specificuser:" value="user">
-			Specific user:
+		<combo_item name="Specificuser:">
+			Usuario Específico:
 		</combo_item>
 	</combo_box>
-	<line_editor bottom_delta="-20" enabled="false" follows="top|right" height="16"
-	     name="sell_to_agent"  width="150" />
-	<button bottom_delta="0" height="16" label="Select..." left_delta="155"
-	     name="sell_to_select_agent" width="110" />
-	<icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
-	     name="step_sell_objects" width="64" />
-	<text bottom_delta="38" follows="top|left" height="16" left="72"
-	     name="sell_objects_label" right="-20" font="SansSerifBig" >
-		Sell the objects with the land?
+	<button label="Elegir..." name="sell_to_select_agent"/>
+	<text name="sell_objects_label">
+		¿Vender los objetos con el terreno?
 	</text>
-	<text bottom_delta="-20" follows="top|left" height="16" left="72"
-	     name="sell_objects_text">
-		Land owner&apos;s transferable objects on parcel will change ownership.
+	<text name="sell_objects_text">
+		La propiedad de los objetos transferibles en la parcela cambiarán de propietario.
 	</text>
-	<radio_group bottom_delta="-44" follows="top|right" height="40" left="72"
-	     name="sell_objects" right="420">
-		<radio_item bottom="0" height="0" left="10" name="none" visible="false" />
-		<radio_item bottom="-20" height="16" left="10" name="no">
-			No, keep ownership of objects
+	<radio_group name="sell_objects">
+		<radio_item name="none"/>
+		<radio_item name="no">
+			No, mantener propiedad de los objetos
 		</radio_item>
-		<radio_item bottom="-40" height="16" left="10" name="yes">
-			Yes, sell objects with land
+		<radio_item name="yes">
+			Si, vender los objetos con la propiedad
 		</radio_item>
 	</radio_group>
-	<button bottom_delta="4" height="16" label="Show Objects" name="show_objects"
-	     right="414" width="110" />
-	<text bottom_delta="-35" follows="top|left" height="16" left="72"
-	     name="nag_message_label" right="-20" font="SansSerifBig" >
-		REMEMBER: All sales are final.
+	<button label="Mostrar Objetos" name="show_objects"/>
+	<text name="nag_message_label">
+		RECUERDA: Todas las ventas son finales.
 	</text>
-	<button bottom="-479" follows="bottom|left" height="20" label="Set Land For Sale"
-	     left="72" name="sell_btn" width="160" />
-	<button bottom_delta="0" follows="bottom|right" height="20" label="Cancel"
-	     name="cancel_btn" right="444" width="90" />
+	<button label="Definir Terreno en Venta" name="sell_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_settings_debug.xml b/indra/newview/skins/default/xui/es/floater_settings_debug.xml
index a8c0840a1..21433b0ab 100644
--- a/indra/newview/skins/default/xui/es/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/es/floater_settings_debug.xml
@@ -1,31 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="215" name="settings_debug"
-     title="Debug Settings" width="350">
-	<combo_box allow_text_entry="true" bottom="-50" follows="top|left" font="SansSerifSmall"
-	     height="20" left="15" max_chars="255" name="settings_combo" />
-	<text_editor bottom_delta="-75" enabled="false" height="60" width="320" hide_scrollbar="true"
-	     name="comment_text" word_wrap="true" />
-	<combo_box bottom_delta="-30" follows="top|left" font="SansSerifSmall" height="20"
-	     left="15" name="boolean_combo" visible="false">
-		<combo_item name="TRUE" value="true">
-			TRUE
+<floater name="settings_debug" title="Configurar del Depurador">
+	<combo_box name="settings_combo" />
+	<combo_box name="boolean_combo">
+		<combo_item name="TRUE">
+			VERDADERO
 		</combo_item>
-		<combo_item name="FALSE" value="">
-			FALSE
+		<combo_item name="FALSE">
+			FALSO
 		</combo_item>
 	</combo_box>
-	<line_editor bottom_delta="0" height="20" name="val_text" visible="false" width="300" />
-	<color_swatch bottom="30" can_apply_immediately="true" height="55" label="Color"
-	     name="color_swatch" visible="true" width="37" />
-	<spinner bottom_delta="25" height="20" label="x" label_width="40" max_val="10000000"
-	     name="val_spinner_1" visible="false" width="120" />
-	<spinner bottom_delta="0" height="20" label="x" label_width="40" left_delta="135"
-	     max_val="10000000" name="val_spinner_2" visible="false" width="120" />
-	<spinner bottom_delta="-20" height="20" label="x" label_width="40" left="15"
-	     max_val="10000000" name="val_spinner_3" visible="false" width="120" />
-	<spinner bottom_delta="0" height="20" label="x" label_width="40" left_delta="135"
-	     max_val="10000000" name="val_spinner_4" visible="false" width="120" />
-	<button bottom="5" height="20" label="Reset to default" left="15" name="default_btn"
-	     width="150" />
+	<color_swatch label="Color" name="color_swatch"/>
+	<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"/>
+	<button label="Restablecer" name="default_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_sim_release_message.xml b/indra/newview/skins/default/xui/es/floater_sim_release_message.xml
index 72e8b27f3..9b406452a 100644
--- a/indra/newview/skins/default/xui/es/floater_sim_release_message.xml
+++ b/indra/newview/skins/default/xui/es/floater_sim_release_message.xml
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-     height="500" min_height="300" min_width="300" name="floaterreleasemessage"
-     title="Entering Region" width="700">
-	<button bottom="10" follows="bottom|right" font="SansSerifSmall" height="20"
-	     label="Close" name="close_btn" right="-10" width="50" />
-	<web_browser bottom="40" follows="top|left|bottom|right" font="SansSerifSmall" left="15"
-	     name="release_message_floater_browser" right="-15" top="-30" />
+<floater name="floaterreleasemessage" title="Entrando a Región">
+	<button label="Cerrar" name="close_btn"/>
 	<string name="in-world_help_title">
-		In-World Help
+		Ayuda en el Mundo
 	</string>
 	<string name="in-world_help_url">
 		http://www.secondlife.com/app/support/inworld.html
 	</string>
 	<string name="additional_help_title">
-		Additional Help
+		Ayuda Adicional
 	</string>
 	<string name="additional_help_url">
 		http://www.secondlife.com/app/support/support.html
diff --git a/indra/newview/skins/default/xui/es/floater_skin_preview_template.xml b/indra/newview/skins/default/xui/es/floater_skin_preview_template.xml
index 2822d9bf4..fb31b510b 100644
--- a/indra/newview/skins/default/xui/es/floater_skin_preview_template.xml
+++ b/indra/newview/skins/default/xui/es/floater_skin_preview_template.xml
@@ -1,80 +1,33 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<multi_floater bottom="256" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="148" left="256" name="floater_chatterbox" title="" title_bar="true" width="300" rect_control="ChatterboxRect">
-    <icon image_name="checkerboard_transparency_bg.png" follows="left|right|top|bottom" bottom="0" left="0" height="128" width="300" />
-    <panel name="panel_littletoolbar" width="300" height="28" left="0" bottom="0" background_opaque="true" background_visible="true">
-        <panel bottom="0" filename="panel_bg_toolbar.xml" height="26" left="0" width="300" follows="left|right|top|bottom"/>
-        <button bottom="0" font="SansSerif" height="24"
-            image_selected="btn_chatbar_selected.tga" scale_image="true"
-            image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn"
-            image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)"
-            width="50" auto_resize="false" follows="left|right" user_resize="false"/>
-            <icon image_name="spacer24.tga" left_delta="2" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
-        <flyout_button bottom="0" font="SansSerif" height="24" label="Communicate" left_delta="52"
-           name="communicate_btn" tool_tip="Communicate with your Friends and Groups."
-            list_position="above" auto_resize="false"
-            width="120" follows="left|right" user_resize="false"/>
-        <icon image_name="spacer24.tga" width="2" height="2" follows="left|right" auto_resize="false" color="0,0,0,0"/>
-        <button bottom="0" left_delta="122"
-            font="SansSerif"
-            height="24"
-            label="Fly"
-            image_overlay="icn_toolbar_fly.tga"
-            image_overlay_alignment="left"
-            image_selected="toolbar_btn_selected.tga"
-            image_unselected="toolbar_btn_enabled.tga"
-            toggle="true"
-            auto_resize="false"
-            image_disabled="toolbar_btn_disabled.tga"
-            scale_image="true"
-            label_selected="Stop Flying" left="0" name="fly_btn"
-            tool_tip="Start flying. Use E/C or PgUp/PgDn to fly up and down."
-            width="120"
-            follows="left|right"
-            user_resize="false"/>
-    </panel>
-        <panel name="panel_unfocused_floater" background_opaque="false" background_visible="true" bg_alpha_color="DefaultBackgroundColor" height="100" width="148" left="2" bottom="29" border="true" border_color="FloaterUnfocusBorderColor">
-            <panel background_opaque="false" background_visible="false" bg_alpha_color="0,0,0,0" height="17" width="148" bottom="83" />
-            <text name="titlebar_focused" text_color="LabelDisabledColor" bottom_delta="6" left_delta="15" font="SansSerif">Unfocused</text>
-            <icon image_name="closebox.tga" left_delta="116" bottom="83" width="16" height="16" color="FloaterButtonImageColor"/>
-            <icon image_name="minimize.tga" left_delta="-17" bottom_delta="0" width="16" height="16" color="FloaterButtonImageColor"/>
-            
-        <combo_box name="combo_box_1" label="Combo Box" height="20" width="90" bottom_delta="-22" left="2" />
-        <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
-			     bottom="5" embedded_items="false" enabled="false"
-			     follows="left|top|right|bottom" font="SansSerif" height="50" left="5"
-			     max_length="2147483647" mouse_opaque="true" name="Chat History Editor"
-			     text_color="ChatHistoryTextColor"
-			     text_readonly_color="ChatHistoryTextColor" width="140" word_wrap="true">Text</text_editor>
-        </panel>
-        <panel name="panel_focused_floater" background_opaque="true" background_visible="true" height="100" width="148" left="152" bottom="29" border="true">
-            <panel background_opaque="false" background_visible="true" bg_alpha_color="TitleBarFocusColor" height="17" width="148" bottom="83" />
-            <text name="titlebar_focused" text_color="LabelTextColor" bottom_delta="6" left_delta="15" font="SansSerif">Focused</text>
-            <icon image_name="closebox.tga" left_delta="116" bottom="83" width="16" height="16" color="FloaterButtonImageColor" />
-            <icon image_name="minimize.tga" left_delta="-17" bottom_delta="0" width="16" height="16" color="FloaterButtonImageColor"/>
-<icon enabled="false" image_name="tabarea.tga"
-	     bg_alpha_color="blue" color="DefaultShadowLight" border="false"
-	     bottom="0" follows="left|right|bottom" height="17" left="1" scale_image="true"
-	     mouse_opaque="false" name="chatterbox_tab_container" width="148"></icon>
-    <tab_container bottom="0" follows="left|right|top|bottom" height="102" left="0"
-	     name="chatterbox_tabs" tab_position="bottom" tab_min_width="40" width="148" >
-        <panel name="test_1" label="Focused">
-            <slider bottom_delta="-36" control_name="SliderTest" follows="left|top|right"
-	     height="15" increment="0.05" initial_val="0.5" label="Slider"
-	     label_width="36" left="5" max_val="1" min_val="0" name="SliderTestName"
-	     show_text="false" volume="true" width="140" />
-            <check_box name="check_box_test_1" label="True" bottom_delta="56" initial_value="true" left="0" />
-        <check_box name="check_box_test_2" label="False" bottom_delta="0" left_delta="50" initial_value="false" />
-            <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
-			     bottom="8" embedded_items="false" enabled="false"
-			      font="SansSerif" height="22" left="2"
-			     max_length="2147483647" mouse_opaque="true" name="Chat History Editor" hide_scrollbar="true"
-			     text_color="ChatHistoryTextColor"
-			     text_readonly_color="ChatHistoryTextColor" width="140" word_wrap="true">Chat Text</text_editor>
-        
-        </panel>
-        <panel name="test_2" label="Unfocused" />
-    </tab_container>
-        </panel>
-
+<multi_floater name="floater_chatterbox" title="" >
+	<panel name="panel_littletoolbar" >
+		<button label="" left="2" name="chat_btn" tool_tip="Mostrar barra de Chat. (Intro)"/>
+			<flyout_button label="Comunicarse" name="communicate_btn" tool_tip="Comunicarte con tus amigos y grupos."/>
+			<button label="Volar" label_selected="Dejar de Volar" name="fly_btn" tool_tip="Comenzar a Volar. Usa E/C o AvPág/RePág para ascender y descender."/>
+	</panel>
+	<panel name="panel_unfocused_floater" >
+		<text name="titlebar_focused" >
+			Sin foco
+		</text>
+		<combo_box name="combo_box_1" label="Combo Box"/>
+		<text_editor name="Chat History Editor">
+			Text
+		</text_editor>
+	</panel>
+	<panel name="panel_focused_floater">
+		<text name="titlebar_focused" >
+			En foco
+		</text>
+		<tab_container name="chatterbox_tabs">
+			<panel name="test_1" label="En foco">
+				<slider label="Control Deslizante" label_width="36" name="SliderTestName"/>
+            <check_box name="check_box_test_1" label="Verdadero"/>
+				<check_box name="check_box_test_2" label="Falso"/>
+            <text_editor name="Chat History Editor">
+					Chat de Texto
+				</text_editor>
+			</panel>
+			<panel name="test_2" label="Sin Foco" />
+		</tab_container>
+	</panel>
 </multi_floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_snapshot.xml b/indra/newview/skins/default/xui/es/floater_snapshot.xml
index b48c2ca1c..5ee5f1fd6 100644
--- a/indra/newview/skins/default/xui/es/floater_snapshot.xml
+++ b/indra/newview/skins/default/xui/es/floater_snapshot.xml
@@ -1,122 +1,103 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-300" can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" follows="left|top" height="566" name="Snapshot"
-     rect_control="FloaterSnapshotRect" title="Snapshot Preview" width="215">
-	<text bottom_delta="-40" follows="top|left" height="15" left="10" name="type_label"
-	     width="195">
-    Snapshot destination
-  </text>
-	<radio_group bottom_delta="-65" follows="left|top" height="60" label="Snapshot type"
-	     left="10" name="snapshot_type_radio" width="195">
-		<radio_item bottom="-19" height="16" name="postcard">
-			Send via email
+<floater name="Snapshot" title="Vista Previa de la foto">
+	<text name="type_label">
+		Destino de la foto
+	</text>
+	<radio_group label="Tipo de foto" name="snapshot_type_radio">
+		<radio_item name="postcard">
+			Enviar por Email
 		</radio_item>
-		<radio_item bottom="-38" height="16" name="texture">
-      Save to your inventory ([UPLOADFEE])
-    </radio_item>
-		<radio_item bottom="-57" height="16" name="local">
-			Save to your hard drive
+		<radio_item name="texture">
+			Guardarla en tu inventario ([UPLOADFEE])
+		</radio_item>
+		<radio_item name="local">
+			Guardarla en disco duro
 		</radio_item>
 	</radio_group>
-	<text bottom="-236" follows="left|top" height="25" left="10" name="file_size_label"
-	     width="195">
-		File size: [SIZE] KB
+	<text name="file_size_label">
+		Tamaño del Archivo: [SIZE] KB
 	</text>
-	<button bottom="-246" follows="left|top" height="20" label="Refresh Snapshot" left="10"
-	     name="new_snapshot_btn" width="195" />
-	<button bottom_delta="-22" follows="left|top" height="20" label="Send" left="10"
-	     name="send_btn" width="105" />
-	<button bottom_delta="0" follows="left|top" height="20" label="Save ([UPLOADFEE])" left="10"
-	     name="upload_btn" width="105" />
-  <flyout_button bottom_delta="0" follows="left|top" height="20" label="Save" left="10"
-       list_position="below" mouse_opaque="true" name="save_btn" tool_tip="Save image to a file"
-       width="105">
-    <flyout_button_item value="save" name="save_item">Save</flyout_button_item>
-    <flyout_button_item value="saveas" name="saveas_item">Save As...</flyout_button_item>
-  </flyout_button>
-	<button bottom_delta="0" follows="left|top" height="20" label="Cancel" left="120"
-	     name="discard_btn" width="85" />
-	<button bottom="-290" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="20" label="More &gt;&gt;" left="10"
-	     mouse_opaque="true" name="more_btn" scale_image="TRUE"
-	     tool_tip="Advanced Options" width="80" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="20" label="&lt;&lt; Less" left_delta="0"
-	     mouse_opaque="true" name="less_btn" scale_image="TRUE"
-	     tool_tip="Advanced Options" width="80" />
-	<text bottom_delta="-20" follows="top|left" height="15" left="10" name="type_label2"
-	     width="115">
-	Size
-  </text>
-  <text bottom_delta="0" follows="top|left" height="15" left="130" name="format_label"
-       width="70">
-  Format
-  </text>
-	<combo_box bottom_delta="-22" follows="left|top" height="20" label="Resolution" left="10"
-	     name="postcard_size_combo" width="115">
-		<combo_item name="CurrentWindow" value="[i0,i0]">
-			Current Window
+	<button label="Actualizar foto" name="new_snapshot_btn"/>
+	<button label="Enviar" name="send_btn"/>
+	<button label="Guardar ([UPLOADFEE])" name="upload_btn"/>
+	<flyout_button label="Guardar" name="save_btn" tool_tip="Guardar la imagen en un archivo">
+		<flyout_button_item name="save_item">
+			Guardar
+		</flyout_button_item>
+		<flyout_button_item name="saveas_item">
+			Guardar Como...
+		</flyout_button_item>
+	</flyout_button>
+	<button label="Cancelar" name="discard_btn"/>
+	<button label="Más &gt;&gt;" name="more_btn" tool_tip="Opciones Avanzadas"/>
+	<button label="&lt;&lt; Menos" name="less_btn" tool_tip="Opciones Avanzadas"/>
+	<text name="type_label2">
+		Tamaño
+	</text>
+	<text name="format_label">
+		Formato
+	</text>
+	<combo_box label="Resolución" name="postcard_size_combo">
+		<combo_item name="CurrentWindow">
+			Ventana Actual
 		</combo_item>
-		<combo_item name="640x480" value="[i640,i480]">
+		<combo_item name="640x480">
 			640x480
 		</combo_item>
-		<combo_item name="800x600" value="[i800,i600]">
+		<combo_item name="800x600">
 			800x600
 		</combo_item>
-		<combo_item name="1024x768" value="[i1024,i768]">
+		<combo_item name="1024x768">
 			1024x768
 		</combo_item>
-		<combo_item name="Custom" value="[i-1,i-1]">
-			Custom
+		<combo_item name="Custom">
+			Personalizado
 		</combo_item>
 	</combo_box>
-	<combo_box bottom_delta="0" follows="left|top" height="20" label="Resolution" left="10"
-	     name="texture_size_combo" width="115">
-		<combo_item name="CurrentWindow" value="[i0,i0]">
-			Current Window
+	<combo_box label="Resolución" name="texture_size_combo">
+		<combo_item name="CurrentWindow">
+			Ventana Actual
 		</combo_item>
-		<combo_item name="Small(128x128)" value="[i128,i128]">
-			Small (128x128)
+		<combo_item name="Small(128x128)">
+			Pequeño (128x128)
 		</combo_item>
-		<combo_item name="Medium(256x256)" value="[i256,i256]">
-			Medium (256x256)
+		<combo_item name="Medium(256x256)">
+			Medio (256x256)
 		</combo_item>
-		<combo_item name="Large(512x512)" value="[i512,i512]">
-			Large (512x512)
+		<combo_item name="Large(512x512)">
+			Alto (512x512)
 		</combo_item>
-		<combo_item name="Custom" value="[i-1,i-1]">
-			Custom
+		<combo_item name="Custom">
+			Personalizado
 		</combo_item>
 	</combo_box>
-	<combo_box bottom_delta="0" follows="left|top" height="20" label="Resolution" left="10"
-	     name="local_size_combo" width="115">
-		<combo_item name="CurrentWindow" value="[i0,i0]">
-			Current Window
+	<combo_box label="Resolución" name="local_size_combo">
+		<combo_item name="CurrentWindow">
+			Ventana Actual
 		</combo_item>
-		<combo_item name="320x240" value="[i320,i240]">
+		<combo_item name="320x240">
 			320x240
 		</combo_item>
-		<combo_item name="640x480" value="[i640,i480]">
+		<combo_item name="640x480">
 			640x480
 		</combo_item>
-		<combo_item name="800x600" value="[i800,i600]">
+		<combo_item name="800x600">
 			800x600
 		</combo_item>
-		<combo_item name="1024x768" value="[i1024,i768]">
+		<combo_item name="1024x768">
 			1024x768
 		</combo_item>
-		<combo_item name="1280x1024" value="[i1280,i1024]">
+		<combo_item name="1280x1024">
 			1280x1024
 		</combo_item>
-		<combo_item name="1600x1200" value="[i1600,i1200]">
+		<combo_item name="1600x1200">
 			1600x1200
 		</combo_item>
-		<combo_item name="Custom" value="[i-1,i-1]">
-			Custom
+		<combo_item name="Custom">
+			Personalizado
 		</combo_item>
 	</combo_box>
-	<combo_box bottom_delta="0" follows="left|top" height="20" label="Format" left="130"
-	     name="local_format_combo" width="70">
+	<combo_box label="Formato" name="local_format_combo">
 		<combo_item name="PNG">
 			PNG
 		</combo_item>
@@ -127,46 +108,29 @@
 			BMP
 		</combo_item>
 	</combo_box>
-
-	<spinner bottom_delta="-25" decimal_digits="0" follows="left|top" height="20"
-	     increment="32" label="Width" label_width="30" left="10" max_val="6016"
-	     min_val="32" name="snapshot_width" width="95" allow_text_entry="false"/>
-	<spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="20"
-	     increment="32" label="Height" label_width="35" left="110" max_val="6016"
-	     min_val="32" name="snapshot_height" width="95" allow_text_entry="false"/>
-	<check_box bottom_delta="-20" follows="left|top" label="Constrain Proportions" left="10"
-	     name="keep_aspect_check" />
-	<slider bottom_delta="-20" decimal_digits="0" follows="left|top" height="15"
-	     increment="1" initial_val="75" label="Image Quality" left="10"
-	     max_val="100" min_val="0" name="image_quality_slider" width="210" />
-	<text bottom_delta="-28" follows="left|top" height="20" left="10"
-	     name="layer_type_label" width="50">
-		Capture:
+	<spinner label="Ancho" name="snapshot_width"/>
+	<spinner label="Alto" name="snapshot_height"/>
+	<check_box label="Mantener Proporciones" name="keep_aspect_check" />
+	<slider label="Calidad de la Imagen" name="image_quality_slider"/>
+	<text name="layer_type_label">
+		Captura:
 	</text>
-	<combo_box bottom_delta="3" follows="left|top" height="20" label="Image Layers" left="60"
-	     name="layer_types" width="145">
-		<combo_item name="Colors" value="colors">
-			Colors
+	<combo_box label="Capas de la Imagen" name="layer_types">
+		<combo_item name="Colors">
+			Colores
 		</combo_item>
-		<combo_item name="Depth" value="depth">
-			Depth
+		<combo_item name="Depth">
+			Profundidad
 		</combo_item>
 	</combo_box>
-	<check_box bottom_delta="-20" follows="left|top" label="Show interface in snapshot"
-	     left="10" name="ui_check" />
-	<check_box bottom_delta="-20" follows="left|top" label="Show HUD objects in snapshot"
-	     left="10" name="hud_check" />
-	<check_box bottom_delta="-20" follows="left|top" label="Keep open after saving" left="10"
-	     name="keep_open_check" />
-	<check_box bottom_delta="-20" follows="left|top" label="Freeze frame (fullscreen preview)"
-	     left="10" name="freeze_frame_check" />
-	<check_box bottom_delta="-20" follows="left|top" label="Auto-refresh" left="10"
-	     name="auto_snapshot_check" />
-	<check_box bottom_delta="-20" follows="left|top" control_name="TemporaryUpload" enabled="true"
-             initial_value="false" label="Temporary Image (Free)" left="10"
-             name="temp_check" tooltip="Sets the asset to be temporary, meaning it's free, but in return, only good for a short time before it ceases to exist." />
+	<check_box label="Incluir la interfaz en la foto" name="ui_check" />
+	<check_box label="Incluir HUDs en la foto"name="hud_check" />
+	<check_box label="Mantener abierto tras guardar" name="keep_open_check"/>
+	<check_box label="Congelar la toma (Vista Previa en Pantalla Completa)" name="freeze_frame_check"/>
+	<check_box label="Actualizar Automáticamente" name="auto_snapshot_check"/>
+	<check_box label="Imagen Temporal (Gratis)" name="temp_check" tooltip="Definir en los activos que es una imagen temporaria, lo que signfica que será gratis, pero también que su existencia será limitada."/>
 	<string name="unknown">
-		unknown
+		desconocido
 	</string>
 </floater>
- 
+ 
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/es/floater_sound_preview.xml b/indra/newview/skins/default/xui/es/floater_sound_preview.xml
index 0a755e8e5..37aa2f664 100644
--- a/indra/newview/skins/default/xui/es/floater_sound_preview.xml
+++ b/indra/newview/skins/default/xui/es/floater_sound_preview.xml
@@ -1,29 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="190" min_height="140" min_width="300"
-     name="Sound Preview" title="sound.wav" width="300">
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-35" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="15" left="10"
-	     mouse_opaque="false" name="name_label" v_pad="0" width="275">
-		Name:
+<floater name="Sound Preview">
+	<text name="name_label">
+		Nombre:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-23"
-	     follows="left|top|right" font="SansSerifSmall" height="19" left="10"
-	     max_length="63" mouse_opaque="true" name="name_form" width="280" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-19" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="15" left="10"
-	     mouse_opaque="false" name="description_label" v_pad="0" width="270">
-		Description:
+	<text name="description_label">
+		Descripción:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-23"
-	     follows="left|top|right" font="SansSerifSmall" height="19" left="10"
-	     max_length="127" mouse_opaque="true" name="description_form" width="280" spell_check="true" />
-	<button bottom="-180" follows="right|bottom" font="SansSerif" halign="center"
-	     height="20" label="Cancel" label_selected="Cancel" left="200"
-	     mouse_opaque="true" name="cancel_btn" width="90" />
-	<button bottom="-180" follows="left|bottom" font="SansSerif" halign="center"
-	     height="20" label="Upload ([UPLOADFEE])"
-	     left_delta="-135" mouse_opaque="true" name="ok_btn" width="130" />
+	<button label="Cancelar" label_selected="Cancelar" name="cancel_btn"/>
+	<button label="Subir ([UPLOADFEE])" name="ok_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_statistics.xml b/indra/newview/skins/default/xui/es/floater_statistics.xml
index b11e26611..45d2f963e 100644
--- a/indra/newview/skins/default/xui/es/floater_statistics.xml
+++ b/indra/newview/skins/default/xui/es/floater_statistics.xml
@@ -1,14 +1,3 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true"
-	follows="right|top"
-    width="250"
-    height="392"
-	min_width="100"
-	min_height="100"
-    mouse_opaque="false"
-	name="stats floater"
-    can_resize="true"
-	rect_control="FloaterStatisticsRect"
-    title="Statistics"
-	>
+<floater name="stats floater" title="Estadísticas">
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_telehub.xml b/indra/newview/skins/default/xui/es/floater_telehub.xml
index 1c3662207..dd4217ac0 100644
--- a/indra/newview/skins/default/xui/es/floater_telehub.xml
+++ b/indra/newview/skins/default/xui/es/floater_telehub.xml
@@ -1,43 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="250" min_height="220" min_width="83"
-     name="telehub" title="Telehub" width="272">
-	<text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16"
-	     left="10" name="status_text_connected" width="260">
-		Telehub connected to object [OBJECT]
+<floater name="telehub" title="Punto de Teleporte">
+	<text name="status_text_connected">
+		Punto de Teleporte conectado al objeto [OBJECT]
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerifSmall" height="16" left="10"
-	     name="status_text_not_connected" width="200">
-		No telehub connected.
+	<text name="status_text_not_connected">
+		Punto de Teleporte sin conectar.
 	</text>
-	<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
-	     left="10" name="help_text_connected" width="260">
-		To remove, click Disconnect.
+	<text name="help_text_connected">
+		Para quitar, pulsa desconectar.
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" left="10"
-	     name="help_text_not_connected" width="260">
-		Select object and click Connect Telehub.
+	<text name="help_text_not_connected">
+		Selecciona el objeto y pulsa Conectar el Punto de Teleporte.
 	</text>
-	<button bottom_delta="-20" follows="top|left" font="SansSerifSmall" height="20"
-	     label="Connect Telehub" left="10" name="connect_btn" width="110" />
-	<button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-	     label="Disconnect" left="130" name="disconnect_btn" width="110" />
-	<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-	     left="10" name="spawn_points_text" width="200">
-		Spawn Points (positions, not objects):
+	<button label="Conectar el Punto de Teleporte" name="connect_btn"/>
+	<button label="Desconectar" name="disconnect_btn"/>
+	<text name="spawn_points_text">
+		Generar Puntos (posiciones, no objetos):
 	</text>
-	<scroll_list bottom_delta="-60" draw_border="true" follows="left|top" font="SansSerifSmall"
-	     height="60" left="10" multi_select="false" name="spawn_points_list"
-	     width="230" />
-	<button bottom_delta="-25" follows="top|left" font="SansSerifSmall" height="20"
-	     label="Add Spawn" left="10" name="add_spawn_point_btn" width="110" />
-	<button bottom_delta="0" follows="top|left" font="SansSerifSmall" height="20"
-	     label="Remove Spawn" left="130" name="remove_spawn_point_btn" width="110" />
-	<text bottom_delta="-85" follows="top|left" font="SansSerifSmall" height="80"
-	     left="10" name="spawn_point_help" width="260">
-		Select object and click Add to specify position.
-You may then move or delete the object.
-Positions are relative to the telehub center.
-Select item in list to show position in world.
+	<button label="Añadir punto" name="add_spawn_point_btn"/>
+	<button label="Quitar punto" name="remove_spawn_point_btn"/>
+	<text name="spawn_point_help">
+		Selecciona el objeto y pulsa Añadir para
+especificar la posición.
+Hecho eso, puedes mover o borrar el objeto.
+Las posiciones son relativas al centro del
+Punto de Teleporte.
+Selecciona un ítem de la lista para mostrar su
+posición en el mundo.	
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_teleport.xml b/indra/newview/skins/default/xui/es/floater_teleport.xml
index 9460de5f6..1522bd3f5 100644
--- a/indra/newview/skins/default/xui/es/floater_teleport.xml
+++ b/indra/newview/skins/default/xui/es/floater_teleport.xml
@@ -1,55 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <!--agentd teleport floater-->
-<floater
-	name="teleport_floater"
-	title="Teleport"
-	can_resize="true"
-	can_minimize="true"
-	can_close="true"
-	can_drag_on_left="false"
-	width="300"
-	height="150"
-	min_width="80"
-	min_height="150"
-	>
-
-	<text name="teleport_text"
-		font="SansSerifSmall"
-		left="10"
-		bottom_delta="-40"
-		width="260"
-		height="16"
-                follows="left|top"
-		> Public Region Seed: </text>
-
-
-	<combo_box allow_text_entry="true"
-		name="teleport_edit"
-		width="250"
-		height="20"
-		left="10"
-		bottom_delta="-30"
-		follows="left|top"
-		hidden="false"
-		mouse_opaque="true"
-		max_length="420"
-		font="SansSerif"
-		bevel_style="in"
-		border_style="line"
-		border_thickness="1"
-		select_all_on_focus_received="true"
-	/>
-
-	<button
-		name="teleport_btn"
-		label="Teleport"
-		font="SansSerifSmall"
-		left="10"
-		bottom_delta="-25"
-		width="100"
-		height="20"
-		follows="top|left"
-		/>
-	<button bottom_delta="0" follows="bottom|right" height="20" label="Cancel" right="224"
-	     name="cancel_btn" width="90" />
+<floater name="teleport_floater" title="Teleportar" >
+	<text name="teleport_text"> Semillas Región Pública: </text>
+	<combo_box name="teleport_edit"/>
+	<button name="teleport_btn" label="Teleportar"/>
+	<button label="Cancelar" name="cancel_btn"/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_teleport_history.xml b/indra/newview/skins/default/xui/es/floater_teleport_history.xml
index 1f4827f79..f0972cb76 100644
--- a/indra/newview/skins/default/xui/es/floater_teleport_history.xml
+++ b/indra/newview/skins/default/xui/es/floater_teleport_history.xml
@@ -1,28 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="teleporthistory" title="Teleport History" rect_control="FloaterTeleportHistoryRect"
-	can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-	min_width="550" min_height="150" width="550" height="200">
-	<scroll_list name="places_list" can_resize="true" multi_select="false"
-		background_visible="true" draw_border="true" draw_stripes="true" draw_heading="true"
-		height="150" width="530" bottom_delta="-170" top="10" left="10" follows="left|top|right|bottom">
-		<column name="parcel" label="Parcel" dynamicwidth="true" />
-		<column name="region" label="Region" width="150" />
-		<column name="position" label="Position" width="90" />
-		<column name="visited" label="Visited" width="110" />
+<floater name="teleporthistory" title="Historial de Teleporte" >
+	<scroll_list name="places_list">
+		<column name="parcel" label="Parcela"/>
+		<column name="region" label="Región"/>
+		<column name="position" label="Posición"/>
+		<column name="visited" label="Visitado"/>
 		<!--Hidden fields, used as storage for prebuilt strings, please keep at width 0-->
-		<column name="slurl" label="" width="0" />
-		<column name="simstring" label="" width="0" />
+		<column name="slurl" label=""/>
+		<column name="simstring" label=""/>
 	</scroll_list>
-	<button name="teleport" label="Teleport" tool_tip="Teleport to selected location"
-		enabled="false" mouse_opaque="true" font="SansSerif" halign="center"
-		height="20" width="90" bottom_delta="-24" left="10" follows="left|bottom"
-	/>
-	<button name="show_on_map" label="Show on map" tool_tip="Center map on selected location."
-		enabled="false" mouse_opaque="true" font="SansSerif" halign="center"
-		height="20" width="125" bottom_delta="0" left_delta="100" follows="left|bottom"
-	/>
-	<button name="copy_slurl" label="Copy SLURL to clipboard" tool_tip="Copy selected location as SLURL."
-		enabled="false" mouse_opaque="true" font="SansSerif" halign="center"
-		height="20" width="180" bottom_delta="0" left_delta="135" follows="left|bottom"
-	/>
+	<button name="teleport" label="Teleporte" tool_tip="Teleportar a la ubicación seleccionada"/>
+	<button name="show_on_map" label="Mostrar en el mapa" tool_tip="Centrar mapa en la ubicación seleccionada."/>
+	<button name="copy_slurl" label="Copiar SLURL al portapapeles" tool_tip="Copiar ubicación seleccionada al portapapeles."/>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_test.xml b/indra/newview/skins/default/xui/es/floater_test.xml
index 58e519fa9..8e40bd877 100644
--- a/indra/newview/skins/default/xui/es/floater_test.xml
+++ b/indra/newview/skins/default/xui/es/floater_test.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="40" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="225" left="40" name="Test" title="Test"
-     width="180" />
+<floater name="Test" title="Test"/>
diff --git a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
index 7a15bccaa..100bd97f5 100644
--- a/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
@@ -1,112 +1,45 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-516" can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="true" can_tear_off="true" enabled="true" height="360"
-     left="478" min_height="360" min_width="460" mouse_opaque="true"
-     name="texture picker" title="Pick: Texture" width="460">
+<floater name="texture picker" title="Seleccionar: Textura" >
 	<string name="choose_picture">
-		Click to choose a picture
+		Pulsar para seleccionar una textura
 	</string>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-110" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="center" height="14" left="4"
-	     mouse_opaque="true" name="Multiple" v_pad="0" width="163">
-		Multiple
+	<text name="Multiple">
+		Múltiple
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-204" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="4"
-	     mouse_opaque="true" name="unknown" v_pad="0" width="163">
-		Dimensions: [DIMENSIONS]
+	<text name="unknown">
+		Medidas: [DIMENSIONS]
 	</text>
-	<button bottom="-228" enabled="false" follows="left|bottom" font="SansSerifSmall"
-	     halign="center" height="20" label="Default" label_selected="Default"
-	     left="4" mouse_opaque="true" name="Default" scale_image="true" width="64" />
-	<button bottom="-228" enabled="false" follows="left|bottom" font="SansSerifSmall"
-	     halign="center" height="20" label="Alpha" label_selected="Alpha" left="72"
-	     mouse_opaque="true" name="Alpha" scale_image="true" width="64" />
-	<button bottom="-252" enabled="true" follows="left|bottom" font="SansSerifSmall"
-	     halign="center" height="20" label="Blank" label_selected="Blank" left="4"
-	     mouse_opaque="true" name="Blank" scale_image="true" width="64" />
-	<button bottom="-252" enabled="false" follows="left|bottom" font="SansSerifSmall"
-	     halign="center" height="20" label="Invisible" label_selected="Invisible" left="72"
-	     mouse_opaque="true" name="Invisible" scale_image="true" width="64" />
-	<check_box bottom="-305" enabled="true" follows="left|bottom" font="SansSerifSmall"
-	     height="20" initial_value="true" label="Show Folders" left="4"
-	     mouse_opaque="true" name="show_folders_check" radio_style="false"
-	     width="150" />
-	<check_box bottom="-322" enabled="true" follows="left|bottom" font="SansSerifSmall"
-	     height="20" initial_value="true" label="Apply Immediately" left="4"
-	     mouse_opaque="true" name="apply_immediate_check" radio_style="false"
-	     width="150" />
-	<button bottom="-322" enabled="true" follows="left|bottom" font="SansSerif"
-	     halign="center" height="32" image_selected="eye_button_active.tga"
-	     image_unselected="eye_button_inactive.tga" label="" label_selected=""
-	     left="139" mouse_opaque="true" name="Pipette" scale_image="true" width="32" />
-	<button bottom="-322" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" label="Cancel" label_selected="Cancel"
-	     left="176" mouse_opaque="true" name="Cancel" scale_image="true" width="100" />
-	<button bottom="-322" enabled="true" follows="right|bottom" font="SansSerif"
-	     halign="center" height="20" label="Select" label_selected="Select"
-	     left="280" mouse_opaque="true" name="Select" scale_image="true" width="100" />
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-345"
-	     left="8" follows="bottom|left" font="SansSerif" handle_edit_keys_directly="false"
-	     height="20" max_length="36" mouse_opaque="true" name="texture_uuid"
-	     select_all_on_focus_received="false" width="230" />
-	<button enabled="true" follows="left|bottom" font="SansSerif"
-	     height="20" label="Apply UUID" label_selected="Apply UUID"
-	     left="238" bottom="-345" mouse_opaque="true" 
-	     name="ApplyUUID" scale_image="true" width="100" />
+	<button label="Predeterminda" label_selected="Predeterminada" name="Default"/>
+	<button label="Alfa" label_selected="Alfa" name="Alpha"/>
+	<button label="Blanca" label_selected="Blanca" name="Blank"/>
+	<button label="Invisible" label_selected="Invisible" name="Invisible"/>
+	<check_box label="Mostrar Carpetas" name="show_folders_check"/>
+	<check_box label="Aplicar inmediatamente" name="apply_immediate_check"/>
+	<button label="" label_selected="" name="Pipette"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<button label="Seleccionar" label_selected="Seleccionar" name="Select"/>
+	<button label="Aplciar UUID" label_selected="Aplicar UUID" name="ApplyUUID"/>
 	<string name="pick title">
-		Pick:
+		Seleccionar:
 	</string>
 
-  	<tab_container border="false" bottom_delta="20" width="410" height="300" left="175" mouse_opaque="false" name="actions_tab_container" tab_position="top" follows="left|top|right|bottom">
-    <panel border="false" bottom_delta="0" follows="right|top" height="300" label="Inventory" left="0" mouse_opaque="false" name="server_tab" width="410">
-        <search_editor bottom_delta="-20" enabled="true" follows="left|top|right" height="16"
-	         label="Type here to search" left="0" mouse_opaque="true"
-	         name="inventory search editor" width="271" />
-        <inventory_panel allow_multi_select="false" border="true" bottom="-270" enabled="true"
-	         follows="left|top|right|bottom" height="245" left="0" mouse_opaque="true"
-	         name="inventory panel" sort_order="TexturePickerSortOrder" width="271" />
-    </panel>
-    <panel border="false" bottom_delta="0" follows="left|top" height="300" label="Computer" left="175" mouse_opaque="false" name="local_tab" width="410">
-  <!-- tag: vaa emerald local_asset_browser [begin] -->
-      <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-           bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-           font="SansSerifSmall" h_pad="0" halign="left" height="14" left="4"
-           mouse_opaque="true" name="select_local" v_pad="0" width="400">
-        Select texture on your computer to preview inworld
-      </text>
-      <button bottom_delta="-22" enabled="true" follows="left|top" 
-              font="SansSerifSmall" halign="center" height="20" 
-              label="Add" left="4" mouse_opaque="true" 
-              name="Add" scale_image="true" width="70" visible="true" />
-      <button bottom_delta="0" enabled="true" follows="left|top" 
-              font="SansSerifSmall" halign="center" height="20" 
-              label="Remove" left_delta="73" mouse_opaque="true" 
-              name="Remove" scale_image="true" width="70" visible="true" />
-      <button bottom_delta="0" enabled="true" follows="left|top" 
-              font="SansSerifSmall" halign="center" height="20" 
-              label="Properties..." left_delta="103" mouse_opaque="true" 
-              name="Browser" scale_image="true" width="90" visible="true" />
-      <scroll_list
-              name="local_name_list"
-              left="0"
-              bottom="-270"
-              width="271"
-              height="225"
-              follows="left|top|right|bottom"
-              column_padding="0"
-              can_resize="false"
-              draw_heading="true"
-              multi_select="true"
-              search_column="1"
-              visible="true"
-	  	        >
-	      <column name="unit_name" label="Name" dynamicwidth="true" />
-	      <column name="unit_id_HIDDEN" label="ID" width="0" />
-	    </scroll_list>
-	  <!-- tag: vaa emerald local_asset_browser [end] -->
-    </panel>
-  </tab_container>
+  	<tab_container name="actions_tab_container">
+		<panel label="Inventario" name="server_tab">
+			<search_editor label="Escribe aquí para buscar" name="inventory search editor"/>
+		</panel>
+		<panel label="Computador" name="local_tab">
+			<!-- tag: vaa emerald local_asset_browser [begin] -->
+			<text name="select_local">
+				Selecciona una textura desde tu computador para tener una vista previa en el mundo
+			</text>
+			<button label="Añadir" name="Add"/>
+			<button label="Quitar" name="Remove"/>
+			<button label="Propiedades..." name="Browser"/>
+			<scroll_list name="local_name_list">
+				<column name="unit_name" label="Nombre"/>
+				<column name="unit_id_HIDDEN" label="ID"/>
+			</scroll_list>
+			<!-- tag: vaa emerald local_asset_browser [end] -->
+		</panel>
+	</tab_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_tools.xml b/indra/newview/skins/default/xui/es/floater_tools.xml
index 2375b379f..d6d9b414e 100644
--- a/indra/newview/skins/default/xui/es/floater_tools.xml
+++ b/indra/newview/skins/default/xui/es/floater_tools.xml
@@ -1,1552 +1,752 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-359" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="left|top" height="550" 
-     left="308" min_height="100" min_width="100" mouse_opaque="true"
-     name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
-     short_title="Build" width="272">
+<floater name="toolbox floater" title="" short_title="Construir">
 
 <!-- Main floater tabs -->
 
-	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-	    image_disabled="tool_zoom.tga" image_disabled_selected="tool_zoom_active.tga"
-	    image_selected="tool_zoom_active.tga" image_unselected="tool_zoom.tga"
-	    label="" label_selected="" left="4" mouse_opaque="true" name="button focus"
-	    tool_tip="Focus" width="32" />
-	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-	    image_disabled="UIImgGrabUUID" image_disabled_selected="UIImgGrabSelectedUUID"
-	    image_selected="UIImgGrabSelectedUUID" image_unselected="UIImgGrabUUID"
-	    label="" label_selected="" left="40" mouse_opaque="true" name="button move"
-	    tool_tip="Move" width="32" />
-	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-	    image_disabled="UIImgFaceUUID" image_disabled_selected="UIImgFaceSelectedUUID"
-	    image_selected="UIImgFaceSelectedUUID" image_unselected="UIImgFaceUUID"
-	    label="" label_selected="" left="76" mouse_opaque="true" name="button edit"
-	    tool_tip="Edit" width="32" />
-	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-	    image_disabled="UIImgCreateUUID" image_disabled_selected="UIImgCreateSelectedUUID"
-	    image_selected="UIImgCreateSelectedUUID" image_unselected="UIImgCreateUUID"
-	    label="" label_selected="" left="112" mouse_opaque="true"
-	    name="button create" tool_tip="Create" width="32" />
-	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-	    image_disabled="tool_dozer.tga" image_disabled_selected="tool_dozer_active.tga"
-	    image_selected="tool_dozer_active.tga" image_unselected="tool_dozer.tga"
-	    label="" label_selected="" left="148" mouse_opaque="true"
-	    name="button land" tool_tip="Land" width="32" />
+	<button label="" label_selected="" name="button focus" tool_tip="Visión"/>
+	<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="Crear"/>
+	<button label="" label_selected="" name="button land" tool_tip="Terreno"/>
 
 <!-- Focus panel -->
 
-	<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-	    initial_value="false" label="Zoom" left="4" mouse_opaque="true"
-	    name="radio zoom" radio_style="true" width="114" />
-	<volume_slider bottom="-69" follows="left|top" height="14" increment="0.01"
-	    initial_val="0.125" left="114" max_val="0.5" min_val="0"
-	    mouse_opaque="true" name="slider zoom" width="134" />
-	<check_box bottom="-84" follows="left|top" font="SansSerifSmall" height="16"
-	    initial_value="false" label="Orbit (Ctrl)" left="4" mouse_opaque="true"
-	    name="radio orbit" radio_style="true" width="114" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	    initial_value="false" label="Pan (Ctrl-Shift)" left="4"
-	    mouse_opaque="true" name="radio pan" radio_style="true" width="114" />
+	<check_box label="Zoom" name="radio zoom"/>
+	<check_box label="Órbita (Ctrl)" name="radio orbit"/>
+	<check_box label="Panorámica (Ctrl-Shift)" name="radio pan"/>
 
 <!-- Move panel -->
 
-	<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-	    initial_value="false" label="Move" left="4" mouse_opaque="true"
-	    name="radio move" radio_style="true" width="114" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	    initial_value="false" label="Lift (Ctrl)" left="4" mouse_opaque="true"
-	    name="radio lift" radio_style="true" width="114" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	    initial_value="false" label="Spin (Ctrl-Shift)" left="4"
-	    mouse_opaque="true" name="radio spin" radio_style="true" width="114" />
+	<check_box label="Mover" name="radio move"/>
+	<check_box label="Elevar (Ctrl)" name="radio lift"/>
+	<check_box label="Rotar (Ctrl-Shift)" name="radio spin"/>
 
 <!-- Edit panel -->
-	<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-	    initial_value="false" label="Position" left="4" mouse_opaque="true"
-	    name="radio position" radio_style="true" width="114" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	    initial_value="false" label="Rotate (Ctrl)" left="4" mouse_opaque="true"
-	    name="radio rotate" radio_style="true" width="114" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	    initial_value="false" label="Stretch (Ctrl-Shift)" left="4"
-	    mouse_opaque="true" name="radio stretch" radio_style="true" width="123" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	    initial_value="false" label="Select Texture" left="4" mouse_opaque="true"
-	    name="radio select face" radio_style="true" width="114" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	    initial_value="false" label="Align (Ctrl-A)" left="4" mouse_opaque="true"
-	    name="radio align" radio_style="true" width="114" />
-	<check_box bottom_delta="-15" control_name="EditLinkedParts" follows="left|top"
-	    font="SansSerifSmall" height="16" initial_value="false"
-	    label="Edit linked parts" left="4" mouse_opaque="true"
-	    name="checkbox edit linked parts" width="114" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	    bottom_delta="-17" drop_shadow_visible="true" follows="left|top"
-	    font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"
-	    mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">
-		Ruler:
+	<check_box label="Posición" name="radio position"/>
+	<check_box label="Girar (Ctrl)" name="radio rotate"/>
+	<check_box label="Estirar (Ctrl-Shift)" name="radio stretch"/>
+	<check_box label="Elegir Cara" name="radio select face"/>
+	<check_box label="Alinear (Ctrl-A)" name="radio align"/>
+	<check_box label="Editar partes enlazadas" name="checkbox edit linked parts"/>
+	<text name="text ruler mode">
+		Regla:
 	</text>
-	<combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
-	    left_delta="40" max_chars="20" mouse_opaque="true"
-	    name="combobox grid mode" width="86">
-		<combo_item name="World" value="World">
-			World
+	<combo_box name="combobox grid mode">
+		<combo_item name="World">
+			Mundo
 		</combo_item>
-		<combo_item name="Local" value="Local">
+		<combo_item name="Local">
 			Local
 		</combo_item>
-		<combo_item name="Reference" value="Reference">
-			Reference
+		<combo_item name="Reference">
+			Referencia
 		</combo_item>
 	</combo_box>
-	<check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
-	    font="SansSerifSmall" height="15" initial_value="false"
-	    label="Stretch Both Sides" left="143" mouse_opaque="true"
-	    name="checkbox uniform" width="134" />
-	<check_box bottom_delta="-16" control_name="ScaleStretchTextures" follows="left|top"
-	    font="SansSerifSmall" height="15" initial_value="true"
-	    label="Stretch Textures" left_delta="0" mouse_opaque="true"
-	    name="checkbox stretch textures" width="134" />
-	<check_box bottom_delta="-16" control_name="LimitDragDistance" follows="left|top"
-	    font="SansSerifSmall" height="15" initial_value="true"
-	    label="Limit drag distance" left_delta="0" mouse_opaque="true"
-	    name="checkbox limit drag distance" width="134" />
-	<check_box bottom_delta="-16" control_name="SnapEnabled" follows="left|top"
-	    font="SansSerifSmall" height="15" initial_value="true" label="Use Grid"
-	    left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
-	<button bottom_delta="-17" follows="left|top" font="SansSerifSmall" halign="center" 
-		valign="center" height="20" label="Options..." label_selected="Options..." 
-		left_delta="20" mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
+	<check_box label="Estirar ambos lados" name="checkbox uniform"/>
+	<check_box label="Estirar Texturas" name="checkbox stretch textures"/>
+	<check_box label="Limitar dist. Arrastre" name="checkbox limit drag distance"/>
+	<check_box label="Usar Cuadrícula" name="checkbox snap to grid"/>
+	<button label="Opciones..." label_selected="Opciones..." name="Options..."/>
 
 <!-- Help text -->
 
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	    bottom="-52" drop_shadow_visible="true" follows="left|top"
-	    font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-	    mouse_opaque="true" name="text status" v_pad="0" width="264">
-		Drag to move, shift-drag to copy
+	<text name="text status">
+		Arrastrar para mover, Mayús+Arrastrar para copiar
 	</text>
 
 <!-- Create panel -->
 
-	<button bottom="-75" follows="left|top" font="SansSerif" halign="center" height="24"
-	    image_disabled="object_cube.tga"
-	    image_disabled_selected="object_cube_active.tga"
-	    image_selected="object_cube_active.tga" image_unselected="object_cube.tga"
-	    label="" label_selected="" left="4" mouse_opaque="true" name="ToolCube"
-	    scale_image="TRUE" width="24" tool_tip="Cube"/>
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	    height="24" image_disabled="object_prism.tga" image_disabled_selected="object_prism_active.tga"
-	    image_selected="object_prism_active.tga" image_unselected="object_prism.tga" 
-		label="" label_selected="" left_delta="23" mouse_opaque="true" name="ToolPrism" 
-		scale_image="TRUE" tool_tip="Prism" width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	    height="24" image_disabled="object_pyramid.tga"
-	    image_disabled_selected="object_pyramid_active.tga"
-	    image_selected="object_pyramid_active.tga"
-	    image_unselected="object_pyramid.tga" label="" label_selected=""
-	    left_delta="23" mouse_opaque="true" name="ToolPyramid" scale_image="TRUE"
- tool_tip="Pyramid" width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	    height="24" image_disabled="object_tetrahedron.tga"
-	    image_disabled_selected="object_tetrahedron_active.tga"
-	    image_selected="object_tetrahedron_active.tga"
-	    image_unselected="object_tetrahedron.tga" label="" label_selected=""
-	    left_delta="23" mouse_opaque="true" name="ToolTetrahedron"
-	    scale_image="TRUE" tool_tip="Tetrahedron" width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	    height="24" width="24" image_disabled="object_cylinder.tga"
-	    image_disabled_selected="object_cylinder_active.tga"
-	    image_selected="object_cylinder_active.tga"
-	    image_unselected="object_cylinder.tga" label="" label_selected=""
-	    left_delta="23" mouse_opaque="true" tool_tip="Cylinder" name="ToolCylinder" scale_image="TRUE"/>
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	    height="24" image_disabled="object_hemi_cylinder.tga"
-	    image_disabled_selected="object_hemi_cylinder_active.tga"
-	    image_selected="object_hemi_cylinder_active.tga"
-	    image_unselected="object_hemi_cylinder.tga" label="" label_selected=""
-	    left_delta="23" mouse_opaque="true" name="ToolHemiCylinder"
-	    scale_image="TRUE" tool_tip="Hemicylinder" width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	    height="24" image_disabled="object_cone.tga"
-	    image_disabled_selected="object_cone_active.tga"
-	    image_selected="object_cone_active.tga" image_unselected="object_cone.tga"
-	    label="" label_selected="" left_delta="23" mouse_opaque="true"
-	    name="ToolCone" scale_image="TRUE" tool_tip="Cone" width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	    height="24" image_disabled="object_hemi_cone.tga"
-	    image_disabled_selected="object_hemi_cone_active.tga"
-	    image_selected="object_hemi_cone_active.tga"
-	    image_unselected="object_hemi_cone.tga" label="" label_selected=""
-	    left_delta="23" mouse_opaque="true" name="ToolHemiCone" scale_image="TRUE"
-		tool_tip="Hemicone" width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	    height="24" image_disabled="object_sphere.tga"
-	    image_disabled_selected="object_sphere_active.tga"
-	    image_selected="object_sphere_active.tga"
-	    image_unselected="object_sphere.tga" label="" label_selected=""
-	    left_delta="23" mouse_opaque="true" name="ToolSphere" scale_image="TRUE"
-	    width="24" tool_tip="Sphere" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	    height="24" image_disabled="object_hemi_sphere.tga"
-	    image_disabled_selected="object_hemi_sphere_active.tga"
-	    image_selected="object_hemi_sphere_active.tga"
-	    image_unselected="object_hemi_sphere.tga" label="" label_selected=""
-	    left_delta="23" mouse_opaque="true" name="ToolHemiSphere"
-	    scale_image="TRUE" tool_tip="Hemisphere" width="24" />
-	<button bottom_delta="-23" follows="left|top" font="SansSerif" halign="center"
-	     height="24" image_disabled="object_torus.tga"
-	     image_disabled_selected="object_torus_active.tga"
-	     image_selected="object_torus_active.tga"
-	     image_unselected="object_torus.tga" label="" label_selected="" left="4"
-	     mouse_opaque="true" name="ToolTorus" scale_image="TRUE" tool_tip="Torus" width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="24" image_disabled="object_tube.tga"
-	     image_disabled_selected="object_tube_active.tga"
-	     image_selected="object_tube_active.tga" image_unselected="object_tube.tga"
-	     label="" label_selected="" left_delta="23" mouse_opaque="true"
-	     name="ToolTube" scale_image="TRUE" tool_tip="Tube" width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="24" image_disabled="object_ring.tga"
-	     image_disabled_selected="object_ring_active.tga"
-	     image_selected="object_ring_active.tga" image_unselected="object_ring.tga"
-	     label="" label_selected="" left_delta="23" mouse_opaque="true"
-	     name="ToolRing" scale_image="TRUE" tool_tip="Ring" width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="24" image_disabled="object_tree.tga"
-	     image_disabled_selected="object_tree_active.tga"
-	     image_selected="object_tree_active.tga" image_unselected="object_tree.tga"
-	     label="" label_selected="" left_delta="23" mouse_opaque="true"
-	     name="ToolTree" scale_image="TRUE" tool_tip="Tree" width="24" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="24" image_disabled="object_grass.tga"
-	     image_disabled_selected="object_grass_active.tga"
-	     image_selected="object_grass_active.tga"
-	     image_unselected="object_grass.tga" label="" label_selected=""
-	     left_delta="23" mouse_opaque="true" name="ToolGrass" scale_image="TRUE"
-	     tool_tip="Grass" width="24" />
-	<check_box bottom="-117" control_name="CreateToolKeepSelected" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Keep selected" left="4" mouse_opaque="true"
-	     name="checkbox sticky" width="128" />
-	<check_box bottom_delta="-15" control_name="CreateToolCopySelection" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Copy selected" left_delta="0" mouse_opaque="true"
-	     name="checkbox copy selection" width="134" />
-	<check_box bottom_delta="-16" control_name="CreateToolCopyCenters" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="true" label="Center"
-	     left_delta="18" mouse_opaque="true" name="checkbox copy centers"
-	     width="134" />
-	<check_box bottom_delta="-16" control_name="CreateToolCopyRotates" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false" label="Rotate"
-	     left_delta="0" mouse_opaque="true" name="checkbox copy rotates" width="134" />
+	<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="Semicilindro"/>
+	<button label="" label_selected="" name="ToolCone" tool_tip="Cono"/>
+	<button label="" label_selected="" name="ToolHemiCone" tool_tip="Semicono"/>
+	<button label="" label_selected="" name="ToolSphere" tool_tip="Esfera"/>
+	<button label="" label_selected="" name="ToolHemiSphere" tool_tip="Semiesfera"/>
+	<button label="" label_selected="" name="ToolTorus" tool_tip="Toroide"/>
+	<button label="" label_selected="" name="ToolTube" tool_tip="Tubo"/>
+	<button label="" label_selected="" name="ToolRing" tool_tip="Anillo"/>
+	<button label="" label_selected="" name="ToolTree" tool_tip="�rbol"/>
+	<button label="" label_selected="" name="ToolGrass" tool_tip="Hierba"/>
+	<check_box label="Mantener Seleccionado" name="checkbox sticky"/>
+	<check_box label="Copiar Seleccionado" name="checkbox copy selection"/>
+	<check_box label="Centrado" name="checkbox copy centers"/>
+	<check_box label="Rotado" name="checkbox copy rotates"/>
 
 <!-- Land panel -->
 
-	<check_box bottom="-69" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Select Land" left="4" mouse_opaque="true"
-	     name="radio select land" radio_style="true" width="114" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Flatten" left="4" mouse_opaque="true"
-	     name="radio flatten" radio_style="true" width="114" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Raise" left="4" mouse_opaque="true"
-	     name="radio raise" radio_style="true" width="114" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Lower" left="4" mouse_opaque="true"
-	     name="radio lower" radio_style="true" width="114" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Smooth" left="4" mouse_opaque="true"
-	     name="radio smooth" radio_style="true" width="114" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Roughen" left="4" mouse_opaque="true"
-	     name="radio noise" radio_style="true" width="114" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Revert" left="4" mouse_opaque="true"
-	     name="radio revert" radio_style="true" width="114" />
-	<button bottom="-72" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="20" label="Apply" label_selected="Apply"
-	     left="116" mouse_opaque="true" name="button apply to selection"
-	     scale_image="TRUE" tool_tip="Modify Selected Land" width="78" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
-	     border_visible="false" bottom_delta="-16" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="118"
-	     hidden="false" mouse_opaque="true" name="Bulldozer:" v_pad="0" width="100">
-	          Bulldozer:
+	<check_box label="Seleccionar Terreno" name="radio select land"/>
+	<check_box label="Nivelar" name="radio flatten"/>
+	<check_box label="Elevar" name="radio raise"/>
+	<check_box label="Bajar" name="radio lower"/>
+	<check_box label="Suavizar" name="radio smooth"/>
+	<check_box label="Escarpar" name="radio noise"/>
+	<check_box label="Restablecer" name="radio revert"/>
+	<button label="Aplicar" label_selected="Aplicar" name="button apply to selection" tool_tip="Modificar el terreno seleccionado"/>
+	<text name="Bulldozer:">
+		Excavadora:
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
-	     border_visible="false" bottom_delta="-18" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="132"
-	     hidden="false" mouse_opaque="true" name="Dozer Size:" v_pad="0" width="100">
-	          Size
+	<text name="Dozer Size:">
+		Tamaño
 	</text>
-	<volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
-         increment="0.1" initial_val="2.0" left="178" max_val="11.0" min_val="1.0"
-	     mouse_opaque="true" name="slider brush size" width="80" />	
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false"
-	     border_visible="false" bottom_delta="-18" drop_shadow_visible="true" enabled="true"
-	     follows="left|top" font="SansSerifSmall" h_pad="0" halign="left" height="12" left="132"
-	      hidden="false" mouse_opaque="true" name="Strength:" v_pad="0" width="100">
-	          Strength
+	<text name="Strength:">
+		Fuerza
 	</text>
-	<volume_slider bottom_delta="-4" follows="left|top" height="16" hidden="false"
-	     increment="0.1" initial_val="0.00" left="178" max_val="2.0" min_val="-1.0"
-	     mouse_opaque="true" name="slider force" width="80" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-         bottom="-151" left="118" drop_shadow_visible="true" follows="left|top"
-         font="SansSerifSmall" h_pad="0" halign="right" height="16" visible="false" 
-         mouse_opaque="true" name="link_num_obj_count" v_pad="0" width="143">
+	<text name="link_num_obj_count">
 		[DESC] [NUM]
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-       bottom="-163" left="118" drop_shadow_visible="true" follows="left|top"
-       font="SansSerifSmall" h_pad="0" halign="right" height="16"
-       mouse_opaque="true" name="prim_count" v_pad="0" width="143"/>
 
 <!-- Sub-tabs -->
 
-	<tab_container bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="false"
-	     name="Object Info Tabs" tab_max_width="52" tab_min_width="40"
-	     tab_position="top" width="272">
-		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-		     label="General" left="1" mouse_opaque="false" name="General" width="270">
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="Name:" v_pad="0" width="78">
-				Name:
+	<tab_container name="Object Info Tabs" >
+		<panel label="General" name="General">
+			<text name="Name:">
+				Nombre:
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-26"
-			     follows="left|top|right" font="SansSerifSmall" height="16" left="88"
-			     max_length="63" mouse_opaque="true" name="Object Name"
-			     select_all_on_focus_received="true" width="172" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-40" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="Description:" v_pad="0" width="78">
-				Description:
+			<text name="Description:">
+				Descripción:
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-46"
-			     follows="left|top|right" font="SansSerifSmall" height="16" left="88"
-			     max_length="127" mouse_opaque="true" name="Object Description"
-			     select_all_on_focus_received="true" width="172" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-66" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-			     mouse_opaque="true" name="Creator:" v_pad="0" width="78">
-				Creator:
+			<text name="Creator:">
+				Creador:
 			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-66" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
-			     mouse_opaque="true" name="Creator Name" v_pad="0" width="88">
+			<text name="Creator Name">
 		        Thrax Linden
       		</text>
-      		<button bottom="-66" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="16" label="Profile..." label_selected="Profile..." left_delta="94"
-			     mouse_opaque="true" name="button creator profile" scale_image="TRUE"
-			     width="78" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-86" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-			     mouse_opaque="true" name="Owner:" v_pad="0" width="78">
-				Owner:
+      		<button label="Perfil..." label_selected="Perfil..." name="button creator profile"/>
+			<text name="Owner:">
+				Propietario:
 			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-86" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
-			     mouse_opaque="true" name="Owner Name" v_pad="0" width="88">
+			<text name="Owner Name">
 		        Thrax Linden
 		    </text>
-		    <button bottom="-86" follows="top|right" font="SansSerifSmall" halign="center"
-			    height="16" label="Profile..." label_selected="Profile..." left_delta="94"
-			    mouse_opaque="true" name="button owner profile" scale_image="TRUE"
-			    width="78" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-				font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-				mouse_opaque="true" name="Last Owner:" v_pad="0" width="78">
-				Last Owner:
+		    <button label="Perfil..." label_selected="Perfil..." name="button owner profile"/>
+			<text name="Last Owner:">
+				Último Propietario:
 			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-				font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
-				mouse_opaque="true" name="Last Owner Name" v_pad="0" width="88">
+			<text name="Last Owner Name">
 				Thrax Linden
 			</text>
-			<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
-				height="16" label="Profile..." label_selected="Profile..." left_delta="94"
-				mouse_opaque="true" name="button last owner profile" scale_image="TRUE"
-				width="78" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-				bottom="-126" drop_shadow_visible="true" follows="left|top"
-				font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-				mouse_opaque="true" name="Group:" v_pad="0" width="78">
-				Group:
+			<button label="Perfil..." label_selected="Perfil..." name="button last owner profile"/>
+			<text name="Group:">
+				Grupo:
 			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			    bottom="-126" drop_shadow_visible="true" follows="left|top"
-			    font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
-			    mouse_opaque="true" name="Group Name Proxy" v_pad="0" visible="false"
-			    width="88">
+			<text name="Group Name Proxy">
 				The Lindens
 			</text>
-			<button bottom="-126" follows="top|right" font="SansSerifSmall" halign="center"
-			    height="16" label="Set" label_selected="Set..." left_delta="94"
-			    mouse_opaque="true" name="button set group" scale_image="TRUE" width="30" />
-			<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
-			    height="16" label="View" label_selected="Open" left_delta="30"
-			    mouse_opaque="true" name="button open group" scale_image="TRUE" width="48" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			    bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-			    font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-			    mouse_opaque="true" name="Permissions:" v_pad="0" width="85">
-				Permissions:
+			<button label="Definir" label_selected="Definir..." name="button set group"/>
+			<button label="Ver" label_selected="Abrir" name="button open group"/>
+			<text name="Permissions:">
+				Permisos:
 			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			    bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			    font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-			    mouse_opaque="true" name="perm_modify" v_pad="0" width="250">
-				You can modify this object.
+			<text name="perm_modify">
+				Puedes modificar este objeto.
 			</text>
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			    initial_value="false" label="Share with group" left="10"
-			    mouse_opaque="true" name="checkbox share with group"
-			    tool_tip="Allow all members of the set group to share and use your permissions for this object. You must Deed to enable role restrictions."
-			    width="166" />
+			<check_box label="Compartir con el grupo" name="checkbox share with group" tool_tip="Permitir que todos los miembros del grupo compartan y utilicen sus permisos sobre este objeto. Debes transferirlo para activar las restricciones según los roles."/>
 			<string name="text deed continued">
-				Deed...
+				Transferir...
 			</string>
 			<string name="text deed">
 				Deed
 			</string>
-			<button bottom="-186" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" label="Deed..." label_selected="Deed..." left_delta="172"
-			     mouse_opaque="true" name="button deed" scale_image="TRUE"
-			     tool_tip="Group shared objects can be deeded by a group officer."
-			     width="78" />
-			<check_box bottom="-206" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Allow anyone to move" left="10"
-			     mouse_opaque="true" name="checkbox allow everyone move" width="142" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Allow anyone to copy" left="10"
-			     mouse_opaque="true" name="checkbox allow everyone copy" width="141" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Show in search" left="10" name="search_check"
-			     tool_tip="Let people see this object in search results" width="78" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="For Sale" left="10" mouse_opaque="true"
-			     name="checkbox for sale" width="78" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="90"
-			     mouse_opaque="true" name="Cost" v_pad="0" width="78">
-				Price:  [CURRENCY]
+			<button label="Transferir..." label_selected="Transferir..." name="button deed" tool_tip="Los objetos compartidos por el grupo pueden ser transferidos por un oficial del grupo."/>
+			<check_box label="Permitir que cualquiera lo mueva" name="checkbox allow everyone move"/>
+			<check_box label="Permitir a cualquiera copiarlo" name="checkbox allow everyone copy"/>
+			<check_box label="Mostrar en la Búsqueda" name="search_check" tool_tip="Permitir que este objeto aparezca en los resultados de la búsqueda"/>
+			<check_box label="En Venta" name="checkbox for sale"/>
+			<text name="Cost">
+				Precio:  [CURRENCY]
 			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-			     follows="left|top|right" font="SansSerifSmall" height="16" left_delta="80"
-			     max_length="25" mouse_opaque="true" name="Edit Cost" width="75" />
-			<radio_group bottom="-286" draw_border="false" follows="left|top|right" height="16"
-			     left="42" mouse_opaque="true" name="sale type" width="218">
-				<radio_item bottom="-16" follows="left|top" height="16" left="0" mouse_opaque="true"
-				     name="Original" width="70">
+			<radio_group name="sale type">
+				<radio_item name="Original">
 					Original
 				</radio_item>
-				<radio_item bottom="-16" follows="left|top" height="16" left="70" mouse_opaque="true"
-				     name="Copy" width="70">
-					Copy
+				<radio_item name="Copy">
+					Copia
 				</radio_item>
-				<radio_item bottom="-16" follows="left|top" height="16" left="140" mouse_opaque="true"
-				     name="Contents" width="76">
-					Contents
+				<radio_item name="Contents">
+					Contenido
 				</radio_item>
 			</radio_group>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-298" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="Next owner can:" v_pad="0" width="250">
-				Next owner can:
+			<text name="Next owner can:">
+				El próximo propietario puede:
 			</text>
-			<check_box bottom_delta="-22" follows="left|top|right" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Modify" left="10" mouse_opaque="true"
-			     name="checkbox next owner can modify" width="250" />
-			<check_box bottom_delta="0" follows="left|top|right" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Copy" left_delta="60" mouse_opaque="true"
-			     name="checkbox next owner can copy" width="190" />
-			<check_box bottom_delta="0" follows="left|top|right" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Resell/Give away" left_delta="60"
-			     mouse_opaque="true" name="checkbox next owner can transfer" width="130" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-332" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="label click action" v_pad="0" width="150">
-				When Left-Clicked:
+			<check_box label="Modificarlo" name="checkbox next owner can modify"/>
+			<check_box label="Copiarlo" name="checkbox next owner can copy"/>
+			<check_box label="Revenderlo/Darlo" name="checkbox next owner can transfer"/>
+			<text name="label click action">
+				Al pulsarlo con botón izquierdo:
 			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-25" follows="left|top" height="18"
-			     left="10" max_chars="20" mouse_opaque="true" name="clickaction" width="150">
+			<combo_box name="clickaction">
 			     <!-- Do not reorder these items, the index numbers are
 					used internally. JC -->
-			<combo_item name="Touch/grab(default)" value="Touch/grab (default)">
-					Touch/grab (default)
+			<combo_item name="Touch/grab(default)">
+					Tocar/Agarrar (Por Defecto)
 				</combo_item>
-				<combo_item name="Sitonobject" value="Sit on object">
-					Sit on object
+				<combo_item name="Sitonobject">
+					Sentarse en el objeto
 				</combo_item>
-				<combo_item name="Buyobject" value="Buy object">
-					Buy object
+				<combo_item name="Buyobject">
+					Comprar el objeto
 				</combo_item>
-				<combo_item name="Payobject" value="Pay object">
-					Pay object
+				<combo_item name="Payobject">
+					Pagar al objeto
 				</combo_item>
-				<combo_item name="Open" value="Open">
-					Open
+				<combo_item name="Open">
+					Abrirlo
 				</combo_item>
-				<combo_item name="Play" value="Play">
-					Play parcel media
+				<combo_item name="Play">
+					Ejecutar el media de la parcela
 				</combo_item>
-				<combo_item name="Opemmedia" value="Open Media">
-					Open parcel media
+				<combo_item name="Opemmedia">
+					Abrir el media de la parcela
 				</combo_item>
 			</combo_box>
-			<button bottom="-358" follows="top|right" font="SansSerifSmall" halign="center"
-				height="20" label="Copy Key" label_selected="Copy Key" left_delta="172"
-				mouse_opaque="true" name="button cpy_key" scale_image="TRUE"
-				tool_tip="Copies the object key to the clipboard."
-				width="78" />
-      		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-135" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
-			     mouse_opaque="true" name="B:" v_pad="0" width="174">
+			<button label="Copiar UUID" label_selected="Copiar Key" name="button cpy_key" tool_tip="Copia el UUID del objeto al portapapeles."/>
+      		<text name="B:">
 				B:
 			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-115" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
-			     mouse_opaque="true" name="O:" v_pad="0" width="124">
+			<text name="O:">
 				O;
 			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-115" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
-			     mouse_opaque="true" name="G:" v_pad="0" width="74">
+			<text name="G:">
 				G:
 			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-127" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
-			     mouse_opaque="true" name="E:" v_pad="0" width="174">
+			<text name="E:">
 				E:
 			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-127" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
-			     mouse_opaque="true" name="N:" v_pad="0" width="124">
+			<text name="N:">
 				N:
 			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-127" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
-			     mouse_opaque="true" name="F:" v_pad="0" width="74">
+			<text name="F:">
 				F:
 			</text>
 			<string name="text modify info 1">
-				You can modify this object.
+				Puedes modificar este objeto.
 			</string>
 			<string name="text modify info 2">
-				You can modify these objects.
+				Puedes modificar estos objetos.
 			</string>
 			<string name="text modify info 3">
-				You cannot modify this object.
+				No puedes modificar este objeto
 			</string>
 			<string name="text modify info 4">
-				You cannot modify these objects.
+				No puedes modificar estos objetos.
 			</string>
 			<string name="text modify warning">
-				Must select entire object to set permissions.
+				Debes seleccionar todo el objeto para definir los permisos.
 			</string>
 			<string name="Cost Default">
-			Price:           [CURRENCY]
+				Precio:           [CURRENCY]
 			</string>
 			<string name="Cost Total">
-			Total Price:  [CURRENCY]
+				Precio Total:  [CURRENCY]
 			</string>
 			<string name="Cost Per Unit">
-			Price Per:     [CURRENCY]
+				Precio Por:     [CURRENCY]
 			</string>
 			<string name="Cost Mixed">
-			Mixed Price
+				Precio Variable
 			</string>
 			<string name="Sale Mixed">
-			Mixed Sale
+				Venta Variable
 			</string>
 		</panel>
 
 <!-- Object sub-tab -->
 
-		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-		     label="Object" left="1" mouse_opaque="false" name="Object" width="270">
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="select_single" v_pad="0" width="252">
+		<panel label="Objeto" name="Object">
+			<button label="Enlazar" name="link_obj"  tool_tip="Él llega a la ciudad..."/>
+			<button label="Desenlazar" name="unlink_obj" tool_tip="Deselnzar el conjunto enlazado"/>
+			<check_box label="Bloqueado" name="checkbox locked" tool_tip="Previene que el objeto sea movido o borrado. Suele ser útil mientras se construye, para prevenir que se modifique sin querer."/>
+			<check_box label="Material" name="Physical Checkbox Ctrl" tool_tip="Permite que el objeto pueda ser empujado y le afecte la gravedad."/>
+			<check_box label="Temporal" name="Temporary Checkbox Ctrl" tool_tip="Hace que el objeto se borre 1 minuto después de su creación."/>
+			<check_box label="Inmaterial" name="Phantom Checkbox Ctrl" tool_tip="Hace que el objeto no colisione con otros objetos o avatares."/>
+			<text name="label position">
+				Posición (metros)
 			</text>
-			<button bottom="-26" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="18" label="Link" left="10" mouse_opaque="true" name="link_obj"  enabled="true"
-			     tool_tip="He come to town..."  width="50" />
-			<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="18" label="Unlink" left_delta="50" mouse_opaque="true" name="unlink_obj"  enabled="true"
-			     tool_tip="Unlinks linkset."  width="50" />
-			<check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Locked" left="5" mouse_opaque="true"
-			     name="checkbox locked"
-			     tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."
-			     width="123" />
-			<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Physical" left_delta="0" mouse_opaque="true"
-			     name="Physical Checkbox Ctrl"
-			     tool_tip="Allows object to be pushed and affected by gravity" width="123" />
-			<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Temporary" left_delta="0" mouse_opaque="true"
-			     name="Temporary Checkbox Ctrl"
-			     tool_tip="Causes object to be deleted 1 minute after creation." width="123" />
-			<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Phantom" left_delta="0" mouse_opaque="true"
-			     name="Phantom Checkbox Ctrl"
-			     tool_tip="Causes object to not collide with other objects or avatars"
-			     width="123" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="2"
-			     mouse_opaque="true" name="label position" v_pad="0" width="121">
-				Position (meters)
+			<spinner label="X" name="Pos X"/>
+			<spinner label="Y" name="Pos Y"/>
+			<spinner label="Z" name="Pos Z"/>
+			<button label="C" name="copypos" tool_tip="Copiar Posición"/>
+			<button label="P" name="pastepos" tool_tip="Pegar Posición"/>
+			<button label="p" name="pasteposclip" tool_tip="Pegar posición desde el portapapeles"/>
+			
+			<text name="label size">
+				Tamaño (metros)
 			</text>
-			<spinner bottom_delta="-22" decimal_digits="4" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="X" label_width="10" left_delta="0"
-			     max_val="512" min_val="-256" mouse_opaque="true" name="Pos X"
-			     text_enabled_color="110, 15, 15, 255" width="87" />
-			<spinner bottom_delta="-18" decimal_digits="4" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="Y" label_width="10" left_delta="0"
-			     max_val="512" min_val="-256" mouse_opaque="true" name="Pos Y"
-			     text_enabled_color="0, 100, 40, 255" width="87" />
-			<spinner bottom_delta="-18" decimal_digits="4" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="Z" label_width="10" left_delta="0"
-			     max_val="4096" min_val="-3.5" mouse_opaque="true" name="Pos Z"
-			     text_enabled_color="0, 67, 132, 255" width="87" />
-			<button bottom_delta="35" follows="top|right" font="SansSerifSmall" halign="center"
-				 height="18" label="C" left_delta="90" mouse_opaque="true" name="copypos" enabled="true"
-				 tool_tip="Copy Position"  width="20" />
-			<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="18" label="P" left_delta="0" mouse_opaque="true" name="pastepos"  enabled="true"
-			     tool_tip="Paste Position"  width="20" />
-			<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="18" label="p" left_delta="0" mouse_opaque="true" name="pasteposclip"  enabled="true"
-			     tool_tip="Paste Position from Clipboard"  width="20" />
-							 
+			<spinner label="X" name="Scale X"/>
+			<spinner label="Y" name="Scale Y"/>
+			<spinner label="Z" name="Scale Z"/>
+			<button label="C" name="copysize" tool_tip="Copiar Tamaño"/>
+			<button label="P" name="pastesize" tool_tip="Pegar Tamaño"/>
+			<button label="p" name="pastesizeclip" tool_tip="Pegar tamaño desde el portapapeles"/>
 				 
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="7"
-			     mouse_opaque="true" name="label size" v_pad="0" width="121">
-				Size
+			<text name="label rotation">
+				Rotación (grados)
 			</text>
-			<spinner bottom_delta="-22" decimal_digits="5" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="X" label_width="10" left_delta="0"
-			     max_val="256" min_val="0.01" mouse_opaque="true" name="Scale X"
-			     text_enabled_color="1, 1, 1, 1" width="87" />
-			<spinner bottom_delta="-18" decimal_digits="5" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="Y" label_width="10" left_delta="0"
-			     max_val="256" min_val="0.01" mouse_opaque="true" name="Scale Y"
-			     text_enabled_color="1, 1, 1, 1" width="87" />
-			<spinner bottom_delta="-18" decimal_digits="5" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="Z" label_width="10" left_delta="0"
-			     max_val="256" min_val="0.01" mouse_opaque="true" name="Scale Z"
-			     text_enabled_color="1, 1, 1, 1" width="87" />
-			<button bottom_delta="35" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="18" label="C" left_delta="90" mouse_opaque="true" name="copysize"  enabled="true"
-			     tool_tip="Copy Size"  width="20" />
-			<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="18" label="P" left_delta="0" mouse_opaque="true" name="pastesize"  enabled="true"
-			     tool_tip="Paste Size"  width="20" />
-			<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="18" label="p" left_delta="0" mouse_opaque="true" name="pastesizeclip"  enabled="true"
-			     tool_tip="Paste Size from Clipboard"  width="20" />
+			<spinner label="X" name="Rot X"/>
+			<spinner label="Y" name="Rot Y"/>
+			<spinner label="Z" name="Rot Z"/>
+			<button label="C" name="copyrot" tool_tip="Copiar Rotación"/>
+			<button label="P" name="pasterot" tool_tip="Pegar Rotación"/>
+			<button label="p" name="pasterotclip" tool_tip="Pegar rotación desde el portapapeles"/>
 				 
-				 
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="7"
-			     mouse_opaque="true" name="label rotation" v_pad="0" width="121">
-				Rotation (degrees)
-			</text>
-			<spinner bottom_delta="-22" decimal_digits="2" follows="left|top" height="16"
-			     increment="1" initial_val="0" label="X" label_width="10" left_delta="0"
-			     max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot X"
-			     text_enabled_color="1, 1, 1, 1" width="87" />
-			<spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
-			     increment="1" initial_val="0" label="Y" label_width="10" left_delta="0"
-			     max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Y"
-			     text_enabled_color="1, 1, 1, 1" width="87" />
-			<spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
-			     increment="1" initial_val="0" label="Z" label_width="10" left_delta="0"
-			     max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Z"
-			     text_enabled_color="1, 1, 1, 1" width="87" />
-			<button bottom_delta="35" follows="top|right" font="SansSerifSmall" halign="center"
-				 height="18" label="C" left_delta="90" mouse_opaque="true" name="copyrot"  enabled="true"
-				 tool_tip="Copy Rotation"  width="20" />
-			<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="18" label="P" left_delta="0" mouse_opaque="true" name="pasterot"  enabled="true"
-			     tool_tip="Paste Rotation"  width="20" />
-			<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="18" label="p" left_delta="0" mouse_opaque="true" name="pasterotclip"  enabled="true"
-			     tool_tip="Paste Rotation from Clipboard"  width="20" />
-							 
-							 
-				 
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="label material" v_pad="0" width="121">
+			<text name="label material">
 				Material
 			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-			     left="10" max_chars="20" mouse_opaque="true" name="material" width="87">
-				<combo_item name="Stone" value="Stone">
-					Stone
+			<combo_box name="material">
+				<combo_item name="Stone">
+					Piedra
 				</combo_item>
-				<combo_item name="Metal" value="Metal">
+				<combo_item name="Metal">
 					Metal
 				</combo_item>
-				<combo_item name="Glass" value="Glass">
-					Glass
+				<combo_item name="Glass">
+					Vidrio
 				</combo_item>
-				<combo_item name="Wood" value="Wood">
-					Wood
+				<combo_item name="Wood">
+					Madera
 				</combo_item>
-				<combo_item name="Flesh" value="Flesh">
-					Flesh
+				<combo_item name="Flesh">
+					Carne
 				</combo_item>
-				<combo_item name="Plastic" value="Plastic">
-					Plastic
+				<combo_item name="Plastic">
+					Plástico
 				</combo_item>
-				<combo_item name="Rubber" value="Rubber">
-					Rubber
+				<combo_item name="Rubber">
+					Goma
 				</combo_item>
 			</combo_box>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			    bottom="-20" drop_shadow_visible="true" follows="left|top"
-			    font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			    mouse_opaque="true" name="edit_object" v_pad="0" width="252">
-				Params:
+			<text name="edit_object">
+				Parámetros:
 			</text>
-			<button bottom="-24" follows="top|right" font="SansSerifSmall" halign="center"
-			    height="16" label="Copy" left="178" mouse_opaque="true" name="copyparams"  enabled="true"
-			    tool_tip="Copy Parameters from Clipboard"  width="42" />
-			<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="16" label="Paste" left_delta="42" mouse_opaque="true" name="pasteparams"  enabled="true"
-     			 tool_tip="Paste Parameters from Clipboard"  width="42" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-36" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="label basetype" v_pad="0" width="141">
-				Building Block Type
+			<button label="Copiar" name="copyparams" tool_tip="Copiar Parámetros desde el Portapapeles"/>
+			<button label="Pegar" name="pasteparams" tool_tip="Pegar Parámetros desde el Portapapeles"/>
+			<text name="label basetype">
+				Tipo de Objeto a Construir
 			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
-			     left="121" max_chars="20" mouse_opaque="true" name="comboBaseType"
-			     width="141">
-				<combo_item name="Box" value="Box">
-					Box
+			<combo_box name="comboBaseType">
+				<combo_item name="Box">
+					Caja
 				</combo_item>
-				<combo_item name="Cylinder" value="Cylinder">
-					Cylinder
+				<combo_item name="Cylinder">
+					Cilindro
 				</combo_item>
-				<combo_item name="Prism" value="Prism">
-					Prism
+				<combo_item name="Prism">
+					Prisma
 				</combo_item>
-				<combo_item name="Sphere" value="Sphere">
-					Sphere
+				<combo_item name="Sphere">
+					Esfera
 				</combo_item>
-				<combo_item name="Torus" value="Torus">
-					Torus
+				<combo_item name="Torus">
+					Toroide
 				</combo_item>
-				<combo_item name="Tube" value="Tube">
-					Tube
+				<combo_item name="Tube">
+					Tubo
 				</combo_item>
-				<combo_item name="Ring" value="Ring">
-					Ring
+				<combo_item name="Ring">
+					Anillo
 				</combo_item>
-				<combo_item name="Sculpted" value="Sculpted">
+				<combo_item name="Sculpted">
 					Sculpted
 				</combo_item>
-
-				<combo_item name="Hemicylinder" value="Hemicylinder">
-					Hemicylinder
+				<combo_item name="Hemicylinder">
+					Hemicilindro
 				</combo_item>
-
-				<combo_item name="Spiral Circle" value="Spiral Circle">
-					Spiral Circle
+				<combo_item name="Spiral Circle">
+					Espiral Circular
 				</combo_item>
-				<combo_item name="Spiral Square" value="Spiral Square">
-					Spiral Square
+				<combo_item name="Spiral Square">
+					Espiral Cuadrado
 				</combo_item>
-				<combo_item name="Spiral Triangle" value="Spiral Triangle">
-					Spiral Triangle
+				<combo_item name="Spiral Triangle">
+					Espiral Triangular
 				</combo_item>
-				<combo_item name="Spiral Semicircle" value="Spiral Semicircle">
-					Spiral Semicircle
+				<combo_item name="Spiral Semicircle">
+					Espiral Semicircular
 				</combo_item>
-
-				<combo_item name="Test Cylinder" value="Test Cylinder">
-					Test Cylinder
+				<combo_item name="Test Cylinder">
+					Cilindro de Prueba
 				</combo_item>
-				<combo_item name="Test Box" value="Test Box">
-					Test Box
+				<combo_item name="Test Box">
+					Caja de Prueba
 				</combo_item>
-				<combo_item name="Test Prism" value="Test Prism">
-					Test Prism
+				<combo_item name="Test Prism">
+					Prisma de Prueba
 				</combo_item>
-				<combo_item name="Test Hemicylinder" value="Test Hemicylinder">
-					Test Hemicylinder
-				</combo_item>
-
-			</combo_box>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="text cut" v_pad="0" width="141">
-				Path Cut Begin and End
-			</text>
-			<spinner bottom_delta="-22" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.025" initial_val="0" label="B" label_width="10" left="121"
-			     max_val="0.98" min_val="0" mouse_opaque="true" name="cut begin" width="68" />
-			<spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.025" initial_val="1" label="E" label_width="10" left_delta="73"
-			     max_val="1" min_val="0.02" mouse_opaque="true" name="cut end" width="68" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="text hollow" v_pad="0" width="68">
-				Hollow
-			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="78"
-			     mouse_opaque="true" name="text skew" v_pad="0" width="63">
-				Skew
-			</text>
-			<spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16"
-			     increment="5" initial_val="0" left="121" max_val="95" min_val="0"
-			     mouse_opaque="true" name="Scale 1" width="68" />
-			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" left_delta="73" max_val="0.95"
-			     min_val="-0.95" mouse_opaque="true" name="Skew" width="68" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141">
-				Hollow Shape
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
-			     left="121" max_chars="20" mouse_opaque="true" name="hole" width="141">
-				<combo_item name="Default" value="Default">
-					Default
-				</combo_item>
-				<combo_item name="Circle" value="Circle">
-					Circle
-				</combo_item>
-				<combo_item name="Square" value="Square">
-					Square
-				</combo_item>
-				<combo_item name="Triangle" value="Triangle">
-					Triangle
+				<combo_item name="Test Hemicylinder">
+					Hemicilindro de Prueba
 				</combo_item>
 			</combo_box>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="text twist" v_pad="0" width="141">
-				Twist Begin and End
+			<text name="text cut">
+				Corte: Inicio y Fin
 			</text>
-			<spinner bottom_delta="-22" decimal_digits="0" follows="left|top" height="16"
-			     increment="9" initial_val="0" label="B" label_width="10" left="121"
-			     max_val="180" min_val="-180" mouse_opaque="true" name="Twist Begin"
-			     width="68" />
-			<spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16"
-			     increment="9" initial_val="0" label="E" label_width="10" left_delta="73"
-			     max_val="180" min_val="-180" mouse_opaque="true" name="Twist End"
-			     width="68" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="scale_taper" v_pad="0" width="141">
-				Taper
+			<spinner label="I" name="cut begin"/>
+			<spinner label="F" name="cut end"/>
+			<text name="text hollow">
+				Hueco
 			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="scale_hole" v_pad="0" width="141">
-				Hole Size
+			<text name="text skew">
+				Sesgo
 			</text>
-			<spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" label="X" label_width="10" left="121"
-			     max_val="1" min_val="-1" mouse_opaque="true" name="Taper Scale X"
-			     width="68" />
-			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
-			     max_val="1" min_val="-1" mouse_opaque="true" name="Taper Scale Y"
-			     width="68" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="text topshear" v_pad="0" width="141">
-				Top Shear
+			<text name="Hollow Shape">
+				Forma del Hueco
 			</text>
-			<spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" label="X" label_width="10" left="121"
-			     max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear X" width="68" />
-			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
-			     max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear Y" width="68" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="advanced_cut" v_pad="0" width="141">
-				Profile Cut Begin and End
-			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
-			     mouse_opaque="true" name="advanced_dimple" v_pad="0" width="141">
-				Dimple Begin and End
-			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
-			     mouse_opaque="true" name="advanced_slice" v_pad="0" width="141">
-				Slice Begin and End
-			</text>
-			<spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.025" initial_val="0" label="B" label_width="10" left="121"
-			     max_val="0.95" min_val="0" mouse_opaque="true" name="Path Limit Begin"
-			     width="68" />
-			<spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.025" initial_val="1" label="E" label_width="10" left_delta="73"
-			     max_val="1" min_val="0.05" mouse_opaque="true" name="Path Limit End"
-			     width="68" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="text taper2" v_pad="0" width="141">
-				Taper
-			</text>
-			<spinner bottom_delta="-19" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="X" label_width="10" left="121"
-			     max_val="1" min_val="-1" mouse_opaque="true" name="Taper X" width="68" />
-			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="Y" label_width="10" left_delta="73"
-			     max_val="1" min_val="-1" mouse_opaque="true" name="Taper Y" width="68" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="text radius delta" v_pad="0" width="78">
-				Radius
-			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="73"
-			     mouse_opaque="true" name="text revolutions" v_pad="0" width="68">
-				Revolutions
-			</text>
-			<spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1"
-			     mouse_opaque="true" name="Radius Offset" width="68" />
-			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1"
-			     mouse_opaque="true" name="Revolutions" width="68" />
-			<texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="141"
-			     label="Sculpt Texture" left="121" mouse_opaque="true"
-			     name="sculpt texture control" tool_tip="Click to choose a picture"
-			     visible="false" width="141" />
-            <check_box bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16"
-                 initial_value="false" label="Mirror" left="121" mouse_opaque="true"
-                 name="sculpt mirror control" visible="false"
-                 tool_tip="Flips sculpted prim along the X axis."
-                 width="121" />
-            <check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-                 initial_value="false" label="Inside-out" left="121" mouse_opaque="true"
-                 name="sculpt invert control" visible="false"
-                 tool_tip="Inverts the sculpted prims normals, making it appear inside-out."
-                 width="121" />
-			<text align="left" bg_visible="false" border_drop_shadow_visible="false"
-			     border_visible="false" bottom_delta="-20" drop_shadow_visible="true"
-			     follows="left|top" font="SansSerifSmall" h_pad="0" height="10" left="121"
-			     mouse_opaque="true" name="label sculpt type" v_pad="0" visible="false"
-			     width="121">
-				Stitching type
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
-			     left="121" max_chars="20" mouse_opaque="true" name="sculpt type control"
-			     visible="false" width="141">
-				<combo_item name="None" value="None">
-					(none)
+			<combo_box name="hole">
+				<combo_item name="Default">
+					Predeterminado
 				</combo_item>
-				<combo_item name="Sphere" value="Sphere">
-					Sphere
+				<combo_item name="Circle">
+					Circular
 				</combo_item>
-				<combo_item name="Torus" value="Torus">
-					Torus
+				<combo_item name="Square">
+					Cuadrangular
 				</combo_item>
-				<combo_item name="Plane" value="Plane">
-					Plane
+				<combo_item name="Triangle">
+					Triángular
 				</combo_item>
-				<combo_item name="Cylinder" value="Cylinder">
-					Cylinder
+			</combo_box>
+			<text name="text twist">
+				Torsión: Inicio y Fin
+			</text>
+			<spinner label="I" name="Twist Begin"/>
+			<spinner label="F" name="Twist End"/>
+			<text name="scale_taper">
+				Biselar
+			</text>
+			<text name="scale_hole">
+				Tamaño del Hueco
+			</text>
+			<spinner label="X" name="Taper Scale X"/>
+			<spinner label="Y" name="Taper Scale Y"/>
+			<text name="text topshear">
+				Inclinación Superior
+			</text>
+			<spinner label="X" name="Shear X"/>
+			<spinner label="Y" name="Shear Y"/>
+			<text name="advanced_cut">
+				Perfil de Corte: Inicio y Fin
+			</text>
+			<text name="advanced_dimple">
+				Horadar: Inicio y Fin
+			</text>
+			<text name="advanced_slice">
+				Cortar: Inicio y Fin
+			</text>
+			<spinner label="I" name="Path Limit Begin"/>
+			<spinner label="F" name="Path Limit End"/>
+			<text name="text taper2">
+				Biselar
+			</text>
+			<spinner label="X" name="Taper X"/>
+			<spinner label="Y" name="Taper Y"/>
+			<text name="text radius delta">
+				Radio
+			</text>
+			<text name="text revolutions">
+				Giros
+			</text>
+			<texture_picker label="Textura para Sculpt" name="sculpt texture control" tool_tip="Pulsa aquí para elegir una imagenClick to choose a picture"/>
+			<check_box label="Espejo" name="sculpt mirror control" tool_tip="Girar el prim sculpt sobre el eje X."/>
+			<check_box label="Dentro-Fuera" name="sculpt invert control" tool_tip="Invertir los valores de los prims sculpted, haciendo aparecer fuera lo de dentro."/>
+			<text name="label sculpt type">
+				Tipo de Unión
+			</text>
+			<combo_box name="sculpt type control">
+				<combo_item name="None">
+					(ninguna)
 				</combo_item>
-      		</combo_box>
+				<combo_item name="Sphere">
+					Esfera
+				</combo_item>
+				<combo_item name="Torus">
+					Toroide
+				</combo_item>
+				<combo_item name="Plane">
+					Plano
+				</combo_item>
+				<combo_item name="Cylinder">
+					Cilindro
+				</combo_item>
+			</combo_box>
 		</panel>
 
 <!-- Features sub-tab -->
 
-		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-		     label="Features" left="1" mouse_opaque="false" name="Features" width="270">
-		     	<string name="None">None</string>
-			<string name="Prim">Prim</string>
-			<string name="Convex Hull">Convex Hull</string>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="select_single" v_pad="0" width="252">
-				Select only one primitive to edit features.
+		<panel label="Caract." name="Features">
+			<string name="None">
+				Ninguno
+			</string>
+			<string name="Prim">
+				Primitiva
+			</string>
+			<string name="Convex Hull">
+				Cierre Convexo
+			</string>
+			<text name="select_single">
+				Selecciona un sólo prim para editarlo.
 			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="edit_object" v_pad="0" width="252">
-				Edit object features:
+			<text name="edit_object">
+				Editar Características del Objeto
 			</text>
-			<check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Flexible Path" left="10" mouse_opaque="true"
-			     name="Flexible1D Checkbox Ctrl"
-			     tool_tip="Allows object to flex about the Z axis. (Client-side only)"
-			     width="121" />
-			<spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
-			     increment="1" initial_val="2" label="Softness" label_width="55" left="10"
-			     max_val="3" min_val="0" mouse_opaque="true" name="FlexNumSections"
-			     width="118" />
-			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
-			     increment="0.5" initial_val="0.3" label="Gravity" label_width="55"
-			     left="10" max_val="10" min_val="-10" mouse_opaque="true" name="FlexGravity"
-			     width="118" />
-			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
-			     increment="0.5" initial_val="2" label="Drag" label_width="55" left="10"
-			     max_val="10" min_val="0" mouse_opaque="true" name="FlexFriction"
-			     width="118" />
-			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
-			     increment="0.5" initial_val="0" label="Wind" label_width="55" left="10"
-			     max_val="10" min_val="0" mouse_opaque="true" name="FlexWind" width="118" />
-			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
-			     increment="0.5" initial_val="1" label="Tension" label_width="55" left="10"
-			     max_val="10" min_val="0" mouse_opaque="true" name="FlexTension" width="118" />
-			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="Force X" label_width="55" left="10"
-			     max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceX"
-			     width="118" />
-			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="Force Y" label_width="55" left="10"
-			     max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceY"
-			     width="118" />
-			<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="Force Z" label_width="55" left="10"
-			     max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceZ"
-			     width="118" />
-			<check_box bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Light" left="10" mouse_opaque="true"
-			     name="Light Checkbox Ctrl" tool_tip="Causes object to emit light"
-			     width="121" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-21" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
-			     mouse_opaque="true" name="label color" v_pad="0" width="58">
+			<check_box label="Flexibilidad" name="Flexible1D Checkbox Ctrl" tool_tip="Permite que el objeto sea flexible en el eje Z . (Sólo del lado del Client"/>
+			<spinner label="Blandura" name="FlexNumSections"/>
+			<spinner label="Gravedad" name="FlexGravity"/>
+			<spinner label="Fricción" name="FlexFriction"/>
+			<spinner label="Viento" name="FlexWind"/>
+			<spinner label="Tensión" name="FlexTension"/>
+			<spinner label="Fuerza en X" name="FlexForceX"/>
+			<spinner label="Fuerza en Y" name="FlexForceY"/>
+			<spinner label="Fuerza en Z" name="FlexForceZ"/>
+			<check_box label="Luz" name="Light Checkbox Ctrl" tool_tip="Hace que el objeto emita luz"/>
+			<text name="label color">
 				Color
 			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="114"
-			     mouse_opaque="true" name="label texture" v_pad="0" width="58">
-				Texture
+			<text name="label texture">
+				Textura
 			</text>
-			<color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-28"
-				left="55"
-			     can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
-			     height="48" label="" mouse_opaque="true" name="colorswatch"
-			     tool_tip="Click to open Color Picker" width="32" />
+			<color_swatch label="" name="colorswatch" tool_tip="Pulsa aqui para abrir el selector de color"/>
 			
-			 <texture_picker
-		            allow_no_texture="true"
-		            bottom_delta="-1"
-		            can_apply_immediately="true"
-		            default_image_name="Default"
-		            follows="left|top"
-		            height="48"
-		            label=""
-		            left_delta="124"
-		            mouse_opaque="true"
-		            name="light texture control"
-		            tool_tip="Click to choose a projection image (only has effect with deferred rendering enabled)"
-		            width="32" />
-			<spinner bottom_delta="-4" decimal_digits="3" follows="left|top" height="16"
-				left="10"
-			     increment="0.1" initial_val="0.5" label="Intensity" label_width="45"
-			     max_val="1" min_val="0" mouse_opaque="true"
-			     name="Light Intensity" 
-			     width="108" />
-			<spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-				left_delta="114"
-			     increment="0.1" initial_val="0.5" label="FOV" label_width="55"
-			     max_val="3" min_val="0" mouse_opaque="true"
-			     name="Light FOV" 
-			     width="118" />
-			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-				left="10"
-			     increment="0.1" initial_val="5" label="Radius" label_width="45"
-			     max_val="20" min_val="0" mouse_opaque="true"
-			     name="Light Radius" 
-			     width="108" />
-			<spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-				left_delta="114" 
-			     increment="0.5" initial_val="0.5" label="Focus" label_width="55"
-			     max_val="20" min_val="-20" mouse_opaque="true"
-			     name="Light Focus" 
-			     width="118" />
-			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-				left="10"
-			     increment="0.25" initial_val="1" label="Falloff" label_width="45"
-			     max_val="2" min_val="0" mouse_opaque="true"
-			     name="Light Falloff" 
-			     width="108" />
-			<spinner bottom_delta="0" 
-				decimal_digits="3" 
-				follows="left|top" 
-				height="16"
-				left_delta="114" 
-			     	ncrement="0.05" 
-				initial_val="1" 
-				label="Ambiance" 
-				label_width="55"
-			     	max_val="1" 
-			     	min_val="0" 
-			     	mouse_opaque="true"
-			     	name="Light Ambiance" 
-			     	width="118" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top"
-             height="10"
-             layout="topleft"
-             name="label physicsshapetype"
-	     left_delta="13"
-             bottom="-41"
-             width="121">
-                Physics Shape Type:
-            </text>
-			<combo_box
-			   height="19"
-			   bottom_delta="-26" 
-			   layout="topleft"
-			   follows="left|top"
-			   name="Physics Shape Type Combo Ctrl"
-			   tool_tip="Choose the physics shape type"
-			   width="108"/>
-	    <spinner
-             follows="left|top"
-             height="19"
-             increment="0.1"
-             initial_value="1"
-             label="Gravity"
-             label_width="55"
-             layout="topleft"
-             min_val="-1"
-             max_val="28"
-             name="Physics Gravity"
-             top_pad="10"
-             width="118" />
-
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.1"
-             initial_value="0"
-             label="Friction"
-             label_width="55"
-             layout="topleft"
-             left_delta="0"
-             max_val="255"
-             min_val="0"
-             name="Physics Friction"
-             top_pad="4"
-	     bottom_delta="-20"
-             width="118" />
-
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.1"
-             initial_value="0"
-             label="Density"
-             label_width="55"
-             label_wrap="true"
-             layout="topleft"
-             left_delta="0"
-             max_val="22587"
-             min_val="1"
-             name="Physics Density"
-             top_pad="4"
-	     bottom_delta="-20"
-             width="118" />
-
-            <spinner
-             follows="left|top"
-             height="19"
-             increment="0.01"
-             initial_value="0"
-             label="Restitution"
-             label_width="55"
-             layout="topleft"
-             left_delta="0"
-             max_val="1"
-             min_val="0"
-             name="Physics Restitution"
-             top_pad="8"
-	     bottom_delta="-20"
-             width="118" />
+			<texture_picker label="" name="light texture control" tool_tip="Pulsa para escoger una proyección de imagen (sólo tiene efecto con el renderizado diferido activado"/>
+			<spinner label="Intensidad" name="Light Intensity"/>
+			<spinner label="CDV" name="Luz CDV" />
+			<spinner label="Radio" name="Light Radius"/>
+			<spinner label="Visión" name="Light Focus"/>
+			<spinner label="Atenuación" name="Light Falloff"/>
+			<spinner label="Ambiente" name="Light Ambiance"/>
+			<text name="label physicsshapetype">
+                Tipo de Forma Física:
+			</text>
+			<combo_box name="Physics Shape Type Combo Ctrl" tool_tip="Selecciona el tipo de forma física"/>
+			<spinner label="Gravedad" name="Physics Gravity"/>
+			<spinner label="Fricción" name="Physics Friction"/>
+			<spinner label="Densidad" name="Physics Density"/>
+			<spinner label="Restitución" name="Physics Restitution"/>
 		</panel>
 
 <!-- Texture sub-tab -->
 
-		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-		     label="Texture" left="1" mouse_opaque="false" name="Texture" width="270">
-			<texture_picker allow_no_texture="false" allow_invisible_texture="true" bottom="-90" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="80" label="Texture"
-			     left="10" mouse_opaque="true" name="texture control"
-			     tool_tip="Click to choose a picture" width="64" />
-			<color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-90"
-			     can_apply_immediately="true" color="1, 1, 1, 1" follows="left|top"
-			     height="80" label="Color" left_delta="90" mouse_opaque="true"
-			     name="colorswatch" tool_tip="Click to open Color Picker" width="64" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-11" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"
-			     mouse_opaque="true" name="color trans" v_pad="0" width="80">
-				Transparency %
+		<panel label="Textura" name="Texture">
+			<texture_picker label="Textura" name="texture control" tool_tip="Pulsa para seleccionar una imagen"/>
+			<color_swatch label="Color" name="colorswatch" tool_tip="Pulsa para abrir el selector de color"/>
+			<text name="color trans">
+				Transparencia %
 			</text>
-			<spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
-			     increment="2" initial_val="0" left="180" max_val="100" min_val="0"
-			     mouse_opaque="true" name="ColorTrans" width="80" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10"
-			     left="180" mouse_opaque="true" name="glow label" v_pad="0" width="80">
-				Glow
+			<text name="glow label">
+				Brillo
 			</text>
-			<spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.1" initial_val="0" left="180" max_val="1"
-			     min_val="0" mouse_opaque="true" name="glow" width="80" />
-			<check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Full Bright" left="180" mouse_opaque="true"
-			     name="checkbox fullbright" width="81" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-104" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="tex gen" v_pad="0" width="90">
-				Mapping
+			<check_box label="Brillo Máximo" name="checkbox fullbright"/>
+			<text name="tex gen">
+				Mapeado
 			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-			     left="10" max_chars="20" mouse_opaque="true" name="combobox texgen"
-			     width="80">
-				<combo_item name="Default" value="Default">
-					Default
+			<combo_box name="combobox texgen">
+				<combo_item name="Default">
+					Por Defecto
 				</combo_item>
-				<combo_item name="Planar" value="Planar">
-					Planar
+				<combo_item name="Planar">
+					Plano
 				</combo_item>
 			</combo_box>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-104" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="100"
-			     mouse_opaque="true" name="label shininess" v_pad="0" width="70">
-				Shininess
+			<text name="label shininess">
+				Brillantez
 			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-			     left="100" max_chars="20" mouse_opaque="true" name="combobox shininess"
-			     width="70">
-				<combo_item name="None" value="None">
-					None
+			<combo_box name="combobox shininess">
+				<combo_item name="None">
+					Ninguna
 				</combo_item>
-				<combo_item name="Low" value="Low">
-					Low
+				<combo_item name="Low">
+					Baja
 				</combo_item>
-				<combo_item name="Medium" value="Medium">
-					Medium
+				<combo_item name="Medium">
+					Media
 				</combo_item>
-				<combo_item name="High" value="High">
-					High
+				<combo_item name="High">
+					Alta
 				</combo_item>
 			</combo_box>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-104" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"
-			     mouse_opaque="true" name="label bumpiness" v_pad="0" width="80">
-				Bumpiness
+			<text name="label bumpiness">
+				Relieve
 			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-			     left="180" max_chars="20" mouse_opaque="true" name="combobox bumpiness"
-			     width="80">
-				<combo_item name="None" value="None">
-					None
+			<combo_box name="combobox bumpiness">
+				<combo_item name="None">
+					Ninguno
 				</combo_item>
-				<combo_item name="Brightness" value="Brightness">
-					Brightness
+				<combo_item name="Brightness">
+					Brillo
 				</combo_item>
-				<combo_item name="Darkness" value="Darkness">
-					Darkness
+				<combo_item name="Darkness">
+					Oscuro
 				</combo_item>
-				<combo_item name="woodgrain" value="woodgrain">
-					woodgrain
+				<combo_item name="woodgrain">
+					Grano de madera
 				</combo_item>
-				<combo_item name="bark" value="bark">
-					bark
+				<combo_item name="bark">
+					Corteza
 				</combo_item>
-				<combo_item name="bricks" value="bricks">
-					bricks
+				<combo_item name="bricks">
+					Ladrillos
 				</combo_item>
-				<combo_item name="checker" value="checker">
-					checker
+				<combo_item name="checker">
+					Cajero
 				</combo_item>
-				<combo_item name="concrete" value="concrete">
-					concrete
+				<combo_item name="concrete">
+					Cemento
 				</combo_item>
-				<combo_item name="crustytile" value="crustytile">
-					crustytile
+				<combo_item name="crustytile">
+					Azulejería
 				</combo_item>
-				<combo_item name="cutstone" value="cutstone">
-					cutstone
+				<combo_item name="cutstone">
+					Piedra cortada
 				</combo_item>
-				<combo_item name="discs" value="discs">
-					discs
+				<combo_item name="discs">
+					Discos
 				</combo_item>
-				<combo_item name="gravel" value="gravel">
-					gravel
+				<combo_item name="gravel">
+					grava
 				</combo_item>
-				<combo_item name="petridish" value="petridish">
-					petridish
+				<combo_item name="petridish">
+					Placa de Petri
 				</combo_item>
-				<combo_item name="siding" value="siding">
-					siding
+				<combo_item name="siding">
+					Revestimiento
 				</combo_item>
-				<combo_item name="stonetile" value="stonetile">
-					stonetile
+				<combo_item name="stonetile">
+					Baldosa de Piedra
 				</combo_item>
-				<combo_item name="stucco" value="stucco">
-					stucco
+				<combo_item name="stucco">
+					Estuco
 				</combo_item>
-				<combo_item name="suction" value="suction">
-					suction
+				<combo_item name="suction">
+					succión
 				</combo_item>
-				<combo_item name="weave" value="weave">
-					weave
+				<combo_item name="weave">
+					Tejido
 				</combo_item>
 			</combo_box>
-			<check_box bottom="-148" follows="left|top" font="SansSerifSmall" height="16"
-				initial_value="false" enabled="false" label="Align planar textures"
-				left="8" mouse_opaque="true" name="checkbox planar align" width="160"
-				tool_tip="Aligns textures on all selected faces to the last selected face. Requires Planar texture mapping." />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-158" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="tex scale" v_pad="0" width="160">
-				Repeats per Face
+			<check_box label="Alinear texturas planas" name="checkbox planar align" tool_tip="Alinear las texturas de todas las caras a la última seleccionada. Requiere mapeado plano de textura." />
+			<text name="tex scale">
+				Repetic. por cara
 			</text>
-			<spinner bottom="-178" decimal_digits="5" follows="left|top" height="16" increment="0.1"
-			     initial_val="0" label="Horizontal (U)" label_width="90" left="20"
-			     max_val="1000" min_val="0" mouse_opaque="true" name="TexScaleU" width="160" />
-			<check_box bottom="-179" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
-			     name="checkbox flip s" width="70" />
-			<spinner bottom="-196" decimal_digits="5" follows="left|top" height="16" increment="0.1"
-			     initial_val="0" label="Vertical (V)" label_width="90" left="20"
-			     max_val="1000" min_val="0" mouse_opaque="true" name="TexScaleV" width="160" />
-			<check_box bottom="-197" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
-			     name="checkbox flip t" width="70" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-228" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="tex rotate" v_pad="0" width="102">
-				Rotation (degrees)
+			<spinner label="Horizontal (U)" name="TexScaleU"/>
+			<check_box label="Invertir" name="checkbox flip s"/>
+			<spinner label="Vertical (V)" name="TexScaleV"/>
+			<check_box label="Invertir" name="checkbox flip t"/>
+			<text name="tex rotate">
+				Rotación (grados)
 			</text>
-			<spinner bottom="-234" decimal_digits="2" follows="left|top" height="16" increment="1"
-			     initial_val="0" left="112" max_val="9999" min_val="-9999"
-			     mouse_opaque="true" name="TexRot" width="68" />
 			<string name="string repeats per meter">
-				Repeats Per Meter
+				Repetic. por Metro
 			</string>
 			<string name="string repeats per face">
-				Repeats Per Face
+				Repetic. por Cara
 			</string>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-250" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="rpt" v_pad="0" width="160">
-				Repeats Per Meter
+			<text name="rpt">
+				Repetic. por Metro
 			</text>
-			<spinner bottom="-256" decimal_digits="1" follows="left|top" height="16" increment="0.1"
-			     initial_val="1" left="112" max_val="10" min_val="0.1" mouse_opaque="true"
-			     name="rptctrl" width="68" />
-			<button bottom="-256" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="20" label="Apply" label_selected="Apply" left_delta="78"
-			     mouse_opaque="true" name="button apply" scale_image="TRUE" width="75" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-288" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="tex offset" v_pad="0" width="160">
-				Offset
+			<button label="Aplicar" label_selected="Aplicar" name="button apply"/>
+			<text name="tex offset">
+				Desplazar
 			</text>
-			<spinner bottom="-308" decimal_digits="4" follows="top" height="16" increment="0.01" initial_val="0" label="Horizontal (U)" label_width="90" left="20"
-			     max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160"/>
-			<spinner bottom_delta="-18" decimal_digits="4" follows="top" height="16" increment="0.01" initial_val="0" label="Vertical (V)" label_width="90"
-			     left="20" max_val="1" min_val="-1" name="TexOffsetV"
-			     width="160"/>
-			<text bottom="-352" height="20" left="10" name="textbox autofix" v_pad="0" width="160">Align media texture
-(must load first)</text>
-			<button bottom="-360" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="20" label="Align" label_selected="Align" left="112"
-			     mouse_opaque="true" name="button align" scale_image="TRUE" width="68" />
-			<text bottom="-322" drop_shadow_visible="true" follows="left|top" height="20" left="185" name="textbox params">Texture Params</text>
-			<button bottom_delta="-18" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="20" label="Copy" left_delta="5" mouse_opaque="true" name="copytextures"  enabled="true"
-			     tool_tip="Copy Testure Params from Clipboard"  width="68" />
-	  		<button bottom_delta="-20" follows="top" height="20" label="Paste" name="pastetextures" tool_tip="Paste Texture Params from Clipboard"  width="68" />
+			<spinner label="Horizontal (U)" name="TexOffsetU"/>
+			<spinner label="Vertical (V)" name="TexOffsetV"/>
+			<text name="textbox autofix">
+				Alinear textura para Media
+(Se debe subir primero)
+			</text>
+			<button label="Alinear" label_selected="Alinear" name="button align"/>
+			<text name="textbox params" left="195" height="40">
+				Parámetros 
+de Textura
+			</text>
+			<button label="Copiar" tool_tip="Copiar Parámetros de Textura al Portapapeles"/>
+	  		<button label="Pegar" name="pastetextures" tool_tip="Pegar Parámetros de Textura desde el Portapapeles"/>
     	</panel>
-    	<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-		     label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
-      		<button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20" label="New Script" label_selected="New Script" left="10" name="button new script" scale_image="TRUE" width="100"/>
-      <button bottom_delta="0" left_delta="110" width="100" height="20" follows="left|top"
-            label="Permissions..." name="button permissions" font="SansSerif" halign="center"
-            mouse_opaque="true" scale_image="TRUE" />
-			<panel bottom_delta="-330" follows="left|top" height="325"  left="10"
-			     mouse_opaque="true" name="ContentsInventory" width="252" />
+    	<panel label="Contenido" name="Contents">
+			<button label="Nuevo Script" label_selected="Nuevo Script" name="button new script"/>
+			<button label="Permisos..." name="button permissions" />
+			<panel name="ContentsInventory"/>
 		</panel>
 	</tab_container>
 
 <!-- Land Info sub-tab -->
 
-	<panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
-	     name="land info panel" width="272">
+	<panel name="land info panel">
 	<!-- Parcel Information -->
-		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		     bottom="-40" drop_shadow_visible="true" follows="left|top"
-		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
-		     mouse_opaque="true" name="label_parcel_info" v_pad="0" width="150">
-			Parcel Information
+		<text name="label_parcel_info">
+			Información de la Parcela
 		</text>
-		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		     bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
-		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="48"
-		     mouse_opaque="true" name="label_area_price" v_pad="0" width="150">
-			Price: [CURRENCY][PRICE] for [AREA] sq. m.
+		<text name="label_area_price">
+			Precio: [CURRENCY][PRICE] por [AREA] m²
 		</text>
-		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="48"
-		     mouse_opaque="true" name="label_area" v_pad="0" width="150">
-			Area: [AREA] sq. m.
+		<text name="label_area">
+			Superficie: [AREA] m²
 		</text>
-		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-		     height="20" label="About Land..." label_selected="About Land..." left="48"
-		     mouse_opaque="true" name="button about land" scale_image="TRUE" width="112" />
-		<check_box bottom_delta="-24" control_name="ShowParcelOwners" follows="left|top"
-		     tool_tip="Colour parcels according to their ownership" font="SansSerifSmall"
-		     height="16" initial_value="false" label="Show owners" left="48" 
-		     mouse_opaque="true" name="checkbox show owners" width="100" />
-			<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-			     height="18" label="?" label_selected="?" left_delta="94"
-			     mouse_opaque="true" name="button show owners help" width="18" />
+		<button label="Acerca del Terreno..." label_selected="Acerca del Terreno..."name="button about land" width="112" />
+		<check_box tool_tip="El color de las parcelas es según su propietario" label="Mostrar Propietarios" name="checkbox show owners"/>
+		<button label="?" label_selected="?" name="button show owners help"/>
 	<!-- Modify Parcel -->
-		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		     bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
-		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
-		     mouse_opaque="true" name="label_parcel_modify" v_pad="0" width="150">
-			Modify Parcel
+		<text name="label_parcel_modify">
+			Modificar Parcela
 		</text>
-		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-		     height="20" label="Subdivide..." label_selected="Subdivide..." left="48"
-		     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
-		     width="112" />
-		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-		     height="20" label="Join..." label_selected="Join..." left="48"
-		     mouse_opaque="true" name="button join land" scale_image="TRUE" width="112" />
+		<button label="Subdividir..." label_selected="Subdividir..." name="button subdivide land"/>
+		<button label="Unir..." label_selected="Unir..." name="button join land"/>
 	<!-- Land Transactions -->
-		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		     bottom_delta="-56" drop_shadow_visible="true" follows="left|top"
-		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="40"
-		     mouse_opaque="true" name="label_parcel_trans" v_pad="0" width="150">
-			Land Transactions
+		<text name="label_parcel_trans">
+			Transacciones de Terreno
 		</text>
-		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-		     height="20" label="Buy Land..." label_selected="Buy Land..." left="48"
-		     mouse_opaque="true" name="button buy land" scale_image="TRUE" width="112" />
-		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-		     height="20" label="Abandon Land..." label_selected="Abandon Land..."
-		     left="48" mouse_opaque="true" name="button abandon land" scale_image="TRUE"
-		     width="112" />
+		<button label="Comprar Terreno..." label_selected="Comprar Terreno..." name="button buy land"/>
+		<button label="Abandonar Terreno..." label_selected="Abandonar Terreno..."
+name="button abandon land"/>
 	</panel>
 	<string name="status_rotate">
-		Drag colored bands to rotate object
+		Arrastra las bandas coloreadas para rotar el objeto
 	</string>
 	<string name="status_scale">
-		Click and drag to stretch selected side
+		Pulsa y arrastra para estirar el lado seleccionado
 	</string>
 	<string name="status_move">
-		Drag to move, shift-drag to copy
+		Arrastrar para mover, Mayús+Arrastrar para copiar
 	</string>
 	<string name="status_align">
-		Click an arrow to align objects in that direction
+		Pulsa en una flecha para alinear los objetos en dicha dirección
 	</string>
 	<string name="status_modifyland">
-		Click and hold to modify land
+		Mantén pulsado para modificar el terreno
 	</string>
 	<string name="status_camera">
-		Click and drag to change view
+		Pulsa y arrastra para cambiar la vista
 	</string>
 	<string name="status_grab">
-		Drag to move, Ctrl to lift, Ctrl-Shift to rotate
+		Arrastrar para moverDrag , Ctrl Vertical, Ctrl-Mayús para girar
 	</string>
 	<string name="status_place">
-		Click inworld to build
+		Pulsa en el mundo para construir
 	</string>
 	<string name="status_selectland">
-		Click and drag to select land
+		Pulsa y arrastra para seleccionar el Terreno
 	</string>
 	<string name="grid_screen_text">
-		Screen
+		Pantalla
 	</string>
 	<string name="grid_local_text">
 		Local
 	</string>
 	<string name="grid_world_text">
-		World
+		Mundo
 	</string>
 	<string name="grid_reference_text">
-		Reference
+		Referencia
 	</string>
 	<string name="grid_attachment_text">
-		Attachment
+		Añadido
 	</string>
   <string name="status_selectprimequiv">
-    , Cost: [SEL_WEIGHT]
+    , Peso: [SEL_WEIGHT]
   </string>
   <string name="status_selectcount">
-    Primitives: [COUNT][PE_STRING]
+    Primitivas: [COUNT][PE_STRING]
   </string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_top_objects.xml b/indra/newview/skins/default/xui/es/floater_top_objects.xml
index 6b59ee391..7e30241f7 100644
--- a/indra/newview/skins/default/xui/es/floater_top_objects.xml
+++ b/indra/newview/skins/default/xui/es/floater_top_objects.xml
@@ -1,90 +1,60 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-     height="400" min_height="300" min_width="580" name="top_objects"
-     title="loading..." width="580">
-	<text bottom="-50" follows="left|top" font="SansSerif" height="20" left="10"
-	     name="title_text" width="400">
-		Loading...
+<floater name="top_objects" title="cargando...">
+	<text name="title_text">
+		Cargando...
 	</text>
-	<scroll_list bottom_delta="-200" draw_border="true" draw_heading="true"
-	     follows="left|top|bottom|right" height="200" left="10" multi_select="true"
-	     name="objects_list" width="560">
-		<column label="Score" name="score" width="43" />
-		<column label="Name" name="name" dynamicwidth="true" />
-		<column label="Owner" name="owner" width="100" />
-		<column label="Location" name="location" width="100" />
-		<column label="Time" name="time" width="105" />
-    <column label="Mono Time" name="mono_time" width="50" />
-	  <column label="URLs" name="URLs" width="50" />
-  </scroll_list>
-	<text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
-	     left="10" name="id_text" width="100">
-		Object ID:
+	<scroll_list name="objects_list">
+		<column label="Puntuación" name="score"/>
+		<column label="Nombre" name="name"/>
+		<column label="Propietario" name="owner"/>
+		<column label="Ubicación" name="location"/>
+		<column label="Tiempo" name="time" width="60"/>
+		<column label="Tiempo en Mono" name="mono_time" width="100"/>
+		<column label="URLs" name="URLs"/>
+	</scroll_list>
+	<text name="id_text">
+		ID del Objeto:
 	</text>
-	<line_editor bottom_delta="3" enabled="false"
-	     follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-	     name="id_editor" width="385" />
-	<button bottom_delta="0" follows="bottom|right" height="20" label="Show Beacon"
-	     name="show_beacon_btn" right="-10" width="100" />
-	<text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
-	     left="10" name="obj_name_text" width="100">
-		Object Name:
+	<button label="Mostrar Balizas" name="show_beacon_btn"/>
+	<text name="obj_name_text">
+		Objeto:
 	</text>
-	<line_editor bottom_delta="3" enabled="true"
-	     follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-	     name="object_name_editor" width="385" />
-	<button bottom_delta="0" follows="bottom|right" height="20" label="Filter"
-	     name="filter_object_btn" right="-10" width="100" />
-	<text bottom_delta="-30" follows="left|bottom" font="SansSerifSmall" height="20"
-	     left="10" name="owner_name_text" width="100">
-		Owner Name:
+	<button label="Filtro" name="filter_object_btn"/>
+	<text name="owner_name_text">
+		Propietario:
 	</text>
-	<line_editor bottom_delta="3" enabled="true"
-	     follows="left|bottom|right" font="SansSerifSmall" height="20" left="80"
-	     name="owner_name_editor" width="385" />
-	<button bottom_delta="0" follows="bottom|right" height="20" label="Filter"
-	     name="filter_owner_btn" right="-10" width="100" />
-	<button bottom="35" follows="bottom|left" height="20" label="Return Selected" left="10"
-	     name="return_selected_btn" width="110" />
-	<button bottom="35" follows="bottom|left" height="20" label="Return All" left="125"
-	     name="return_all_btn" width="110" />
-  <button bottom="35" follows="bottom|left" height="20" label="Lag Warning" left="240"
-	     name="lagwarning" width="110" />
-  <button bottom="35" follows="bottom|left" height="20" label="Kick" left="355"
-	     name="kick" width="110" />
-	<button bottom="10" follows="bottom|left" height="20" label="Disable Selected"
-	     left="10" name="disable_selected_btn" width="110" />
-	<button bottom="10" follows="bottom|left" height="20" label="Disable All" left="125"
-	     name="disable_all_btn" width="110" />
-  <button bottom="10" follows="bottom|left" height="20" label="Profile" left="240"
-	     name="profile" width="110" />  
-  <button bottom="10" follows="bottom|left" height="20" label="TP to" left="355"
-	     name="tpto" width="110" />
-
-	<button bottom="35" follows="bottom|right" height="20" label="Refresh"
-	     name="refresh_btn" right="-10" width="100" />
+	<button label="Filtro" name="filter_owner_btn"/>
+	<button label="Devolver Seleccionado" name="return_selected_btn" width="152"/>
+	<button label="Devolver Todo" left="165" name="return_all_btn" width="110" />
+	<button label="Advertencia de Lag" left="280" name="lagwarning" width="130" />
+	<button label="Expulsar" left="415" name="kick" width="80" />
+	<button label="Desactivar Seleccionado" name="disable_selected_btn" width="152" />
+	<button label="Desactivar Todo" left="165" name="disable_all_btn" width="110" />
+	<button label="Perfil" left="280" name="profile" width="130" />  
+	<button label="TP a" left="415" name="tpto" width="80" />
+	<button label="Actualizar" name="refresh_btn" right="-10" width="70" />
 	<string name="top_scripts_title">
 		Top Scripts
 	</string>
 	<string name="top_scripts_text">
-		[COUNT] scripts taking a total of [TIME] ms
+		[COUNT] scripts usando un total de [TIME] ms
 	</string>
 	<string name="scripts_score_label">
-		Time
+		Tiempo
 	</string>
     <string name="scripts_mono_time_label">
-        Mono Time
+		Tiempo en Mono
     </string>
     <string name="top_colliders_title">
-		Top Colliders
+		Top Colisionadores
 	</string>
 	<string name="top_colliders_text">
-		Top [COUNT] objects experiencing many potential collisions
+		Top [COUNT] objetos con muchas potenciales colisiones
 	</string>
 	<string name="colliders_score_label">
-		Score
+		Puntaje
 	</string>
     <string name="none_descriptor">
-		None found.
+		Ninguno Encontrado.
 	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_tos.xml b/indra/newview/skins/default/xui/es/floater_tos.xml
index 485cfcc27..2bce2ec63 100644
--- a/indra/newview/skins/default/xui/es/floater_tos.xml
+++ b/indra/newview/skins/default/xui/es/floater_tos.xml
@@ -1,35 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="false" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="500" min_height="100" min_width="100"
-     name="modal container" title="" width="600">
-	<button bottom="-484" enabled="false" font="SansSerif" halign="center" height="20"
-	     label="Continue" label_selected="Continue" left="484" mouse_opaque="true"
-	     name="Continue" width="100" />
-	<button bottom="-484" font="SansSerif" halign="center" height="20" label="Cancel"
-	     label_selected="Cancel" left="16" mouse_opaque="true" name="Cancel"
-	     width="100" />
-	<check_box bottom="-435" follows="top|right"
-		font="SansSerifSmall" height="16" initial_value="false" label="I Agree to the Terms of Service"
-		left="16" mouse_opaque="true" name="agree_chk" width="55" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-50" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-	     h_pad="0" halign="left" height="30" left="16" mouse_opaque="true"
-	     name="tos_heading" v_pad="0" width="552">
-		Please read the following Terms of Service carefully. To continue logging in to Second Life,
-you must accept the agreement.
+<floater name="modal container" title="">
+	<button label="Continuar" label_selected="Continuar" name="Continue"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<check_box label="Acepto los Términos del Servicio" name="agree_chk"/>
+	<text name="tos_heading">
+		Por favor, lee cuidadosamente las siguientes Condiciones del Servicio. Si quieres seguir
+iniciando sesión en Second Life, debes aceptar el acuerdo.
 	</text>
-	<text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif"
-	     height="283" left="16" max_length="65536" mouse_opaque="true"
-	     name="tos_text" width="568"
-	     word_wrap="true">
+	<text_editor name="tos_text">
 		TOS_TEXT
 	</text_editor>
   <!-- Loading text says: "Loading Terms of Service..." URL encoded -->
-	<web_browser bottom="-406" embedded_items="false" follows="left|top" font="SansSerif"
-	     height="340" left="16" max_length="65536" mouse_opaque="true"
-	     name="tos_html"
-	     start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E"
-	     width="568" word_wrap="true" />
+	<web_browser name="tos_html" start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//secondlife.com/app/tos/%22%3ETerms%20of%20Service%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E"/>
 	<string name="real_url">
 		http://secondlife.com/app/tos/
 	</string>
diff --git a/indra/newview/skins/default/xui/es/floater_url_entry.xml b/indra/newview/skins/default/xui/es/floater_url_entry.xml
index fb1f64a38..8556da1d3 100644
--- a/indra/newview/skins/default/xui/es/floater_url_entry.xml
+++ b/indra/newview/skins/default/xui/es/floater_url_entry.xml
@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="87" max_height="91" min_height="87"
-     min_width="500" name="url_entry" title="" width="500">
-	<text bottom="-20" follows="top|left" height="15" left="20" name="media_label"
-	     top="-20">
-		Media URL:
+<floater name="url_entry" title="">
+	<text name="media_label">
+		URL del Media:
 	</text>
-	<combo_box allow_text_entry="true" bottom="-35" follows="left|top|right" height="19"
-	     left="90" max_chars="255" max_length="550" name="media_entry" width="370" />
-	<button bottom="10" bottom_delta="-35" follows="top|left" height="20" label="OK"
-	     left="20" name="ok_btn" width="64" />
-	<button bottom="10" bottom_delta="0" follows="top|left" height="20" label="Cancel"
-	     left="112" name="cancel_btn" width="64" />
-	<button bottom="10" bottom_delta="0" follows="top|right" height="20" label="Clear"
-	     name="clear_btn" right="460" width="64" />
-	<text bottom_delta="2" follows="bottom|left" height="15" left="220"
-	     name="loading_label" visible="false">
-		Loading...
+	<combo_box name="media_entry"/>
+	<button label="OK" name="ok_btn"/>
+	<button label="Cancelar" name="cancel_btn"/>
+	<button label="Limpiar" name="clear_btn"/>
+	<text name="loading_label">
+		Cargando...
 	</text>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_vfs.xml b/indra/newview/skins/default/xui/es/floater_vfs.xml
index 5079d4114..c2a017fdb 100644
--- a/indra/newview/skins/default/xui/es/floater_vfs.xml
+++ b/indra/newview/skins/default/xui/es/floater_vfs.xml
@@ -1,6 +1,3 @@
 <?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="320" min_width="320" height="320" min_height="320"
-     name="floater_vfs" title="Local Assets" rect_control="FloaterVFSRect">
-	
+<floater name="floater_vfs" title="Activos Locales">
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_vfs_explorer.xml b/indra/newview/skins/default/xui/es/floater_vfs_explorer.xml
index 933338ff6..eeb5f81e6 100644
--- a/indra/newview/skins/default/xui/es/floater_vfs_explorer.xml
+++ b/indra/newview/skins/default/xui/es/floater_vfs_explorer.xml
@@ -1,6 +1,3 @@
 <?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="320" min_width="320" height="320" min_height="320"
-     name="floater_vfs" title="VFS Explorer" rect_control="FloaterVFSRect">
-
+<floater name="floater_vfs" title="Explorador del VFS">
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_license.xml b/indra/newview/skins/default/xui/es/floater_voice_license.xml
index 4596134c8..6a0363305 100644
--- a/indra/newview/skins/default/xui/es/floater_voice_license.xml
+++ b/indra/newview/skins/default/xui/es/floater_voice_license.xml
@@ -1,39 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="false" can_drag_on_left="false" can_minimize="false"
-     can_resize="false" height="500" min_height="100" min_width="100"
-     name="modal container" title="" width="600">
-  <button bottom="-484" enabled="false" font="SansSerif" halign="center" height="20"
-	     label="Continue" label_selected="Continue" left="484" mouse_opaque="true"
-	     name="Continue" width="100" />
-  <button bottom="-484" font="SansSerif" halign="center" height="20" label="Cancel"
-	     label_selected="Cancel" left="16" mouse_opaque="true" name="Cancel"
-	     width="100" />
-  <check_box bottom="-435" follows="top|right"
-		 font="SansSerifSmall" height="16" initial_value="false" label="I Agree to the Terms of the Vivox Acceptable Use Policy"
-	     left="16" mouse_opaque="true" name="agree_chk" width="55" />
-  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-50" drop_shadow_visible="true" follows="left|top" font="SansSerif"
-	     h_pad="0" halign="left" height="30" left="16" mouse_opaque="true"
-	     name="license_heading" v_pad="0" width="552">
-Please read the following license carefully. 
-To use voice, you must accept the license agreement.
-  </text>
-  <text_editor bottom="-376" embedded_items="false" follows="left|top" font="SansSerif"
-	     height="283" left="16" max_length="65536" mouse_opaque="true"
-	     name="license_text" width="568"
-	     word_wrap="true">
-    LICENSE_TEXT
-  </text_editor>
-  <!-- Loading text says: "Loading Vivox Personal License Agreement..." URL encoded -->
-  <web_browser bottom="-406" embedded_items="false" follows="left|top" font="SansSerif"
-	     height="340" left="16" max_length="65536" mouse_opaque="true"
-	     name="license_html"
-		 start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//vivox.com/vivox_aup.html%22%3EVivox%20Acceptable%20Use%20Policy%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E"
-	     width="568" word_wrap="true" />
-  <string name="real_url">
-	vivox_aup.html
-  </string>
-  <string name="fallback_html">
-	vivox_aup.html
-  </string>
+<floater name="modal container" title="">
+	<button label="Continuar" label_selected="Continuar" name="Continue"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<check_box label="Acetpo los Términos de la Política Aceptable de Uso de Vivox" name="agree_chk"/>
+	<text name="license_heading">
+		Por favor lee cuidadosamente la siguiente licencia.
+Para usar el chat de voz debes aceptar el acuerdo de licencia.
+	</text>
+	<text_editor name="license_text">
+		LICENSE_TEXT
+	</text_editor>
+	<!-- Loading text says: "Loading Vivox Personal License Agreement..." URL encoded -->
+	<web_browser name="license_html" start_url="data:text/html,%3Chtml%3E%3Chead%3E%3C/head%3E%3Cbody text=%22000000%22%3E%3Ch2%3E Loading %3Ca%20target%3D%22_external%22%20href%3D%22http%3A//vivox.com/vivox_aup.html%22%3EVivox%20Acceptable%20Use%20Policy%3C/a%3E...%3C/h2%3E %3C/body%3E %3C/html%3E" />
+	<string name="real_url">
+		vivox_aup.html
+	</string>
+	<string name="fallback_html">
+		vivox_aup.html
+	</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_wizard.xml b/indra/newview/skins/default/xui/es/floater_voice_wizard.xml
index 71acd0fc8..757cd0005 100644
--- a/indra/newview/skins/default/xui/es/floater_voice_wizard.xml
+++ b/indra/newview/skins/default/xui/es/floater_voice_wizard.xml
@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="0" can_minimize="true" can_resize="false" height="300" left="0"
-     name="floater_voice_wizard" title="Voice Setup" width="420">
-	<tab_container bottom="30" hide_tabs="true" left="4" name="wizard_tabs" right="-2"
-	     tab_position="bottom" top="-20">
-		<panel bottom="0" filename="panel_voice_enable.xml" left="0" right="0" />
-		<panel bottom="0" filename="panel_voice_options.xml" left="0" right="0" />
-		<panel bottom="0" filename="panel_audio_device.xml" left="0" name="device_settings"
-		     right="0" />
+<floater name="floater_voice_wizard" title="Configuración Chat de Voz">
+	<tab_container name="wizard_tabs">
+		<panel filename="panel_voice_enable.xml"/>
+		<panel filename="panel_voice_options.xml"/>
+		<panel filename="panel_audio_device.xml" name="device_settings"/>
 	</tab_container>
-	<panel border="false" bottom="8" height="20" left="8" mouse_opaque="true"
-	     name="content_panel" width="404">
-		<button bottom="0" height="20" label="Previous" left="55" name="back_btn" width="85" />
-		<button bottom="0" height="20" label="Next" left_delta="90" name="next_btn" width="85" />
-		<button bottom="0" height="20" label="Finish" left_delta="90" name="ok_btn" width="85" />
-		<button bottom="0" height="20" label="Cancel" left_delta="90" name="cancel_btn"
-		     width="80" />
+	<panel name="content_panel">
+		<button label="Anterior" name="back_btn"/>
+		<button label="Siguiente" name="next_btn"/>
+		<button label="Finalizar" name="ok_btn"/>
+		<button label="Cancelar" name="cancel_btn"/>
 	</panel>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_water.xml b/indra/newview/skins/default/xui/es/floater_water.xml
index 9dcb96eae..4b68823d4 100644
--- a/indra/newview/skins/default/xui/es/floater_water.xml
+++ b/indra/newview/skins/default/xui/es/floater_water.xml
@@ -1,257 +1,101 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="240" left="50" min_height="200"
-     min_width="400" mouse_opaque="true" name="Water Floater"
-     rect_control="FloaterAdvancedWaterRect" title="Advanced Water Editor"
-     width="700">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-50" drop_shadow_visible="true" follows="left|top|right"
-	     font="SansSerif" h_pad="0" halign="left" height="16"
-	     left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
-	     width="110">
-		Water Presets:
+<floater name="Water Floater" title="Editor Avanzado del Agua">
+	<text name="KeyFramePresetsText">
+		Aguar Predefinida:
 	</text>
-	<combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18"
-	     left_delta="110" max_chars="20" mouse_opaque="true"
-	     name="WaterPresetsCombo" width="150" />
-	<button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="New" label_selected="New" left_delta="170"
-	     mouse_opaque="true" name="WaterNewPreset" scale_image="true" width="70" />
-	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Save" label_selected="Save" left_delta="80"
-	     mouse_opaque="true" name="WaterSavePreset" scale_image="true" width="70" />
-	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Delete" label_selected="Delete" left_delta="80"
-	     mouse_opaque="true" name="WaterDeletePreset" scale_image="true" width="70" />
-	<tab_container bottom="-240" follows="left|top" height="180" left="0"
-	     mouse_opaque="false" name="Water Tabs" tab_position="top" width="700">
-		<panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
-		     label="Settings" left="1" mouse_opaque="false"
-		     name="Settings" width="698">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
-				Water Fog Color
+	<combo_box name="WaterPresetsCombo"/>
+	<button label="Nuevo" label_selected="Nuevo" name="WaterNewPreset"/>
+	<button label="Guardar" label_selected="Guardar" name="WaterSavePreset"/>
+	<button label="Borrar" label_selected="Borrar" name="WaterDeletePreset"/>
+	<tab_container name="Water Tabs">
+		<panel label="Configuraciones" name="Settings">
+			<text name="BHText">
+				Color del Aguar
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="160" name="WaterFogColorHelp" width="18" />
-			<color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom="-80"
-			     can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
-			     height="50" label="" left="40" mouse_opaque="true"
-			     name="WaterFogColor" tool_tip="Click to open Color Picker" width="40" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-90" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="WaterFogDensText" v_pad="0" width="355">
-				Fog Density Exponent
+			<button name="WaterFogColorHelp"/>
+			<color_swatch label="" name="WaterFogColor" tool_tip="Pulsa para abrir el selector de color"/>
+			<text name="WaterFogDensText">
+				Transparencia
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="160" name="WaterFogDensityHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WaterFogDensity"
-			     decimal_digits="1" follows="left" height="10" increment=".1"
-			     initial_val="16" label="" left="24" max_val="10" min_val="0"
-			     mouse_opaque="true" name="WaterFogDensity" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-130" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="WaterUnderWaterFogModText" v_pad="0"
-			     width="355">
-				Underwater Fog Modifier
+			<button label="?" name="WaterFogDensityHelp"/>
+			<slider label="" name="WaterFogDensity"/>
+			<text name="WaterUnderWaterFogModText">
+				Modificador claridad del agua
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="160" name="WaterUnderWaterFogModHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="" decimal_digits="2"
-			     follows="left" height="10" increment=".01" initial_val="16" label=""
-			     left="24" max_val="2" min_val="0" mouse_opaque="true"
-			     name="WaterUnderWaterFogMod" show_text="true" value="0.25" width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
-				Reflection Wavelet Scale
+			<button label="?" name="WaterUnderWaterFogModHelp"/>
+			<slider label="" name="WaterUnderWaterFogMod"/>
+			<text name="BDensText">
+				Escala de Reflexión de Ondulaciones
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="395" name="WaterNormalScaleHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="245" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
+			<button label="?" name="WaterNormalScaleHelp"/>
+			<text name="BHText2">
 				1
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
+			<text name="BHText3">
 				2
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
+			<text name="BHText4">
 				3
 			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WaterNormalScaleX"
-			     decimal_digits="1" follows="left" height="10" increment="0.1"
-			     initial_val="0.7" label="" left="259" max_val="10" min_val="0"
-			     mouse_opaque="true" name="WaterNormalScaleX" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleY"
-			     decimal_digits="1" follows="left" height="10" increment="0.1"
-			     initial_val="0.7" label="" left="259" max_val="10" min_val="0"
-			     mouse_opaque="true" name="WaterNormalScaleY" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WaterNormalScaleZ"
-			     decimal_digits="1" follows="left" height="10" increment="0.1"
-			     initial_val="0.7" label="" left="259" max_val="10" min_val="0"
-			     mouse_opaque="true" name="WaterNormalScaleZ" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-80" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
-				Fresnel Scale
+			<slider label="" name="WaterNormalScaleX"/>
+			<slider label="" name="WaterNormalScaleY"/>
+			<slider label="" name="WaterNormalScaleZ"/>
+			<text name="HDText">
+				Escala Fresnel
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="395" name="WaterFresnelScaleHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelScale"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WaterFresnelScale" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-115" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="FresnelOffsetText" v_pad="0"
-			     width="355">
-				Fresnel Offset
+			<button label="?" name="WaterFresnelScaleHelp"/>
+			<slider label="" name="WaterFresnelScale"/>
+			<text name="FresnelOffsetText">
+				Desplazamiento Fresnel
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="395" name="WaterFresnelOffsetHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WaterFresnelOffset"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WaterFresnelOffset" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
-				Refract Scale Above
+			<button label="?" name="WaterFresnelOffsetHelp"/>
+			<slider label="" name="WaterFresnelOffset"/>
+			<text name="DensMultText">
+				Refracción de la Superficie
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="630" name="WaterScaleAboveHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleAbove"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.1" label="" left="494" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WaterScaleAbove" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-53" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="WaterScaleBelowText" v_pad="0"
-			     width="355">
-				Refract Scale Below
+			<button label="?" name="WaterScaleAboveHelp"/>
+			<slider label="" name="WaterScaleAbove"/>
+			<text name="WaterScaleBelowText">
+				Refracción bajo la Superficie
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="630" name="WaterScaleBelowHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WaterScaleBelow"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0" label="" left="494" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WaterScaleBelow" show_text="true" value="0.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
-				Blur Multiplier
+			<button label="?" name="WaterScaleBelowHelp"/>
+			<slider label="" name="WaterScaleBelow"/>
+			<text name="MaxAltText">
+				Desenfoque
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="630" name="WaterBlurMultiplierHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WaterBlurMult"
-			     decimal_digits="3" follows="left" height="10" increment=".001"
-			     initial_val="0" label="" left="494" max_val=".16" min_val="0"
-			     mouse_opaque="true" name="WaterBlurMult" show_text="true" value="0"
-			     width="200" />
+			<button label="?" name="WaterBlurMultiplierHelp"/>
+			<slider label="" name="WaterBlurMult"/>
 		</panel>
-		<panel border="true" bottom="-240" follows="left|top|right|bottom" height="180"
-		     label="Image" left="1" mouse_opaque="false" name="Waves"
-		     width="698">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
-				Big Wave Direction
+		<panel label="Imagen" name="Waves">
+			<text name="BHText">
+				Dirección de la Ola Grande
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="155" name="WaterWave1Help" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="10" mouse_opaque="true" name="WaterWave1DirXText" v_pad="0"
-			     width="10">
+			<button label="?" name="WaterWave1Help"/>
+			<text name="WaterWave1DirXText">
 				X
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="WaterWave1DirYText" v_pad="0"
-			     width="10">
+			<text name="WaterWave1DirYText">
 				Y
 			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WaterWave1DirX"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-			     mouse_opaque="true" name="WaterWave1DirX" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave1DirY"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-			     mouse_opaque="true" name="WaterWave1DirY" show_text="true" value="0.7"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-70" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="355">
-				Little Wave Direction
+			<slider label="" name="WaterWave1DirX"/>
+			<slider label="" name="WaterWave1DirY"/>
+			<text name="BHText2">
+				Dirección de la Ola Normal
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="155" name="WaterWave2Help" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="10" mouse_opaque="true" name="WaterWave2DirXText" v_pad="0"
-			     width="10">
+			<button label="?" name="WaterWave2Help"/>
+			<text name="WaterWave2DirXText">
 				X
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="WaterWave2DirYText" v_pad="0"
-			     width="10">
+			<text name="WaterWave2DirYText">
 				Y
 			</text>
-			<slider bottom="-100" can_edit_text="false" control_name="WaterWave2DirX"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-			     mouse_opaque="true" name="WaterWave2DirX" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WaterWave2DirY"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="4" min_val="-4"
-			     mouse_opaque="true" name="WaterWave2DirY" show_text="true" value="0.7"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="240" mouse_opaque="true" name="BHText3" v_pad="0" width="355">
-				Normal Map
+			<slider label="" name="WaterWave2DirX"/>
+			<slider label="" name="WaterWave2DirY"/>
+			<text name="BHText3">
+				Vista Normal
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="365" name="WaterNormalMapHelp" width="18" />
-			<texture_picker bottom="-165" height="143" label="" left="250" name="WaterNormalMap"
-			     width="128" />
+			<button label="?" name="WaterNormalMapHelp"/>
+			<texture_picker label="" name="WaterNormalMap"/>
 		</panel>
 	</tab_container>
 	<string name="WLDefaultWaterNames">
diff --git a/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml
index 0284e5527..f9f3141ca 100644
--- a/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml
+++ b/indra/newview/skins/default/xui/es/floater_wearable_save_as.xml
@@ -1,25 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater border="true" bottom="372" can_close="false" can_drag_on_left="false"
-     can_minimize="false" can_resize="false" can_tear_off="true" enabled="true"
-     height="100" left="415" min_height="100" min_width="100"
-     mouse_opaque="true" name="modal container" title="" width="240">
-	<button bottom="-90" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Save" label_selected="Save" left="20" mouse_opaque="true"
-	     name="Save" scale_image="true" width="82" />
-	<button bottom="-90" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Cancel" label_selected="Cancel" left="138" mouse_opaque="true"
-	     name="Cancel" scale_image="true" width="82" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-26" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="16" left="20"
-	     mouse_opaque="true" name="Save item as:" v_pad="0" width="200">
-		Save item as:
+<floater name="modal container" title="">
+	<button label="Guardar" label_selected="Guardar" name="Save"/>
+	<button label="Cancelar" label_selected="Cancelar" name="Cancel"/>
+	<text name="Save item as:">
+		Guardar item como:
 	</text>
-	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-50"
-	     enabled="true" follows="left|top" font="SansSerif"
-	     handle_edit_keys_directly="true" height="20" left="20" max_length="63"
-	     mouse_opaque="true" name="name ed" select_all_on_focus_received="false"
-	     select_on_focus="false" width="200">
-		New [DESC]
+	<line_editor name="name ed">
+		Nuevo [DESC]
 	</line_editor>
 </floater>
diff --git a/indra/newview/skins/default/xui/es/floater_windlight_options.xml b/indra/newview/skins/default/xui/es/floater_windlight_options.xml
index 906e7de49..a23744f3f 100644
--- a/indra/newview/skins/default/xui/es/floater_windlight_options.xml
+++ b/indra/newview/skins/default/xui/es/floater_windlight_options.xml
@@ -1,590 +1,227 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-150" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" height="220" left="50" min_height="180"
-     min_width="400" mouse_opaque="true" name="WindLight floater"
-     rect_control="FloaterAdvancedSkyRect" title="Advanced Sky Editor"
-     width="700">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-50" drop_shadow_visible="true" follows="left|top|right"
-	     font="SansSerif" h_pad="0" halign="left" height="16"
-	     left="10" mouse_opaque="true" name="KeyFramePresetsText" v_pad="0"
-	     width="110">
-		Sky Presets:
+<floater name="WindLight floater" title="Editor Avanzado del Cielo">
+	<text name="KeyFramePresetsText">
+		Cielo Predefinidos:
 	</text>
-	<combo_box allow_text_entry="false" bottom="-50" follows="left|top" height="18"
-	     left_delta="110" max_chars="20" mouse_opaque="true" name="WLPresetsCombo"
-	     width="150" />
-	<button bottom="-53" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="New" label_selected="New" left_delta="170"
-	     mouse_opaque="true" name="WLNewPreset" scale_image="true" width="70" />
-	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Save" label_selected="Save" left_delta="80"
-	     mouse_opaque="true" name="WLSavePreset" scale_image="true" width="70" />
-	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Delete" label_selected="Delete" left_delta="80"
-	     mouse_opaque="true" name="WLDeletePreset" scale_image="true" width="70" />
-	<button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-	     label="Day Cycle Editor" label_selected="Day Cycle Editor"
-	     left_delta="120" mouse_opaque="true" name="WLDayCycleMenuButton"
-	     scale_image="true" width="120" />
-	<tab_container bottom="-220" follows="left|top" height="160" left="0"
-	     mouse_opaque="false" name="WindLight Tabs" tab_position="top" width="700">
-		<panel border="true" bottom="-220" follows="left|top|right|bottom" height="160"
-		     label="Atmosphere" left="1" mouse_opaque="false"
-		     name="Atmosphere" width="698">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="355">
-				Blue Horizon
+	<combo_box name="WLPresetsCombo"/>
+	<button label="Nuevo" label_selected="Nuevo" name="WLNewPreset"/>
+	<button label="Guardar" label_selected="Guardar" name="WLSavePreset"/>
+	<button label="Borrar" label_selected="Borrar" name="WLDeletePreset"/>
+	<button label="Editor Ciclo Diario" label_selected="Editor Ciclo Diario" name="WLDayCycleMenuButton"/>
+	<tab_container name="WindLight Tabs">
+		<panel label="Atmofera" name="Atmosphere">
+			<text name="BHText">
+				Coloración
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="160" name="WLBlueHorizonHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="10" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
+			<button label="?" name="WLBlueHorizonHelp"/>
+			<text name="BHText2">
 				R
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
+			<text name="BHText3">
 				G
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
+			<text name="BHText4">
 				B
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
+			<text name="BHText5">
 				I
 			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WLBlueHorizonR"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueHorizonR" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonG"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueHorizonG" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonB"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueHorizonB" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueHorizonI"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueHorizonI" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="BDensText" v_pad="0" width="355">
-				Haze Horizon
+			<slider label="" name="WLBlueHorizonR"/>
+			<slider label="" name="WLBlueHorizonG"/>
+			<slider label="" name="WLBlueHorizonB"/>
+			<slider label="" name="WLBlueHorizonI"/>
+			<text name="BDensText">
+				Cantidad de la Bruma
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="160" name="WLHazeHorizonHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeHorizon"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.25" label="" left="24" max_val="1.0" min_val="0"
-			     mouse_opaque="true" name="WLHazeHorizon" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="BDensText2" v_pad="0" width="355">
-				Blue Density
+			<button label="?" name="WLHazeHorizonHelp"/>
+			<slider label="" name="WLHazeHorizon"/>
+			<text name="BDensText2">
+				Saturación
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="395" name="WLBlueDensityHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="245" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
+			<button label="?" name="WLBlueDensityHelp"/>
+			<text name="BHText6">
 				R
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
+			<text name="BHText7">
 				G
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
+			<text name="BHText8">
 				B
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10">
+			<text name="BHText9">
 				I
 			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WLBlueDensityR"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueDensityR" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityG"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueDensityG" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityB"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueDensityB" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLBlueDensityI"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLBlueDensityI" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="HDText" v_pad="0" width="355">
-				Haze Density
+			<slider label="" name="WLBlueDensityR"/>
+			<slider label="" name="WLBlueDensityG"/>
+			<slider label="" name="WLBlueDensityB"/>
+			<slider label="" name="WLBlueDensityI"/>
+			<text name="HDText">
+				Densidad de la Bruma
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="395" name="WLHazeDensityHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLHazeDensity"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="4" min_val="0"
-			     mouse_opaque="true" name="WLHazeDensity" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="DensMultText" v_pad="0" width="355">
-				Density Multiplier
+			<button label="?" name="WLHazeDensityHelp"/>
+			<slider label="" name="WLHazeDensity"/>
+			<text name="DensMultText">
+				Densidad
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="630" name="WLDensityMultHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLDensityMult"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.1" label="" left="494" max_val="0.9" min_val="0"
-			     mouse_opaque="true" name="WLDensityMult" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-53" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="WLDistanceMultText" v_pad="0"
-			     width="355">
-				Distance Multiplier
+			<button label="?" name="WLDensityMultHelp"/>
+			<slider label="" name="WLDensityMult"/>
+			<text name="WLDistanceMultText">
+				Distancia
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="630" name="WLDistanceMultHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLDistancMult"
-			     decimal_digits="1" follows="left" height="10" increment="0.1"
-			     initial_val="1.0" label="" left="494" max_val="100" min_val="0"
-			     mouse_opaque="true" name="WLDistanceMult" show_text="true" value="0.0"
-			     width="207" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="MaxAltText" v_pad="0" width="355">
-				Max Altitude
+			<button label="?" name="WLDistanceMultHelp"/>
+			<slider label="" name="WLDistanceMult"/>
+			<text name="MaxAltText">
+				Altitud Máx.
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="630" name="WLMaxAltitudeHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLMaxAltitude"
-			     decimal_digits="0" follows="left" height="10" increment="1"
-			     initial_val="500" label="" left="494" max_val="4000" min_val="0"
-			     mouse_opaque="true" name="WLMaxAltitude" show_text="true" value="4000"
-			     width="205" />
+			<button label="?" name="WLMaxAltitudeHelp">
+			<slider label="" name="WLMaxAltitude"/>
 		</panel>
-		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
-		     label="Lighting" left="1" mouse_opaque="true"
-		     name="Lighting" width="698">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="SLCText" v_pad="0" width="355">
-				Sun/Moon Color
+		<panel label="Iluminación" name="Lighting">
+			<text name="SLCText">
+				Color Sol/Luna
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="160" name="WLSunlightColorHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10">
+			<button label="?" name="WLSunlightColorHelp"/>
+			<text name="BHText">
 				R
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
+			<text name="BHText2">
 				G
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
+			<text name="BHText3">
 				B
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
+			<text name="BHText4">
 				I
 			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WLSunlightR"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLSunlightR" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightG"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLSunlightG" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightB"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLSunlightB" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLSunlightI"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLSunlightI" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="TODText" v_pad="0" width="355">
-				Sun/Moon Position
+			<slider label=""name="WLSunlightR"/>
+			<slider label="" name="WLSunlightG"/>
+			<slider label="" name="WLSunlightB"/>
+			<slider label="" name="WLSunlightI"/>
+			<text name="TODText">
+				Posisción Sol/Luna
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="160" name="WLTimeOfDayHelp" width="18" />
-			<icon bottom_delta="-30" follows="left|top" height="20" image_name="icon_diurnal.tga"
-			     left="30" name="SkyDayCycle" width="148" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLSunAngle"
-			     decimal_digits="3" follows="left" height="10" increment="0.001"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLSunAngle" show_text="true" value="1.0"
-			     width="204" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="WLAmbientText" v_pad="0" width="355">
-				Ambient
+			<button label="?" name="WLTimeOfDayHelp"/>
+			<slider label="" name="WLSunAngle"/>
+			<text name="WLAmbientText">
+				Ambiente
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="395" name="WLAmbientHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="245" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
+			<button label="?" name="WLAmbientHelp"/>
+			<text name="BHText5">
 				R
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
+			<text name="BHText6">
 				G
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
+			<text name="BHText7">
 				B
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
+			<textname="BHText8">
 				I
 			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WLAmbientR" decimal_digits="2"
-			     follows="left" height="10" increment="0.01" initial_val="0.7" label=""
-			     left="259" max_val="1" min_val="0" mouse_opaque="true" name="WLAmbientR"
-			     show_text="true" value="1.0" width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientG"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLAmbientG" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientB"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLAmbientB" show_text="true" value="1.0"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLAmbientI"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLAmbientI" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="WLEastAngleText" v_pad="0" width="355">
-				East Angle
+			<slider label="" name="WLAmbientR"  />
+			<slider label="" name="WLAmbientG"/>
+			<slider label="" name="WLAmbientB"/>
+			<slider label="" name="WLAmbientI"/>
+			<text name="WLEastAngleText">
+				�ngulo de elevación
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="395" name="WLEastAngleHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLEastAngle"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.0" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLEastAngle" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="SunGlowText" v_pad="0" width="355">
-				Sun Glow
+			<button label="?" name="WLEastAngleHelp"/>
+			<slider label="" name="WLEastAngle"/>
+			<text name="SunGlowText">
+				Resplandor del Sol
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="630" name="WLSunGlowHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLGlowB"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.1" label="Focus " left="494" max_val="0.5" min_val="0"
-			     mouse_opaque="true" name="WLGlowB" show_text="true" value="1.0" width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLGlowR"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.25" label="Size    " left="494" max_val="1.99" min_val="1"
-			     mouse_opaque="true" name="WLGlowR" show_text="true" value="1.0" width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-67" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="SceneGammaText" v_pad="0" width="200">
-				Scene Gamma
+			<button label="?" name="WLSunGlowHelp"/>
+			<slider label="Visión" name="WLGlowB"/>
+			<slider label="Tamaño  " name="WLGlowR"/>
+			<text name="SceneGammaText">
+				Gamma de la escena
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="630" name="WLSceneGammaHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLGamma"
-			     decimal_digits="2" follows="bottom" height="10" increment="0.01"
-			     initial_val="2.0" label="" left="494" max_val="10.0" min_val="0"
-			     mouse_opaque="true" name="WLGamma" show_text="true" value="2.0" width="207" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-102" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="WLStarText" v_pad="0" width="355">
-				Star Brightness
+			<button label="?" name="WLSceneGammaHelp"/>
+			<slider label="" name="WLGamma"/>
+			<text name="WLStarText">
+				Brillo de las Estrellas
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="630" name="WLStarBrightnessHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLStarAlpha"
-			     decimal_digits="2" follows="bottom" height="10" increment="0.01"
-			     initial_val="0" label="" left="494" max_val="2" min_val="0"
-			     mouse_opaque="true" name="WLStarAlpha" show_text="true" value="0"
-			     width="200" />
+			<button label="?" name="WLStarBrightnessHelp"/>
+			<slider label="" name="WLStarAlpha"/>
 		</panel>
-		<panel border="true" bottom="-180" follows="left|top|right|bottom" height="160"
-		     label="Clouds" left="1" mouse_opaque="false" name="Clouds"
-		     width="698">
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="WLCloudColorText" v_pad="0" width="355">
-				Cloud Color
+		<panel label="Nubes" name="Clouds">
+			<text name="WLCloudColorText">
+				Color de las Nubes
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="160" name="WLCloudColorHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-37" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="10" mouse_opaque="true" name="BHText" v_pad="0" width="10">
+			<button label="?" name="WLCloudColorHelp"/>
+			<text name="BHText">
 				R
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText2" v_pad="0" width="10">
+			<text name="BHText2">
 				G
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText3" v_pad="0" width="10">
+			<text name="BHText3">
 				B
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText4" v_pad="0" width="10">
+			<text name="BHText4">
 				I
 			</text>
-			<slider bottom="-50" can_edit_text="false" control_name="WLCloudColorR"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudColorR" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorG"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudColorG" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorB"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.7" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudColorB" show_text="true" value="0.7"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudColorI"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudColorI" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="10" mouse_opaque="true" name="WLCloudColorText2" v_pad="0"
-			     width="355">
-				Cloud XY/Density
+			<slider label="" name="WLCloudColorR"/>
+			<slider label="" name="WLCloudColorG"/>
+			<slider label="" name="WLCloudColorB"/>
+			<slider label="" name="WLCloudColorI"/>
+			<text name="WLCloudColorText2">
+				Posisición/Densidad de las Nubes
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="160" name="WLCloudDensityHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-103" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="10" mouse_opaque="true" name="BHText5" v_pad="0" width="10">
+			<button label="?" name="WLCloudDensityHelp"/>
+			<text name="BHText5">
 				X
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText6" v_pad="0" width="10">
+			<text name="BHText6">
 				Y
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText7" v_pad="0" width="10">
+			<text name="BHText7">
 				D
 			</text>
-			<slider bottom="-117" can_edit_text="false" control_name="WLCloudX" decimal_digits="2"
-			     follows="left" height="10" increment="0.01" initial_val="0.5" label=""
-			     left="24" max_val="1" min_val="0" mouse_opaque="true" name="WLCloudX"
-			     show_text="true" value="0.5" width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudY"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.5" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudY" show_text="true" value="0.5"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDensity"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1.0" label="" left="24" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudDensity" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="WLCloudCoverageText" v_pad="0"
-			     width="355">
-				Cloud Coverage
+			<slider label="" name="WLCloudX"/>
+			<slider label="" name="WLCloudY"/>
+			<slider label="" name="WLCloudDensity"/>
+			<text name="WLCloudCoverageText">
+				Nubosidad
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="395" name="WLCloudCoverageHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudCoverage"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.5" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudCoverage" show_text="true" value="0.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-55" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="WLCloudScaleText" v_pad="0"
-			     width="355">
-				Cloud Scale
+			<button label="?" name="WLCloudCoverageHelp"/>
+			<slider label="" name="WLCloudCoverage"/>
+			<text name="WLCloudScaleText">
+				Altitud de la Nubes
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="395" name="WLCloudScaleHelp" width="18" />
-			<slider bottom_delta="-30" can_edit_text="false" control_name="WLCloudScale"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1.0" label="" left="259" max_val="1.0" min_val="0.01"
-			     mouse_opaque="true" name="WLCloudScale" show_text="true" value="1.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-87" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="245" mouse_opaque="true" name="WLCloudDetailText" v_pad="0"
-			     width="355">
-				Cloud Detail (XY/Density)
+			<button label="?" name="WLCloudScaleHelp"/>
+			<slider label="" name="WLCloudScale"/>
+			<text name="WLCloudDetailText">
+				Detalle de las Nubes
+(Posición/Densidad)
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="395" name="WLCloudDetailHelp" width="18" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-103" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left="245" mouse_opaque="true" name="BHText8" v_pad="0" width="10">
+			<button label="?" name="WLCloudDetailHelp"/>
+			<text name="BHText8">
 				X
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText9" v_pad="0" width="10">
+			<text name="BHText9">
 				Y
 			</text>
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-11" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="center" height="16"
-			     left_delta="0" mouse_opaque="true" name="BHText10" v_pad="0" width="10">
+			<text name="BHText10">
 				D
 			</text>
-			<slider bottom="-117" can_edit_text="false" control_name="WLCloudDetailX"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.5" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudDetailX" show_text="true" value="0.5"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDetailY"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.5" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudDetailY" show_text="true" value="0.5"
-			     width="200" />
-			<slider bottom_delta="-11" can_edit_text="false" control_name="WLCloudDetailDensity"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="1.0" label="" left="259" max_val="1" min_val="0"
-			     mouse_opaque="true" name="WLCloudDetailDensity" show_text="true"
-			     value="1.0" width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="WLCloudScrollXText" v_pad="0"
-			     width="355">
-				Cloud Scroll X
+			<slider label="" name="WLCloudDetailX"/>
+			<slider label="" name="WLCloudDetailY"/>
+			<slider label="" name="WLCloudDetailDensity"/>
+			<text name="WLCloudScrollXText">
+				Velocidad Nubes en X
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="605" name="WLCloudScrollXHelp" width="18" />
-			<check_box control_name="WLCloudLockX" follows="left" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Lock" left="625" mouse_opaque="true"
-			     name="WLCloudLockX" width="200" />
-			<slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollX"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.5" label="" left="494" max_val="10" min_val="-10"
-			     mouse_opaque="true" name="WLCloudScrollX" show_text="true" value="0.0"
-			     width="200" />
-			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-60" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerif" h_pad="0" halign="left" height="16"
-			     left="480" mouse_opaque="true" name="WLCloudScrollYText" v_pad="0"
-			     width="355">
-				Cloud Scroll Y
+			<button label="?" name="WLCloudScrollXHelp"/>
+			<check_box label="Bloquear" name="WLCloudLockX"/>
+			<slider label="" name="WLCloudScrollX"/>
+			<text name="WLCloudScrollYText">
+				Velocidad Nubes en Y
 			</text>
-			<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="605" name="WLCloudScrollYHelp" width="18" />
-			<check_box control_name="WLCloudLockY" follows="left" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Lock" left="625" mouse_opaque="true"
-			     name="WLCloudLockY" width="200" />
-			<slider bottom_delta="-15" can_edit_text="false" control_name="WLCloudScrollY"
-			     decimal_digits="2" follows="left" height="10" increment="0.01"
-			     initial_val="0.5" label="" left="494" max_val="10" min_val="-10"
-			     mouse_opaque="true" name="WLCloudScrollY" show_text="true" value="0.0"
-			     width="200" />
-			<check_box bottom="-120" control_name="DrawClassicClouds" follows="left"
-			     font="SansSerifSmall" height="16" initial_value="false"
-			     label="Draw Classic Clouds" left="480" mouse_opaque="true"
-			     name="DrawClassicClouds" width="200" />
-			<button bottom="-102" follows="left|top" font="SansSerifSmall" height="18" label="?"
-			     left="608" name="WLClassicCloudsHelp" width="18" />
+			<button label="?" name="WLCloudScrollYHelp"/>
+			<check_box label="Bloquear" name="WLCloudLockY"/>
+			<slider label="" name="WLCloudScrollY"/>
+			<check_box label="Dibujar Nubes Clásicas" name="DrawClassicClouds"/>
+			<button label="?" name="WLClassicCloudsHelp"/>
 		</panel>
 	</tab_container>
 	<string name="WLDefaultSkyNames">
diff --git a/indra/newview/skins/default/xui/es/floater_world_map.xml b/indra/newview/skins/default/xui/es/floater_world_map.xml
index ebbda0fc8..ccbd29fcb 100644
--- a/indra/newview/skins/default/xui/es/floater_world_map.xml
+++ b/indra/newview/skins/default/xui/es/floater_world_map.xml
@@ -1,178 +1,58 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-     height="711" min_height="520" min_width="410" name="worldmap"
-     rect_control="FloaterWorldMapRect2" title="World Map" width="1243">
-	<panel bottom="-701" follows="left|top|right|bottom" height="681"
-		 left="15" mouse_opaque="true" name="objects_mapview" width="995" />
-	<icon bottom="-50" color="1, 1, 1, 1" follows="top|right" height="16"
-	     image_name="map_avatar_16.tga" left="1013" mouse_opaque="true" name="self"
-	     width="16" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-50" drop_shadow_visible="true" follows="top|right"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
-	     mouse_opaque="true" name="you_label" v_pad="0" width="145">
-		You
+<floater name="worldmap" title="Mapa del Mundo">
+	<panel name="objects_mapview"/>
+	<text name="you_label">
+		Tu
 	</text>
-	<icon bottom="-50" color="1, 1, 1, 1" follows="top|right" height="16"
-	     image_name="map_home.tga" left="1083" mouse_opaque="true" name="home"
-	     width="16" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-50" drop_shadow_visible="true" follows="top|right"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
-	     mouse_opaque="true" name="home_label" v_pad="0" width="145">
-		Home
+	<text name="home_label">
+		Base
 	</text>
-	<icon bottom="-70" color="0.5, 0.25, 1, 1" follows="top|right" height="16"
-	     image_name="legend.tga" left="1013" mouse_opaque="true" name="square2"
-	     width="16" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-70" drop_shadow_visible="true" follows="top|right"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
-	     mouse_opaque="true" name="auction_label" v_pad="0" width="145">
-		Auction
+	<text name="auction_label">
+		Subasta
 	</text>
-	<icon bottom="-70" color="1, 1, 0.25, 1" follows="top|right" height="16"
-	     image_name="legend.tga" left="1083" mouse_opaque="true" name="square"
-	     width="16" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-70" drop_shadow_visible="true" follows="top|right"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
-	     mouse_opaque="true" name="land_for_sale_label" v_pad="0" width="145">
-		Land For Sale
+	<text name="land_for_sale_label">
+		Terreno en Venta
 	</text>
-	<button bottom="-50" follows="top|right" font="SansSerifSmall" halign="center"
-	     height="16" label="Go Home" label_selected="Go Home" left="1150"
-	     mouse_opaque="true" name="Go Home" tool_tip="Teleport to your home"
-	     width="88" />
-	<icon bottom="-92" color="0, 1, 0, 1" follows="top|right" height="8"
-		image_name="map_avatar_8.tga" left="1017" mouse_opaque="true" name="person"
-		width="8" />
-	<check_box bottom="-96" control_name="MapShowPeople" follows="top|right"
-		font="SansSerifSmall" height="16" initial_value="false" label="Resident"
-		left_delta="16" mouse_opaque="true" name="people_chk" width="110" />
-	<icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"
-		image_name="map_infohub.tga" left="1013" mouse_opaque="true" name="infohub"
-		width="16" />
-	<check_box bottom="-116" control_name="MapShowInfohubs" follows="top|right"
-		font="SansSerifSmall" height="16" initial_value="false" label="Infohub"
-		left_delta="20" mouse_opaque="true" name="infohub_chk" width="110" />
-	<icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16"
-		image_name="map_telehub.tga" left="1013" mouse_opaque="true" name="telehub"
-		width="16" />
-	<check_box bottom="-136" control_name="MapShowTelehubs" follows="top|right"
-		font="SansSerifSmall" height="16" initial_value="false" label="Telehub"
-		left_delta="20" mouse_opaque="true" name="telehubchk" width="110" />
-	<icon bottom="-156" color="1, 1, 1, 1" follows="top|right" height="16"
-	     image_name="icon_for_sale.tga" left="1013" mouse_opaque="true"
-	     name="landforsale" width="16" />
-	<check_box bottom="-156" control_name="MapShowLandForSale" follows="top|right"
-	     font="SansSerifSmall" height="16" initial_value="false" label="Land for Sale"
-	     left_delta="20" mouse_opaque="true" name="land_for_sale_chk" width="110" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-96" drop_shadow_visible="true" follows="top|right"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="1139"
-	     mouse_opaque="true" name="events_label" v_pad="0" width="145">
-		Events:
+	<button label="Ir a Base" label_selected="Ir a Base" name="Go Home" tool_tip="Teleportar a tu Base"/>
+	<check_box label="Residente" name="people_chk"/>
+	<check_box label="Punto Info" name="infohub_chk"/>
+	<check_box label="Punto de Enlace" name="telehubchk"/>
+	<check_box label="Terreno en Venta" name="land_for_sale_chk"/>
+	<text name="events_label">
+		Eventos:
 	</text>
-	<icon bottom="-116" color="1, 1, 1, 1" follows="top|right" height="16"
-	     image_name="map_event.tga" left="1151" mouse_opaque="true" name="event"
-	     width="16" />
-	<check_box bottom="-116" control_name="MapShowPGEvents" follows="top|right"
-	     font="SansSerifSmall" height="16" initial_value="false" label="PG"
-	     left_delta="20" mouse_opaque="true" name="event_chk" width="55" />
-	<icon bottom="-136" color="1, 1, 1, 1" follows="top|right" height="16"
-	     image_name="map_event_mature.tga" left="1151" mouse_opaque="true"
-	     name="events_mature_icon" width="16" />
-	<check_box bottom="-136" control_name="MapShowMatureEvents" follows="top|right"
-	     font="SansSerifSmall" height="16" initial_value="true" label="Mature"
-	     left_delta="20" mouse_opaque="true" name="event_mature_chk" width="55" />
-	<icon bottom="-156" color="1, 1, 1, 1" follows="top|right" height="16"
-	     image_name="map_event_adult.tga" left="1151" mouse_opaque="true"
-	     name="events_adult_icon" width="16" />
-	<check_box bottom="-156" control_name="MapShowAdultEvents" follows="top|right"
-	     font="SansSerifSmall" height="16" initial_value="false" label="Adult"
-	     left_delta="20" mouse_opaque="true" name="event_adult_chk" width="55" />
-	<icon bottom="-180" color="0.5, 0, 0, 1" follows="top|right" height="16"
-	     image_name="map_track_16.tga" left="1013" mouse_opaque="true"
-	     name="avatar_icon" width="16" />
-	<combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
-	     label="Online Friends" left_delta="20" max_chars="60" mouse_opaque="true"
-	     name="friend combo" tool_tip="Friend to Show on Map" width="202">
-		<combo_item name="none_selected" value="None">
-			Online Friends
+	<check_box label="PG" name="event_chk"/>
+	<check_box label="Mature" name="event_mature_chk"/>
+	<check_box label="Adulto" name="event_adult_chk"/>
+	<combo_box label="Amigos Conectados" name="friend combo" tool_tip="Mostrar amigos en el mapa">
+		<combo_item name="none_selected">
+			Amigos Conectados
 		</combo_item>
 	</combo_box>
-	<icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"
-	     image_name="map_track_16.tga" left="1013" mouse_opaque="true"
-	     name="landmark_icon" width="16" />
-	<combo_box allow_text_entry="true" bottom_delta="0" follows="top|right" height="20"
-	     label="Landmarks" left_delta="20" max_chars="64" mouse_opaque="true"
-	     name="landmark combo" tool_tip="Landmark to Show on Map" width="202">
-		<combo_item name="none_selected" value="None">
-			Landmarks
+	<combo_box label="Hitos" name="landmark combo" tool_tip="Hitos a mostrar en el Mapa">
+		<combo_item name="none_selected">
+			Hitos
 		</combo_item>
 	</combo_box>
-	<icon bottom_delta="-25" color="0.5, 0, 0, 1" follows="top|right" height="16"
-	     image_name="map_track_16.tga" left="1013" mouse_opaque="true"
-	     name="location_icon" width="16" />
-	<line_editor bottom_delta="0" follows="top|right" height="20" label="Search by Region Name"
-	     left_delta="20" name="location" select_on_focus="true"
-	     tool_tip="Type the name of a region" width="140" />
-	<button bottom_delta="0" follows="top|right" font="SansSerif" halign="center"
-	     height="20" label="Search" left_delta="145" mouse_opaque="true"
-	     name="DoSearch" tool_tip="Search for region" width="60" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-20" drop_shadow_visible="true" follows="top|right"
-	     font="SansSerif" h_pad="0" halign="left" height="16" left="1013"
-	     mouse_opaque="true" name="search_label" v_pad="0" width="222">
-		Search Results:
+	<line_editor label="Buscar por Nombre de Región" name="location" tool_tip="Escribe el nombre de la región"/>
+	<button label="Buscar" name="DoSearch" tool_tip="Buscar Región"/>
+	<text name="search_label">
+		Resultados de la Búsqueda:
 	</text>
-	<scroll_list background_visible="true" bottom_delta="-326" draw_border="true"
-	     draw_stripes="false" 
-	     follows="top|right|bottom" height="320" left="1013" multi_select="false"
-	     name="search_results" width="222">
-		<column label="" name="icon" width="16" />
-		<column label="" name="sim_name" width="206" />
+	<scroll_list name="search_results">
+		<column label="" name="icon"/>
+		<column label="" name="sim_name"/>
 	</scroll_list>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-20" drop_shadow_visible="true" follows="bottom|right"
-	     font="SansSerif" h_pad="0" halign="left" height="16" left="1013"
-	     mouse_opaque="true" name="location_label" v_pad="0" width="98">
-		Location:
+	<text name="location_label">
+		Ubicación:
 	</text>
-	<spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
-	     increment="1" initial_val="128" left="1090" max_val="255" min_val="0"
-	     mouse_opaque="true" name="spin x"
-	     tool_tip="X coordinate of location to show on map" width="48" />
-	<spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
-	     increment="1" initial_val="128" left_delta="50" max_val="255" min_val="0"
-	     mouse_opaque="true" name="spin y"
-	     tool_tip="Y coordinate of location to show on map" width="48" />
-	<spinner bottom_delta="0" decimal_digits="0" follows="bottom|right" height="16"
-	     increment="1" initial_val="0" left_delta="50" max_val="4096" min_val="0"
-	     mouse_opaque="true" name="spin z"
-	     tool_tip="Z coordinate of location to show on map" width="48" />
-	<button bottom="-625" follows="right|bottom" font="SansSerif" halign="center"
-	     height="20" label="Teleport" label_selected="Teleport" left="-230"
-	     mouse_opaque="true" name="Teleport"
-	     tool_tip="Teleport to selected location" width="90" />
-	<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
-	     height="20" label="Show Destination" label_selected="Show Destination"
-	     left_delta="100" mouse_opaque="true" name="Show Destination"
-	     tool_tip="Center map on selected location" width="125" />
-	<button bottom_delta="-24" follows="right|bottom" font="SansSerif" halign="center"
-	     height="20" label="Clear" label_selected="Clear" left="-230"
-	     mouse_opaque="true" name="Clear" tool_tip="Stop tracking" width="90" />
-	<button bottom_delta="0" follows="right|bottom" font="SansSerif" halign="center"
-	     height="20" label="Show My Location" label_selected="Show My Location"
-	     left_delta="100" mouse_opaque="true" name="Show My Location"
-	     tool_tip="Center map on your avatar&apos;s location" width="125" />
-	<button bottom_delta="-24" enabled="false" follows="bottom|right" font="SansSerif"
-	     height="20" label="Copy SLURL to clipboard" left="-230" name="copy_slurl"
-	     tool_tip="Copies current location as SLURL to be used on the web."
-	     width="222" />
-	<slider bottom="-697" can_edit_text="false" decimal_digits="3" follows="right|bottom"
-	     height="16" increment="0.2" initial_val="48.5029" label="Zoom" left="-230"
-	     max_val="0" min_val="-8" mouse_opaque="true" name="zoom slider"
-	     show_text="false" value="48.5029" width="222" />
+	<spinner name="spin x" tool_tip="Coordenada X de la ubicación para mostrar en el mapa"/>
+	<spinner name="spin y" tool_tip="Coordenada Y de la ubicación para mostrar en el mapa"/>
+	<spinner name="spin z" tool_tip="Coordenada Z de la ubicación para mostrar en el mapa"/>
+	<button label="Teleportar" label_selected="Teleportar" name="Teleport" tool_tip="Teleportar a la ubicación seleccionada"/>
+	<button label="Mostrar Destino" label_selected="Mostrar Destino" name="Show Destination" tool_tip="Centrar el mapa en la ubicación seleccionada"/>
+	<button label="Limpiar" label_selected="Limpiar" name="Clear" tool_tip="Detener la búsqueda"/>
+	<button label="Mostrar mi ubicación" label_selected="Mostrar mi ubicación" name="Show My Location" tool_tip="Centrar el mapa en la ubicación de tu avatar"/>
+	<button label="Copiar el SLURL al  portapapeles" name="copy_slurl" tool_tip="Copia el SLURL de la actua ubicación para poder utilizarlo en la web"/>
+	<slider label="Zoom" name="zoom slider" />
 </floater>
diff --git a/indra/newview/skins/default/xui/es/fonts.xml b/indra/newview/skins/default/xui/es/fonts.xml
index 78114c9de..0c360a04e 100644
--- a/indra/newview/skins/default/xui/es/fonts.xml
+++ b/indra/newview/skins/default/xui/es/fonts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <fonts>
 
-  <font name="default" comment="default font files (global fallbacks)">
+  <font name="default" comment="archivos de fuentes por defecto (Respaldos Globales)">
     <file>DejaVuSansCondensed.ttf</file>
     <os name="Windows">
       <file>MSGOTHIC.TTC</file>
@@ -20,91 +20,58 @@
     </os>
   </font>
 
-  <font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
+  <font name="SansSerif" comment="Nombre de la fuente san-serif (Nombre del archivo Truetype)">
     <file>DroidSans.ttf</file>
   </font>
 
-  <font name="SansSerifBold" 
-	comment="Name of bold sans-serif font" 
-	font_style="Bold">
+  <font name="SansSerifBold" comment="Nombre de la fuente bold sans-serif" font_style="Bold">
 	<file>DroidSans-Bold.ttf</file>
   </font>
 
-  <font name="Monospace"
-	comment="Name of monospace font">
-    <file>DejaVuSansMono.ttf</file>
+  <font name="Monospace" comment="Nombre de la fuente monospace">
+		<file>DejaVuSansMono.ttf</file>
   </font>
 
-  <font name="DejaVu"
-	comment="Name of DejaVu font">
+  <font name="DejaVu" comment="Nombre de la fuente DejaVu">
     <file>DejaVuSans.ttf</file>
   </font>
 
-  <font name="DejaVu"
-	comment="Name of DejaVu font (bold)"
-	font_style="BOLD">
+  <font name="DejaVu" comment="Nombre de la fuente DejaVu (Negrita)" font_style="BOLD">
     <file>DejaVuSansBold.ttf</file>
   </font>
 
-  <font name="DejaVu"
-	comment="Name of DejaVu font (italic)"
-	font_style="ITALIC">
+  <font name="DejaVu" comment="Nombre de la fuente DejaVu (itálica)" font_style="ITALIC">
     <file>DejaVuSansOblique.ttf</file>
   </font>
 
-  <font name="DejaVu"
-	comment="Name of DejaVu font (bold italic)"
-	font_style="BOLD|ITALIC">
+  <font name="DejaVu" comment="Nombre de la fuente DejaVu (Itálica negrita)" font_style="BOLD|ITALIC">
     <file>DejaVuSansBoldOblique.ttf</file>
   </font>
 
-  <font name="Helvetica"
-	comment="Name of Helvetica font">
+  <font name="Helvetica" comment="Nombre de la fuente Helvetica"> 
     <file>arial.ttf</file>
   </font>
 
-  <font name="Helvetica"
-	comment="Name of Helvetica font (bold)"
-	font_style="BOLD">
+  <font name="Helvetica" comment="Nombre de la fuente Helvetica (Negrita)" font_style="BOLD">
     <file>arialbd.ttf</file>
   </font>
 
-  <font name="Helvetica"
-	comment="Name of Helvetica font (italic)"
-	font_style="ITALIC">
+  <font name="Helvetica" comment="Nombre de la fuente Helvetica (itálica)" font_style="ITALIC">
     <file>ariali.ttf</file>
   </font>
 
-  <font name="Helvetica"
-	comment="Name of Helvetica font (bold italic)"
-	font_style="BOLD|ITALIC">
+  <font name="Helvetica" comment="Nombre de la fuente Helvetica (Negrita Itálica)" font_style="BOLD|ITALIC">
     <file>arialbi.ttf</file>
   </font>
 
-  <font name="OverrideTest"
-	comment="Name of font to test overriding">
+  <font name="OverrideTest" comment=" Nombre de la fuente de prueba de sobreescritura">
     <file>times.ttf</file>
   </font>
 
-  <font_size name="Monospace"
-	     comment="Size for monospaced font (points, or 1/72 of an inch)"
-	     size="9.0"
-	     />
-  <font_size name="Huge"
-	     comment="Size of huge font (points, or 1/72 of an inch)"
-	     size="14.0"
-	     />
-  <font_size name="Large"
-	     comment="Size of large font (points, or 1/72 of an inch)"
-	     size="11.0"
-	     />
-  <font_size name="Medium"
-	     comment="Size of medium font (points, or 1/72 of an inch)"
-	     size="9.5"
-	     />
-  <font_size name="Small"
-	     comment="Size of small font (points, or 1/72 of an inch)"
-	     size="8.5"
-	     />
+  <font_size name="Monospace" comment="Tamaño de la fuente monospaced  (puntos, o 1/72 de una pulgada)" size="9.0"/>
+  <font_size name="Huge" comment="Tamaño de la fuente grande (puntos, o 1/72 de una pulgada)" size="14.0"/>
+  <font_size name="Large" comment="Tamaño de la fuente larga (puntos, o 1/72 de una pulgada)" size="11.0"/>
+  <font_size name="Medium" comment="Tamaño de la fuente media (puntos, o 1/72 de  una pulgada)" size="9.5"/>
+  <font_size name="Small" comment="Tamaño de la fuente pequeña (puntos, o 1/72 de una pulgada)" size="8.5"/>
 </fonts>
 
diff --git a/indra/newview/skins/default/xui/es/menu_login.xml b/indra/newview/skins/default/xui/es/menu_login.xml
index a46385b51..4355de976 100644
--- a/indra/newview/skins/default/xui/es/menu_login.xml
+++ b/indra/newview/skins/default/xui/es/menu_login.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar bottom="-18" drop_shadow="false" enabled="true" follows="left|top|right"
-     height="18" left="0" mouse_opaque="true" name="Login Menu" opaque="true"
-     tear_off="false" width="802">
+<menu_bar name="Login Menu">
 	<menu name="File" label="Archivo" >
 		<menu_item_call name="Quit" label="Salir" >
 			<on_click function="File.Quit" userdata="" />
diff --git a/indra/newview/skins/default/xui/es/menu_mini_map.xml b/indra/newview/skins/default/xui/es/menu_mini_map.xml
index 5e7455754..b06364201 100644
--- a/indra/newview/skins/default/xui/es/menu_mini_map.xml
+++ b/indra/newview/skins/default/xui/es/menu_mini_map.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu bottom="100" color="MenuDefaultBgColor" drop_shadow="true" height="101" left="100"
-	 mouse_opaque="false" name="popup" opaque="true" width="128">
+<menu name="popup">
 	<menu_item_call name="Zoom Close" label="Acercar" >
 		<on_click function="MiniMap.ZoomLevel" userdata="2" />
 	</menu_item_call>
@@ -32,9 +31,7 @@
 		<on_click function="MiniMap.CamFollow" />
 		<on_enable function="MiniMap.EnableProfile" />
 	</menu_item_call>
-	<menu bottom_delta="0" color="MenuDefaultBgColor" drop_shadow="true" height="175" left="0"
-	     mouse_opaque="false" name="Mark" opaque="true" tear_off="false"
-	     width="125">
+	<menu name="Mark">
 		<on_enable function="MiniMap.EnableProfile" />
 		<menu_item_call name="Red" label="Rojo" >
 			<on_click function="MiniMap.setred" />
diff --git a/indra/newview/skins/default/xui/es/menu_pie_attachment.xml b/indra/newview/skins/default/xui/es/menu_pie_attachment.xml
index 4308b5d42..e712d1794 100644
--- a/indra/newview/skins/default/xui/es/menu_pie_attachment.xml
+++ b/indra/newview/skins/default/xui/es/menu_pie_attachment.xml
@@ -15,12 +15,12 @@
 			 <on_click function="Self.StandUp" userdata="" />
 			 <on_enable function="Self.EnableStandUp" />
 	  </menu_item_call>
-	  <menu_item_call enabled="false" label="Quitar" mouse_opaque="true" name="Detach">
+	  <menu_item_call label="Quitar" name="Detach">
 			 <on_click function="Attachment.Detach" />
 			 <on_enable function="Attachment.EnableDetach" />
 	  </menu_item_call>
 	  <pie_menu label="Herramientas &gt;" name="Tools &gt;">
-			 <menu_item_call label="S. Count" mouse_opaque="true" name="ScriptCount">
+			 <menu_item_call label="S. Count" name="ScriptCount">
 					<on_click function="Object.ScriptCount" />
 					<on_visible function="Object.VisibleScriptCount" />
 			 </menu_item_call>
@@ -28,7 +28,7 @@
 					<on_click function="Object.Inspect" />
 					<on_enable function="Object.EnableInspect"/>
 			 </menu_item_call>
-			 <menu_item_call label="Data" name="Data">
+			 <menu_item_call label="Datos" name="Data">
 					<on_click function="Object.Data" />
 			 </menu_item_call>
 			 <menu_item_call label="Derender" name="Derender">
diff --git a/indra/newview/skins/default/xui/es/menu_pie_object.xml b/indra/newview/skins/default/xui/es/menu_pie_object.xml
index 129ba4e87..c0ed80232 100644
--- a/indra/newview/skins/default/xui/es/menu_pie_object.xml
+++ b/indra/newview/skins/default/xui/es/menu_pie_object.xml
@@ -89,12 +89,12 @@
 				<on_enable function="Object.EnableReportAbuse" />
 			</menu_item_call>
 		</pie_menu>
-		<menu_item_call enabled="false" label="Comprar..." name="Buy...">
+		<menu_item_call label="Comprar..." name="Buy...">
 			<on_click function="Object.Buy" />
 			<on_enable function="Object.EnableBuy" />
 		</menu_item_call>
 	</pie_menu>
-	<menu_item_call enabled="false" label="Editar..." name="Edit...">
+	<menu_item_call label="Editar..." name="Edit...">
 		<on_click function="Object.Edit" />
 		<on_enable function="EnableEdit" />
 	</menu_item_call>
diff --git a/indra/newview/skins/default/xui/es/menu_pie_self.xml b/indra/newview/skins/default/xui/es/menu_pie_self.xml
index 0d0e72dca..4ef8b18d3 100644
--- a/indra/newview/skins/default/xui/es/menu_pie_self.xml
+++ b/indra/newview/skins/default/xui/es/menu_pie_self.xml
@@ -49,7 +49,7 @@
 					<on_click function="Edit.TakeOff" userdata="alpha" />
 					<on_enable function="Edit.EnableTakeOff" userdata="alpha" />
 				</menu_item_call>
-				<menu_item_call label="Calzoncillos" name="Self Underpants" >
+				<menu_item_call label="Ropa Interior" name="Self Underpants" >
 					<on_click function="Edit.TakeOff" userdata="underpants" />
 					<on_enable function="Edit.EnableTakeOff" userdata="underpants" />
 				</menu_item_call>
diff --git a/indra/newview/skins/default/xui/es/menu_slurl.xml b/indra/newview/skins/default/xui/es/menu_slurl.xml
index 5ec4f662c..5072c76e7 100644
--- a/indra/newview/skins/default/xui/es/menu_slurl.xml
+++ b/indra/newview/skins/default/xui/es/menu_slurl.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu bottom="100" color="0, 0, 0, 1" drop_shadow="true" height="101" left="100"
-     mouse_opaque="false" name="Popup" opaque="true" width="128">
+<menu name="Popup">
 	<menu_item_separator name="Landmark Separator" />
 	<menu_item_call label="Acerca de la URL" name="about_url" >
 		<on_click filter="" function="Inventory.DoToSelected" userdata="about" />
diff --git a/indra/newview/skins/default/xui/es/mime_types_linux.xml b/indra/newview/skins/default/xui/es/mime_types_linux.xml
index e95b371d0..4f848d7d3 100644
--- a/indra/newview/skins/default/xui/es/mime_types_linux.xml
+++ b/indra/newview/skins/default/xui/es/mime_types_linux.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <mimetypes name="default">
 	<defaultlabel>
-		(Unknown)
+		(Desconocido)
 	</defaultlabel>
 	<defaultwidget>
-		none
+		ninguno
 	</defaultwidget>
 	<defaultimpl>
 		media_plugin_webkit
 	</defaultimpl>
 	<widgetset name="web">
 		<label name="web_label">
-			Web Content
+			Contenido Web
 		</label>
 		<icon>
 			icn_media_web.tga
@@ -20,21 +20,21 @@
 			text/html
 		</default_type>
 		<tooltip name="web_tooltip">
-			This location has Web content
+			Esta ubicación tiene contenido Web
 		</tooltip>
 		<playtip name="web_playtip">
-			Show Web content
+			Mostrar contenido Web
 		</playtip>
 		<allow_resize>
-			true
+			verdadero
 		</allow_resize>
 		<allow_looping>
-			false
+			falso
 		</allow_looping>
 	</widgetset>
 	<widgetset name="movie">
 		<label name="movie_label">
-			Movie
+			Película
 		</label>
 		<default_type>
 			video/*
@@ -43,21 +43,21 @@
 			icn_media_movie.tga
 		</icon>
 		<tooltip name="movie_tooltip">
-			There is a movie to play here
+			Aquí hay una película para reproducir
 		</tooltip>
 		<playtip name="movie_playtip">
-			Play movie
+			Reproducir película
 		</playtip>
 		<allow_resize>
-			false
+			falso
 		</allow_resize>
 		<allow_looping>
-			true
+			verdadero
 		</allow_looping>
 	</widgetset>
 	<widgetset name="image">
 		<label name="image_label">
-			Image
+			Imagen
 		</label>
 		<icon>
 			icn_media_web.tga
@@ -66,16 +66,16 @@
 			image/*
 		</default_type>
 		<tooltip name="image_tooltip">
-			There is an image at this location
+			Hay un imagen en esta ubicación
 		</tooltip>
 		<playtip name="image_playtip">
-			View this location&apos;s image
+			Ver la imagen de esta ubicación
 		</playtip>
 		<allow_resize>
-			false
+			falso
 		</allow_resize>
 		<allow_looping>
-			false
+			falso
 		</allow_looping>
 	</widgetset>
 	<widgetset name="audio">
@@ -89,24 +89,24 @@
 			audio/*
 		</default_type>
 		<tooltip name="audio_tooltip">
-			There is audio at this location
+			Hay audio en esta ubicación
 		</tooltip>
 		<playtip name="audio_playtip">
-			Play this location&apos;s audio
+			Reproducir el audio de esta ubicación
 		</playtip>
 		<allow_resize>
-			false
+			falso
 		</allow_resize>
 		<allow_looping>
-			true
+			verdadero
 		</allow_looping>
 	</widgetset>
 	<scheme name="rtsp">
 		<label name="rtsp_label">
-			Real Time Streaming
+			Streaming en tiempo real
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_gstreamer
@@ -114,10 +114,10 @@
 	</scheme>
 	<mimetype name="blank">
 		<label name="blank_label">
-			- None -
+			- Ninguna -
 		</label>
 		<widgettype>
-			none
+			ninguna
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -125,10 +125,10 @@
 	</mimetype>
 	<mimetype name="none/none">
 		<label name="none/none_label">
-			- None -
+			- Ninguna -
 		</label>
 		<widgettype>
-			none
+			ninguna
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -150,7 +150,7 @@
 			Video
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_gstreamer
@@ -158,10 +158,10 @@
 	</mimetype>
 	<mimetype name="image/*">
 		<label name="image2_label">
-			Image
+			Imagen
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -169,7 +169,7 @@
 	</mimetype>
 	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">
-			Movie (QuickTime)
+			Pelicula (QuickTime)
 		</label>
 		<widgettype>
 			movie
@@ -202,10 +202,10 @@
 	</mimetype>
 	<mimetype name="application/pdf">
 		<label name="application/pdf_label">
-			PDF Document
+			Documento PDF
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -213,10 +213,10 @@
 	</mimetype>
 	<mimetype name="application/postscript">
 		<label name="application/postscript_label">
-			Postscript Document
+			Documento Postscript
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -227,7 +227,7 @@
 			Rich Text (RTF)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -238,7 +238,7 @@
 			Synchronized Multimedia Integration Language (SMIL)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -246,7 +246,7 @@
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
 		<label name="application/xhtml+xml_label">
-			Web Page (XHTML)
+			Página Web (XHTML)
 		</label>
 		<widgettype>
 			web
@@ -260,7 +260,7 @@
 			Macromedia Director
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -312,10 +312,10 @@
 	</mimetype>
 	<mimetype menu="1" name="image/bmp">
 		<label name="image/bmp_label">
-			Image (BMP)
+			Imagen (BMP)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -323,10 +323,10 @@
 	</mimetype>
 	<mimetype menu="1" name="image/gif">
 		<label name="image/gif_label">
-			Image (GIF)
+			Imagen (GIF)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -334,10 +334,10 @@
 	</mimetype>
 	<mimetype menu="1" name="image/jpeg">
 		<label name="image/jpeg_label">
-			Image (JPEG)
+			Imagen (JPEG)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -345,10 +345,10 @@
 	</mimetype>
 	<mimetype menu="1" name="image/png">
 		<label name="image/png_label">
-			Image (PNG)
+			Imagen (PNG)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -356,10 +356,10 @@
 	</mimetype>
 	<mimetype name="image/svg+xml">
 		<label name="image/svg+xml_label">
-			Image (SVG)
+			Imagen (SVG)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -367,10 +367,10 @@
 	</mimetype>
 	<mimetype menu="1" name="image/tiff">
 		<label name="image/tiff_label">
-			Image (TIFF)
+			Imagen (TIFF)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -378,7 +378,7 @@
 	</mimetype>
 	<mimetype menu="1" name="text/html">
 		<label name="text/html_label">
-			Web Page
+			Página Web
 		</label>
 		<widgettype>
 			web
@@ -389,10 +389,10 @@
 	</mimetype>
 	<mimetype menu="1" name="text/plain">
 		<label name="text/plain_label">
-			Text
+			Texto
 		</label>
 		<widgettype>
-			text
+			texto
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -403,7 +403,7 @@
 			XML
 		</label>
 		<widgettype>
-			text
+			texto
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -411,10 +411,10 @@
 	</mimetype>
 	<mimetype menu="1" name="video/mpeg">
 		<label name="video/mpeg_label">
-			Movie (MPEG)
+			Película (MPEG)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_gstreamer
@@ -422,10 +422,10 @@
 	</mimetype>
 	<mimetype name="video/mp4">
 		<label name="video/mp4_label">
-			Movie (MP4)
+			Película (MP4)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_gstreamer
@@ -433,10 +433,10 @@
 	</mimetype>
 	<mimetype menu="1" name="video/quicktime">
 		<label name="video/quicktime_label">
-			Movie (QuickTime)
+			Película (QuickTime)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_gstreamer
@@ -444,10 +444,10 @@
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
 		<label name="video/x-ms-asf_label">
-			Movie (Windows Media ASF)
+			Película (Windows Media ASF)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_gstreamer
@@ -455,10 +455,10 @@
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
 		<label name="video/x-ms-wmv_label">
-			Movie (Windows Media WMV)
+			Película (Windows Media WMV)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_gstreamer
@@ -466,10 +466,10 @@
 	</mimetype>
 	<mimetype menu="1" name="video/x-msvideo">
 		<label name="video/x-msvideo_label">
-			Movie (AVI)
+			Película (AVI)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_gstreamer
diff --git a/indra/newview/skins/default/xui/es/mime_types_mac.xml b/indra/newview/skins/default/xui/es/mime_types_mac.xml
index 7931e55c0..f2401d14c 100644
--- a/indra/newview/skins/default/xui/es/mime_types_mac.xml
+++ b/indra/newview/skins/default/xui/es/mime_types_mac.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <mimetypes name="default">
 	<defaultlabel>
-		(Unknown)
+		(Desconocido)
 	</defaultlabel>
 	<defaultwidget>
-		none
+		ninguno
 	</defaultwidget>
 	<defaultimpl>
 		media_plugin_webkit
 	</defaultimpl>
 	<widgetset name="web">
 		<label name="web_label">
-			Web Content
+			Contenido Web
 		</label>
 		<icon>
 			icn_media_web.tga
@@ -20,21 +20,21 @@
 			text/html
 		</default_type>
 		<tooltip name="web_tooltip">
-			This location has Web content
+			Esta ubicación tiene contenido Web
 		</tooltip>
 		<playtip name="web_playtip">
-			Show Web content
+			Mostrar contenido Show
 		</playtip>
 		<allow_resize>
-			true
+			verdadero
 		</allow_resize>
 		<allow_looping>
-			false
+			falso
 		</allow_looping>
 	</widgetset>
 	<widgetset name="movie">
 		<label name="movie_label">
-			Movie
+			Película
 		</label>
 		<default_type>
 			video/*
@@ -43,21 +43,21 @@
 			icn_media_movie.tga
 		</icon>
 		<tooltip name="movie_tooltip">
-			There is a movie to play here
+			Aquí hay una película para reproducir
 		</tooltip>
 		<playtip name="movie_playtip">
-			Play movie
+			Reproducir película
 		</playtip>
 		<allow_resize>
-			false
+			falso
 		</allow_resize>
 		<allow_looping>
-			true
+			verdadero
 		</allow_looping>
 	</widgetset>
 	<widgetset name="image">
 		<label name="image_label">
-			Image
+			Imagen
 		</label>
 		<icon>
 			icn_media_web.tga
@@ -66,16 +66,16 @@
 			image/*
 		</default_type>
 		<tooltip name="image_tooltip">
-			There is an image at this location
+			Aquí hay una imagen
 		</tooltip>
 		<playtip name="image_playtip">
-			View this location&apos;s image
+			Ver la imagen de esta ubicación
 		</playtip>
 		<allow_resize>
-			false
+			falso
 		</allow_resize>
 		<allow_looping>
-			false
+			falso
 		</allow_looping>
 	</widgetset>
 	<widgetset name="audio">
@@ -89,24 +89,24 @@
 			audio/*
 		</default_type>
 		<tooltip name="audio_tooltip">
-			There is audio at this location
+			Aquí hay audio
 		</tooltip>
 		<playtip name="audio_playtip">
-			Play this location&apos;s audio
+			Reproducir el audio de esta ubicación
 		</playtip>
 		<allow_resize>
-			false
+			falso
 		</allow_resize>
 		<allow_looping>
-			true
+			verdadero
 		</allow_looping>
 	</widgetset>
 	<scheme name="rtsp">
 		<label name="rtsp_label">
-			Real Time Streaming
+			Streaming en tiempo real
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_quicktime
@@ -114,10 +114,10 @@
 	</scheme>
 	<mimetype name="blank">
 		<label name="blank_label">
-			- None -
+			- Ninguno -
 		</label>
 		<widgettype>
-			none
+			ninguno
 		</widgettype>
 		<impl>
 			media_plugin_quicktime
@@ -125,10 +125,10 @@
 	</mimetype>
 	<mimetype name="none/none">
 		<label name="none/none_label">
-			- None -
+			- Ninguno -
 		</label>
 		<widgettype>
-			none
+			ninguno
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -150,7 +150,7 @@
 			Video
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_quicktime
@@ -158,10 +158,10 @@
 	</mimetype>
 	<mimetype name="image/*">
 		<label name="image2_label">
-			Image
+			Imagen
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
         <impl>
 			media_plugin_webkit
@@ -169,10 +169,10 @@
 	</mimetype>
 	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">
-			Movie (QuickTime)
+			Película (QuickTime)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_quicktime
@@ -202,10 +202,10 @@
 	</mimetype>
 	<mimetype name="application/pdf">
 		<label name="application/pdf_label">
-			PDF Document
+			Documento PDF
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -213,10 +213,10 @@
 	</mimetype>
 	<mimetype name="application/postscript">
 		<label name="application/postscript_label">
-			Postscript Document
+			Documento Postscript
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -227,7 +227,7 @@
 			Rich Text (RTF)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -238,7 +238,7 @@
 			Synchronized Multimedia Integration Language (SMIL)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -246,7 +246,7 @@
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
 		<label name="application/xhtml+xml_label">
-			Web Page (XHTML)
+			Página Web (XHTML)
 		</label>
 		<widgettype>
 			web
@@ -260,7 +260,7 @@
 			Macromedia Director
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -312,7 +312,7 @@
 	</mimetype>
 	<mimetype menu="1" name="image/bmp">
 		<label name="image/bmp_label">
-			Image (BMP)
+			Imagen (BMP)
 		</label>
 		<widgettype>
 			image
@@ -323,10 +323,10 @@
 	</mimetype>
 	<mimetype menu="1" name="image/gif">
 		<label name="image/gif_label">
-			Image (GIF)
+			Imagen (GIF)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -334,10 +334,10 @@
 	</mimetype>
 	<mimetype menu="1" name="image/jpeg">
 		<label name="image/jpeg_label">
-			Image (JPEG)
+			Imagen (JPEG)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -345,10 +345,10 @@
 	</mimetype>
 	<mimetype menu="1" name="image/png">
 		<label name="image/png_label">
-			Image (PNG)
+			Imagen (PNG)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -356,10 +356,10 @@
 	</mimetype>
 	<mimetype name="image/svg+xml">
 		<label name="image/svg+xml_label">
-			Image (SVG)
+			Imagen (SVG)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -367,10 +367,10 @@
 	</mimetype>
 	<mimetype menu="1" name="image/tiff">
 		<label name="image/tiff_label">
-			Image (TIFF)
+			Imagen (TIFF)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -378,7 +378,7 @@
 	</mimetype>
 	<mimetype menu="1" name="text/html">
 		<label name="text/html_label">
-			Web Page
+			Página Web
 		</label>
 		<widgettype>
 			web
@@ -389,10 +389,10 @@
 	</mimetype>
 	<mimetype menu="1" name="text/plain">
 		<label name="text/plain_label">
-			Text
+			Texto
 		</label>
 		<widgettype>
-			text
+			texto
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -403,7 +403,7 @@
 			XML
 		</label>
 		<widgettype>
-			text
+			texto
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -411,10 +411,10 @@
 	</mimetype>
 	<mimetype menu="1" name="video/mpeg">
 		<label name="video/mpeg_label">
-			Movie (MPEG)
+			Película (MPEG)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_quicktime
@@ -422,10 +422,10 @@
 	</mimetype>
 	<mimetype name="video/mp4">
 		<label name="video/mp4_label">
-			Movie (MP4)
+			Película (MP4)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_quicktime
@@ -433,10 +433,10 @@
 	</mimetype>
 	<mimetype menu="1" name="video/quicktime">
 		<label name="video/quicktime_label">
-			Movie (QuickTime)
+			Película (QuickTime)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_quicktime
@@ -444,10 +444,10 @@
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
 		<label name="video/x-ms-asf_label">
-			Movie (Windows Media ASF)
+			Película (Windows Media ASF)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_quicktime
@@ -455,10 +455,10 @@
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
 		<label name="video/x-ms-wmv_label">
-			Movie (Windows Media WMV)
+			Película (Windows Media WMV)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_quicktime
@@ -466,10 +466,10 @@
 	</mimetype>
 	<mimetype menu="1" name="video/x-msvideo">
 		<label name="video/x-msvideo_label">
-			Movie (AVI)
+			Película (AVI)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_quicktime
diff --git a/indra/newview/skins/default/xui/es/mime_types_windows.xml b/indra/newview/skins/default/xui/es/mime_types_windows.xml
index 61067da06..aef3b0728 100644
--- a/indra/newview/skins/default/xui/es/mime_types_windows.xml
+++ b/indra/newview/skins/default/xui/es/mime_types_windows.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <mimetypes name="default">
 	<defaultlabel>
-		(Unknown)
+		(Desconocido)
 	</defaultlabel>
 	<defaultwidget>
-		none
+		ninguno
 	</defaultwidget>
 	<defaultimpl>
 		media_plugin_webkit
 	</defaultimpl>
 	<widgetset name="web">
 		<label name="web_label">
-			Web Content
+			Contenido Web
 		</label>
 		<icon>
 			icn_media_web.tga
@@ -20,21 +20,21 @@
 			text/html
 		</default_type>
 		<tooltip name="web_tooltip">
-			This location has Web content
+			Esta ubicación tiene contenido Web
 		</tooltip>
 		<playtip name="web_playtip">
-			Show Web content
+			Mostrar el contenido Web
 		</playtip>
 		<allow_resize>
-			true
+			verdadero
 		</allow_resize>
 		<allow_looping>
-			false
+			falso
 		</allow_looping>
 	</widgetset>
 	<widgetset name="movie">
 		<label name="movie_label">
-			Movie
+			Película
 		</label>
 		<default_type>
 			video/*
@@ -46,18 +46,18 @@
 			There is a movie to play here
 		</tooltip>
 		<playtip name="movie_playtip">
-			Play movie
+			Play película
 		</playtip>
 		<allow_resize>
-			false
+			falso
 		</allow_resize>
 		<allow_looping>
-			true
+			verdadero
 		</allow_looping>
 	</widgetset>
 	<widgetset name="image">
 		<label name="image_label">
-			Image
+			Imagen
 		</label>
 		<icon>
 			icn_media_web.tga
@@ -66,16 +66,16 @@
 			image/*
 		</default_type>
 		<tooltip name="image_tooltip">
-			There is an image at this location
+			Hay una imagen en esta ubicación
 		</tooltip>
 		<playtip name="image_playtip">
-			View this location&apos;s image
+			Ver la imagen de esta ubicación
 		</playtip>
 		<allow_resize>
-			false
+			falso
 		</allow_resize>
 		<allow_looping>
-			false
+			falso
 		</allow_looping>
 	</widgetset>
 	<widgetset name="audio">
@@ -89,16 +89,16 @@
 			audio/*
 		</default_type>
 		<tooltip name="audio_tooltip">
-			There is audio at this location
+			Hay audio en esta ubicación
 		</tooltip>
 		<playtip name="audio_playtip">
-			Play this location&apos;s audio
+			Reproducir el audio de esta ubicación
 		</playtip>
 		<allow_resize>
-			false
+			falso
 		</allow_resize>
 		<allow_looping>
-			true
+			verdadero
 		</allow_looping>
 	</widgetset>
 	<scheme name="rtsp">
@@ -106,7 +106,7 @@
 			Real Time Streaming
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_quicktime
@@ -114,10 +114,10 @@
 	</scheme>
 	<mimetype name="blank">
 		<label name="blank_label">
-			- None -
+			- Ninguno -
 		</label>
 		<widgettype>
-			none
+			ninguno
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -125,10 +125,10 @@
 	</mimetype>
 	<mimetype name="none/none">
 		<label name="none/none_label">
-			- None -
+			- Ninguno -
 		</label>
 		<widgettype>
-			none
+			ninguno
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -150,7 +150,7 @@
 			Video
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_quicktime
@@ -158,7 +158,7 @@
 	</mimetype>
 	<mimetype name="image/*">
 		<label name="image2_label">
-			Image
+			Imagen
 		</label>
 		<widgettype>
 			image
@@ -169,10 +169,10 @@
 	</mimetype>
 	<mimetype menu="1" name="video/vnd.secondlife.qt.legacy">
 		<label name="vnd.secondlife.qt.legacy_label">
-			Movie (QuickTime)
+			Película (QuickTime)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
       media_plugin_quicktime
@@ -202,10 +202,10 @@
 	</mimetype>
 	<mimetype name="application/pdf">
 		<label name="application/pdf_label">
-			PDF Document
+			Documento PDF
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -213,10 +213,10 @@
 	</mimetype>
 	<mimetype name="application/postscript">
 		<label name="application/postscript_label">
-			Postscript Document
+			Documento Postscript
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -227,7 +227,7 @@
 			Rich Text (RTF)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -238,7 +238,7 @@
 		    Synchronized Multimedia Integration Language (SMIL)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -246,7 +246,7 @@
 	</mimetype>
 	<mimetype name="application/xhtml+xml">
 		<label name="application/xhtml+xml_label">
-			Web Page (XHTML)
+			Página Web (XHTML)
 		</label>
 		<widgettype>
 			web
@@ -260,7 +260,7 @@
 			Macromedia Director
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -312,10 +312,10 @@
 	</mimetype>
 	<mimetype menu="1" name="image/bmp">
 		<label name="image/bmp_label">
-			Image (BMP)
+			Imagen (BMP)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -323,10 +323,10 @@
 	</mimetype>
 	<mimetype menu="1" name="image/gif">
 		<label name="image/gif_label">
-			Image (GIF)
+			Imagen (GIF)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -334,10 +334,10 @@
 	</mimetype>
 	<mimetype menu="1" name="image/jpeg">
 		<label name="image/jpeg_label">
-			Image (JPEG)
+			Imagen (JPEG)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -345,10 +345,10 @@
 	</mimetype>
 	<mimetype menu="1" name="image/png">
 		<label name="image/png_label">
-			Image (PNG)
+			Imagen (PNG)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -356,10 +356,10 @@
 	</mimetype>
 	<mimetype name="image/svg+xml">
 		<label name="image/svg+xml_label">
-			Image (SVG)
+			Imagen (SVG)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -367,10 +367,10 @@
 	</mimetype>
 	<mimetype menu="1" name="image/tiff">
 		<label name="image/tiff_label">
-			Image (TIFF)
+			Imagen (TIFF)
 		</label>
 		<widgettype>
-			image
+			imagen
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -378,7 +378,7 @@
 	</mimetype>
 	<mimetype menu="1" name="text/html">
 		<label name="text/html_label">
-			Web Page
+			Página Web
 		</label>
 		<widgettype>
 			web
@@ -389,10 +389,10 @@
 	</mimetype>
 	<mimetype menu="1" name="text/plain">
 		<label name="text/plain_label">
-			Text
+			Texto
 		</label>
 		<widgettype>
-			text
+			texto
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -403,7 +403,7 @@
 			XML
 		</label>
 		<widgettype>
-			text
+			texto
 		</widgettype>
 		<impl>
 			media_plugin_webkit
@@ -411,10 +411,10 @@
 	</mimetype>
 	<mimetype menu="1" name="video/mpeg">
 		<label name="video/mpeg_label">
-			Movie (MPEG)
+			Película (MPEG)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
       media_plugin_quicktime
@@ -422,10 +422,10 @@
 	</mimetype>
 	<mimetype name="video/mp4">
 		<label name="video/mp4_label">
-			Movie (MP4)
+			Película (MP4)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
       media_plugin_quicktime
@@ -433,10 +433,10 @@
 	</mimetype>
 	<mimetype menu="1" name="video/quicktime">
 		<label name="video/quicktime_label">
-			Movie (QuickTime)
+			Película (QuickTime)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
       media_plugin_quicktime
@@ -444,10 +444,10 @@
 	</mimetype>
 	<mimetype name="video/x-ms-asf">
 		<label name="video/x-ms-asf_label">
-			Movie (Windows Media ASF)
+			Película (Windows Media ASF)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
       media_plugin_quicktime
@@ -455,10 +455,10 @@
 	</mimetype>
 	<mimetype name="video/x-ms-wmv">
 		<label name="video/x-ms-wmv_label">
-			Movie (Windows Media WMV)
+			Película (Windows Media WMV)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
       media_plugin_quicktime
@@ -466,10 +466,10 @@
 	</mimetype>
 	<mimetype menu="1" name="video/x-msvideo">
 		<label name="video/x-msvideo_label">
-			Movie (AVI)
+			Película (AVI)
 		</label>
 		<widgettype>
-			movie
+			película
 		</widgettype>
 		<impl>
       media_plugin_quicktime
diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml
index afe01bfd4..f696ae189 100644
--- a/indra/newview/skins/default/xui/es/notifications.xml
+++ b/indra/newview/skins/default/xui/es/notifications.xml
@@ -1,7288 +1,3436 @@
-<?xml version="1.0" ?><notifications>
-  
-  <global name="skipnexttime">
-
-		Don&apos;t show me this again
-  </global>
-
-  <global name="alwayschoose">
-
-		Always choose this option
-  </global>
-
-  <template name="okbutton">
-    <form>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="$yestext"/>
-    </form>
-  </template>
-
-  <template name="okignore">
-    <form>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="$yestext"/>
-      <ignore text="$ignoretext"/>
-    </form>
-  </template>
-
-  <template name="okcancelbuttons">
-    <form>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="$yestext"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="$notext"/>
-    </form>
-  </template>
-
-  <template name="okcancelbuttonscanceldefault">
-    <form>
-      <button
-       index="0"
-       name="OK"
-       text="$yestext"/>
-      <button
-       default="true"
-       index="1"
-       name="Cancel"
-       text="$notext"/>
-    </form>
-  </template>
-
-  <template name="okcancelbuttonscanceldefault">
-    <form>
-      <button
-       index="0"
-       name="OK"
-       text="$yestext"/>
-      <button
-       default="true"
-       index="1"
-       name="Cancel"
-       text="$notext"/>
-    </form>
-  </template>
-
-  <template name="okcancelignore">
-    <form>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="$yestext"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="$notext"/>
-      <ignore text="$ignoretext"/>
-    </form>
-  </template>
-
-  <template name="okhelpbuttons">
-    <form>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="$yestext"/>
-      <button
-       index="1"
-       name="Help"
-       text="$helptext"/>
-    </form>
-  </template>
-
-  <template name="yesnocancelbuttons">
-    <form>
-      <button
-       default="true"
-       index="0"
-       name="Yes"
-       text="$yestext"/>
-      <button
-       index="1"
-       name="No"
-       text="$notext"/>
-      <button
-       index="2"
-       name="Cancel"
-       text="$canceltext"/>
-    </form>
-  </template>
-
-  <notification
-   icon="alert.tga"
-   name="MediaAlert"
-   type="alert">
-The owner of this parcel has requested the following [TYPE] URL to be loaded by your viewer:
-
-[URL]
-
-You may choose to allow or deny the corresponding domain or in-world scripted object server:
-
-[DOMAIN]
-
-"Allow" and "Deny" apply only for this session, while "Blacklist" and "Whitelist" apply forever.
-   <form name="form">
-    <button
-	 index="0"
-	 name="Allow"
-	 text="Allow"/>
-	<button
-	 index="1"
-	 name="Deny"
-	 text="Deny"/>
-	<button
-	 index="2"
-	 name="Blacklist"
-	 text="Blacklist"/>
-	<button
-	 index="3"
-	 name="Whitelist"
-	 text="Whitelist"/>
-   </form>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="MediaListed"
-   type="alert">
-Media/audio URLs for [DOMAIN] now [LISTED]
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="MediaBlocked"
-   type="notifytip">
-Media/audio URL blocked for [DOMAIN]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MediaFiltersCleared"
-   type="alertmodal">
-The media filters have been cleared
-  </notification>
-
-  <notification
-   functor="GenericAcknowledge"
-   icon="alertmodal.tga"
-   name="MissingAlert"
-   label="Unknown Alert Message"
-   type="alertmodal">
-Your version of [APP_NAME] does not know how to display the alert message it just received.
-
-Error details: The alert called &apos;[_NAME]&apos; was not found in notifications.xml.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="FloaterNotFound"
-   type="alertmodal">
-Floater error: Could not find the following controls:
-
-[CONTROLS]
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TutorialNotFound"
-   type="alertmodal">
-No tutorial is currently available.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GenericAlert"
-   type="alertmodal">
-[MESSAGE]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GenericAlertYesCancel"
-   type="alertmodal">
-[MESSAGE]
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GenericAlertYesNoCancel"
-   type="alertmodal">
-[MESSAGE]
-    <usetemplate
-     name="yesnocancelbuttons"
-     notext="No"
-     yestext="Yes"
-     canceltext="Cancel"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="BadInstallation"
-   type="alertmodal">
-An error occurred while updating [APP_NAME]. Please download the latest version from the official download site.
-    <usetemplate
-     name="okbutton"
-     yestext="Ok"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LoginFailedNoNetwork"
-   type="alertmodal">
-Could not connect to the [SECOND_LIFE_GRID]. 
-&apos;[DIAGNOSTIC]&apos;
-Make sure your Internet connection is working properly.
-	<usetemplate
-     name="okbutton"
-     yestext="Ok"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MessageTemplateNotFound"
-   type="alertmodal">
-Message Template [PATH] not found.
-	<usetemplate
-     name="okbutton"
-     yestext="Ok"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WearableSave"
-   type="alertmodal">
-Save changes to current clothing/body part?
-    <usetemplate
-     canceltext="Cancel"
-     name="yesnocancelbuttons"
-     notext="Don&apos;t Save"
-     yestext="Save"/>
-  </notification>
-  <notification
-   icon="alertmodal.tga"
-     name="ConfirmNoCopyToOutbox"
-     type="alertmodal">
-You don't have permission to copy one or more of these items to the Merchant Outbox.  You can move them or leave them behind.
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Don't move item(s)"
-     yestext="Move item(s)"/>
-  </notification>
-
-  <notification
-   icon="OutboxStatus_Success"
-   name="OutboxFolderCreated"
-   type="outbox">
-    <unique/>
-A new folder has been created for each item you have transferred into the top level of your Merchant Outbox.
-
-    <usetemplate
-     ignoretext="A new folder was created in the Merchant Outbox"
-     name="okignore"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="OutboxStatus_Success"
-   name="OutboxImportComplete"
-   type="outbox">
-Success
-
-All folders were successfully sent to the Marketplace.
-
-        <usetemplate
-         ignoretext="All folders sent to the Marketplace"
-         name="okignore"
-         yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="OutboxStatus_Warning"
-   name="OutboxImportHadErrors"
-   type="outbox">
-Some folders did not transfer
-
-Errors occurred when some folders were sent to the Marketplace.  Those folders are still in your Merchant Outbox.
-
-See the [[MARKETPLACE_IMPORTS_URL] error log] for more information.
-
-        <usetemplate
-         name="okbutton"
-         yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="OutboxStatus_Error"
-   name="OutboxImportFailed"
-   type="outbox">
-Transfer failed
-
-No folders were sent to the Marketplace because of a system or network error.  Try again later.
-
-        <usetemplate
-         name="okbutton"
-         yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="OutboxStatus_Error"
-   name="OutboxInitFailed"
-   type="outbox">
-Marketplace initialization failed
-
-Initialization with the Marketplace failed because of a system or network error.  Try again later.
-
-        <usetemplate
-         name="okbutton"
-         yestext="OK"/>
-  </notification>
-    
-
-    <notification
-   icon="alertmodal.tga"
-   name="CompileQueueSaveText"
-   type="alertmodal">
-There was a problem uploading the text for a script due to the following reason: [REASON]. Please try again later.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CompileQueueSaveBytecode"
-   type="alertmodal">
-There was a problem uploading the compiled script due to the following reason: [REASON]. Please try again later.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WriteAnimationFail"
-   type="alertmodal">
-There was a problem writing animation data.  Please try again later.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UploadAuctionSnapshotFail"
-   type="alertmodal">
-There was a problem uploading the auction snapshot due to the following reason: [REASON]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableToViewContentsMoreThanOne"
-   type="alertmodal">
-Unable to view the contents of more than one item at a time.
-Please select only one object and try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SaveClothingBodyChanges"
-   type="alertmodal">
-Save all changes to clothing/body parts?
-    <usetemplate
-     canceltext="Cancel"
-     name="yesnocancelbuttons"
-     notext="Don&apos;t Save"
-     yestext="Save All"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GrantModifyRights"
-   type="alertmodal">
-Granting modify rights to another resident allows them to change, delete or take ANY objects you may have in-world. Be VERY careful when handing out this permission.
-Do you want to grant modify rights for [NAME]?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GrantModifyRightsMultiple"
-   type="alertmodal">
-Granting modify rights to another resident allows them to change ANY objects you may have in-world. Be VERY careful when handing out this permission.
-Do you want to grant modify rights for the selected Residents?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RevokeModifyRights"
-   type="alertmodal">
-Do you want to revoke modify rights for [NAME]?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RevokeModifyRightsMultiple"
-   type="alertmodal">
-Do you want to revoke modify rights for the selected Residents?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableToCreateGroup"
-   type="alertmodal">
-Unable to create group.
-[MESSAGE]
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="PanelGroupApply"
-   type="alertmodal">
-[NEEDS_APPLY_MESSAGE]
-[WANT_APPLY_MESSAGE]
-    <usetemplate
-     canceltext="Cancel"
-     name="yesnocancelbuttons"
-     notext="Ignore Changes"
-     yestext="Apply Changes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MustSpecifyGroupNoticeSubject"
-   type="alertmodal">
-You must specify a subject to send a group notice.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AddGroupOwnerWarning"
-   type="alertmodal">
-You are about to add group members to the role of [ROLE_NAME].
-Members cannot be removed from that role.
-The members must resign from the role themselves.
-Are you sure you want to continue?
-    <usetemplate
-     ignoretext="When adding group members to the owner role"
-     name="okcancelignore"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AssignDangerousActionWarning"
-   type="alertmodal">
-You are about to add the Ability &apos;[ACTION_NAME]&apos; to the Role &apos;[ROLE_NAME]&apos;.
-
- *WARNING*
- Any Member in a Role with this Ability can assign themselves -- and any other 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.
-
-Add this Ability to &apos;[ROLE_NAME]&apos;?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AssignDangerousAbilityWarning"
-   type="alertmodal">
-You are about to add the Ability &apos;[ACTION_NAME]&apos; to the Role &apos;[ROLE_NAME]&apos;.
-
- *WARNING*
- Any Member in a Role with this Ability can assign themselves -- and any other member -- all Abilities, elevating themselves to near-Owner power.
-
-Add this Ability to &apos;[ROLE_NAME]&apos;?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ClickPublishHelpLand"
-   type="alertmodal">
-Selecting the &quot;Publish in Search&quot;
-Checking this box will show:
-- this parcel in search results
-- this parcel&apos;s public objects
-- this parcel in web search
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ClickSoundHelpLand"
-   type="alertmodal">Media and Music can only be experienced within the parcel. Sound and Voice options can be restricted to the parcel or will be heard by residents outside the parcel depending on their maturity Rating. Go to Knowledge Base to learn more about how to set these options?
-    <url option="0" name="url">
-	https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=5046
-    </url>
-    <usetemplate
-     name="okcancelbuttons"
-     yestext="Go to Knowledge Base"
-	 notext="Close" />
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ClickSearchHelpAll"
-   type="alertmodal">
-Search results are organized based on the tab you are in, your maturity Rating, the category chosen, and other factors. For more details, please see the Knowledge Base.
-    <url option="0" name="url">
-	https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=4722
-    </url>
-    <usetemplate
-     name="okcancelbuttons"
-     yestext="Go to Knowledge Base"
-	 notext="Close" />
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ClickPublishHelpLandDisabled"
-   type="alertmodal">
-You can&apos;t make this parcel show in search because it is located in a region that forbids this.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ClickPublishHelpAvatar"
-   type="alertmodal">
-Selecting &quot;Show in Search&quot; will show:
-- my profile in search results
-- a link to my profile in public group pages
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ClickPartnerHelpAvatar"
-   type="alertmodal">
-You can propose to another Resident or dissolve an existing partnership through the [SECOND_LIFE] website.
-
-Go to the [SECOND_LIFE] web site for more information on partnering?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="Go to Page"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ClickUploadHelpPermissions"
-   type="alertmodal">
-Your default permissions may not work in older regions.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ClickWebProfileHelpAvatar"
-   type="alertmodal">
-If this Resident has set a web profile URL then you can:
- * Click &apos;Load&apos; to see the page in this Web tab.
- * Click Load &gt; &apos;In external browser&apos; to view the page in your default web browser.
- * Click Load &gt; &apos;Home URL&apos; to return to this Resident&apos;s web profile if you&apos;ve navigated away.
-
-When viewing your own profile, you can enter any URL as your web profile and click OK to set it.
-Other residents can visit the URL you set when they look at your profile.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="JoinGroupCanAfford"
-   type="alertmodal">
-Joining this group costs [CURRENCY][COST].
-Do you wish to proceed?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="Join"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="JoinGroupCannotAfford"
-   type="alertmodal">
-Joining this group costs [CURRENCY][COST].
-You do not have enough [CURRENCY] to join this group.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LandBuyPass"
-   type="alertmodal">
-For [CURRENCY][COST] you can enter this land (&apos;[PARCEL_NAME]&apos;) for [TIME] hours.  Buy a pass?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SalePriceRestriction"
-   type="alertmodal">
-Sale price must be set to more than [CURRENCY]0 if selling to anyone.
-Please select an individual to sell to if selling for [CURRENCY]0.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmLandSaleChange"
-   priority="high"
-   type="alertmodal">
-The selected [LAND_SIZE] m² land is being set for sale.
-Your selling price will be [CURRENCY][SALE_PRICE] and will be authorized for sale to [NAME].
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmLandSaleToAnyoneChange"
-   type="alertmodal">
-ATTENTION: Clicking &apos;sell to anyone&apos; makes your land available to the entire [SECOND_LIFE] community, even those not in this region.
-
-The selected [LAND_SIZE] m² land is being set for sale.
-Your selling price will be [CURRENCY][SALE_PRICE] and will be authorized for sale to [NAME].
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ReturnObjectsDeededToGroup"
-   type="alertmodal">
-Are you sure you want to return all objects shared with the group &apos;[NAME]&apos; on this parcel of land back to their previous owner&apos;s inventory?
-
-*WARNING* This will delete the non-transferable objects deeded to the group!
-
-Objects: [N]
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ReturnObjectsOwnedByUser"
-   type="alertmodal">
-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?
-
-Objects: [N]
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
- icon="alert.tga"
- name="ClickBuildConstants"
- type="alert">
-The following constants are accepted in this tab:
-
-PX  --  X-axis position
-PY  --  Y-axis position
-PZ  --  Z-axis position
-SX  --  X-axis size
-SY  --  Y-axis size
-SZ  --  Z-axis size
-RX  --  X-axis rotation
-RY  --  Y-axis rotation
-RZ  --  Z-axis rotation
-CB  --  Path cut begin
-CE  --  Path cut end
-HLW  --  Hollow size
-SKW  --  Skew
-PB  --  Slice/Dimple/Profile cut begin
-PE  --  Slice/Dimple/Profile cut end
-TB  --  Twist begin
-TE  --  Twist end
-SHX  --  X-axis top shear
-SHY  --  Y-axis top shear
-HLX  --  X-axis hole size
-HLY  --  Y-axis hole size
-TPX  --  X-axis taper
-TPY  --  Y-axis taper
-ROF  --  Radius offset
-REV  --  Revolutions
-
-PI  --  pi
-TWO_PI  --  2pi
-PI_BY_TWO  --  pi/2
-SQRT2  --  Square root of 2
-DEG_TO_RAD  --  DEG_TO_RAD conversion (pi/180)
-RAD_TO_DEG  --  RAD_TO_DEG conversion (180/pi)
-GRAVITY  --  -9.8
-
-*  --  Multiplication
-\  --  Division
-+  --  Addition
--  --  Subtraction
-
-For information about this feature, click "More Info".
-  <url option="1" name="url">
-    http://imprudenceviewer.org/wiki/Build_Math_Expressions
-  </url>
-  <usetemplate
-   name="okhelpbuttons"
-   yestext="OK"
-   helptext="More Info"/>
-</notification>
-  
-  <notification
-   icon="alertmodal.tga"
-   name="ReturnObjectsOwnedBySelf"
-   type="alertmodal">
-Are you sure you want to return all objects owned by you on this parcel of land back to your inventory?
-
-Objects: [N]
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ReturnObjectsNotOwnedBySelf"
-   type="alertmodal">
-Are you sure you want to return all objects NOT owned by you 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.
-
-*WARNING* This will delete the non-transferable objects deeded to the group!
-
-Objects: [N]
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ReturnObjectsNotOwnedByUser"
-   type="alertmodal">
-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.
-
-*WARNING* This will delete the non-transferable objects deeded to the group!
-
-Objects: [N]
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ReturnAllTopObjects"
-   type="alertmodal">
-Are you sure you want to return all listed objects back to their owner&apos;s inventory?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DisableAllTopObjects"
-   type="alertmodal">
-Are you sure you want to disable all objects in this region?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ReturnObjectsNotOwnedByGroup"
-   type="alertmodal">
-Return the objects on this parcel of land that are NOT shared with the group [NAME] back to their owners?
-
-Objects: [N]
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableToDisableOutsideScripts"
-   type="alertmodal">
-Can not disable scripts.
-This entire region is damage enabled.
-Scripts must be allowed to run for weapons to work.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MustBeInParcel"
-   type="alertmodal">
-You must be standing inside the land parcel to set its Landing Point.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="PromptRecipientEmail"
-   type="alertmodal">
-Please enter a valid email address for the recipient(s).
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="PromptSelfEmail"
-   type="alertmodal">
-Please enter your email address.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="PromptMissingSubjMsg"
-   type="alertmodal">
-Email snapshot with the default subject or message?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ErrorProcessingSnapshot"
-   type="alertmodal">
-Error processing snapshot data
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ErrorEncodingSnapshot"
-   type="alertmodal">
-Error encoding snapshot.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ErrorUploadingPostcard"
-   type="alertmodal">
-There was a problem sending a snapshot due to the following reason: [REASON]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ErrorUploadingReportScreenshot"
-   type="alertmodal">
-There was a problem uploading a report screenshot due to the following reason: [REASON]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MustAgreeToLogIn"
-   type="alertmodal">
-You must agree to the Terms of Service to continue logging into [SECOND_LIFE].
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CouldNotPutOnOutfit"
-   type="alertmodal">
-Could not put on outfit.
-The outfit folder contains no clothing, body parts, or attachments.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotWearTrash"
-   type="alertmodal">
-You can not wear clothes or body parts that are in the trash
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MaxAttachmentsOnOutfit"
-   type="alertmodal">
-Could not attach object.
-Exceeds the attachments limit of [MAX_ATTACHMENTS] objects. Please detach another object first.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotWearInfoNotComplete"
-   type="alertmodal">
-You can not wear that item because it has not yet loaded. Please try again in a minute.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MustHaveAccountToLogIn"
-   type="alertmodal">
-Oops! Something was left blank.
-You need to enter the Username name of your avatar.
-
-You need an account to enter [SECOND_LIFE]. Would you like to create one now?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Try again"
-     yestext="Create a new account"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MustHaveAccountToLogInNoLinks"
-   type="alertmodal">
-You need to enter the First and Last name, or Username of your avatar.
-
-You need an account to enter the [SECOND_LIFE_GRID].
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AddClassified"
-   type="alertmodal">
-Classified ads appear in the &apos;Classified&apos; section of the Search directory and on www.secondlife.com for one week.
-Fill out your ad, then click &apos;Publish...&apos; to add it to the directory.
-You&apos;ll be asked for a price to pay when clicking Publish.
-Paying more makes your ad appear higher in the list, and also appear higher when people search for keywords.
-    <usetemplate
-     ignoretext="When adding a new Classified"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DeleteClassified"
-   type="alertmodal">
-Delete classified &apos;[NAME]&apos;?
-There is no reimbursement for fees paid.
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ClassifiedSave"
-   type="alertmodal">
-Save changes to classified [NAME]?
-    <usetemplate
-     canceltext="Cancel"
-     name="yesnocancelbuttons"
-     notext="Don&apos;t Save"
-     yestext="Save"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DeleteAvatarPick"
-   type="alertmodal">
-Delete pick [PICK]?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="PromptGoToEventsPage"
-   type="alertmodal">
-Go to the [SECOND_LIFE] events web page?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SelectProposalToView"
-   type="alertmodal">
-Please select a proposal to view.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SelectHistoryItemToView"
-   type="alertmodal">
-Please select a history item to view.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ResetShowNextTimeDialogs"
-   type="alertmodal">
-Would you like to re-enable all these popups, which you previously indicated &apos;Don&apos;t show me again&apos;?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SkipShowNextTimeDialogs"
-   type="alertmodal">
-Would you like to disable all popups which can be skipped?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="CacheWillClear"
-   type="notify">
-    Cache will be cleared after you restart [APP_NAME].
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="CacheWillBeMoved"
-   type="notify">
-    Cache will be moved after you restart [APP_NAME].
-    Note: This will clear the cache.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="ChangeConnectionPort"
-   type="notify">
-Port settings take effect after you restart [APP_NAME].
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="ProxyNeedRestart"
-   type="notify">
-    Socks proxy settings will take effect after you restart [APP_NAME].
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SOCKS_CONNECT_OK"
-   type="alertmodal">
-Connection to Socks5 proxy [PROXY] was successful.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SOCKS_NOT_PERMITTED"
-   type="alertmodal">
-The Socks5 proxy "[PROXY]" refused the connection, not allowed by rule set
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SOCKS_CONNECT_ERROR"
-   type="alertmodal">
-The Socks5 proxy "[PROXY]" refused the connection, could not open TCP channel
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SOCKS_NOT_ACCEPTABLE"
-   type="alertmodal">
-The Socks5 proxy "[PROXY]" refused the selected authentication system
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SOCKS_AUTH_FAIL"
-   type="alertmodal">
-The Socks5 proxy "[PROXY]" reported your credentials are invalid
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SOCKS_UDP_FWD_NOT_GRANTED"
-   type="alertmodal">
-The Socks5 proxy "[PROXY]" refused the UDP associate request
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SOCKS_HOST_CONNECT_FAILED"
-   type="alertmodal">
-Could not connect to Socks5 proxy server "[PROXY]"
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="ChangeSkin"
-   type="notfy">
-    The new skin will appear after you restart [APP_NAME].
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GoToAuctionPage"
-   type="alertmodal">
-Go to the [SECOND_LIFE] web page to see auction details or make a bid?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SaveChanges"
-   type="alertmodal">
-Save Changes?
-    <usetemplate
-     canceltext="Cancel"
-     name="yesnocancelbuttons"
-     notext="Don&apos;t Save"
-     yestext="Save"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GestureSaveFailedTooManySteps"
-   type="alertmodal">
-Gesture save failed.
-This gesture has too many steps.
-Try removing some steps, then save again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GestureSaveFailedTryAgain"
-   type="alertmodal">
-Gesture save failed.  Please try again in a minute.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GestureSaveFailedObjectNotFound"
-   type="alertmodal">
-Could not save gesture because the object or the associated object inventory could not be found.
-The object may be out of range or may have been deleted.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GestureSaveFailedReason"
-   type="alertmodal">
-There was a problem saving a gesture due to the following reason: [REASON].  Please try resaving the gesture later.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SaveNotecardFailObjectNotFound"
-   type="alertmodal">
-Could not save notecard because the object or the associated object inventory could not be found.
-The object may be out of range or may have been deleted.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SaveNotecardFailReason"
-   type="alertmodal">
-There was a problem saving a notecard due to the following reason: [REASON].  Please try re-saving the notecard later.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ScriptCannotUndo"
-   type="alertmodal">
-Could not undo all changes in your version of the script.
-Would you like to load the server&apos;s last saved version?
-(**Warning** This operation cannot be undone.)
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SaveScriptFailReason"
-   type="alertmodal">
-There was a problem saving a script due to the following reason: [REASON].  Please try re-saving the script later.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SaveScriptFailObjectNotFound"
-   type="alertmodal">
-Could not save the script because the object it is in could not be found.
-The object may be out of range or may have been deleted.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SaveBytecodeFailReason"
-   type="alertmodal">
-There was a problem saving a compiled script due to the following reason: [REASON].  Please try re-saving the script later.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CouldNotStartStopScript"
-   type="alertmodal">
-Could not start or stop the script because the object it is on could not be found.
-The object may be out of range or may have been deleted.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotDownloadFile"
-   type="alertmodal">
-Unable to download file
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotWriteFile"
-   type="alertmodal">
-Unable to write file [[FILE]]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnsupportedHardware"
-   type="alertmodal">
-Warning: Your system does not meet [APP_NAME] minimum system requirements. If you continue using [APP_NAME], you may experience poor performance. [GRID_OWNER] cannot provide technical support for unsupported system configurations.
-
-    MINSPECS
-    Do you wish to visit [_URL] for more information?
-    <url option="0" name="url">
-
-			http://www.secondlife.com/corporate/sysreqs.php
-    </url>
-    <usetemplate
-     ignoretext="When detecting unsupported hardware"
-     name="okcancelignore"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnknownGPU"
-   type="alertmodal">
-Your system contains a graphics card that is unknown to us at this time.
-This is often the case with new hardware we haven&apos;t had a chance to test.  [APP_NAME] will most likely run properly, but you may need to adjust your graphics settings to something more appropriate.
-(Edit menu &gt; Preferences &gt; Graphics).
-    <form name="form">
-      <ignore name="ignore"
-       text="When detecting an unknown graphics card"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DisplaySettingsNoShaders"
-   type="alertmodal">
-    [APP_NAME] crashed while initializing graphics drivers.
-    Graphics Quality will be set to low to avoid some common driver errors.
-    This will disable some graphics features.
-    We recommend updating your graphics card drivers.
-    Graphics Quality can be raised in Preferences &gt; Graphics.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RegionNoTerraforming"
-   type="alertmodal">
-The region [REGION] does not allow terraforming.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotCopyWarning"
-   type="alertmodal">
-You do not have permission to copy the following items:
-[ITEMS]
-and will lose it from your inventory if you give it away. Do you really want to offer these items?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotGiveItem"
-   type="alertmodal">
-Unable to give inventory item.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TransactionCancelled"
-   type="alertmodal">
-Transaction cancelled.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TooManyItems"
-   type="alertmodal">
-Cannot give more than 42 items in a single inventory transfer.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoItems"
-   type="alertmodal">
-You do not have permission to transfer the selected items.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotCopyCountItems"
-   type="alertmodal">
-You do not have permission to copy [COUNT] of the selected items. You will lose these items from your inventory.
-Do you really want to give these items?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotGiveCategory"
-   type="alertmodal">
-You do not have permission to transfer the selected folder.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="FreezeAvatar"
-   type="alertmodal">
-Freeze this avatar?
-He or she will temporarily be unable to move, chat, or interact with the world.
-    <usetemplate
-     canceltext="Cancel"
-     name="yesnocancelbuttons"
-     notext="Unfreeze"
-     yestext="Freeze"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="FreezeAvatarFullname"
-   type="alertmodal">
-Freeze [AVATAR_NAME]?
-He or she will temporarily be unable to move, chat, or interact with the world.
-    <usetemplate
-     canceltext="Cancel"
-     name="yesnocancelbuttons"
-     notext="Unfreeze"
-     yestext="Freeze"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="EjectAvatarFullname"
-   type="alertmodal">
-Eject [AVATAR_NAME] from your land?
-    <usetemplate
-     canceltext="Cancel"
-     name="yesnocancelbuttons"
-     notext="Eject and Ban"
-     yestext="Eject"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="EjectAvatarNoBan"
-   type="alertmodal">
-Eject this avatar from your land?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="Eject"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="EjectAvatarFullnameNoBan"
-   type="alertmodal">
-Eject [AVATAR_NAME] from your land?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="Eject"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AcquireErrorTooManyObjects"
-   type="alertmodal">
-ACQUIRE ERROR: Too many objects selected.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AcquireErrorObjectSpan"
-   type="alertmodal">
-ACQUIRE ERROR: Objects span more than one region.
-Please move all objects to be acquired onto the same region.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="PromptGoToCurrencyPage"
-   type="alertmodal">
-[EXTRA]
-
-Go to [URL] for information on purchasing currency?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableToLinkObjects"
-   type="alertmodal">
-Unable to link these [COUNT] objects.
-You can link a maximum of [MAX] objects.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotLinkIncompleteSet"
-   type="alertmodal">
-You can only link complete sets of objects, and must select more than one object.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotLinkModify"
-   type="alertmodal">
-Unable to link because you don&apos;t have modify permission on all the objects.
-
-Please make sure none are locked, and that you own all of them.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotLinkDifferentOwners"
-   type="alertmodal">
-Unable to link because not all of the objects have the same owner.
-
-Please make sure you own all of the selected objects.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoFileExtension"
-   type="alertmodal">
-No file extension for the file: &apos;[FILE]&apos;
-
-Please make sure the file has a correct file extension.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="InvalidFileExtension"
-   type="alertmodal">
-Invalid file extension [EXTENSION]
-Expected [VALIDS]
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotUploadSoundFile"
-   type="alertmodal">
-Couldn&apos;t open uploaded sound file for reading:
-[FILE]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SoundFileNotRIFF"
-   type="alertmodal">
-File does not appear to be a RIFF WAVE file:
-[FILE]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SoundFileNotPCM"
-   type="alertmodal">
-File does not appear to be a PCM WAVE audio file:
-[FILE]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SoundFileInvalidChannelCount"
-   type="alertmodal">
-File has invalid number of channels (must be mono or stereo):
-[FILE]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SoundFileInvalidSampleRate"
-   type="alertmodal">
-File does not appear to be a supported sample rate (must be 44.1k):
-[FILE]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SoundFileInvalidWordSize"
-   type="alertmodal">
-File does not appear to be a supported word size (must be 8 or 16 bit):
-[FILE]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SoundFileInvalidHeader"
-   type="alertmodal">
-Could not find &apos;data&apos; chunk in WAV header:
-[FILE]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SoundFileInvalidChunkSize"
-   type="alertmodal">
-Wrong chunk size in WAV file:
-[FILE]
-  </notification>
-  
-  <notification
-   icon="alertmodal.tga"
-   name="SoundFileInvalidTooLong"
-   type="alertmodal">
-Audio file is too long (10 second maximum):
-[FILE]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ProblemWithFile"
-   type="alertmodal">
-Problem with file [FILE]:
-
-[ERROR]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotOpenTemporarySoundFile"
-   type="alertmodal">
-Couldn&apos;t open temporary compressed sound file for writing: [FILE]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnknownVorbisEncodeFailure"
-   type="alertmodal">
-Unknown Vorbis encode failure on: [FILE]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotEncodeFile"
-   type="alertmodal">
-Unable to encode file: [FILE]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CorruptResourceFile"
-   type="alertmodal">
-Corrupt resource file: [FILE]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnknownResourceFileVersion"
-   type="alertmodal">
-Unknown resource file version in file: [FILE]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableToCreateOutputFile"
-   type="alertmodal">
-Unable to create output file: [FILE]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DoNotSupportBulkAnimationUpload"
-   type="alertmodal">
-We do not currently support bulk upload of animation files.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotUploadReason"
-   type="alertmodal">
-Unable to upload [FILE] due to the following reason: [REASON]
-Please try again later.
-  </notification>
-
-   <notification
-    icon="alertmodal.tga"
-    name="UploadCostConfirmation"
-    type="alertmodal">
-This upload will cost L$[PRICE], do you wish to continue with the upload?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="Upload"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotCreateLandmarkNotOwner"
-   type="alertmodal">
-You cannot create a landmark here because the owner of the land doesn&apos;t allow it.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotRecompileSelectObjectsNoScripts"
-   type="alertmodal">
-Not able to perform &apos;recompilation&apos;.
-Select an object with a script.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotRecompileSelectObjectsNoPermission"
-   type="alertmodal">
-Not able to perform &apos;recompilation&apos;.
-
-Select objects with scripts that you have permission to modify.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotResetSelectObjectsNoScripts"
-   type="alertmodal">
-Not able to perform &apos;reset&apos;.
-
-Select objects with scripts.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotResetSelectObjectsNoPermission"
-   type="alertmodal">
-Not able to perform &apos;reset&apos;.
-
-Select objects with scripts that you have permission to modify.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotSetRunningSelectObjectsNoScripts"
-   type="alertmodal">
-Not able to set any scripts to &apos;running&apos;.
-
-Select objects with scripts.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotSetRunningNotSelectObjectsNoScripts"
-   type="alertmodal">
-Unable to set any scripts to &apos;not running&apos;.
-
-Select objects with scripts.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NoFrontmostFloater"
-   type="alertmodal">
-No frontmost floater to save.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SeachFilteredOnShortWords"
-   type="alertmodal">
-Your search query was modified and the words that were too short were removed.
-
-Searched for: [FINALQUERY]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SeachFilteredOnShortWordsEmpty"
-   type="alertmodal">
-Your search terms were too short so no search was performed.
-  </notification>
-
-  <!-- Generic Teleport failure modes - strings will be inserted from
-       teleport_strings.xml if available. -->
-  <notification
-   icon="alertmodal.tga"
-   name="CouldNotTeleportReason"
-   type="alertmodal">
-Could not teleport.
-[REASON]
-  </notification>
-
-  <!-- Teleport failure modes not delivered via the generic mechanism
-       above (for example, delivered as an AlertMessage on
-       region-crossing :( ) - these paths should really be merged
-       in the future. -->
-  <notification
-   icon="alertmodal.tga"
-   name="invalid_tport"
-   type="alertmodal">
-Problem encountered processing your teleport request. You may need to log back in before you can teleport. If you continue to get this message, please check the Tech Support FAQ at:
-www.secondlife.com/support
-  </notification>
-  <notification
-   icon="alertmodal.tga"
-   name="invalid_region_handoff"
-   type="alertmodal">
-Problem encountered processing your region crossing. You may need to log back in before you can cross regions. If you continue to get this message, please check the Tech Support FAQ at:
-www.secondlife.com/support
-  </notification>
-  <notification
-   icon="alertmodal.tga"
-   name="blocked_tport"
-   type="alertmodal">
-Sorry, teleport is currently blocked. Try again in a moment.  If you still cannot teleport, please log out and log back in to resolve the problem.
-  </notification>
-  <notification
-   icon="alertmodal.tga"
-   name="nolandmark_tport"
-   type="alertmodal">
-Sorry, but system was unable to locate landmark destination.
-  </notification>
-  <notification
-   icon="alertmodal.tga"
-   name="timeout_tport"
-   type="alertmodal">
-Sorry, but system was unable to complete the teleport connection.  Try again in a moment.
-  </notification>
-  <notification
-   icon="alertmodal.tga"
-   name="noaccess_tport"
-   type="alertmodal">
-Sorry, you do not have access to that teleport destination.
-  </notification>
-  <notification
-   icon="alertmodal.tga"
-   name="missing_attach_tport"
-   type="alertmodal">
-Your attachments have not arrived yet. Try waiting for a few more seconds or log out and back in again before attempting to teleport.
-  </notification>
-  <notification
-   icon="alertmodal.tga"
-   name="too_many_uploads_tport"
-   type="alertmodal">
-The asset queue in this region is currently clogged so your teleport request will not be able to succeed in a timely manner. Please try again in a few minutes or go to a less busy area.
-  </notification>
-  <notification
-   icon="alertmodal.tga"
-   name="expired_tport"
-   type="alertmodal">
-Sorry, but the system was unable to complete your teleport request in a timely fashion. Please try again in a few minutes.
-  </notification>
-  <notification
-   icon="alertmodal.tga"
-   name="expired_region_handoff"
-   type="alertmodal">
-Sorry, but the system was unable to complete your region crossing in a timely fashion. Please try again in a few minutes.
-  </notification>
-  <notification
-   icon="alertmodal.tga"
-   name="no_host"
-   type="alertmodal">
-Unable to find teleport destination. The destination may be temporarily unavailable or no longer exists. Please try again in a few minutes.
-  </notification>
-  <notification
-   icon="alertmodal.tga"
-   name="no_inventory_host"
-   type="alertmodal">
-The inventory system is currently unavailable.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotSetLandOwnerNothingSelected"
-   type="alertmodal">
-Unable to set land owner:
-No parcel selected.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotSetLandOwnerMultipleRegions"
-   type="alertmodal">
-Unable to force land ownership because selection spans multiple regions. Please select a smaller area and try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ForceOwnerAuctionWarning"
-   type="alertmodal">
-This parcel is up for auction. Forcing ownership will cancel the auction and potentially make some residents unhappy if bidding has begun. Force ownership?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotContentifyNothingSelected"
-   type="alertmodal">
-Unable to contentify:
-No parcel selected.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotContentifyNoRegion"
-   type="alertmodal">
-Unable to contentify:
-No region selected.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotReleaseLandNothingSelected"
-   type="alertmodal">
-Unable to abandon land:
-No parcel selected.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotReleaseLandNoRegion"
-   type="alertmodal">
-Unable to abandon land:
-Cannot find region.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotBuyLandNothingSelected"
-   type="alertmodal">
-Unable to buy land:
-No parcel selected.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotBuyLandNoRegion"
-   type="alertmodal">
-Unable to buy land:
-Cannot find the region this land is in.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotCloseFloaterBuyLand"
-   type="alertmodal">
-You cannot close the Buy Land window until [APP_NAME] estimates the price of this transaction.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotDeedLandNothingSelected"
-   type="alertmodal">
-Unable to deed land:
-No parcel selected.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotDeedLandNoGroup"
-   type="alertmodal">
-Unable to deed land:
-No Group selected.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotDeedLandNoRegion"
-   type="alertmodal">
-Unable to deed land:
-Cannot find the region this land is in.
-Please use Help -&gt; Bug Reporting -&gt; Report Bug to report this.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotDeedLandMultipleSelected"
-   type="alertmodal">
-Unable to deed land:
-Multiple parcels selected.
-
-Try selecting a single parcel.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="DeedToGroupFail"
-   type="notifytip">
-    Deed to group failed.
-    <tag>group</tag>
-    <tag>fail</tag>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ParcelCanPlayMedia"
-   type="alertmodal">
-This location can play streaming media.
-Streaming media requires a fast Internet connection.
-
-Play streaming media when available?
-(You can change this option later under Preferences &gt; Audio &amp; Video.)
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Disable"
-     yestext="Play Media"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotDeedLandWaitingForServer"
-   type="alertmodal">
-Unable to deed land:
-Waiting for server to report ownership.
-
-Please try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotDeedLandNoTransfer"
-   type="alertmodal">
-Unable to deed land:
-The region [REGION] does not allow transfer of land.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotReleaseLandWatingForServer"
-   type="alertmodal">
-Unable to abandon land:
-Waiting for server to update parcel information.
-
-Try again in a few seconds.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotReleaseLandSelected"
-   type="alertmodal">
-Unable to abandon land:
-You do not own all the parcels selected.
-
-Please select a single parcel.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotReleaseLandDontOwn"
-   type="alertmodal">
-Unable to abandon land:
-You don&apos;t have permission to release this parcel.
-Parcels you own appear in green.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotReleaseLandRegionNotFound"
-   type="alertmodal">
-Unable to abandon land:
-Cannot find the region this land is in.
-
-Please use Help -&gt; Bug Reporting -&gt; Report Bug to report this.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotReleaseLandNoTransfer"
-   type="alertmodal">
-Unable to abandon land:
-The region [REGION] does not allow transfer of land.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotReleaseLandPartialSelection"
-   type="alertmodal">
-Unable to abandon land:
-You must select an entire parcel to release it.
-
-Select an entire parcel, or divide your parcel first.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ReleaseLandWarning"
-   type="alertmodal">
-You are about to release [AREA] m² of land.
-Releasing this parcel will remove it from your land holdings, but will not grant any [CURRENCY].
-
-Release this land?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotDivideLandNothingSelected"
-   type="alertmodal">
-Unable to divide land:
-
-No parcels selected.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotDivideLandPartialSelection"
-   type="alertmodal">
-Unable to divide land:
-
-You have an entire parcel selected.
-Try selecting a part of the parcel.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LandDivideWarning"
-   type="alertmodal">
-Dividing this land will split this parcel into two and each parcel can have its own settings. Some settings will be reset to defaults after the operation.
-
-Divide land?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotDivideLandNoRegion"
-   type="alertmodal">
-Unable to divide land:
-Cannot find the region this land is in.
-
-Please use Help -&gt; Bug Reporting -&gt; Report Bug to report this.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotJoinLandNoRegion"
-   type="alertmodal">
-Unable to join land:
-Cannot find the region this land is in.
-
-Please use Help -&gt; Bug Reporting -&gt; Report Bug to report this.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotJoinLandNothingSelected"
-   type="alertmodal">
-Unable to join land:
-No parcels selected.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotJoinLandEntireParcelSelected"
-   type="alertmodal">
-Unable to join land:
-You only have one parcel selected.
-
-Select land across both parcels.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotJoinLandSelection"
-   type="alertmodal">
-Unable to join land:
-You must select more than one parcel.
-
-Select land across both parcels.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="JoinLandWarning"
-   type="alertmodal">
-Joining this land will create one large parcel out of all parcels intersecting the selected rectangle.
-You will need to reset the name and options of the new parcel.
-
-Join land?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ShowOwnersHelp"
-   type="alertmodal">
-Show owners:
-Color parcels to show the owner type.
-
-Green = Your land
-Aqua = Your Group&apos;s land
-Red = Owned by others
-Yellow = For sale
-Purple = For auction
-Grey = Public
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmNotecardSave"
-   type="alertmodal">
-This notecard needs to be saved before the item can be copied or viewed. Save notecard?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmItemCopy"
-   type="alertmodal">
-Copy this item to your inventory?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="Copy"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ResolutionSwitchFail"
-   type="alertmodal">
-Failed to switch resolution to [RESX] by [RESY]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ErrorUndefinedGrasses"
-   type="alertmodal">
-Error: Undefined grasses: [SPECIES]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ErrorUndefinedTrees"
-   type="alertmodal">
-Error: Undefined trees: [SPECIES]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotSaveWearableOutOfSpace"
-   type="alertmodal">
-Unable to save &apos;[NAME]&apos; to wearable file.  You will need to free up some space on your computer and save the wearable again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotSaveToAssetStore"
-   type="alertmodal">
-Unable to save [NAME] to central asset store.
-This is usually a temporary failure. Please customize and save the wearable again in a few minutes.
-
-If this problem persists, please click on the &apos;Help -&gt; Bug Reporting &gt; Report Bug&apos; pull down menu
-and provide details about your network setup.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="YouHaveBeenLoggedOut"
-   type="alertmodal">
-You have been logged out of [SECOND_LIFE]:
-            [MESSAGE]
-You can still look at existing IM and chat by clicking &apos;View IM &amp; Chat&apos;. Otherwise, click &apos;Quit&apos; to exit [APP_NAME] immediately.
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Quit"
-     yestext="View IM &amp; Chat"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="OnlyOfficerCanBuyLand"
-   type="alertmodal">
-Unable to buy land for the group:
-You do not have permission to buy land for your active group.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Add Friend"
-   name="AddFriend"
-   type="alertmodal">
-Friends can give permissions to track each other on the map and receive online status updates.
-
-Offer friendship to [NAME]?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Add Friend"
-   name="AddFriendWithMessage"
-   type="alertmodal">
-Friends can give permissions to track each other on the map and receive online status updates.
-
-Offer friendship to [NAME]?
-    <form name="form">
-      <input name="message" type="text">
-Would you be my friend?
-      </input>
-      <button
-       default="true"
-       index="0"
-       name="Offer"
-       text="OK"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RemoveFromFriends"
-   type="alertmodal">
-Do you want to remove [NAME] from your Friends List?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RemoveMultipleFromFriends"
-   type="alertmodal">
-Do you want to remove multiple friends from your Friends list?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GodDeleteAllScriptedPublicObjectsByUser"
-   type="alertmodal">
-Are you sure you want to delete all scripted objects owned by
-** [AVATAR_NAME] **
-on all others land in this sim?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GodDeleteAllScriptedObjectsByUser"
-   type="alertmodal">
-Are you sure you want to DELETE ALL scripted objects owned by
-** [AVATAR_NAME] **
-on ALL LAND in this sim?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GodDeleteAllObjectsByUser"
-   type="alertmodal">
-Are you sure you want to DELETE ALL objects (scripted or not) owned by
-** [AVATAR_NAME] **
-on ALL LAND in this sim?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="BlankClassifiedName"
-   type="alertmodal">
-You must specify a name for your classified.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MinClassifiedPrice"
-   type="alertmodal">
-Price to pay for listing must be at least [CURRENCY][MIN_PRICE].
-
-Please enter a higher price.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmItemDeleteHasLinks"
-   type="alertmodal">
-At least one of the items you has link items that point to it.  If you delete this item, its links will permanently stop working.  It is strongly advised to delete the links first.
-
-Are you sure you want to delete these items?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmObjectDeleteLock"
-   type="alertmodal">
-At least one of the items you have selected is locked.
-
-Are you sure you want to delete these items?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmObjectDeleteNoCopy"
-   type="alertmodal">
-At least one of the items you have selected is not copyable.
-
-Are you sure you want to delete these items?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmObjectDeleteNoOwn"
-   type="alertmodal">
-You do not own least one of the items you have selected.
-
-Are you sure you want to delete these items?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmObjectDeleteLockNoCopy"
-   type="alertmodal">
-At least one object is locked.
-At least one object is not copyable.
-
-Are you sure you want to delete these items?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmObjectDeleteLockNoOwn"
-   type="alertmodal">
-At least one object is locked.
-You do not own least one object.
-
-Are you sure you want to delete these items?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmObjectDeleteNoCopyNoOwn"
-   type="alertmodal">
-At least one object is not copyable.
-You do not own least one object.
-
-Are you sure you want to delete these items?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmObjectDeleteLockNoCopyNoOwn"
-   type="alertmodal">
-At least one object is locked.
-At least one object is not copyable.
-You do not own least one object.
-
-Are you sure you want to delete these items?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmObjectTakeLock"
-   type="alertmodal">
-At least one object is locked.
-
-Are you sure you want to take these items?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmObjectTakeNoOwn"
-   type="alertmodal">
-You do not own all of the objects you are taking.
-If you continue, next owner permissions will be applied and possibly restrict your ability to modify or copy them.
-
-Are you sure you want to take these items?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmObjectTakeLockNoOwn"
-   type="alertmodal">
-At least one object is locked.
-You do not own all of the objects you are taking.
-If you continue, next owner permissions will be applied and possibly restrict your ability to modify or copy them.
-However, you can take the current selection.
-
-Are you sure you want to take these items?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantBuyLandAcrossMultipleRegions"
-   type="alertmodal">
-Unable to buy land because selection spans multiple regions.
-
-Please select a smaller area and try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DeedLandToGroup"
-   type="alertmodal">
-By deeding this parcel, the group will be required to have and maintain sufficient land use credits.
-The purchase price of the land is not refunded to the owner. If a deeded parcel is sold, the sale price will be divided evenly among group members.
-
-Deed this [AREA] m² of land to the group &apos;[GROUP_NAME]&apos;?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DeedLandToGroupWithContribution"
-   type="alertmodal">
-By deeding this parcel, the group will be required to have and maintain sufficient land use credits.
-The deed will include a simultaneous land contribution to the group from &apos;[NAME]&apos;.
-The purchase price of the land is not refunded to the owner. If a deeded parcel is sold, the sale price will be divided evenly among group members.
-
-Deed this [AREA] m² of land to the group &apos;[GROUP_NAME]&apos;?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DisplaySetToSafe"
-   type="alertmodal">
-Display settings have been set to safe levels because you have specified the -safe option.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DisplaySetToRecommended"
-   type="alertmodal">
-Display settings have been set to recommended levels based on your system configuration.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ErrorMessage"
-   type="alertmodal">
-[ERROR_MESSAGE]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AvatarMoved"
-   type="alertmodal">
-Your [TYPE] location is not currently available. [HELP]
-You have been moved into a nearby region.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ClothingLoading"
-   type="alertmodal">
-Your clothing is still downloading.
-You can use [SECOND_LIFE] normally and other people will see you correctly.
-    <form name="form">
-      <ignore name="ignore"
-       text="When clothing is taking a long time to download"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="FirstRun"
-   type="alertmodal">
-
-[APP_NAME] installation is complete.
-
-If this is your first time using [SECOND_LIFE], you will need to create an account before you can log on.
-Return to www.secondlife.com to create a new account?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Continue"
-     yestext="New Account..."/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LoginPacketNeverReceived"
-   type="alertmodal">
-We&apos;re having trouble connecting. There may be a problem with your internet connection or the [SECOND_LIFE_GRID].
-
-You can either check your internet connection and try again in a few minutes, click Help to connect to our support site, or click Teleport to attempt to teleport home.
-    <form name="form">
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-      <button
-       index="1"
-       name="Help"
-       text="Help"/>
-      <button
-       index="2"
-       name="Teleport"
-       text="Teleport"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WelcomeChooseSex"
-   type="alertmodal">
-Your character will appear in a moment.
-
-Use arrow keys to walk.
-Press the F1 key at any time for help or to learn more about [SECOND_LIFE].
-Please choose the male or female avatar. You can change your mind later.
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Female"
-     yestext="Male"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NotEnoughCurrency"
-   type="alertmodal">
-[NAME] [CURRENCY] [PRICE] You don&apos;t have enough [CURRENCY] to do that.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GrantedModifyRights"
-   type="alertmodal">
-You have been granted the privilege to modify [NAME]&apos;s objects.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RevokedModifyRights"
-   type="alertmodal">
-Your privilege to modify [NAME]&apos;s objects has been revoked
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="FlushMapVisibilityCaches"
-   type="alertmodal">
-This will flush the map caches on this region.
-This is really only useful for debugging.
-(In production, wait 5 minutes, then everyone&apos;s map will update after they relog.)
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="BuyOneObjectOnly"
-   type="alertmodal">
-Unable to buy more than one object at a time.  Please select only one object and try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="OnlyCopyContentsOfSingleItem"
-   type="alertmodal">
-Unable to copy the contents of more than one item at a time.
-Please select only one object and try again.
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="KickUsersFromRegion"
-   type="alertmodal">
-Teleport all Residents in this region home?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="EstateObjectReturn"
-   type="alertmodal">
-Are you sure you want to return objects owned by [USER_NAME]?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="InvalidTerrainBitDepth"
-   type="alertmodal">
-Couldn&apos;t set region textures:
-Terrain texture [TEXTURE_NUM] has an invalid bit depth of [TEXTURE_BIT_DEPTH].
-
-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image then click &quot;Apply&quot; again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="InvalidTerrainSize"
-   type="alertmodal">
-Couldn&apos;t set region textures:
-Terrain texture [TEXTURE_NUM] is too large at [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y].
-
-Replace texture [TEXTURE_NUM] with a 24-bit 512x512 or smaller image then click &quot;Apply&quot; again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RawUploadStarted"
-   type="alertmodal">
-Upload started. It may take up to two minutes, depending on your connection speed.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmBakeTerrain"
-   type="alertmodal">
-Do you really want to bake the current terrain, make it the center for terrain raise/lower limits and the default for the &apos;Revert&apos; tool?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MaxAllowedAgentOnRegion"
-   type="alertmodal">
-You can only have [MAX_AGENTS] Allowed Residents.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MaxBannedAgentsOnRegion"
-   type="alertmodal">
-You can only have [MAX_BANNED] Banned Residents.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MaxAgentOnRegionBatch"
-   type="alertmodal">
-Failure while attempting to add [NUM_ADDED] agents:
-Exceeds the [MAX_AGENTS] [LIST_TYPE] limit by [NUM_EXCESS].
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MaxAllowedGroupsOnRegion"
-   type="alertmodal">
-You can only have [MAX_GROUPS] Allowed Groups.
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="Bake"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MaxManagersOnRegion"
-   type="alertmodal">
-You can only have [MAX_MANAGER] Estate Managers.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="OwnerCanNotBeDenied"
-   type="alertmodal">
-Can&apos;t add estate owner to estate &apos;Banned Resident&apos; list.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CanNotChangeAppearanceUntilLoaded"
-   type="alertmodal">
-Can&apos;t change appearance until clothing and shape are loaded.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ClassifiedMustBeAlphanumeric"
-   type="alertmodal">
-The name of your classified must start with a letter from A to Z or a number.  No punctuation is allowed.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CantSetBuyObject"
-   type="alertmodal">
-Can&apos;t set Buy Object, because the object is not for sale.
-Please set the object for sale and try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="FinishedRawDownload"
-   type="alertmodal">
-Finished download of raw terrain file to:
-[DOWNLOAD_PATH].
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DownloadWindowsMandatory"
-   type="alertmodal">
-A new version of [APP_NAME] is available.
-[MESSAGE]
-You must download this update to use [APP_NAME].
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Quit"
-     yestext="Download"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DownloadWindows"
-   type="alertmodal">
-An updated version of [APP_NAME] is available.
-[MESSAGE]
-This update is not required, but we suggest you install it to improve performance and stability.
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Continue"
-     yestext="Download"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DownloadWindowsReleaseForDownload"
-   type="alertmodal">
-An updated version of [APP_NAME] is available.
-[MESSAGE]
-This update is not required, but we suggest you install it to improve performance and stability.
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Continue"
-     yestext="Download"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DownloadMacMandatory"
-   type="alertmodal">
-A new version of [APP_NAME] is available.
-[MESSAGE]
-You must download this update to use [APP_NAME].
-
-Download to your Applications folder?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Quit"
-     yestext="Download"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DownloadMac"
-   type="alertmodal">
-An updated version of [APP_NAME] is available.
-[MESSAGE]
-This update is not required, but we suggest you install it to improve performance and stability.
-
-Download to your Applications folder?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Continue"
-     yestext="Download"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DownloadMacReleaseForDownload"
-   type="alertmodal">
-An updated version of [APP_NAME] is available.
-[MESSAGE]
-This update is not required, but we suggest you install it to improve performance and stability.
-
-Download to your Applications folder?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Continue"
-     yestext="Download"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="DeedObjectToGroup"
-   type="alertmodal">
-Deeding this object will cause the group to:
-* Receive [CURRENCY] paid into the object
-    <usetemplate
-     ignoretext="When deeding objects to groups"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="Deed"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WebLaunchExternalTarget"
-   type="alertmodal">
-Open your system Web browser to view this content?
-    <usetemplate
-     ignoretext="When opening your system browser to view a Web page"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WebLaunchJoinNow"
-   type="alertmodal">
-Go to www.secondlife.com to manage your account?
-    <usetemplate
-     ignoretext="When launching web browser to manage your account"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WebLaunchBugReport101"
-   type="alertmodal">
-Visit the [SECOND_LIFE] Wiki and learn how to report bugs correctly.
-    <usetemplate
-     ignoretext="When launching web browser to view the Bug Reporting 101 Wiki"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WebLaunchSecurityIssues"
-   type="alertmodal">
-Visit the [SECOND_LIFE] Wiki for details of how to report a security issue.
-    <usetemplate
-     ignoretext="When launching web browser to view Security Issues Wiki"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WebLaunchQAWiki"
-   type="alertmodal">
-Visit the [SECOND_LIFE] QA Wiki.
-    <usetemplate
-     ignoretext="When launching web browser to view the QA Wiki"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WebLaunchPublicIssue"
-   type="alertmodal">
-Visit the [SECOND_LIFE] Public Issue Tracker, where you can report bugs and other issues.
-    <usetemplate
-     ignoretext="When launching web browser to view the Public Issue Tracker"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="Go to page"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WebLaunchSinguIssue"
-   type="alertmodal">
-Visit the Singularity Issue Tracker, to report bugs and issues with Singularity Viewer.
-    <usetemplate
-     ignoretext="When launching web browser to view Singularity Issue Tracker"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="Go to page"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WebLaunchPublicIssueHelp"
-   type="alertmodal">
-Visit the [SECOND_LIFE] Wiki for info on how to use the Public Issue Tracker.
-    <usetemplate
-     ignoretext="When launching web browser to view Public Issue Tracker Wiki"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="Go to page"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WebLaunchSupportWiki"
-   type="alertmodal">
-Go to the Official [GRID_OWNER] Blog, for the latest news and information.
-    <usetemplate
-     ignoretext="When launching web browser to view the blog"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WebLaunchLSLGuide"
-   type="alertmodal">
-Go to the Scripting Guide for scripting help?
-    <usetemplate
-     ignoretext="When launching web browser to view the Scripting Guide"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WebLaunchLSLWiki"
-   type="alertmodal">
-Go to the LSL Portal for scripting help?
-    <usetemplate
-     ignoretext="When launching web browser to view the LSL Portal"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="Go to page"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ReturnToOwner"
-   type="alertmodal">
-Are you sure you want to return the selected objects to their owners? Transferable deeded objects will be returned to their previous owners.
-
-*WARNING* No-transfer deeded objects will be deleted!
-    <usetemplate
-     ignoretext="When returning objects to their owners"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="GroupLeaveConfirmMember"
-   type="alert">
-You are currently a member of the group [GROUP].
-Leave Group?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="ConfirmKick"
-   type="alert">
-Do you REALLY want to kick all users off the grid?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="Kick All Users"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MuteLinden"
-   type="alertmodal">
-Sorry, you cannot mute an employee of [GRID_OWNER].
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CannotStartAuctionAlreadyForSale"
-   type="alertmodal">
-You cannot start an auction on a parcel which is already set for sale.  Disable the land sale if you are sure you want to start an auction.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Mute object by name failed"
-   name="MuteByNameFailed"
-   type="alertmodal">
-You already have muted this name.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="RemoveItemWarn"
-   type="alert">
-Though permitted, deleting contents may damage the object. Do you want to delete that item?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="CantOfferCallingCard"
-   type="alert">
-Cannot offer a calling card at this time. Please try again in a moment.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="CantOfferFriendship"
-   type="alert">
-Cannot offer friendship at this time. Please try again in a moment.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="BusyModeSet"
-   type="alert">
-Busy mode set.
-Chat and instant messages will be hidden. Instant messages will get your Busy mode response. All teleportation offers will be declined. All inventory offers will go to your Trash.
-    <usetemplate
-     ignoretext="When setting busy mode"
-     name="okignore"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="JoinedTooManyGroupsMember"
-   type="alert">
-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;Groups...&apos; option from the &apos;Edit&apos; menu.
-[NAME] has invited you to join a group as a member.
-[INVITE]
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Decline"
-     yestext="Join"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="KickUser"
-   type="alert">
-Kick this user with what message?
-    <form name="form">
-      <input name="message" type="text">
-An administrator has logged you off.
-      </input>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="KickAllUsers"
-   type="alert">
-Kick everyone currently on the grid with what message?
-    <form name="form">
-      <input name="message" type="text">
-An administrator has logged you off.
-      </input>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="FreezeUser"
-   type="alert">
-Freeze this user with what message?
-    <form name="form">
-      <input name="message" type="text">
-You have been frozen. You cannot move or chat. An administrator will contact you via instant message (IM).
-      </input>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="UnFreezeUser"
-   type="alert">
-Unfreeze this user with what message?
-    <form name="form">
-      <input name="message" type="text">
-You are no longer frozen.
-      </input>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="OfferTeleport"
-   type="alertmodal">
-Offer a teleport to your location with the following message?
-    <form name="form">
-      <input name="message" type="text">
-Join me in [REGION]
-      </input>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="OfferTeleportFromGod"
-   type="alertmodal">
-God summon user to your location?
-    <form name="form">
-      <input name="message" type="text">
-Join me in [REGION]
-      </input>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="TeleportFromLandmark"
-   type="alertmodal">
-Are you sure you want to teleport?
-    <usetemplate
-     ignoretext="When teleporting from a landmark in inventory"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="Teleport"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   label="Message everyone in your Estate"
-   name="MessageEstate"
-   type="alert">
-Type a short announcement which will be sent to everyone currently in your estate.
-    <form name="form">
-      <input name="message" type="text"/>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   label="Change Linden Estate"
-   name="ChangeLindenEstate"
-   type="alert">
-You are about to change a Governance-owned estate (mainland, teen grid, orientation, etc.).
-
-This is EXTREMELY DANGEROUS because it can fundamentally affect the user experience.  On the mainland, it will change thousands of regions and make the spaceserver hiccup.
-
-Proceed?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   label="Change Linden Estate Access"
-   name="ChangeLindenAccess"
-   type="alert">
-You are about to change the access list for a Governance-owned estate (mainland, teen grid, orientation, etc.).
-
-This is DANGEROUS and should only be done to invoke the hack allowing objects/[CURRENCY] to be transfered in/out of a grid.
-It will change thousands of regions and make the spaceserver hiccup.
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   label="Select estate"
-   name="EstateAllowedAgentAdd"
-   type="alert">
-Add to allowed list for this estate only or for [ALL_ESTATES]?
-    <usetemplate
-     canceltext="Cancel"
-     name="yesnocancelbuttons"
-     notext="All Estates"
-     yestext="This Estate"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   label="Select estate"
-   name="EstateAllowedAgentRemove"
-   type="alert">
-Remove from allowed list for this estate only or for [ALL_ESTATES]?
-    <usetemplate
-     canceltext="Cancel"
-     name="yesnocancelbuttons"
-     notext="All Estates"
-     yestext="This Estate"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   label="Select estate"
-   name="EstateAllowedGroupAdd"
-   type="alert">
-Add to group allowed list for this estate only or for [ALL_ESTATES]?
-    <usetemplate
-     canceltext="Cancel"
-     name="yesnocancelbuttons"
-     notext="All Estates"
-     yestext="This Estate"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   label="Select estate"
-   name="EstateAllowedGroupRemove"
-   type="alert">
-Remove from group allowed list for this estate only or [ALL_ESTATES]?
-    <usetemplate
-     canceltext="Cancel"
-     name="yesnocancelbuttons"
-     notext="All Estates"
-     yestext="This Estate"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   label="Select estate"
-   name="EstateBannedAgentAdd"
-   type="alert">
-Deny access for this estate only or for [ALL_ESTATES]?
-    <usetemplate
-     canceltext="Cancel"
-     name="yesnocancelbuttons"
-     notext="All Estates"
-     yestext="This Estate"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   label="Select estate"
-   name="EstateBannedAgentRemove"
-   type="alert">
-Remove this Resident from the ban list for  access for this estate only or for [ALL_ESTATES]?
-    <usetemplate
-     canceltext="Cancel"
-     name="yesnocancelbuttons"
-     notext="All Estates"
-     yestext="This Estate"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   label="Select estate"
-   name="EstateManagerAdd"
-   type="alert">
-Add estate manager for this estate only or for [ALL_ESTATES]?
-    <usetemplate
-     canceltext="Cancel"
-     name="yesnocancelbuttons"
-     notext="All Estates"
-     yestext="This Estate"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   label="Select estate"
-   name="EstateManagerRemove"
-   type="alert">
-Remove estate manager for this estate only or for [ALL_ESTATES]?
-    <usetemplate
-     canceltext="Cancel"
-     name="yesnocancelbuttons"
-     notext="All Estates"
-     yestext="This Estate"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   label="Confirm Kick"
-   name="EstateKickUser"
-   type="alert">
-Kick [EVIL_USER] from this estate?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="EstateChangeCovenant"
-   type="alertmodal">
-Are you sure you want to change the Estate Covenant?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RegionEntryAccessBlocked"
-   type="alertmodal">
-You are not allowed in that Region due to your maturity Rating. This may be a result of a lack of information validating your age.
-
-Please verify you have the latest Viewer installed, and go to the Knowledge Base for details on accessing areas with this maturity rating.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RegionEntryAccessBlocked_KB"
-   type="alertmodal">
-You are not allowed in that region due to your maturity Rating.
-
-Go to the Knowledge Base for more information about maturity Ratings?
-    <url option="0" name="url">
-		https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
-    </url>
-    <usetemplate
-     name="okcancelignore"
-     yestext="Go to Knowledge Base"
-	 notext="Close"
-	 ignoretext="When Region entry is blocked due to maturity Rating"/>
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="RegionEntryAccessBlocked_Notify"
-   type="notifytip">
-You are not allowed in that region due to your maturity Rating.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="RegionEntryAccessBlocked_Change"
-   type="alertmodal">
-You are not allowed in that Region due to your maturity Rating preference.
-
-You can click &apos;Change Preference&apos; to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Edit &gt; Preferences... &gt; General.
-	 <form name="form">
-      <button
-       index="0"
-       name="OK"
-       text="Change Preference"/>
-      <button
-       default="true"
-       index="1"
-       name="Cancel"
-       text="Close"/>
-       <ignore name="ignore" text="When Region entry is blocked due to maturity Rating preference"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LandClaimAccessBlocked"
-   type="alertmodal">
-You cannot claim this land due to your maturity Rating. This may be a result of a lack of information validating your age.
-
-Please verify you have the latest Viewer installed, and go to the Knowledge Base for details on accessing areas with this maturity rating.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LandClaimAccessBlocked_KB"
-   type="alertmodal">
-You cannot claim this land due to your maturity Rating.
-
-Go to the Knowledge Base for more information about maturity Ratings?
-    <url option="0" name="url">
-		https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
-    </url>
-    <usetemplate
-     name="okcancelignore"
-     yestext="Go to Knowledge Base"
-	 notext="Close"
-	 ignoretext="When claiming land is blocked due to maturity Rating"/>
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="LandClaimAccessBlocked_Notify"
-   type="notifytip">
-You cannot claim this land due to your maturity Rating.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LandClaimAccessBlocked_Change"
-   type="alertmodal">
-You cannot claim this land due to your maturity Rating preference.
-
-You can click &apos;Change Preference&apos; to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Edit &gt; Preferences... &gt; General.
-    <usetemplate
-     name="okcancelignore"
-     yestext="Change Preference"
-	 notext="Close"
-	 ignoretext="When claiming land is blocked due to maturity Rating preference"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LandBuyAccessBlocked"
-   type="alertmodal">
-You cannot buy this land due to your maturity Rating. This may be a result of a lack of information validating your age.
-
-Please verify you have the latest Viewer installed, and go to the Knowledge Base for details on accessing areas with this maturity rating.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LandBuyAccessBlocked_KB"
-   type="alertmodal">
-You cannot buy this land due to your maturity Rating.
-
-Go to the Knowledge Base for more information about maturity Ratings?
-    <url option="0" name="url">
-		https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
-    </url>
-    <usetemplate
-     name="okcancelignore"
-     yestext="Go to Knowledge Base"
-	 notext="Close"
-	 ignoretext="When a Land purchase is blocked due to maturity Rating"/>
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="LandBuyAccessBlocked_Notify"
-   type="notifytip">
-You cannot buy this land due to your maturity Rating.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="LandBuyAccessBlocked_Change"
-   type="alertmodal">
-You cannot buy this land due to your maturity Rating preference.
-
-You can click &apos;Change Preference&apos; to raise your maturity Rating preference now and allow you to enter. You will be able to search and access [REGIONMATURITY] content from now on. If you later want to change this setting back, go to Edit &gt; Preferences... &gt; General.
-    <usetemplate
-     name="okcancelignore"
-     yestext="Change Preference"
-	 notext="Close"
-	 ignoretext="When a Land purchase is blocked due to maturity Rating preference"/>
-  </notification>
-
-	<notification
-	  icon="alertmodal.tga"
-	  name="TooManyPrimsSelected"
-	  type="alertmodal">
-		"There are too many prims selected.  Please select [MAX_PRIM_COUNT] or fewer prims and try again"
-		<usetemplate
-		 name="okbutton"
-		 yestext="OK"/>
-	</notification>
-
-	<notification
-   icon="alertmodal.tga"
-   name="ProblemImportingEstateCovenant"
-   type="alertmodal">
-Problem importing estate covenant.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ProblemAddingEstateManager"
-   type="alertmodal">
-Problems adding a new estate manager.  One or more estates may have a full manager list.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ProblemAddingEstateGeneric"
-   type="alertmodal">
-Problems adding to this estate list.  One or more estates may have a full list.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="UnableToLoadNotecardAsset"
-   type="alertmodal">
-Unable to load notecard&apos;s asset at this time.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NotAllowedToViewNotecard"
-   type="alertmodal">
-Insufficient permissions to view notecard associated with asset ID requested.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MissingNotecardAssetID"
-   type="alertmodal">
-Asset ID for notecard is missing from database.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="PublishClassified"
-   type="alert">
-Remember: Classified ad fees are non-refundable.
-
-Publish this classified now for [CURRENCY][AMOUNT]?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SetClassifiedMature"
-   type="alertmodal">
-Does this classified contain Mature content?
-    <usetemplate
-     canceltext="Cancel"
-     name="yesnocancelbuttons"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SetGroupMature"
-   type="alertmodal">
-Does this group contain Mature content?
-    <usetemplate
-     canceltext="Cancel"
-     name="yesnocancelbuttons"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   label="Confirm restart"
-   name="ConfirmRestart"
-   type="alert">
-Do you really want to restart this region?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   label="Message everyone in this region"
-   name="MessageRegion"
-   type="alert">
-Type a short announcement which will be sent to everyone in this region.
-    <form name="form">
-      <input name="message" type="text"/>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Block Terraform"
-   name="HelpRegionBlockTerraform"
-   type="alertmodal">
-If this box is checked, land owners will not be able to terraform their land regardless of the per-parcel &apos;Edit Terrain&apos; setting.
-
-Default: off
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Block Fly"
-   name="HelpRegionBlockFly"
-   type="alertmodal">
-If this box is checked, people will not be able to fly in this region regardless of the per-parcel &apos;Fly&apos; setting.
-
-Default: off
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Bulk Change Content Permissions"
-   name="HelpBulkPermission"
-   type="alertmodal">
-The Bulk Permissions tool helps you to quickly change the permissions on multiple items in the contents of the selected object(s).  However, please note that you are only setting permissions on the items in the Contents of the selected objects -- not permissions on the container object(s) themselves.  
-
-Also note, the permissions are not applied to the nested contents of any of the contained items.  Your request only operates on items exactly one level deep.
-
-You can selectively choose which types of items to modify by using the checklist under &apos;Content Types&apos; here. Snapshots are included when you select Textures.
-
-* This tool will only succeed at changing permissions on items you are allowed to change.
-* You cannot grant any Next owner permissions which you do not already have.
-* The Next owner permissions are merely requests. If any item cannot take all of the new permissions, none of its permissions will change.
-
-When you are ready to change the permissions in bulk, click &apos;Apply&apos; and wait for the results to display.
-
-If you close the Bulk Permissions window while permissions are being changed, it will halt the operation.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Allow Damage"
-   name="HelpRegionAllowDamage"
-   type="alertmodal">
-If this box is checked, the health system across all parcels regardless of individual parcel settings. If this box is left unchecked, individual parcel owners will still be able to activate the health system on their parcels.
-
-Default: off
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Agent Limit"
-   name="HelpRegionAgentLimit"
-   type="alertmodal">
-Sets the maximum number of avatars allowed in this region.
-Performance may vary depending on the number avatars present.
-
-Default: 40
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Object Bonus"
-   name="HelpRegionObjectBonus"
-   type="alertmodal">
-The Object Bonus is a multiplier for primitives allowed on any given parcel. The range allowed is 1 to 10. Set at &apos;1&apos;, each 512m² parcel is allowed 117 objects. Set at &apos;2&apos;, each 512m² parcel is allowed 234, or twice as many, and so on. The max number of objects allowed per region remains 15,000 no matter what the Object Bonus is. Once set, be aware that lowering the Object Bonus may cause objects to be returned or deleted.
-
-Default: 1.0
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Maturity"
-   name="HelpRegionMaturity"
-   type="alertmodal">
-Sets the maturity Rating of the Region, as shown in the menu bar at the top of any Resident&apos;s viewer, and in tooltips on the World Map when the cursor hovers over this Region. This setting also affects access to this Region and search results. Other Residents may only enter Regions or view search results with the same maturity Ratings they have chosen in their preferences.
-
-It may take some time for this change to be reflected on the map.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Restrict Pushing"
-   name="HelpRegionRestrictPushObject"
-   type="alertmodal">
-This checkbox sets the full region to restricted push permissions.
-When enabled, Residents may only be pushed by themselves or by the parcel&apos;s owner.
-(Push refers to the llPushObject() LSL function.)
-
-Default: Off
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Parcel Join/Subdivide"
-   name="HelpParcelChanges"
-   type="alertmodal">
-This checkbox sets whether or not parcels not owned by the estate owner can be joined or subdivided.
-If this option is unchecked:
- * Only estate owners or managers can join or subdivide parcels.
- * They may only join or subdivide parcels belonging to the owner, or to a group where they have the appropriate group powers.
-If this option is checked:
- * All parcel owners can join or subdivide the parcels they own.
- * For group owned parcels, those with appropriate group powers may join or subdivide parcels.
-
-Default: Checked
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Do Not Show In Search"
-   name="HelpRegionSearch"
-   type="alertmodal">
-Checking this box will block parcel owners from listing their parcels in search.
-
-Default: Off
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Changed Region Maturity"
-   name="RegionMaturityChange"
-   type="alertmodal">
-The maturity rating for this region has been updated.
-It may take some time for the change to be reflected on the map.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Land Resale"
-   name="HelpRegionLandResell"
-   type="alertmodal">
-Estate owners and managers can sell any land owned by the estate owner.
-If this option is left unchecked, buyers cannot resell their land in this region.
-If this option is checked, buyers can resell their land in this region.
-
-Default: Disallow
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Disable Scripts"
-   name="HelpRegionDisableScripts"
-   type="alertmodal">
-When sim performance is poor, a script may be to blame. Open the Statistics Bar (Ctrl-Shift-1). Look at the Simulator Physics FPS.
-If it is lower than 45,  open the Time panel located at the bottom of the Stats Bar. If Script Time reads 25 ms or higher, click the Get Top Scripts button. You will be given the name and location of scripts that may be causing poor performance.
-
-Checking the Disable Scripts box and then pressing the Apply button will temporarily disable all scripts in this region. You may need to do this in order to travel to the location of a noted &apos;top script&apos;. Once you have arrived at the location, investigate the script to determine if it is causing the problem. You may want to contact the owner of the script or delete or return the object.
-Uncheck the Disable Script box and then Apply to reactivate the scripts in the region.
-
-Default: off
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Disable Collisions"
-   name="HelpRegionDisableCollisions"
-   type="alertmodal">
-When sim performance is poor, physical objects may be to blame.
-Open the Statistics Bar (Ctrl-Shift-1). Look at the Simulator Physics FPS.  If it is lower than 45, open the Time panel located at the bottom of the Stats Bar. If Sim Time (Physics) reads 20 ms or higher, click the Get Top Colliders button.
-You will be given the name and location of physical objects that may be causing poor performance.
-
-Checking the Disable Collisions box and then pressing the Apply button will temporarily disable object-object collisions. You may need to do this in order to travel to the location of a noted &apos;top collider&apos;. Once you have arrived at the location, investigate the object - is it constantly colliding with other objects? You may want to contact the owner of the object or delete or return the object.
-Uncheck the Disable Collisions box and then Apply to reactivate collisions in the region.
-
-Default: off
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Disable Physics"
-   name="HelpRegionDisablePhysics"
-   type="alertmodal">
-Disable Physics is similar to Disable Collisions, except all physics simulation is disabled.  This means that not only will objects stop colliding, but avatars will be unable to move.
-
-This should only be used when Disable Collisions does not give back enough performance to the region to investigate a physics problem or Top Collider.
-
-Be sure to re-enable physics when you are done, or avatars will continue to be unable to move.
-
-Default: off
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Top Colliders"
-   name="HelpRegionTopColliders"
-   type="alertmodal">
-Show a list of objects experiencing the greatest number of potential object-object collisions.  These objects can slow performance.  Select View &gt; Statistics Bar and look under Simulator &gt; Time &gt; Sim Time (Physics) to see if more than 20 ms is being spent in physics.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Top Scripts"
-   name="HelpRegionTopScripts"
-   type="alertmodal">
-Show a list of objects spending the most time running LSL scripts.  These objects can slow performance.
-Select View &gt; Statistics Bar and look under Simulator &gt; Time &gt; Script Time to see if more than 25 ms is being spent in scripts.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Restart Region"
-   name="HelpRegionRestart"
-   type="alertmodal">
-Restart the server process running this region after a two minute warning.  All Residents in the region will be disconnected.  The region will save its data, and should come back up within 90 seconds.
-
-Restarting the region will not fix most performance problems, and should usually be used only when directed.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Water Height"
-   name="HelpRegionWaterHeight"
-   type="alertmodal">
-This is the height in meters where water appears. If this setting is anything other than 20 and you have water that is adjacent to the edge of world or &apos;void&apos; water, there will be a visible gap.
-
-Default: 20
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Terrain Raise"
-   name="HelpRegionTerrainRaise"
-   type="alertmodal">
-This is the distance in meters that parcel owners can raise their terrain above the &apos;baked&apos; terrain default height.
-
-Default: 4
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Terrain Lower"
-   name="HelpRegionTerrainLower"
-   type="alertmodal">
-This is the distance in meters that parcel owners can lower their terrain below the &apos;baked&apos; terrain default height.
-
-Default: -4
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Upload RAW Terrain"
-   name="HelpRegionUploadRaw"
-   type="alertmodal">
-This button uploads a .RAW file to the region you are in.
-The file must have the correct dimensions (RGB, 256x256) and 13 channels.  The best way to create a terrain file is to download the existing RAW file.  A good first step is to modify the red channel (land height), and upload it.
-
-The upload can take up to 45 seconds. Note that uploading a terrain file *will not* move the objects that are on the land, only the terrain itself and the permissions associated with the parcels.  This can result in objects going underground.
-
-For more information on editing region height fields, consult F1 Help.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Download RAW Terrain"
-   name="HelpRegionDownloadRaw"
-   type="alertmodal">
-This button downloads a file containing the height field data, parcel dimensions, parcel for sale status and some parcel permissions for this region. When opening the file in a program such as Photoshop you must specify the document&apos;s dimensions which are: RGB, 256x256 with 13 channels. This terrain file cannot be opened in any other way.
-
-For more information on editing region height fields, consult F1 help.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Use Estate Sun"
-   name="HelpRegionUseEstateSun"
-   type="alertmodal">
-This checkbox makes the sun position in this region the same as the sun position in the rest of the estate.
-
-Default: on
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Fixed Sun"
-   name="HelpRegionFixedSun"
-   type="alertmodal">
-This checkbox sets the sun position to the position in the Phase slider and stops the sun from moving.
-
-Default: off
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Bake Terrain"
-   name="HelpRegionBakeTerrain"
-   type="alertmodal">
-This button saves the current shape of the terrain as the new default for the region. Once baked, the land can revert to the saved shape whenever you or others use the Edit Terrain &apos;Revert&apos; option. The baked terrain is also the middle point for the terrain raise and lower limits.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Estate Managers"
-   name="HelpEstateEstateManager"
-   type="alertmodal">
-An estate manager is a Resident to whom you have delegated control of region and estate settings.  An estate manager can change any setting in these panels, except for uploading, downloading, and baking terrain.  In particular, they can allow or ban Residents from your estate.
-
-Estate managers can only be added or removed by the owner of the estate, not by each other.  Please only choose Residents you trust as estate managers, as you will be ultimately responsible for their actions.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Use Global Time"
-   name="HelpEstateUseGlobalTime"
-   type="alertmodal">
-This checkbox makes the sun in your estate follow the same position as on the Governance-owned &apos;mainland&apos; estates.
-
-Default: on
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Fixed Sun"
-   name="HelpEstateFixedSun"
-   type="alertmodal">
-This checkbox sets the sun position to the position in the Phase slider and stops the sun from moving.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Public Access"
-   name="HelpEstateExternallyVisible"
-   type="alertmodal">
-This checkbox sets whether Residents who are on other estates can enter this estate without being on an access list.
-
-Default: on
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Allow Direct Teleport"
-   name="HelpEstateAllowDirectTeleport"
-   type="alertmodal">
-When checked, allows Residents to directly teleport to any point in your estate.  When unchecked, Residents teleport to the nearest telehub.
-
-Default: off
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Allow Access"
-   name="HelpEstateAllowResident"
-   type="alertmodal">
-Access to this estate will be limited to Residents listed here and any groups below.  This setting is only available when Public Access is unchecked.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Allow Group Access"
-   name="HelpEstateAllowGroup"
-   type="alertmodal">
-Access to this estate will be limited to groups listed here and any Residents above.  This setting is only available when Public Access is unchecked.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Abuse Email Address"
-   name="HelpEstateAbuseEmailAddress"
-   type="alertmodal">
-Setting this to a valid email address will cause abuse reports on this estate to be sent to that address.
-Setting it blank will cause abuse reports to be sent only to [SECOND_LIFE].
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Deny Access"
-   name="HelpEstateBanResident"
-   type="alertmodal">
-Residents on this list are denied access to your estate, regardless of any other settings.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Allow Voice Chat"
-   name="HelpEstateVoiceChat"
-   type="alertmodal">
-Parcels in this estate are allowed to have their own voice channels in which residents may hear and talk with others nearby.
-
-Default: off
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Voice Version Mismatch"
-   name="VoiceVersionMismatch"
-   type="alertmodal">
-This version of [APP_NAME] is not compatible with the Voice Chat feature in this region. Please upgrate to the latest version.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Estate Covenant"
-   name="HelpEstateCovenant"
-   type="alertmodal">
-Setting an estate covenant enables you to sell parcels within that estate. If a covenant is not set, you cannot sell the land. The notecard for your covenant can be empty if you do not wish to apply any rules or advise buyers of anything in relation to the land before they buy it.
-
-A covenant can be used to communicate rules, guidelines, cultural information or simply your own expectations to the prospective buyer. This can include zoning, building regulations, payment options or any other information you feel it is important for the new owner to have seen and to have agreed to before they purchase.
-
-The buyer must agree to the covenant by ticking the check box before they will be able to finish the purchase. Estate covenants are always visible in the About Land dialog for any parcels that have one set.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Can&apos;t Buy Objects"
-   name="BuyObjectOneOwner"
-   type="alertmodal">
-Cannot buy objects from different owners at the same time.
-Please select only one object and try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Can&apos;t Buy Contents"
-   name="BuyContentsOneOnly"
-   type="alertmodal">
-Unable to buy the contents of more than one object at a time.
-Please select only one object and try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Can&apos;t Buy Contents"
-   name="BuyContentsOneOwner"
-   type="alertmodal">
-Cannot buy objects from different owners at the same time.
-Please select only one object and try again.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="BuyOriginal"
-   type="alertmodal">
-Buy original object from [OWNER] for [CURRENCY][PRICE]?
-You will become the owner of this object.
-You will be able to:
- Modify: [MODIFYPERM]
- Copy: [COPYPERM]
- Resell or Give Away: [RESELLPERM]
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="BuyOriginalNoOwner"
-   type="alertmodal">
-Buy original object for [CURRENCY][PRICE]?
-You will become the owner of this object.
-You will be able to:
- Modify: [MODIFYPERM]
- Copy: [COPYPERM]
- Resell or Give Away: [RESELLPERM]
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="BuyCopy"
-   type="alertmodal">
-Buy a copy from [OWNER] for [CURRENCY][PRICE]?
-The object will be copied to your inventory.
-You will be able to:
- Modify: [MODIFYPERM]
- Copy: [COPYPERM]
- Resell or Give Away: [RESELLPERM]
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="BuyCopyNoOwner"
-   type="alertmodal">
-Buy a copy for [CURRENCY][PRICE]?
-The object will be copied to your inventory.
-You will be able to:
- Modify: [MODIFYPERM]
- Copy: [COPYPERM]
- Resell or Give Away: [RESELLPERM]
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="BuyContents"
-   type="alertmodal">
-Buy contents from [OWNER] for [CURRENCY][PRICE]?
-They will be copied to your inventory.
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="BuyContentsNoOwner"
-   type="alertmodal">
-Buy contents for [CURRENCY][PRICE]?
-They will be copied to your inventory.
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmPurchase"
-   type="alertmodal">
-This transaction will:
-[ACTION]
-
-Are you sure you want to proceed with this purchase?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmPurchasePassword"
-   type="password">
-This transaction will:
-[ACTION]
-
-Are you sure you want to proceed with this purchase?
-Please re-enter your password and click OK.
-    <form name="form">
-      <input
-       name="message"
-       type="password"/>
-      <button
-       default="true"
-       index="0"
-       name="ConfirmPurchase"
-       text="OK"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="SetPickLocation"
-   type="alert">
-Note:
-You have updated the location of this pick but the other details will retain their original values.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MoveInventoryFromObject"
-   type="alertmodal">
-You have selected &apos;no copy&apos; inventory items.
-These items will be moved to your inventory, not copied.
-
-Move the inventory item(s)?
-    <usetemplate
-     ignoretext="When moving no-copy inventory from objects"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MoveInventoryFromScriptedObject"
-   type="alertmodal">
-You have selected &apos;no copy&apos; inventory items.  These items will be moved to your inventory, not copied.
-Because this object is scripted, moving these items to your inventory may cause the script to malfunction.
-
-Move the inventory item(s)?
-    <usetemplate
-     ignoretext="When moving no-copy inventory from scripted objects"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="ClickActionNotPayable"
-   type="alert">
-Warning: The Pay Object click action has been set, but it will only work if a script is added with a money() event.
-    <form name="form">
-      <ignore name="ignore"
-       text="When Setting &apos;Pay&apos; on objects without money() events"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="PaymentBlockedButtonMismatch"
-   type="alertmodal">
-Payment stopped: the price paid does not match any of the pay buttons set for this object.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="OpenObjectCannotCopy"
-   type="alertmodal">
-There are no items in this object that you are allowed to copy.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WebLaunchAccountHistory"
-   type="alertmodal">
-Go to the [SECOND_LIFE] web site to see your account history?
-    <usetemplate
-     ignoretext="When loading account history web page"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="Go to page"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ClickOpenF1Help"
-   type="alertmodal">
-Visit the [SECOND_LIFE] Support Web site?
-    <usetemplate
-     ignoretext="When visiting the [SECOND_LIFE] Support Website."
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="Go"/>
-  </notification>
-  
-  <notification
-   icon="alertmodal.tga"
-   name="NoSupportUrl"
-   type="alertmodal">
-This grid has no link for support.
-  </notification>
-  
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmQuit"
-   type="alertmodal">
-Are you sure you want to quit?
-    <usetemplate
-     ignoretext="When Quitting [APP_NAME]."
-     name="okcancelignore"
-     notext="Continue"
-     yestext="Quit"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpReportAbuseEmailLL"
-   type="alertmodal">
-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 can view the incident resolution on the Incident Report at:
-
-http://secondlife.com/support/incidentreport.php
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpReportAbuseEmailEO"
-   type="alertmodal">
-IMPORTANT: This report will go to the owner of the region you are currently in and not to [GRID_OWNER].
-
-As a service to residents and visitors, the owner of the region you are in has elected to receive and resolve all reports originating in this region. [GRID_OWNER] will not investigate reports you file from this location.
-
-The region owner will resolve reports based on the local rules of this region as outlined in the estate Covenant.
-(View covenants by going to the World menu and selecting About Land.)
-
-The resolution of this report applies only to this Region; Residents access to other areas of the [SECOND_LIFE_GRID] will not be affected by the outcome of this report. Only [GRID_OWNER] can restrict access to the entirety of the [SECOND_LIFE_GRID].
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpReportBug"
-   type="alertmodal">
-Use this tool to *only* report technical features that do not perform as described or expected, please provide as much detail as possible.
-You may reply to the auto-response email to add more details to your report.
-
-All bug reports are investigated and assessed. No email response will be sent.
-
-If you are having a technical difficulty, please contact Support at:
-
-http://secondlife.com/community/support.php
-
-Note: Incomplete reports will not be investigated
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpReportAbuseSelectCategory"
-   type="alertmodal">
-Please select a category for this abuse report.
-Selecting a category helps us file and process abuse reports.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpReportBugSelectCategory"
-   type="alertmodal">
-Please select a category for this bug.
-Selecting a category helps us file and process bug reports.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpReportAbuseAbuserNameEmpty"
-   type="alertmodal">
-Please enter the name of the abuser.
-Entering an accurate value helps us file and process abuse reports.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpReportAbuseAbuserLocationEmpty"
-   type="alertmodal">
-Please enter the location where the abuse took place.
-Entering an accurate value helps us file and process abuse reports.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpReportAbuseSummaryEmpty"
-   type="alertmodal">
-Please enter a summary of the abuse that took place.
-Entering an accurate summary helps us file and process abuse reports.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpReportBugSummaryEmpty"
-   type="alertmodal">
-Please enter a summary of the bug.
-Entering an accurate summary helps us file and process bug reports.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpReportAbuseDetailsEmpty"
-   type="alertmodal">
-Please enter a detailed description of the abuse that took place.
-Be as specific as you can, including names and the details of the incident you are reporting.
-Entering an accurate description helps us file and process abuse reports.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpReportBugDetailsEmpty"
-   type="alertmodal">
-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.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpReportAbuseContainsCopyright"
-   type="alertmodal">
-    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.
-
-    (2) The DMCA or Content Removal Process. To request removal of content from [SECOND_LIFE], you MUST submit a valid notification of infringement as provided in our DMCA Policy.
-
-    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 &apos;CopyBot or Permissions Exploit&apos;.
-
-Thank you,
-
-[GRID_OWNER]
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="FailedRequirementsCheck"
-   type="alertmodal">
-The following required components are missing from [FLOATER]:
-[COMPONENTS]
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   label="Replace Existing Attachment"
-   name="ReplaceAttachment"
-   type="alert">
-There is already an object attached to this point on your body.
-Do you want to replace it with the selected object?
-    <form name="form">
-      <ignore name="ignore"
-       save_option="true"
-       text="When replacing existing attachments"/>
-      <button
-       default="true"
-       ignore="Replace Automatically"
-       index="0"
-       name="Yes"
-       text="OK"/>
-      <button
-       ignore="Never Replace"
-       index="1"
-       name="No"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   label="Busy Mode Warning"
-   name="BusyModePay"
-   type="alert">
-You are in Busy Mode, which means you will not receive any items offered in exchange for this payment.
-
-Would you like to leave Busy Mode before completing this transaction?
-    <form name="form">
-      <ignore name="ignore"
-       save_option="true"
-       text="When paying a person or object in busy mode"/>
-      <button
-       default="true"
-       ignore="Always leave Busy Mode"
-       index="0"
-       name="Yes"
-       text="OK"/>
-      <button
-       ignore="Never leave Busy Mode"
-       index="1"
-       name="No"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmDeleteProtectedCategory"
-   type="alertmodal">
-The folder &apos;[FOLDERNAME]&apos; is a system folder. Deleting system folders can cause instability.  Are you sure you want to delete it?
-    <usetemplate
-     ignoretext="Confirm before I delete a system folder"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmEmptyTrash"
-   type="alertmodal">
-Are you sure you want to permanently remove the contents of your Trash folder?
-    <usetemplate
-     ignoretext="When emptying your inventory trash folder"
-     name="okcancelignore"
-     notext="Cancel"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmClearBrowserCache"
-   type="alertmodal">
-Are you sure you want to clear your browser cache?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmClearCookies"
-   type="alertmodal">
-Are you sure you want to clear your cookies?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmClearMediaUrlList"
-   type="alertmodal">
-Are you sure you want to clear your list of saved URLs?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="Cancel"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ConfirmEmptyLostAndFound"
-   type="alertmodal">
-Are you sure you want to permanently remove the contents of your Lost And Found folder?
-    <usetemplate
-     ignoretext="When emptying your inventory Lost And Found folder"
-     name="okcancelignore"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="CopySLURL"
-   type="alertmodal">
-The following SLURL has been copied to your clipboard:
- [SLURL]
-
-Put it in a web page to give others easy access to this location or try it out yourself by pasting it into the address bar of your web browser.
-    <form name="form">
-      <ignore name="ignore"
-       text="When copying a SLURL to your clipboard"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GraphicsPreferencesHelp"
-   type="alertmodal">
-This panel controls window size and resolution and the quality of the client&apos;s graphics.  The Preferences &gt; Graphics interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. You may also customize your graphics settings by checking the Custom checkbox and manipulating the following settings:
-
-Shaders: Enable or disable various types of pixel shaders.
-
-Reflection Detail: Sets the types of objects that water can reflect.
-
-Avatar Rendering: Sets options that affect how the client renders avatars.
-
-Draw Distance: Affects how far out from your viewpoint objects will be rendered in the scene.
-
-Max Particle Count: Sets the maximum number of particles you are able to see on your screen at once.
-
-Post Process Quality: Sets the resolution with which Glow is rendered.
-
-Mesh Detail: Sets the amount of detail or number of triangles used in rendering certain objects. A higher value takes longer to render, but makes these objects appear with more detail.
-
-Lighting Detail: Selects what types of lights you would like to render.
-
-Terrain Detail: Sets the amount of detail you would like to see for the terrain texture.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WLSavePresetAlert"
-   type="alertmodal">
-Do you wish to overwrite the saved preset?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WLDeletePresetAlert"
-   type="alertmodal">
-Do you wish to delete [SKY]?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WLNoEditDefault"
-   type="alertmodal">
-You cannot edit or delete a default preset.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WLMissingSky"
-   type="alertmodal">
-This day cycle file references a missing sky file: [SKY].
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="PPSaveEffectAlert"
-   type="alertmodal">
-PostProcess Effect exists. Do you still wish overwrite it?
-    <usetemplate
-     name="okcancelbuttons"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpEditSky"
-   type="alertmodal">
-Edit the WindLight sliders to create and save a set of skies.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpEditDayCycle"
-   type="alertmodal">
-Set which skies to turn to throughout the day.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="EnvSettingsHelpButton"
-   type="alertmodal">
-These settings adjust the way the environment looks locally on your computer.  Your graphics card needs to support atmospheric shaders in order to have access to all of the settings.
-
-Adjust the &quot;Time of Day&quot; slider to change the day&apos;s phase locally on the viewer.
-
-Adjust the &quot;Cloud Cover&quot; slider to control how much the clouds cover the sky.
-
-Pick a color in the &quot;Water Color&quot; color picker to change the color of the water.
-
-Adjust the &quot;Water Fog&quot; slider to control how dense the fog is underwater.
-
-Click &quot;Use Estate Time&quot; to reset the time of day to the region&apos;s current time of day and remain linked to it.
-
-Click &quot;Advanced Sky&quot; to bring up an editor with more advanced settings for the sky.
-
-Click &quot;Advanced Water&quot; to bring up an editor with more advanced settings for the water.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpDayCycle"
-   type="alertmodal">
-The Day Cycle Editor gives you control over the sky during [SECOND_LIFE]&apos;s day/night cycle. This is the cycle that is used by the Basic Environment Editor&apos;s Time of Day slider.
-
-The Day Cycle Editor works by setting keyframes. These are nodes (represented by the gray blips on the time graph) that have Sky Presets associated with them. As the Time of Day progresses, the WindLight sky &quot;animates&quot; as it interpolates between these keyframes.
-
-The yellow arrow above the timeline represents your current view, based on Time of Day. Click and drag it to see how your day will animate. You may add or delete keyframes by pressing the Add Key and Delete Key buttons to the right of the timeline.
-
-You can set the time position of a keyframe by either dragging it along the timeline, or by setting its value manually in the Key Frame Settings frame. Within the Key Frame Settings frame, you&apos;ll be able to associate the keyframe with its respective WindLight preset.
-
-Length of Cycle dictates the overall duration of a &quot;day&quot;. Setting this to a low value (for instance, 2 min.) will mean your entire 24-hour timeline will animate in only two real minutes! Once you are satisfied with your timeline and keyframe cycle, use the Play and Stop buttons to preview the results. Remember- you can also move the yellow time-indicator arrow above the timeline to see the cycle animate interactively. Using the Use Estate Time button will synchronize your day length and time of day with the Estate&apos;s day cycle.
-
-Once you are pleased with your Day Cycle, you can save and load it with the Save Test Day and Load Test Day buttons. Note that, for now, we only allow one Day Cycle.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpBlueHorizon"
-   type="alertmodal">
-Use the Red/Green/Blue (RGB) sliders to adjust the color of the sky. You can use the Intensity (I) slider to move all three RGB sliders in unison.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpHazeHorizon"
-   type="alertmodal">
-Haze Horizon is one of the most useful parameters for adjusting overall light exposure in the scene.  It is effective for simulating many exposure settings, such as white-outs from the sun and darker, closed-iris settings.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpBlueDensity"
-   type="alertmodal">
-Blue Density affects the overall color saturation of the sky and fog. If you move the Intensity (I) slider to the right, colors will become brighter and more vibrant. If you move it all the way to the left, the colors will become duller, eventually fading to black and white. If you want to fine-tune the sky&apos;s color balance, you can control individual elements of saturation by using the Red/Green/Blue (RGB) sliders.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpHazeDensity"
-   type="alertmodal">
-Haze Density controls the level of dull, gray haze in the atmosphere.  It is effective for simulating scenes with high levels of smoke and man-made pollutants.  It is also effective for simulating fog and mist.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpDensityMult"
-   type="alertmodal">
-The Density Multiplier can be used to affect the overall atmospheric density. At lower settings, it creates a feeling of &quot;thin air&quot;, and at higher settings, it creates a very heavy, smoggy effect.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpDistanceMult"
-   type="alertmodal">
-Adjusts WindLight&apos;s perceived distance.  A value of zero effectively turns off WindLight&apos;s influence on terrain and objects.  Values greater than 1 simulate greater distances for thicker atmospheric effects.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpMaxAltitude"
-   type="alertmodal">
-Max Altitude adjusts the altitude calculations WindLight performs when computing its atmospheric lighting.  At later times of day, it is useful for adjusting how &quot;deep&quot; the sunset appears.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpSunlightColor"
-   type="alertmodal">
-Adjusts the color and intensity of the direct light in the scene.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpSunAmbient"
-   type="alertmodal">
-Adjusts the color and intensity of ambient atmospheric light in the scene.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpSunGlow"
-   type="alertmodal">
-The Size slider controls the size of the sun.
-The Focus slider controls how blurred the sun is over the sky.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpSceneGamma"
-   type="alertmodal">
-Adjust the screen&apos;s distribution of light and dark.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpStarBrightness"
-   type="alertmodal">
-Adjusts the brightness of the stars in the sky.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpTimeOfDay"
-   type="alertmodal">
-Controls the location of the sun in the sky.
-Similar to elevation.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpEastAngle"
-   type="alertmodal">
-Controls the location of the sun in the sky.
-Similar to azimuth.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpCloudColor"
-   type="alertmodal">
-Edits the color of the clouds.  It is generally recommended to keep it whitish, but hey, have fun if you want.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpCloudDetail"
-   type="alertmodal">
-Controls the detail image layered on top of the main cloud image.  X and Y control its position.  D (Density) controls how puffy or fractured the clouds appear.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpCloudDensity"
-   type="alertmodal">
-Allows you to control the position of the clouds with the X and Y sliders and how dense they are with the the D slider.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpCloudCoverage"
-   type="alertmodal">
-Controls how much the clouds cover the sky.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpCloudScale"
-   type="alertmodal">
-Controls the scaling of the cloud image on the sky dome.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpCloudScrollX"
-   type="alertmodal">
-Controls the speed of the clouds as they move in the X direction.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpCloudScrollY"
-   type="alertmodal">
-Controls the speed of the clouds as they move in the Y direction.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpClassicClouds"
-   type="alertmodal">
-Check this box to enable rendering of older classic clouds in addition to WindLight&apos;s clouds.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpWaterFogColor"
-   type="alertmodal">
-Chooses the color of the underwater fog.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpWaterFogDensity"
-   type="alertmodal">
-Controls how dense the water fog is and how far you can see underwater.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpUnderWaterFogMod"
-   type="alertmodal">
-Modifies the effect of the Fog Density Exponent to control how far you can see when your avatar is underwater.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpWaterGlow"
-   type="alertmodal">
-Controls how much the surface of the water glows.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpWaterNormalScale"
-   type="alertmodal">
-Controls the scaling of the three wavelets that make up the water.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpWaterFresnelScale"
-   type="alertmodal">
-Controls how much light is reflected at different angles.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpWaterFresnelOffset"
-   type="alertmodal">
-Controls how much light intensity is reflected.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpWaterScaleAbove"
-   type="alertmodal">
-Controls how much light is refracted from looking above the surface of the water.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpWaterScaleBelow"
-   type="alertmodal">
-Controls how much light is refracted from looking from below the surface of the water.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpWaterBlurMultiplier"
-   type="alertmodal">
-Controls how waves and reflections are mixed.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpWaterNormalMap"
-   type="alertmodal">
-Controls what normal map is layered across the water to determine reflections/refractions.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpWaterWave1"
-   type="alertmodal">
-Controls where and how fast the large scaled version of the normal map moves in the X and Y direction.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpWaterWave2"
-   type="alertmodal">
-Controls where and how fast the the small scaled version of the normal map moves in the X and Y direction.
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="NewSkyPreset"
-   type="alert">
-    Give me a name for the new sky.
-    <form name="form">
-      <input name="message" type="text">
-        New Preset
-      </input>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ExistsSkyPresetAlert"
-   type="alertmodal">
-    Preset already exists!
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="NewDaycyclePreset"
-   type="alert">
-    Set a name for the new day cycle.
-    <form name="form">
-      <input name="message" type="text">
-        New Day
-      </input>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ExistsDaycylePresetAlert"
-   type="alertmodal">
-    Preset already exists!
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="NewWaterPreset"
-   type="alert">
-Give me a name for the new water preset.
-    <form name="form">
-      <input name="message" type="text">
-New Preset
-      </input>
-      <button
-       default="true"
-       index="0"
-       name="OK"
-       text="OK"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ExistsWaterPresetAlert"
-   type="alertmodal">
-Preset already exists!
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="WaterNoEditDefault"
-   type="alertmodal">
-You cannot edit or delete a default preset.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ChatterBoxSessionStartError"
-   type="alertmodal">
-Unable to start a new chat session with [RECIPIENT].
-[REASON]
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ChatterBoxSessionEventError"
-   type="alertmodal">
-[EVENT]
-[REASON]
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ForceCloseChatterBoxSession"
-   type="alertmodal">
-Your chat session with [NAME] must close.
-[REASON]
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="Cannot_Purchase_an_Attachment"
-   type="alertmodal">
-Items may not be purchased while they are part of an attachment.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="About Requests for the Debit Permission"
-   name="DebitPermissionDetails"
-   type="alertmodal">
-Granting this request gives a script ongoing permission to take in-world money ([CURRENCY]) from your account. To revoke this permission, the object owner must delete the object or reset the scripts in the object.
-    <usetemplate
-     name="okbutton"
-     yestext="OK"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AutoWearNewClothing"
-   type="alertmodal">
-Would you like to automatically wear the clothing item you create?
-    <usetemplate
-     ignoretext="Automatically wear new clothing"
-     name="okcancelignore"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="NotAgeVerified"
-   type="alertmodal">
-You need to be age-verified in order to access this parcel.
-Would you like to visit the [SECOND_LIFE] website to verify your age?
-
-[_URL]
-    <url option="0" name="url">
-
-			https://secondlife.com/account/verification.php
-    </url>
-    <usetemplate
-     ignoretext="Warn about lack of age verification"
-     name="okcancelignore"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="Cannot enter parcel: no payment info on file"
-   type="alertmodal">
-This parcel requires that you have payment information on file before you can access it.
-Would you like to visit the [SECOND_LIFE] website to set this up?
-
-[_URL]
-    <url option="0" name="url">
-
-			https://secondlife.com/account/
-    </url>
-    <usetemplate
-     ignoretext="Warn about lack of payment info"
-     name="okcancelignore"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="MissingString"
-   type="alertmodal">
-The string [STRING_NAME] is missing from strings.xml
-  </notification>
-  
-  <notification
-   icon="alertmodal.tga"
-   name="GridsNoNick"
-   type="alertmodal">
-Cannot save new grid information.
-You need to specify a unique grid nickname.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GridsNoLoginUri"
-   type="alertmodal">
-Cannot save new grid '[NAME]'.
-You need to specify a login URI.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GridExists"
-   type="alertmodal">
-Cannot save new grid '[NAME]'.
-A grid with the same nickname already exists.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GridInfoNoLoginUri"
-   type="alertmodal">
-A login URI is required to retrieve the grid info.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="GridInfoError"
-   type="alertmodal">
-Cannot retrieve grid info from server.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="HelpRenderCompat"
-   type="alertmodal">
-Builds with extended hollow or extended hole size do not render properly on other viewers. Please keep this option checked, if you want your builds looking properly in other viewers.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ExportFailed"
-   type="alertmodal">
-Bad permissions for the exported object. Export aborted.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="ExportPartial"
-   type="alertmodal">
-Object exported. Some textures could not be saved due to: [REASON]
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="ExportSuccessful"
-   type="notifytip">
-Export successful.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="SystemMessageTip"
-   type="notifytip">
-[MESSAGE]
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="Cancelled"
-   type="notifytip">
-Cancelled
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="CancelledSit"
-   type="notifytip">
-Cancelled Sit
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="CancelledAttach"
-   type="notifytip">
-Cancelled Attach
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="ReplacedMissingWearable"
-   type="notifytip">
-Replaced missing clothing/body part with default.
-  </notification>
-
-  <notification
-   icon="groupnotify"
-   name="GroupNotice"
-   type="groupnotify">
-Topic: [SUBJECT], Message: [MESSAGE]
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="FriendOnline"
-   type="notifytip">
-[NAME] is Online
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="FriendOffline"
-   type="notifytip">
-[NAME] is Offline
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="AddSelfFriend"
-   type="notifytip">
-You cannot add yourself as a friend.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="UploadingAuctionSnapshot"
-   type="notifytip">
-Uploading in-world and web site snapshots...
-(Takes about 5 minutes.)
-  </notification>
-
-<notification
-   icon="notify.tga"
-   name="UploadPayment"
-   type="notify">
-You paid [CURRENCY][AMOUNT] to upload.
-</notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="UploadWebSnapshotDone"
-   type="notifytip">
-Web site snapshot upload done.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="UploadSnapshotDone"
-   type="notifytip">
-In-world snapshot upload done
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="TerrainDownloaded"
-   type="notifytip">
-Terrain.raw downloaded
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="GestureMissing"
-   type="notifytip">
-Gesture [NAME] is missing from database.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="UnableToLoadGesture"
-   type="notifytip">
-Unable to load gesture [NAME].
-Please try again.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="LandmarkMissing"
-   type="notifytip">
-Landmark is missing from database.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="UnableToLoadLandmark"
-   type="notifytip">
-Unable to load landmark.  Please try again.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="CapsKeyOn"
-   type="notifytip">
-Your Caps Lock key is on.
-As this will affect the password you type in, you will probably want to turn it off.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="NotecardMissing"
-   type="notifytip">
-Notecard is missing from database.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="NotecardNoPermissions"
-   type="notifytip">
-Insufficient permissions to view notecard.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="RezItemNoPermissions"
-   type="notifytip">
-Insufficient permissions to rez object.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="UnableToLoadNotecard"
-   type="notifytip">
-Unable to load notecard.
-Please try again.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="ScriptMissing"
-   type="notifytip">
-Script is missing from database.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="ScriptNoPermissions"
-   type="notifytip">
-Insufficient permissions to view script.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="UnableToLoadScript"
-   type="notifytip">
-Unable to load script.  Please try again.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="IncompleteInventory"
-   type="notifytip">
-The complete contents you are offering are not yet locally available. Please try offering those items again in a minute.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="IncompleteInventoryItem"
-   type="notifytip">
-The item you are accessing is not yet locally available. Please try again in a minute.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="CannotModifyProtectedCategories"
-   type="notifytip">
-You cannot modify protected categories.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="CannotRemoveProtectedCategories"
-   type="notifytip">
-You cannot remove protected categories.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="OfferedCard"
-   type="notifytip">
-You have offered a calling card to [NAME]
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="UnableToBuyWhileDownloading"
-   type="notifytip">
-Unable to buy while downloading object data.
-Please try again.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="UnableToLinkWhileDownloading"
-   type="notifytip">
-Unable to link while downloading object data.
-Please try again.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="CannotBuyObjectsFromDifferentOwners"
-   type="notifytip">
-Cannot buy objects from different owners at the same time.
-Please select a single object.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="ObjectNotForSale"
-   type="notifytip">
-Object does not appear to be for sale.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="EnteringGodMode"
-   type="notifytip">
-Entering god mode, level [LEVEL]
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="LeavingGodMode"
-   type="notifytip">
-Leaving god mode, level [LEVEL]
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="CopyFailed"
-   type="notifytip">
-Copy failed because you lack copy permission
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="InventoryAccepted"
-   type="notifytip">
-[NAME] accepted your inventory offer.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="InventoryDeclined"
-   type="notifytip">
-[NAME] declined your inventory offer.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="ObjectMessage"
-   type="notifytip">
-[NAME]: [MESSAGE]
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="CallingCardAccepted"
-   type="notifytip">
-Your calling card was accepted.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="CallingCardDeclined"
-   type="notifytip">
-Your calling card was declined.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="TeleportToLandmark"
-   type="notifytip">
-Now that you have reached the mainland, you can teleport to locations like &apos;[NAME]&apos; by clicking on the Inventory button on the bottom right of your screen, and then select the Landmarks folder.
-Double click on the landmark and click on Teleport to travel there.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="TeleportToPerson"
-   type="notifytip">
-Now that you have reached the mainland, you can contact residents like &apos;[NAME]&apos; by clicking on the Inventory button on the bottom right of your screen, and then select the Calling Cards folder.
-Double click on the card, click on Instant Message, and type a message.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="CantSelectLandFromMultipleRegions"
-   type="notifytip">
-Can&apos;t select land across server boundaries.
-Try selecting a smaller piece of land.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="SearchWordBanned"
-   type="notifytip">
-Some terms in your search query were excluded due to content restrictions as clarified in the Community Standards.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="NoContentToSearch"
-   type="notifytip">
-Please select at least one type of content to search (PG, Mature, or Adult).
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="GroupVote"
-   type="notify">
-[NAME] has proposed to vote on:
-[MESSAGE]
-    <form name="form">
-      <button
-       index="0"
-       name="VoteNow"
-       text="Vote Now"/>
-      <button
-       index="1"
-       name="Later"
-       text="Later"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="SystemMessage"
-   type="notify">
-[MESSAGE]
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="EventNotification"
-   type="notify">
-Event Notification:
-
-[NAME]
-[DATE]
-    <form name="form">
-      <button
-       index="0"
-       name="Teleport"
-       text="Teleport"/>
-      <button
-       index="1"
-       name="Description"
-       text="Description"/>
-      <button
-       index="2"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="TransferObjectsHighlighted"
-   type="notify">
-All objects on this parcel that will transfer to the purchaser of this parcel are now highlighted.
-
-* Trees and grasses that will transfer are not highlighted.
-    <form name="form">
-      <button
-       index="0"
-       name="Done"
-       text="Done"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="DeactivatedGesturesTrigger"
-   type="notify">
-Deactivated gestures with same trigger:
-[NAMES]
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="NoQuickTime"
-   type="notify">
-Apple&apos;s QuickTime software does not appear to be installed on your system.
-If you want to view streaming media on parcels that support it you should go to the QuickTime site (http://www.apple.com/quicktime) and install the QuickTime Player.
-  </notification>
-  <notification
-   icon="notify.tga"
-   name="NoPlugin"
-   type="notify">
-    No Media Plugin was found to handle the "[MIME_TYPE]" mime type.  Media of this type will be unavailable.
-  </notification>
-  <notification
-   icon="alertmodal.tga"
-   name="MediaPluginFailed"
-   type="alertmodal">
-    The following Media Plugin has failed:
-    [PLUGIN]
-
-Please re-install the plugin or contact the vendor if you continue to experience problems.
-    <form name="form">
-      <ignore name="ignore"
-       text="When a Media Plugin fails"/>
-    </form>
-  </notification>
-  <notification
-   icon="notify.tga"
-   name="OwnedObjectsReturned"
-   type="notify">
-The objects you own on the selected parcel of land have been returned back to your inventory.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="OtherObjectsReturned"
-   type="notify">
-The objects on the selected parcel of land that is owned by [NAME] have been returned to his or her inventory.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="OtherObjectsReturned2"
-   type="notify">
-The objects on the selected parcel of land owned by the resident &apos;[NAME]&apos; have been returned to their owner.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="GroupObjectsReturned"
-   type="notify">
-The objects on the selected parcel of land shared with the group [GROUPNAME] have been returned back to their owner&apos;s inventory.
-Transferable deeded objects have been returned to their previous owners.
-Non-transferable objects that are deeded to the group have been deleted.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="UnOwnedObjectsReturned"
-   type="notify">
-The objects on the selected parcel that are NOT owned by you have been returned to their owners.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="NotSafe"
-   type="notify">
-This land has damage enabled (&apos;not safe&apos;).
-You can be hurt here. If you die, you will be teleported to your home location.
-    <unique/>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="NoFly"
-   type="notify">
-This land has flying disabled (&apos;no fly&apos;).
-You cannot fly here.
-    <unique/>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="PushRestricted"
-   type="notify">
-This land is &apos;No Pushing&apos;.
-You cannot push others here unless you own the land.
-    <unique/>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="NoVoice"
-   type="notify">
-This land has voice disabled.
-    <unique/>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="NoBuild"
-   type="notify">
-This land has building disabled (&apos;no build&apos;).
-You cannot create objects here.
-    <unique/>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="ScriptsStopped"
-   type="notify">
-An administrator has temporarily stopped scripts in this region.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="ScriptsNotRunning"
-   type="notify">
-This region is not running any scripts.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="NoOutsideScripts"
-   type="notify">
-This land has outside scripts disabled (&apos;no outside scripts&apos;).
-No scripts will run except those belonging to the land owner.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="ClaimPublicLand"
-   type="notify">
-Can only claim public land in region you&apos;re in.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="RegionTPAccessBlocked"
-   type="notify">
-You aren&apos;t allowed in that Region due to your maturity Rating. You may need to validate your age and/or install the latest Viewer.
-
-Please go to the Knowledge Base for details on accessing areas with this maturity Rating.  
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="URBannedFromRegion"
-	type="notify">
-You are banned from the region.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="NoTeenGridAccess"
-	type="notify">
-Your account cannot connect to this teen grid region.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="NoHelpIslandTP"
-	type="notify">
-You cannot teleport back to Help Island.
-Go to &apos;Help Island Public&apos; to repeat the tutorial.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="ImproperPaymentStatus"
-	type="notify">
-You do not have proper payment status to enter this region.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="MustGetAgeRegion"
-	type="notify">
-You must be age-verified to enter this region.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="MustGetAgeParcel"
-	type="notify">
-You must be age-verified to enter this parcel.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="NoDestRegion"
-	type="notify">
-No destination region found.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="NotAllowedInDest"
-	type="notify">
-You are not allowed into the destination.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="RegionParcelBan"
-	type="notify">
-Cannot region cross into banned parcel. Try another way.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="TelehubRedirect"
-	type="notify">
-You have been redirected to a telehub.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="CouldntTPCloser"
-	type="notify">
-Could not teleport closer to destination.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="TPCancelled"
-	type="notify">
-	Teleport cancelled.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="FullRegionTryAgain"
-	type="notify">
-The region you are attempting to enter is currently full.
-Please try again in a few moments.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="GeneralFailure"
-	type="notify">
-General failure.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="RoutedWrongRegion"
-	type="notify">
-Routed to wrong region. Please try again.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="NoValidAgentID"
-	type="notify">
-No valid agent id.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="NoValidSession"
-	type="notify">
-No valid session id.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="NoValidCircuit"
-	type="notify">
-No valid circuit code.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="NoValidTimestamp"
-	type="notify">
-No valid timestamp.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="NoPendingConnection"
-	type="notify">
-Unable to create pending connection.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="InternalUsherError"
-	type="notify">
-Internal error attempting to connect agent usher.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="NoGoodTPDestination"
-	type="notify">
-Unable to find a good teleport destination in this region.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="InternalErrorRegionResolver"
-	type="notify">
-Internal error attempting to activate region resolver.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="NoValidLanding"
-	type="notify">
-A valid landing point could not be found.
-  </notification>
-
-  <notification
-	icon="notify.tga"
-	name="NoValidParcel"
-	type="notify">
-No valid parcel could be found.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="ObjectGiveItem"
-   type="notify">
-An object named [OBJECTFROMNAME] owned by [NAME] has given you a [OBJECTTYPE] named [OBJECTNAME].
-    <form name="form">
-      <button
-       index="0"
-       name="Keep"
-       text="Keep"/>
-      <button
-       index="1"
-       name="Discard"
-       text="Discard"/>
-      <button
-       index="2"
-       name="Mute"
-       text="Mute"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="ObjectGiveItemUnknownUser"
-   type="notify">
-An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJECTTYPE] named [OBJECTNAME].
-    <form name="form">
-      <button
-       index="0"
-       name="Keep"
-       text="Keep"/>
-      <button
-       index="1"
-       name="Discard"
-       text="Discard"/>
-      <button
-       index="2"
-       name="Mute"
-       text="Mute"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="UserGiveItem"
-   type="notify">
-[NAME] has given you a [OBJECTTYPE] named &apos;[OBJECTNAME]&apos;.
-    <form name="form">
-      <button
-       index="0"
-       name="Keep"
-       text="Keep"/>
-      <button
-       index="1"
-       name="Discard"
-       text="Discard"/>
-      <button
-       index="2"
-       name="Mute"
-       text="Mute"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="GodMessage"
-   type="notify">
-[NAME]
-[MESSAGE]
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="JoinGroup"
-   type="notify">
-[MESSAGE]
-    <form name="form">
-      <button
-       index="0"
-       name="Join"
-       text="Join"/>
-      <button
-       index="1"
-       name="Decline"
-       text="Decline"/>
-      <button
-       index="2"
-       name="Info"
-       text="Info"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="TeleportOffered"
-   type="notify">
-[NAME] has offered to teleport you to his or her location:
-
-[MESSAGE]
-    <form name="form">
-      <button
-       index="0"
-       name="Teleport"
-       text="Teleport"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="GotoURL"
-   type="notify">
-[MESSAGE]
-[URL]
-    <form name="form">
-      <button
-       index="0"
-       name="Later"
-       text="Later"/>
-      <button
-       index="1"
-       name="GoNow..."
-       text="Go Now..."/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="OfferFriendship"
-   type="notify">
-[NAME] is offering friendship.
-
-[MESSAGE]
-
-(By default, you will be able to see each other&apos;s online status.)
-    <form name="form">
-      <button
-       index="0"
-       name="Accept"
-       text="Accept"/>
-      <button
-       index="1"
-       name="Decline"
-       text="Decline"/>
-      <button
-       index="2"
-       name="Ignore"
-       text="Ignore"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="OfferFriendshipNoMessage"
-   type="notify">
-[NAME] is offering friendship.
-
-(By default, you will be able to see each other&apos;s online status.)
-    <form name="form">
-      <button
-       index="0"
-       name="Accept"
-       text="Accept"/>
-      <button
-       index="1"
-       name="Decline"
-       text="Decline"/>
-      <button
-       index="2"
-       name="Ignore"
-       text="Ignore"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FriendshipAccepted"
-   type="notify">
-[NAME] accepted your friendship offer.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FriendshipDeclined"
-   type="notify">
-[NAME] declined your friendship offer.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="FriendshipDissolved"
-   type="alertmodal">
-[NAME] dissolved friendship.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="OfferCallingCard"
-   type="notify">
-[NAME] is offering their calling card.
-This will add a bookmark in your inventory so you can quickly IM this resident.
-    <form name="form">
-      <button
-       index="0"
-       name="Accept"
-       text="Accept"/>
-      <button
-       index="1"
-       name="Decline"
-       text="Decline"/>
-      <button
-       index="2"
-       name="Ignore"
-       text="Ignore"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="RegionRestartMinutes"
-   priority="high"
-   sound="UISndAlert"
-   type="notify">
-Region is restarting in [MINUTES] minutes.
-If you remain in this region you will be logged out.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="RegionRestartSeconds"
-   priority="high"
-   sound="UISndAlert"
-   type="notify">
-Region is restarting in [SECONDS] seconds.
-If you remain in this region you will be logged out.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="LoadWebPage"
-   type="notify">
-Load web page [URL]?
-
-[MESSAGE]
-
-From object: [OBJECTNAME], owner: [NAME]?
-    <form name="form">
-      <button
-       index="0"
-       name="Gotopage"
-       text="Go to page"/>
-      <button
-       index="1"
-       name="Cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FailedToFindWearableUnnamed"
-   type="notify">
-Failed to find [TYPE] in database.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FailedToFindWearable"
-   type="notify">
-Failed to find [TYPE] named [DESC] in database.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="InvalidWearable"
-   type="notify">
-    The item you are trying to wear uses a feature that your viewer can&apos;t read. Please consider using the latest [APP_NAME].
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="ScriptQuestion"
-   type="notify">
-&apos;[OBJECTNAME]&apos;, an object owned by &apos;[NAME]&apos;, would like to:
-
-[QUESTIONS]
-Is this OK?
-    <form name="form">
-      <button
-       index="0"
-       name="Yes"
-       text="Yes"/>
-      <button
-       index="1"
-       name="No"
-       text="No"/>
-      <button
-       index="2"
-       name="Mute"
-       text="Mute"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="ScriptQuestionCaution"
-   priority="high"
-   type="notify">
-&apos;[OBJECTNAME]&apos;, an object owned by &apos;[NAME]&apos;, would like to:
-
-[QUESTIONS]
-If you do not trust this object and its creator, you should deny the request. For additional information, click the Details button.
-
-Grant this request?
-    <form name="form">
-      <button
-       index="0"
-       name="Grant"
-       text="Grant"/>
-      <button
-       default="true"
-       index="1"
-       name="Deny"
-       text="Deny"/>
-      <button
-       index="2"
-       name="Details"
-       text="Details..."/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="ScriptDialog"
-   type="notify">
-[NAME]&apos;s &apos;[TITLE]&apos; (ch[CHANNEL])
-[MESSAGE]
-    <form name="form">
-      <button
-       index="-1"
-       name="Ignore"
-       text="Ignore"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="ScriptDialogGroup"
-   type="notify">
-[GROUPNAME]&apos;s &apos;[TITLE]&apos;
-[MESSAGE]
-    <form name="form">
-      <button
-       index="-1"
-       name="Ignore"
-       text="Ignore"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="ScriptTextBoxDialog"
-   type="notify">
-    [NAME]&apos;s &apos;[TITLE]&apos;
-    [MESSAGE]
-    <form name="form">
-      <input name="message">
-      </input>
-      <button
-       index="-1"
-       name="Ignore"
-       text="Ignore"/>
-      <button
-       index="0"
-       name="Send"
-       text="Send"/>
-    </form>
-  </notification>
-  
-
-  <notification
-   icon="notify.tga"
-   name="FirstBalanceIncrease"
-   type="notify">
-You just received [CURRENCY][AMOUNT].
-Objects and other users may give you [CURRENCY].
-Your balance is shown in the upper-right corner of the screen.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FirstBalanceDecrease"
-   type="notify">
-You just paid [CURRENCY][AMOUNT].
-Your balance is shown in the upper-right corner of the screen.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FirstSit"
-   type="notify">
-You are sitting.
-Use the arrow keys (or AWSD) to change the view.
-Click the &apos;Stand Up&apos; button to get up.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FirstMap"
-   type="notify">
-Click and drag to scroll the map.
-Double-click to teleport.
-Use the controls on the right to find things and display different backgrounds.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FirstBuild"
-   type="notify">
-You can build new objects in some areas of [SECOND_LIFE].
-Use the tools in the upper left to build, and try holding down Ctrl or Alt to rapidly switch tools.
-Press Esc to stop building.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FirstLeftClickNoHit"
-   type="notify">
-Left-clicking interacts with special objects.
-If the mouse pointer changes to a hand, you can interact with the object.
-Right-click always shows a menu of things you can do.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FirstTeleport"
-   type="notify">
-This region doesn&apos;t allow point-to-point teleports, so you&apos;ve been transported to the nearest telehub.
-Your destination is marked with a tall beacon.
-Follow the red arrow to the beacon, or click the arrow to dismiss the beacon.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FirstOverrideKeys"
-   type="notify">
-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.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FirstAppearance"
-   type="notify">
-You are editing your appearance.
-To rotate and zoom view, use the arrow keys.
-When you are finished, press &apos;Save All&apos; to save your look and exit.
-You can edit your appearance as often as you like.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FirstInventory"
-   type="notify">
-This is your inventory, which contains objects, notecards, clothing, and other things you own.
-* To wear an object or outfit folder, drag it onto yourself.
-* To bring an object into the world, drag it onto the ground.
-* To read a notecard, double-click it.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FirstSandbox"
-   type="notify">
-This is a sandbox region.
-Objects you build here may be deleted after you leave the area, Sandboxes clean on a regular basis, please refer to the information at the top of the screen next to the region name.
-
-Sandbox regions are uncommon, and are marked with signs.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FirstFlexible"
-   type="notify">
-This object is flexible.
-Flexible objects may not be physical and must be phantom until the flexible checkbox is unchecked.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FirstDebugMenus"
-   type="notify">
-You have enabled the Advanced menu.
-This menu contains features useful for developers debugging [APP_NAME].
-To toggle this menu on Windows press Ctrl-Alt-D. On Mac press Cmd-Opt-Shift-D.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FirstSculptedPrim"
-   type="notify">
-You are editing a sculpted prim.
-Sculpted prims require a special texture to specify their shape.
-You can find example sculpted textures in the inventory library.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FirstMedia"
-   type="notify">
-You have begun playing media.  Media can set to play automatically in the preferences window under Audio / Video. Note that this can be a security risk for media sites you do not trust.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FirstRLVDetach"
-   type="notify">
-One of your attachments was made nondetachable using Restrained Life.
-Please note that this also disables the &apos;Wear&apos; option on all prim attachments in your inventory unless they are properly named.
-
-For more information search for &apos;Restrained Life&apos; on the SL wiki.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FirstRLVFartouch"
-   type="notify">
-You have been fartouch restricted: you will be unable to touch objects farther than 1.5m from your avatar until the restriction is lifted.
-
-Tip: if an object is out of range the mouse cursor will not change as you hover over it and you'll hear an error sound if you try to right-click it.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="FirstRLVGiveToRLV"
-   type="alertmodal">
-Folders starting with &apos;#RLV/~&apos; can automatically be placed under your #RLV shared folder after you accept the inventory offer.
-
-Please note that - if enabled - the accepted inventory items will instantly be available to scripts and will have full use of the RLV API which may cause unexpected or undesirable situations.
-
-Do you want to enable this feature?
-    <usetemplate
-     name="okcancelbuttonscanceldefault"
-     notext="No"
-     yestext="Yes"/>
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="MaxListSelectMessage"
-   type="notifytip">
-You may only select up to [MAX_SELECT] items from this list.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="VoiceInviteP2P"
-   type="notify">
-[NAME] is inviting you to a Voice Chat call.
-Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this caller.
-    <unique>
-      <context key="NAME"/>
-    </unique>
-    <form name="form">
-      <button
-       index="0"
-       name="Accept"
-       text="Accept"/>
-      <button
-       index="1"
-       name="Decline"
-       text="Decline"/>
-      <button
-       index="2"
-       name="Mute"
-       text="Mute"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="AutoUnmuteByIM"
-   type="notify">
-[NAME] was sent an instant message and has been automatically unmuted.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="AutoUnmuteByMoney"
-   type="notify">
-[NAME] was given money and has been automatically unmuted.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="AutoUnmuteByInventory"
-   type="notify">
-[NAME] was offered inventory and has been automatically unmuted.
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="VoiceInviteGroup"
-   type="notify">
-[NAME] has joined a Voice Chat call with the group [GROUP].
-Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this caller.
-    <unique>
-      <context key="NAME"/>
-      <context key="GROUP"/>
-    </unique>
-    <form name="form">
-      <button
-       index="0"
-       name="Accept"
-       text="Accept"/>
-      <button
-       index="1"
-       name="Decline"
-       text="Decline"/>
-      <button
-       index="2"
-       name="Mute"
-       text="Mute"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="VoiceInviteAdHoc"
-   type="notify">
-[NAME] has joined a Voice Chat call with a conference chat...
-Click Accept to join the call or Decline to decline the invitation. Click Mute to mute this user.
-    <unique>
-      <context key="NAME"/>
-    </unique>
-    <form name="form">
-      <button
-       index="0"
-       name="Accept"
-       text="Accept"/>
-      <button
-       index="1"
-       name="Decline"
-       text="Decline"/>
-      <button
-       index="2"
-       name="Mute"
-       text="Mute"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="InviteAdHoc"
-   type="notify">
-[NAME] is inviting you to a conference chat.
-Click Accept to join the chat or Decline to decline the invitation. Click Mute to mute this user.
-    <unique>
-      <context key="NAME"/>
-    </unique>
-    <form name="form">
-      <button
-       index="0"
-       name="Accept"
-       text="Accept"/>
-      <button
-       index="1"
-       name="Decline"
-       text="Decline"/>
-      <button
-       index="2"
-       name="Mute"
-       text="Mute"/>
-    </form>
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="VoiceChannelFull"
-   type="notifytip">
-The voice call you are trying to join, [VOICE_CHANNEL_NAME], has reached maximum capacity. Please try again later.
-    <unique>
-      <context key="VOICE_CHANNEL_NAME"/>
-    </unique>
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="ProximalVoiceChannelFull"
-   type="notifytip">
-We&apos;re sorry.  This area has reached maximum capacity for voice conversations.  Please try to use voice in another area.
-    <unique/>
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="VoiceChannelDisconnected"
-   type="notifytip">
-You have been disconnected from [VOICE_CHANNEL_NAME].  You will now be reconnected to spatial voice chat.
-    <unique>
-      <context key="VOICE_CHANNEL_NAME"/>
-    </unique>
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="VoiceChannelDisconnectedP2P"
-   type="notifytip">
-[VOICE_CHANNEL_NAME] has ended the call.  You will now be reconnected to spatial voice chat.
-    <unique>
-      <context key="VOICE_CHANNEL_NAME"/>
-    </unique>
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="P2PCallDeclined"
-   type="notifytip">
-[VOICE_CHANNEL_NAME] has declined your call.  You will now be reconnected to spatial voice chat.
-    <unique>
-      <context key="VOICE_CHANNEL_NAME"/>
-    </unique>
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="P2PCallNoAnswer"
-   type="notifytip">
-[VOICE_CHANNEL_NAME] is not available to take your call.  You will now be reconnected to spatial voice chat.
-    <unique>
-      <context key="VOICE_CHANNEL_NAME"/>
-    </unique>
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="VoiceChannelJoinFailed"
-   type="notifytip">
-Failed to connect to [VOICE_CHANNEL_NAME], please try again later.  You will now be reconnected to spatial voice chat.
-    <unique>
-      <context key="VOICE_CHANNEL_NAME"/>
-    </unique>
-  </notification>
-
-  <notification
-   duration="10"
-   icon="notifytip.tga"
-   name="VoiceLoginRetry"
-   type="notifytip">
-We are creating a voice channel for you. This may take up to one minute.
-    <unique/>
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="Cannot enter parcel: not a group member"
-   type="notifytip">
-Cannot enter parcel, you are not a member of the appropriate group.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="Cannot enter parcel: banned"
-   type="notifytip">
-Cannot enter parcel, you have been banned.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="Cannot enter parcel: not on access list"
-   type="notifytip">
-Cannot enter parcel, you are not on the access list.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="VoiceNotAllowed"
-   type="notifytip">
-You do not have permission to connect to voice chat for [VOICE_CHANNEL_NAME].
-    <unique>
-      <context key="VOICE_CHANNEL_NAME"/>
-    </unique>
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="VoiceCallGenericError"
-   type="notifytip">
-An error has occurred while trying to connect to voice chat for [VOICE_CHANNEL_NAME].  Please try again later.
-    <unique>
-      <context key="VOICE_CHANNEL_NAME"/>
-    </unique>
-  </notification>
-
-  <notification
-   duration="10"
-   icon="notifytip.tga"
-   name="ServerVersionChanged"
-   priority="high"
-   type="notifytip">
-The region you have entered is running a different simulator version. Click this message for details.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="UnableToOpenCommandURL"
-   priority="high"
-   type="notifytip">
-The URL you clicked cannot be opened from this web browser.
-  </notification>
-
-  <notification
-    name="RegionCapabilityRequestError"
-    icon="alert.tga"
-    type="alert">
-    Could not get region capability &apos;[CAPABILITY]&apos;.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="AvatarRezNotification"
-   type="notifytip">
-( [EXISTENCE] seconds alive )
-Avatar '[NAME]' declouded after [TIME] seconds.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="AvatarRezSelfBakedDoneNotification"
-   type="notifytip">
-( [EXISTENCE] seconds alive )
-You finished baking your outfit after [TIME] seconds.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="AvatarRezSelfBakedUpdateNotification"
-   type="notifytip">
-( [EXISTENCE] seconds alive )
-You sent out an update of your appearance after [TIME] seconds.
-[STATUS]
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="AvatarRezCloudNotification"
-   type="notifytip">
-( [EXISTENCE] seconds alive )
-Avatar '[NAME]' became cloud.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="AvatarRezArrivedNotification"
-   type="notifytip">
-( [EXISTENCE] seconds alive )
-Avatar '[NAME]' appeared.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="AvatarRezLeftCloudNotification"
-   type="notifytip">
-( [EXISTENCE] seconds alive )
-Avatar '[NAME]' left after [TIME] seconds as cloud.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="AvatarRezEnteredAppearanceNotification"
-   type="notifytip">
-( [EXISTENCE] seconds alive )
-Avatar '[NAME]' entered appearance mode.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="AvatarRezLeftAppearanceNotification"
-   type="notifytip">
-( [EXISTENCE] seconds alive )
-Avatar '[NAME]' left appearance mode.
-  </notification>
-  <notification
-   icon="notifytip.tga"
-   name="AvatarRezLeftNotification"
-   type="notifytip">
-( [EXISTENCE] seconds alive )
-Avatar '[NAME]' left as fully loaded.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="AvatarRezSelfBakedTextureUploadNotification"
-   type="notifytip">
-( [EXISTENCE] seconds alive )
-You uploaded a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds.
-  </notification>
-
-  <notification
-   icon="notifytip.tga"
-   name="AvatarRezSelfBakedTextureUpdateNotification"
-   type="notifytip">
-( [EXISTENCE] seconds alive )
-You locally updated a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME] seconds.
-  </notification>
-
-  <global name="UnsupportedCPU">
-- Your CPU speed does not meet the minimum requirements.
-  </global>
-
-  <global name="UnsupportedGLRequirements">
-    You do not appear to have the proper hardware requirements for [APP_NAME]. The viewer requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
-  </global>
-
-  <global name="UnsupportedCPUSSE2">
-    You do not appear to have the proper hardware requirements for [APP_NAME]. The viewer requires a CPU that supports SSE2
-  </global>
-  
-  <global name="UnsupportedCPUSSE">
-    You do not appear to have the proper hardware requirements for [APP_NAME]. The viewer requires a CPU that supports SSE
-  </global>
-  
-  <global name="UnsupportedCPUAmount">
-796
-  </global>
-
-  <global name="UnsupportedRAMAmount">
-510
-  </global>
-
-  <global name="UnsupportedGPU">
-- Your graphics card does not meet the minimum requirements.
-  </global>
-
-  <global name="UnsupportedRAM">
-- Your system memory does not meet the minimum requirements.
-  </global>
-
-  <global name="PermYes">
-Yes
-  </global>
-
-  <global name="PermNo">
-No
-  </global>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SetDisplayNameSuccess"
-   type="alert">
-    Hi [DISPLAY_NAME]!
-
-    Just like in real life, it takes a while for everyone to learn about a new name.  Please allow several days for [http://wiki.secondlife.com/wiki/Setting_your_display_name your name to update] in objects, scripts, search, etc.
-  </notification>
-
-  <notification
- icon="alertmodal.tga"
- name="SetDisplayNameBlocked"
- type="alert">
-    Sorry, you cannot change your display name. If you feel this is in error, please contact support.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SetDisplayNameFailedLength"
-   type="alertmodal">
-    Sorry, that name is too long.  Display names can have a maximum of [LENGTH] characters.
-
-    Please try a shorter name.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SetDisplayNameFailedGeneric"
-   type="alertmodal">
-    Sorry, we could not set your display name.  Please try again later.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="SetDisplayNameMismatch"
-   type="alertmodal">
-    The display names you entered do not match. Please re-enter.
-  </notification>
-
-  <!-- *NOTE: This should never happen -->
-  <notification
-   icon="alertmodal.tga"
-   name="AgentDisplayNameUpdateThresholdExceeded"
-   type="alertmodal">
-    Sorry, you have to wait longer before you can change your display name.
-
-    See http://wiki.secondlife.com/wiki/Setting_your_display_name
-
-    Please try again later.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   name="AgentDisplayNameSetBlocked"
-   type="alertmodal">
-    Sorry, we could not set your requested name because it contains a banned word.
-
-    Please try a different name.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
- name="AgentDisplayNameSetInvalidUnicode"
- type="alertmodal">
-    The display name you wish to set contains invalid characters.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
- name="AgentDisplayNameSetOnlyPunctuation"
- type="alertmodal">
-    Your display name must contain letters other than punctuation.
-  </notification>
-
-  <notification
- icon="notifytip.tga"
- name="DisplayNameUpdate"
- type="notifytip">
-    [OLD_NAME] ([SLID]) is now known as [NEW_NAME].
-  </notification>
-
-  <notification
-   icon="notify.tga"
-   name="FirstAO"
-   type="notify">
-    For instructions, make a new template in the AO. Use the toolbar to toggle the AO on/off.
-  </notification>
-
-  <notification icon="notifytip.tga" name="BlockedCards" type="notifytip">Blocked calling cards from [NAME] ([SOURCE])</notification>
-  <notification icon="notifytip.tga" name="BlockedDialogs" type="notifytip">Blocking all dialogs from [NAME]'s objects. (Origin: [SOURCE])</notification>
-  <notification icon="notifytip.tga" name="BlockedGeneralAvatar" type="notifytip">Blocked spam from avatar [NAME] ([SOURCE])</notification>
-  <notification icon="notifytip.tga" name="BlockedGeneralObjects" type="notifytip">Blocked spam from objects owned by [OWNER] ([SOURCE])</notification>
-  <notification icon="notifytip.tga" name="BlockedChatterAvatar" type="notifytip">Blocked chat-spam from avatar [NAME] ([SOURCE])</notification>
-  <notification icon="notifytip.tga" name="BlockedChatterObjects" type="notifytip">Blocked chat-spam from objects owned by [OWNER] ([SOURCE])</notification>
-
-  <notification
- icon="notify.tga"
- name="FirstPhysicsWearable"
- priority="high"
- type="notify">
-By wearing a Physics Wearable certain server behavior will be enabled that many older viewers are incompatable with. On such viewers you may display incorrectly (often as 'Ruth').
-
-If you wish to keep compatability with old viewers then you must not wear a Physics Wearable during your session. If you have already worn one during this session remove it and reconnect.
-
-Click 'Wear' to attach the Physics Wearable, or click 'Cancel' if you wish to maintain compatability with legacy clients.
-    <unique/>
-    <form name="form">
-    <button
-     index="0"
-     name="Wear"
-     text="Wear"/>
-    <button
-     index="1"
-     name="Cancel"
-     text="Cancel"/>
-  </form>
-  </notification>
-
-  <notification
-   icon="alert.tga"
-   name="SGIncompleteAppearance"
-   type="alert">
-Sending incomplete appearance. You may appear to others as a cloud.
-
-Your shape, skin, hair or eyes might be defect.
-	<usetemplate
-	 name="okbutton"
-	 yestext="OK"/>
-  </notification>
-
-  <notification
-  icon="alertmodal.tga"
-  label="All settings reset"
-  name="ResetSettingsComplete"
-  type="alertmodal">
-    Settings have been reset. You should relog to ensure this takes full effect.
-  </notification>
-
-  <notification
-   icon="alertmodal.tga"
-   label="Reset all settings"
-   name="ResetSystemSettingsPrompt"
-   type="alertmodal">
-    Resetting all settings may be helpful if you are experiencing problems; however, you will need to redo any changes you have made to the default configuration.
-
-    Would you like to reset system settings?
-    <form>
-      <button
-       index="0"
-       name="all"
-       text="OK"/>
-      <button
-       default="true"
-       index="3"
-       name="cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-
-  <notification
-    icon="alertmodal.tga"
-    label="Reset all settings"
-    name="ResetAllSettingsPrompt"
-    type="alertmodal">
-    Resetting all settings may be helpful if you are experiencing problems; however, you will need to redo any changes you have made to the default configuration.
-
-    Which settings would you like to reset?
-    <form>
-      <button
-       index="0"
-       name="all"
-       text="ALL"/>
-      <button
-       index="1"
-       name="system"
-       text="System"/>
-      <button
-       index="2"
-       name="user"
-       text="User"/>
-      <button
-       default="true"
-       index="3"
-       name="cancel"
-       text="Cancel"/>
-    </form>
-  </notification>
-
-
-</notifications>
-
+<?xml version="1.0" encoding="utf-8"?>
+<notifications>
+	<global name="skipnexttime">
+		No mostrarme esto otra vez
+	</global>
+	<global name="alwayschoose">
+		Elegir siempre esta opción
+	</global>
+	<template name="okbutton">
+		<form>
+			<button name="OK" text="$yestext"/>
+		</form>
+	</template>
+	<template name="okignore">
+		<form>
+			<button name="OK" text="$yestext"/>
+			<ignore text="$ignoretext"/>
+		</form>
+	</template>
+	<template name="okcancelbuttons">
+		<form>
+			<button  name="OK" text="$yestext"/>
+			<button name="Cancel" text="$notext"/>
+		</form>
+	</template>
+	<template name="okcancelignore">
+		<form>
+			<button name="OK" text="$yestext"/>
+			<button name="Cancel" text="$notext"/>
+			<ignore text="$ignoretext"/>
+		</form>
+	</template>
+	<template name="okhelpbuttons">
+		<form> 
+			<button name="OK" text="$yestext"/>
+			<button name="Help" text="$helptext"/>
+		</form>
+	</template>
+	<template name="yesnocancelbuttons">
+		<form> 
+			<button name="Yes" text="$yestext"/>
+			<button name="No" text="$notext"/>
+			<button name="Cancel" text="$canceltext"/>
+		</form>
+	</template>
+	<notification name="MediaAlert" type="alert">
+		El propietario de esta parcela ha solicitado que el siguiente URL de [TYPE] sea cargado en tu visor:
+
+[URL]
+
+Puedes escoger aceptar o denegar el dominio correspondiente o el script en el mundo:
+
+[DOMAIN]
+
+"Permitir" y "Denegar" se aplican solamente para esta sesión mientras que "Lista Negra" y "Lista Blanca" se aplican en forma permanente.
+		<form name="form">
+			<button index="0" name="Allow" text="Permitir"/>
+			<button index="1" name="Deny" text="Denegar"/>
+			<button index="2" name="Blacklist" text="Lista Negra"/>
+			<button index="3" name="Whitelist" text="Lista Blanca"/>
+		</form>
+	</notification>
+	<notification name="MediaListed" type="alert">
+		La URL del Media/audio para este  [DOMAIN] está ahora [LISTED]
+	</notification>
+	<notification name="MediaBlocked" type="notifytip">
+		La URL del Media/audio ha sido bloqueada para este [DOMAIN]
+	</notification>
+	<notification name="MediaFiltersCleared" type="alertmodal">
+		El Filtro de Media ha sido vaciado
+	</notification>  
+	<notification functor="GenericAcknowledge" label="Mensaje de alerta desconocida" name="MissingAlert">
+		Esta versión de [APP_NAME] no sabe como mostrar el mensaje de alerta que has recibido. Por favor verifica que tienes instalada la última versión de [APP_NAME].
+
+Detalles de error: El alerta llamado &apos;[_NAME]&apos; no ha sido encontado en notifications.xml.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="FloaterNotFound">
+		Error: No se han podido encontrar los siguientes controles:
+
+[CONTROLS]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="TutorialNotFound">
+		Actualmente, no hay un tutorial disponible.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="GenericAlert">
+		[MESSAGE]
+	</notification>
+	<notification name="GenericAlertYesCancel">
+		[MESSAGE]
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sí"/>
+	</notification>
+	<notification name="GenericAlertYesNoCancel" type="alertmodal">
+		[MESSAGE]
+		<usetemplate name="yesnocancelbuttons" notext="No" yestext="Si" canceltext="Cancelar"/>
+	</notification>
+	<notification name="BadInstallation">
+		Ha ocurrido un error al actualizar [APP_NAME].  Por favor, descarga la última versión desde www.singularityviewer.org.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="LoginFailedNoNetwork">
+		No se puede conectar a [SECOND_LIFE_GRID]. 
+&apos;[DIAGNOSTIC]&apos;
+Asegurate que tu conexión a internet funciona correctamente.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MessageTemplateNotFound">
+		No se ha encontrado la plantilla de mensaje [PATH].
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="WearableSave">
+		¿Guardar los cambios en las ropas o partes del cuerpo actuales?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="No Guardar" yestext="Guardar"/>
+	</notification>
+	<notification name="ConfirmNoCopyToOutbox" type="alertmodal">
+		No tienes permisos para copiar uno o más ítems al Merchant Outbox. Puedes moverlos o dejarlos fuera.
+		<usetemplate name="okcancelbuttons" notext="No mover ítem(s)" yestext="Mover ítem(s)"/>
+	</notification>
+	<notification name="OutboxFolderCreated" type="outbox">
+		<unique/>
+			Una nueva carpeta ha sido creada por cada ítem que has transferido en el nivel superior de tu Merchant Outbox.
+	
+		<usetemplate ignoretext="Una nueva carpeta ha sido creada en el Merchant Outbox" name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="OutboxImportComplete" type="outbox">
+		Completado
+
+Todas las carpetas ha sido enviadas satisfactoriamente al Marketplace.
+
+		<usetemplate ignoretext="Todas las carpetas se han enviado al Marketplace" name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="OutboxImportHadErrors" type="outbox">
+		Algunas carpetas no fueron transferidas
+
+Ha habido errores al enviar algunas carpetas al Markeplace. Estas carpetas aún están en tu Merchant Outbox.
+
+Mira en el  [log de errores [[MARKETPLACE_IMPORTS_URL]] para mayor información.
+
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OutboxImportFailed" type="outbox">
+		La transferencia ha fallado
+
+No se han enviado carpetas al Marketplace debido a un error de sistema o de red. Inténtalo nuevamente más tarde.
+
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="OutboxInitFailed" type="outbox">
+		Ha fallado la inicialización del Marketplace
+
+La inicialización con el Marketplace ha fallado debido a un error de sistema o de red. Inténtalo nuevamente más tarde.
+
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>	
+	<notification name="CompileQueueSaveText">
+		Hubo un problema al subir el texto de un script por la siguiente razón: [REASON]. Por favor, inténtalo más tarde.
+	</notification>
+	<notification name="CompileQueueSaveBytecode">
+		Hubo un problema al subir el script compilado por la siguiente razón: [REASON]. Por favor, inténtalo más tarde.
+	</notification>
+	<notification name="WriteAnimationFail">
+		Hubo un problema al escribir los datos de la animación. Por favor, inténtalo más tarde.
+	</notification>
+	<notification name="UploadAuctionSnapshotFail">
+		Hubo un problema al subir la foto de la subasta por la siguiente razón: [REASON]
+	</notification>
+	<notification name="UnableToViewContentsMoreThanOne">
+		No se puede ver a la vez los contenidos de más de un ítem a la vez. Por favor, elige un solo objeto y vuelve a intentarlo.
+	</notification>
+	<notification name="SaveClothingBodyChanges">
+		¿Guardar todos los cambios en la ropa y partes del cuerpo?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="No Guardar" yestext="Guardar Todo"/>
+	</notification>
+	<notification name="GrantModifyRights">
+		Al conceder derechos de modificación a otro residente le autorizas a cambiar, borrar, o agarrar CUALQUIER objeto que tengas en el mundo. Se MUY cuidadoso dando este permiso. 
+¿Quieres conceder derechos de modificación a [NAME]?
+		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="GrantModifyRightsMultiple">
+		Al conceder derechos de modificación a otros residentes les autorizas a cambiar, borrar, o agarrar CUALQUIER objeto que tengas en el mundo. Se MUY cuidadoso dando este permiso.
+¿Quieres conceder derechos de modificación a los residentes seleccionados?
+		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="RevokeModifyRights">
+		¿Quieres revocar los derechos de modificación a [NAME]?
+		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="RevokeModifyRightsMultiple">
+		¿Quieres revocar los derechos de modificación a los residentes seleccionados?
+		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="UnableToCreateGroup">
+		No se ha podido crear el grupo.
+[MESSAGE]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PanelGroupApply">
+		[NEEDS_APPLY_MESSAGE]
+[WANT_APPLY_MESSAGE]
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Ignorar Cambios" yestext="Aplicar Cambios"/>
+	</notification>
+	<notification name="MustSpecifyGroupNoticeSubject">
+		Debes especificar un asunto para enviar un aviso al grupo.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="AddGroupOwnerWarning">
+		Estas por agregar miembros del gurpo al rol de [ROLE_NAME].
+Estos miembros no pueden ser removidos de este rol.
+Los miembros deberán abandonar el rol por si mismos.
+¿Estás seguro que quieres continuar?
+		<usetemplate ignoretext="Cuando se añaden miembros del grupo al rol de propietario" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="AssignDangerousActionWarning">
+		Estas por agregar la capacidad &apos;[ACTION_NAME]&apos; al rol &apos;[ROLE_NAME]&apos;.
+
+*ADVERTENCIA*
+  Todos los miembros con esta capacidad podrán asignarse a sí mismos -y a otros miembros- roles con mayores poderes de los que actualmente tienen. Potencialmente, podrían elevarse hasta poderes cercanos a los del propietario. Asegúrate de lo que estás haciendo antes de otorgar esta capacidad.
+
+¿Añadir esta capacidad al rol &apos;[ROLE_NAME]&apos;?
+		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="AssignDangerousAbilityWarning">
+		Estas por agregar la capacidad &apos;[ACTION_NAME]&apos; al rol &apos;[ROLE_NAME]&apos;.
+
+*ADVERTENCIA*
+  Todos los miembros con esta capacidad podrán asignarse a sí mismos -y a otros miembros- todas las capacidades, elevándose hasta poderes cercanos a los del propietario. 
+
+¿Añadir esta capacidad al rol &apos;[ROLE_NAME]&apos;?
+		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="ClickPublishHelpLand">
+		Seleccionando &apos;Publicar en la búsqueda&apos;
+Marcando este ítem, se mostrará:
+- esta parcela en los resultados de la búsqueda
+- los objetos públicos de esta parcela
+- esta parcela en la búsqueda de la web	
+	</notification>
+	<notification name="ClickSoundHelpLand">
+		Los media y la música sólo pueden disfrutarse dentro de la parcela. Según el nivel de calificación de los residentes, las opciones de sonido y de voz pueden restringirse a la parcela u oírse fuera de ella. ¿Ir a la Base de Conocimientos para aprender más sobre cómo configurar estas opciones?
+		<url name="url">
+			https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=5046
+		</url>
+	<usetemplate name="okcancelbuttons" yestext="Ir a la Base de Conocimientos" notext="Cerrar" />
+	</notification>
+	<notification name="ClickSearchHelpAll">
+		Los resultados de la búsqueda se organizan según la pestaña en que estés, tu nivel de calificación, la categoría elegida, y otros factores. Para más detalles, ve, por favor, a la Base de Conocimientos.
+		<url name="url">
+			https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=4722
+		</url>
+	<usetemplate name="okcancelbuttons" yestext="Ir a la Base de Conocimientos" notext="Cerrar" />
+	</notification>
+	<notification name="ClickPublishHelpLandDisabled">
+		No puedes hacer que esta parcela aparezca en la búsqueda, porque está situada en una región que no lo permite.
+	</notification>
+	<notification name="ClickPublishHelpAvatar">
+		Seleccionando &apos;Mostrar en la búsqueda&apos;	se mostrará:
+- mi perfil en los resultados de la búsqueda
+- un enlace a mi perfil en las páginas públicas de los grupos
+	</notification>
+	<notification name="ClickPartnerHelpAvatar">
+		Puedes proponerle la relación a otro residente o disolver tu relación con tu compañero/a en el sitio web de [SECOND_LIFE].	
+
+¿Ir al sitio web [SECOND_LIFE] para mayor información sobre este asunto?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Ir a la Página"/>
+	</notification>
+	<notification name="ClickUploadHelpPermissions">
+		Tus permisos por defecto no funcionarán en regiones antiguas.
+	</notification>
+	<notification name="ClickWebProfileHelpAvatar">
+		Si este residente ha indicado una URL para mostrar un perfil en la web, tu puedes:
+ * Pulsar &apos;Cargar&apos; para ver la página en esta pestaña web.
+ * Pulsar Cargar &gt; &apos;En un navegador externo&apos; para ver la página en tu navegador por defecto.
+ * Pulsar Cargar &gt; &apos;URL Inicio&apos; para volver al perfil en la web de este residente si has estado navegando por otros sitios.
+
+Cuando estés viendo su propio perfil, puedes introducir cualquier URL como tu perfil web, y pulsar OK para fijarla.
+Los demás residentes podrán visitar la URL que hayas elegido cuando vean tu perfil.	
+	</notification>
+	<notification name="JoinGroupCanAfford">
+		Unirse a este grupo cuesta [CURRENCY][COST].
+¿Quieres hacerlo?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Unirse"/>
+	</notification>
+	<notification name="JoinGroupCannotAfford">
+		Unirse a este grupo cuesta [CURRENCY][COST].
+No tienes suficientes [CURRENCY] para unirte a este grupo.
+	</notification>
+	<notification name="LandBuyPass">
+		Por [CURRENCY][COST] puedes entrar a este terreno (&apos;[PARCEL_NAME]&apos;) durante [TIME] horas.  ¿Comprar un pase?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="SalePriceRestriction">
+		El precio de venta tiene que ser mayor de [CURRENCY]0 si la venta es a cualquiera.
+Por favor, elige a alguien concreto como comprador si la venta es por 0 L$.	
+	</notification>
+	<notification name="ConfirmLandSaleChange">
+		Los [LAND_SIZE] m² de terreno seleccionados se van a colocar para su venta.
+El precio de venta será de  [CURRENCY][SALE_PRICE]  y se autorizará la compra solamente a  [NAME].
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmLandSaleToAnyoneChange">
+		ADVERTENCIA: Al pulsar &apos;vender a cualquiera&apos;, tu terreno estará disponible para toda la comunidad de [SECOND_LIFE], incluso para quienes no están en esta región.
+
+Los [LAND_SIZE] m² de terreno seleccionados se van a poner a la venta.
+Su precio de venta será de [CURRENCY][SALE_PRICE], y se autorizará la compra a [NAME].	
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ReturnObjectsDeededToGroup">
+		¿Estás seguro de que quieres devolver todos los objetos de esta parcela que están compartidos con el grupo &apos;[NAME]&apos; al inventario de su propietario anterior?
+		
+*ADVERTENCIA* ¡Esto borrará los objetos no transferibles que se hayan cedido al grupo!
+
+Objetos: [N]
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ReturnObjectsOwnedByUser">
+		¿Estás seguro de que quieres devolver al inventario de &apos;[NAME]&apos; todos los objetos que sean de su propiedad en esta parcela?
+
+Objetos: [N]	
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ClickBuildConstants">
+		En esta pestaña se aceptan las siguientes constantes:
+
+PX  --  Posición eje X
+PY  --  Posición eje Y
+PZ  --  Posición eje Z
+SX  --  Tamaño eje X
+SY  --  Tamaño eje Y
+SZ  --  Tamaño eje Z
+RX  --  Rotación eje X
+RY  --  Rotación eje Y
+RZ  --  Rotación eje Z
+CB  --  Inicio del Camino de Corte
+CE  --  Fin del Camino de Corte
+HLW  --  Tamaño del Hueco
+SKW  --  Sesgar
+PB  --  Inicio Cortar/Horadar/Perfil de Corte
+PE  --  Fin Cortar/Horadar/Perfil de Corte
+TB  --  Inicio Torsión
+TE  --  Fin Torsión
+SHX  --  Inicio Inclinación Superior eje X
+SHY  --  Fin Inclinación Superior eje Y
+HLX  --  Tamaño Hueco eje X
+HLY  --  Tamaño Hueco eje Y
+TPX  --  Biselado eje X
+TPY  --  Biselado eje Y
+ROF  --  Radio de desplazamiento
+REV  --  Giros
+
+PI  --  pi
+TWO_PI  --  2pi
+PI_BY_TWO  --  pi/2
+SQRT2  --  Raíz Cuadrada de 2
+DEG_TO_RAD  --  Conversión DEG_TO_RAD (pi/180)
+RAD_TO_DEG  --  Conversión RAD_TO_DEG (180/pi)
+GRAVITY  --  -9.8
+
+*  --  Multiplicación
+\  --  División
++  --  Suma
+-  --  Resta
+
+Para mayor información sobre esta característica, pulsa "Más Información".
+		<url option="1" name="url">
+			http://imprudenceviewer.org/wiki/Build_Math_Expressions
+		</url>
+		<usetemplate name="okhelpbuttons" yestext="OK" helptext="Más Información"/>
+	</notification>	
+	<notification name="ReturnObjectsOwnedBySelf">
+		¿Estás seguro de que quieres devolver a tu inventario todos los objetos de los que eres propietario en esta parcela?
+
+Objetos: [N]
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ReturnObjectsNotOwnedBySelf">
+		¿Estás seguro de que quieres devolver todos los objetos de los que NO eres propietario en esta parcela al inventario de sus propietarios?
+Los objetos transferibles que se hayan transferido al grupo se devolverán a sus anteriores propietarios.
+
+*ADVERTENCIA* ¡Esto borrará los objetos no transferibles que se hayan cedido al grupo!
+
+Objetos: [N]	
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ReturnObjectsNotOwnedByUser">
+		¿Estás seguro de que quieres devolver todos los objetos de esta parcela que NO sean propiedad de [NAME] al inventario de su propietario?
+Los objetos transferibles que se hayan transferido al grupo se devolverán a sus anteriores propietarios.
+
+*ADVERTENCIA* ¡Esto borrará los objetos no transferibles que se hayan cedido al grupo!
+
+Objetos: [N]	
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ReturnAllTopObjects">
+		¿Estás seguro de que quieres devolver al inventario de su propietario todos los objetos de la lista?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="DisableAllTopObjects">
+		¿Estás seguro de que quieres desactivar todos los objetos de esta región?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ReturnObjectsNotOwnedByGroup">
+		¿Devolver a sus propietarios los objetos de esta parcela que NO estén compartidos con el grupo [NAME]?
+
+Objetos: [N]
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="UnableToDisableOutsideScripts">
+		No se pueden desactivar los scripts.
+Toda esta región tiene activado el &apos;daño&apos;.
+Para que funcionen las armas los scripts deben estar activados.
+	</notification>
+	<notification name="MustBeInParcel">
+		Para configurar el Punto de llegada de la parcela, debes estar dentro de ella.
+	</notification>
+	<notification name="PromptRecipientEmail">
+		Por favor, escribe una dirección de correo electrónica válida para el/los receptor/es.
+	</notification>
+	<notification name="PromptSelfEmail">
+		Por favor ingresa tu dirección de correo electrónico.
+	</notification>
+	<notification name="PromptMissingSubjMsg">
+		¿enviar la foto por correo electrónico con el asunto o el mensaje por defecto?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ErrorProcessingSnapshot">
+		Error al procesar los datos de la foto.
+	</notification>
+	<notification name="ErrorEncodingSnapshot">
+		Error al codificar la foto.
+	</notification>
+	<notification name="ErrorUploadingPostcard">
+		Hubo un problema al enviar la foto por la siguiente razón: [REASON]
+	</notification>
+	<notification name="ErrorUploadingReportScreenshot">
+		Hubo un problema al subir la captura de pantalla del informe por la siguiente razón: [REASON]
+	</notification>
+	<notification name="MustAgreeToLogIn">
+		Debes aceptar los Términos del Servicio para continuar el inicio de sesión en [SECOND_LIFE].
+	</notification>
+	<notification name="CouldNotPutOnOutfit">
+		No se ha podido ponerte el vestuario.
+La carpeta del vestuario contiene ítems que no son partes del cuerpo, u objetos a anexar.	
+	</notification>
+	<notification name="CannotWearTrash">
+		No puedes vestirse ropas o partes del cuerpo que están en la Papelera
+	</notification>
+	<notification name="MaxAttachmentsOnOutfit" type="alertmodal">
+		No se pudo adjuntar el objeto.
+Se ha excedido el límite de [MAX_ATTACHMENTS] objetos adjuntos. Por favor quitate un objeto primero.		
+	</notification>	
+	<notification name="CannotWearInfoNotComplete">
+		No puedes vestirse este ítem porque aún no se ha cargado. Por favor, reinténtalo en un minuto.
+	</notification>
+	<notification name="MustHaveAccountToLogIn">
+		¡Ups! Algo quedó en blanco.
+Debes escribir el nombre y apellido o el nombre de usuario de tu avatar.
+
+Necesitas una cuenta para entrar en [SECOND_LIFE]. ¿Quieres crear una ahora?	
+		<usetemplate name="okcancelbuttons" notext="Reintentar" yestext="Crear una Cuenta Nueva"/>
+	</notification>
+	<notification name="MustHaveAccountToLogInNoLinks" type="alertmodal">
+		Debes escribir el nombre y apellido o el nombre de usuario de tu avatar.
+
+Necesitas una cuenta para entrar en [SECOND_LIFE_GRID].
+	</notification>	
+	<notification name="AddClassified">
+		Los anuncios clasificados aparecen durante una semana en la sección &apos;Clasificados&apos; del directorio Buscar y en www.secondlife.com.
+Rellena tu anuncio y pulsa &apos;Publicar...&apos; para añadirlo al directorio.
+Cuando pulses Publicar, se te preguntará por un precio a pagar.
+El pagar más hará que tu anuncio aparezca más arriba en la lista, y que también aparezca más arriba cuando la gente busque por palabras clave.
+		<usetemplate ignoretext="Cuando se añade un nuevo Clasificado" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="DeleteClassified">
+		¿Borrar el Anuncio Clasificado &apos;[NAME]&apos;?
+No se reembolsan las cuotas pagadas.
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ClassifiedSave">
+		¿Guardar los cambios en el Anuncio Clasificado [NAME]?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="No Guardar" yestext="Guardar"/>
+	</notification>
+	<notification name="DeleteAvatarPick">
+		¿Borrar el Destacado [PICK]?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="PromptGoToEventsPage">
+		¿Ir a la web de eventos de [SECOND_LIFE]?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="SelectProposalToView">
+		Por favor, selecciona la propuesta que quieres ver.
+	</notification>
+	<notification name="SelectHistoryItemToView">
+		Por favor, selecciona un ítem del historial para verlo.
+	</notification>
+	<notification name="ResetShowNextTimeDialogs">
+		¿Quieres reactivar todas estas ventanas emergentes, incluso las que marcaste previamente como &apos;No mostrarme más esto&apos;?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="SkipShowNextTimeDialogs">
+		¿Quieres desactivar todas las ventanas emergentes que pueden ser omitidas?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="CacheWillClear">
+		El caché será limpiado al reiniciar [APP_NAME].
+	</notification>
+	<notification name="CacheWillBeMoved">
+		El caché será movido al reiniciar [APP_NAME].
+		Nota: Esto limpiará el caché  
+	</notification>
+	<notification name="ChangeConnectionPort">
+		Las configuraciones del puerto tendrán efecto cuando reinicies [APP_NAME].
+	</notification>
+	<notification name="ProxyNeedRestart" type="notify">
+		Las configuraciones de Sockets del proxy tendrán efecto cuando reinicies [APP_NAME].
+	</notification>
+	<notification name="SOCKS_CONNECT_OK" type="alertmodal">
+		La conexión a través del Proxy Socks5 [PROXY] fué satisfactoria.
+	</notification>	
+	<notification name="SOCKS_NOT_PERMITTED" type="alertmodal">
+		El Proxy Socks5 "[PROXY]" rechazó la conexión, no permitido por el conjunto de reglas.
+	</notification>
+	<notification name="SOCKS_CONNECT_ERROR" type="alertmodal">
+		El Proxy Socks5 "[PROXY]" rechazó la conexión,no se puede abrir el canal TCP
+	</notification>
+	<notification name="SOCKS_NOT_ACCEPTABLE" type="alertmodal">
+		El Proxy Socks5 "[PROXY]" rechazó el sistema de autenticación seleccionado.
+	</notification>
+	<notification name="SOCKS_AUTH_FAIL" type="alertmodal">
+		El Proxy Socks5 "[PROXY]" ha reportado que tus credenciales son inválidas
+	</notification>
+	<notification name="SOCKS_UDP_FWD_NOT_GRANTED" type="alertmodal">
+El Proxy Socks5 "[PROXY]" rechazó el requerimiento UDP
+	</notification>
+	<notification name="SOCKS_HOST_CONNECT_FAILED" type="alertmodal">
+		No se puede conectar al Servidor proxy Socks5 "[PROXY]"
+	</notification>	
+	<notification name="ChangeSkin">
+		La nueva Apariencia se aplicará al reiniciar [APP_NAME].
+	</notification>
+	<notification name="GoToAuctionPage">
+		¿Ir a la página web de [SECOND_LIFE] para ver detalles de la subasta o hacer una oferta?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="SaveChanges">
+		¿Guardar los cambios?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="No Guardar" yestext="Guardar"/>
+	</notification>
+	<notification name="GestureSaveFailedTooManySteps">
+		Fallo al guardar el gesto.
+Este gesto tiene demasiados pasos.
+Intenta quitarle algunos pasos, y vuelve a guardarlo.
+	</notification>
+	<notification name="GestureSaveFailedTryAgain">
+		Fallo al guardar el gesto. Por favor, reinténtalo en un minuto.
+	</notification>
+	<notification name="GestureSaveFailedObjectNotFound">
+		No se ha podido guardar el gesto porque no se pudo encontrar el objeto o el objeto asociado.
+El objeto debe de haber sido borrado o estar fuera de rango.
+	</notification>
+	<notification name="GestureSaveFailedReason">
+		Al guardar un gesto, hubo un problema por: [REASON]. Por favor, reintenta guardarlo más tarde.
+	</notification>
+	<notification name="SaveNotecardFailObjectNotFound">
+		No se ha podido guardar la nota porque no se pudo encontrar el objeto o el objeto asociado del inventario.
+El objeto debe de haber sido borrado o estar fuera de rango.
+	</notification>
+	<notification name="SaveNotecardFailReason">
+		Al guardar una nota, hubo un problema por: [REASON]. Por favor, reintenta guardarla más tarde.
+	</notification>
+	<notification name="ScriptCannotUndo">
+		No se han podido deshacer todos los cambios en tu versión del script.
+¿Quieres cargar la última versión guardada en el servidor?
+(**Cuidado** No podrá deshacer esta operación).
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="SaveScriptFailReason">
+		Al guardar un script, hubo un problema por: [REASON]. Por favor, reintenta guardarlo más tarde.
+	</notification>
+	<notification name="SaveScriptFailObjectNotFound">
+		No se ha podido guardar el script porque no se pudo encontrar el objeto que lo contiene.
+El objeto debe de haber sido borrado o estar fuera de rango.
+	</notification>
+	<notification name="SaveBytecodeFailReason">
+		Al guardar un script compilado, hubo un problema por: [REASON]. Por favor, reintenta guardarlo más tarde..
+	</notification>
+	<notification name="CouldNotStartStopScript">
+		No se ha podido ejecutar o detener el script porque no se pudo encontrar el objeto que lo contiene.
+El objeto debe de haber sido borrado o estar fuera de rango.
+	</notification>
+	<notification name="CannotDownloadFile">
+		No se ha podido descargar el archivo.
+	</notification>
+	<notification name="CannotWriteFile">
+		No se ha podido escribir el archivo [[FILE]]
+	</notification>
+	<notification name="UnsupportedHardware">
+		Atención: tu sistema no tiene los requerimientos mínimos que necesita [APP_NAME] . Si continuas usando [APP_NAME], tendrás un funcionamiento pobre. Desafortunadamente, [GRID_OWNER] no puede ofrecerte soporte técnico para configuraciones inadecuadas del sistema.
+
+MINSPECS
+Para más información, ¿quieres visitar [_URL]?
+		<url name="url" option="0">
+			http://secondlife.com/support/sysreqs.php?lang=es
+		</url>
+		<usetemplate ignoretext="Cuando se detecte hardware no soportado" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="UnknownGPU">
+		En este momento, desconocemos la tarjeta gráfica de tu sistema.
+Con frecuencia, esto se debe a hardware nuevo que no hemos podido revisar aún.
+Es muy probable que [APP_NAME] funcione correctamente, pero deberás ajustar tus configuraciones gráficas a lo que sea más apropiado.
+(Menú Editar &gt; Preferencias &gt; Gráficos).
+		<form name="form">
+			<ignore name="ignore" text="Cuando se detecte una tarjeta gráfica desconocida"/>
+		</form>
+	</notification>
+	<notification name="DisplaySettingsNoShaders">
+		[APP_NAME] falló al inicializar los controladores gráficos.
+La calidad de los gráficos deberá establecerse en un nivel bajo para prevenir algunos errores frecuentes en los controladores.
+Esto desactivará algunas opciones gráficas.
+Te recomendamos que actualices los controladores de tu tarjeta gráfica.
+La calidad gráfica puede configurarse en Preferencias &gt; Gráficos.
+	</notification>
+	<notification name="RegionNoTerraforming">
+		En la región [REGION] no se permite modificar el terreno.
+	</notification>
+	<notification name="CannotCopyWarning">
+		No tiene permiso para copiar los siguientes ítems.
+[ITEMS]		
+Si lo entregas, lo perderás de tu inventario.
+¿Realmente quieres darlo?
+		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="CannotGiveItem">
+		No se ha podido dar el ítem del inventario.
+	</notification>
+	<notification name="TransactionCancelled">
+		Transacción cancelada.
+	</notification>
+	<notification name="TooManyItems">
+		En una única transferencia del inventario, no se pueden dar más de 42 ítems.
+	</notification>
+	<notification name="NoItems">
+		No tiene permiso para transferir el ítem seleccionado.
+	</notification>
+	<notification name="CannotCopyCountItems">
+		No tiene permiso para copiar [COUNT] de los
+ítems seleccionados. Si los entregas, los perderás de su inventario.
+¿Realmente quieres darlos?
+		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="CannotGiveCategory">
+		No tienes permiso para transferir la carpeta seleccionada.
+	</notification>
+	<notification name="FreezeAvatar">
+		¿Congelar a este avatar?
+Temporalmente, será incapaz de moverse, usar el chat, o interactuar con el mundo.
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Descongelar" yestext="Congelar"/>
+	</notification>
+	<notification name="FreezeAvatarFullname">
+		¿Congelar a [AVATAR_NAME]?
+Temporalmente, será incapaz de moverse, usar el chat, o interactuar con el mundo.
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Descongelar" yestext="Congelar"/>
+	</notification>
+	<notification name="EjectAvatarFullname">
+		¿Expulsar a [AVATAR_NAME] de tu terreno?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Expulsar y Prohibir el acceso" yestext="Expulsar"/>
+	</notification>
+	<notification name="EjectAvatarNoBan">
+		¿Expulsar a este avatar de tu terreno?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar"/>
+	</notification>
+	<notification name="EjectAvatarFullnameNoBan">
+		¿Expulsar a [AVATAR_NAME] de su terreno?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar"/>
+	</notification>
+	<notification name="AcquireErrorTooManyObjects">
+		ERROR OBTENIDO: Hay demasiados objetos seleccionados.
+	</notification>
+	<notification name="AcquireErrorObjectSpan">
+		ERROR OBTENIDO: Los objetos están en más de una región.
+Por favor, mueve todos los objetos a adquirir a la misma región.
+	</notification>
+	<notification name="PromptGoToCurrencyPage">
+		[EXTRA]
+
+¿Ir a [URL] para informarte sobre la compra de moneda?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="UnableToLinkObjects">
+		No se pudo enlazar estos [COUNT] objetos.
+Puedes enlazar [MAX] objetos como máximo.
+	</notification>
+	<notification name="CannotLinkIncompleteSet">
+		Sólo puedes enlazar objetos completos (no sus partes), y debes
+seleccionar más de uno.
+	</notification>
+	<notification name="CannotLinkModify">
+		Imposible enlazarlos, porque no tienes permiso para modificar
+todos los objetos.
+
+Por favor, asegúrate de que no hay ninguno bloqueado, y de que eres el propietario de todos.
+	</notification>
+	<notification name="CannotLinkDifferentOwners">
+		Imposible enlazarlos, porque hay objetos de distintos propietarios.
+
+Por favor, asegúrate de que eres propietario de todos los objetos seleccionados.
+	</notification>
+	<notification name="NoFileExtension">
+		No hay extensión de archivo en: &apos;[FILE]&apos;
+
+Por favor, asegúrate de que la extensión del archivo es correcta.
+	</notification>
+	<notification name="InvalidFileExtension">
+		Extensión inválida de archivo: [EXTENSION]
+Podría ser [VALIDS]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="CannotUploadSoundFile">
+		No se pudo abrir el archivo de sonido que se ha subido para leer:
+[FILE]
+	</notification>
+	<notification name="SoundFileNotRIFF">
+		No parece que el archivo sea un archivo RIFF WAVE:
+[FILE]
+	</notification>
+	<notification name="SoundFileNotPCM">
+		No parece que el archivo sea un archivo de audio PCM WAVE:
+[FILE]
+	</notification>
+	<notification name="SoundFileInvalidChannelCount">
+		El archivo no tiene un número de canales válido (debe ser mono o estéreo):
+[FILE]
+	</notification>
+	<notification name="SoundFileInvalidSampleRate">
+		No parece que el archivo tenga una frecuencia de muestreo (sample rate) adecuada (debe de ser 44.1k):
+[FILE]
+	</notification>
+	<notification name="SoundFileInvalidWordSize">
+		No parece que el archivo tenga un tamaño de palabra (word size) adecuado (debe de ser de 8 o 16 bites):
+[FILE]
+	</notification>
+	<notification name="SoundFileInvalidHeader">
+		No se encontró el fragmento de datos en la cabecera del WAV:
+[FILE]
+	</notification>
+	<notification name="SoundFileInvalidChunkSize">
+		Tamaño incorrecto del fragmento en el archivo WAV:
+[FILE]
+  </notification>	
+	<notification name="SoundFileInvalidTooLong">
+		El archivo de audio es demasiado largo (10 segundos como máximo):
+[FILE]
+	</notification>
+	<notification name="ProblemWithFile">
+		Problemas con el archivo [FILE]:
+
+[ERROR]
+	</notification>
+	<notification name="CannotOpenTemporarySoundFile">
+		No se ha podido abrir para su escritura el archivo comprimido de sonido: [FILE]
+	</notification>
+	<notification name="UnknownVorbisEncodeFailure">
+		Códec Vorbis desconocido, fallo en : [FILE]
+	</notification>
+	<notification name="CannotEncodeFile">
+		No se puede codificar el archivo: [FILE]
+	</notification>
+	<notification name="CorruptResourceFile">
+		Archivo de recursos corrupto: [FILE]
+	</notification>
+	<notification name="UnknownResourceFileVersion">
+		Versión de archivo de recurosos desconocida para el archivo: [FILE]
+	</notification>
+	<notification name="UnableToCreateOutputFile">
+		No se ha podido crear el archivo de salida: [FILE]
+	</notification>
+	<notification name="DoNotSupportBulkAnimationUpload">
+		Actualmente, no ofrecemos la posibilidad de subida masiva de archivos de animación.
+	</notification>
+	<notification name="CannotUploadReason">
+		No se ha podido subir [FILE] por la siguiente razón: [REASON]
+Por favor, inténtalo más tarde.
+	</notification>
+   <notification name="UploadCostConfirmation">
+		Esta subida costará [CURRENCY][PRICE], ¿Deseas continuar con la subida?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Subir"/>
+	</notification>	
+	<notification name="CannotCreateLandmarkNotOwner">
+		No puedes crear un hito aquí porque el propietario del terreno no lo permite.
+	</notification>
+	<notification name="CannotRecompileSelectObjectsNoScripts">
+		No se pudo &apos;recompilar&apos;.
+Selecciona un objeto con script.
+	</notification>
+	<notification name="CannotRecompileSelectObjectsNoPermission">
+		No se pudo &apos;recompilar&apos;.
+
+Selecciona objetos con scripts en los que tengas permiso para modificarlos.
+	</notification>
+	<notification name="CannotResetSelectObjectsNoScripts">
+		No se pudo &apos;reiniciar&apos;.
+
+Selecciona objetos con scripts.
+	</notification>
+	<notification name="CannotResetSelectObjectsNoPermission">
+		No se pudo &apos;reiniciar&apos;.
+
+Selecciona objetos con scripts en los que tengas permiso para modificarlos.
+	</notification>
+	<notification name="CannotSetRunningSelectObjectsNoScripts">
+		No se puede configurar ningún script como &apos;ejecutándose&apos;.
+
+Selecciona objetos con scripts.
+	</notification>
+	<notification name="CannotSetRunningNotSelectObjectsNoScripts">
+		No se puede configurar ningún script como &apos;no ejecutándose&apos;.
+
+Selecciona objetos con scripts.
+	</notification>
+	<notification name="NoFrontmostFloater">
+		No hay flotante en primer plano para guardar.
+	</notification>
+	<notification name="SeachFilteredOnShortWords">
+		Se ha modificado tu búsqueda, eliminando las palabras demasiado cortas.
+
+Buscando: [FINALQUERY]
+	</notification>
+	<notification name="SeachFilteredOnShortWordsEmpty">
+		Los términos de tu búsqueda son muy cortos, por lo que no se ha hecho la búsqueda.
+	</notification>
+	<notification name="CouldNotTeleportReason">
+		No se ha podido teleportar.
+[REASON]
+	</notification>
+
+  <notification name="invalid_tport">
+		Ha habido un problema al procesar tu petición de teleporte. Debes volver a iniciar sesión para poder teleportarte. Si te sigue apareciendo este mensaje, revisa, por favor, las preguntas frecuentes en el Soporte técnico:
+www.secondlife.com/support
+  </notification>
+  <notification name="invalid_region_handoff">
+		Ha habido un problema al procesar tu paso a otra región. Debes volver a iniciar sesión para poder pasar de región a región. Si te sigue apareciendo este mensaje, revisa, por favor, las preguntas frecuentes en el Soporte técnico:
+www.secondlife.com/support
+  </notification>
+  <notification name="blocked_tport">
+		Lo sentimos, en estos momentos los teleportes están bloqueados. Vuelve a intentarlo en un momento. Si sigues sin poder teleportarse, desconéctate y vuelve a iniciar sesión para solucionar el problema.
+  </notification>
+  <notification name="nolandmark_tport">
+		Lo sentimos, pero el sistema no ha podido localizar el destino de este hito.
+  </notification>
+  <notification name="timeout_tport">
+		Lo sentimos, pero el sistema no ha podido completar el teleporte.
+Vuelve a intentarlo en un momento.
+  </notification>
+  <notification name="noaccess_tport">
+		Lo sentimos, pero no tienes acceso al destino de este teleporte.
+  </notification>
+  <notification name="missing_attach_tport">
+		Aún no han llegado sus objetos anexados. Espera unos segundos más o desconéctate y vuelve a iniciar sesión antes de teleportarte.
+  </notification>
+  <notification name="too_many_uploads_tport">
+		La cola de espera en esta región está actualmente obstruida, por lo que tu petición de teleporte no se atenderá en un tiempo prudencial. Por favor, vuelve a intentarlo en unos minutos o dirijete a una zona menos ocupada.
+  </notification>
+  <notification name="expired_tport">
+		Lo sentimos, pero el sistema no ha podido atender a tu petición de teleporte en un tiempo prudencial. Por favor, vuelve a intentarlo en unos pocos minutos.
+  </notification>
+  <notification name="expired_region_handoff">
+		Lo sentimos, pero el sistema no ha podido completar tu paso a otra región en un tiempo prudencial. Por favor, vuelve a intentarlo en unos pocos minutos.
+  </notification>
+  <notification name="no_host">
+		Ha sido imposible encontrar el destino del teleporte: o está desactivado temporalmente o ya no existe. Por favor, vuelve a intentarlo en unos pocos minutos.
+  </notification>
+  <notification name="no_inventory_host">
+		En estos momentos no está disponible el sistema del inventario.
+  </notification>
+	<notification name="CannotSetLandOwnerNothingSelected">
+		No se ha podido configurar el propietario del terreno:
+No se ha seleccionado una parcela.
+	</notification>
+	<notification name="CannotSetLandOwnerMultipleRegions">
+		No se ha podido obtener la propiedad del terreno porque la selección se extiende por varias regiones. Por favor, selecciona un área más pequeña y reinténtalo.
+	</notification>
+	<notification name="ForceOwnerAuctionWarning">
+		Esta parcela está siendo subastada. Forzar su propiedad cancelará la subasta y, probablemente, disguste a algunos residentes que ya hayan empezado a ofertar. 
+	¿Forzar la propiedad?
+		<tag>confirm</tag>
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="CannotContentifyNothingSelected">
+		No se ha podido &apos;contentify&apos;:
+No se ha seleccionado una parcela.
+	</notification>
+	<notification name="CannotContentifyNoRegion">
+		No se ha podido &apos;contentify&apos;:
+No se ha seleccionado una región.
+	</notification>
+	<notification name="CannotReleaseLandNothingSelected">
+		No se ha podido abandonar el terreno:
+no se ha seleccionado una parcela.
+	</notification>
+	<notification name="CannotReleaseLandNoRegion">
+		No se ha podido abandonar el terreno:
+No se ha podido encontrar la región.
+	</notification>
+	<notification name="CannotBuyLandNothingSelected">
+		Imposible comprar terreno:
+No se ha seleccionado una parcela.
+	</notification>
+	<notification name="CannotBuyLandNoRegion">
+		Imposible comprar terreno:
+No se ha podido encontrar en qué región está.
+	</notification>
+	<notification name="CannotCloseFloaterBuyLand">
+		No puedes cerrar la ventana de Comprar terreno hasta que [APP_NAME] calcule el precio de esta transacción.
+	</notification>
+	<notification name="CannotDeedLandNothingSelected">
+		No se ha podido transferir el terreno:
+No se ha seleccionado una parcela.
+	</notification>
+	<notification name="CannotDeedLandNoGroup">
+		No se ha podido transferir el terreno:
+No ha seleccionado un grupo.
+	</notification>
+	<notification name="CannotDeedLandNoRegion">
+		No se ha podido transferir el terreno:
+Ha sido imposible encontrar en qué región está.
+Por favor, para informar de esto usa Herramientas -&gt; Informar de un fallo.
+	</notification>
+	<notification name="CannotDeedLandMultipleSelected">
+		No se ha podido transferir el terreno:
+Has seleccionado varias parcelas.
+
+Inténtelo seleccionando sólo una.
+	</notification>
+	<notification name="DeedToGroupFail" type="notifytip">
+		Ha fallado la transferencia al grupo.
+    <tag>grupo</tag>
+    <tag>falló</tag>
+  </notification>	
+	<notification name="ParcelCanPlayMedia">
+		Esta localización puede mostrar media en streaming.
+Los media en streaming necesitan una conexión rápida a Internet.
+
+¿ Reproducir el media en streming si está disponible?
+(Puede cambiar más adelante esta opción en Preferencias &gt; Audio y Vídeo).
+		<usetemplate name="okcancelbuttons" notext="Desactivar" yestext="Ejecutar los media"/>
+	</notification>
+	<notification name="CannotDeedLandWaitingForServer">
+		No se ha podido transferir el terreno:
+Esperando que el servidor informe acerca de la propiedad.
+
+Por favor, vuelve a intentarlo.
+	</notification>
+	<notification name="CannotDeedLandNoTransfer">
+		No se ha podido transferir el terreno:
+En la región [REGION] no se permite transferir terrenos.
+	</notification>
+	<notification name="CannotReleaseLandWatingForServer">
+		No se ha podido abandonar el terreno:
+Esperando que el servidor actualice la información de la parcela.
+
+Vuelve a intentarlo en unos segundos.
+	</notification>
+	<notification name="CannotReleaseLandSelected">
+		No se ha podido abandonar el terreno:
+No eres propietario de todas las parcelas seleccionadas.
+
+Por favor, selecciona una sola parcela.
+	</notification>
+	<notification name="CannotReleaseLandDontOwn">
+		No se ha podido abandonar el terreno:
+No tienes permisos para liberar esta parcela.
+Las parcelas de tu propiedad se muestran en verde.
+	</notification>
+	<notification name="CannotReleaseLandRegionNotFound">
+		No se ha podido abandonar el terreno:
+Ha sido imposible encontrar en qué región está.
+
+Por favor, para informar de esto usa Herramientas &gt; Informar de un fallo.
+	</notification>
+	<notification name="CannotReleaseLandNoTransfer">
+		No se ha podido abandonar el terreno:
+En la región [REGION] no se permite transferir terrenos.
+	</notification>
+	<notification name="CannotReleaseLandPartialSelection">
+		No se ha podido abandonar el terreno:
+Debes seleccionar una parcela completa para liberarla.
+
+Selecciona una parcela completa, o divídela primero.
+	</notification>
+	<notification name="ReleaseLandWarning">
+		Estas por abandonar [AREA] m² de terreno.
+Al hacerlo, la quitarás de tus posesiones de terreno, pero no recibirás ningún [CURRENCY].
+
+¿Abandonar este terreno?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="CannotDivideLandNothingSelected">
+		No se ha podido dividir el terreno:
+
+No ha seleccionado ninguna parcela.
+	</notification>
+	<notification name="CannotDivideLandPartialSelection">
+		No se ha podido dividir el terreno:
+
+Has seleccionado una parcela entera.
+Inténtalo seleccionando una parte de la parcela.
+	</notification>
+	<notification name="LandDivideWarning">
+		Dividir este terreno lo separará en dos parcelas, cada una de las cuales tendrá su propia configuración. Tras esta operación, algunas configuraciones volverán a las existentes por defecto.
+
+¿Dividir el terreno?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="CannotDivideLandNoRegion">
+		No se ha podido dividir el terreno:
+Ha sido imposible encontrar en qué región está.
+
+Por favor, para informar de esto usa Herramientas -&gt; Informar de un fallo.
+	</notification>
+	<notification name="CannotJoinLandNoRegion">
+		No se ha podido unir el terreno:
+Ha sido imposible encontrar en qué región está.
+
+Por favor, para informar de esto usa Herramientas -&gt; Informar de un fallo.
+	</notification>
+	<notification name="CannotJoinLandNothingSelected">
+		No se ha podido unir el terreno:
+No hay parcelas seleccionadas.
+	</notification>
+	<notification name="CannotJoinLandEntireParcelSelected">
+		No se ha podido unir el terreno:
+Sólo has seleccionado una parcela.
+
+Selecciona terreno que incluya algo de ambas parcelas.
+	</notification>
+	<notification name="CannotJoinLandSelection">
+		No se ha podido unir el terreno:
+Debes seleccionar más de una parcela.
+
+Selecciona terreno que incluya algo de ambas parcelas.
+	</notification>
+	<notification name="JoinLandWarning">
+		Al unir este terreno crearás una parcela más grande formada por todas aquellas que tengan parte en el rectángulo seleccionado.
+Deberás reconfigurar el nombre y las opciones de la nueva parcela.
+
+¿Unir el terreno?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ShowOwnersHelp">
+		Mostrar los propietarios:
+El color de las parcelas indica el tipo de propietario.
+
+Verde = Su terreno
+Agua = Terreno de sus grupos
+Rojo = Propiedad de otros
+Amarillo = En venta
+Morado = Para subasta
+Gris = Público
+	</notification>
+	<notification name="ConfirmNotecardSave">
+		Esta nota debe guardarse antes de que se la pueda copiar o ver. ¿Guardar la nota?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmItemCopy">
+		¿Copiar este ítem a tu inventario?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Copiar"/>
+	</notification>
+	<notification name="ResolutionSwitchFail">
+		Fallo al cambiar la resolución a [RESX] por [RESY]
+	</notification>
+	<notification name="ErrorUndefinedGrasses">
+		Error, hierbas no definidas: [SPECIES]
+	</notification>
+	<notification name="ErrorUndefinedTrees">
+		Error, árboles no definidos: [SPECIES]
+	</notification>
+	<notification name="CannotSaveWearableOutOfSpace">
+		No se ha podido guardar el archivo &apos;[NAME]&apos;. Tendrás que liberar algo de espacio en tu computador y guardarlo de nuevo.
+	</notification>
+	<notification name="CannotSaveToAssetStore">
+		No se ha podido guardar [NAME] en la base central de almacenamiento.
+Esto es, generalmente, un fallo temporal. Por favor, reinténtalo en unos pocos minutos.
+
+Si persiste el problema, por favor, pulsa en en el menú &apos;Herramientas &gt; Informar de un fallo&apos; y aporta detalles sobre la configuración de tu conexión.
+	</notification>
+	<notification name="YouHaveBeenLoggedOut">
+		Se ha cerrado tu sesión en [SECOND_LIFE]:
+            [MESSAGE]
+Aún puedes ver el chat y los MI existentes pulsando &apos;Ver MI y Chat&apos;. Si no, pulsa &apos;Salir&apos; para cerrar [APP_NAME]  inmediatemente.
+		<usetemplate name="okcancelbuttons" notext="Salir" yestext="Ver MI y Chat"/>
+	</notification>
+	<notification name="OnlyOfficerCanBuyLand">
+		No se ha podido comprar terreno para el grupo:
+No tienes el permiso de comprar terreno para el grupo que tienes activado actualmente.
+	</notification>
+	<notification label="Añadir como amigo" name="AddFriend">
+		Los amigos pueden darse permiso para localizarse en el mapa y para saber si el otro está conectado.
+
+¿Ofrecer a [NAME] que sea tu amigo?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification label="Añadir como amigo" name="AddFriendWithMessage">
+		Los amigos pueden darse permiso para localizarse en el mapa y para saber si el otro está conectado.
+
+¿Ofrecer a [NAME] que sea tu amigo?
+		<form name="form">
+			<input name="message" type="text">
+				¿Quieres formar parte de mis amigos?
+			</input>
+			<button name="Offer" text="OK"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="RemoveFromFriends">
+		¿Quieres quitar a [NAME] de tu lista de amigos?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="RemoveMultipleFromFriends">
+		¿Quieres quitar a varios amigos de tu lista de amigos?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="GodDeleteAllScriptedPublicObjectsByUser">
+		¿Estás seguro de que quieres borrar todos los objetos con script propiedad de
+** [AVATAR_NAME] **
+en todos los otros terrenos de este sim?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="GodDeleteAllScriptedObjectsByUser">
+		¿Está seguro de que quiere BORRAR TODOS los objetos con script propiedad de
+** [AVATAR_NAME] **
+en TODO EL TERRENO de este sim?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="GodDeleteAllObjectsByUser">
+		¿Estás seguro de que quieres BORRAR TODOS los objetos (con script o no) propiedad de
+** [AVATAR_NAME] **
+en TODO EL TERRENO de este sim?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="BlankClassifiedName">
+		Debes especificar un nombre para tu clasificado.
+	</notification>
+	<notification name="MinClassifiedPrice">
+		El pago para aparecer en la lista debe ser de, al menos, [CURRENCY][MIN_PRICE].
+
+Por favor, elige un pago mayor.
+	</notification>
+	<notification name="ConfirmItemDeleteHasLinks">
+		Al menos uno de los ítems que tiene elementos enlazados que apuntan a el. Si se elimina este tema, sus vínculos de forma permanente dejarán de funcionar. Se recomienda encarecidamente a eliminar los vínculos en primer lugar.	
+
+¿Estás seguro de que quieres borrar estos ítems?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>	
+	<notification name="ConfirmObjectDeleteLock">
+		Al menos uno de los ítems que has seleccionado está bloqueado.
+
+¿Estás seguro de que quieres borrar estos ítems?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteNoCopy">
+		Al menos uno de los ítems que has seleccionado no es copiable.
+
+¿Estás seguro de que quieres borrar estos ítems?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteNoOwn">
+		No eres el propietario de, al menos, uno de los ítems que has seleccionado.
+
+¿Estás seguro de que quieres borrar estos ítems?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteLockNoCopy">
+		Al menos un objeto está bloqueado.
+Al menos un objeto no es copiable.
+
+¿Estás seguro de que quieres borrar estos ítems?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteLockNoOwn">
+		Al menos un objeto está bloqueado.
+No eres propietario de, al menos, un objeto.
+
+¿Estás seguro de que quieres borrar estos ítems?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteNoCopyNoOwn">
+		Al menos un objeto no es copiable.
+No eres propietario de, al menos, un objeto.
+
+¿Estás seguro de que quieres borrar estos ítems?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmObjectDeleteLockNoCopyNoOwn">
+		Al menos un objeto está bloqueado.
+Al menos un objeto no es copiable.
+No eres propietario de, al menos, un objeto.
+
+¿Estás seguro de que quieres borrar estos ítems?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmObjectTakeLock">
+		Al menos un objeto está bloqueado.
+
+¿Estás seguro de que quieres tomar estos ítems?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmObjectTakeNoOwn">
+		No eres el propietario de todos los objetos que estás tomando.
+Si continuas, se aplicarán los permisos marcados para el próximo propietario, y es posible que se restrinja su posibilidad de hacer modificaciones o copias.
+
+¿Estás seguro de que quieres tomar estos ítems?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmObjectTakeLockNoOwn">
+		Al menos un objeto está bloqueado.
+No eres el propietario de todos los objetos que estás tomando.
+Si continuas, se aplicarán los permisos marcados para el próximo propietario, y es posible que se restrinja su posibilidad de hacer modificaciones o copias
+Con todo, puedes tomar lo actualmente seleccionado.
+
+¿Estás seguro de que quieres tomar estos ítems?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="CantBuyLandAcrossMultipleRegions">
+		No se ha podido hacer la compra porque el terreno seleccionado se extiende por varias regiones.
+
+Por favor, selecciona un área más pequeña y reinténtalo.
+	</notification>
+	<notification name="DeedLandToGroup">
+		Al transferir esta parcela, se requerirá al grupo que tenga y mantenga el crédito suficiente para el uso del terreno.
+El precio de compra de la parcela no se reembolsa al propietario. Si se vende una parcela transferida, el precio de venta se dividirá a partes iguales entre los miembros del grupo.
+
+¿Transferir estos [AREA] m² de terreno al grupo &apos;[GROUP_NAME]&apos;?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="DeedLandToGroupWithContribution">
+		Al transferir esta parcela, se requerirá al grupo que tenga y mantenga el crédito suficiente para uso de terreno.
+La tranferencia incluirá, a la vez, una contribucíon de terreno al grupo de &apos;[NAME]&apos;.
+El precio de compra de la parcela no se reembolsa al propietario.
+Si se vende una parcela transferida, el precio de venta se dividirá a partes iguales entre los miembros del grupo.
+
+¿Transferir estos [AREA] m² de terreno al grupo &apos;[GROUP_NAME]&apos;?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="DisplaySetToSafe">
+		Las configuraciones gráficas se han fijado en los niveles guardados, pues has especificado la opción de guardarlos.
+	</notification>
+	<notification name="DisplaySetToRecommended">
+		Las configuraciones gráficas se han fijado en los niveles recomendados para la configuración de tu sistema.
+	</notification>
+	<notification name="ErrorMessage">
+		[ERROR_MESSAGE]
+	</notification>
+	<notification name="AvatarMoved">
+		Tu localización [TYPE] no está disponible en estos momentos. [HELP]
+Has sido llevado a una región cercana.
+	</notification>
+	<notification name="ClothingLoading">
+		Aún está descargándose tu ropa.
+Puedes usar normalmente [SECOND_LIFE], los demás residentes te verán correctamente.
+		<form name="form">
+			<ignore name="ignore" text="Cuando está llevando mucho tiempo descargar la ropa"/>
+		</form>
+	</notification>
+	<notification name="FirstRun">
+		Se ha completado la instalación de [APP_NAME] .
+
+Si esta es la primera vez que usas [SECOND_LIFE], deberás crear una cuenta antes de poder iniciar una sesión.
+¿Volver a www.secondlife.com para crear una cuenta nueva?
+		<usetemplate name="okcancelbuttons" notext="Continuar" yestext="Cuenta nueva..."/>
+	</notification>
+	<notification name="LoginPacketNeverReceived">
+		Tenemos problemas de conexión. Puede deberse a un problema de tu conexión a internet o de los servidores de [SECOND_LIFE_GRID].
+
+Puedes revisar tu conexión a internet y volver a intentarlo en unos minutos. Pulsa Ayuda para conectarte a nuestro sitio de Sporte, o pulsa Teleportar para intentar teleportarte a tu Base.
+		<form name="form">
+			<button name="OK" text="OK"/>
+			<button name="Help" text="Ayuda"/>
+			<button name="Teleport" text="Teleportar"/>
+		</form>
+	</notification>
+	<notification name="WelcomeChooseSex">
+		Tu personaje aparecerá en un momento.
+
+Para caminar, usa las teclas del cursor.
+En cualquier momento, puedes pulsar la tecla F1 para conseguir ayuda o para aprender más acerca de [SECOND_LIFE].
+Por favor, elige el avatar masculino o femenino. Puedes cambiar más adelante tu elección.
+		<usetemplate name="okcancelbuttons" notext="Mujer" yestext="Varón"/>
+	</notification>
+	<notification name="NotEnoughCurrency">
+		[NAME] cuesta [CURRENCY] [PRICE]. Nos tiene suficientes [CURRENCY]  para hacer eso.
+	</notification>
+	<notification name="GrantedModifyRights">
+		Se te ha concedido el privilegio de modificar los objetos de [NAME].
+	</notification>
+	<notification name="RevokedModifyRights">
+		Ha sido revocado tu privilegio de modificar los objetos de [NAME].
+	</notification>
+	<notification name="FlushMapVisibilityCaches">
+		Esto limpiará los caches del mapa en esta región.
+Esto sólo es realmente útil para cuestiones de depuración..
+(A efectos prácticos, espere 5 minutos, y el mapa de cualquiera se actualizará después de que reinicien sesión).
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="BuyOneObjectOnly">
+		No se puede comprar más de un objeto a la vez. Por favor, selecciona sólo un objeto y vuelve a intentarlo.
+	</notification>
+	<notification name="OnlyCopyContentsOfSingleItem">
+		No se puede copiar a la vez los contenidos de más de un objeto.
+Por favor, selecciona sólo uno y reinténtalo.
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="KickUsersFromRegion">
+		¿Teleportar a su base a todos los residentes en esta región?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="EstateObjectReturn">
+		¿Estás seguro de que quieres devolver los objetos propiedad de
+[USER_NAME] ?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="InvalidTerrainBitDepth">
+		No se han podido configurar las texturas de la región:
+La textura del terreno [TEXTURE_NUM] tiene una profundidad de bites inválida: [TEXTURE_BIT_DEPTH].
+
+Cambia la textura [TEXTURE_NUM] por una imagen de 24-bit y 512x512 o menor, y pulsa de nuevo &apos;Aplicar&apos; .
+	</notification>
+	<notification name="InvalidTerrainSize">
+		No se han podido configurar las texturas de la región:
+La textura del terreno [TEXTURE_NUM] es demasiado grande: [TEXTURE_SIZE_X]x[TEXTURE_SIZE_Y].
+
+Cambia la textura [TEXTURE_NUM] por una imagen de 24-bit y 512x512 o menor, y pulsa de nuevo &apos;Aplicar&apos; .
+	</notification>
+	<notification name="RawUploadStarted">
+		Ha empezado la subida. Dependiendo de la velocidad de tu conexión, llevará unos dos minutos.
+	</notification>
+	<notification name="ConfirmBakeTerrain">
+		¿Realmente quieres predeterminar el terreno actual, haciéndolo el centro de los limites para elevarlo y rebajarlo, y el terreno por defecto para la herramienta &apos;Revertir&apos;?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="MaxAllowedAgentOnRegion">
+		Sólo puedes tener un máximo de [MAX_AGENTS] residentes autorizados.
+	</notification>
+	<notification name="MaxBannedAgentsOnRegion">
+		Sólo puedes tener un máximo de [MAX_BANNED] residentes no admitidos.
+	</notification>
+	<notification name="MaxAgentOnRegionBatch">
+		Fallo al intentar añadir [NUM_ADDED] agentes:
+Se superan en [NUM_EXCESS] los [MAX_AGENTS] permitidos en [LIST_TYPE].
+	</notification>
+	<notification name="MaxAllowedGroupsOnRegion">
+		Sólo puedes tener un máximo de [MAX_GROUPS] grupos permitidos.
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Predeterminar"/>
+	</notification>
+	<notification name="MaxManagersOnRegion">
+		Sólos puedes tener un máximo de [MAX_MANAGER] administradores del estado.
+	</notification>
+	<notification name="OwnerCanNotBeDenied">
+		No se puede añadir a la lista de residentes no admitidos al propietario del estado.
+	</notification>
+	<notification name="CanNotChangeAppearanceUntilLoaded">
+		No se puede cambiar la apariencia hasta que no se carguen la ropa y la forma.
+	</notification>
+	<notification name="ClassifiedMustBeAlphanumeric">
+		El nombre de tu anuncio clasificado debe empezar o con un número o con una letra de la A a la Z. No se permiten signos de puntuación.
+	</notification>
+	<notification name="CantSetBuyObject">
+		No puede configurar el Comprar el objeto, porque éste no está en venta.
+Por favor, pon en venta el objeto y reinténtalo.
+	</notification>
+	<notification name="FinishedRawDownload">
+		Finalizada la descarga del archivo raw de terreno en:
+[DOWNLOAD_PATH].
+	</notification>
+	<notification name="DownloadWindowsMandatory">
+		Está disponible una nueva versión de [APP_NAME].
+[MESSAGE]
+Debes descargar esta actualización para usar [APP_NAME].
+		<usetemplate name="okcancelbuttons" notext="Salir" yestext="Descargar"/>
+	</notification>
+	<notification name="DownloadWindows">
+		Está disponible una versión actualizada de [APP_NAME].
+[MESSAGE]
+Esta actualización no es obligatoria, pero te sugerimos instalarla para mejorar el rendimiento y la estabilidad.
+		<usetemplate name="okcancelbuttons" notext="Continuar" yestext="Descargar"/>
+	</notification>
+	<notification name="DownloadWindowsReleaseForDownload">
+		Está disponible una versión actualizada de [APP_NAME].
+[MESSAGE]
+Esta actualización no es obligatoria, pero te sugerimos instalarla para mejorar el rendimiento y la estabilidad.
+		<usetemplate name="okcancelbuttons" notext="Continuar" yestext="Descargar"/>
+	</notification>
+	<notification name="DownloadMacMandatory">
+		Está disponible una versión nueva de [APP_NAME].
+[MESSAGE]
+Debes descargar esta actualización para usar [APP_NAME].
+
+¿Descargarla a tu carpeta de aplicaciones?
+		<usetemplate name="okcancelbuttons" notext="Salir" yestext="Descargar"/>
+	</notification>
+	<notification name="DownloadMac">
+		Está disponible una versión actualizada de [APP_NAME].
+[MESSAGE]
+Esta actualización no es obligatoria, pero te sugerimos instalarla para mejorar el rendimiento y la estabilidad.
+
+¿Descargarla a tu carpeta de aplicaciones?
+		<usetemplate name="okcancelbuttons" notext="Continuar" yestext="Descargar"/>
+	</notification>
+	<notification name="DownloadMacReleaseForDownload">
+		Está disponible una versión actualizada de [APP_NAME].
+[MESSAGE]
+Esta actualización no es obligatoria, pero te sugerimos instalarla para mejorar el rendimiento y la estabilidad.
+
+¿Descargarla a tu carpeta de aplicaciones?
+		<usetemplate name="okcancelbuttons" notext="Continuar" yestext="Descargar"/>
+	</notification>
+	<notification name="DeedObjectToGroup">
+		Transferir este objeto al grupo hará que:
+* Reciba los [CURRENCY] pagados en el objeto
+		<usetemplate ignoretext="Cuando se transfieren objetos a los grupos" name="okcancelignore" notext="Cancelar" yestext="Transferir"/>
+	</notification>
+	<notification name="WebLaunchExternalTarget">
+		¿Abrir el navegador de tu sistema para ver este contenido?
+		<usetemplate ignoretext="Cuando se abra el navegador de tu sistema para ver una página web" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchJoinNow">
+		¿Ir a www.secondlife.com para administrar tu cuenta?
+		<usetemplate ignoretext="Cuando se abra el navegador para administrar tu cuenta" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchBugReport101">
+		Visita el wiki de [SECOND_LIFE] y aprende cómo informar correctamente de fallos.
+		<usetemplate ignoretext="Cuando se abra el navegador para ver el wiki de Informes de fallos - instrucciones" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchSecurityIssues">
+		Visita el wiki de [SECOND_LIFE] para más detalles sobre cómo informar de una cuestión de seguridad.
+		<usetemplate ignoretext="Cuando se abra el navegador para ver el wiki de cuestiones de seguridad" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchQAWiki">
+		Visita el wiki QA de [SECOND_LIFE].
+		<usetemplate ignoretext="Cuando se abra el navegador para ver el wiki QA" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchPublicIssue">
+		Visita el Public Issue Tracker (sistema público de seguimiento de incidencias) de [SECOND_LIFE], donde podrás informar de errores y otros asuntos.
+		<usetemplate ignoretext="Cuando se abra el navegador para ver el Public Issue Tracker" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/>
+	</notification>
+	<notification name="WebLaunchSinguIssue">
+		Visita Singularity Issue Tracker (Seguimiento de incidencias del Visor Singularity), donde podrás informar de errores y otros asuntos del visor Singularity.
+    <usetemplate ignoretext="Cuando se abra el navegador para ir al Issue Tracker de Singularity" name="okcancelignore" notext="Cancelar" yestext="Ir a la Página"/>
+  </notification>	
+	<notification name="WebLaunchPublicIssueHelp">
+		Visita el wiki de [SECOND_LIFE] para informarte de cómo usar el Public Issue Tracker (sistema público de seguimiento de incidencias).
+
+Por favor, asegurate de que tu reporte no será un duplicado de uno ya existente.
+		<usetemplate ignoretext="Cuando se abra el navegador para ver el wiki del Public Issue Tracker" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/>
+	</notification>
+	<notification name="WebLaunchSupportWiki">
+		Para ver las últimas noticias e informaciones, ¿ir al Blog oficial?
+		<usetemplate ignoretext="Cuando se abra el navegador para ver el blog" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchLSLGuide">
+		¿Quieres abrir Guía de programación para encontrar ayuda?
+		<usetemplate ignoretext="Cuando se abra el navegador para ver la Guía de programación" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="WebLaunchLSLWiki">
+		¿Quieres visitar el portal de LSL para encontrar ayuda sobre programación?
+		<usetemplate ignoretext="Cuando se abra el navegador para ver el portal de programación" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/>
+	</notification>
+	<notification name="ReturnToOwner">
+		¿Estás seguro de que quieres devolver los objetos seleccionados a sus propietarios? Los objetos transferibles que se hayan cedido volverán a sus propietarios anteriores.
+
+*ADVERTENCIA* ¡Serán borrados los objetos no transferibles que estén cedidos!
+		<usetemplate ignoretext="Cuando se devuelvan los objetos a sus propietarios" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="GroupLeaveConfirmMember">
+		Actualmente, eres miembro del grupo [GROUP].
+¿Dejar el grupo?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmKick">
+		¿REALMENTE quieres expulsar a todos los usuarios de este grid?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Expulsar a todos los usuarios"/>
+	</notification>
+	<notification name="MuteLinden">
+		Perdón, pero no puedes ignorar a un empleado de [GRID_OWNER].
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="CannotStartAuctionAlreadyForSale">
+		No puedes empezar una subasta en una parcela que ya está en venta. Desactiva la venta de terreno si estás seguro de querer iniciar una subasta.
+	</notification>
+	<notification label="Fallo al ignorar un objeto según el nombre" name="MuteByNameFailed">
+		Ya has ignorado ese nombre.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="RemoveItemWarn">
+		Aunque esté permitido, borrar contenidos puede dañar el objeto.
+¿Quieres borrar ese ítem?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="CantOfferCallingCard">
+		En este momento, no se puede ofrecer una tarjeta de visita. Por favor, reinténtalo en un momento.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="CantOfferFriendship">
+		En este momento, no se puede ofrecer el ser amigo. Por favor, reinténtalo en un momento.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="BusyModeSet">
+		Pasar al modo ocupado.
+Se ocultará el chat y los mensajes instantáneos. Los mensajes instantáneos recibirán su Respuesta en el modo ocupado. Todos los ofrecimientos de teleporte serán rehusados. Todas las ofertas de inventario irán a tu Papelera.
+		<usetemplate ignoretext="Cuando se pasa al modo ocupado" name="okignore" yestext="OK"/>
+	</notification>
+	<notification name="JoinedTooManyGroupsMember">
+		Perteneces a demasiados grupos para poder entrar en otro. Por favor, sal de al menos uno antes de entrar en éste, o rehúsa la oferta. Para salir de un grupo, selecciona la opción &apos;Grupos...&apos; en el menú &apos;Editar&apos;.
+[NAME] te ha invitado a ser miembro de un grupo.
+[INVITE]
+		<usetemplate name="okcancelbuttons" notext="Rehusar" yestext="Entrar"/>
+	</notification>
+	<notification name="KickUser">
+		¿Con qué mensaje se expulsará a este usuario?
+		<form name="form">
+			<input name="message" type="text">
+				Un administrador te ha desconectado.
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="KickAllUsers">
+		¿Con qué mensaje se expulsará a cualquiera que esté actualmente en el grid?
+		<form name="form">
+			<input name="message" type="text">
+				Un administrador te ha desconectado.
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="FreezeUser">
+		¿Con qué mensaje se congelará a este usuario?
+		<form name="form">
+			<input name="message" type="text">
+				Has sido congelado. No puedes moverte o escribir en el chat. Un administrador contactará contigo a través de un mensaje instantáneo (MI).
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="UnFreezeUser">
+		¿Con qué mensaje se descongelará a este usuario?
+		<form name="form">
+			<input name="message" type="text">
+				Ya no estás congelado.
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="OfferTeleport">
+		¿Ofrecer teleporte a tu posición con este mensaje?
+		<form name="form">
+			<input name="message" type="text">
+				Ven conmigo a [REGION]
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="OfferTeleportFromGod">
+		¿Convocar a este usuario a tu posición?
+		<form name="form">
+			<input name="message" type="text">
+				Ven conmigo a [REGION]
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="TeleportFromLandmark">
+		¿Estás seguro de que quieres teleportarte?
+		<usetemplate ignoretext="Cuando estás teleportando desde un hito del inventario" name="okcancelignore" notext="Cancelar" yestext="Teleportar"/>
+	</notification>
+	<notification label="Mensaje a todo el estado" name="MessageEstate">
+		Escribe un anuncio breve que se enviará a todo el que esté en tu estado.
+		<form name="form">
+			<input name="message" type="text"/>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification label="Cambiar un estado Linden" name="ChangeLindenEstate">
+		Vas a hacer cambios en un estado propiedad de Linden (mainland, grid teen, orientación, etc.).
+
+Esto es EXTREMADAMENTE PELIGROSO, porque puede afectar radicalmente al funcionamiento de los usuarios. En mainland, se cambiarán miles de regiones, y se provocará un colapso en el espacio del servidor.
+
+¿Proceder?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification label="Cambiar el acceso a un estado Linden" name="ChangeLindenAccess">
+		Vas a cambiar la lista de acceso de un estado propiedad de Linden (mainland, grid teen, orientación, etc.).
+
+Esto es PELIGROSO, y sólo debe hacerse para deshacerse de ataques que permitan sacar o meter en el grid objetos o [CURRENCY].
+Se cambiarán miles de regiones, y se provocará un colapso en el espacio del servidor.
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification label="Seleccionar el estado" name="EstateAllowedAgentAdd">
+		¿Añadir a la lista de permitidos sólo para este estado o para [ALL_ESTATES]?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
+	</notification>
+	<notification label="Seleccionar el estado" name="EstateAllowedAgentRemove">
+		¿Quitar de la lista de permitidos sólo para este estado o para [ALL_ESTATES]?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
+	</notification>
+	<notification label="Seleccionar el estado" name="EstateAllowedGroupAdd">
+		¿Añadir a la lista de grupos permitidos sólo para este estado o para [ALL_ESTATES]?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
+	</notification>
+	<notification label="Seleccionar el estado" name="EstateAllowedGroupRemove">
+		¿Quitar de la lista de grupos permitidos sólo para este estado o para [ALL_ESTATES]?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
+	</notification>
+	<notification label="Seleccionar el estado" name="EstateBannedAgentAdd">
+		¿Denegar el acceso sólo a este estado o a [ALL_ESTATES]?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
+	</notification>
+	<notification label="Seleccionar el estado" name="EstateBannedAgentRemove">
+		¿Quitar de la lista de prohibición de acceso a este residente para que acceda sólo a este estado o a [ALL_ESTATES]?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
+	</notification>
+	<notification label="Seleccionar el estado" name="EstateManagerAdd">
+		¿Añadir Administrador del Estado sólo para este estado o para [ALL_ESTATES]?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
+	</notification>
+	<notification label="Seleccionar el estado" name="EstateManagerRemove">
+		¿Remover Administrador del Estado sólo para este estado o para [ALL_ESTATES]?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="Todos los estados" yestext="Este estado"/>
+	</notification>
+	<notification label="Confirmar la expulsión" name="EstateKickUser">
+		¿Expulsar a [EVIL_USER] de este estado?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="EstateChangeCovenant">
+		¿Estás seguro de que quieres cambiar el contrato del estado?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="RegionEntryAccessBlocked">
+		No estás autorizado en esa región por tu nivel de calificación. Puede deberse a que no hay información validada de tu edad.
+
+Por favor, comprueba que tienes instalado el último visor, y ve a la Base de Conocimientos para más detalles sobre el acceso a zonas con este nivel de calificación.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_KB">
+		No estás autorizado en esa región por tu nivel de calificación. 
+
+¿Quieres ir a la Base de Conocimientos para aprender más sobre el nivel de calificación?
+		<url name="url">
+			https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+		</url>
+		<usetemplate name="okcancelignore" yestext="Ir a la Base de Conocimientos" notext="Cerrar" ignoretext="Cuando la entrada a la región está bloqueada por el nivel de calificación"/>
+	</notification>
+	<notification name="RegionEntryAccessBlocked_Notify">
+		No estás autorizado en esa región por tu nivel de calificación.
+	</notification>
+	<notification name="RegionEntryAccessBlocked_Change">
+		No estás autorizado en esa región por tu nivel de calificación..
+
+Puedes pulsar &apos;Cambiar preferencia&apos; para aumentar tu nivel de calificación y poder entrar. Desde ese momento, podrás buscar y acceder a contenido [REGIONMATURITY]. Si más adelante quieres deshacer esta configuración, ve a Editar &gt; Preferencias... &gt; General.
+		<form name="form">
+			<button name="OK" text="Cambiar preferencia"/>
+			<button name="Cancel" text="Cancelar"/>
+			<ignore name="ignore" text="Cuando la entrada a la región está bloqueada por la preferencia del nivel de calificación"/>
+		</form>
+	</notification>
+	<notification name="LandClaimAccessBlocked">
+		No puedes reclamar este terreno por tu nivel de calificación. Puede deberse a que no hay información validada de tu edad.
+
+Por favor, comprueba que tienes instalado el último visor, y ve a la Base de Conocimientos para más detalles sobre el acceso a zonas con este nivel de calificación.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="LandClaimAccessBlocked_KB">
+		No puedes reclamar este terreno por tu nivel de calificación. 
+
+¿Quieres ir a la Base de Conocimientos para más información sobre el nivel de calificación?
+		<url name="url">
+			https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+		</url>
+		<usetemplate name="okcancelignore" yestext="Ir a la Base de Conocimientos" notext="Cerrar" ignoretext="Cuando el reclamar terreno está bloqueado por el nivel de calificación"/>
+	</notification>
+	<notification name="LandClaimAccessBlocked_Notify">
+		Por tu nivel de calificación, No puedes reclamar este terreno.
+	</notification>
+	<notification name="LandClaimAccessBlocked_Change">
+		No puedes reclamar este terreno por tus preferencias de nivel de calificación.
+
+Puedes pulsar &apos;Cambiar preferencia&apos; para aumentar tu nivel de calificación y poder entrar. Desde ese momento, podrás buscar y acceder a contenido [REGIONMATURITY]. Si más adelante quieres deshacer esta configuración, ve a Editar &gt; Preferencias... &gt; General..
+		<usetemplate name="okcancelignore" yestext="Cambiar preferencia" notext="Cerrar" ignoretext="Cuando el reclamar terreno está bloqueado por la preferencia del nivel de calificación"/>
+	</notification>
+	<notification name="LandBuyAccessBlocked">
+		No puedes comprar este terreno por tu nivel de calificación. Puede deberse a que no hay información validada de tu edad.
+
+Por favor, compruebs que tienes instalado el último visor, y ve a la Base de Conocimientos para más detalles sobre el acceso a zonas con este nivel de calificación.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="LandBuyAccessBlocked_KB">
+		No puedes comprar este terreno por tus preferencias de nivel de calificación. 
+
+¿Quieres ir a la Base de Conocimientos para más información sobre el nivel de calificación?
+		<url name="url">
+			https://support.secondlife.com/ics/support/default.asp?deptID=4417&amp;task=knowledge&amp;questionID=6010
+		</url>
+		<usetemplate name="okcancelignore" yestext="Ir a la Base de Conocimientos" notext="Cerrar" ignoretext="Cuando la compra de terreno está bloqueada por el nivel de calificación"/>
+	</notification>
+	<notification name="LandBuyAccessBlocked_Notify">
+		No puedes comprar este terreno por tu nivel de calificación.
+	</notification>
+	<notification name="LandBuyAccessBlocked_Change">
+		No puedes comprar este terreno por tus preferencias de nivel de calificación.
+
+Puedes pulsar &apos;Cambiar preferencia&apos; para aumentar tu nivel de calificación y poder entrar. Desde ese momento, podrás buscar y acceder a contenido [REGIONMATURITY]. Si más adelante quieres deshacer esta configuración, ve a Editar &gt; Preferencias... &gt; General.
+		<usetemplate name="okcancelignore" yestext="Cambiar preferencia" notext="Cerrar" ignoretext="Cuando la compra de terreno está bloqueada por la preferencia del nivel de calificación"/>
+	</notification>
+	<notification name="TooManyPrimsSelected">
+		"Hay seleccionadas demasiadas primitivas. Por favor, selecciona [MAX_PRIM_COUNT] o menos, y reinténtalo"
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="ProblemImportingEstateCovenant">
+		Hay problemas al importar el contrato del estado.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="ProblemAddingEstateManager">
+		Hay problemas al añadir un administrador nuevo del estado. Uno o más estados deben de tener llena la lista de administradores.
+	</notification>
+	<notification name="ProblemAddingEstateGeneric">
+		Hay problemas en añadir a la lista del estado. Uno o más estados deben de tener llena la lista.
+	</notification>
+	<notification name="UnableToLoadNotecardAsset">
+		En este momento, no se pueden cargar los datos de la&apos;s nota&apos;s.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="NotAllowedToViewNotecard">
+		Permisos insuficientes para ver la nota asociada al ID solicitado.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MissingNotecardAssetID">
+		Se ha perdido en la base de datos el ID de la nota.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="PublishClassified">
+		Recuerda: las cuotas que se pagan por los clasificados no son reembolsables.
+
+¿Publicar ahora este anuncio por [CURRENCY][AMOUNT]?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="SetClassifiedMature">
+		¿Este anuncio tiene contenido &apos;Mature&apos;?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="SetGroupMature">
+		¿Este grupo tiene contenido &apos;Mature&apos;?
+		<usetemplate canceltext="Cancelar" name="yesnocancelbuttons" notext="No" yestext="Sí"/>
+	</notification>
+	<notification label="Confirmar el reinicio" name="ConfirmRestart">
+		¿Realmente quieres reiniciar la región de aquí a 2 minutos?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification label="Mensaje a toda la región" name="MessageRegion">
+		Escribe un anuncio breve que se enviará a todo el que esté en esta región.
+		<form name="form">
+			<input name="message" type="text"/>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification label="No permitir modificar el terreno" name="HelpRegionBlockTerraform">
+		Si se marca está casilla, los propietarios de terreno no podrán modificarlo, independientemente de lo que esté configurado en cada parcela.
+
+Por defecto: off
+	</notification>
+	<notification label="Prohibir volar" name="HelpRegionBlockFly">
+		Si se marca esta casilla, estará prohibido volar en la región, independientemente de lo que esté configurado en cada parcela.
+
+Por defecto: off
+	</notification>
+	<notification label="Cambio múltiple de permisos del contenido" name="HelpBulkPermission">
+		La herramienta de cambio múltiple de permisos te ayuda a cambiar con rapidez los permisos de varios de los items contenidos en el objeto u objetos que selecciones. Pero fíjate que sólo configurará los permisos de los ítems que están en el contenido de los objetos seleccionados, no los de esos objetos que los contienen.  
+
+Nota también que los permisos no se aplicarán a los contenidos que puedan tener cada uno de los ítems. Lo que haga sólo afectará a los ítems que estén exactamente en el primer nivel de contenidos.
+
+Puedes elegir qué clase de ítems modificar usando la lista &apos;Tipos de contenido&apos;. Las imágenes se consideran incluidas si selecciona Texturas.
+
+* Esta herramienta sólo puede cambiar los permisos de aquellos ítems de los que estés autorizado a cambiarlos.
+* No puedes otorgar al siguiente propietario permisos que no tengas ya.
+* Los permisos para el nuevo propietario son, en principio, una solicitud. Si alguno de los ítems no puede coger todos esos permisos solicitados, no cambiará ninguno de los permisos que tenga.
+
+Cuando estés listo para efectuar el cambio múltiple de permisos, pulsa &apos;Aplicar&apos; y espera a que se muestren los resultados.
+
+Si cierras la ventana de Cambio múltiple de permisos mientras se están cambiando, se cancelará la operación.
+	</notification>
+	<notification label="Permitir el daño" name="HelpRegionAllowDamage">
+		Si se marca la casilla, el sistema de &apos;vida&apos; afecta a todas las parcelas independientemente de lo que tenga marcado cada una.
+Si la casilla no está marcada, el propietario de cada parcela podrá decidir si activa en ella el sistema de &apos;vida&apos;.
+
+Por defecto: off
+	</notification>
+	<notification label="Nº máximo de avatares" name="HelpRegionAgentLimit">
+		Configura el número máximo de avatares que se permite en esta región.
+El funcionamiento puede variar según el número de avatares que estén presentes.
+
+Por defecto: 40
+	</notification>
+	<notification label="Plus de objetos" name="HelpRegionObjectBonus">
+		El plus de objetos es un multiplicador de los prims permitidos en cualquier parcela.
+El rango permitido es de 1 a 10. Fijándolo en &apos;1&apos;, se permiten 117 objetos en cada parcela de 512 m². Fijándolo en &apos;2&apos;, se permiten 234 (el doble), y así sucesivamente. El número máximo de objetos permitidos en una región sigue siendo de 15.000, sea cual sea el plus.
+Una vez establecido, ten en cuenta que reducir el plus de objetos puede causar que se devuelvan o borren objetos.
+
+Por defecto: 1.0
+	</notification>
+	<notification label="Calificación" name="HelpRegionMaturity">
+		Configura el nivel de calificación de la región, tal como se verá en la barra superior del visor de cualquier residente, y en los datos que mostrará el mapa del mundo cuando se pase el cursor sobre esta región. Esta configuración también afecta al acceso a esta región y a los resultados de la búsqueda. Los demás residentes sólo entrarán en las regiones o verán aquellos resultados de la búsqueda que tengan el mismo nivel de calificación que ellos han elegido en sus preferencias.
+
+Puede llevar algún tiempo que este cambio se refleje en el mapa.
+	</notification>
+	<notification label="Impedir &apos;empujar&apos;" name="HelpRegionRestrictPushObject">
+		Esta casilla controla en toda la región los permisos para que haya &apos;empujones&apos;.
+Cuando está activada, los residentes sólo pueden ser empujados por sí mismos o por el propietario de la parcela.
+(&apos;Empujar&apos; se refiere a la función llPushObject() del LSL).
+
+Por defecto: Off
+	</notification>
+	<notification label="Unir/Dividir parcelas" name="HelpParcelChanges">
+		Esta casilla determina si las parcelas que no son del propietario del estado pueden unirse o subdividirse.
+Si no se marca esta opción:
+ * Sólo los propietarios o los administradores del estado pueden unir o dividir parcelas.
+ * Sólo podrán unir o dividir las parcelas pertenecientes al propietario o a un grupo en el que tengan los poderes adecuados.
+Si se marca esta opción:
+ * Todo los propietarios de parcelas podrán unir o dividir las que posean.
+ * En parcelas propiedad de un grupo, quienes tengan los poderes adecuados podrán unirlas o dividirlas.
+
+Por defecto: Marcado
+	</notification>
+	<notification label="No mostrar en la búsqueda" name="HelpRegionSearch">
+		Marcando esta casilla bloqueará que los propietarios de parcelas puedan listarlas en la búsqueda.
+
+Por defecto: Off
+	</notification>
+	<notification label="Cambiada la calificación de la región" name="RegionMaturityChange">
+		Se ha actualizado la calificación de esta región.
+Llevará algún tiempo que el cambio se refleje en el mapa.
+	</notification>
+	<notification label="Reventa de terreno" name="HelpRegionLandResell">
+		Los propietarios y los administradores del estado pueden poner en venta cualquier terreno que posea el propietario del estado.
+Si se desmarca esta opción, los compradores no podrán revender el terreno que compren en esta región.
+Si se marca esta opción, los compradores podrán revender el terreno que compren en esta región.
+
+Por defecto: Deshabilitado
+	</notification>
+	<notification label="Desactivar los scripts" name="HelpRegionDisableScripts">
+		Cuando el rendimiento de un sim es pobre, el culpable puede ser un script. Abre Estadísticas (Ctrl-May-1). Mira Simulator Physics FPS. Si es menor de 45, abre el panel Time, en la parte inferior de las Estadísticas. Si ves que Script Time está en 25 ms o más alto, pulsa el botón Listar los scripts según su uso, y verás el nombre y la posición de los scripts que pueden estar causando el bajo rendimiento.
+
+Marcando la casilla Desactivar los scripts y pulsando el botón Aplicar, se desactivarán temporalmente en esta región todos los scripts.
+Debes hacer esto para viajar a la posición que has visto en la Lista de scripts según su uso. Cuando llegues, investiga el script para determinar si es él quien causa el problema. Deberás contactar con el propietario del script, o borrar o devolver el objeto.
+Desmarca la casilla Desactivar los scripts y pulsa Aplicar para reactivar los scripts en la región.
+
+Por defecto: off
+	</notification>
+	<notification label="Desactivar las colisiones" name="HelpRegionDisableCollisions">
+		Cuando el rendimiento de un sim es pobre, la culpa puede estar en los objetos físicos. Abre Estadísticas (Ctrl-May-1). Mira Simulator Physics FPS. Si es menor de 45, abre el panel Time, en la parte inferior de las Estadísticas. Si ves que Sim Time (Physics) está en 20 ms o más alto, pulsa el botón Listar los objetos que colisionan, y verás el nombre y la posición de los objetos que pueden estar causando el bajo rendimiento.
+
+Marcando la casilla Desactivar las colisiones y pulsando el botón Aplicar, se desactivarán temporalmente las colisiones entre objetos.
+Debes hacer esto para viajar a la localización que se ha avisado en la Lista de objetos que colisionan. Cuando llegues, investiga el objeto:
+¿está colisionando constantemente con otros objetos? Deberás contactar con el propietario del objeto, o borrarlo o devolverlo.
+Desmarca la casilla Desactivar las colisiones y pulsa Aplicar para reactivar las colisiones en la región.
+
+Por defecto: off
+	</notification>
+	<notification label="Desactivar la física" name="HelpRegionDisablePhysics">
+		Desactivar la física es parecido a Desactivar las colisiones, pero se desactivan todas las simulaciones físicas: no sólo se detiene la colisión de objetos, sino que también se provoca que los avatares no puedan moverse.
+
+Esto debería usarse sólo cuando Desactivar las colisiones no ha aportado a la región suficiente rendimiento para investigar un problema con las propiedades físicas o los objetos que colisionan.
+
+Cuando acabes, no te olvides de reactivar la física, o los avatares seguirán sin poder moverse.
+
+Por defecto: off
+	</notification>
+	<notification label="Objetos que colisionan" name="HelpRegionTopColliders">
+		Muestra una lista de aquellos objetos con más colisiones potenciales con otros objetos. Estos objetos pueden ralentizar el rendimiento.
+Selecciona Ver &gt; Estadísticas, y mira Simulator &gt; Time &gt; Sim Time (Physics) para ver si se están empleando en &apos;physics&apos; más de 20 ms.
+	</notification>
+	<notification label="Listar los scripts" name="HelpRegionTopScripts">
+		Muestra una lista de los objetos que más tiempo emplean en ejecutar scripts de LSL. Estos objetos pueden ralentizar el rendimiento.
+Selecciona Ver &gt; Estadísticas, y mira Simulator &gt; Time &gt; Script Time para ver si se están empleando más de 25 ms.
+	</notification>
+	<notification label="Reiniciar la región" name="HelpRegionRestart">
+		Reinicia los procesos del servidor en que corre esta región tras dos minutos de advertencia previa. Se desconectará a todos los residentes que estén en la región. La región guardará sus datos, y debería volver en unos 90 segundos.
+
+Reiniciar la región no solventa la mayoría de los problemas de rendimiento, y, normalmente, debe utilizarse sólo cuando se indique.
+	</notification>
+	<notification label="Nivel del agua" name="HelpRegionWaterHeight">
+		Es el nivel, en metros, del agua. Si se marca en algo distinto de 20, y tienes al lado el agua del mundo o un &apos;vacío&apos;, habrá una diferencia visible.
+
+Por defecto: 20
+	</notification>
+	<notification label="Elevación del terreno" name="HelpRegionTerrainRaise">
+		Es la distancia que, en metros, los propietarios de parcelas pueden elevar su terreno sobre la altura del terreno inicialmente creado.
+
+Por defecto: 4
+	</notification>
+	<notification label="Rebaje del terreno" name="HelpRegionTerrainLower">
+		Es la distancia que, en metros, los propietarios de parcelas pueden bajar su terreno sobre la altura del terreno inicialmente creado.
+
+Por defecto: -4
+	</notification>
+	<notification label="Subir un RAW para el terreno" name="HelpRegionUploadRaw">
+		Este botón carga un archivo .RAW en la región en que estás.
+El archivo debe tener las dimensiones correctas (RGB, 256x256) y 13 canales. La forma mejor de crear un archivo de terreno es descargar el archivo RAW existente. Un buen inicio es modificar el canal rojo -red- (altura del terreno), y subirlo.
+
+La carga puede llevar unos 45 segundos. Fíjate que subir un archivo de terreno *no* moverá los objetos que haya en el terreno, sólo el terreno mismo y los permisos asociados a las parcelas.
+Por tanto, puede que algunos objetos acaben enterrados..
+
+Para más información sobre la edición de las alturas del terreno, consulta la ayuda F1.
+	</notification>
+	<notification label="Descargar el RAW del terreno" name="HelpRegionDownloadRaw">
+		Este botón descarga un archivo de esta región con los datos de alturas, dimensiones de las parcelas, estado de las parcelas en venta, y algunos permisos de las parcelas. Al abrir el archivo en un programa como Photoshop debes especificar las dimensiones del documento: RGB, 256x256 con 13 canales.
+Este archivo de terreno no puede abrirse de otro modo.
+
+Para más información sobre la edición de las alturas del terreno, consulta la ayuda F1.
+	</notification>
+	<notification label="Usar el Sol del estado" name="HelpRegionUseEstateSun">
+		Esta casilla hace que la posición del Sol en la región sea la misma que la del resto del estado.
+
+Por defecto: on
+	</notification>
+	<notification label="Fijar el Sol" name="HelpRegionFixedSun">
+		Esta casilla fija la posición del Sol en la posición del deslizable Fase, y detiene su movimiento.
+
+Por defecto: off
+	</notification>
+	<notification label="Predeterminar este terreno" name="HelpRegionBakeTerrain">
+		Este botón salva la forma actual del terreno como nueva forma por defecto para la región. Una vez predeterminado, el terreno puede volver a esa forma cada vez que tu u otros usen la opción &apos;Revertir&apos; en Editar el terreno. El terreno predeterminado también marca el punto medio para elevar y bajar los límites.
+	</notification>
+	<notification label="Administradores del estado" name="HelpEstateEstateManager">
+		Un administrador del estado es un residente en el que delegas controles de la región y configuraciones del estado. Un administrador del estado puede cambiar algunas configuraciones de estos paneles, excepto las de subir, descargar, y predeterminar el terreno. Y, concretamente, puede autorizar o expulsar a residentes de su estado.
+
+Sólo el propietario del estado puede añadir o remover administradores, nadie más.
+Por favor, elige sólo a residentes en quienes confíes, pues tu serás el responsable último de sus acciones.
+	</notification>
+	<notification label="Usar el horario global" name="HelpEstateUseGlobalTime">
+		Esta casilla hace que, en tu estado, el Sol tenga la misma posición que en los estados propiedad de Linden, &apos;mainland&apos;.
+
+Por defecto: on
+	</notification>
+	<notification label="Fijar el Sol" name="HelpEstateFixedSun">
+		Esta casilla fija la posición del Sol en la posición del deslizable Fase, y detiene su movimiento.
+	</notification>
+	<notification label="Acceso público" name="HelpEstateExternallyVisible">
+		Esta casilla habilita que cualquier residente que esté en otro estado pueda entrar en éste sin tener que estar en una lista de acceso.
+
+Por defecto: on
+	</notification>
+	<notification label="Permitir el teleporte a cualquier punto" name="HelpEstateAllowDirectTeleport">
+		Cuando esta marcado, los residentes puede teleportarse directamente a cualquier punto de tu estado. Si se desmarca, los residentes se teleportarán al Punto de Teleporte más cercano.
+
+Por defecto: off
+	</notification>
+	<notification label="Autorizar el acceso" name="HelpEstateAllowResident">
+		El acceso a este estado se limitará a los residentes aquí enumerados y a cualquier grupo de abajo. Esta configuración sólo funciona cuando está desmarcado Acceso público.
+	</notification>
+	<notification label="Autorizar el acceso de grupo" name="HelpEstateAllowGroup">
+		El acceso a este estado se limitará a los grupos aquí enumerados y a cualquier residente de arriba. Esta configuración sólo funciona cuando está desmarcado Acceso público.
+	</notification>
+	<notification label="Dirección de correo para infracciones" name="HelpEstateAbuseEmailAddress">
+		Aportando aquí una dirección de correo válida, se hará que las Denuncias de Infracción en este estado se envíen a esa dirección.
+Si se deja en blanco, las Denuncias de Infracción se enviarán sólo a Linden Lab.
+	</notification>
+	<notification label="Denegar el acceso" name="HelpEstateBanResident">
+		A los residentes en esta lista se les niega el acceso a tu estado, independientemente de cualquier otra configuración.
+	</notification>
+	<notification label="Autorizar el chat de voz" name="HelpEstateVoiceChat">
+		Se autoriza a las parcelas del estado a tener sus propios canales de voz en los que los residentes puedan hablar y oír a otros residentes.
+
+Por defecto: off
+	</notification>
+	<notification label="Desajuste en la versión de voz" name="VoiceVersionMismatch">
+		Esta versión de [APP_NAME] no es compatible con el chat de voz de esta región. Para que el chat de voz funcione correctamente, debes actualizar la versión.
+	</notification>
+	<notification label="Contrato del estado" name="HelpEstateCovenant">
+		Definir un contrato del estado te permite vender parcelas del mismo. Si no existe un contrato, no puedes vender terreno.
+La nota para tu contrato puede estar vacía si es que no quieres aplicar reglas, avisos a los compradores, o cualquier otra cosa relacionada con el terreno antes de que sea comprado.
+
+Puedes usar un contrato para comunicar al posible comprador reglas, pautas, información cultural, o, simplemente, tus propias expectativas.
+Así, puede hablarse de parcelación, normas de las construcciones, formas de pago, u otra información que consideres que el nuevo propietario debe saber y con la que debe estar de acuerdo antes de hacer la compra.
+
+Para poder finalizar la compra, el comprador debe aceptar el contrato marcando la casilla adecuada. Los contratos de los estados son siempre visibles en la información Acerca del terreno en todas las parcelas.
+	</notification>
+	<notification label="No se pudo comprar los objetos" name="BuyObjectOneOwner">
+		No se pueden comprar a la vez objetos de propietarios diferentes.
+Por favor, selecciona sólo un objeto y vuelve a intentarlo.
+	</notification>
+	<notification label="No se pudo comprar el contenido" name="BuyContentsOneOnly">
+		No se puede comprar a la vez los contenidos de más de un objeto.
+Por favor, selecciona sólo un objeto y vuelve a intentarlo.
+	</notification>
+	<notification label="No se pudo comprar el contenido" name="BuyContentsOneOwner">
+		No se pueden comprar a la vez objetos de propietarios diferentes.
+Por favor, selecciona sólo un objeto y vuelve a intentarlo.
+	</notification>
+	<notification name="BuyOriginal">
+		¿Comprar el objeto original de [OWNER] por [CURRENCY][PRICE]?
+Tú pasarás a ser el propietario de este objeto.
+Podrás:
+ Modificarlo: [MODIFYPERM]
+ Copiarlo: [COPYPERM]
+ Revenderlo o darlo: [RESELLPERM]
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="BuyOriginalNoOwner">
+		¿Comprar el objeto original por [CURRENCY][PRICE]?
+Tú pasarás a ser el propietario de este objeto.
+Podrás:
+ Modificarlo: [MODIFYPERM]
+ Copiarlo: [COPYPERM]
+ Revenderlo o darlo: [RESELLPERM]
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="BuyCopy">
+		¿Comprar una copia de [OWNER] por [CURRENCY][PRICE]?
+El objeto se copiará a tu inventario.
+Podráa:
+ Modificarlo: [MODIFYPERM]
+ Copiarlo: [COPYPERM]
+ Revenderlo o darlo: [RESELLPERM]
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="BuyCopyNoOwner">
+		¿Comprar una copia por [CURRENCY][PRICE]?
+El objeto se copiará a tu inventario.
+Podrás:
+ Modificarlo: [MODIFYPERM]
+ Copiarlo: [COPYPERM]
+ Revenderlo o darlo: [RESELLPERM]
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="BuyContents">
+		¿Comprar los contenidos de [OWNER] por [CURRENCY][PRICE]?
+Serán copiados a tu inventario.
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="BuyContentsNoOwner">
+		¿Comprar los contenidos por [CURRENCY][PRICE]?
+Serán copiados a tu inventario.
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmPurchase">
+		Esta transacción hará que:
+[ACTION]
+
+¿Estás seguro de querer hacer esta compra?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmPurchasePassword" type="password">
+		Esta transacción hará que:
+[ACTION]
+
+¿Está seguro de querer hacer esta compra?
+Por favor, vuelve a escribir tu contraseña y pulsa OK.
+		<form name="form">
+			<input name="message" type="password"/>
+			<button name="ConfirmPurchase" text="OK"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="SetPickLocation">
+		Nota:
+Has actualizado la posición de este Destacado, pero los otros detalles permanecen con sus valores originales.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="MoveInventoryFromObject">
+		Has elegido ítems &apos;no copiables&apos; de tu inventario. Esos ítems se quitarán de tu inventario, no se copiarán.
+
+¿Mover el/los ítem/s del inventario?
+		<usetemplate ignoretext="Cuando mueva objetos &apos;no copiables&apos; del inventario" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="MoveInventoryFromScriptedObject">
+		Has elegido ítems &apos;no copiables&apos; de tu inventario. Esos ítems se moverán a tu inventario, no se copiarán.
+Dado que estos objetos tienen scripts, moverlos a tu inventario puede provocar un mal funcionamiento del script.
+
+¿Mover el/los ítem/s del inventario?
+		<usetemplate ignoretext="Cuando mueva objetos con script &apos;no copiables&apos; del inventario" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ClickActionNotPayable">
+		Atención: la acción Pagar al objeto al pulsar ha sido marcada, pero sólo funcionará si se añade un script con un evento money().
+		<form name="form">
+			<ignore name="ignore" text="Cuando configure &apos;Pagar&apos; en objetos sin el evento money()"/>
+		</form>
+	</notification>
+	<notification name="PaymentBlockedButtonMismatch">
+		Pago detenido: el precio pagado no concuerda con ninguno de los configurados en el botones de pago del objeto.
+	</notification>	
+	<notification name="OpenObjectCannotCopy">
+		En este objeto, no hay ítems que estés autorizado a copiar.
+	</notification>
+	<notification name="WebLaunchAccountHistory">
+		¿Ir al sitio web de Second Life para ver el historial de tu cuenta?
+		<usetemplate ignoretext="Cuando se cargue la página web del historial de la cuenta" name="okcancelignore" notext="Cancelar" yestext="Ir a la página"/>
+	</notification>
+	<notification name="ClickOpenF1Help">
+		¿Visitar el sitio web de Soporte de [SECOND_LIFE]?
+		<usetemplate ignoretext="Cuando visites el sitio web de Soporte de Second Life." name="okcancelignore" notext="Cancelar" yestext="Ir"/>
+	</notification>
+	<notification name="NoSupportUrl">
+		Este grid no tiene enlace para consultar por Soporte.
+	</notification>	
+	<notification name="ConfirmQuit">
+		¿Estás seguro de que quieres salir?
+		<usetemplate ignoretext="Cuando esté saliendo de Second Life." name="okcancelignore" notext="Continuar" yestext="Salir"/>
+	</notification>
+	<notification name="HelpReportAbuseEmailLL">
+		Usa esta herramienta para denunciar violaciones de las Normas de la Comunidad y las Condiciones del Servicio. Mira:
+
+http://secondlife.com/corporate/tos.php
+http://secondlife.com/corporate/cs.php
+
+Se investigan y resuelven todas las infracciones denunciadas de las Normas de la Comunidad y las Condiciones del Servicio. Puedes ver la resolución tomada en el Informe de Incidentes, en:
+
+http://secondlife.com/support/incidentreport.php
+	</notification>
+	<notification name="HelpReportAbuseEmailEO">
+		IMPORTANTE: Esta denuncia no irá a [GRID_OWNER], sino al propietario de la región en la que te encuentras actualmente.
+
+Como un servicio a los residentes y visitantes, el propietario de la región ha elegido recibir y resolver todas las denuncias que se originen en esta región. [GRID_OWNER] no investigará las denuncias que envíes desde aquí.
+
+El propietario de la región resolverá las denuncias basándose en las reglas locales de la región, tal como se detallan en el Contrato del estado.
+(Puedes ver el Contrato yendo al menú Mundo y eligiendo Acerca del terreno).
+
+La resolución de esta denuncia se aplica exclusivamente a esta región; el acceso de los residentes a otras áreas de [SECOND_LIFE_GRID] no se verá afectado por el resultado de esta denuncia. Únicamente [GRID_OWNER] puede impedir el acceso a la totalidad de [SECOND_LIFE_GRID].
+	</notification>
+	<notification name="HelpReportBug">
+		Usa esta herramienta *sólo* para informar de cuestiones técnicas que no se comportan como se describe o era esperable. Por favor, aporta todos los detalles que puedas.
+Deberás responder al correo electrónico de auto respuesta para añadir más detalles a tu informe.
+
+Todos los informes de fallos serán investigados y evaluados. No se contestará por correo electrónico.
+
+Si tienes algún problema técnico, por favor, contacta con Soporte en:
+
+http://secondlife.com/community/support.php
+
+Nota: no se investigarán los informes incompletos.
+	</notification>
+	<notification name="HelpReportAbuseSelectCategory">
+		Por favor, elige una categoría para esta denuncia de infracción.
+Seleccionar una categoría nos ayuda a clasificar y procesar las denuncias de infracciones.
+	</notification>
+	<notification name="HelpReportBugSelectCategory">
+		Por favor, elige una categoría para este fallo.
+Seleccionar una categoría nos ayuda a clasificar y procesar los informes de fallos.
+	</notification>
+	<notification name="HelpReportAbuseAbuserNameEmpty">
+		Por favor, escribe el nombre del infractor.
+Aportar el dato preciso nos ayuda a clasificar y procesar las denuncias de infracciones.
+	</notification>
+	<notification name="HelpReportAbuseAbuserLocationEmpty">
+		Por favor, escribe la localización donde tuvo lugar la infracción.
+Aportar el dato preciso nos ayuda a clasificar y procesar las denuncias de infracciones.
+	</notification>
+	<notification name="HelpReportAbuseSummaryEmpty">
+		Por favor, escribe un resumen de la infracción que ha habido.
+Aportar un resumen preciso nos ayuda a clasificar y procesar las denuncias de infracciones.
+	</notification>
+	<notification name="HelpReportBugSummaryEmpty">
+		Por favor, escribe un resumen del fallo.
+Aportar un resumen preciso nos ayuda a clasificar y procesar los informes de fallos.
+	</notification>
+	<notification name="HelpReportAbuseDetailsEmpty">
+		Por favor, escribe una descripción minuciosa de la infracción que ha habido.
+Se tan específico como puedas, incluyendo los nombres y los detalles implicados en el incidente que denuncias.
+Aportar una descripción precisa nos ayuda a clasificar y procesar las denuncias de infracciones.
+	</notification>
+	<notification name="HelpReportBugDetailsEmpty">
+		Por favor, escribe una descripción minuciosa del fallo.
+Se tan específico como puedas, incluyendo -si es posible- los pasos que permitan reproducir el fallo.
+Aportar una descripción precisa nos ayuda a clasificar y procesar los informes de fallos.
+	</notification>
+	<notification name="HelpReportAbuseContainsCopyright">
+		Estimado Residente:
+
+Parece que estás denunciando una violación de la propiedad intelectual. Por favor, asegúrate de que tu denuncia es correcta.
+
+(1) El proceso de la denuncia. Debes enviar una denuncia de infracción si crees que un Residente está violando el sistema de permisos de [SECOND_LIFE], por ejemplo, usando un CopyBot u otras herramientas parecidas para copiar, infringiendo los derechos de propiedad intelectual. El Equipo de Infracciones (Abuse Team) investiga y lleva a cabo las acciones disciplinarias apropiadas ante toda acción que viole las las Normas de la Comunidad de [SECOND_LIFE] o las Condiciones del Servicio. Sin embargo, el Equipo de Infracciones ni gestiona ni responde a las solicitudes de eliminar contenidos del mundo de Second Life.
+
+(2) El DMCA o Proceso de Eliminación de Contenido. Para solicitar que se elimine algún contenido de Second Life, DEBES enviar una notificación válida de infracción tal y como se explica en nuestra DMCA Policy en http://secondlife.com/corporate/dmca.php.
+
+Si todavía quieres seguir con el proceso de infracción, por favor, cierra esta ventana y termina de enviar tu denuncia. En concreto, debes seleccionar la categoría &apos;CopyBot o Programa para saltarse los permisos&apos;.
+
+Gracias,
+
+[GRID_OWNER]
+	</notification>
+	<notification name="FailedRequirementsCheck">
+		Han desaparecido de [FLOATER] estos componentes:
+[COMPONENTS]
+	</notification>
+	<notification label="Reemplazar el anexado actual" name="ReplaceAttachment">
+		En ese punto de tu cuerpo ya hay un objeto anexado. ¿Quieres reemplazarlo por el objeto que has elegido?
+		<form name="form">
+			<ignore name="ignore" save_option="true" text="Cuando se reemplacen anexados existentes"/>
+			<button ignore="Reemplazar automaticamente" name="Yes" text="OK"/>
+			<button ignore="Nunca reemplazar" name="No" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification label="¡Aviso! Modo Ocupado" name="BusyModePay">
+		Estás en el modo Ocupado. Por tanto, no recibirás ningún ítem a cambio de este pago.
+
+¿Quieres salir del modo Ocupado ante de completar esta transacción?
+		<form name="form">
+			<ignore name="ignore" save_option="true" text="Cuando se esté pagando a un objeto o persona en el modo Ocupado"/>
+			<button ignore="Siempre salir del modo Ocupado" name="Yes" text="OK"/>
+			<button ignore="Nunca salir del modo Ocupado" name="No" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="ConfirmDeleteProtectedCategory">
+		La carpeta &apos;[FOLDERNAME]&apos; es una carpeta de sistema. Borrar carpetas de sistema puede causar inestabilidades. ¿Estás seguro de que quieres borrarla?
+		<usetemplate ignoretext="Confirmar antes de borrar una carpeta de sistema" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>	
+	<notification name="ConfirmEmptyTrash">
+		¿Estás seguro de que quieres vaciar definitivamente el contenido de tu Papelera?
+		<usetemplate ignoretext="Cuando se vacíe la Papelera" name="okcancelignore" notext="Cancelar" yestext="OK"/>
+	</notification>
+	<notification name="ConfirmClearBrowserCache">
+		¿Estás seguro de que quieres limpiar la caché de su navegador?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sí"/>
+	</notification>
+	<notification name="ConfirmClearCookies">
+		¿Estás seguro de que quieres limpiar tus cookies?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sí"/>
+	</notification>
+	<notification name="ConfirmClearMediaUrlList">
+		¿Estás seguro de que quieres vaciar tu lista de URL guardadas?
+		<usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sí"/>
+	</notification>
+	<notification name="ConfirmEmptyLostAndFound">
+		¿Estás seguro de que quieres eliminar permanentemente el contenido de tu carpeta Objetos Perdidos?
+		<usetemplate ignoretext="Cuando se vacíe la carpeta del inventario Objetos Perdidos" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="CopySLURL">
+		Se ha copiado a tu portapapeles la siguiente SLurl:
+ [SLURL]
+
+Publícala en una página web para que otros puedan acceder fácilmente a esta posición, o pruébala tu mismo pegándola en la barra de direcciones de tu navegador.
+		<form name="form">
+			<ignore name="ignore" text="Cuando se copie una SLurl al portapapeles"/>
+		</form>
+	</notification>
+	<notification name="GraphicsPreferencesHelp">
+		Este panel controla el tamaño de la ventana, la resolución y la calidad de los gráficos del cliente. La interfaz Preferencias &gt; Gráficos te permite escoger entre cuatro niveles gráficos: Bajo, Medio, Alto, y Ultra. También puedes personalizar tus configuraciones gráficas marcando la casilla Personalizar y adaptando estas configuraciones:
+
+Sombras: activa o desactiva varios tipos de sombras.
+
+Detalles de Reflejos: determina qué tipo de objetos reflejará el agua.
+
+Renderización del avatar: muestra opciones que afectan a cómo renderiza el cliente los avatares.
+
+Distancia de dibujo: afecta a cuán lejos de tu punto de vista se renderizarán los objetos en la escena.
+
+Núm. máx. de partículas: define el número máximo de partículas que podrás ver a la vez en tu pantalla.
+
+Calidad del Post Procesado: define la resolución con que se renderiza el brillo.
+
+Detalle de la malla: define la cantidad de detalles o número de triángulos usados para renderizar algunos objetos. Cuanto más alto sea el valor, más detalle, pero más tiempo para renderizar.
+
+Detalles de la iluminación: determina que tipo de luces quieres que se rendericen.
+
+Nivel de detalle del terreno: marca con cuánto detalle quieres ver la textura del terreno.
+	</notification>
+	<notification name="WLSavePresetAlert">
+		¿Quieres sobrescribir la preselección guardada?
+		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="WLDeletePresetAlert">
+		¿Quieres borrar [SKY]?
+		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="WLNoEditDefault">
+		No puedes editar ni borrar una preselección por defecto.
+	</notification>
+	<notification name="WLMissingSky">
+		Este archivo del ciclo de un día se refiere a un archivo perdido de cielo: [SKY].
+	</notification>
+	<notification name="PPSaveEffectAlert">
+		Ya existe un efecto de postprocesado. ¿Deseas sobreescribirlo?
+		<usetemplate name="okcancelbuttons" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="HelpEditSky">
+		Edita los deslizables del WindLight para crear y guardar configuraciones del cielo.
+	</notification>
+	<notification name="HelpEditDayCycle">
+		Define cómo se verán los cielos a lo largo del día.
+	</notification>
+	<notification name="EnvSettingsHelpButton">
+		Estas configuraciones ajustan la forma en que ves el medio ambiente localmente, en tu computador. Tu tarjeta gráfica debe admitir Sombras de la atmósfera (&apos;atmospheric shaders&apos;) para poder acceder a esta configuración.
+
+Ajusta el deslizable &apos;Duración de un día&apos; para cambiar localmente, en tu visor, las etapas del día.
+
+Ajuste el deslizable &apos;Nubosidad&apos; para controlar cuántas nubes cubren el cielo.
+
+Pulsa un color en el selector de &apos;Color del agua&apos; para cambiar el color de la misma.
+
+Ajusta el deslizable &apos;Claridad del agua&apos; para controlar el nivel de claridad del agua bajo la superficie.
+
+Pulsa &apos;Usar el horario del estado&apos; para devolver los valores del día al tiempo actual de la región y seguir a partir de él.
+
+Pulsa &apos;Cielo avanzado&apos; para abrir un editor con configuraciones avanzadas para el cielo.
+
+Pulsa &apos;Agua avanzada&apos; para abrir un editor con configuraciones avanzadas para el agua.
+	</notification>
+	<notification name="HelpDayCycle">
+		El Editor del ciclo del día te permite controlar el cielo de [SECOND_LIFE] durante el ciclo día/noche. Este es el ciclo que usa el deslizable Duración de un día del Editor del entorno.
+
+El Editor del ciclo del día trabaja configurando fotogramas clave (&apos;keyframes&apos;): nodos (representados por los puntos grises en la línea del tiempo) cada uno de los cuales tiene asociado un Cielo definido. Según progresa la Duración de un día, el WindLight realiza la &apos;animación&apos; del cielo interpolándose entre esos fotogramas clave.
+
+La flecha amarilla sobre la línea del tiempo representa lo que ves actualmente, basándose en la Duración de un día. Púlsala y muévela para ver cómo cambia la animación del día. Puedes añadir o borrar fotogramas clave pulsando los botones Añadir un punto o Quitar un punto, situados a la derecha de la línea del tiempo.
+
+Puedes establecer la posición en el tiempo de cualquier fotograma clave moviéndolo a lo largo de la línea del tiempo, o configurando manualmente su valor en el recuadro Configuración del fotograma clave. También en ese recuadro podrás asociar el fotograma clave a un modelo predefinido de WindLight.
+
+La Duración del ciclo establece la duración total de un &apos;día&apos;. Marcar un valor bajo (por ejemplo, 2 min.) hará que las 24 horas de tu línea del tiempo se animen ¡en sólo dos minutos reales! Una vez que estés satisfecho con tu ciclo de la línea del tiempo y los fotogramas clave, utiliza los botones Probar y Parar para obtener una vista previa de los resultados. Recuerda que también puedes mover la flecha amarilla de encima de la línea del tiempo para ver el ciclo de la animación. El botón Usar el horario del estado sincronizará su ciclo de duración de un día con el ciclo del estado.
+
+Cuando todo esté a tu gusto, puedes guardar esos datos y cargarlos luego usando los botones Guardar este tipo de día y Cargar un tipo de día. Nota que, por el momento, sólo podemos permitir un ciclo de un día.
+	</notification>
+	<notification name="HelpBlueHorizon">
+		Usa los deslizables Rojo/Verde/Azul (RVA) para ajustar el color del cielo. Puedes usar el deslizable de Intensidad (I) para moverlos al unísono.
+	</notification>
+	<notification name="HelpHazeHorizon">
+		La Cantidad de bruma es uno de los parámetros más útiles para ajustar el nivel de luz de la escena. Es eficaz para simular muchos ajustes de la exposición, como la claridad en un ambiente nublado o de nevisca, o las tonalidades del una flor Iris aún cerrada.
+	</notification>
+	<notification name="HelpBlueDensity">
+		La Saturación afecta a la densidad global de la saturación de color del cielo y la niebla. Si mueves el deslizable Intensidad (I) a la derecha, los colores serán más vivos y brillantes. Si lo mueves a la izquierda, se irán decolorando hasta llegar incluso al blanco y negro. Si deseas ajustar el balance de color del cielo, puedes controlar la saturación de cada elemento usando el deslizable Rojo/Verde/Azul (RVA).
+	</notification>
+	<notification name="HelpHazeDensity">
+		La Densidad de la bruma controla lo sombrío de la atmósfera, su neblina. Es eficaz para simular escenas con mucho humo o contaminantes, y también para simular niebla y llovizna.
+	</notification>
+	<notification name="HelpDensityMult">
+		La Densidad puede usarse para definir globalmente la &apos;pesadez&apos; de la atmósfera. Los ajustes bajos dan sensación de un &apos;aire limpio&apos;, y los altos de pesadez, de esmog.
+	</notification>
+	<notification name="HelpDistanceMult">
+		Ajusta a qué distancia se percibe el WindLight. El valor cero desactiva la influencia del WindLight en el terreno y los objetos. Los valores superiores a 1 simulan mayores distancias a las que afectan los efectos atmosféricos
+	</notification>
+	<notification name="HelpMaxAltitude">
+		La Altitud máxima ajusta hasta que altura el WindLight realiza sus cálculos para computar la iluminación atmosférica. En las últimas horas del día, es útil para ajustar la &apos;profundidad&apos; a la que aparece el Sol.
+	</notification>
+	<notification name="HelpSunlightColor">
+		Ajusta en la escena la intensidad y el color de las luces directas.
+	</notification>
+	<notification name="HelpSunAmbient">
+		Ajusta en la escena la intensidad y el color de la luz ambiental.
+	</notification>
+	<notification name="HelpSunGlow">
+		El deslizable Tamaño controla el tamaño del Sol.
+El deslizable Visión controla cómo se ve de borroso el Sol en el cielo.
+	</notification>
+	<notification name="HelpSceneGamma">
+		Ajusta la distribución de luz y oscuridad en la pantalla.
+	</notification>
+	<notification name="HelpStarBrightness">
+		Ajusta el brillo de las estrellas en el cielo.
+	</notification>
+	<notification name="HelpTimeOfDay">
+		Controla la posición del Sol en el cielo. Es parecido a la elevación.
+	</notification>
+	<notification name="HelpEastAngle">
+		Controla la posición del Sol en el cielo. Es parecido al acimut.
+	</notification>
+	<notification name="HelpCloudColor">
+		Edita el color de las nubes. En general, es recomendable mantenerlas blanquecinas.
+Pero, vaya, diviértete si quieres.
+	</notification>
+	<notification name="HelpCloudDetail">
+		Controla el detalle de las capas superiores de la imagen en la imagen principal de las nubes. X e Y controlan su posición. D (Densidad) controla la densidad o la fracturación con que aparecen las nubes.
+	</notification>
+	<notification name="HelpCloudDensity">
+		Te permite controlar la posición de las nubes con los deslizables X e Y, y su densidad con el deslizable D.
+	</notification>
+	<notification name="HelpCloudCoverage">
+		Controla cuánto cubren el cielo las nubes.
+	</notification>
+	<notification name="HelpCloudScale">
+		Controla el tamaño de la imagen de las nubes en la bóveda celeste.
+	</notification>
+	<notification name="HelpCloudScrollX">
+		Controla la velocidad de las nubes al moverse en la dirección del eje X.
+	</notification>
+	<notification name="HelpCloudScrollY">
+		Controla la velocidad de las nubes al moverse en la dirección del eje Y.
+	</notification>
+	<notification name="HelpClassicClouds">
+		Marca esta casilla para activar la aparición de las antiguas nubes clásicas junto a las nubes del WindLight.
+	</notification>
+	<notification name="HelpWaterFogColor">
+		Elige el color del agua bajo la superficie.
+	</notification>
+	<notification name="HelpWaterFogDensity">
+		Controla la densidad de la claridad del agua, y a qué distancia puede verse bajo ella.
+	</notification>
+	<notification name="HelpUnderWaterFogMod">
+		Modifica el efecto de Transparencia para controlar cuán lejos tu avatar puede ver bajo el agua.
+	</notification>
+	<notification name="HelpWaterGlow">
+		Controla la cantidad de brillo de la superficie del agua.
+	</notification>
+	<notification name="HelpWaterNormalScale">
+		Controla el tamaño de las tres ondulaciones que componen el agua.
+	</notification>
+	<notification name="HelpWaterFresnelScale">
+		Controla cuánta luz se refleja desde diferentes ángulos.
+	</notification>
+	<notification name="HelpWaterFresnelOffset">
+		Controla cuánta intensidad de luz se refleja.
+	</notification>
+	<notification name="HelpWaterScaleAbove">
+		Controla la cantidad de luz refractada mirando la superficie del agua desde arriba.
+	</notification>
+	<notification name="HelpWaterScaleBelow">
+		Controla la cantidad de luz refractada mirando la superficie del agua desde debajo.
+	</notification>
+	<notification name="HelpWaterBlurMultiplier">
+		Controla cómo se mezclan las ondas y los reflejos.
+	</notification>
+	<notification name="HelpWaterNormalMap">
+		Controla cuál es la capa de &apos;vista normal&apos; del agua, para determinar las reflexiones/refracciones.
+	</notification>
+	<notification name="HelpWaterWave1">
+		Controla hacia adónde y a qué velocidad se mueve en los ejes X e Y la versión en tamaño grande de la &apos;vista normal&apos;.
+	</notification>
+	<notification name="HelpWaterWave2">
+		Controla hacia adónde y a qué velocidad se mueve en los ejes X e Y la versión en tamaño pequeño de la &apos;vista normal&apos;.
+	</notification>
+	<notification name="NewSkyPreset">
+		Dame un nombre para el cielo nuevo.
+		<form name="form">
+			<input name="message" type="text">
+				Preselección nueva
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="ExistsSkyPresetAlert">
+		¡Esa preselección ya existe!
+	</notification>
+	<notification name="NewDaycyclePreset">
+		Define un nombre para el nuevo Ciclo del Día.
+		<form name="form">
+			<input name="message" type="text">
+				Nuevo Día
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="ExistsDaycylePresetAlert">
+		¡Esa preselección ya existe!
+	</notification>	
+	<notification name="NewWaterPreset">
+		Dame un nombre para la nueva preselección de agua.
+		<form name="form">
+			<input name="message" type="text">
+				Preselección nueva
+			</input>
+			<button name="OK" text="OK"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="ExistsWaterPresetAlert">
+		¡Esa preselección ya existe!
+	</notification>
+	<notification name="WaterNoEditDefault">
+		No puedes editar o borrar una preselección por defecto.
+	</notification>
+	<notification name="ChatterBoxSessionStartError">
+		No se puede empezar una nueva sesión de chat con [RECIPIENT].
+[REASON]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="ChatterBoxSessionEventError">
+		[EVENT]
+[REASON]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="ForceCloseChatterBoxSession">
+		Debe cerrarse tu sesión de chat con [NAME].
+[REASON]
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="Cannot_Purchase_an_Attachment">
+		No se pueden comprar los ítems que aún forman parte de un objeto anexado.
+	</notification>
+	<notification label="Acerca de las solicitudes de autorización de débito" name="DebitPermissionDetails">
+		Al admitir esta petición, le das permiso a un script para que transfiera dinero del mundo ([CURRENCY]) de tu cuenta. Para revocar este permiso, el propietario del objeto debe eliminarlo o reiniciar ese script del objeto.
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification name="AutoWearNewClothing">
+		¿Quieres vestirse automáticamente el ítem de ropa nueva que has creado?
+		<usetemplate ignoretext="Al vestirme automáticamente la ropa nueva" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="NotAgeVerified">
+		Para acceder a esta parcela, se debe haber verificado tu edad.
+¿Quieres visitar la web de [SECOND_LIFE] para verificar tu edad?
+
+[_URL]
+		<url name="url" option="0">
+			https://secondlife.com/account/verification.php?lang=es
+		</url>
+		<usetemplate ignoretext="Advertir de la falta de la verificación de edad" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="Cannot enter parcel: no payment info on file">
+		Antes de que puedas acceder a esta parcela, se requiere que tengas archivada tu información de pago.
+¿Quieres visitar la web de Second Life para actualizar esto?
+
+[_URL]
+		<url name="url" option="0">
+			https://secondlife.com/account/index.php?lang=es
+		</url>
+		<usetemplate ignoretext="Advertir de la falta de información de pago" name="okcancelignore" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="MissingString">
+		La cadena [STRING_NAME] Ha desaparecido de strings.xml
+	</notification>
+	<notification name="GridsNoNick">
+		No se puede guardar la información del nuevo grid.
+Debes especificar un nombre único de grid.
+	</notification>
+	<notification name="GridsNoLoginUri">
+		No se puede guardar el nuevo grid '[NAME]'.
+Debes especificar un URI de inicio de sesión.
+	</notification>
+	<notification name="GridExists">
+		No se puede guardar el nuevo grid '[NAME]'.
+Ya existe un grid con el mismo nombre.
+	</notification>
+	<notification name="GridInfoNoLoginUri">
+		Se requiere un URI de inicio de sesión para recuperar la información del grid.
+	</notification>
+	<notification name="GridInfoError">
+		No se puede recuperar la información del grid desde el servidor.
+	</notification>
+	<notification name="HelpRenderCompat">
+		Las construcciones con huecos extendidos o tamaños de agujeros extendidos no se renderizarán adecuadamente en otros visores. Por favor, mantén esta opción marcada si quieres que tus construcciones se vean adecuadamente in otros visores.
+	</notification>
+	<notification name="ExportFailed">
+		Permisos incorrectos para el objeto exportado. Se aborta el proceso de exportado.
+	</notification>
+	<notification name="ExportPartial">
+		Objeto exportado. Algunas texturas pueden no haber sido guardadas debido a: : [REASON]
+	</notification>
+	<notification name="ExportSuccessful">
+		Exportado satisfactorio.
+	</notification>
+	<notification name="SystemMessageTip">
+		[MESSAGE]
+	</notification>
+	<notification name="Cancelled">
+		Cancelado
+	</notification>
+	<notification name="CancelledSit">
+		Cancelado el sentarse
+	</notification>
+	<notification name="CancelledAttach">
+		Cancelado el anexar
+	</notification>
+	<notification name="ReplacedMissingWearable">
+		Reemplazadas las ropas o partes del cuerpo perdidas con sus equivalentes por defecto.
+	</notification>
+	<notification name="GroupNotice">
+		Asunto: [SUBJECT], Mensaje: [MESSAGE]
+	</notification>
+	<notification name="FriendOnline">
+		[NAME] está conectado
+	</notification>
+	<notification name="FriendOffline">
+		[NAME] no está conectado
+	</notification>
+	<notification name="AddSelfFriend">
+		No se puedes añadirte a ti mismo como.
+	</notification>
+	<notification name="UploadingAuctionSnapshot">
+		Subiendo fotos al mundo y al sitio web...
+(tardará unos 5 minutos).
+	</notification>
+	<notification name="UploadPayment">
+		Has pagado [CURRENCY][AMOUNT] por la subida.
+	</notification>
+	<notification name="UploadWebSnapshotDone">
+		Completada la subida de la foto al sitio web.
+	</notification>
+	<notification name="UploadSnapshotDone">
+		Completada la subida de la foto al mundo.
+	</notification>
+	<notification name="TerrainDownloaded">
+		Se ha descargado Terrain.raw
+	</notification>
+	<notification name="GestureMissing">
+		El gesto [NAME] ha desaparecido de la base de datos.
+	</notification>
+	<notification name="UnableToLoadGesture">
+		No se ha podido cargar el gesto [NAME].
+Por favor, vuelve a intentarlo.
+	</notification>
+	<notification name="LandmarkMissing">
+		El hito ha desaparecido de la base de datos.
+	</notification>
+	<notification name="UnableToLoadLandmark">
+		No se ha podido cargar el hito. Por favor, vuelve a intentarlo.
+	</notification>
+	<notification name="CapsKeyOn">
+		Tienes pulsada la tecla de bloqueo de mayúsculas, lo que influirá en cómo escribas la contraseña.
+Quizá quieras soltar esa tecla.
+	</notification>
+	<notification name="NotecardMissing">
+		La nota ha desaparecido de la base de datos.
+	</notification>
+	<notification name="NotecardNoPermissions">
+		No tienes permisos suficientes para ver la nota.
+	</notification>
+	<notification name="RezItemNoPermissions">
+		No tienes permisos suficientes para rezear el objeto.
+	</notification>
+	<notification name="UnableToLoadNotecard">
+		No se puede cargar la nota.
+Por favor, vuelve a intentarlo.		
+	</notification>
+	<notification name="ScriptMissing">
+		El script ha desaparecido de la base de datos.
+	</notification>
+	<notification name="ScriptNoPermissions">
+		Nos tiene permisos suficientes para ver el script.
+	</notification>
+	<notification name="UnableToLoadScript">
+		No se ha podido cargar el script. Por favor, vuelva a intentarlo.
+	</notification>
+	<notification name="IncompleteInventory">
+		Los contenidos que estás ofreciendo aún no están disponibles. Por favor, vuelve a ofrecerlos en un minuto.
+	</notification>
+	<notification name="IncompleteInventoryItem">
+		Los ítems que estás accediendo aún no están disponibles. Por favor, vuelve a intentarlo en un minuto.
+  </notification>	
+	<notification name="CannotModifyProtectedCategories">
+		No puedes modificar categorías que están protegidas.
+	</notification>
+	<notification name="CannotRemoveProtectedCategories">
+		No puedes quitar categorías que están protegidas.
+	</notification>
+	<notification name="OfferedCard">
+		Has ofrecido una tarjeta de visita a [FIRST] [LAST]
+	</notification>
+	<notification name="UnableToBuyWhileDownloading">
+		No se puede comprar un objeto mientras se descargan sus datos.
+Por favor, vuelve a intentarlo.
+	</notification>
+	<notification name="UnableToLinkWhileDownloading">
+		No se puede enlazar un objeto mientras se descargan sus datos.
+Por favor, vuelve a intentarlo.
+	</notification>
+	<notification name="CannotBuyObjectsFromDifferentOwners">
+		No puede comprar a la vez objetos de diferentes propietarios.
+Por favor, elige sólo uno.
+	</notification>
+	<notification name="ObjectNotForSale">
+		El objeto no aparece como puesto a la venta.
+	</notification>
+	<notification name="EnteringGodMode">
+		Entrando en el modo administrativo, nivel [LEVEL]
+	</notification>
+	<notification name="LeavingGodMode">
+		Saliendo del modo administrativo, nivel [LEVEL]
+	</notification>
+	<notification name="CopyFailed">
+		No se ha hecho la copia porque no tienes permiso para hacerla
+	</notification>
+	<notification name="InventoryAccepted">
+		[NAME] ha aceptado tu oferta del inventario.
+	</notification>
+	<notification name="InventoryDeclined">
+		[NAME] ha rehusado tu oferta del inventario.
+	</notification>
+	<notification name="ObjectMessage">
+		[NAME]: [MESSAGE]
+	</notification>
+	<notification name="CallingCardAccepted">
+		Se ha aceptado tu tarjeta de visita.
+	</notification>
+	<notification name="CallingCardDeclined">
+		Se ha rehusado tu tarjeta de visita.
+	</notification>
+	<notification name="TeleportToLandmark">
+		Ahora que ha llegado al Continente (mainland), puedes teleportarte a localizaciones como &apos;[NAME]&apos; pulsando el botón Inventario de la esquina inferior derecha de tu pantalla, y, después, seleccionando la carpeta Hitos.
+Pulsa dos veces en el hito y, luego, pulsa en Teleportar para viajar hasta allí.
+	</notification>
+	<notification name="TeleportToPerson">
+		Ahora que ha llegado al Continente (mainland), puedes contactar con residentes como &apos;[NAME]&apos; pulsando el botón Inventario de la esquina inferior derecha de tu pantalla, y, después, seleccionando la carpeta Tarjetas de visita.
+Pulsa dos veces en la tarjeta, pulsa en Mensaje Instantáneo, y escribe un mensaje.
+	</notification>
+	<notification name="CantSelectLandFromMultipleRegions">
+		No puedes seleccionar un terreno que cruce las fronteras entre servidores.
+Inténtalo seleccionando un trozo más pequeño de terreno.
+	</notification>
+	<notification name="SearchWordBanned">
+		Se han excluido algunos términos de tu búsqueda debido a restricciones en el contenido, según se especifica en las Normas de la Comunidad.
+	</notification>
+	<notification name="NoContentToSearch">
+		Por favor, elige al menos un tipo de contenido a buscar (&apos;PG&apos;, &apos;Mature&apos;, o &apos;Adulto&apos;).
+	</notification>
+	<notification name="GroupVote">
+		[NAME] ha propuesto votar:
+[MESSAGE]
+		<form name="form">
+			<button name="VoteNow" text="Votar ahora"/>
+			<button name="Later" text="Más tarde"/>
+		</form>
+	</notification>
+	<notification name="SystemMessage">
+		[MESSAGE]
+	</notification>
+	<notification name="EventNotification">
+		Notificación de un evento:
+
+[NAME]
+[DATE]
+		<form name="form">
+			<button name="Teleport" text="Teleportar"/>
+			<button name="Description" text="Descripción"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="TransferObjectsHighlighted">
+		En estos momentos, están realzados todos los objetos de esta parcela que serán transferidos al comprador de la misma.
+
+* No están realzados los árboles y hierbas que se transferirán.
+		<form name="form">
+			<button name="Done" text="Hecho"/>
+		</form>
+	</notification>
+	<notification name="DeactivatedGesturesTrigger">
+		Desactivados los gestos que tienen el mismo disparador:
+[NAMES]
+	</notification>
+	<notification name="NoQuickTime">
+		No se ve como instalado en tu sistema el software QuickTime de Apple.
+Si quieres ver por streaming elementos multimedia en las parcelas que los tengan, debes ir al sitio web de QuickTime (http://www.apple.com/quicktime) e instalar el QuickTime Player.
+	</notification>
+	<notification name="NoPlugin">
+		No se encontrado un plugin de Media que pueda manejar el tipo mime  "[MIME_TYPE]".  El contenido Media de este tipo no estará disponible.
+	</notification>
+	<notification name="MediaPluginFailed">
+		Ha fallado el siguiente Plugin de Media:
+    [PLUGIN]
+
+Por favor, reinstala el plugin o contacta a su desarrollador si continuas experimentando problemas.
+		<form name="form">
+			<ignore name="ignore" text="Cuando el Plugin de Media falle"/>
+		</form>
+	</notification>
+	<notification name="OwnedObjectsReturned">
+		Se han devuelto a tu inventario los objetos de los que eras propietario en la parcela seleccionada.
+	</notification>
+	<notification name="OtherObjectsReturned">
+		Se han devuelto a tu inventario los objetos de los que eras propietario en la parcela propiedad de [NAME] .
+	</notification>
+	<notification name="OtherObjectsReturned2">
+		Se han devuelto a su propietario los objetos que, en la parcela seleccionada, eran propiedad del residente &apos;[NAME]&apos;.
+	</notification>
+	<notification name="GroupObjectsReturned">
+		Se han devuelto a los inventarios de sus propietarios los objetos que estaban compartidos con el grupo [GROUPNAME] en la parcela seleccionada.
+Los objetos transferibles que se transfirieron al grupo se han devuelto a sus propietarios anteriores.
+Los objetos no transferibles que se transfirieron al grupo han sido borrados.
+	</notification>
+	<notification name="UnOwnedObjectsReturned">
+		Se han devuelto a sus propietarios los objetos de los que tú NO eras propietario en la parcela seleccionada.
+	</notification>
+	<notification name="NotSafe">
+		Este es un terreno con el daño autorizado (&apos;No Seguro&apos;).
+Aquí puedes ser herido. Si mueres, serás teleportado a tu Base.
+	</notification>
+	<notification name="NoFly">
+		En este terreno no se permite volar (&apos;No Volar&apos;).
+Aquí no puedes volar, si no tienes activada la opción "Siempre Volar en las preferencias del sistema.
+	</notification>
+	<notification name="PushRestricted">
+		Este terreno es &apos;Sin empujones&apos;.
+No puedes empujar a otros a menos que seas el propietario del terreno.
+	</notification>
+	<notification name="NoVoice">
+		Este terreno tiene desactivada la voz.
+	</notification>
+	<notification name="NoBuild">
+		Este terreno tiene desactivado el construir (&apos;No Construir&apos;).
+Aquí no puedes crear objetos.
+	</notification>
+	<notification name="SeeAvatars">
+		<unique/>    
+			Esta parcela oculta a los avatares y el texto del chat a las otras parcelas. No puedes ver a otros residentes fuera de esta parcela, y ellos no podrán verte a ti. El chat de texto en el canal 0 también es bloqueado.
+	</notification>	
+	<notification name="ScriptsStopped">
+		Un administrador ha detenido temporalmente los scripts en esta región.
+	</notification>
+	<notification name="ScriptsNotRunning">
+		En esta región no se está ejecutando ningún script.
+	</notification>
+	<notification name="NoOutsideScripts">
+		Esta región tiene desactivados los scripts de otros (&apos;Sin Scripts de Otros&apos;).
+No se ejecutará ningún script que no pertenezca al propietario del terreno.
+	</notification>
+	<notification name="ClaimPublicLand">
+		Sólo puedes reclamar terreno público en la Región en que tú estás.
+	</notification>
+	<notification name="RegionTPAccessBlocked">
+		No estás autorizado en esa región por tu nivel de calificación. Debes validar tu edad y/o instalar el último visor.
+
+Por favor, ve a la Base de Conocimientos para más detalles sobre el acceso a zonas con este nivel de calificación.
+	</notification>
+	<notification name="URBannedFromRegion">
+		Se te ha prohibido el acceso a la región.
+	</notification>
+	<notification name="NoTeenGridAccess">
+		Tu cuenta no puede conectarse a esta región del grid teen.
+	</notification>
+	<notification name="NoHelpIslandTP">
+		No puedes teleportarse de vuelta a la Isla de Ayuda (&apos;Help Island&apos;).
+Ve a la &apos;Isla Pública de Ayuda&apos; (&apos;Help Island Public&apos;) para repetir el tutorial.
+	</notification>
+	<notification name="ImproperPaymentStatus">
+		No tienes el estado de pago adecuado para entrar a esta región.
+	</notification>
+	<notification name="MustGetAgeRegion">
+		Debes haber verificado tu edad para entrar a esta región.
+	</notification>
+	<notification name="MustGetAgeParcel">
+		Debes haber verificado tu edad para entrar a esta parcela.
+	</notification>
+	<notification name="NoDestRegion">
+		No se ha encontrada la región de destino.
+	</notification>
+	<notification name="NotAllowedInDest">
+		No estás autorizado en el destino.
+	</notification>
+	<notification name="RegionParcelBan">
+		No puedes cruzar la región por una parcela con el acceso prohibido. Intenta otro camino.
+	</notification>
+	<notification name="TelehubRedirect">
+		Has sido redirigido a un punto de teleporte.
+	</notification>
+	<notification name="CouldntTPCloser">
+		No te puedes teleportar a un destino tan cercano.
+	</notification>
+	<notification name="TPCancelled">
+		Teleporte cancelado.
+	</notification>
+	<notification name="FullRegionTryAgain">
+		En estos momentos, está llena la región a la que intentas entrar.
+Por favor, reinténtalo en unos momentos.
+	</notification>
+	<notification name="GeneralFailure">
+		Fallo general.
+	</notification>
+	<notification name="RoutedWrongRegion">
+		Mal dirigido a la región. Por favor, reinténtalo.
+	</notification>
+	<notification name="NoValidAgentID">
+		ID de agente inválido.
+	</notification>
+	<notification name="NoValidSession">
+		ID de sesión inválido.
+	</notification>
+	<notification name="NoValidCircuit">
+		Código de Circuito inválido.
+	</notification>
+	<notification name="NoValidTimestamp">
+		Fecha inválida.
+	</notification>
+	<notification name="NoPendingConnection">
+		No se puede crear la conexión.
+	</notification>
+	<notification name="InternalUsherError">
+		Se ha producido un error interno al intentar conectar con el agente de transporte.
+	</notification>
+	<notification name="NoGoodTPDestination">
+		No se puede encontrar en esta región un buen destino para el teleporte.
+	</notification>
+	<notification name="InternalErrorRegionResolver">
+		Ha sucedido un error interno al intentar activar el resolver de la región.
+	</notification>
+	<notification name="NoValidLanding">
+		No se ha podido encontrar un punto de aterrizaje válido.
+	</notification>
+	<notification name="NoValidParcel">
+		No se ha podido encontrar una parcela válida.
+	</notification>
+	<notification name="ObjectGiveItem">
+		Un objeto llamado [OBJECTFROMNAME], propiedad de [NAME] , te ha dado un/a [OBJECTTYPE] de nombre [OBJECTNAME].
+		<form name="form">
+			<button name="Keep" text="Guardar"/>
+			<button name="Discard" text="Descartar"/>
+			<button name="Mute" text="Ignorar"/>
+		</form>
+	</notification>
+	<notification name="ObjectGiveItemUnknownUser">
+		Un objeto llamado [OBJECTFROMNAME], propiedad de (un usuario desconocido), te ha dado un/a [OBJECTTYPE] de nombre [OBJECTNAME].
+		<form name="form">
+			<button name="Keep" text="Guardar"/>
+			<button name="Discard" text="Descartar"/>
+			<button name="Mute" text="Ignorar"/>
+		</form>
+	</notification>
+	<notification name="UserGiveItem">
+		[NAME] te ha dado un/a [OBJECTTYPE] de nombre &apos;[OBJECTNAME]&apos;.
+		<form name="form">
+			<button name="Keep" text="Guardar"/>
+			<button name="Discard" text="Descartar"/>
+			<button name="Mute" text="Ignorar"/>
+		</form>
+	</notification>
+	<notification name="GodMessage">
+		[NAME]
+		
+[MESSAGE]
+	</notification>
+	<notification name="JoinGroup">
+		[MESSAGE]
+		<form name="form">
+			<button name="Join" text="Entrar"/>
+			<button name="Decline" text="Rehusar"/>
+			<button name="Info" text="Información"/>
+		</form>
+	</notification>
+	<notification name="TeleportOffered">
+		[NAME] te ha ofrecido teleportarte hasta su posición:
+
+[MESSAGE]
+		<form name="form">
+			<button name="Teleport" text="Teleportar"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="GotoURL">
+		[MESSAGE]
+[URL]
+		<form name="form">
+			<button name="Later" text="Más tarde"/>
+			<button name="GoNow..." text="Ir ahora..."/>
+		</form>
+	</notification>
+	<notification name="OfferFriendship">
+		[NAME] te está ofreciendo amistad.
+
+[MESSAGE]
+
+(Por defecto, podrás ver si están conectados los demás).
+		<form name="form">
+			<button name="Accept" text="Aceptar"/>
+			<button name="Decline" text="Rehusar"/>
+		</form>
+	</notification>
+	<notification name="OfferFriendshipNoMessage">
+		[NAME] te está ofreciendo amistad.
+
+(Por defecto, podrás ver si están conectados los demás).
+		<form name="form">
+			<button name="Accept" text="Aceptar"/>
+			<button name="Decline" text="Rehusar"/>
+		</form>
+	</notification>
+	<notification name="FriendshipAccepted">
+		[NAME] ha aceptado tu oferta de amistad.
+	</notification>
+	<notification name="FriendshipDeclined">
+		[NAME] ha rehusado tu oferta de amistad.
+	</notification>
+	<notification name="OfferCallingCard">
+		[FIRST] [LAST] te está ofreciendo su tarjeta de visita.
+Esto añadirá un ítem a tu inventario para que puedas enviar rápidamente a este residente un MI.
+		<form name="form">
+			<button name="Accept" text="Aceptar"/>
+			<button name="Decline" text="Rehusar"/>
+		</form>
+	</notification>
+	<notification name="RegionRestartMinutes">
+		La región se reiniciará en [MINUTES] minutos.
+Si permaneces en esta región, serás desconectado.
+	</notification>
+	<notification name="RegionRestartSeconds">
+		La región se reiniciará en [SECONDS] segundos.
+Si permaneces en esta región, serás desconectado.
+	</notification>
+	<notification name="LoadWebPage">
+		¿Cargar la página web [URL]?
+
+[MESSAGE]
+
+Del objeto: [OBJECTNAME]; propiedad de: [NAME]?
+		<form name="form">
+			<button name="Gotopage" text="Cargar"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="FailedToFindWearableUnnamed">
+		Búsqueda fallida de [TYPE] en la base de datos.
+	</notification>
+	<notification name="FailedToFindWearable">
+		Búsqueda fallida de [TYPE] de nombre [DESC] en la base de datos.
+	</notification>
+	<notification name="InvalidWearable">
+		El ítem que intentas llevar usa una característica que tu visor no puede leer. Por favor, considera actualizar tu versión de [APP_NAME].
+	</notification>
+	<notification name="ScriptQuestion">
+		&apos;[OBJECTNAME]&apos;, un objeto propiedad de &apos;[NAME]&apos;, querría:
+
+[QUESTIONS]
+¿Estás de acuerdo?
+		<form name="form">
+			<button name="Yes" text="Sí"/>
+			<button name="No" text="No"/>
+			<button name="Mute" text="Ignorar"/>
+		</form>
+	</notification>
+	<notification name="ScriptQuestionCaution">
+		&apos;[OBJECTNAME]&apos;, un objeto propiedad de &apos;[NAME]&apos;, querría:
+
+[QUESTIONS]
+Si no confías en este objeto y su creador, debes denegar la solicitud. Para más información, pulsa el botón Detalles.
+
+¿Autorizar esta petición?
+		<form name="form">
+			<button name="Grant" text="Autorizar"/>
+			<button name="Deny" text="Denegar"/>
+			<button name="Details" text="Detalles..."/>
+		</form>
+	</notification>
+	<notification name="ScriptDialog">
+		&apos;[TITLE]&apos; de [NAME]
+[MESSAGE]
+		<form name="form">
+			<button name="Ignore" text="Ignorar"/>
+		</form>
+	</notification>
+	<notification name="ScriptDialogGroup">
+		&apos;[TITLE]&apos; de [GROUPNAME]
+[MESSAGE]
+		<form name="form">
+			<button name="Ignore" text="Ignorar"/>
+		</form>
+	</notification>
+	<notification name="ScriptTextBoxDialog">
+		&apos;[TITLE]&apos; de [NAME]
+[MESSAGE]
+		<form name="form">
+			<input name="message">
+			</input>
+			<button name="Ignore" text="Ignorar"/>
+			<button name="Send" text="Enviar"/>
+		</form>
+	</notification>	
+	<notification name="FirstBalanceIncrease">
+		Has recibido [CURRENCY][AMOUNT].
+Pueden darte [CURRENCY] tanto objetos como otros usuarios.
+Tu balance se muestra en la esquina superior derecha de la pantalla.
+	</notification>
+	<notification name="FirstBalanceDecrease">
+		Has pagado [CURRENCY][AMOUNT].
+Tu balance se muestra en la esquina superior derecha de la pantalla.
+	</notification>
+	<notification name="FirstSit">
+		Estás sentado.
+Usa las teclas del cursor (o AWSD) para cambiar el punto de vista.
+Pulsa el botón &apos;Levantarse&apos; para ponerte de pie.
+	</notification>
+	<notification name="FirstMap">
+		Pulsa el mapa y arrástralo para desplazarlo.
+Púlsalo dos veces para teleportarte.
+Usa los controles de la derecha para encontrar sitios y mostrar diferentes fondos.
+	</notification>
+	<notification name="FirstBuild">
+		Puedes construir objetos nuevos en algunas zonas de [SECOND_LIFE].
+Usa las herramientas de arriba a la izquierda para construir, y prueba a cambiar rápidamente entre ellas pulsando Ctrl o Alt.
+Pulsa Esc para dejar de construir.
+	</notification>
+	<notification name="FirstLeftClickNoHit">
+		En algunos objetos concretos, al pulsarlos con el botón izquierdo del ratón interaccionas con ellos.
+Si el puntero del ratón pasa a ser una mano puedes interactuar con el objeto.
+El botón derecho del ratón siempre muestra un menú con acciones que puedes realizar.
+	</notification>
+	<notification name="FirstTeleport">
+		Esta región no permite teleportarse de un punto a otro, por lo que has sido llevado al Punto de Teleporte más cercano.
+Tu destinado está señalado con una columna de luz roja.
+Sigue la flecha roja hasta llegar a la columna, o pulsa la flecha para hacerla desaparecer.
+	</notification>
+	<notification name="FirstOverrideKeys">
+		A partir de ahora, tus teclas de movimiento las gestiona un objeto.
+Prueba las teclas del cursor o AWSD para ver qué hacen.
+Algunos objetos (las pistolas, por ejemplo) te pedirán que, para usarlos, entres en vista subjetiva. Pulsa &apos;M&apos; para hacerlo.
+	</notification>
+	<notification name="FirstAppearance">
+		Estás modificando tu apariencia.
+Usa las teclas del cursor para girar el punto de vista y hacer zoom.
+Cuando acabes, pulse &apos;Guardar todo&apos; para salvar tu apariencia y salir de la modificación.
+Puedes modificar tu apariencia tantas veces como quieras.
+	</notification>
+	<notification name="FirstInventory">
+		Este es tu inventario. Tienes objetos, notas, ropas, y otras cosas de tu propiedad.
+* Para vestirte un objeto o un vestuario completo, arrástralo hasta tu avatar.
+* Para colocar un objeto en el mundo, arrástralo hasta el suelo.
+* Para leer una nota, pulsa dos veces en ella.
+	</notification>
+	<notification name="FirstSandbox">
+		Esta es una región &apos;sandbox&apos; (zona de pruebas).
+Los objetos que construyas aquí pueden ser eliminados cuando salgas de esta zona, pues los sandbox se limpian regularmente. Por favor, ten en cuenta la información que hay arriba de tu pantalla junto al nombre de la región.
+
+Las regiones sandbox no son frecuentes, y están señalizadas.
+	</notification>
+	<notification name="FirstFlexible">
+		Este objeto es flexible.
+Los objetos flexibles no pueden ser materiales, y serán inmateriales hasta que se desmarque la casilla de flexibles.
+	</notification>
+	<notification name="FirstDebugMenus">
+		Has activado el menú Avanzado.
+Contiene herramientas útiles para los desarrolladores que trabajan mejorando [APP_NAME].
+Para pasar este menú a una ventana, pulsa Ctrl-Alt-D (o Ctrl-Alt-Mayús-D). En un Mac, pulsa Cmd-Opt-Shift-D.
+	</notification>
+	<notification name="FirstSculptedPrim">
+		Estás editando un prim &apos;sculpted&apos;.
+Los prim sculpted requieren una textura especial para tomar forma.
+Puedes encontrar ejemplos de texturas sculpted en la biblioteca del inventario.
+	</notification>
+	<notification name="FirstMedia">
+		Has empezado a reproducir media. Puedes hacer que los media se reproduzcan automáticamente en la pestaña Audio y Vídeo de la ventana de preferencias. Nota que tal cosa puede suponer un riesgo de seguridad en los sitios multimedia en los que no confíes.
+	</notification>
+	<notification name="FirstRLVDetach">
+		Uno de los anexados se hizo No Desmontable con Restrained Life.
+Ten en cuenta que esto también deshabilita la opción &apos;Vestir&apos; en todos los prims anexados en tu inventario, a menos que estén debidamente nombrados.
+
+Para mayor información busca &apos;Restrained Life&apos; en el wiki de SL.
+	</notification>
+	<notification name="FirstRLVFartouch">
+		Se te ha restingido el tocar objetos lejanos: no serás capaz de tocar objetos más lejos de 1.5 metros de distancia de tu avatar hasta que la restricción sea levantada.
+
+Sugerencia: si un objeto está fuera de rango el cursor del ratón cambiará cuando pase sobre el y escucharás un sonido de error si intentas hacer clic en él.
+	</notification>
+	<notification name="FirstRLVGiveToRLV">
+		Las carpetas que comienzan con &apos;# RLV / ~&apos; se pueden colocar automáticamente dentro de la carpeta compartida #RLV después de aceptar la oferta de inventario.
+
+Por favor, ten en cuenta que - si está activado - los artículos de inventario aceptados inmediatamente estarán disponible para los scritps y tendrán pleno uso de la API de RLV, lo que puede provocar situaciones inesperadas o no deseadas.
+
+¿Quieres habilitar esta característica?
+		<usetemplate name="okcancelbuttonscanceldefault" notext="No" yestext="Sí"/>
+	</notification>
+	<notification name="MaxListSelectMessage">
+		Puedes seleccionar un máximo de [MAX_SELECT] ítems de esta lista.
+	</notification>
+	<notification name="VoiceInviteP2P">
+		[NAME] te está invitando a un chat de voz.
+Pulsa Aceptar para tomar la llamada o Rehusar para declinar la invitación. Pulsa Ignorar para ignorar a quien llama.
+		<form name="form">
+			<button name="Accept" text="Aceptar"/>
+			<button name="Decline" text="Rehusar"/>
+			<button name="Mute" text="Ignorar"/>
+		</form>
+	</notification>
+	<notification name="AutoUnmuteByIM">
+		[NAME], a quien has enviado un mensaje instantáneo, ha dejado automáticamente de estar ignorado.
+	</notification>
+	<notification name="AutoUnmuteByMoney">
+		[NAME], a quien has dado dinero, ha dejado automáticamente de estar ignorado.
+	</notification>
+	<notification name="AutoUnmuteByInventory">
+		[NAME], a quien has ofrecido algo del inventario, ha dejado automáticamente de estar ignorado.
+	</notification>
+	<notification name="VoiceInviteGroup">
+		[NAME] se ha unido al chat de voz con el grupo [GROUP].
+Pulsa Aceptar para tomar la llamada o Rehusar para declinar la invitación. Pulsa Ignorar para ignorar a quien llama.
+		<form name="form">
+			<button name="Accept" text="Aceptar"/>
+			<button name="Decline" text="Rehusar"/>
+			<button name="Mute" text="Ignorar"/>
+		</form>
+	</notification>
+	<notification name="VoiceInviteAdHoc">
+		[NAME] ha empezado un chat de voz en multiconferencia.
+Pulsa Aceptar para tomar la llamada o Rehusar para declinar la invitación. Pulsa Ignorar para ignorar a este usuario.
+		<form name="form">
+			<button name="Accept" text="Aceptar"/>
+			<button name="Decline" text="Rehusar"/>
+			<button name="Mute" text="Ignorar"/>
+		</form>
+	</notification>
+	<notification name="InviteAdHoc">
+		[NAME] te está invitando a un chat en conferencia.
+Pulsa Aceptar para entrar al chat o Rehusar para declinar la invitación. Pulsa Ignorar para ignorar a este usuario.
+		<form name="form">
+			<button name="Accept" text="Aceptar"/>
+			<button name="Decline" text="Rehusar"/>
+			<button name="Mute" text="Ignorar"/>
+		</form>
+	</notification>
+	<notification name="VoiceChannelFull">
+		El chat de voz al que estás intentando entrar, [VOICE_CHANNEL_NAME], ha llegado a su capacidad máxima. Por favor, inténtalo más tarde.
+	</notification>
+	<notification name="ProximalVoiceChannelFull">
+		Lo sentimos. Este área ha llegado a su capacidad máxima de conversaciones por voz. Por favor, intenta usar la voz en otra zona.
+	</notification>
+	<notification name="VoiceChannelDisconnected">
+		Has sido desconectado del [VOICE_CHANNEL_NAME]. Vas a ser reconectado al chat de voz del mundo.
+	</notification>
+	<notification name="VoiceChannelDisconnectedP2P">
+		[VOICE_CHANNEL_NAME] ha colgado la llamada. Vas a ser reconectado al chat de voz del mundo.
+	</notification>
+	<notification name="P2PCallDeclined">
+		[VOICE_CHANNEL_NAME] ha rehusado tu llamada. Vas a ser reconectado al chat de voz del mundo.
+	</notification>
+	<notification name="P2PCallNoAnswer">
+		[VOICE_CHANNEL_NAME] no está disponible para tomar tu llamada. Vas a ser reconectado al chat de voz del mundo.
+	</notification>
+	<notification name="VoiceChannelJoinFailed">
+		Fallo al conectar al [VOICE_CHANNEL_NAME]; por favor, inténtalo más tarde. Vas a ser reconectado al chat de voz del mundo.
+	</notification>
+	<notification name="VoiceLoginRetry">
+		Estamos creando un canal de voz para ti. Esto puede tardar hasta un minuto.
+	</notification>
+	<notification name="Cannot enter parcel: not a group member">
+		No puedes entrar en esta parcela, no eres miembro del grupo adecuado.
+	</notification>
+	<notification name="Cannot enter parcel: banned">
+		No puedes entrar en esta parcela, se te ha prohibido el acceso.
+	</notification>
+	<notification name="Cannot enter parcel: not on access list">
+		No puedes entrar en esta parcela, no estás en la lista de acceso.
+	</notification>
+	<notification name="VoiceNotAllowed">
+		No tienes permiso para conectarte al chat de voz de [VOICE_CHANNEL_NAME].
+	</notification>
+	<notification name="VoiceCallGenericError">
+		Ha ocurrido un error intentando conectarte al [VOICE_CHANNEL_NAME]. Por favor, inténtalo más tarde.
+	</notification>
+	<notification name="ServerVersionChanged">
+		La región en la que has entrado está utilizando una versión diferente de simulador:
+Actual simulador: [NEWVERSION]
+Anterior simulador: [OLDVERSION]
+		<unique>
+		  <context key="OLDVERSION"/>
+		  <context key="NEWVERSION"/>
+		</unique>
+	</notification>
+	<notification name="UnableToOpenCommandURL">
+		No puede abrirse desde este navegador la URL que has pulsado.
+	</notification>
+	<notification name="RegionCapabilityRequestError">
+		No se pueden obtener las capacidades &apos;[CAPABILITY]&apos; de la región.
+	</notification>
+	<notification name="AvatarRezNotification">
+		( [EXISTENCE] segundos vivo )
+Avatar '[NAME]' dejó de ser nube después de [TIME] segundos.
+	</notification>
+	<notification name="AvatarRezSelfBakedDoneNotification">
+		( [EXISTENCE] segundos vivo )
+Has terminado de cargar tu vestuario después de [TIME] segundos.
+	</notification>
+	<notification name="AvatarRezSelfBakedUpdateNotification">
+		( [EXISTENCE] segundos vivo )
+Has enviado una actualización de tu apariencia después de [TIME] segundos.
+[STATUS]
+	</notification>
+	<notification name="AvatarRezCloudNotification">
+		( [EXISTENCE] segundos vivo )
+Avatar '[NAME]' se convirtió en nube.
+	</notification>
+	<notification name="AvatarRezArrivedNotification">
+		( [EXISTENCE] segundos vivo )
+Avatar '[NAME]' ha aparecido.
+	</notification>
+	<notification name="AvatarRezLeftCloudNotification">
+		( [EXISTENCE] segundos vivo )
+Avatar '[NAME]' se fué después de [TIME] segundos siendo nube.
+	</notification>
+	<notification name="AvatarRezEnteredAppearanceNotification">
+		( [EXISTENCE] segundos vivo )
+Avatar '[NAME]' ha entrado en edición de Apariencia.
+	</notification>
+	<notification name="AvatarRezLeftAppearanceNotification">
+		( [EXISTENCE] segundos vivo )
+Avatar '[NAME]' ha abandona la edición de Apariencia.
+	</notification>
+	<notification name="AvatarRezLeftNotification">
+		( [EXISTENCE] segundos vivo )
+Avatar '[NAME]' se fué habiéndose cargado completamente.
+	</notification>
+	<notification name="AvatarRezSelfBakedTextureUploadNotification">
+		( [EXISTENCE] segundos vivo )
+Has subido uan textura base (baked) de [RESOLUTION] para '[BODYREGION]' después de [TIME] segundos.
+	</notification>
+	<notification name="AvatarRezSelfBakedTextureUpdateNotification">
+		( [EXISTENCE] segundos vivo )
+Has actualizado en forma local una textura base (baked) [RESOLUTION] para '[BODYREGION]' después de [TIME] segundos.
+  </notification>
+	<global name="UnsupportedCPU">
+		- La velocidad de tu CPU no cumple los requerimientos mínimos.
+	</global>
+	<global name="UnsupportedGLRequirements">
+		Parece que no tienes los requerimientos de hardware apropiados para [APP_NAME]. El visor requiere una tarjeta gráfica OpenGL que admita texturas múltiples (&apos;multitexture support&apos;). Si este es el caso, comprueba que tienes los últimos controladores para tu tarjeta gráfica, así como los últimos parches y &apos;service packs&apos; para tu sistema operativo.
+
+Si los problemas persisten, por favor, acude a: http://www.secondlife.com/support
+	</global>
+	<global name="UnsupportedCPUSSE2">
+		Parece que no tienes los requerimientos de hardware apropiados para [APP_NAME]. El visor requiere un CPU que soporte el set de instrucciones SSE2
+	</global>
+	<global name="UnsupportedCPUSSE">
+		Parece que no tienes los requerimientos de hardware apropiados para [APP_NAME]. El visor requiere un CPU que soporte el set de instrucciones SSE
+	</global>	
+	<global name="UnsupportedCPUAmount">
+		796
+	</global>
+	<global name="UnsupportedRAMAmount">
+		510
+	</global>
+	<global name="UnsupportedGPU">
+		- Tu tarjeta gráfica no cumple los requerimientos mínimos.
+	</global>
+	<global name="UnsupportedRAM">
+		- La memoria de tu sistema no cumple los requerimientos mínimos.
+	</global>
+	<global name="PermYes">
+		Sí
+	</global>
+	<global name="PermNo">
+		No
+	</global>
+	<notification name="SetDisplayNameSuccess">
+		¡Hola [DISPLAY_NAME]!
+
+		Tal como en la vida real, le toma a todos un tiempo aprender un nuevo nombre. Por favor, espera varios días para que se refleje [http://wiki.secondlife.com/wiki/Setting_your_display_name your name to update] en objetos, scripts, búsqueda, etc.
+	</notification>
+	<notification name="SetDisplayNameBlocked">
+		Lo sentimos, pero no puedes cambiar tu Nombre a Mostrar. Si crees que esto es un error, por favor, contacta con el soporte.
+	</notification>
+	<notification name="SetDisplayNameFailedLength">
+		Lo sentimos, ese nombre es demasiado largo. Los Nombres a Mostrar deben tener un máximo de [LENGTH] caracteres.
+
+		Por favor, intenta con un nombre más corto.
+	</notification>
+	<notification name="SetDisplayNameFailedGeneric">
+		Lo sentimos, no podemos configurar tu Nombre a Mostrar. Por favor, intenta nuevamente más tarde.
+	</notification>
+	<notification name="SetDisplayNameMismatch">
+		Los Nombre a Mostrar que has ingresado no concuerdan. Por favor, ingrésalos de nuevo.
+	</notification>
+	<!-- *NOTE: This should never happen -->
+	<notification name="AgentDisplayNameUpdateThresholdExceeded">
+		Lo sentimos, has esperado demasiado tiempo para cambiar tu Nombre a Mostrar.
+
+Consulta http://wiki.secondlife.com/wiki/Setting_your_display_name
+
+Por favor, inténtalo nuevamente más tarde.
+	</notification>
+	<notification name="AgentDisplayNameSetBlocked">
+		Lo sentimos, no podemos configurar el nombre solicitado debido a que contiene una palabra prohibida.
+
+Por favor, intenta con un nombre diferente.
+	</notification>
+	<notification name="AgentDisplayNameSetInvalidUnicode">
+		El Nombre a Mostrar que deseas definir contiene caracteres inválidos.
+	</notification>
+	<notification name="AgentDisplayNameSetOnlyPunctuation">
+		Tu Nombre a Mostrar debe contener letras y no signos de puntuación.
+	</notification>
+	<notification name="DisplayNameUpdate">
+		[OLD_NAME] ([SLID]) es ahora conocido como [NEW_NAME].
+	</notification>
+	<notification name="FirstAO">
+		Para instrucciones, crea una nueva plantilla en el AO. Usa la barra de herramientas para activar/desactivar el AO.
+	</notification>
+	<notification name="BlockedCards">
+		Se ha bloqueado la Tarjeta de Visita de [NAME] ([SOURCE])
+	</notification>
+	<notification name="BlockedDialogs">
+		Se han bloqueado todos los diálogos de los objetos de [NAME]. (Origen: [SOURCE])
+	</notification>
+	<notification name="BlockedGeneralAvatar">
+		Spam bloqueado proveniente del avatar [NAME] ([SOURCE])
+	</notification>
+	<notification name="BlockedGeneralObjects">
+		Spam bloqueado proveniente de objetos propiedad de [OWNER] ([SOURCE])
+	</notification>
+	<notification name="BlockedChatterAvatar">
+	  Se ha bloqueado spam de chat del avatar [NAME] ([SOURCE])
+	</notification>
+	<notification name="BlockedChatterObjects">
+		Se ha bloqueado spam de chat de los objetos propiedad de [OWNER] ([SOURCE])
+	</notification>
+	<notification name="FirstPhysicsWearable">
+		Al vestirse una capa Física se activan ciertos comportamientos en el servidor incompatibles con algunos visores antiguos. En dichos visores te podrán ver incorrectamente (a menudo como 'Ruth').
+
+Si quieres mantener compatibilidad con visores antiguos, no deberías vestirte Capas Físicas durante la sesión. Si actualmente tienes una vestida en esta sesión, quítatela y reconéctate.
+
+Pulsa 'Vestir' para anexarte una Capa Física, o Pulsa 'Cancelar' si quieres mantener compatibilidad con visores antiguos.
+		<unique/>
+		<form name="form">
+			<button name="Wear" text="Vestir"/>
+			<button name="Cancel" text="Cancelar"/>
+		</form>
+	</notification>
+	<notification name="SGIncompleteAppearance">
+		Enviando apariencia incompleta. Puedes aparecer como nube para los demás.
+
+Tu cuerpo, piel, pelo u ojos podrían ser los predeterminados
+		<usetemplate name="okbutton" yestext="OK"/>
+	</notification>
+	<notification label="Reiniciar Configuraciones" name="ResetSettingsComplete">
+		Las configuraciones han sido reiniciadas a sus valores por defecto. Deberás reiniciar sesión para asegurarte que tenga efecto completo.
+	</notification>
+	<notification label="Reiniciar Configuraciones" name="ResetSystemSettingsPrompt">
+		Reiniciar todas las configuraciones a sus valores por defecto puede ayudar si estás experimentando problemas; sin embargo, deberás cambiar nuevamente aquellas configuraciones que hayas personalizado..
+
+¿Quieres reiniciar las configuraciones del sistema?
+		<form>
+			<button name="all" text="OK"/>
+			<button name="cancel"  text="Cancelar"/>
+		</form>
+	</notification>
+	<notification label="Reiniciar todas las Configuraciones" name="ResetAllSettingsPrompt">
+		Reiniciar todas las configuraciones a sus valores por defecto puede ayudar si estás experimentando problemas; sin embargo, deberás cambiar nuevamente aquellas configuraciones que hayas personalizado..
+
+    ¿Qué configuraciones quieres reiniciar?
+		<form> 
+			<button name="all" text="TODAS"/>
+			<button name="system" text="Sistema"/>
+			<button name="user" text="Usuario"/>
+			<button name="cancel" text="Cancelar"/>
+		</form>
+	</notification>	
+</notifications>
diff --git a/indra/newview/skins/default/xui/es/panel_audio_device.xml b/indra/newview/skins/default/xui/es/panel_audio_device.xml
index f65c29710..854e26b1f 100644
--- a/indra/newview/skins/default/xui/es/panel_audio_device.xml
+++ b/indra/newview/skins/default/xui/es/panel_audio_device.xml
@@ -7,7 +7,7 @@
 		Dispostitivo de Entrada (micrófono):
 	</text>
 	<text name="Output device (speakers):">
-		Dospositiv o de Salida (parlantes):
+		Dispositivo de Salida (parlantes):
 	</text>
 	<text name="Input level:">
 		Nivel de Entrada
diff --git a/indra/newview/skins/default/xui/es/panel_classified.xml b/indra/newview/skins/default/xui/es/panel_classified.xml
index bafc3938c..3d4f852b2 100644
--- a/indra/newview/skins/default/xui/es/panel_classified.xml
+++ b/indra/newview/skins/default/xui/es/panel_classified.xml
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Classified" title="Clasificados">
-	  <line_editor name="given_name_editor" tool_tip="El nombre debe comenzar con una letra o número, sin signos de puntación" />
-	  <line_editor name="location_editor"  tool_tip="Fija la ubicación para este clasificado en tu actual posición."/>
-	  <button label="Fijar" name="set_location_btn"/>
-	  <button label="Teleportar" name="classified_teleport_btn"/>
-	  <button label="Mostrar en el Mapa" name="classified_map_btn"/>
-	  <button label="Perfil" name="classified_profile_btn"/>
-	  <combo_box name="classified_mature_check">
-			 <combo_item name="select_mature" value="Select">
-					- Seleccionar Calificación -
-			 </combo_item>
-			 <combo_item name="mature" value="Mature">
-					Contenido Mature
-			 </combo_item>
-			 <combo_item name="pg" value="PG">
-					Contenido PG
-			 </combo_item>
-	  </combo_box>
-	  <combo_box label="" name="classified_category_combo"/>
-	  <button label="Actualizar" name="classified_update_btn"/>
-	  <string name="ad_placed_paid">
-			 Aviso Colocado: [DATE], Pagado [CURRENCY][AMT] Por listado.
-	  </string>
-	  <string name="update_txt">
-			 Actualziar
-	  </string>
-	  <string name="publish_txt">
-			 Publicado...
-	  </string>
+	<line_editor name="given_name_editor" tool_tip="El nombre debe comenzar con una letra o número, sin signos de puntación" />
+	<line_editor name="location_editor"  tool_tip="Fija la ubicación para este clasificado en tu actual posición."/>
+	<button label="Fijar" name="set_location_btn"/>
+	<button label="Teleportar" name="classified_teleport_btn"/>
+	<button label="Mostrar en el Mapa" name="classified_map_btn"/>
+	<button label="Perfil" name="classified_profile_btn"/>
+	<combo_box name="classified_mature_check">
+		<combo_item name="select_mature" value="Select">
+			- Seleccionar Calificación -
+		</combo_item>
+		<combo_item name="mature" value="Mature">
+			Contenido Mature
+		</combo_item>
+		<combo_item name="pg" value="PG">
+			Contenido PG
+		</combo_item>
+	</combo_box>
+	<combo_box label="" name="classified_category_combo"/>
+	<button label="Actualizar" name="classified_update_btn"/>
+	<string name="ad_placed_paid">
+		Aviso Colocado: [DATE], Pagado [CURRENCY][AMT] Por listado.
+	</string>
+	<string name="update_txt">
+		Actualziar
+	</string>
+	<string name="publish_txt">
+		Publicado...
+	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_event.xml b/indra/newview/skins/default/xui/es/panel_event.xml
index c0e24574b..100ff7896 100644
--- a/indra/newview/skins/default/xui/es/panel_event.xml
+++ b/indra/newview/skins/default/xui/es/panel_event.xml
@@ -1,70 +1,70 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Event" title="Eventos">
-	  <text name="event_name_label">
-			 Nombre:
-	  </text>
-	  <text name="event_name">
-			 (ninguno)
-	  </text>
-	  <text name="event_category_label">
-			 Tipo:
-	  </text>
-	  <text name="event_category">
-			 (ninguno)
-	  </text>
-	  <text name="event_mature_label">
-			 Contenido Mature:
-	  </text>
-	  <text name="event_mature_yes">
-			 Si
-	  </text>
-	  <text name="event_mature_no">
-			 No
-	  </text>
-	  <text name="event_date_label">
-			 Fecha:
-	  </text>
-	  <text name="event_date">
-			 (ninguna)
-	  </text>
-	  <text name="event_duration_label">
-			 Duración del Evento:
-	  </text>
-	  <text name="event_duration">
-			 (ninguna)
-	  </text>
-	  <text name="event_runby_label">
-			 Auspiciado por:
-	  </text>
-	  <text name="event_runby">
-			 (nadie)
-	  </text>
-	  <text name="event_location_label">
-			 Ubicación:
-	  </text>
-	  <text name="event_location">
-			 (ninguna)
-	  </text>
-	  <text name="event_cover_label">
-			 Cuota de participación:
-	  </text>
-	  <text name="event_cover">
-			 (ninguna)
-	  </text>
-	  <text name="event_desc_label">
-			 Descripción:
-	  </text>
-	  <button label="Teleportar" name="teleport_btn"/>
-	  <button label="Mostrar en el Mapa" name="map_btn"/>
-	  <button label="Notificar" name="notify_btn"/>
-	  <button label="Crear Evento..." name="create_event_btn"/>
-	  <string name="none">
-			 ninguna
-	  </string>
-	  <string name="notify">
-			 Notificar
-	  </string>
-	  <string name="dont_notify">
-			 No notificar
-	  </string>
+	<text name="event_name_label">
+		Nombre:
+	</text>
+	<text name="event_name">
+		(ninguno)
+	</text>
+	<text name="event_category_label">
+		Tipo:
+	</text>
+	<text name="event_category">
+		(ninguno)
+	</text>
+	<text name="event_mature_label">
+		Contenido Mature:
+	</text>
+	<text name="event_mature_yes">
+		Si
+	</text>
+	<text name="event_mature_no">
+		No
+	</text>
+	<text name="event_date_label">
+		Fecha:
+	</text>
+	<text name="event_date">
+		(ninguna)
+	</text>
+	<text name="event_duration_label">
+		Duración del Evento:
+	</text>
+	<text name="event_duration">
+		(ninguna)
+	</text>
+	<text name="event_runby_label">
+		Auspiciado por:
+	</text>
+	<text name="event_runby">
+		(nadie)
+	</text>
+	<text name="event_location_label">
+		Ubicación:
+	</text>
+	<text name="event_location">
+		(ninguna)
+	</text>
+	<text name="event_cover_label">
+		Cuota de participación:
+	</text>
+	<text name="event_cover">
+		(ninguna)
+	</text>
+	<text name="event_desc_label">
+		Descripción:
+	</text>
+	<button label="Teleportar" name="teleport_btn"/>
+	<button label="Mostrar en el Mapa" name="map_btn"/>
+	<button label="Notificar" name="notify_btn"/>
+	<button label="Crear Evento..." name="create_event_btn"/>
+	<string name="none">
+		ninguna
+	</string>
+	<string name="notify">
+		Notificar
+	</string>
+	<string name="dont_notify">
+		No notificar
+	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_friends.xml b/indra/newview/skins/default/xui/es/panel_friends.xml
index 12b5f03b0..3164086db 100644
--- a/indra/newview/skins/default/xui/es/panel_friends.xml
+++ b/indra/newview/skins/default/xui/es/panel_friends.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="friends">
-	  <string name="Multiple">
-			 Varios Amigos...
-	  </string>
-	  <scroll_list name="friend_list" tool_tip="Para seleccionar a varios amigos, manten pulsado Ctrl o Mays. mientras les vas pulsando">
-			 <column tool_tip="Estado En Línea"/>
-			 <column label="Nombre" name="friend_name" tool_tip="Nombre"/>
-			 <column name="icon_visible_online" tool_tip="Tu amigo puede ver cuándo estás conectado"/>
-			 <column name="icon_visible_map" tool_tip="Tu amigo puede localizarte en el mapa"/>
-			 <column name="icon_edit_mine" tool_tip="Tu amigo puede editar, borrar o tomar tus objetos"/>
-			 <column name="icon_visible_online_theirs" tool_tip="Puedes ver cuando tus amigos están conectados (Actualizable al inicio de sesión)"/>
-			 <column name="icon_visible_map_theirs" tool_tip="Puedes localizarlos en el mapa"/>
-			 <column name="icon_edit_theirs" tool_tip="Puedes editar los objetos de este amigo"/>
-			 <column name="friend_last_update_generation"/>
-	  </scroll_list>
-	  <search_editor name="buddy_search_lineedit" label="Buscar Contactos" tool_tip="Nombre del amigo que estás buscando"/>
-	  <button label="0" name="expand_collapse_btn" tool_tip="Ampliar/Contraer información extra"/>
-	  <button label="MI/Llamada" name="im_btn" tool_tip="Abrir sesión de Mensajes Instantáneos"/>
-	  <button label="Perfil" name="profile_btn" tool_tip="Mostrar foto, grupos e información adicional"/>
-	  <button label="Teleportar..." name="offer_teleport_btn" tool_tip="Ofrecer Teleporte a tu ubicación a este amigo" />
-	  <button label="Pagar..." name="pay_btn" tool_tip="Dar dinero ([CURRENCY]) a este amigo"/>
-	  <button label="Quitar..." name="remove_btn" tool_tip="Quitar a este residente de tu lista de amigos"/>
-	  <button label="Agregar..." name="add_btn" tool_tip="Ofrecer amistad a este residente"/>
-	  <text name="friends">
-			 En Línea:
-	  </text>
-	  <text name="f_num">
-			 0000
-	  </text>
-	  <text name="sel">
-			 Seleccionados:
-	  </text>
-	  <text name="s_num">
-			 0000
-	  </text>		 
+	<string name="Multiple">
+		Varios Amigos...
+	</string>
+	<scroll_list name="friend_list" tool_tip="Para seleccionar a varios amigos, manten pulsado Ctrl o Mays. mientras les vas pulsando">
+		<column tool_tip="Estado En Línea"/>
+		<column label="Nombre" name="friend_name" tool_tip="Nombre"/>
+		<column name="icon_visible_online" tool_tip="Tu amigo puede ver cuándo estás conectado"/>
+		<column name="icon_visible_map" tool_tip="Tu amigo puede localizarte en el mapa"/>
+		<column name="icon_edit_mine" tool_tip="Tu amigo puede editar, borrar o tomar tus objetos"/>
+		<column name="icon_visible_online_theirs" tool_tip="Puedes ver cuando tus amigos están conectados (Actualizable al inicio de sesión)"/>
+		<column name="icon_visible_map_theirs" tool_tip="Puedes localizarlos en el mapa"/>
+		<column name="icon_edit_theirs" tool_tip="Puedes editar los objetos de este amigo"/>
+		<column name="friend_last_update_generation"/>
+	</scroll_list>
+	<search_editor name="buddy_search_lineedit" label="Buscar Contactos" tool_tip="Nombre del amigo que estás buscando"/>
+	<button label="0" name="expand_collapse_btn" tool_tip="Ampliar/Contraer información extra"/>
+	<button label="MI/Llamada" name="im_btn" tool_tip="Abrir sesión de Mensajes Instantáneos"/>
+	<button label="Perfil" name="profile_btn" tool_tip="Mostrar foto, grupos e información adicional"/>
+	<button label="Teleportar..." name="offer_teleport_btn" tool_tip="Ofrecer Teleporte a tu ubicación a este amigo" />
+	<button label="Pagar..." name="pay_btn" tool_tip="Dar dinero ([CURRENCY]) a este amigo"/>
+	<button label="Quitar..." name="remove_btn" tool_tip="Quitar a este residente de tu lista de amigos"/>
+	<button label="Agregar..." name="add_btn" tool_tip="Ofrecer amistad a este residente"/>
+	<text name="friends">
+		Conectado:
+	</text>
+	<text name="f_num">
+		0000
+	</text>
+	<text name="sel">
+		Seleccionados:
+	</text>
+	<text name="s_num">
+		0000
+	</text>		 
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group.xml b/indra/newview/skins/default/xui/es/panel_group.xml
index 48fbc8d36..0b8c2fae3 100644
--- a/indra/newview/skins/default/xui/es/panel_group.xml
+++ b/indra/newview/skins/default/xui/es/panel_group.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="GroupInfo" title="Información del Grupo">
-	  <string name="default_needs_apply_text">
-			 Hay cambios sin aplicar en esta pestaña.
-	  </string>
-	  <string name="want_apply_text">
-			 ¿Deseas aplicar estos cambios?
-	  </string>
-	  <tab_container name="group_tab_container">
-			 <panel name="general_tab" />
-			 <panel name="roles_tab" />
-			 <panel name="notices_tab" />
-			 <panel name="voting_tab" />
-			 <panel name="land_money_tab" />
-	  </tab_container>
-	  <button label="Aplicar" label_selected="Aplicar" name="btn_apply"/>
-	  <button label="Cancelar" label_selected="Cancelar" name="btn_cancel"/>
-	  <button label="OK" label_selected="OK" name="btn_ok"/>
-	  <button label="Actualizar" label_selected="Actualizar" name="btn_refresh"/>
+	<string name="default_needs_apply_text">
+		Hay cambios sin aplicar en esta pestaña.
+	</string>
+	<string name="want_apply_text">
+		¿Deseas aplicar estos cambios?
+	</string>
+	<tab_container name="group_tab_container">
+		<panel name="general_tab" />
+		<panel name="roles_tab" />
+		<panel name="notices_tab" />
+		<panel name="voting_tab" />
+		<panel name="land_money_tab" />
+	</tab_container>
+	<button label="Aplicar" label_selected="Aplicar" name="btn_apply"/>
+	<button label="Cancelar" label_selected="Cancelar" name="btn_cancel"/>
+	<button label="OK" label_selected="OK" name="btn_ok"/>
+	<button label="Actualizar" label_selected="Actualizar" name="btn_refresh"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_finder.xml b/indra/newview/skins/default/xui/es/panel_group_finder.xml
index 62655bd1a..820273e64 100644
--- a/indra/newview/skins/default/xui/es/panel_group_finder.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_finder.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="GroupInfoFinder" title="Buscar Infor de Grupo">
-	  <text name="default_needs_apply_text">
-			 Hay cambios sin aplicar en esta pestaña.
-	  </text>
-	  <text name="want_apply_text">
-			 ¿Deseas aplicar estos cambios?
-	  </text>
-	  <tab_container name="group_tab_container">
-			 <panel name="general_tab" />
-			 <panel name="roles_tab" />
-			 <panel name="notices_tab" />
-			 <panel name="voting_tab" />
-			 <panel name="land_money_tab" />
-	  </tab_container>
+	<text name="default_needs_apply_text">
+		Hay cambios sin aplicar en esta pestaña.
+	</text>
+	<text name="want_apply_text">
+		¿Deseas aplicar estos cambios?
+	</text>
+	<tab_container name="group_tab_container">
+		<panel name="general_tab" />
+		<panel name="roles_tab" />
+		<panel name="notices_tab" />
+		<panel name="voting_tab" />
+		<panel name="land_money_tab" />
+	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_general.xml b/indra/newview/skins/default/xui/es/panel_group_general.xml
index 8f532d1b8..28a1acb3a 100644
--- a/indra/newview/skins/default/xui/es/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_general.xml
@@ -1,86 +1,86 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="General" name="general_tab">
-	  <string name="help_text">
-			 La pestaña General contiene información global de este grupo,
+	<string name="help_text">
+		La pestaña General contiene información global de este grupo,
 la lista de propietarios y miembros visibles,
 las preferencias generales del grupo, y las opciones de los miembros.
 
 Coloca el cursor sobre las opciones para más información.	  
-	  </string>
-	  <string name="group_info_unchanged">
-			 La información general del grupo ha cambiado.
-	  </string>
-	  <button label="?" label_selected="?" name="help_button"/>
-	  <line_editor label="Escribe aquí el nombre de tu nuevo grupo" name="group_name_editor"/>
-	  <text name="group_name">
-			 Escribe aquí el nombre de tu nuevo grupo
-	  </text>
-	  <text name="prepend_founded_by">
-			 Creado por
-	  </text>
-	  <text name="founder_name">
-			 (esperando)
-	  </text>
-	  <text name="group_key_text">
-			 Key del Grupo:
-	  </text>
-     <name_editor name="group_key"/>
-	  <text name="group_charter_label">
-			 Carta del Grupo
-	  </text>
-	  <texture_picker label="Emblema del Grupo" name="insignia" tool_tip="Pulsa aquí para elegir una imagen"/>
-	  <text_editor name="charter">
-			 Carta del Grupo
-	  </text_editor>
-	  <button label="Entrar ([CURRENCY]0)" label_selected="Entrar ([CURRENCY]0)" name="join_button"/>
-	  <button label="Ver en Detalle" label_selected="Ver en Detalle" name="info_button"/>
-	  <text name="text_owners_and_visible_members">
-			 Propietarios y Miembros Visibles
-	  </text>
-	  <text name="text_owners_are_shown_in_bold">
-			 (Los Propietarios aparecen en Negrita)
-	  </text>
-	  <name_list name="visible_members">
-			 <column label="Nombre del Miembro" name="name"/>
-			 <column label="Título" name="title"/>
-			 <column label="Última Conexión" name="online"/>
-	  </name_list>
-	  <text name="text_group_preferences">
-			 Preferencias del Grupo
-	  </text>
-	  <panel name="preferences_container">
-			 <check_box label="Mostrar en la Búsqueda" name="show_in_group_list" tool_tip="Permitir que la gente vea este grupo en los resultados de la búsqueda" />
-			 <check_box label="Inscripción Libre" name="open_enrollement" tool_tip="Definir si se admiten al grupo nuevos miembros sin que sea necesario invitarlos" />
-			 <check_box label="Cuota de Inscripción: [CURRENCY]" name="check_enrollment_fee" tool_tip="Define si se requiere una cuota para entrar al grupo" />
-			 <spinner name="spin_enrollment_fee" tool_tip="Cuando está marcado &apos;Cuota de inscripción&apos;, los miembros nuevos deben pagar esta cuota para entrar al grupo" />
-			 <text name="content_rating">
-					Calificación de Contenido
-			 </text>
-			 <combo_box name="group_mature_check"  tool_tip="Establece si la información de tu grupo es de Contenido Mature">
-					<combo_item name="select_mature" value="Select">
-						  -	 Seleccionar Calificación -
-					</combo_item>
-					<combo_item name="mature">
-						  Contenido Mature
-					</combo_item>
-					<combo_item name="pg">
-						  Contenido PG
-					</combo_item>
-			 </combo_box>
-			 <check_box label="Recibir Avisos del Grupo" name="receive_notices" tool_tip="Define si quieres recibir avisos de este grupo. Desmarca esta opción si el grupo te envía spam."/>
-			 <check_box label="Unirse al Chat del Grupo" name="receive_chat" tool_tip="Define si quieres participar del chat en el grupo. Desmarca esta opción si el grupo te envía spam"/>
-			 <check_box label="Listar Grupo en mi Perfil" name="list_groups_in_profile" tool_tip="Define si quieres que este grupo sea listado en tu Perfil"/>
-			 <text name="active_title_label">
-					Mi Título activo
-			 </text>
-			 <combo_box name="active_title" tool_tip="Define el título del grupo que mostrará tu avatar cuando el grupo esté activo"/>
-	  </panel>
-	  <string name="incomplete_member_data_str">
-			 Recuperando datos de los miembros
-	  </string>
-	  <string name="confirm_group_create_str">
-					Crear este grupo cuesta [GROUPCREATEFEE]. 
+	</string>
+	<string name="group_info_unchanged">
+		La información general del grupo ha cambiado.
+	</string>
+	<button label="?" label_selected="?" name="help_button"/>
+	<line_editor label="Escribe aquí el nombre de tu nuevo grupo" name="group_name_editor"/>
+	<text name="group_name">
+		Escribe aquí el nombre de tu nuevo grupo
+	</text>
+	<text name="prepend_founded_by">
+		Creado por
+	</text>
+	<text name="founder_name">
+		(esperando)
+	</text>
+	<text name="group_key_text">
+		ID del Grupo:
+	</text>
+	<name_editor name="group_key"/>
+	<text name="group_charter_label">
+		Carta del Grupo
+	</text>
+	<texture_picker label="Emblema del Grupo" name="insignia" tool_tip="Pulsa aquí para elegir una imagen"/>
+	<text_editor name="charter">
+		Carta del Grupo
+	</text_editor>
+	<button label="Entrar ([CURRENCY]0)" label_selected="Entrar ([CURRENCY]0)" name="join_button"/>
+	<button label="Ver en Detalle" label_selected="Ver en Detalle" name="info_button"/>
+	<text name="text_owners_and_visible_members">
+		Propietarios y Miembros Visibles
+	</text>
+	<text name="text_owners_are_shown_in_bold">
+		(Los Propietarios aparecen en Negrita)
+	</text>
+	<name_list name="visible_members">
+		<column label="Nombre del Miembro" name="name"/>
+		<column label="Título" name="title"/>
+		<column label="Última Conexión" name="online"/>
+	</name_list>
+	<text name="text_group_preferences">
+		Preferencias del Grupo
+	</text>
+	<panel name="preferences_container">
+		<check_box label="Mostrar en la Búsqueda" name="show_in_group_list" tool_tip="Permitir que la gente vea este grupo en los resultados de la búsqueda" />
+		<check_box label="Inscripción Libre" name="open_enrollement" tool_tip="Definir si se admiten al grupo nuevos miembros sin que sea necesario invitarlos" />
+		<check_box label="Cuota de Inscripción: [CURRENCY]" name="check_enrollment_fee" tool_tip="Define si se requiere una cuota para entrar al grupo" />
+		<spinner name="spin_enrollment_fee" tool_tip="Cuando está marcado &apos;Cuota de inscripción&apos;, los miembros nuevos deben pagar esta cuota para entrar al grupo" />
+		<text name="content_rating">
+			Calificación de Contenido
+		</text>
+		<combo_box name="group_mature_check"  tool_tip="Establece si la información de tu grupo es de Contenido Mature">
+			<combo_item name="select_mature" value="Select">
+				-	 Seleccionar Calificación -
+			</combo_item>
+			<combo_item name="mature">
+				Contenido Mature
+			</combo_item>
+			<combo_item name="pg">
+				Contenido PG
+			</combo_item>
+		</combo_box>
+		<check_box label="Recibir Avisos del Grupo" name="receive_notices" tool_tip="Define si quieres recibir avisos de este grupo. Desmarca esta opción si el grupo te envía spam."/>
+		<check_box label="Unirse al Chat del Grupo" name="receive_chat" tool_tip="Define si quieres participar del chat en el grupo. Desmarca esta opción si el grupo te envía spam"/>
+		<check_box label="Listar Grupo en mi Perfil" name="list_groups_in_profile" tool_tip="Define si quieres que este grupo sea listado en tu Perfil"/>
+		<text name="active_title_label">
+			Mi Título activo
+		</text>
+		<combo_box name="active_title" tool_tip="Define el título del grupo que mostrará tu avatar cuando el grupo esté activo"/>
+	</panel>
+	<string name="incomplete_member_data_str">
+		Recuperando datos de los miembros
+	</string>
+	<string name="confirm_group_create_str">
+		Crear este grupo cuesta [GROUPCREATEFEE]. 
 ¿Estás plena, absoluta, y TOTALMENTE seguro de que quieres gastarse [GROUPCREATEFEE] para crear este grupo?
 Quedas avisado de que si, en un plazo de 48 horas, no entra nadie al grupo, éste será disuelto, y el nombre no se podrá usar en el futuro.	  
-	  </string>
+	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_land_money.xml b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
index 1ae6d5b94..62e88aa2f 100644
--- a/indra/newview/skins/default/xui/es/panel_group_land_money.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_land_money.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Terreno y [CURRENCY]" name="land_money_tab" >
-	  <string name="help_text">
-			 Se listan las parcelas propiedad del grupo, detallando las contribuciones. Aparece una advertencia si el Terreno total en uso es menor que o igual a la Contribución total. Las pestañas &apos;Planificación&apos;, &apos;Detalles&apos; y &apos;Ventas&apos; aportan información sobre las finanzas del grupo	  
-	  </string>
-	  <button label="?" name="help_button"/>
-	  <string name="cant_view_group_land_text">
-			 No tienes permiso para ver qué terreno posee el grupo.
-	  </string>
-	  <string name="cant_view_group_accounting_text">
-			 No tienes permiso para ver la información de la cuenta del grupo.
-	  </string>
-	  <string name="loading_txt">
-			 Cargando...
-	  </string>
-	  <text name="group_land_heading">
-			 Terreno propiedad del grupo
-	</text>
+	<string name="help_text">
+		Se listan las parcelas propiedad del grupo, detallando las contribuciones. Aparece una advertencia si el Terreno total en uso es menor que o igual a la Contribución total. Las pestañas &apos;Planificación&apos;, &apos;Detalles&apos; y &apos;Ventas&apos; aportan información sobre las finanzas del grupo	  
+	</string>
+	<button label="?" name="help_button"/>
+	<string name="cant_view_group_land_text">
+		No tienes permiso para ver qué terreno posee el grupo.
+	</string>
+	<string name="cant_view_group_accounting_text">
+		No tienes permiso para ver la información de la cuenta del grupo.
+	</string>
+	<string name="loading_txt">
+		Cargando...
+	</string>
+	<text name="group_land_heading">
+		Terreno propiedad del grupo
+	/text>
 	<scroll_list name="group_parcel_list">
 		<column label="Parcela" name="name"/>
 		<column label="Región" name="location"/>
diff --git a/indra/newview/skins/default/xui/es/panel_group_notices.xml b/indra/newview/skins/default/xui/es/panel_group_notices.xml
index a5ff100bc..fe6fe0703 100644
--- a/indra/newview/skins/default/xui/es/panel_group_notices.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_notices.xml
@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Avisos" name="notices_tab">
-	  <string name="help_text">
-			 Los avisos son una forma rápida de comunicación dentro 
+	<string name="help_text">
+		Los avisos son una forma rápida de comunicación dentro 
 de un grupo, difundiendo un mensaje y, si se quiere, añadiéndole 
 un ítem. Los avisos sólo los reciben los miembros del grupo cuyo 
 rol tiene adjudicada tal habilidad. Puedes desactivar los avisos 
 en la pestaña General.	  
-	  </string>
-	  <string name="no_notices_text">
-			 No hay avisos anteriores.
-	  </string>
-	  <button label="?" label_selected="?" name="help_button"/>
-	  <text name="lbl">
-			 Archivo de Avisos del Grupo
-	  </text>
-	  <text name="lbl2">
-			 Los avisos se mantienen durante 14 días. Pulsa en la lista de abajo el que 
+	</string>
+	<string name="no_notices_text">
+		No hay avisos anteriores.
+	</string>
+	<button label="?" label_selected="?" name="help_button"/>
+	<text name="lbl">
+		Archivo de Avisos del Grupo
+	</text>
+	<text name="lbl2">
+		Los avisos se mantienen durante 14 días. Pulsa en la lista de abajo el que 
 quieras ver. Pulsa el botón &apos;Actualizar&apos; para comprobar si se han 
 recibido nuevos avisos. Las listas de avisos tienen un límite de 200 avisos por día.	  
-	  </text>
-	  <scroll_list name="notice_list">
-			 <column label="" name="icon" width="16" />
-			 <column label="Asunto" name="subject"/>
-			 <column label="De" name="from"/>
-			 <column label="Fecha" name="date"/>
-			 <column name="sort"/>
-	  </scroll_list>
-	  <text name="notice_list_none_found">
-			 No se han encontrado.
-	  </text>
-	  <button label="Crear Aviso Nuevo" label_selected="Crear Aviso Nuevo" name="create_new_notice"/>
-	  <button label="Actualizar" label_selected="Actualizar la Lista" name="refresh_notices"/>
-	  <panel label="Crear Aviso Nuevo" name="panel_create_new_notice">
-			 <text name="lbl">
-					Crear un aviso
-			 </text>
-			 <text name="lbl2">
-			 Para enviar un aviso, debes escribir un asunto. Puedes añadir un
+	</text>
+	<scroll_list name="notice_list">
+		<column label="" name="icon" width="16" />
+		<column label="Asunto" name="subject"/>
+		<column label="De" name="from"/>
+		<column label="Fecha" name="date"/>
+		<column name="sort"/>
+	</scroll_list>
+	<text name="notice_list_none_found">
+		No se han encontrado.
+	</text>
+	<button label="Crear Aviso Nuevo" label_selected="Crear Aviso Nuevo" name="create_new_notice"/>
+	<button label="Actualizar" label_selected="Actualizar la Lista" name="refresh_notices"/>
+	<panel label="Crear Aviso Nuevo" name="panel_create_new_notice">
+		<text name="lbl">
+			Crear un aviso
+		</text>
+		<text name="lbl2">
+			Para enviar un aviso, debes escribir un asunto. Puedes añadir un
 ítem al aviso arrastrándolo desde tu inventario a este panel. 
 Los ítems anexados deben ser copiables y transferibles,
 y no se puede enviar una carpeta.			 
-			 </text>
-			 <text name="lbl3">
-					Asunto:
-			 </text>
-			 <text name="lbl4">
-					Mensaje:
-			 </text>
-			 <text name="lbl5">
-					Anexar:
-			 </text>
-			 <button label="Eliminar lo Anexado" label_selected="Eliminar lo Anexado" name="remove_attachment"/>
-			 <button label="Enviar el Aviso" label_selected="Enviar el Aviso" name="send_notice"/>
-			 <panel name="drop_target2"/>
-			 <panel name="drop_target" tool_tip="Para enviar un ítem con el aviso, arrástralo desde tu inventario hasta el cuadro del mensaje. Para poder enviar ese objeto con el aviso, debes tener permiso para copiarlo y transferirlo."/>
-	  </panel>
-	  <panel label="Ver Avisos Anteriores" name="panel_view_past_notice">
-			 <text name="lbl">
-					Avisos Archivados
-			 </text>
-			 <text name="lbl2">
-					Pulsa el botón &apos;Crear Aviso Nuevo&apos; para enviar uno nuevo.
-			 </text>
-			 <text name="lbl3">
-					Asunto:
-			 </text>
-			 <text name="lbl4">
-					Mensaje:
-			 </text>
-			 <button label="Abrir lo Anexado" label_selected="Abrir lo Anexado" name="open_attachment"/>
-	  </panel>
+		</text>
+		<text name="lbl3">
+			Asunto:
+		</text>
+		<text name="lbl4">
+			Mensaje:
+		</text>
+		<text name="lbl5">
+			Anexar:
+		</text>
+		<button label="Eliminar lo Anexado" label_selected="Eliminar lo Anexado" name="remove_attachment"/>
+		<button label="Enviar el Aviso" label_selected="Enviar el Aviso" name="send_notice"/>
+		<panel name="drop_target2"/>
+		<panel name="drop_target" tool_tip="Para enviar un ítem con el aviso, arrástralo desde tu inventario hasta el cuadro del mensaje. Para poder enviar ese objeto con el aviso, debes tener permiso para copiarlo y transferirlo."/>
+	</panel>
+	<panel label="Ver Avisos Anteriores" name="panel_view_past_notice">
+		<text name="lbl">
+			Avisos Archivados
+		</text>
+		<text name="lbl2">
+			Pulsa el botón &apos;Crear Aviso Nuevo&apos; para enviar uno nuevo.
+		</text>
+		<text name="lbl3">
+			Asunto:
+		</text>
+		<text name="lbl4">
+			Mensaje:
+		</text>
+		<button label="Abrir lo Anexado" label_selected="Abrir lo Anexado" name="open_attachment"/>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_roles.xml b/indra/newview/skins/default/xui/es/panel_group_roles.xml
index 66230e19b..9705df045 100644
--- a/indra/newview/skins/default/xui/es/panel_group_roles.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_roles.xml
@@ -1,156 +1,156 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Miembros y Roles" name="roles_tab">
-	  <string name="default_needs_apply_text">
-			 En cambios sin aplicar en esta pestaña.
-	  </string>
-	  <string name="want_apply_text">
-			 ¿Deseas aplicar estos cambios?
-	  </string>
-	  <button label="?" left="391" name="help_button"/>
-	  <panel name="members_header">
-			 <text name="static">
-					Miembros y Roles
-			 </text>
-			 <text name="static2">
-					Los miembros del grupo tienen asignados roles con distintas capacidades.
+	<string name="default_needs_apply_text">
+		En cambios sin aplicar en esta pestaña.
+	</string>
+	<string name="want_apply_text">
+		¿Deseas aplicar estos cambios?
+	</string>
+	<button label="?" left="391" name="help_button"/>
+	<panel name="members_header">
+		<text name="static">
+			Miembros y Roles
+		</text>
+		<text name="static2">
+			Los miembros del grupo tienen asignados roles con distintas capacidades.
 Estas configuraciones son fácilmente personalizables, para facilitar una 
 mayor flexibilidad y organización.			 
-			 </text>
-	  </panel>
-	  <panel name="roles_header">
-			 <text name="static">
-					Roles
-			 </text>
-			 <text name="role_properties_modifiable">
-					Elige un rol de los de abajo. Puedes modificar su nombre, su
+		</text>
+	</panel>
+	<panel name="roles_header">
+		<text name="static">
+			Roles
+		</text>
+		<text name="role_properties_modifiable">
+			Elige un rol de los de abajo. Puedes modificar su nombre, su
 descripción, y la etiqueta de los miembros.			 
-			 </text>
-			 <text name="role_properties_not_modifiable">
-					Elige un rol de los de abajo para ver sus propiedades, miembros, y qué
+		</text>
+		<text name="role_properties_not_modifiable">
+			Elige un rol de los de abajo para ver sus propiedades, miembros, y qué
 capacidades tiene asignadas.			 
-			 </text>
-			 <text name="role_actions_modifiable">
-					También puede asignar capacidades al rol.
-			 </text>
-			 <text name="role_actions_not_modifiable">
-					Puedes ver, pero no modificar, las capacidades asignadas.
-			 </text>
-	  </panel>
-	  <panel name="actions_header">
-			 <text name="static">
-					Capacidades
-			 </text>
-			 <text name="static2">
-					Puedes ver una descripción de la capacidad, y qué miembros y roles pueden
+		</text>
+		<text name="role_actions_modifiable">
+			También puede asignar capacidades al rol.
+		</text>
+		<text name="role_actions_not_modifiable">
+			Puedes ver, pero no modificar, las capacidades asignadas.
+		</text>
+	</panel>
+	<panel name="actions_header">
+		<text name="static">
+			Capacidades
+		</text>
+		<text name="static2">
+			Puedes ver una descripción de la capacidad, y qué miembros y roles pueden
 realizarla.		
-			 </text>
-	  </panel>
-	  <tab_container name="roles_tab_container">
-			 <panel label="Miembros" name="members_sub_tab" tool_tip="Miembros">
-					<button label="Buscar" name="search_button"/>
-					<button label="Mostrar Todos" name="show_all_button"/>
-					<name_list name="member_list">
-						  <column label="Nombre" name="name"/>
-						  <column label="Cuotas Donadas" name="donated"/>
-						  <column label="Última Conexión" name="online"/>
-					</name_list>
-					<button label="Invitar a un Nuevo Miembro..." name="member_invite"/>
-					<button label="Expulsar del Grupo" name="member_eject"/>
-					<string name="help_text">
-						  Puedea añadir o quitar los roles asignados a los miembros.
+		</text>
+	</panel>
+	<tab_container name="roles_tab_container">
+		<panel label="Miembros" name="members_sub_tab" tool_tip="Miembros">
+			<button label="Buscar" name="search_button"/>
+			<button label="Mostrar Todos" name="show_all_button"/>
+			<name_list name="member_list">
+				<column label="Nombre" name="name"/>
+				<column label="Cuotas Donadas" name="donated"/>
+				<column label="Última Conexión" name="online"/>
+			</name_list>
+			<button label="Invitar a un Nuevo Miembro..." name="member_invite"/>
+			<button label="Expulsar del Grupo" name="member_eject"/>
+			<string name="help_text">
+				Puedea añadir o quitar los roles asignados a los miembros.
 Selecciona varios nombres manteniendo pulsada la tecla Ctrl y pulsando en cada uno de ellos.
-					</string>
-			 </panel>
-			 <panel label="Roles" name="roles_sub_tab" width="398">
-					<button label="Buscar" name="search_button"/>
-					<button label="Mostrar Todos" name="show_all_button"/>
-					<scroll_list name="role_list">
-						  <column label="Nombre del Rol" name="name"/>
-						  <column label="Título" name="title"/>
-						  <column label="Miembros" name="members"/>
-					</scroll_list>
-					<button label="Crear Nuevo Rol ..." name="role_create"/>
-					<button label="Eliminar Rol" name="role_delete"/>
-					<string name="help_text">
-						  Los roles tienen una etiqueta y una serie de capacidades permitidas que los miembros pueden desarrollar. Los miembros pueden tener más de un rol. Un grupo puede tener hasta 10 roles, incluyendo el de Todos y el de Propietarios.					
-					</string>
-					<string name="cant_delete_role">
-						  Los roles de &apos;Todos&apos; y &apos;Propietarios&apos; son especiales, y no pueden eliminarse.					
-					</string>
-			 </panel>
-			 <panel label="Capacidades" name="actions_sub_tab">
-					<button label="Buscar" name="search_button"/>
-					<button label="Mostrar Todas" name="show_all_button"/>
-					<scroll_list name="action_list" tool_tip="Selecciona una capacidad para verla más en detalle.">
-						  <column label="" name="icon" />
-						  <column label="" name="action"/>
-					</scroll_list>
-					<string name="help_text">
-						  Las capacidades permiten a los miembros que tienen ese rol el hacer 
+			</string>
+		</panel>
+		<panel label="Roles" name="roles_sub_tab" width="398">
+			<button label="Buscar" name="search_button"/>
+			<button label="Mostrar Todos" name="show_all_button"/>
+			<scroll_list name="role_list">
+				<column label="Nombre del Rol" name="name"/>
+				<column label="Título" name="title"/>
+				<column label="Miembros" name="members"/>
+			</scroll_list>
+			<button label="Crear Nuevo Rol ..." name="role_create"/>
+			<button label="Eliminar Rol" name="role_delete"/>
+			<string name="help_text">
+				Los roles tienen una etiqueta y una serie de capacidades permitidas que los miembros pueden desarrollar. Los miembros pueden tener más de un rol. Un grupo puede tener hasta 10 roles, incluyendo el de Todos y el de Propietarios.					
+			</string>
+			<string name="cant_delete_role">
+				Los roles de &apos;Todos&apos; y &apos;Propietarios&apos; son especiales, y no pueden eliminarse.					
+			</string>
+		</panel>
+		<panel label="Capacidades" name="actions_sub_tab">
+			<button label="Buscar" name="search_button"/>
+			<button label="Mostrar Todas" name="show_all_button"/>
+			<scroll_list name="action_list" tool_tip="Selecciona una capacidad para verla más en detalle.">
+				<column label="" name="icon" />
+				<column label="" name="action"/>
+			</scroll_list>
+			<string name="help_text">
+				Las capacidades permiten a los miembros que tienen ese rol el hacer 
 tareas específicas dentro de este grupo. Hay una gran variedad de capacidades.					
-					</string>
-			 </panel>
-	  </tab_container>
-	  <panel name="members_footer" >
-			 <text name="static">
-					Roles Asignados
-			 </text>
-			 <text name="static2">
-					Capacidades Permitidas
-			 </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="Para más detalles de cada capacidad permitida, ve a la pestaña Capacidades">
-					<column label="" name="icon"/>
-					<column label="" name="action"/>
-			 </scroll_list>
-	  </panel>
-	  <panel name="roles_footer">
-			 <text name="static">
-					Nombre
-			 </text>
-			 <text name="static2">
-					Descripción
-			 </text>
-			 <line_editor name="role_name">
-					Empleados
-			 </line_editor>
-			 <text name="static3">
-					Título
-			 </text>
-			 <line_editor name="role_title">
-					(esperando)
-			 </line_editor>
-			 <text_editor name="role_description">
-					(esperando)
-			 </text_editor>
-			 <text name="static4">
-					Miembros Asignados
-			 </text>
-			 <text name="static5" tool_tip=" Lista de las capacidades que puede desarrollar el rol seleccionado actualmente.">
-					Capacidades Asignadas
-			 </text>
-			 <check_box label="Los Miembros son visibles" name="role_visible_in_list" tool_tip="Establece si los miembros de este rol pueden ser vistos en la pestaña General por personas ajenas al grupo" />
-			 <scroll_list name="role_allowed_actions" tool_tip="Para más detalles de cada capacidad permitida, ve a la pestaña Capacidades.">
-					<column label="" name="icon"/>
-					<column label="" name="checkbox"/>
-					<column label="" name="action"/>
-			 </scroll_list>
-	  </panel>
-	  <panel name="actions_footer">
-			 <text name="static">
-					Descripción
-			 </text>
-			 <text_editor name="action_description">
-					Esta capacidad es la de &apos;Expulsar miembros de este grupo&apos;. Sólo un propietario puede expulsar a otro.			 
-			 </text_editor>
-			 <text name="static2">
-					Roles con la capacidad
-			 </text>
-			 <text name="static3">
-					Miembros con la capacidad
-			 </text>
-	  </panel>
+			</string>
+		</panel>
+	</tab_container>
+	<panel name="members_footer" >
+		<text name="static">
+			Roles Asignados
+		</text>
+		<text name="static2">
+			Capacidades Permitidas
+		</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="Para más detalles de cada capacidad permitida, ve a la pestaña Capacidades">
+			<column label="" name="icon"/>
+			<column label="" name="action"/>
+		</scroll_list>
+	</panel>
+	<panel name="roles_footer">
+		<text name="static">
+			Nombre
+		</text>
+		<text name="static2">
+			Descripción
+		</text>
+		<line_editor name="role_name">
+			Empleados
+		</line_editor>
+		<text name="static3">
+			Título
+		</text>
+		<line_editor name="role_title">
+			(esperando)
+		</line_editor>
+		<text_editor name="role_description">
+			(esperando)
+		</text_editor>
+		<text name="static4">
+			Miembros Asignados
+		</text>
+		<text name="static5" tool_tip=" Lista de las capacidades que puede desarrollar el rol seleccionado actualmente.">
+			Capacidades Asignadas
+		</text>
+		<check_box label="Los Miembros son visibles" name="role_visible_in_list" tool_tip="Establece si los miembros de este rol pueden ser vistos en la pestaña General por personas ajenas al grupo" />
+		<scroll_list name="role_allowed_actions" tool_tip="Para más detalles de cada capacidad permitida, ve a la pestaña Capacidades.">
+			<column label="" name="icon"/>
+			<column label="" name="checkbox"/>
+			<column label="" name="action"/>
+		</scroll_list>
+	</panel>
+	<panel name="actions_footer">
+		<text name="static">
+			Descripción
+		</text>
+		<text_editor name="action_description">
+			Esta capacidad es la de &apos;Expulsar miembros de este grupo&apos;. Sólo un propietario puede expulsar a otro.			 
+		</text_editor>
+		<text name="static2">
+			Roles con la capacidad
+		</text>
+		<text name="static3">
+			Miembros con la capacidad
+		</text>
+	</panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_group_voting.xml b/indra/newview/skins/default/xui/es/panel_group_voting.xml
index 1452b7e8e..58c8ded4a 100644
--- a/indra/newview/skins/default/xui/es/panel_group_voting.xml
+++ b/indra/newview/skins/default/xui/es/panel_group_voting.xml
@@ -1,214 +1,117 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Propuestas" name="voting_tab">
-	  <string name="help_text">
-			 Las propuestas de grupo pueden utilizarse para saber 
+	<string name="help_text">
+		Las propuestas de grupo pueden utilizarse para saber 
 qué  quiere hacer un grupo, o cómo piensa acerca de algo. 
 Si tienes los permisos necesarios, puedesr crear propuestas, 
 votar en las que estén abiertas, y ver las antiguas.	  
-	  </string>
-	  <panel name="open_proposals_container"/>
-	  <panel name="voting_history_container"/>
-			 <button label="?" name="help_button"/>
-			 <text name="proposal_header">
-					Abrir las Propuestas de Grupo
-			 </text>
-			 <text name="proposal_instructions">
-					Pulsa dos veces la propuesta en la que quieres votar, o pulsa
+	</string>
+	<panel name="open_proposals_container"/>
+	<panel name="voting_history_container"/>
+		<button label="?" name="help_button"/>
+		<text name="proposal_header">
+			Abrir las Propuestas de Grupo
+		</text>
+		<text name="proposal_instructions">
+			Pulsa dos veces la propuesta en la que quieres votar, o pulsa
 Hacer una propuesta para crear una nueva.
-			 </text>
-			 <text name="proposal_lbl">
-					Descripción de la Propuesta
-			 </text>
-			 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-	     mouse_opaque="false" name="proposal_voting_lbl" v_pad="0" visible="true"
-	     width="396">
-		Proposal                                                         Voting Ends                    Voted?
+		</text>
+		<text name="proposal_lbl">
+			Descripción de la Propuesta
+		</text>
+		<text name="proposal_voting_lbl">
+			Propuesta                                                       Finaliza                     ¿Votado?
 	</text>
-	<scroll_list bottom_delta="-121" column_padding="5" column_widths="200,120,40"
-	     draw_border="true" height="120" left="11" mouse_opaque="true"
-	     multi_select="false" name="proposals" width="396" />
-	<button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"
-	     height="20" label="Create Proposal" label_selected="Create Proposal"
-	     left_delta="-0" mouse_opaque="true" name="btn_proposal" width="160" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="20" label="View Proposal" label_selected="View Proposal" left="247"
-	     mouse_opaque="true" name="btn_view_proposal_item" width="160" />
-	<text_editor background_visible="true" bg_visible="false" border_drop_shadow_visible="false"
-	     border_visible="false" bottom="300" drop_shadow_visible="false"
-	     embedded_items="false" follows="left|top" font="SansSerif" height="90"
-	     is_unicode="false" left="11" max_length="254" mouse_opaque="true"
-	     name="proposal_text" width="289" word_wrap="true" spell_check="true" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="20" label="View List" label_selected="View List" left="304"
-	     mouse_opaque="true" name="btn_view_proposal_list" width="101" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="right" height="20" left="8"
-	     mouse_opaque="false" name="quorum_lbl" v_pad="0" width="65">
-		Quorum:
+	<button label="Crear Propuesta" label_selected="Crear Propuesta" name="btn_proposal"/>
+	<button label="Ver Propuestas" label_selected="Ver Propuestas" name="btn_view_proposal_item"/>
+	<button label="Ver Listado" label_selected="Ver Listado" name="btn_view_proposal_list"/>
+	<text name="quorum_lbl">
+		Quórum:
 	</text>
-	<spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="20"
-	     increment="1" initial_val="0" left="78" max_val="138" min_val="1"
-	     mouse_opaque="true" name="quorum" text_disabled_color="orange"
-	     tool_tip="# of total voting members needed for election results to be binding."
-	     width="54" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-0" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="60"
-	     mouse_opaque="false" name="quorum_text" v_pad="0" width="300">
-		out of [MEMBERS] members must vote.
+	<spinner name="quorum" tool_tip="# de miembros votantes necesario para que el resultado de la votación sea válida"/>
+	<text name="quorum_text">
+		de los [MEMBERS] miembros deben votar.
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-23" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="right" height="20" left="8"
-	     mouse_opaque="false" name="duration_lbl" v_pad="0" width="65">
-		Duration:
+	<text name="duration_lbl">
+		Duración:
 	</text>
-	<spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="20"
-	     increment="1" initial_val="7" left_delta="70" max_val="30" min_val="1"
-	     mouse_opaque="true" name="duration"
-	     tool_tip="# of days the election will last." width="45" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="52"
-	     mouse_opaque="false" name="duration_text" v_pad="0" width="300">
-		days
+	<spinner name="duration" tool_tip="# de días que tomará la votación"/>
+	<text name="duration_text">
+		días
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="right" height="20" left="210"
-	     mouse_opaque="false" name="majority_lbl" v_pad="0" visible="false"
-	     width="65" />
-	<radio_group bottom_delta="72" draw_border="false" follows="left|top" height="60" left="300"
-	     mouse_opaque="true" name="majority"
-	     text_disabled_color="0.67647, 0.76275, 0.93529, 0.45"
-	     tool_tip="Majority of total votes needed to win." width="107">
-		Simple Majority
-		2/3 Majority
-		Unanimous
+	<radio_group name="majority" tool_tip="Total de votos necesaros para obtener la mayoría y ganar">
+		Mayoría Simple
+		2/3 de los votos
+		Unanimidad
 	</radio_group>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-72" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
-	     mouse_opaque="false" name="start_lbl" v_pad="0" width="70">
-		Voting Start:
+	<text name="start_lbl">
+		Comienza:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="75"
-	     mouse_opaque="false" name="start_date" v_pad="0" width="200" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="right" height="20" left="12"
-	     mouse_opaque="false" name="end_lbl" v_pad="0" width="70">
-		Voting Ends:
+	<text name="end_lbl">
+		Termina:
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left_delta="75"
-	     mouse_opaque="false" name="end_date" v_pad="0" width="200" />
-	<button bottom="-218" follows="left|top" font="SansSerif" halign="center" height="20"
-	     label="Submit Proposal" label_selected="Submit Proposal" left="200"
-	     mouse_opaque="true" name="btn_submit" width="120" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="20" label="Cancel" label_selected="Cancel" left_delta="128"
-	     mouse_opaque="true" name="btn_cancel" width="75" />
-	<button bottom="-218" follows="top" font="SansSerif" halign="center" height="20"
-	     label="Yes" label_selected="Yes" left="200" mouse_opaque="true"
-	     name="btn_yes" width="63" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="20" label="No" label_selected="No" left_delta="70"
-	     mouse_opaque="true" name="btn_no" width="63" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="20" label="Abstain" label_selected="Abstain" left_delta="70"
-	     mouse_opaque="true" name="btn_abstain" width="63" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-240" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifBig" h_pad="0" halign="left" height="10" left="12"
-	     mouse_opaque="false" name="txt" v_pad="0" width="363">
-		Group Voting History
+	<button label="Enviar Propuesta" label_selected="Enviar Propuesta" name="btn_submit"/>
+	<button label="Cancelar" label_selected="Cancelar" name="btn_cancel"/>
+	<button label="Si" label_selected="Si" name="btn_yes"/>
+	<button label="No" label_selected="No" name="btn_no"/>
+	<button label="Abstención" label_selected="Abstención" name="btn_abstain"/>
+	<text name="txt">
+		Historial Votaciones del Grupo
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-28" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-	     mouse_opaque="false" name="instructions" v_pad="0" width="400">
-		Double Click on a Past Vote or select one and click View Item to view results.
+	<text name="instructions">
+		Pulsa dos veces para en una votación anterior o selecciona una y pulsa Ver Item para ver sus resultados.
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-296" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-	     mouse_opaque="false" name="history_list_lbl" text_wrap="true" v_pad="0"
-	     width="396">
-		Past Vote                                                         Voting Ended
+	<text name="history_list_lbl">
+		Votación Anterior                                           Finalizada
 	</text>
-	<scroll_list background_visible="true" bottom_delta="-132" column_padding="5"
-	     column_widths="220,120" draw_border="true" follows="left|top" height="126"
-	     left="10" mouse_opaque="true" multi_select="false" name="history_list"
-	     width="396" />
-	<button bottom_delta="-25" follows="top" font="SansSerif" halign="center" height="20"
-	     label="View Item" label_selected="View Item" left="287" mouse_opaque="true"
-	     name="btn_view_history_item" width="120" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="157" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="right" height="10" left="10"
-	     mouse_opaque="false" name="vote_text_lbl" v_pad="0" width="70">
-		Vote Results:
+	<button label="Ver Item" label_selected="Ver Item" name="btn_view_history_item"/>
+	<text name="vote_text_lbl">
+		Resultados:
 	</text>
-	<text_editor bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-132" drop_shadow_visible="false" embedded_items="false"
-	     follows="left|top" font="SansSerif" h_pad="0" height="126"
-	     hide_scrollbar="true" is_unicode="false" left="10" max_length="1024"
-	     mouse_opaque="true" name="vote_text"
-	     text_wrap="true" v_pad="0"
-	     width="396" word_wrap="false" />
-	<button bottom_delta="-25" follows="top" font="SansSerif" halign="center" height="20"
-	     label="View List" label_selected="View List" left="287" mouse_opaque="true"
-	     name="btn_view_history_list" width="120" />
+	<button label="Ver Listado" label_selected="Ver Listado" name="btn_view_history_list"/>
 	<string name="proposals_header_view_txt">
-		Open Group Proposals
+		Propuestas Abiertas del Grupo
 	</string>
 	<string name="proposals_header_view_inst">
-		Double Click on the proposal you would like to vote on or press
-Create Proposal to create a new proposal.
+		Pulsa dos veces en la propuesta si quieres votar o presiona en
+Crear Propuesta para una nueva.
 	</string>
 	<string name="proposals_header_create_txt">
-		Create Proposal
+		Crear Propuesta
 	</string>
 	<string name="proposals_header_create_inst">
-		Type the Proposal Description for the new proposal. You can change the
-Quorum, Duration and Majority required to pass the proposal.
+		Escribe la Descripción de la Propuesta for la nueva Propuesta. Puedes cambiar
+el Quórum, duración y la mayoría requerida para aprobar la propuesta.
 	</string>
 	<string name="proposals_header_vote_txt">
-		Proposal Vote
+		Votar la Propuesta
 	</string>
 	<string name="proposals_header_vote_inst">
-		Press the Yes or No button to vote on the proposal,
-or choose to Abstain voting on this proposal.
+		Presiona los botones Si o No para votar la propuesta,
+o selecciona Abstención en esta propuesta.
 	</string>
 	<string name="proposals_header_voted_inst">
-		You have voted: [VOTE]
+		has votado: [VOTE]
 	</string>
 	<string name="empty_proposal_txt">
-		The proposal you are trying to create is empty.  Please fill out the proposal before creating it.
+		La propuesta que estás creando está vacía. Por favor rellena la propuesta antes de crearla.it.
 	</string>
 	<string name="proposals_submit_yes_txt">
-		Submitting Yes to proposal...
+		Enviando Si a la propuesta...
 	</string>
 	<string name="proposals_submit_no_txt">
-		Submitting No to proposal...
+		Enviando No a la propuesta...
 	</string>
 	<string name="proposals_submit_abstain_txt">
-		Submitting Abstain to proposal...
+		Enviando Abstención a la propuesta...
 	</string>
 	<string name="proposals_submit_new_txt">
-		Submitting new proposal...
+		Enviando nueva propuesta...
 	</string>
 	<string name="vote_recorded">
-		Your vote was received.
+		Tu voto ha sido recibido.
 	</string>
 	<string name="vote_previously_recorded">
-		You have previously voted.  You are only allowed to vote once during an election.
+		Ya has votado. Sólo puedes votar una vez en la elección.
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_groups.xml b/indra/newview/skins/default/xui/es/panel_groups.xml
index f4acca0af..924701d66 100644
--- a/indra/newview/skins/default/xui/es/panel_groups.xml
+++ b/indra/newview/skins/default/xui/es/panel_groups.xml
@@ -1,52 +1,28 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="-371" height="300" left="280" mouse_opaque="true"
-     name="groups" width="350">
-	<scroll_list background_visible="true" bottom="45" column_padding="0" draw_border="true"
-	     draw_heading="true" draw_stripes="true" enabled="true"
-	     follows="left|top|right|bottom" left="10" mouse_opaque="true"
-	     multi_select="false" name="group list" tab_stop="true" top="-10"
-	     width="240">
-		<column dynamicwidth="true" label="Name" name="name" tool_tip="Name" />
-    <!--<column label="Active" name="is_active_group"
+<panel name="groups">
+	<scroll_list name="group list">
+		<column label="Nombre" name="name" tool_tip="Nombre"/>
+		<!--<column label="Active" name="is_active_group"
 		    tool_tip="Group is set as active" width="40" />-->
-    <column image_overlay="ff_visible_online.tga" name="is_listed_group"
-		    tool_tip="Group is visible in profile." width="20" />
-    <column image_overlay="icn_chat_overlay.tga" name="is_chattable_group"
-		    tool_tip="Receive group chat" width="20" />
-    <column image_overlay="smicon_warn.tga" name="is_notice_group"
-        tool_tip="Receive group notices" width="20" />
+		<column name="is_listed_group" tool_tip="El Grupo es visible en tu perfil"/>
+		<column name="is_chattable_group" tool_tip="Recibir chat del grupo"/>
+		<column name="is_notice_group" tool_tip="Recibir avisos del grupo"/>
 	</scroll_list>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="22" drop_shadow_visible="true" enabled="true" follows="left|bottom"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-	     mouse_opaque="false" name="groupdesc" v_pad="0" width="248">
-		Your currently active group is displayed in italics.
+	<text name="groupdesc">
+		Tu grupo activo se muestra en Itálica.
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="5" drop_shadow_visible="true" enabled="true" follows="left|bottom"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
-	     mouse_opaque="false" name="groupcount" v_pad="0" width="248">
-		You belong to [COUNT] groups (of [MAX] maximum).
+	<text name="groupcount">
+		Perteneces a [COUNT] grupos (de un máximo de [MAX]).
 	</text>
-	<pad bottom="-7" height="0" left="-90" width="1" />
-	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-	     label="IM/Call" left_delta="0" name="IM"
-	     tool_tip="Open Instant Message session" width="80" />
-	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-	     label="Info" name="Info" width="80" />
-	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-	     label="Activate" name="Activate" width="80" />
-	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-	     label="Leave" name="Leave" width="80" />
-	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-	     label="Create..." name="Create" width="80" />
-	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-	     label="Search..." name="Search..." width="80" />
-  	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-	     label="Invite..." name="Invite..." width="80" />
-	<button bottom_delta="-25" follows="top|right" font="SansSerif" height="22"
-	     label="Titles..." name="Titles..." width="80" />
-  <string name="none">
-		none
-  </string>
+	<button label="MI/Llamar" name="IM" tool_tip="Abrir sesión de Mensajes Instantáneos"/>
+	<button label="Info" name="Info"/>
+	<button label="Activar" name="Activate"/>
+	<button label="Abandonar" name="Leave"/>
+	<button label="Crear..." name="Create"/>
+	<button label="Buscar..." name="Search..."/>
+  	<button label="Invitar..." name="Invite..."/>
+	<button label="Títulos..." name="Titles..."/>
+	<string name="none">
+		ninguno
+	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_hud.xml b/indra/newview/skins/default/xui/es/panel_hud.xml
index 95f828996..08a521d0e 100644
--- a/indra/newview/skins/default/xui/es/panel_hud.xml
+++ b/indra/newview/skins/default/xui/es/panel_hud.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="false" auto_resize="true" background_visible="false" bottom="50"
-     follows="left|right|top|bottom" height="728" left="0" mouse_opaque="false"
-     name="hud" user_resize="false" width="1024" />
+<panel name="hud"/>
diff --git a/indra/newview/skins/default/xui/es/panel_land_covenant.xml b/indra/newview/skins/default/xui/es/panel_land_covenant.xml
index e9f8f3af0..4eab54caf 100644
--- a/indra/newview/skins/default/xui/es/panel_land_covenant.xml
+++ b/indra/newview/skins/default/xui/es/panel_land_covenant.xml
@@ -1,60 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" follows="top|left" height="220" left="0"
-     name="Covenant" title="Covenant" width="480">
-	<text bottom_delta="-5" follows="left|top"
-	     font="SansSerifSmall" height="20" left="180" name="covenant_timestamp_text"
-	     width="250" />
-	<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
-	     left="10" name="region_name_lbl" width="100">
-		Region:
+<panel name="Covenant" title="Convenio">
+	<text name="region_name_lbl">
+		Región:
 	</text>
-	<text bottom_delta="0" follows="left|top"
-	     font="SansSerifSmall" height="20" left="120" name="region_name_text"
-	     width="150">
-		(unknown)
+	<text name="region_name_text">
+		(desconocida)
 	</text>
-	<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
-	     left="10" name="estate_name_lbl" width="100">
-		Estate:
+	<text name="estate_name_lbl">
+		Estado:
 	</text>
-	<text bottom_delta="0" follows="left|top"
-	     font="SansSerifSmall" height="20" left="120" name="estate_name_text"
-	     width="150">
-		(unknown)
+	<text name="estate_name_text">
+		(desconocido)
 	</text>
-	<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20"
-	     left="10" name="estate_owner_lbl" width="100">
-		Estate Owner:
+	<text name="estate_owner_lbl">
+		Propietario del Estado:
 	</text>
-	<text bottom_delta="0" follows="left|top"
-	     font="SansSerifSmall" height="20" left="120" name="estate_owner_text"
-	     width="150">
-		(unknown)
+	<text name="estate_owner_text">
+		(desconocido)
 	</text>
-	<text bottom_delta="-20" follows="left|top"
-	     font="SansSerif" height="20" left="60" name="resellable_clause"
-	     width="300">
-		Purchased land in this region may or may not be resold.
+	<text name="resellable_clause">
+		El terreno comprado en esta región puede o no ser revendido.
 	</text>
-	<text bottom_delta="-20" follows="left|top"
-	     font="SansSerif" height="20" left="60" name="changeable_clause"
-	     width="375">
-		Purchased land in this region may or may not be joined or subdivided.
+	<text name="changeable_clause">
+		El terreno comprado en esta región puede o no ser unido o dividido.
 	</text>
-	<text_editor bottom_delta="-200" enabled="false"
-	     follows="left|top" font="SansSerifSmall" height="200" left="15"
-	     max_length="65535" name="covenant_editor" 
-	     width="425" word_wrap="true" />
 	<string name="can_resell">
-		Purchased land in this region may be resold.
+		El terreno comprado en esta región puede ser revendido.
 	</string>
 	<string name="can_not_resell">
-		Purchased land in this region may not be resold.
+		El terreno comprado en esta región no puede ser revendido.
 	</string>
 	<string name="can_change">
-		Purchased land in this region may be joined or subdivided.
+		El terreno comprado en esta región puede ser unido o dividido.
 	</string>
 	<string name="can_not_change">
-		Purchased land in this region may not be joined or subdivided.
+		El terreno comprado en esta región no puede ser unido ni dividido.
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_login.xml b/indra/newview/skins/default/xui/es/panel_login.xml
index c63e1d1dc..e33c0e8a2 100644
--- a/indra/newview/skins/default/xui/es/panel_login.xml
+++ b/indra/newview/skins/default/xui/es/panel_login.xml
@@ -1,50 +1,46 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="panel_login">
-	  <web_browser name="login_html" />
-	  <string name="real_url">
-			 http://secondlife.com/app/login/
-	  </string>
-	  <string name="forgot_password_url">
-			 http://secondlife.com/account/request.php
-	  </string>
-	  <text name="name_label">
-			 Nombre o Usuario:
-	  </text>
-	  <combo_box name="name_combo" />
-	  <text name="password_text">
-			 Contraseña:	
-	  </text>
-	  <line_editor name="password_edit"/>
-	  <check_box label="Recordar Nombre" name="remember_name_check"/>
-	  <check_box label="Recordar Contraseña" name="remember_check" width="138" />
-	  <text name="grids_combo_text">
-			 Grid:
-	  </text>
-	  <combo_box name="grids_combo" width="120" />
-	  <button name="grids_btn" label="Administrar Grid"/>		 
-	  <text name="start_location_text" v_pad="0" width="120">
-			 Posición Inicial:
-	  </text>
-	  <combo_box name="regionuri_edit"/>
-	  <combo_box name="start_location_combo" width="155">
-			 <combo_item name="MyHome" value="My Home">
-					Mi Base
-			 </combo_item>
-			 <combo_item name="MyLastLocation" value="My Last Location">
-					Mi Última Ubicación
-			 </combo_item>
-			 <combo_item name="Typeregionname" value="&lt;Type region name&gt;">
-					&lt;Escribe el Nombre de la Región&gt;
-			 </combo_item>
-	  </combo_box>
-	  <button label="Iniciar Sesión" label_selected="Iniciar Sesión" name="connect_btn" width="100" />
-	  <text name="create_new_account_text" width="200">
-			 Registrate para obtener una Cuenta
-	  </text>
-	  <text name="forgot_password_text" width="200">
-			 ¿Olvidaste tu Nombre o tu Contraseña?
-	  </text>
-	  <text name="channel_text">
-			 [CHANNEL] [VERSION]
-	  </text>
+	<string name="real_url">
+		http://secondlife.com/app/login/
+	</string>
+	<string name="forgot_password_url">
+		http://secondlife.com/account/request.ph
+	</string>
+	<text name="name_label">
+		Nombre o Usuario:
+	</text>
+	<combo_box name="name_combo" />
+	<text name="password_text">
+		Contraseña:	
+	</text>
+	<check_box label="Recordar Nombre" name="remember_name_check"/>
+	<check_box label="Recordar Contraseña" name="remember_check" width="138" />
+	<text name="grids_combo_text">
+		Grid:
+	</text>
+	<button name="grids_btn" label="Administrar Grid"/>		 
+	<text name="start_location_text" v_pad="0" width="120">
+		Posición Inicial:
+	</text>
+	<combo_box name="start_location_combo" width="155">
+		<combo_item name="MyHome" value="My Home">
+			Mi Base
+		</combo_item>
+		<combo_item name="MyLastLocation" value="My Last Location">
+			Mi Última Ubicación
+		</combo_item>
+		<combo_item name="Typeregionname" value="&lt;Type region name&gt;">
+			&lt;Escribe el Nombre de la Región&gt;
+		</combo_item>
+	</combo_box>
+	<button label="Iniciar Sesión" label_selected="Iniciar Sesión" name="connect_btn" width="100" />
+	<text name="create_new_account_text" width="200">
+		Registrate para obtener una Cuenta
+	</text>
+	<text name="forgot_password_text" width="200">
+		¿Olvidaste tu Nombre o tu Contraseña?
+	</text>
+	<text name="channel_text">
+		[CHANNEL] [VERSION]
+	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_master_volume.xml b/indra/newview/skins/default/xui/es/panel_master_volume.xml
index 27bace7ea..d2ba47013 100644
--- a/indra/newview/skins/default/xui/es/panel_master_volume.xml
+++ b/indra/newview/skins/default/xui/es/panel_master_volume.xml
@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bg_visible="false" border="false" border_visible="false" bottom="-34"
-     name="master_volume">
-	<button bottom="-22" height="22" label=""
-	     left="2" name="volume" toggle="true"
-	     tool_tip="Master Volume Control, click for volume settings" width="28" />
-	<volume_slider bottom="-20" control_name="AudioLevelMaster" height="17" increment="0.05"
-	     initial_val="0.5" left_delta="22" max_val="1" min_val="0"
-	     mouse_opaque="true" name="volume_slider"
-	     tool_tip="Change the volume using this slider" width="50" />
-	<button bottom="-20" control_name="MuteAudio" height="20"
-	     image_selected="icn_speaker-muted_dark.tga"
-	     image_unselected="icn_speaker_dark.tga" label="" left_delta="52"
-	     name="mute_master" toggle="true" width="25" />
+<panel name="master_volume">
+	<button label="" name="volume" tool_tip="Control Maestro del Volumen, pulsa aquí para ir a las configuraciones del volumen"/>
+	<volume_slider name="volume_slider" tool_tip="Cambia el volumen usando este control deslizante"/>
+	<button label="" name="mute_master"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_media_controls.xml b/indra/newview/skins/default/xui/es/panel_media_controls.xml
index a8ecfcab8..f67b2e350 100644
--- a/indra/newview/skins/default/xui/es/panel_media_controls.xml
+++ b/indra/newview/skins/default/xui/es/panel_media_controls.xml
@@ -1,98 +1,38 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bg_visible="false" border="false" border_visible="false" bottom="1"
-     enabled="true" follows="right|bottom" height="20" left="0"
-     name="media_controls" width="262">
-	<icon bottom="-22" enabled="true" follows="left|top" height="22"
-	     image_name="icn_label_music.tga" label="" left_delta="2" mouse_opaque="true"
-	     name="music_icon" scale_image="true" tool_tip="Play/pause streaming music"
-	     width="20" />
-	<button bottom="-21" enabled="true" follows="left|top" height="20"
-          image_overlay="icn_play.tga"
-          image_unselected="flyout_btn_left.tga"
-             image_selected="flyout_btn_left_selected.tga"
-             image_disabled="flyout_btn_left_disabled.tga"
-	      label="" left_delta="20"
-	     mouse_opaque="true" name="music_play" scale_image="true" toggle="false"
-	     tool_tip="Play/pause streaming music" width="20" />
-  <button bottom="-21" enabled="false" follows="left|top" height="20"
-	     image_overlay="icn_pause.tga"
-             image_unselected="flyout_btn_left.tga"
-             image_selected="flyout_btn_left_selected.tga"
-             image_disabled="flyout_btn_left_disabled.tga"
-	     label="" left_delta="0"
-	     mouse_opaque="true" name="music_pause" scale_image="true" toggle="false"
-	     tool_tip="Pause streaming music" width="20" />
-  <button bottom="-21" enabled="true" follows="left|top" height="20"
-	     image_overlay="icn_stop.tga"
-             image_unselected="flyout_btn_right.tga"
-             image_selected="flyout_btn_right_selected.tga"
-             image_disabled="flyout_btn_right_disabled.tga"
-	     label="" left_delta="20"
-	     mouse_opaque="true" name="music_stop" scale_image="true" toggle="false"
-	     tool_tip="Stop streaming music" width="20" />
-  <icon bottom="-22" enabled="true" follows="left|top" height="22"
-	     image_name="icn_label_media.tga"
-             label="" left_delta="23" mouse_opaque="true"
-	     name="media_icon" scale_image="true" tool_tip="Play/pause streaming music"
-	     width="20" />
-  <button bottom="-21" enabled="true" follows="left|top" height="20"
-	     image_overlay="icn_play.tga"
-             image_unselected="flyout_btn_left.tga"
-             image_selected="flyout_btn_left_selected.tga"
-             image_disabled="flyout_btn_left_disabled.tga"
-	     label="" left_delta="21"
-	     mouse_opaque="true" name="media_play" scale_image="true" toggle="false"
-	     tool_tip="Play/pause streaming music" width="20" />
-  <button bottom="-21" enabled="false" follows="left|top" height="20"
-	     image_overlay="icn_pause.tga"
-                          image_unselected="flyout_btn_left.tga"
-             image_selected="flyout_btn_left_selected.tga"
-             image_disabled="flyout_btn_left_disabled.tga"
-	     label="" left_delta="0"
-	     mouse_opaque="true" name="media_pause" scale_image="true" toggle="false"
-	     tool_tip="Pause streaming media" width="20" />
-	<button bottom="-21" enabled="true" follows="left|top" height="20"
-	     image_overlay="icn_stop.tga"
-                          image_unselected="flyout_btn_right.tga"
-             image_selected="flyout_btn_right_selected.tga"
-             image_disabled="flyout_btn_right_disabled.tga"
-	     label="" left_delta="20"
-	     mouse_opaque="true" name="media_stop" scale_image="true" toggle="false"
-	     tool_tip="Stop streaming media" width="20" />
-	<volume_slider bottom="-23" control_name="AudioLevelMaster" height="22" increment="0.05"
-	     initial_val="0.5" left_delta="15" max_val="1" min_val="0"
-	     mouse_opaque="true" name="volume_slider" tool_tip="Master Volume"
-	     width="56" />
-	<button bottom="-19" control_name="MuteAudio" height="20"
-	     image_selected="icn_speaker-muted_dark.tga"
-	     image_unselected="icn_speaker_dark.tga" label="" left_delta="56"
-	     name="mute_master" toggle="true" tool_tip="Master Mute" width="24" />
-	<button bottom="-22" control_name="ShowVolumeSettingsPopup" height="22" label=""
-	     left_delta="19" name="expand" scale_image="true" toggle="true"
-	     tool_tip="Adjust individual volume levels" width="22" />
-        
+<panel name="media_controls">
+	<icon label="" name="music_icon" tool_tip="Reproduce/Pausa la música en streaming"/>
+	<button label="" name="music_play" tool_tip="Reproduce/Pausa la música en streaming"/>
+	<button label="" name="music_pause" tool_tip="Pausa la música en streaming"/>
+	<button label="" name="music_stop" tool_tip="Detiene la música en streaming"/>
+	<icon label="" name="media_icon" tool_tip="Reproduce/Pausa la música en streaming"/>
+	<button label="" name="media_play" tool_tip="Reproduce/Pausa la música en streaming"/>
+	<button name="media_pause" tool_tip="Pausa la música en streaming"/>
+	<button label="" name="media_stop" tool_tip="Detiene la música en streaming"/>
+	<volume_slider name="volume_slider" tool_tip="Volumen Maestro"/>
+	<button name="mute_master" tool_tip="Silencio Maestro"/>
+	<button label="" name="expand" tool_tip="Ajustes individuales de niveles de volumen"/>
 	<string name="play_label">
-		Play
+		Reproducir
 	</string>
 	<string name="stop_label">
-		Stop
+		Detener
 	</string>
 	<string name="pause_label">
-		Pause
+		Pausa
 	</string>
 	<string name="default_tooltip_label">
-		No Media Specified
+		No se ha especificado Media
 	</string>
 	<string name="media_hidden_label">
-		(URL hidden by parcel owner)
+		(La URL ha sido ocultada por el propietario de la parcela)
 	</string>
 	<string name="media_icon_tooltip_web">
-		This location displays content from the World Wide Web. Click the Play button to display Web content.
+		Esta ubicación muestra contenido desde la Web . Pulsa el botón Reproducir para ver cl contenido Web.
 	</string>
 	<string name="media_icon_tooltip_movie">
-		This location displays Video content. Click the Play button to play the video.
+		Esta ubicación muestra contenido de video. Pulsa Reproducir para ver el Vídeo.
 	</string>
 	<string name="media_play_tooltip">
-		Display Web content at this location.
+		Mostrar contenido web en esta ubicación.
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_media_hud.xml b/indra/newview/skins/default/xui/es/panel_media_hud.xml
index 1c0781a5b..f8f41c454 100644
--- a/indra/newview/skins/default/xui/es/panel_media_hud.xml
+++ b/indra/newview/skins/default/xui/es/panel_media_hud.xml
@@ -1,68 +1,32 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="false" follows="" height="160" visible="false" mouse_opaque="false"  
-     label="" name="MediaHUD" width="208" background_visible="false" background_opaque="false" bg_alpha_color="1 1 1 0.0">
-<panel name="media_region" left="20" right="-20" bottom="35" top="-20" follows="left|right|top|bottom" visible="true" background_opaque="false"
-       mouse_opaque="false"/>
+<panel label="" name="MediaHUD">
+	<panel name="media_region"/>
 	<!--icon name="bg_image" image_name="media_panel_hoverrectangle.png" visible="true" left="10" bottom="32" right="-10" top="-10" follows="left|right|top|bottom"/-->
 	<layout_stack orientation="horizontal" left="0" bottom="0" follows="left|right|bottom" visible="true" width="208" height="32">
 		<layout_panel user_resize="false"/>
 		<layout_panel user_resize="false" auto_resize="false" width="210" min_width="208">
-			<panel name="media_focused_controls" width="208" left="0" height="32" bottom="0" visible="true">
-				<icon name="media_panel_transportcontrols_bg" image_name="media_panel_bg.png" visible="true" height="32" width="99" scale_image="true" bottom="0"/>
-				<button name="back" label="" left="4" width="20" bottom="6" height="22" image_unselected="media_btn_back.png" 
-					image_selected="media_btn_back.png" scale_image="true"/>
-				<icon name="media_panel_divider-1" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="20" 
-					scale_image="false" bottom="5"/>
-				<button name="fwd" label="" left_delta="3"  width="17" bottom_delta="0" height="22" image_unselected="media_btn_forward.png" 
-					image_selected="media_btn_forward.png" scale_image="true"/>
-				<icon name="media_panel_divider-2" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="17" 
-					scale_image="false" bottom="5"/>
-				<button name="home" label="" left_delta="3"  width="22" bottom_delta="0" height="22" image_unselected="media_btn_home.png" 
-					image_selected="media_btn_home.png" scale_image="true"/>
-        <button name="media_stop" label="" left_delta="0"  width="22" bottom_delta="0" height="22" image_unselected="button_anim_stop.tga"
-					image_selected="button_anim_stop.tga" scale_image="true"/>
-        <icon name="media_panel_divider-3" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="22" 
-					scale_image="false" bottom="5"/>
-				<button name="reload" label="" left_delta="3"  width="22" bottom_delta="0" height="22" image_unselected="media_btn_reload.png" 
-					image_selected="media_btn_reload.png" scale_image="true"/>
-				<button name="stop" label="" left_delta="0"  width="22" bottom_delta="0" height="22" image_unselected="media_btn_stoploading.png" 
-					image_selected="media_btn_stoploading.png" scale_image="true" visible="false"/>
-        <button name="play" label="" left_delta="0"  width="22" bottom_delta="0" height="22" image_unselected="button_anim_play.tga"
-					image_selected="button_anim_play.tga" scale_image="true" visible="false"/>
-        <button name="pause" label="" left_delta="0"  width="22" bottom_delta="0" height="22" image_unselected="button_anim_pause.tga"
-					image_selected="button_anim_pause.tga" scale_image="true" visible="false"/>
-        <icon name="media_panel_scrollbg" image_name="media_panel_scrollbg.png" visible="true" height="32" width="32" 
-					scale_image="false" bottom="0" left="97"/>
-				<button name="scrollup" label="" left="109" width="8" bottom="20" height="8" image_unselected="media_btn_scrollup.png" 
-					image_selected="media_btn_scrollup.png" scale_image="false"/>
-				<button name="scrollleft" label="" left="100" width="8" bottom="12" height="8" image_unselected="media_btn_scrollleft.png" 
-					image_selected="media_btn_scrollleft.png" scale_image="false"/>
-				<button name="scrollright" label="" left="117" width="8" bottom="12" height="8" image_unselected="media_btn_scrollright.png" 
-					image_selected="media_btn_scrollright.png" scale_image="false"/>
-				<button name="scrolldown" label="" left="109" width="8" bottom="4" height="8" image_unselected="media_btn_scrolldown.png" 
-					image_selected="media_btn_scrolldown.png" scale_image="false"/>
-				<icon name="media_panel_metacontrols_bg" image_name="media_panel_bg.png" visible="true" height="32" width="81" 
-					scale_image="true" bottom="0" left="127"/>
-				<button name="zoom_frame" label="" left_delta="4" width="22" bottom="5" height="22" image_unselected="media_btn_optimalzoom.png" 
-					image_selected="media_btn_optimalzoom.png" scale_image="true"/>
-				<icon name="media_panel_divider-4" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="22" 
-					scale_image="false" bottom="5"/>
-				<button name="new_window" label="" left_delta="3" width="24" bottom_delta="1" height="22" image_unselected="media_btn_newwindow.png" 
-					image_selected="media_btn_newwindow.png" scale_image="true"/>
-				<icon name="media_panel_divider-5" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="24" 
-					scale_image="false" bottom="5"/>
-				<button name="close" label="" left_delta="3" width="21" bottom_delta="1" height="22" image_unselected="media_btn_done.png" 
-					image_selected="media_btn_done.png" scale_image="true"/>
+			<panel name="media_focused_controls">
+				<button name="back" label=""/>
+				<button name="fwd" label=""/>
+				<button name="home" label=""/>
+				<button name="media_stop" label=""/>
+				<button name="reload" label=""/>
+				<button name="stop" label=""/>
+				<button name="play" label=""/>
+				<button name="pause" label=""/>
+				<button name="scrollup" label=""/>
+				<button name="scrollleft" label=""/>
+				<button name="scrollright" label=""/>
+				<button name="scrolldown" label=""/>
+				<button name="zoom_frame" label=""/>
+				<button name="new_window" label=""/>
+				<button name="close" label=""/>
 			</panel>
-			<panel name="media_hover_controls" width="57" left="74" height="32" bottom="0" visible="false">
-				<icon name="media_panel_metacontrols_bg-hover" image_name="media_panel_bg.png" visible="true" height="32" width="57" scale_image="true" bottom="0" left="0"/>
-				<button name="zoom_frame_hover" label="" left_delta="4" width="22" bottom="5" height="22" image_unselected="media_btn_optimalzoom.png" image_selected="media_btn_optimalzoom.png" 
-					scale_image="true"/>
-				<icon name="media_panel_divider" image_name="media_panel_divider.png" visible="true" height="22" width="3" left_delta="22" scale_image="false" bottom="5"/>
-				<button name="new_window_hover" label="" left_delta="3" width="24" bottom_delta="1" height="22" image_unselected="media_btn_newwindow.png" image_selected="media_btn_newwindow.png" 
-					scale_image="true"/>
+			<panel name="media_hover_controls">
+				<button name="zoom_frame_hover" label=""/>
+				<button name="new_window_hover" label=""/>
 			</panel>
-    </layout_panel>
+		</layout_panel>
 		<layout_panel user_resize="false"/>
 	</layout_stack> 
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_media_remote.xml b/indra/newview/skins/default/xui/es/panel_media_remote.xml
index 86c977d06..a89f95cf9 100644
--- a/indra/newview/skins/default/xui/es/panel_media_remote.xml
+++ b/indra/newview/skins/default/xui/es/panel_media_remote.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bg_visible="false" border="false" border_visible="false" bottom="0"
-     enabled="true" follows="right|bottom" height="20" left="0"
-     name="media_remote" use_bounding_rect="true" width="220">
-	<panel bottom="1" filename="panel_bg_tab.xml" height="22" left="0" width="220" />
-	<panel bottom="3" filename="panel_media_controls.xml" height="20" left="0" width="220" />
+<panel name="media_remote">
+	<panel filename="panel_bg_tab.xml"/>
+	<panel filename="panel_media_controls.xml"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_media_remote_expanded.xml b/indra/newview/skins/default/xui/es/panel_media_remote_expanded.xml
index 726653614..8bd40ca20 100644
--- a/indra/newview/skins/default/xui/es/panel_media_remote_expanded.xml
+++ b/indra/newview/skins/default/xui/es/panel_media_remote_expanded.xml
@@ -1,33 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bg_visible="false" border="false" border_visible="false" bottom="1"
-     follows="right|bottom" height="185" left="0" name="media_remote"
-     use_bounding_rect="true" width="220">
-	<panel bottom="0" filename="panel_bg_tab.xml" height="187" left="0" width="220" />
-	<panel border="false" bottom="22" filename="panel_audio.xml" height="160"
-	     label="Audio &amp; Video" name="Volume Panel" width="220" />
-	<panel bottom_delta="-10" filename="panel_media_controls.xml" left="0" />
-        	<string name="play_label">
-		Play
+<panel name="media_remote">
+	<panel filename="panel_bg_tab.xml"/>
+	<panel label="Audio &amp; Vídeo" name="Volume Panel"/>
+	<panel filename="panel_media_controls.xml"/>
+	<string name="play_label">
+		Reproducir
 	</string>
 	<string name="stop_label">
-		Stop
+		Detener
 	</string>
 	<string name="pause_label">
-		Pause
+		Pausa
 	</string>
 	<string name="default_tooltip_label">
-		No Media Specified
+		No se ha especificado media
 	</string>
 	<string name="media_hidden_label">
-		(URL hidden by parcel owner)
+		(la URL ha sido ocultada por el propietario de la parcela)
 	</string>
 	<string name="media_icon_tooltip_web">
-		This location displays content from the World Wide Web. Click the Play button to display Web content.
+		Esta ubicación muestra contenido desde la Web . Pulsa el botón Reproducir para ver cl contenido Web.
 	</string>
 	<string name="media_icon_tooltip_movie">
-		This location displays Video content. Click the Play button to play the video.
+		Esta ubicación muestra contenido de video. Pulsa Reproducir para ver el Vídeo.
 	</string>
 	<string name="media_play_tooltip">
-		Display Web content at this location.
+		Mostrar contenido web en esta ubicación.
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_mini_map.xml b/indra/newview/skins/default/xui/es/panel_mini_map.xml
index b5428190c..4f9af1e1b 100644
--- a/indra/newview/skins/default/xui/es/panel_mini_map.xml
+++ b/indra/newview/skins/default/xui/es/panel_mini_map.xml
@@ -1,53 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel background_opaque="false" background_visible="true" bg_alpha_color="NetMapBackgroundColor"
-	 border="false" follows="left|top|right|bottom" height="216" label="Mini Map"
-	 mouse_opaque="false" name="mini_mapview" width="196">
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		 bottom="-40" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
-		 halign="left" height="10" left="80" mouse_opaque="false" name="n_label"
-		 text_color="1, 1, 1, 0.7" v_pad="0" width="10">
+<panel label="MiniMapa" name="mini_mapview">
+	<text name="n_label">
 		N
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		 bottom="-80" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
-		 halign="left" height="10" left="120" mouse_opaque="false" name="e_label"
-		 text_color="1, 1, 1, 0.7" v_pad="0" width="10">
+	<text name="e_label">
 		E
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		 bottom="-120" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
-		 halign="left" height="10" left="80" mouse_opaque="false" name="s_label"
-		 text_color="1, 1, 1, 0.7" v_pad="0" width="10">
+	<text name="s_label">
 		S
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		 bottom="-80" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
-		 halign="left" height="10" left="40" mouse_opaque="false" name="w_label"
-		 text_color="1, 1, 1, 0.7" v_pad="0" width="11">
-		W
+	<text name="w_label">
+		O
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		 bottom="-60" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
-		 halign="left" height="10" left="100" mouse_opaque="false" name="ne_label"
-		 text_color="1, 1, 1, 0.7" v_pad="0" width="20">
+	<text name="ne_label">
 		NE
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		 bottom="-100" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
-		 halign="left" height="10" left="100" mouse_opaque="false" name="se_label"
-		 text_color="1, 1, 1, 0.7" v_pad="0" width="20">
+	<text name="se_label">
 		SE
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		 bottom="-100" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
-		 halign="left" height="10" left="60" mouse_opaque="false" name="sw_label"
-		 text_color="1, 1, 1, 0.7" v_pad="0" width="21">
-		SW
+	<text name="sw_label">
+		SO
 	</text>
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		 bottom="-60" drop_shadow_visible="false" font="SansSerifSmall" h_pad="0"
-		 halign="left" height="1-" left="60" mouse_opaque="false" name="nw_label"
-		 text_color="1, 1, 1, 0.7" v_pad="0" width="21">
-		NW
+	<text name="nw_label">
+		NO
 	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_notifications_channel.xml b/indra/newview/skins/default/xui/es/panel_notifications_channel.xml
index 4e2339287..258da9022 100644
--- a/indra/newview/skins/default/xui/es/panel_notifications_channel.xml
+++ b/indra/newview/skins/default/xui/es/panel_notifications_channel.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="notifications_panel" width="100" height="100" user_resize="true" >
-  <layout_stack name="stack1" left="0" bottom="2" width="100" height="78" follows="left|right|top|bottom" orientation="horizontal" >
-    <scroll_list user_resize="true"  draw_heading="true" left="0" bottom="0" width="100" height="78" follows="left|right|top|bottom" name="notifications_list" sort_column="2" sort_ascending="false">
-      <column label="Name" name="name" width="100" user_resize="true"/>
-      <column label="Content" name="content" width="150" user_resize="true" dynamicwidth="true"/>
-      <column label="Date" name="date" width="150" user_resize="true"/>
-    </scroll_list>
-    <scroll_list user_resize="true"  draw_heading="true" left="0" bottom="0" width="100" height="78" follows="left|right|top|bottom" name="notification_rejects_list" sort_column="2" sort_ascending="false">
-      <column label="Name" name="name" width="100" user_resize="true"/>
-      <column label="Content" name="content" width="150" user_resize="true" dynamicwidth="true"/>
-      <column label="Date" name="date" width="150" user_resize="true"/>
-    </scroll_list>
-  </layout_stack>
-  <button name="header" label="" image="rounded_square.tga" left="0" bottom="-20" width="100" height="20" follows="left|right|top" toggle="true"/>
+<panel name="notifications_panel">
+  <layout_stack name="stack1">
+		<scroll_list name="notifications_list">
+			<column label="Nombre" name="name"/>
+			<column label="Contenido" name="content"/>
+			<column label="Fecha" name="date"/>
+		</scroll_list>
+		<scroll_list name="notification_rejects_list">
+			<column label="Nombre" name="name"/>
+			<column label="Contenido" name="content"/>
+			<column label="Fecha" name="date"/>
+		</scroll_list>
+	</layout_stack>
+	<button name="header" label="" />
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_overlaybar.xml b/indra/newview/skins/default/xui/es/panel_overlaybar.xml
index 090a164d8..cfecad4f7 100644
--- a/indra/newview/skins/default/xui/es/panel_overlaybar.xml
+++ b/indra/newview/skins/default/xui/es/panel_overlaybar.xml
@@ -1,78 +1,37 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel follows="left|right|bottom|top" height="200" left="-1" mouse_opaque="false"
-     name="overlay" use_bounding_rect="true" width="728">
-	<layout_stack bottom="0" follows="left|right|bottom" height="200" left="0"
-	     mouse_opaque="false" name="overlay_layout_panel" orientation="horizontal"
-	     right="-1" use_bounding_rect="true">
-		<layout_panel auto_resize="true" bottom="0" left="0" min_width="420" mouse_opaque="false"
-		     use_bounding_rect="true" user_resize="false" width="420" name="main_panel">
-			<layout_stack bottom="0" follows="left|right|bottom|top" height="50" left="0"
-			     mouse_opaque="false" name="chatbar_and_buttons" orientation="vertical"
-			     right="420" use_bounding_rect="true">
-				<layout_panel auto_resize="true" bottom="0" follows="left|bottom|right|top" height="0"
-				     left="0" min_height="20" min_width="100" mouse_opaque="false"
-				     name="padding" use_bounding_rect="true" user_resize="false" width="420" />
-				<layout_panel auto_resize="false" bottom="0" follows="left|bottom|right|top" height="20"
-				     left="0" min_height="20" min_width="100" mouse_opaque="false"
-				     name="state_buttons" use_bounding_rect="true" user_resize="false"
-				     width="420">
-					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
-					     label="New IM" label_selected="New IM" left="0"
-					     name="New IM" scale_image="true"
-					     tool_tip="You have an instant message pending. Click to show IMs."
-					     width="102" />
-					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
-					     label="Set Not Busy" label_selected="Set Not Busy" left="114"
-					     name="Set Not Busy" scale_image="true"
-					     tool_tip="Chat and IM is hidden for you. Click here to set yourself not busy."
-					     width="102" />
-					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
-					     label="Flycam" label_selected="Flycam" left="229" name="Flycam" scale_image="true"
-					     tool_tip="Your camera is under joystick control, click here to release it."
-					     width="102" />
-					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
-					     label="Mouselook" label_selected="Mouselook" left="343" name="Mouselook"
-					     scale_image="true"
-					     tool_tip="Use mouse to steer your view. If you have a gun, clicking will shoot."
-					     width="102" />
-					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
-					     label="Stand Up" label_selected="Stand Up" left="457" name="Stand Up"
-					     scale_image="true" tool_tip="Click here to stand up." width="102" />
-          <button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
-					     label="Cancel TP" label_selected="Cancel TP" left="571" name="Cancel TP"
-					     scale_image="true" tool_tip="Click here to cancel the current teleport process." width="102" />
-        </layout_panel>
-				<layout_panel auto_resize="false" background_visible="false" border="false" bottom="0"
-				     filename="panel_chat_bar.xml" follows="left|right|bottom" left="0"
-				     min_height="24" mouse_opaque="false" name="chat_bar"
-				     use_bounding_rect="true" width="395" />
+<panel name="overlay">
+	<layout_stack name="overlay_layout_panel">
+		<layout_panel name="main_panel">
+			<layout_stack name="chatbar_and_buttons">
+				<layout_panel name="padding"/>
+				<layout_panel name="state_buttons">
+					<button label="Nuevo MI" label_selected="Nuevo MI" name="New IM" tool_tip="Tienes un Mensaje Instantáneo pendiente. Pulsa para ver los MIs"/>
+					<button label="Fijar No Ocupado" label_selected="Fijar No Ocupado" name="Set Not Busy" tool_tip="El Chat y los MI están ocultos para ti. Pulsa aquí para definir tu estado como No Ocupado"/>
+					<button label="Flycam" label_selected="Flycam" name="Flycam" tool_tip="Tu cámara está siendo controlada por un joystick, pulsa aquí para liberar el control"/>
+					<button label="Vista Subjetiva" label_selected="Vista Subjetiva" name="Mouselook" tool_tip="Usa el mouse para dirigir tu vista. Si tienes un arma, pulsando el botón del ratón harás fuego"/>
+					<button label="Pararse" label_selected="Pararse" name="Stand Up" tool_tip="Pulsa aquí para pararte"/>
+					<button label="Cancelar TP" label_selected="Cancelar TP" name="Cancel TP" tool_tip="Pulsa aquí para cancerla el proceso de teleporte actual"/>
+				</layout_panel>
+				<layout_panel name="chat_bar"/>
 			</layout_stack>
 		</layout_panel>
-		<layout_panel auto_resize="false" bottom="0" left="0" min_width="96" mouse_opaque="false"
-			name="ao_remote_container" use_bounding_rect="true" user_resize="false"
-			width="100">
-			<panel background_visible="false" border="false" bottom="0" name="ao_remote" />
+		<layout_panel name="ao_remote_container">
+			<panel name="ao_remote"/>
 		</layout_panel>
-		<layout_panel auto_resize="false" bottom="0" left="0" min_width="220" mouse_opaque="false"
-		     name="media_remote_container" use_bounding_rect="true" user_resize="false"
-		     width="220">
-			<panel background_visible="false" border="false" bottom="0" name="media_remote" />
+		<layout_panel name="media_remote_container">
+			<panel name="media_remote"/>
 		</layout_panel>
-		<layout_panel auto_resize="false" bottom="0" left="0" min_width="130" mouse_opaque="false"
-		     name="voice_remote_container" use_bounding_rect="true" user_resize="false"
-		     width="128">
-			<panel background_visible="false" border="false" bottom="0" name="voice_remote" />
+		<layout_panel name="voice_remote_container">
+			<panel name="voice_remote"/>
 		</layout_panel>
-		<layout_panel auto_resize="false" bottom="0" mouse_opaque="false"
-		     name="AdvSettings_container" use_bounding_rect="true" user_resize="false" min_width="30" >
-			<panel background_visible="false" border="false" bottom="0" name="Adv_Settings" />
+		<layout_panel name="AdvSettings_container">
+			<panel name="Adv_Settings"/>
 		</layout_panel>
-		<layout_panel auto_resize="false" bottom="0" mouse_opaque="false"
-		     name="AdvSettings_container_exp" use_bounding_rect="true" user_resize="false" min_width="200" >
-			<panel background_visible="false" border="false" bottom="0" name="Adv_Settings" />
+		<layout_panel name="AdvSettings_container_exp">
+			<panel name="Adv_Settings"/>
 		</layout_panel>
 	</layout_stack>
-  <string name="unread_count_string_plural">
-    New IMs
-  </string>
+	<string name="unread_count_string_plural">
+		Nuevos MIs
+	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_place.xml b/indra/newview/skins/default/xui/es/panel_place.xml
index f3ccd14ce..bdd556825 100644
--- a/indra/newview/skins/default/xui/es/panel_place.xml
+++ b/indra/newview/skins/default/xui/es/panel_place.xml
@@ -1,55 +1,39 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="false" bottom="20" can_close="true" can_minimize="true"
-     can_resize="false" follows="bottom|left" height="400" left="330"
-     name="Place" title="Place" width="450">
-	<texture_picker bottom="95" follows="left|top" height="300" left="20" name="snapshot_ctrl"
-	     width="400" />
-	<text bottom_delta="-10" follows="left|top" font="SansSerif" height="20" left="20" name="name_label">
-		Name:
+<panel name="Place" title="Lugar">
+	<text name="name_label">
+		Nombre:
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
-	     name="name_editor" width="361" />
-	<text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20" name="description_label">
-		Description:
+	<text name="description_label">
+		Descripción:
 	</text>
-	<text_editor bottom_delta="-68" enabled="false" follows="left|top"
-	     font="SansSerif" height="70" left="20" max_length="1023" name="desc_editor"
-	     width="400" word_wrap="true" spell_check="true" />
-	<text bottom_delta="-25" follows="left|top" font="SansSerif" height="20" left="20" name="information_label">
-		Information:
+	<text name="information_label">
+		Información:
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
-	     name="info_editor" width="328" />
-	<text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20" name="location_label">
-		Location:
+	<text name="location_label">
+		Ubicación:
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
-	     name="location_editor" width="342" />
-	<button bottom_delta="-20" follows="left|top" height="20" label="Teleport" left="20"
-	     name="teleport_btn" width="100" />
-	<button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="130"
-	     name="map_btn" width="100" />
-	<button bottom_delta="0" follows="left|top" height="20" label="Bids..." left="275"
-	     name="auction_btn" width="80" />
+	<button label="Teleportar" name="teleport_btn"/>
+	<button label="Mostrar en el Mapa" name="map_btn"/>
+	<button label="Ofertas..." name="auction_btn"/>
 	<string name="traffic_text">
-		Traffic: [TRAFFIC]
+		Tráfico: [TRAFFIC]
 	</string>
 	<string name="area_text">
-		Area: [AREA] m². 
+		Superficie: [AREA] m². 
 	</string>
 	<string name="forsale_text">
-		For Sale for [CURRENCY][PRICE]
+		En venta por [CURRENCY][PRICE]
 	</string>
 	<string name="auction_text">
-		Auction ID [ID].
+		ID de la Subasta [ID].
 	</string>
 	<string name="server_update_text">
-		Place information not available without server update.
+		La información del lugar no está disponible sin una actualización del servidor.
 	</string>
 	<string name="server_error_text">
-		Information about this location is unavailable at this time, please try again later.
+		La información de esta ubicación no está disponible actualmente, por favor, intenta de nuevo más tarde.
 	</string>
 	<string name="server_forbidden_text">
-		Information about this location is unavailable due to access restrictions.  Please check your permissions with the parcel owner.
+		La información de esta ubicación no está disponible debido a la restricción de acceso. Por favor, verifica tus permisos con el propietario de la parcela.
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_place_small.xml b/indra/newview/skins/default/xui/es/panel_place_small.xml
index 989077272..4361a25a1 100644
--- a/indra/newview/skins/default/xui/es/panel_place_small.xml
+++ b/indra/newview/skins/default/xui/es/panel_place_small.xml
@@ -1,60 +1,42 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="false" bottom="20" can_close="true" can_minimize="true"
-     can_resize="false" follows="bottom|left" height="400" left="380"
-     name="Place" title="Place" width="450">
-	<texture_picker bottom="-274" follows="left|top" height="270" left="20" name="snapshot_ctrl"
-	     width="360" />
-	<text bottom_delta="-12" follows="left|top" font="SansSerif" height="20" left="20" name="name_label">
-		Name:
+<panel name="Place" title="Lugar">
+	<text name="name_label">
+		Nombre:
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
-	     name="name_editor" width="320" />
-	<text bottom_delta="-24" follows="left|top" font="SansSerif" height="20" left="20" name="description_label">
-		Description:
+	<text name="description_label">
+		Descripción:
 	</text>
-	<text_editor bg_readonly_color="clear" bottom_delta="-68" enabled="false" follows="left|top"
-	     font="SansSerif" height="70" left="20" max_length="1023" name="desc_editor"
-	     width="360" word_wrap="true" spell_check="true" />
-	<text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20" name="information_label">
-		Information:
+	<text name="information_label">
+		Información:
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
-	     name="info_editor" width="328" />
-	<text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20" name="land_type_label">
-		Land Type:
+	<text name="land_type_label">
+		Tipo de Terreno:
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
-	     name="land_type_display" width="342" />
-	<text bottom_delta="-20" follows="left|top" font="SansSerif" height="20" left="20" name="location_label">
-		Location:
+	<text name="location_label">
+		Ubicación:
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="95"
-	     name="location_editor" width="342" />
-	<button bottom_delta="-25" follows="left|top" height="20" label="Teleport" left="20"
-	     name="teleport_btn" width="100" />
-	<button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="130"
-	     name="map_btn" width="100" />
-	<button bottom_delta="0" follows="left|top" height="20" label="Bids..." left="275"
-	     name="auction_btn" width="80" />
+	<button label="Teleportar" name="teleport_btn"/>
+	<button label="Mostrar en el Mapa" name="map_btn"/>
+	<button label="Ofertas..." name="auction_btn"/>
 	<string name="traffic_text">
-		Traffic: [TRAFFIC]
+		Tráfico: [TRAFFIC]
 	</string>
 	<string name="area_text">
-		Area: [AREA] m². 
+		Superficie: [AREA] m². 
 	</string>
 	<string name="forsale_text">
-		For Sale for [CURRENCY][PRICE]
+		En venta por [CURRENCY][PRICE]
 	</string>
 	<string name="auction_text">
-		Auction ID [ID].
+		ID de la Subasta [ID].
 	</string>
 	<string name="server_update_text">
-		Place information not available without server update.
+		La información del lugar no está disponible sin una actualización del servidor.
 	</string>
 	<string name="server_error_text">
-		Information about this location is unavailable at this time, please try again later.
+		La información de esta ubicación no está disponible actualmente, por favor, intenta de nuevo más tarde.
 	</string>
 	<string name="server_forbidden_text">
-		Information about this location is unavailable due to access restrictions.  Please check your permissions with the parcel owner.
+		La información de esta ubicación no está disponible debido a la restricción de acceso. Por favor, verifica tus permisos con el propietario de la parcela.
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_ascent_chat.xml
index 8b565a950..c42c2355b 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_chat.xml
@@ -1,134 +1,134 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Chat Avanzado" name="ascsys">
-	  <tab_container label="Chat Avanzado" name="Ascent Chat">
-			 <panel label="Chat/MI" name="Chat/IM">
-					<text name="objects_link_text_box">
-						  MIs:
-					</text>
-					<check_box label="Usar Pestañas de MI Verticales (Requiere reiniciar)" name="use_vertical_ims_check"/>
-					<check_box label="Anunciar Mensajes Instantáneos Entrantes" tool_tip="Abre una ventana de MI cuando alguien comienza a escribirte un MI. Esto te permite conocer cuando alguien te abre un MI antes de enviartelo." name="quickstart_im_check"/>
-					<check_box label="No enviar '[nombre] está escribiendo...'  en MIs" tool_tip="Tu contacto de MI no verá '______ está escribiendo...' cuando le respondes." name="hide_typing_check"/>
-					<check_box label="Mostrar nombre del grupo en el chat" tool_tip="El nombre del grupo también será mostrado si el MI es de un chat de grupo." name="append_group_name_check"/>
-					<!-- Left/Right Column split  
-					<view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"	left="235" name="CmdDivisor" width="0"/>
-					-->
-					<text name="objects_link_text_box2">
-						  Chat:
-					</text>
-					<check_box label="Ejecutar sonido de escritura en chat local" tool_tip="Silencia el sonido de escritura, haciendo que determinadas cosas sean mas tranquilas, como las actuaciones en vivo." name="play_typing_sound_check"/>
-					<check_box label="No Mostrar/registrar notificaciones en chat" name="hide_notifications_in_chat_check"/>
-					<check_box label="Permitir Método MU pose." tool_tip="Permite el uso de  /me y :  para enviar emotes." name="allow_mu_pose_check"/>
-					<check_box label="Cerrar Automáticamente comentarios OOC." tool_tip="Agregar automáticamente al final '))' en cualquier mensaje que comience con '((', o viseversa." name="close_ooc_check"/>
-					<text name="objects_link_text_box3">
-						  Mostrar en el historial de chat links de chat de objetos para:
-					</text>
-					<radio_group tool_tip="Habilitar link para mostrar al propietario de un objeto de chat." name="objects_link">
-						  <radio_item name="no_object">
-								 Ningún Objeto
-						  </radio_item>
-						  <radio_item name="others_objects">
-								 Objetos de Otros
-						  </radio_item>
-						  <radio_item name="anyones_objects">
-								 Objetos de Cualquiera
-						  </radio_item>
-					</radio_group>
-					<text name="time_format_text_box">
-						  Formato de Hora:
-					</text>
-					<combo_box tool_tip="Muestras las horas o bien en formato 12-23 o 12PM-11PM." name="time_format_combobox">
-						  <combo_item name="24hours">
-								 Reloj de 24-horas
-						  </combo_item>
-						  <combo_item name="12hours">
-								 Reloj de 12-horas
-						  </combo_item>
-					</combo_box>
-					<check_box label="Agregar segundos en la hora del chat/IMs" name="seconds_in_chat_and_ims_check"/>
-					<text name="date_format_text_box">
-						  Formato de Fecha:
-					</text>
-					<combo_box name="date_format_combobox">
-						  <combo_item name="year_first">
-								 YYYY-MM-DD
-						  </combo_item>
-						  <combo_item name="day_first">
-								 DD/MM/YYYY
-						  </combo_item>
-						  <combo_item name="month_first">
-								 MM/DD/YYYY
-						  </combo_item>
-					</combo_box>
-					<!-- Auto-responder -->
-					<check_box label="Habilitar Respuesta Automática" name="AscentInstantMessageResponseAnyone" tool_tip=" Envia un mensaje pre-grabado de tu elección cuando alguien te abre un IM. (Escribe tu mensaje en el área de texto  de la Ventana Texto de Respuesta."/>
-					<check_box label="Responder a no amigos" name="AscentInstantMessageResponseFriends" tool_tip="Envia un mensaje pre-grabado de tu elección cuando alguien te abre un IM. (Escribe tu mensaje en el área de texto  de la Ventana Texto de Respuesta."/>
-					<check_box label="Responder a quienes tienes ignorados" name="AscentInstantMessageResponseMuted" tool_tip="Envia un mensaje pre-grabado de tu elección cuando alguien te abre un IM. (Escribe tu mensaje en el área de texto  de la Ventana Texto de Respuesta."/>
-					<check_box label="Enviar apenas comienzan a escribir" name="AscentInstantMessageShowOnTyping"/>
-					<check_box label="No mostrar MIs contestados automáticamente" name="AscentInstantMessageShowResponded"/>
-					<check_box label="Responder a todos los mensajes" name="AscentInstantMessageResponseRepeat"/>
-					<check_box label="Enviar un item junto con la respuesta" name="AscentInstantMessageResponseItem" tool_tip="Puedes incluir un item de tu inventario para enviar junto con tu respuesta automática, arrástrandolo desde tu inventario al cuadro inferior"/>
-					<text name="text_box1">
-						  Texto de Respuesta:
-					</text>
-					<text name="text_box2">
+	<tab_container label="Chat Avanzado" name="Ascent Chat">
+		<panel label="Chat/MI" name="Chat/IM">
+			<text name="objects_link_text_box">
+				MIs:
+			</text>
+			<check_box label="Usar Pestañas de MI Verticales (Requiere reiniciar)" name="use_vertical_ims_check"/>
+			<check_box label="Anunciar Mensajes Instantáneos Entrantes" tool_tip="Abre una ventana de MI cuando alguien comienza a escribirte un MI. Esto te permite conocer cuando alguien te abre un MI antes de enviartelo." name="quickstart_im_check"/>
+			<check_box label="No enviar '[nombre] está escribiendo...'  en MIs" tool_tip="Tu contacto de MI no verá '______ está escribiendo...' cuando le respondes." name="hide_typing_check"/>
+			<check_box label="Mostrar nombre del grupo en el chat" tool_tip="El nombre del grupo también será mostrado si el MI es de un chat de grupo." name="append_group_name_check"/>
+			<text name="objects_link_text_box2">
+				Chat:
+			</text>
+			<check_box label="Ejecutar sonido de escritura en chat local" tool_tip="Silencia el sonido de escritura, haciendo que determinadas cosas sean mas tranquilas, como las actuaciones en vivo." name="play_typing_sound_check"/>
+			<check_box label="No Mostrar/registrar notificaciones en chat" name="hide_notifications_in_chat_check"/>
+			<check_box label="Permitir Método MU pose." tool_tip="Permite el uso de  /me y :  para enviar emotes." name="allow_mu_pose_check"/>
+			<check_box label="Cerrar Automáticamente comentarios OOC." tool_tip="Agregar automáticamente al final '))' en cualquier mensaje que comience con '((', o viseversa." name="close_ooc_check"/>
+			<text name="objects_link_text_box3">
+				Mostrar en el historial de chat links de chat de objetos para:
+			</text>
+			<radio_group tool_tip="Habilitar link para mostrar al propietario de un objeto de chat." name="objects_link">
+				<radio_item name="no_object">
+					Ningún Objeto
+				</radio_item>
+				<radio_item name="others_objects">
+					Objetos de Otros
+				</radio_item>
+				<radio_item name="anyones_objects">
+					Objetos de Cualquiera
+				</radio_item>
+			</radio_group>
+			<text name="time_format_text_box">
+				Formato de Hora:
+			</text>
+			<combo_box tool_tip="Muestras las horas o bien en formato 12-23 o 12PM-11PM." name="time_format_combobox">
+				<combo_item name="24hours">
+					Reloj de 24-horas
+				</combo_item>
+				<combo_item name="12hours">
+					Reloj de 12-horas
+				</combo_item>
+			</combo_box>
+			<check_box label="Agregar segundos en la hora del chat/IMs" name="seconds_in_chat_and_ims_check"/>
+			<text name="date_format_text_box">
+				Formato de Fecha:
+			</text>
+			<combo_box name="date_format_combobox">
+				<combo_item name="year_first">
+					YYYY-MM-DD
+				</combo_item>
+				<combo_item name="day_first">
+					DD/MM/YYYY
+				</combo_item>
+				<combo_item name="month_first">
+					MM/DD/YYYY
+				</combo_item>
+			</combo_box>
+			<!-- Auto-responder -->
+			<check_box label="Habilitar Respuesta Automática" name="AscentInstantMessageResponseAnyone" tool_tip=" Envia un mensaje pre-grabado de tu elección cuando alguien te abre un IM. (Escribe tu mensaje en el área de texto  de la Ventana Texto de Respuesta."/>
+			<check_box label="Responder a no amigos" name="AscentInstantMessageResponseFriends" tool_tip="Envia un mensaje pre-grabado de tu elección cuando alguien te abre un IM. (Escribe tu mensaje en el área de texto  de la Ventana Texto de Respuesta."/>
+			<check_box label="Responder a quienes tienes ignorados" name="AscentInstantMessageResponseMuted" tool_tip="Envia un mensaje pre-grabado de tu elección cuando alguien te abre un IM. (Escribe tu mensaje en el área de texto  de la Ventana Texto de Respuesta."/>
+			<check_box label="Enviar apenas comienzan a escribir" name="AscentInstantMessageShowOnTyping"/>
+			<check_box label="No mostrar MIs contestados automáticamente" name="AscentInstantMessageShowResponded"/>
+			<check_box label="Responder a todos los mensajes" name="AscentInstantMessageResponseRepeat"/>
+			<check_box label="Enviar un item junto con la respuesta" name="AscentInstantMessageResponseItem" tool_tip="Puedes incluir un item de tu inventario para enviar junto con tu respuesta automática, arrástrandolo desde tu inventario al cuadro inferior"/>
+			<text name="im_give_disp_rect_txt" tool_tip="Arrastra un ítem del Inventario hasta aquí para entregarlo junto con tu respuesta automática">
+				Arrastra un ítem aquí (Actualmente: NINGUNO)
+			</text>
+			<text name="text_box1">
+				Texto de Respuesta:
+			</text>
+			<text name="text_box2">
 #f nombre de usuario, #l apellido del usuario,
 #t para fecha y hora, #r para tu SLURL,
 #i tu tiempo inactivo. (p.e. "5 mins")
-					</text>
-			 </panel>
-
-			 <panel label="Spam" name="Spam">
-					<check_box label="Habilitar bloqueo de spam en chat" tool_tip="Habilita el bloqueo automático de spam en el chat" name="AscChatSpamBlock" control_name="SGBlockChatSpam"/>
-					<spinner label="Mensajes" tool_tip="Número de items de spam por tiempo. (Por Defecto: 10)" name="AscChatSpamCount"/>
-					<spinner label="Tiempo" name="AscChatSpamTime" tool_tip="Tiempo para evaluar el spam, en segundos. (Por defecto: 1.0)"/>
-					<text name="">
-						  segundos
-					</text>
-					<check_box label="Habilitar bloqueo de spam en Diálogos" tool_tip="Habilita el bloqueo automático del spam en ventanas de diálogo" name="AscDialogSpamBlock"/>
-					<check_box label="Habilitar bloqueo de Spam en Tarjetas de Llamada" tool_tip="Habilita el bloqueo automático del spam en Tarjetas de Llamada" name="AscCardSpamBlock"/>
-					<spinner label="Cantidad" name="AscSpamCount" tool_tip="Esta configuración se aplica tanto al Spam en ventanas de Diálogo como en Tarjetas de Llamada (Por Defecto: 4)"/>
-					<spinner label="Tiempo" name="AscSpamTime" tool_tip="Esta configuración se aplica tanto al Spam en ventanas de Diálogo como en Tarjetas de Llamada (Por Defecto: 1.0)"/>
-					<text name="">
-						  segundos
-					</text>
-			 </panel>
-
-			 <panel label="Opciones de Texto" name="TextOptions">
-					<check_box label="Mostrar en rojo palabras mal escritas" name="SpellDisplay"/>
-					<text name="EmSpell_txt1">
-						  Idioma actual (dicxionario):
-					</text>
-					<combo_box name="SpellBase"/>
-					<text name="EmSpell_txt3">
-						  Idiomas descagarados (diccionarios):
-					</text>
-					<combo_box name="EmSpell_Avail"/>
-					<button label="Instalar" name="EmSpell_Add" tool_tip=""/>
-					<button label="Descargar Más..." name="EmSpell_GetMore" tool_tip="Obtener más diccionarios disponibles en línea"/>
-					<text name="EmSpell_txt2">
-						  Idiomas Personalizados Adicionales (diccionarios):
-					</text>
-					<combo_box name="EmSpell_Installed" tool_tip=""/>
-					<button label="Quitar" name="EmSpell_Remove" tool_tip=""/>
-					<button label="Editar Diccionario Personalizado" name="EmSpell_EditCustom"/>
-					<text name="EmSpell_txt4">
+			</text>
+		</panel>
+		<panel label="Spam" name="Spam">
+			<check_box label="Sin Mensajes específicos en la cola de Spam" name="spammsg_checkbox" width="256"/>
+			<button label="Reiniciar colas antispam" label_selected="Reiniciar colas antispam" name="reset_antispam" width="230"/>
+			<spinner label="Tiempo Antispam (segundos):" name="antispamtime" tool_tip="Mas bajo es menos sensible"/>
+			<spinner label="Cantidad Antispam:" tool_tip="Mas alto es menos sensible" name="antispamamount"/>
+			<spinner label="Multiplicador para spam de sonidos:" tool_tip="Mas alto es menos sensible" name="antispamsoundmulti"/>
+			<spinner label="Multiplicador para antispam de sonidos precargados:"  tool_tip="Mas alto es menos sensible" name="antispamsoundpreloadmulti"/>
+			<spinner label="Cantidad de líneas nuevas de mensajes instablock:" tool_tip="Mas alto es menos sensible" name="antispamnewlines"/>
+			<check_box label="Desactivar -Todos- Diálogos (Se reinicia al iniciar sesión)" name="antispam_checkbox"/>
+			<text name="Block All Dialogs From">
+				Bloquear todos los diálogos de
+			</text>
+			<check_box label="Alertas" name="Alerts"/>
+			<check_box label="Ofertas de Amistad" name="Friendship Offers"/>
+			<check_box label="Invitación a Grupos" name="Group Invites"/>
+			<check_box label="Avisos de Grupos" name="Group Notices"/>
+			<check_box label="Oferta de �tems" name="Item Offers"/>
+			<check_box label="Scripts" name="Scripts"/>
+			<check_box label="Ofertas de Teleporte" name="Teleport Offers"/>
+			<check_box label="Notificar cuando se bloquea spam" name="Notify On Spam" tool_tip="Cuando se habilita, la esquina inferior derecha puede convertirse en una fuente de seudo spam cuando el spam reales bloqueado"/>
+		</panel>
+		<panel label="Opciones de Texto" name="TextOptions">
+			<check_box label="Mostrar en rojo palabras mal escritas" name="SpellDisplay"/>
+			<text name="EmSpell_txt1">
+				Idioma actual (diccionario):
+			</text>
+			<text name="EmSpell_txt3">
+				Idiomas descargados (diccionarios):
+			</text>
+			<button label="Instalar" name="EmSpell_Add" tool_tip=""/>
+			<button label="Descargar Más..." name="EmSpell_GetMore" tool_tip="Obtener más diccionarios disponibles en línea"/>
+			<text name="EmSpell_txt2">
+				Idiomas Personalizados Adicionales (diccionarios):
+			</text>
+			<combo_box name="EmSpell_Installed" tool_tip=""/>
+			<button label="Quitar" name="EmSpell_Remove" tool_tip=""/>
+			<button label="Editar Diccionario Personalizado" name="EmSpell_EditCustom"/>
+			<text name="EmSpell_txt4">
 Para usar el corrector ortográfico, botón derecho sobre la palabra
 errónea (en rojo u otro color) y selecciona reemplazarla
-					</text>
-
-					<check_box label="Resaltar Mensajes que contengan los términos" name="KeywordsOn"/>
-					<text name="keyword_txt1">
-						  (separados por comas)
-					</text>
-					<text name="EmKeyw">
-						  Se encuentre en:
-					</text>
-					<check_box label="Flotante de Chat Local" name="KeywordsInChat"/>
-					<check_box label="Flotante de Mensajes Instantáneos" name="KeywordsInIM"/>
-					<check_box label="Resaltar el Mensaje en este color:" name="KeywordsChangeColor"/>
-					<color_swatch name="KeywordsColor" tool_tip="Pulsa para abrir el selector de Colores"/>
-					<check_box label="Ejecutar este sonido de alerta: (UUID)" name="KeywordsPlaySound"/>
-			 </panel>
-
-	  </tab_container>
+			</text>
+			<check_box label="Resaltar Mensajes que contengan los términos" name="KeywordsOn"/>
+			<text name="keyword_txt1">
+				(separados por comas)
+			</text>
+			<text name="EmKeyw">
+				Se encuentre en:
+			</text>
+			<check_box label="Flotante de Chat Local" name="KeywordsInChat"/>
+			<check_box label="Flotante de Mensajes Instantáneos" name="KeywordsInIM"/>
+			<check_box label="Resaltar el Mensaje en este color:" name="KeywordsChangeColor"/>
+			<color_swatch name="KeywordsColor" tool_tip="Pulsa para abrir el selector de Colores"/>
+			<check_box label="Ejecutar este sonido de alerta: (UUID)" name="KeywordsPlaySound"/>
+		</panel>
+	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
index 0b4387f74..5e979a621 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
@@ -1,170 +1,167 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Sistema" name="ascsys">
-	  <tab_container label="Sistema Singularity" name="Ascent System">
-			 <panel label="General" name="User Interface">
-					<check_box label="Habilitar Teleport con doble click" tool_tip="Haciendo doble click en un objeto o persona te transportará hacia su ubicación." name="double_click_teleport_check"/>
-					<check_box label="Reiniciar la Cámara luego de Teleportar" tool_tip="Centra la cámara detrás tuyo luego de un teleport." name="center_after_teleport_check"/>
-					<check_box label="Desplazar destino TP a mitad de la altura del agente" tool_tip="Intenta apuntar el TP de modo que tus pies se apoyen en la tierra del punto al que estás apuntando." name="offset_teleport_check"/>
-					<check_box label="Vista Previa de Animaciones en el avatar en vez del maniquí antes de usar" tool_tip="La ventana de subida de Animaciones ejecutará las animaciones en tu avatar cuando ejecutes la vista previa." name="preview_anim_in_world_check"/>
-					<check_box label="Guardar los Scripts en el inventario como Mono en vez de LSL2" tool_tip="Los Scripts serán compilados automáticamente en Mono al guardarlos - Normalmente es sólo posible cuando están dentro de un objeto." name="save_scripts_as_mono_check"/>
-					<check_box label="Siempre rezear objetos con el grupo del terreno, cuando esté disponible" tool_tip="Rezear objetos con el mismo grupo del terreno sin importar tu grupo activo en el momento." name="always_rez_in_group_check"/>
-					<check_box label="Mostrar siempre el botón Construir como habilitado" tool_tip="Te habilita a utilizar el menu Construir sin tener que complicarte. No significa que puedas construir donde no esté permitido." name="always_build_check"/>
-					<check_box label="Permitir siempre volar" tool_tip="Te permite volar en lugares donde no está permitido. Utilizalo bajo tu responsabilidad, que puedas no significa que debas." name="always_fly_check"/>
-					<check_box label="Deshabilitar la Distancia Mínima de la Cámara" tool_tip="Permite a la cámara acercarse a los objetos." name="disable_camera_zoom_check"/>
-					<check_box label="Habilitar la funcionalidad Super Usuario" tool_tip="Agrega funciones consideradas demasiado peligrosas para un uso normal. Estas características pueden causar estragos, o hacer daño si son mal utilizadas - Principalmente para ti o tus pertenencias. Si estás seguro, activa la casilla de verificación a continuación." name="power_user_check"/>
-					<check_box label="Confirmar funcionalidad Super Usuario" tool_tip="Confirmar la activación de Super Usuario. Activalo bajo tu propio riesgo, y utiliza cualquier característica habilitada en forma responsable. Los desarrolladores de Singularity no reemplazarán nada que hayas arruinado. Te recomendamos hacer una copia de seguridad de todo aquello que será víctima de dichos poderes. A diferencia del resto de los items a marcar, debes hacer click en Aplicar o en OK después de activar esta función." name="power_user_confirm_check"/>
-					<check_box label="Activar Sistema Ascent de Inventario (Requiere Reinicio)" tool_tip="Crea una nueva carpeta en el inventario para almacenar archivos de configuración y assets no permanentes." name="system_folder_check"/>
-					<check_box label="Colocar las Subidas Temporales en la carpeta de asset del sistema." tool_tip="Coloca las subidas temporales en la carpeta de Assets, la cual está separada de las subidas actuales, haciendo que sean más fáciles de encontrar." name="temp_in_system_check"/>
-					<check_box label="Descargar automáticamente el inventario en segundo plano al de iniciar sesión" tool_tip="El inventario será precargado cuando inicies sesión, de esta manera no tienes que esperar que cargue cuando hagas una búsqueda por primera vez." name="fetch_inventory_on_login_check"/>
-					<check_box label="Activar Efectos del Viento" name="enable_wind"/>
-					<check_box label="Activar Nubes" name="enable_clouds"/>
-					<check_box label="Activar Nubes Clásicas" name="enable_classic_clouds"/>
-					<check_box label="Activar rezeado rápido vía distancia de dibujo paso a paso" name="speed_rez_check" tool_tip="Cuando está activo, esto incrementará progresivamente la distancia de dibujo, lo que permite que los objetos mas cercanos aparezcan primero."/>
-					<spinner label="Frecuencia de Distancia de Dibujo:" name="speed_rez_interval" />
-					<text name="speed_rez_seconds">
-						  segundos
-					</text>
-			 </panel>
-
-			 <panel label="Línea de Comandos" name="Command Line">
-					<check_box label="Activar uso de la barra de chat como línea de comandos" name="chat_cmd_toggle"/>
-					<text name="cmd_line_text_2">
-						  Teleportar en el sim (uso: cmd x y z)
-					</text>
-					<text name="cmd_line_text_3">
-						  Teleportar a la superficie (uso: cmd)
-					</text>
-					<text name="cmd_line_text_4">
-						  Teleportar a la altura (uso: cmd z)
-					</text>
-					<text name="cmd_line_text_5">
-						  Teleportar a Base (uso: cmd)
-					</text>
-					<text name="cmd_line_text_6">
-						  Rezear una Plataforma (uso: cmd 0 - 30)
-					</text>
-					<slider name="AscentPlatformSize" label="Ancho Predet.:" tool_tip="Tamaño que tendrá la plataforma"/>
-					<text name="cmd_line_text_8">
-						  Calc. expresiones (uso: cmd 2 + 2)
-					</text>
-					<text name="cmd_line_text_15">
-						  Limpiar historial de chat (uso: cmd)
-					</text>
-					<line_editor tool_tip="Limpia el Historial de chat para evitar el lag por efecto de los spammers de chat." name="AscentCmdLineClearChat"/>
-					<!-- Column Split -->
-					<text name="cmd_line_text_9">
-						  Cambiar Distancia de Dibujo (uso: cmd metros)
-					</text>
-					<text name="cmd_line_text_10">
-						  Teleportar a posición de la cámara (uso: cmd)
-					</text>
-					<text name="cmd_line_text_11">
-						  Nombre de avatar de su UUID (uso: cmd key)
-					</text>
-					<text name="cmd_line_text_12">
-						  Ofrecer Teleport a otro Avatar (uso: cmd key)
-					</text>
-					<text name="cmd_line_text_7">
-						  Teleportar a Sim x (uso: cmd Nombre del Sim)
-					</text>
-					<check_box label="Usar misma posición entre Sims" name="map_to_keep_pos"/>
-					<text name="cmd_line_text_13">
-						  Teleportar hasta avatar (uso: cmd nombre)
-					</text>
-					<line_editor tool_tip="La sintaxis de este comando permite nombres parciales y no es sensible a mayúsculas/minúsculas. Para obtener mejores resultados, úsalo con el radar abierto." name="AscentCmdLineTP2"/>
-					<text name="cmd_line_text_14">
-						  Cambiar falso estado Aussente (uso: cmd)
-					</text>
-			 </panel>
-
-			 <panel label="Seguridad" name="Security">
-					<check_box label="Transmitir efectos del Visor (No incluye rayos)" name="broadcast_viewer_effects"/>
-					<check_box label="Desactivar Apuntar a... y Rayos" tool_tip="No apunta hacia ni muestra tus rayos de edición cuando seleccionas un objeto." name="disable_point_at_and_beams_check"/>
-					<check_box label="No mirar hacia los Objetos (anula ShowLookAt)" tool_tip="Apaga la tansmisión de los giros de cabeza y rayos lookat propios." name="private_look_at_check"/>
-					<check_box label="Mostrar las balizas LookAt de los demás" tool_tip="Te muestra hacia donde miran los demas." name="show_look_at_check"/>
-					<check_box label="Captura silenciosa a Disco" tool_tip="Anula el sonido de la cámara y el alerta a los demás cuando realizas una captura al disco de tu PC" name="quiet_snapshots_check"/>
-					<check_box label="Al pararse, revoca el permiso de los objetos en los cuales estuvo sentado tu avatar" tool_tip="Los objetos retienen, generalmente, el permiso para tomar control y ejecutar animaciones hasta que se reinician u otro usuario le cede permisos. Activando esta opción te aseguras que los permisos serán revocados inmediatamente." name="revoke_perms_on_stand_up_check"/>
-					<check_box label="Desactivar click del ratón para sentarse en los objetos" tool_tip="Algunas herramientas de griefer se basan en forzarte o engañarte para que hagas click en un objeto el cual te hará sentar, dándole automáticamente al objeto permisos para ejecutar una animación entre de otras cosas. Esta opción desactivará la función llSitTarget - Esto significa que deberás seleccionar la opción 'Sentarse' en las bolas de animación o muebles." name="disable_click_sit_check"/>
-					<check_box label="Mostrar cambios del Total de Scripts en Ejecución:" name="totalscriptjumps" tool_tip="Muestra los cambios en la cuenta total de scritps en tu región, dependiendo del umbral que selecciones a la derecha."/>
-					<spinner left_delta="350" name="ScriptJumpCount" tool_tip="Umbral para el mensaje de salto de scripts [Predeterminado: 100]"/>
-			 </panel>
-
-			 <panel label="Construcción" name="Building">
-					<text name="text_box6">
-						  Punto de Pivote
-					</text>
-					<spinner label="Pos. X" name="X pos"/>
-					<spinner label="Pos. Y" name="Y pos"/>
-					<spinner label="Pos. Z" name="Z pos"/>
-					<check_box label="Los valores son en porcentaje" tool_tip="Los ajuste predeterminados se expresan en porcentajes y cada eje se ajusta en 50" name="EmPivotPercToggle"/>
-					<check_box label="Activar resaltado de prims seleccionados" name="EmBuildPrefsRenderHighlight_toggle" />
-					<check_box label="Mostrar Ejes en la posición del Prim Base" tool_tip="El comportamiento por defecto es mostrar el eje en el centro del conjunto de prims. Si está activado, el eje se muestra en la prim raíz del conjunto de enlaces." name="EmBuildPrefsActualRoot_toggle"/>
-					<text name="text_box7">
-						  Permitir sig. propietario:
-					</text>
-					<check_box label="Permiso de Copia" tool_tip="El próximo propietario puede realizar copias de las creaciones" name="next_owner_copy"/>
-					<check_box label="Permiso de Modific." tool_tip="El próximo propietario puede editar y modificar las creaciones" name="next_owner_modify"/>
-					<check_box label="Permiso de Transf." tool_tip="Next owner can give(or sell) creations" name="next_owner_transfer" control_name="NextOwnerTransfer"/>
-					<texture_picker label="     Textura" name="texture control" tool_tip="Pulsa para seleccionar una textura"/>
-					<check_box label="Fantasma" name="EmPhantomToggle"/>
-					<check_box label="Físico" name="EmPhysicalToggle"/>
-					<check_box label="Temporal" name="EmTemporaryToggle"/>
-					<combo_box name="material">
-						  <combo_item name="Stone">
-								 Piedra
-						  </combo_item>
-						  <combo_item name="Metal">
-								 Metal
-						  </combo_item>
-						  <combo_item name="Glass">
-								 Vidrio
-						  </combo_item>
-						  <combo_item name="Wood">
-								 Madera
-						  </combo_item>
-						  <combo_item name="Flesh">
-								 Carne
-						  </combo_item>
-						  <combo_item name="Plastic">
-								 Plástico
-						  </combo_item>
-						  <combo_item name="Rubber">
-								 Caucho
-						  </combo_item>
-					</combo_box>
-					<color_swatch label="      Color" name="colorswatch" tool_tip="Pulsa para abrir el selector de color"/>
-					<spinner label="Alfa" name="alpha" />
-					<spinner label="Brillo" name="glow"/>
-					<check_box label="Brillo Total" name="EmFBToggle"/>
-					<text follows="top">
-						  Brillar
-					</text>
-					<combo_box label="Brillo" name="combobox shininess" tool_tip="Fijar la intensidad de brillo para el objeto">
-						  <combo_item name="None">
-								 Ninguno
-						  </combo_item>
-						  <combo_item name="Low">
-								 Bajo
-						  </combo_item>
-						  <combo_item name="Medium">
-								 Medio
-						  </combo_item>
-						  <combo_item name="High">
-								 Alto
-						  </combo_item>
-					</combo_box>
-					<check_box name="EmeraldBuildPrefsEmbedItem" label="Colocar un item dentro del nuevo objeto"/>
-					<check_box name="EmeraldBuildPrefsEmbedItem" label="Colocar un item dentro del nuevo objeto"/>
-					<text name="Give inventory">
-						  Soltar aquí item de Invent.
-					</text>
-					<text name="build_item_add_disp_rect_txt">
-						  Fijado Actualmente:
+	<tab_container label="Sistema Singularity" name="Ascent System">
+		<panel label="General" name="User Interface">
+			<check_box label="Habilitar Teleport con doble click" tool_tip="Haciendo doble click en un objeto o persona te transportará hacia su ubicación." name="double_click_teleport_check"/>
+			<check_box label="Reiniciar la Cámara luego de Teleportar" tool_tip="Centra la cámara detrás tuyo luego de un teleport." name="center_after_teleport_check"/>
+			<check_box label="Desplazar destino TP a mitad de la altura del agente" tool_tip="Intenta apuntar el TP de modo que tus pies se apoyen en la tierra del punto al que estás apuntando." name="offset_teleport_check"/>
+			<check_box label="Vista Previa de Animaciones en el avatar en vez del maniquí antes de usar" tool_tip="La ventana de subida de Animaciones ejecutará las animaciones en tu avatar cuando ejecutes la vista previa." name="preview_anim_in_world_check"/>
+			<check_box label="Guardar los Scripts en el inventario como Mono en vez de LSL2" tool_tip="Los Scripts serán compilados automáticamente en Mono al guardarlos - Normalmente es sólo posible cuando están dentro de un objeto." name="save_scripts_as_mono_check"/>
+			<check_box label="Siempre rezear objetos con el grupo del terreno, cuando esté disponible" tool_tip="Rezear objetos con el mismo grupo del terreno sin importar tu grupo activo en el momento." name="always_rez_in_group_check"/>
+			<check_box label="Mostrar siempre el botón Construir como habilitado" tool_tip="Te habilita a utilizar el menu Construir sin tener que complicarte. No significa que puedas construir donde no esté permitido." name="always_build_check"/>
+			<check_box label="Permitir siempre volar" tool_tip="Te permite volar en lugares donde no está permitido. Utilizalo bajo tu responsabilidad, que puedas no significa que debas." name="always_fly_check"/>
+			<check_box label="Deshabilitar la Distancia Mínima de la Cámara" tool_tip="Permite a la cámara acercarse a los objetos." name="disable_camera_zoom_check"/>
+			<check_box label="Habilitar la funcionalidad Super Usuario" tool_tip="Agrega funciones consideradas demasiado peligrosas para un uso normal. Estas características pueden causar estragos, o hacer daño si son mal utilizadas - Principalmente para ti o tus pertenencias. Si estás seguro, activa la casilla de verificación a continuación." name="power_user_check"/>
+			<check_box label="Confirmar funcionalidad Super Usuario" tool_tip="Confirmar la activación de Super Usuario. Activalo bajo tu propio riesgo, y utiliza cualquier característica habilitada en forma responsable. Los desarrolladores de Singularity no reemplazarán nada que hayas arruinado. Te recomendamos hacer una copia de seguridad de todo aquello que será víctima de dichos poderes. A diferencia del resto de los items a marcar, debes hacer click en Aplicar o en OK después de activar esta función." name="power_user_confirm_check"/>
+			<check_box label="Activar Sistema Ascent de Inventario (Requiere Reinicio)" tool_tip="Crea una nueva carpeta en el inventario para almacenar archivos de configuración y assets no permanentes." name="system_folder_check"/>
+			<check_box label="Colocar las Subidas Temporales en la carpeta de asset del sistema." tool_tip="Coloca las subidas temporales en la carpeta de Assets, la cual está separada de las subidas actuales, haciendo que sean más fáciles de encontrar." name="temp_in_system_check"/>
+			<check_box label="Descargar automáticamente el inventario en segundo plano al de iniciar sesión" tool_tip="El inventario será precargado cuando inicies sesión, de esta manera no tienes que esperar que cargue cuando hagas una búsqueda por primera vez." name="fetch_inventory_on_login_check"/>
+			<check_box label="Activar Efectos del Viento" name="enable_wind"/>
+			<check_box label="Activar Nubes" name="enable_clouds"/>
+			<check_box label="Activar Nubes Clásicas" name="enable_classic_clouds"/>
+			<check_box label="Activar rezeado rápido vía distancia de dibujo paso a paso" name="speed_rez_check" tool_tip="Cuando está activo, esto incrementará progresivamente la distancia de dibujo, lo que permite que los objetos mas cercanos aparezcan primero."/>
+			<spinner label="Frecuencia de Distancia de Dibujo:" name="speed_rez_interval" />
+			<text name="speed_rez_seconds">
+				segundos
+			</text>
+		</panel>
+		<panel label="Línea de Comandos" name="Command Line">
+			<check_box label="Activar uso de la barra de chat como línea de comandos" name="chat_cmd_toggle"/>
+			<text name="cmd_line_text_2">
+				Teleportar en el sim (uso: cmd x y z)
+			</text>
+			<text name="cmd_line_text_3">
+				Teleportar a la superficie (uso: cmd)
+			</text>
+			<text name="cmd_line_text_4">
+				Teleportar a la altura (uso: cmd z)
+			</text>
+			<text name="cmd_line_text_5">
+				Teleportar a Base (uso: cmd)
+			</text>
+			<text name="cmd_line_text_6">
+				Rezear una Plataforma (uso: cmd 0 - 30)
+			</text>
+			<slider name="AscentPlatformSize" label="Ancho Predet.:" tool_tip="Tamaño que tendrá la plataforma"/>
+			<text name="cmd_line_text_8">
+				Calc. expresiones (uso: cmd 2 + 2)
+			</text>
+			<text name="cmd_line_text_15">
+				Limpiar historial de chat (uso: cmd)
+			</text>
+			<line_editor tool_tip="Limpia el Historial de chat para evitar el lag por efecto de los spammers de chat." name="AscentCmdLineClearChat"/>
+			<!-- Column Split -->
+			<text name="cmd_line_text_9">
+				Cambiar Distancia de Dibujo (uso: cmd metros)
+			</text>
+			<text name="cmd_line_text_10">
+				Teleportar a posición de la cámara (uso: cmd)
+			</text>
+			<text name="cmd_line_text_11">
+				Nombre de avatar de su UUID (uso: cmd key)
+			</text>
+			<text name="cmd_line_text_12">
+				Ofrecer Teleport a otro Avatar (uso: cmd key)
+			</text>
+			<text name="cmd_line_text_7">
+				Teleportar a Sim x (uso: cmd Nombre del Sim)
+			</text>
+			<check_box label="Usar misma posición entre Sims" name="map_to_keep_pos"/>
+			<text name="cmd_line_text_13">
+				Teleportar hasta avatar (uso: cmd nombre)
+			</text>
+			<line_editor tool_tip="La sintaxis de este comando permite nombres parciales y no es sensible a mayúsculas/minúsculas. Para obtener mejores resultados, úsalo con el radar abierto." name="AscentCmdLineTP2"/>
+			<text name="cmd_line_text_14">
+				Cambiar falso estado Aussente (uso: cmd)
+			</text>
+		</panel>
+		<panel label="Seguridad" name="Security">
+			<check_box label="Transmitir efectos del Visor (No incluye rayos)" name="broadcast_viewer_effects"/>
+			<check_box label="Desactivar Apuntar a... y Rayos" tool_tip="No apunta hacia ni muestra tus rayos de edición cuando seleccionas un objeto." name="disable_point_at_and_beams_check"/>
+			<check_box label="No mirar hacia los Objetos (anula ShowLookAt)" tool_tip="Apaga la tansmisión de los giros de cabeza y rayos lookat propios." name="private_look_at_check"/>
+			<check_box label="Mostrar las balizas LookAt de los demás" tool_tip="Te muestra hacia donde miran los demas." name="show_look_at_check"/>
+			<check_box label="Captura silenciosa a Disco" tool_tip="Anula el sonido de la cámara y el alerta a los demás cuando realizas una captura al disco de tu PC" name="quiet_snapshots_check"/>
+			<check_box label="Al pararse, revoca el permiso de los objetos en los cuales estuvo sentado tu avatar" tool_tip="Los objetos retienen, generalmente, el permiso para tomar control y ejecutar animaciones hasta que se reinician u otro usuario le cede permisos. Activando esta opción te aseguras que los permisos serán revocados inmediatamente." name="revoke_perms_on_stand_up_check"/>
+			<check_box label="Desactivar click del ratón para sentarse en los objetos" tool_tip="Algunas herramientas de griefer se basan en forzarte o engañarte para que hagas click en un objeto el cual te hará sentar, dándole automáticamente al objeto permisos para ejecutar una animación entre de otras cosas. Esta opción desactivará la función llSitTarget - Esto significa que deberás seleccionar la opción 'Sentarse' en las bolas de animación o muebles." name="disable_click_sit_check"/>
+			<check_box label="Mostrar cambios del Total de Scripts en Ejecución:" name="totalscriptjumps" tool_tip="Muestra los cambios en la cuenta total de scritps en tu región, dependiendo del umbral que selecciones a la derecha."/>
+			<spinner left_delta="350" name="ScriptJumpCount" tool_tip="Umbral para el mensaje de salto de scripts [Predeterminado: 100]"/>
+		</panel>
+		<panel label="Construcción" name="Building">
+			<text name="text_box6">
+				Punto de Pivote
+			</text>
+			<spinner label="Pos. X" name="X pos"/>
+			<spinner label="Pos. Y" name="Y pos"/>
+			<spinner label="Pos. Z" name="Z pos"/>
+			<check_box label="Los valores son en porcentaje" tool_tip="Los ajuste predeterminados se expresan en porcentajes y cada eje se ajusta en 50" name="EmPivotPercToggle"/>
+			<check_box label="Activar resaltado de prims seleccionados" name="EmBuildPrefsRenderHighlight_toggle" />
+			<check_box label="Mostrar Ejes en la posición del Prim Base" tool_tip="El comportamiento por defecto es mostrar el eje en el centro del conjunto de prims. Si está activado, el eje se muestra en la prim raíz del conjunto de enlaces." name="EmBuildPrefsActualRoot_toggle"/>
+			<text name="text_box7">
+				Permitir sig. propietario:
+			</text>
+			<check_box label="Permiso de Copia" tool_tip="El próximo propietario puede realizar copias de las creaciones" name="next_owner_copy"/>
+			<check_box label="Permiso de Modific." tool_tip="El próximo propietario puede editar y modificar las creaciones" name="next_owner_modify"/>
+			<check_box label="Permiso de Transf." tool_tip="Next owner can give(or sell) creations" name="next_owner_transfer" control_name="NextOwnerTransfer"/>
+			<texture_picker label="     Textura" name="texture control" tool_tip="Pulsa para seleccionar una textura"/>
+			<check_box label="Fantasma" name="EmPhantomToggle"/>
+			<check_box label="Físico" name="EmPhysicalToggle"/>
+			<check_box label="Temporal" name="EmTemporaryToggle"/>
+			<combo_box name="material">
+				<combo_item name="Stone">
+					Piedra
+				</combo_item>
+				<combo_item name="Metal">
+					Metal
+				</combo_item>
+				<combo_item name="Glass">
+					Vidrio
+				</combo_item>
+				<combo_item name="Wood">
+					Madera
+				</combo_item>
+				<combo_item name="Flesh">
+					Carne
+				</combo_item>
+				<combo_item name="Plastic">
+					Plástico
+				</combo_item>
+				<combo_item name="Rubber">
+					Caucho
+				</combo_item>
+			</combo_box>
+			<color_swatch label="      Color" name="colorswatch" tool_tip="Pulsa para abrir el selector de color"/>
+			<spinner label="Alfa" name="alpha" />
+			<spinner label="Brillo" name="glow"/>
+			<check_box label="Brillo Total" name="EmFBToggle"/>
+			<text follows="top">
+				Brillar
+			</text>
+			<combo_box label="Brillo" name="combobox shininess" tool_tip="Fijar la intensidad de brillo para el objeto">
+				<combo_item name="None">
+					Ninguno
+				</combo_item>
+				<combo_item name="Low">
+					Bajo
+				</combo_item>
+				<combo_item name="Medium">
+					Medio
+				</combo_item>
+				<combo_item name="High">
+					Alto
+				</combo_item>
+			</combo_box>
+			<check_box name="EmeraldBuildPrefsEmbedItem" label="Colocar un item dentro del nuevo objeto"/>
+			<check_box name="EmeraldBuildPrefsEmbedItem" label="Colocar un item dentro del nuevo objeto"/>
+			<text name="Give inventory">
+				Soltar aquí item de Invent.
+			</text>
+			<text name="build_item_add_disp_rect_txt">
+				Fijado Actualmente:
 ITEM
-					</text>
-					<spinner label="Tam.X" name="X size"/>
-					<spinner label="Tam. Y" name="Y size"/>
-					<spinner label="Tam.Z" name="Z size"/>					
-			 </panel>
-	  </tab_container>
+			</text>
+			<spinner label="Tam.X" name="X size"/>
+			<spinner label="Tam. Y" name="Y size"/>
+			<spinner label="Tam.Z" name="Z size"/>					
+		</panel>
+	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
index b4152c996..f9a32be00 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_vanity.xml
@@ -1,66 +1,67 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Vanity" name="ascvan">
-	  <tab_container label="Singularity Vanity" name="Ascent Vanity">
-			 <panel label="Principal  (General)" name="General">
-					<check_box label="Cuando se aplicable, guardar Ajustes Vaninty por cuenta." tool_tip="Guarda ajustes individuales por cuenta, permitiendo una mas fácil personalización de Alts." name="use_account_settings_check"/>
-					<check_box label="Ocultar pantalla de progreso de Telerport" tool_tip="Activado, el visor ocultará la pantalla de progreso de Teleportación, pemitiendo leer MIs.." name="disable_tp_screen_check"/>
-					<check_box label="Reproducir sonidos de teleport cuando al cambiar de sim" tool_tip="El Visor reproducirá el sonido de trnasportación al hacer un teleport." name="tp_sound_check"/>
-					<check_box label="Ocultar la pantalla de inicio/cierre de sesión" tool_tip="Marcadao, el visor ocultará la pantalla de progreso de inicio/cierre de sesión." name="disable_logout_screen_check"/>
-					<check_box label="Desactivar animaciones de chat, susurro y gritos" tool_tip="Quiar las animaciones de tu avatar. El efecto es visible para todos" name="disable_chat_animation"/>
-			 </panel>
-			 <panel label="Tags/Colores" name="TagsColors">
-					<!-- Client tag options -->
-					<check_box label="Usar Tag de Visor:" left="10" tool_tip="Activándolo mostrará el tag de tu visor, en forma local, sobre tu nombre de avatar." name="show_my_tag_check"/>
-					<combo_box tool_tip="Tag del Visor ( Y colores subsecuentes) a transmitir. Sobreescribir en forma local por Tag/Colores personalizados." name="tag_spoofing_combobox">
-						  <combo_item name="Singularity" >
-								 Singularity
-						  </combo_item>
-					</combo_box>
-					<check_box label="Mostrarte tag de cliente" tool_tip="Elige el color que verás del tag de tu visor." name="show_self_tag_check"/>
-					<check_box label="Mostrarte color del tag de cliente" tool_tip="Activándolo,  ajustará el nombre de avatar en el color de tu cliente o en el color personalizado." name="show_self_tag_color_check"/>
-					<check_box label="Ver tags de amigos como (Amigo)" tool_tip="Activándolo cambia el tag de cliente de tus amigos a (Amigo)." name="show_friend_tag_check"/>
-					<!-- End of Left Side -->
-					<check_box label="Usar color y etiqueta personalizadas (Sólo local)" tool_tip="Activándolo te permitirá ajustar tu tag de nombre para mostrar con tu tag de cliente y color  personalizados. Esto sólo funciona para ti mismo." name="customize_own_tag_check"/>
-					<text bottom_delta="-17" left_delta="25" follows="top" height="10" name="custom_tag_label_text">
-						  Etiqueta:
-					</text>
-					<line_editor left_delta="45" name="custom_tag_label_box" tool_tip="Texto personalizado que usarás para reemplazar el tag de tu visor (Sólo Local)"/>
-					<text name="custom_tag_color_text">
-						  Color:
-					</text>
-					<color_swatch name="custom_tag_color_swatch" tool_tip="Color personalizado que usarás para reemplazar el color del tag de tu visor (Sólo Local)"/>
-					<check_box label="Mostrar Tag de Visor de los demás" tool_tip="Activándolo mostrará el nombre de Tag de visor sobre los nombres de avatar de otros usuarios." name="show_other_tag_check"/>
-					<check_box label="Mostrar color de Tag de visor de los demás" tool_tip="Activándolo fijará el color del tag del visor de los demás a su propio color." name="show_client_tag_color_check"/>
-					<check_box label="Mostrar tiempo inactivo" tool_tip="Activándolo mostrará la cantidad de tiempo que el avatar está inactivo." name="show_idle_time_check"/>
-					<check_box label="Chequear automáticamente actualizaciones de clientes" tool_tip="Activándolo permite a Singularity descargar nuevas definiciones de clientes cuando sea necesario." name="update_tags_check"/>
-					<button name="update_clientdefs" label="Actualización Manual" height="18" left_delta="310" width="150"/>
-					<!-- End of Client Tag settings -->
-					<text name="effects_color_textbox">
-						  Color para Mis Efectos:
-					</text>
-					<color_swatch label="Efectos" name="effect_color_swatch"/>
-					<check_box label="Utilizar Color de Tipo de usuario (Amigo, Linden, etc.)" left="10" tool_tip="Activándolo mostrará con el color definido abajo a la gente que cumple con determinado criterio de tipo de usuario (Lindens, Propietarios de Estado, amigo, usuarios bloquedos)." name="use_status_check"/>
-					<text name="friends_color_textbox">
-						  Color Para:
-(Radar, Tag, Minimap)</text>
-					<color_swatch label="Amigos" name="friend_color_swatch" tool_tip="Color para los amigos"/>
-					<color_swatch label="Estado" name="estate_owner_color_swatch" tool_tip="Color para Administrador de Regiones"/>
-					<color_swatch label="Lindens" name="linden_color_swatch" tool_tip="Color para empleados de Linden Lab"/>
-					<color_swatch label="Ignorados" name="muted_color_swatch" tool_tip="Color para usuarios ignorados o bloqueados"/>
-			 </panel>
-			 <panel label="Fiísica de Avatar" name="Body Dynamics">
-					<check_box label="Activar física avanzada de los senos del avatar" name="EmBreastsToggle" tool_tip="Deberás seleccionar Aplicar para activar o desactivar estos controles"/>
-					<slider name="EmeraldBoobMass" label="Masa del Seno:"/>
-					<slider name="EmeraldBoobHardness" label="Rebote de Seno:" />
-					<slider name="EmeraldBoobVelMax" label="Vel.Máx. Senos:" />
-					<slider name="EmeraldBoobFriction" label="Fricción de Senos:"/>
-					<slider name="EmeraldBoobVelMin" label="Vel.Mín.Senos:"/>
-					<text name="av_mod_textbox">
-						  Modificar Desplazamientos del Avatar
-					</text>
-					<spinner label="Modificador X" name="X Modifier" tool_tip="Utiliza esto para manipular, en grados, el delimitador del avatar. Puede ser utilizado para distorsionar las órbitas, o para elevar o aumentar los senos sin alterar el cuerpo del avatar." width="133" label_width="70"/>
-					<spinner label="Modificador Y" name="Y Modifier" tool_tip="Utiliza esto para manipular, en grados, el delimitador del avatar. Puede ser utilizado para distorsionar las órbitas, o para elevar o aumentar los senos sin alterar el cuerpo del avatar." width="133" label_width="70"/>
-					<spinner label="Modificador Z" name="Z Modifier" tool_tip="Utiliza esto para manipular, en grados, el delimitador del avatar. Puede ser utilizado para distorsionar las órbitas, o para elevar o aumentar los senos sin alterar el cuerpo del avatar." width="133" label_width="70"/>
-			 </panel>
-	  </tab_container>
+	<tab_container label="Singularity Vanity" name="Ascent Vanity">
+		<panel label="Principal  (General)" name="General">
+			<check_box label="Cuando se aplicable, guardar Ajustes Vaninty por cuenta." tool_tip="Guarda ajustes individuales por cuenta, permitiendo una mas fácil personalización de Alts." name="use_account_settings_check"/>
+			<check_box label="Ocultar pantalla de progreso de Telerport" tool_tip="Activado, el visor ocultará la pantalla de progreso de Teleportación, pemitiendo leer MIs.." name="disable_tp_screen_check"/>
+			<check_box label="Reproducir sonidos de teleport cuando al cambiar de sim" tool_tip="El Visor reproducirá el sonido de trnasportación al hacer un teleport." name="tp_sound_check"/>
+			<check_box label="Ocultar la pantalla de inicio/cierre de sesión" tool_tip="Marcadao, el visor ocultará la pantalla de progreso de inicio/cierre de sesión." name="disable_logout_screen_check"/>
+			<check_box label="Desactivar animaciones de chat, susurro y gritos" tool_tip="Quiar las animaciones de tu avatar. El efecto es visible para todos" name="disable_chat_animation"/>
+		</panel>
+		<panel label="Tags/Colores" name="TagsColors">
+			<!-- Client tag options -->
+			<check_box label="Usar Tag de Visor:" left="10" tool_tip="Activándolo mostrará el tag de tu visor, en forma local, sobre tu nombre de avatar." name="show_my_tag_check"/>
+			<combo_box tool_tip="Tag del Visor ( Y colores subsecuentes) a transmitir. Sobreescribir en forma local por Tag/Colores personalizados." name="tag_spoofing_combobox">
+				<combo_item name="Singularity" >
+					Singularity
+				</combo_item>
+			</combo_box>
+			<check_box label="Mostrarte tag de cliente" tool_tip="Elige el color que verás del tag de tu visor." name="show_self_tag_check"/>
+			<check_box label="Mostrarte color del tag de cliente" tool_tip="Activándolo,  ajustará el nombre de avatar en el color de tu cliente o en el color personalizado." name="show_self_tag_color_check"/>
+			<check_box label="Ver tags de amigos como (Amigo)" tool_tip="Activándolo cambia el tag de cliente de tus amigos a (Amigo)." name="show_friend_tag_check"/>
+			<!-- End of Left Side -->
+			<check_box label="Usar color y etiqueta personalizadas (Sólo local)" tool_tip="Activándolo te permitirá ajustar tu tag de nombre para mostrar con tu tag de cliente y color  personalizados. Esto sólo funciona para ti mismo." name="customize_own_tag_check"/>
+			<text bottom_delta="-17" left_delta="25" follows="top" height="10" name="custom_tag_label_text">
+				Etiqueta:
+			</text>
+			<line_editor left_delta="45" name="custom_tag_label_box" tool_tip="Texto personalizado que usarás para reemplazar el tag de tu visor (Sólo Local)"/>
+			<text name="custom_tag_color_text">
+				Color:
+			</text>
+			<color_swatch name="custom_tag_color_swatch" tool_tip="Color personalizado que usarás para reemplazar el color del tag de tu visor (Sólo Local)"/>
+			<check_box label="Mostrar Tag de Visor de los demás" tool_tip="Activándolo mostrará el nombre de Tag de visor sobre los nombres de avatar de otros usuarios." name="show_other_tag_check"/>
+			<check_box label="Mostrar color de Tag de visor de los demás" tool_tip="Activándolo fijará el color del tag del visor de los demás a su propio color." name="show_client_tag_color_check"/>
+			<check_box label="Mostrar tiempo inactivo" tool_tip="Activándolo mostrará la cantidad de tiempo que el avatar está inactivo." name="show_idle_time_check"/>
+			<check_box label="Chequear automáticamente actualizaciones de clientes" tool_tip="Activándolo permite a Singularity descargar nuevas definiciones de clientes cuando sea necesario." name="update_tags_check"/>
+			<button name="update_clientdefs" label="Actualización Manual" height="18" left_delta="310" width="150"/>
+			<!-- End of Client Tag settings -->
+			<text name="effects_color_textbox">
+				Color para Mis Efectos:
+			</text>
+			<color_swatch label="Efectos" name="effect_color_swatch"/>
+			<check_box label="Utilizar Color de Tipo de usuario (Amigo, Linden, etc.)" left="10" tool_tip="Activándolo mostrará con el color definido abajo a la gente que cumple con determinado criterio de tipo de usuario (Lindens, Propietarios de Estado, amigo, usuarios bloquedos)." name="use_status_check"/>
+			<text name="friends_color_textbox">
+				Color Para:
+(Radar, Tag, Minimap)
+			</text>
+			<color_swatch label="Amigos" name="friend_color_swatch" tool_tip="Color para los amigos"/>
+			<color_swatch label="Estado" name="estate_owner_color_swatch" tool_tip="Color para Administrador de Regiones"/>
+			<color_swatch label="Lindens" name="linden_color_swatch" tool_tip="Color para empleados de Linden Lab"/>
+			<color_swatch label="Ignorados" name="muted_color_swatch" tool_tip="Color para usuarios ignorados o bloqueados"/>
+		</panel>
+		<panel label="Fiísica de Avatar" name="Body Dynamics">
+			<check_box label="Activar física avanzada de los senos del avatar" name="EmBreastsToggle" tool_tip="Deberás seleccionar Aplicar para activar o desactivar estos controles"/>
+			<slider name="EmeraldBoobMass" label="Masa del Seno:"/>
+			<slider name="EmeraldBoobHardness" label="Rebote de Seno:" />
+			<slider name="EmeraldBoobVelMax" label="Vel.Máx. Senos:" />
+			<slider name="EmeraldBoobFriction" label="Fricción de Senos:"/>
+			<slider name="EmeraldBoobVelMin" label="Vel.Mín.Senos:"/>
+			<text name="av_mod_textbox">
+				Modificar Desplazamientos del Avatar
+			</text>
+			<spinner label="Modificador X" name="X Modifier" tool_tip="Utiliza esto para manipular, en grados, el delimitador del avatar. Puede ser utilizado para distorsionar las órbitas, o para elevar o aumentar los senos sin alterar el cuerpo del avatar." width="133" label_width="70"/>
+			<spinner label="Modificador Y" name="Y Modifier" tool_tip="Utiliza esto para manipular, en grados, el delimitador del avatar. Puede ser utilizado para distorsionar las órbitas, o para elevar o aumentar los senos sin alterar el cuerpo del avatar." width="133" label_width="70"/>
+			<spinner label="Modificador Z" name="Z Modifier" tool_tip="Utiliza esto para manipular, en grados, el delimitador del avatar. Puede ser utilizado para distorsionar las órbitas, o para elevar o aumentar los senos sin alterar el cuerpo del avatar." width="133" label_width="70"/>
+		</panel>
+	</tab_container>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_audio.xml b/indra/newview/skins/default/xui/es/panel_preferences_audio.xml
index 5f594fc71..dbf22303b 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_audio.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_audio.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Audio y Video" name="Media panel">
-	  <text name="muting_text">
-			 Volumen:
-	  </text>
-	  <text name="streaming_prefs_text">
-			 Preferencias de Streaming:
-	  </text>
-	  <text name="audio_prefs_text">
-			 Preferencias de Audio:
-	  </text>
-	  <panel label="Volumen" name="Volume Panel"/>
-			 <check_box label="Reproducir Música cuando esté disponible (usa más ancho de banda)" name="streaming_music"/>
-			 <check_box label="Reproducir Media cuando esté disponible (usa más ancho de banda)" name="streaming_video"/>
-			 <check_box label="Reproducir Media Automáticamente" name="auto_streaming_video"/>
-			 <check_box label="Solicitar Permiso (Activar Filtro de Media)" name="streaming_video"/>
-			 <check_box label="Silenciar audio al minimizar la ventana" name="mute_when_minimized"/>
-			 <slider label="Efecto Doppler" name="Doppler Effect"/>
-			 <slider label="Factor de Atenuación" name="Rolloff Factor"/>
-			 <spinner label="Informar transacción de [CURRENCY] desde:" name="currency_change_threshold" label_width="170" width="234"/>
-			 <spinner label="Informar Estado de vida desde:" name="Health Change Threshold" label_width="170" width="234"/>
+	<text name="muting_text">
+		Volumen:
+	</text>
+	<text name="streaming_prefs_text">
+		Preferencias de Streaming:
+	</text>
+	<text name="audio_prefs_text">
+		Preferencias de Audio:
+	</text>
+	<panel label="Volumen" name="Volume Panel"/>
+		<check_box label="Reproducir Música cuando esté disponible (usa más ancho de banda)" name="streaming_music"/>
+		<check_box label="Reproducir Media cuando esté disponible (usa más ancho de banda)" name="streaming_video"/>
+		<check_box label="Reproducir Media Automáticamente" name="auto_streaming_video"/>
+		<check_box label="Solicitar Permiso (Activar Filtro de Media)" name="streaming_video"/>
+		<check_box label="Silenciar audio al minimizar la ventana" name="mute_when_minimized"/>
+		<slider label="Efecto Doppler" name="Doppler Effect"/>
+		<slider label="Factor de Atenuación" name="Rolloff Factor"/>
+		<spinner label="Informar transacción de [CURRENCY] desde:" name="currency_change_threshold" label_width="170" width="234"/>
+		<spinner label="Informar Estado de vida desde:" name="Health Change Threshold" label_width="170" width="234"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
index 5c8d05248..8c00280b2 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml
@@ -1,59 +1,58 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Chat de Texto" name="chat">
-	  <text name="text_box">
-			 Tamaño Fuente de Chat:
-	  </text>
-	  <radio_group name="chat_font_size">
-			 <radio_item name="radio">
-					Pequeño
-			 </radio_item>
-			 <radio_item name="radio2">
-					Medio
-			 </radio_item>
-			 <radio_item name="radio3">
-					Grande
-			 </radio_item>
-	  </radio_group>
-	  <text name="text_box2">
-			 Color de Chat:
-	  </text>
-	  <color_swatch label="Tu" name="user"/>
-	  <color_swatch label="Otros" name="agent"/>
-	  <color_swatch label="MI" left_delta="54" name="im" width="44"/>
-	  <color_swatch label="Sistema" name="system"/>
-	  <color_swatch label="Errores" name="script_error"/>
-	  <color_swatch label="Objetos" name="objects"/>
-	  <color_swatch label="Propietario" name="owner"/>
-	  <color_swatch label="Burbuja" name="background"/>
-	  <color_swatch label="URLs" name="links"/>
-	
-	  <text name="text_box3">
-			 Consola de Chat:
-	  </text>
-	  <spinner label="Desvanecer Chat tras" name="fade_chat_time" label_width="107" width="160"/>
-	  <text name="text_box4"  left="312" >
-			 (segundos)
-	  </text>
-	  <spinner left="370" name="max_chat_count"/>
-	  <text left="435" name="text_box5">
-			 (# líneas)
-	  </text>
-	  <slider label="Opacidad" name="console_opacity"/>
-	  <check_box label="Usar Ancho completo de pantalla (Requeire reinicio)" name="chat_full_width_check"/>
-	  <text name="text_box6" >
-			 Opciones de Chat:
-	  </text>
-	  <check_box label="Cerrar barra de chat al presionar Intro" name="close_chat_on_return_check"/>
-	  <check_box label="Las teclas de cursor siempre mueven al avatar al chatear" name="arrow_keys_move_avatar_check"/>
-	  <check_box label="Mostrar horario en el chat local" name="show_timestamps_check"/>
-	  <check_box label="Mostrar errores de scripts y avisos como chat regular" name="script_errors_as_chat"/>
-	  <check_box label="Ejecutar animación de escribir al chatear" name="play_typing_animation"/>
-	  <text name="text_box7">
-			 Burbuja de Chat:
-	  </text>
-	  <check_box label="Mostrar Burbuja de chat" name="bubble_text_chat"/>
-	  <slider label="Opacidad" name="bubble_chat_opacity"/>
-<!--
+	<text name="text_box">
+		Tamaño Fuente de Chat:
+	</text>
+	<radio_group name="chat_font_size">
+		<radio_item name="radio">
+			Pequeño
+		</radio_item>
+		<radio_item name="radio2">
+			Medio
+		</radio_item>
+		<radio_item name="radio3">
+			Grande
+		</radio_item>
+	</radio_group>
+	<text name="text_box2">
+		Color de Chat:
+	</text>
+	<color_swatch label="Tu" name="user"/>
+	<color_swatch label="Otros" name="agent"/>
+	<color_swatch label="MI" left_delta="54" name="im" width="44"/>
+	<color_swatch label="Sistema" name="system"/>
+	<color_swatch label="Errores" name="script_error"/>
+	<color_swatch label="Objetos" name="objects"/>
+	<color_swatch label="Propietario" name="owner"/>
+	<color_swatch label="Burbuja" name="background"/>
+	<color_swatch label="URLs" name="links"/>
+	<text name="text_box3">
+		Consola de Chat:
+	</text>
+	<spinner label="Desvanecer Chat tras" name="fade_chat_time" label_width="107" width="160"/>
+	<text name="text_box4"  left="312" >
+		(segundos)
+	</text>
+	<spinner left="370" name="max_chat_count"/>
+	<text left="435" name="text_box5">
+		(# líneas)
+	</text>
+	<slider label="Opacidad" name="console_opacity"/>
+	<check_box label="Usar Ancho completo de pantalla (Requeire reinicio)" name="chat_full_width_check"/>
+	<text name="text_box6" >
+		Opciones de Chat:
+	</text>
+	<check_box label="Cerrar barra de chat al presionar Intro" name="close_chat_on_return_check"/>
+	<check_box label="Las teclas de cursor siempre mueven al avatar al chatear" name="arrow_keys_move_avatar_check"/>
+	<check_box label="Mostrar horario en el chat local" name="show_timestamps_check"/>
+	<check_box label="Mostrar errores de scripts y avisos como chat regular" name="script_errors_as_chat"/>
+	<check_box label="Ejecutar animación de escribir al chatear" name="play_typing_animation"/>
+	<text name="text_box7">
+		Burbuja de Chat:
+	</text>
+	<check_box label="Mostrar Burbuja de chat" name="bubble_text_chat"/>
+	<slider label="Opacidad" name="bubble_chat_opacity"/>
+	<!--
 	<text bottom="-410" height="10" left="12" name="text_translate_chat">Translate Chat:</text>
 	<check_box bottom="-417" control_name="TranslateChat" height="16" initial_value="false" label="Use machine translation while chatting (powered by Google)" left="148" name="translate_chat"/>
 	<text bottom="-432" height="10" left="149" name="text_translate_chat">Translate into this language:</text>	
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index ec345f37b..4b8c96cdb 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -1,153 +1,153 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="General" name="general_panel">
-	  <radio_group name="default_start_location">
-			 <radio_item name="MyHome" tool_tip="Iniciar sesión de forma predeterminada en Mi Base.">
-					Mi Base
-			 </radio_item>
-			 <radio_item name="MyLastLocation" tool_tip="Iniciar sesión de forma predeterminada en mi última ubicación.">
-					Mi Última Ubicación
-			 </radio_item>
-	  </radio_group>
-	  <check_box label="Mostrar Ubicación Inicial en Inicio de Sesión" name="show_location_checkbox"/>
-	  <combo_box name="fade_out_combobox">
-			 <combo_item name="Never">
-					Nunca
-			 </combo_item>
-			 <combo_item name="Show Temporarily" >
-					Mostrar Temporalmente
-			 </combo_item>
-			 <combo_item name="Always">
-					Siempre
-			 </combo_item>
-	  </combo_box>
-	  <combo_box name="namesystem_combobox">
-			 <combo_item name="Old Names">
-					Nombres Antiguos
-			 </combo_item>
-			 <combo_item name="Display Names (with Username)">
-					Nombres Mostrados (y Usuario)
-			 </combo_item>
-			 <combo_item name="Display Names only">
-					Solamente Nombres Mostrados
-			  </combo_item>
-	  </combo_box>
-	  <check_box label="Nombres de Avatar en pequeño" name="small_avatar_names_checkbox"/>
-	  <check_box label="Ocultar mi Nombre en mi Pantalla" name="show_my_name_checkbox"/>
-	  <text name="group_titles_textbox">
-			 Títulos de Grupo:
-	  </text>
-	  <check_box label="Ocultar todos los Títulos de Grupo" name="show_all_title_checkbox"/>
-	  <check_box label="Ocultar mi Título de Grupo" name="show_my_title_checkbox"/>
-	  <text name="UI Size:">
-			 Tamaño Interface:
-	  </text>
-	  <check_box label="Resolución independiente del tamaño" name="ui_auto_scale"/>
-	  <spinner label="Ausente tras:" name="afk_timeout_spinner"/>
-	  <check_box label="Avisar cuando gasto o recibo dinero" name="notify_money_change_checkbox"/>
-	  <text name="maturity_desired_label">Rating:</text>
-	  <text name="maturity_desired_prompt">
-			 Quiero acceder a contenido 
-	  </text>
-	  <combo_box name="maturity_desired_combobox">
-			 <combo_item name="Desired_Adult">
-					PG, Mature y Adulto
-			 </combo_item>
-			 <combo_item name="Desired_Mature">
-					PG y Mature
-			 </combo_item>
-			 <combo_item name="Desired_PG">
-					Sólo PG
-			 </combo_item>
-	  </combo_box>
-	  <text name="maturity_desired_textbox">
-			 Sólo PG
-	  </text>
-	  <text name="start_location_textbox">
-			 Ubicación Inicial:
-	  </text>
-	  <text name="show_names_textbox">
-			 Mostrar Nombres:
-	  </text>
-	  <text name="seconds_textbox">
-			 segundos
-	  </text>
-	  <text name="crash_report_textbox">
-			 Reportes de fallos:</text>
-	  <text name="language_textbox">
-			 Idioma:
-	  </text>
-	  <text name="language_textbox2">
-			 (Requiere reiniciar para aplicar)
-          *Usar UI en Inglés</text>
-	  <combo_box name="language_combobox">
-			 <combo_item name="System Default Language">
-					Predeterminado del Sistema
-			 </combo_item>
-			 <combo_item name="English">
-					English(Inglés)
-			 </combo_item>		
-			 <!-- 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 name="Spanish">
-					Español
-			 </combo_item>
-			 <combo_item name="French">
-					Français(Francés)
-			 </combo_item>
-			 <!-- Also, with the above advice in mind, keep completed UI translations above this line.-->
-			 <combo_item name="Danish">
-					Dansk(Danés)*
-			 </combo_item>
-			 <combo_item name="Deutsch(German)">
-					Deutsch(Alemán)*
-			 </combo_item>
-			 <combo_item name="Italian">
-					Italiano(Italiano)*
-			 </combo_item>
-			 <combo_item name="Hungarian">
-					Magyar(Húngaro)*
-			 </combo_item>
-			 <combo_item name="Dutch">
-					Nederlands(Holandés)*
-			 </combo_item>
-			 <combo_item name="Polish">
-					Polski(Polaco)*
-			 </combo_item>
-			 <combo_item name="Portugese">
-					Portugués(Portugués)*
-			 </combo_item>
-			 <combo_item name="Russian">
-					Ру��кий(Ruso)*
-			 </combo_item>
-			 <combo_item name="Turkish">
-					Türkçe(Turco)*
-			 </combo_item>
-			 <combo_item name="Ukrainian">
-					Україн�ька(Ucraniano)*
-			 </combo_item>
-			 <combo_item name="Chinese">
-					中文(简体)(Chino)*
-			 </combo_item>
-			 <combo_item name="(Japanese)">
-					日本語(Japones)*
-			 </combo_item>
-			 <combo_item name="(Korean)">
-					한국어(Coreano)*
-			 </combo_item>
-	  </combo_box>
-	  <string name="region_name_prompt">
-			 &lt;Escribe el nombre de la región&gt;
-	  </string>
-	  <combo_box name="crash_behavior_combobox">
-			 <combo_item name="Askbeforesending">
-					Preguntar antes de enviar
-			 </combo_item>
-			 <combo_item name="Alwayssend">
-					Enviar Siempre
-			 </combo_item>
-			 <combo_item name="Neversend">
-					Nunca Enviar
-			 </combo_item>
-	  </combo_box>
-	  <check_box label="Compartir idioma con los objetos" name="language_is_public" tool_tip="Esta opción le permite a los objetos conocer tu idioma seleccionado."/>
-	  <button label="Reiniciar Configuración" name="clear_settings"/>
+	<radio_group name="default_start_location">
+		<radio_item name="MyHome" tool_tip="Iniciar sesión de forma predeterminada en Mi Base.">
+			Mi Base
+		</radio_item>
+		<radio_item name="MyLastLocation" tool_tip="Iniciar sesión de forma predeterminada en mi última ubicación.">
+			Mi Última Ubicación
+		</radio_item>
+	</radio_group>
+	<check_box label="Mostrar Ubicación Inicial en Inicio de Sesión" name="show_location_checkbox"/>
+	<combo_box name="fade_out_combobox">
+		<combo_item name="Never">
+			Nunca
+		</combo_item>
+		<combo_item name="Show Temporarily" >
+			Mostrar Temporalmente
+		</combo_item>
+		<combo_item name="Always">
+			Siempre
+		</combo_item>
+	</combo_box>
+	<combo_box name="namesystem_combobox">
+		<combo_item name="Old Names">
+			Nombres Antiguos
+		</combo_item>
+		<combo_item name="Display Names (with Username)">
+			Nombres Mostrados (y Usuario)
+		</combo_item>
+		<combo_item name="Display Names only">
+			Solamente Nombres Mostrados
+		</combo_item>
+	</combo_box>
+	<check_box label="Nombres de Avatar en pequeño" name="small_avatar_names_checkbox"/>
+	<check_box label="Ocultar mi Nombre en mi Pantalla" name="show_my_name_checkbox"/>
+	<text name="group_titles_textbox">
+		Títulos de Grupo:
+	</text>
+	<check_box label="Ocultar todos los Títulos de Grupo" name="show_all_title_checkbox"/>
+	<check_box label="Ocultar mi Título de Grupo" name="show_my_title_checkbox"/>
+	<text name="UI Size:">
+		Tamaño Interface:
+	</text>
+	<check_box label="Resolución independiente del tamaño" name="ui_auto_scale"/>
+	<spinner label="Ausente tras:" name="afk_timeout_spinner"/>
+	<check_box label="Avisar cuando gasto o recibo dinero" name="notify_money_change_checkbox"/>
+	<text name="maturity_desired_label">Rating:</text>
+	<text name="maturity_desired_prompt">
+		Quiero acceder a contenido 
+	</text>
+	<combo_box name="maturity_desired_combobox">
+		<combo_item name="Desired_Adult">
+			PG, Mature y Adulto
+		</combo_item>
+		<combo_item name="Desired_Mature">
+			PG y Mature
+		</combo_item>
+		<combo_item name="Desired_PG">
+			Sólo PG
+		</combo_item>
+	</combo_box>
+	<text name="maturity_desired_textbox">
+		Sólo PG
+	</text>
+	<text name="start_location_textbox">
+		Ubicación Inicial:
+	</text>
+	<text name="show_names_textbox">
+		Mostrar Nombres:
+	</text>
+	<text name="seconds_textbox">
+		segundos
+	</text>
+	<text name="crash_report_textbox">
+		Reportes de fallos:</text>
+	<text name="language_textbox">
+		Idioma:
+	</text>
+	<text name="language_textbox2">
+		(Requiere reiniciar para aplicar)
+		*Usar UI en Inglés</text>
+	<combo_box name="language_combobox">
+		<combo_item name="System Default Language">
+			Predeterminado del Sistema
+		</combo_item>
+		<combo_item name="English">
+			English(Inglés)
+		</combo_item>		
+		<!-- 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 name="Spanish">
+			Español
+		</combo_item>
+		<combo_item name="French">
+			Français(Francés)
+		</combo_item>
+		<!-- Also, with the above advice in mind, keep completed UI translations above this line.-->
+		<combo_item name="Danish">
+			Dansk(Danés)*
+		</combo_item>
+		<combo_item name="Deutsch(German)">
+			Deutsch(Alemán)*
+		</combo_item>
+		<combo_item name="Italian">
+			Italiano(Italiano)*
+		</combo_item>
+		<combo_item name="Hungarian">
+			Magyar(Húngaro)*
+		</combo_item>
+		<combo_item name="Dutch">
+			Nederlands(Holandés)*
+		</combo_item>
+		<combo_item name="Polish">
+			Polski(Polaco)*
+		</combo_item>
+		<combo_item name="Portugese">
+			Portugués(Portugués)*
+		</combo_item>
+		<combo_item name="Russian">
+			Ру��кий(Ruso)*
+		</combo_item>
+		<combo_item name="Turkish">
+			Türkçe(Turco)*
+		</combo_item>
+		<combo_item name="Ukrainian">
+			Україн�ька(Ucraniano)*
+		</combo_item>
+		<combo_item name="Chinese">
+			中文(简体)(Chino)*
+		</combo_item>
+		<combo_item name="(Japanese)">
+			日本語(Japones)*
+		</combo_item>
+		<combo_item name="(Korean)">
+			한국어(Coreano)*
+		</combo_item>
+	</combo_box>
+	<string name="region_name_prompt">
+		&lt;Escribe el nombre de la región&gt;
+	</string>
+	<combo_box name="crash_behavior_combobox">
+		<combo_item name="Askbeforesending">
+			Preguntar antes de enviar
+		</combo_item>
+		<combo_item name="Alwayssend">
+			Enviar Siempre
+		</combo_item>
+		<combo_item name="Neversend">
+			Nunca Enviar
+		</combo_item>
+	</combo_box>
+	<check_box label="Compartir idioma con los objetos" name="language_is_public" tool_tip="Esta opción le permite a los objetos conocer tu idioma seleccionado."/>
+	<button label="Reiniciar Configuración" name="clear_settings"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
index 268aaf3be..351162fb4 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
@@ -1,189 +1,236 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Gráficos" name="Display panel">
-	  <button label="?" name="GraphicsPreferencesHelpButton"/>
-	  <check_box label="Ejecutar el Visor en Ventana" name="windowed mode" tool_tip="Si setá desmarcado, el visor se ejecutará a pantalla completa cuando inicies sesión."/>
-	  <text name="WindowSizeLabel">
-			 Tamaño de Ventana:
-	  </text>
-	  <combo_box name="windowsize combo">
-			 <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_item name="1280x720">
-					1280x720 (HDV720)
-			 </combo_item>
-			 <combo_item name="1440x1080">
-					1440x1080 (HDV1080)
-			 </combo_item>
-			 <combo_item name="1920x1080">
-					1920x1080 (HD1080)
-			 </combo_item>
-	  </combo_box>
-	  <text name="DisplayResLabel">
-			 Resolución de Pantalla:
-	  </text>
-	  <combo_box name="fullscreen combo" left="130" />
-	  <text name="AspectRatioLabel1">
-			 Proporción:
-	  </text>
-	  <combo_box name="aspect_ratio" tool_tip="Ancho / Alto" left="130" >
-			 <combo_item name="4:3(StandardCRT)">
-					4:3 (CRT Estándar)
-			 </combo_item>
-			 <combo_item name="5:4(1280x1024LCD)">
-					5:4 (1280x1024 LCD)
-			 </combo_item>
-			 <combo_item name="8:5(Widescreen)">
-					16:10 (PC Pantalla ancha)
-			 </combo_item>
-			 <combo_item name="16:9(Widescreen)">
-					16:9 (TV Pantalla ancha)
-			 </combo_item>
-	  </combo_box>
-	  <check_box label="Detectar proporción automáticamente" name="aspect_auto_detect" left="280"/>
-	  <text name="QualityText">
-			 Calidad y Rendimiento:
-	  </text>
-	  <text name="FasterText"  left="130">
-			 Rápido
-	  </text>
-	  <text name="ShadersPrefText">
-			 Bajo
-	  </text>
-	  <text name="ShadersPrefText2">
-			 Medio
-	  </text>
-	  <text name="ShadersPrefText3">
-			 Alto
-	  </text>
-	  <text name="ShadersPrefText4">
-			 Ultra
-	  </text>
-	  <text name="QualityText2">
-			 Alta Calidad
-	  </text>
-	  <!-- Are these icons really necessary? 
-	<icon bottom="-89" height="14" image_name="rounded_square.tga" left="173" name="LowDivet" width="2"/>
-	<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="MidDivet" width="2"/>
-	<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="HighDivet" width="2"/>
-	<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="UltraDivet" width="2"/>
--->
-	  <check_box label="Personalizar" name="CustomSettings"/>
-	  <text name="ShadersText">
-			 Sombreado:
-	  </text>
-	  <check_box label="Relieve y Brillos" name="BumpShiny"/>
-	  <check_box label="Luces Locales" name="LightingDetailRadio"/>
-	  <check_box label="Sombreado Básico" name="BasicShaders" tool_tip="Desactivar esta opción puede prevenir fallos con algunas tarjetas gráficas."/>
-	  <check_box label="Sombreado Atmosférico" name="WindLightUseAtmosShaders"/>
-	  <check_box label="Iluminación y Sombras" tool_tip="Sombreado Diferido" name="RenderDeferred"/>
-	  <check_box label="Oclusión Ambiental" name="UseSSAO"/>
-	  <check_box label="Profundidad de Campo" name="RenderDepthOfField"/>
-	  <text name="ShadowDetailText">
-			 Sombras:
-	  </text>
-	  <combo_box label="Detalle de Sombras" name="ShadowDetailCombo">
-			 <combo_item name="0">
+	<check_box label="Ejecutar el Visor en Ventana" name="windowed mode" tool_tip="Si está desmarcado, el visor se ejecutará a pantalla completa cuando inicies sesión."/>
+	<text name="WindowSizeLabel">
+		Tamaño de Ventana:
+	</text>
+	<combo_box name="windowsize combo">
+		<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_item name="1280x720">
+			1280x720 (HDV720)
+		</combo_item>
+		<combo_item name="1440x1080">
+			1440x1080 (HDV1080)
+		</combo_item>
+		<combo_item name="1920x1080">
+			1920x1080 (HD1080)
+		</combo_item>
+	</combo_box>
+	<text name="DisplayResLabel">
+		Resolución de Pantalla:
+	</text>
+	<text name="AspectRatioLabel1">
+		Proporción:
+	</text>
+	<combo_box name="aspect_ratio" tool_tip="Ancho / Alto" left="130" >
+		<combo_item name="4:3(StandardCRT)">
+			4:3 (CRT Estándar)
+		</combo_item>
+		<combo_item name="5:4(1280x1024LCD)">
+			5:4 (1280x1024 LCD)
+		</combo_item>
+		<combo_item name="8:5(Widescreen)">
+			16:10 (PC Pantalla ancha)
+		</combo_item>
+		<combo_item name="16:9(Widescreen)">
+			16:9 (TV Pantalla ancha)
+		</combo_item>
+	</combo_box>
+	<button label="Predeterminado" name="Defaults" width="110"/>	
+	<check_box label="Detectar proporción automáticamente" name="aspect_auto_detect" left="280"/>
+	<tab_container name="graphics_tab">
+		<panel label="General" name="Main">
+			<button label="?" name="GraphicsPreferencesHelpButton"/>
+			<text name="QualityText">
+				Calidad y Rendimiento:
+			</text>
+			<text name="FasterText"  left="130">
+				Rápido
+			</text>
+			<text name="ShadersPrefText">
+				Bajo
+			</text>
+			<text name="ShadersPrefText2">
+				Medio
+			</text>
+			<text name="ShadersPrefText3">
+				Alto
+			</text>
+			<text name="ShadersPrefText4">
+				Ultra
+			</text>
+			<text name="QualityText2">
+				Alta Calidad
+			</text>
+			<check_box label="Personalizar" name="CustomSettings"/>
+			<text name="ShadersText">
+				Sombreado:
+			</text>
+			<check_box label="Agua Transparente" name="TransparentWater"/>			
+			<check_box label="Relieve y Brillos" name="BumpShiny"/>
+			<check_box label="Luces Locales" name="LightingDetailRadio"/>
+			<check_box label="Sombreado Básico" name="BasicShaders" tool_tip="Desactivar esta opción puede prevenir fallos con algunas tarjetas gráficas."/>
+			<check_box label="Sombreado Atmosférico" name="WindLightUseAtmosShaders"/>
+			<check_box label="Iluminación y Sombras" tool_tip="Sombreado Diferido" name="RenderDeferred"/>
+			<check_box label="Oclusión Ambiental" name="UseSSAO"/>
+			<check_box label="Profundidad de Campo" name="RenderDepthOfField"/>
+			<text name="TerrainScaleText">
+				Escala de Terreno:
+			</text>
+			<combo_box label="Escala de Terreno" name="TerrainScaleCombo">
+				<combo_item name="Low">
+					Baja
+				</combo_item>
+				<combo_item name="Medium">
+					Media
+				</combo_item>
+				<combo_item name="High">
+					Alta
+				</combo_item>
+				<combo_item name="Ultra">
+					Ultra
+				</combo_item>
+			</combo_box>			
+			<text name="ShadowDetailText">
+				Sombras:
+			</text>
+			<combo_box label="Detalle de Sombras" name="ShadowDetailCombo">
+				<combo_item name="0">
 					Desactivado
-			 </combo_item>
-			 <combo_item name="1">
+				</combo_item>
+				<combo_item name="1">
 					Sol/Luna
-			 </combo_item>
-			 <combo_item name="2">
+				</combo_item>
+				<combo_item name="2">
 					Sol/Luna + Proyectores
-			 </combo_item>
-	  </combo_box>
-	  <text name="ReflectionDetailText">
-			 Reflejos en el Agua:
-	  </text>
-	  <combo_box label="Detalle de los Reflejos" name="ReflectionDetailCombo">
-			 <combo_item name="0">
+				</combo_item>
+			</combo_box>
+			<text name="ReflectionDetailText">
+				Reflejos en el Agua:
+			</text>
+			<combo_box label="Detalle de los Reflejos" name="ReflectionDetailCombo">
+				<combo_item name="0">
 					Mínimos
-			 </combo_item>
-			 <combo_item name="1">
+				</combo_item>
+				<combo_item name="1">
 					Terreno y �rboles
-			 </combo_item>
-			 <combo_item name="2">
+				</combo_item>
+				<combo_item name="2">
 					Objetos Estáticos
-			 </combo_item>
-			 <combo_item name="3">
+				</combo_item>
+				<combo_item name="3">
 					Avatares y Objetos
-			 </combo_item>
-			 <combo_item name="4">
+				</combo_item>
+				<combo_item name="4">
 					Todo
-			 </combo_item>
-	  </combo_box>
-	  <slider label="  Física de Avatar:" name="AvatarPhysicsDetail" width="165"/>
-	  <text name="AvatarPhysicsDetailText">
-			 Apagada
-	  </text>
-	  <!--text bottom="-131" height="12" left="464" name="DrawDistanceMeterText1">m</text-->
-	  <text name="DrawDistanceMeterText2">
-			 m
-	  </text>
-	  <slider label="Distancia de Dibujo:" name="DrawDistance"/>
-	  <slider label="Máximo de Partículas:" name="MaxParticleCount"/>
-	  <slider label="Máx No Simulados" name="AvatarMaxVisible"/>
-	  <slider label="PostProcesado:" name="RenderPostProcess"/>
-	  <text name="MeshDetailText">
-			 Nivel de Detalles:
-	  </text>
-	  <slider label="  Objetos:" name="ObjectMeshDetail" />
-	  <slider label="  Prims Flexibles:" name="FlexibleMeshDetail"/>
-	  <slider label="  �rboles:" name="TreeMeshDetail"/>
-	  <slider label="  Avatares:" name="AvatarMeshDetail"/>
-	  <slider label="  Terreno:" name="TerrainMeshDetail"/>
-	  <slider label="  Cielo:" name="SkyMeshDetail"/>
-	  <text name="PostProcessText">
-			 Bajo
-	  </text>
-	  <text name="ObjectMeshDetailText">
-			 Bajo
-	  </text>
-	  <text name="FlexibleMeshDetailText">
-			 Bajo
-	  </text>
-	  <text name="TreeMeshDetailText">
-			 Bajo
-	  </text>
-	  <text name="AvatarMeshDetailText">
-			 Bajo
-	  </text>
-	  <text name="TerrainMeshDetailText">
-			 Bajo
-	  </text>
-	  <text name="SkyMeshDetailText">
-			 Bajo
-	  </text>
-	  <text name="AvatarRenderingText">
-			 Renderizado del Avatar:
-	  </text>
-	  <check_box label="Avatares Simulados" name="AvatarImpostors"/>
-	  <check_box label="Renderizado por Hardware" name="AvatarVertexProgram"/>
-	  <check_box label="Ropas de Avatar" name="AvatarCloth"/>
-	  <text name="TerrainDetailText">
-			 Detalle del Terreno:
-	  </text>
-	  <radio_group name="TerrainDetailRadio">
-			 <radio_item name="0">
+				</combo_item>
+			</combo_box>
+			<slider label="  Física de Avatar:" name="AvatarPhysicsDetail" width="165"/>
+			<text name="AvatarPhysicsDetailText">
+				Apagada
+			</text>
+			<text name="DrawDistanceMeterText2">
+				m
+			</text>
+			<slider label="Distancia de Dibujo:" name="DrawDistance"/>
+			<slider label="Máximo de Partículas:" name="MaxParticleCount"/>
+			<slider label="Máx No Simulados" name="AvatarMaxVisible"/>
+			<slider label="PostProcesado:" name="RenderPostProcess"/>
+			<text name="MeshDetailText">
+				Nivel de Detalles:
+			</text>
+			<slider label="  Objetos:" name="ObjectMeshDetail" />
+			<slider label="  Prims Flexibles:" name="FlexibleMeshDetail"/>
+			<slider label="  �rboles:" name="TreeMeshDetail"/>
+			<slider label="  Avatares:" name="AvatarMeshDetail"/>
+			<slider label="  Terreno:" name="TerrainMeshDetail"/>
+			<slider label="  Cielo:" name="SkyMeshDetail"/>
+			<text name="ObjectMeshDetailText">
+				Bajo
+			</text>
+			<text name="FlexibleMeshDetailText">
+				Bajo
+			</text>
+			<text name="TreeMeshDetailText">
+				Bajo
+			</text>
+			<text name="AvatarMeshDetailText">
+				Bajo
+			</text>
+			<text name="TerrainMeshDetailText">
+				Bajo
+			</text>
+			<text name="SkyMeshDetailText">
+				Bajo
+			</text>
+			<text name="AvatarRenderingText">
+				Renderizado del Avatar:
+			</text>
+			<check_box label="Avatares Simulados" name="AvatarImpostors"/>
+			<check_box label="Renderizado por Hardware" name="AvatarVertexProgram"/>
+			<check_box label="Ropas de Avatar" name="AvatarCloth"/>
+			<text name="TerrainDetailText">
+				Detalle del Terreno:
+			</text>
+			<radio_group name="TerrainDetailRadio">
+				<radio_item name="0">
 					Bajo
-			 </radio_item>
-			 <radio_item name="2">
+				</radio_item>
+				<radio_item name="2">
 					Alto
-			 </radio_item>
-	  </radio_group>
-	  <button label="Reiniciar" name="Defaults"/>
-	  <!--button bottom="-440" height="20" label="Advanced" left="230" name="CustomSettingsButton" scale_image="true" width="120" toggle="true" control_name="RenderCustomSettings"/-->
-	  <button label="Hardware" name="GraphicsHardwareButton"/>
-	  <string name="resolution_format">[RES_X] x [RES_Y]</string>
-	  <string name="aspect_ratio_text">[NUM]:[DEN]</string>
+				</radio_item>
+			</radio_group>
+			<text name="PostProcessText">
+				Bajo
+			</text>
+		</panel>
+		<panel name="Hardware" label="Hardware">
+			<check_box label="Filtrado Anisotrópico (más lento si se activa)" name="ani"/>
+			<text name="Antialiasing:">
+				Antialiasing:
+			</text>
+			<combo_box label="Antialiasing" name="fsaa">
+				<combo_item name="FSAADisabled">
+					Desactivado
+				</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="Memoria p/ Texturas (MB):" name="GrapicsCardTextureMemory" tool_tip="Cantidad de memoria asignada a las texturas. Por defecto es la memoria de la tarjeta de vídeo. Reducir esta cantidad puede mejorar el rendimiento, pero también puede hacer que las texturas se vean borrosas."/>
+			<check_box  label="Activar OpenGL Vertex Buffer Objects" name="vbo" tool_tip="Habilitar esta opción en hardware moderno puede proporcionar una mejora en el rendimiento. Sin embargo, el hardware antiguo ofrece una pobre implementación de VBOs y puede causar fallos cuando esta opcíon esté activada."/>
+			<check_box label="Activar Flujo VBOs" name="vbo_stream" tool_tip="Desactivar esta opción puede mejorar el rendimiento cuando se habilita VBO. Desactivarlo produce una mejora visible en diversas GPUs de AMD."/>
+			<check_box label="Activar OpenGL Frame Buffer Objects" name="fbo" tool_tip="Habilitar esta opción en hardware moderno puede proporcionar una mejora en el rendimiento. Sin embargo, si se habilita en combinación con el antialiasing en GPUs de AMD pueden causar problemas de mezcla de texturas. Este ajuste es necesario para renderizado diferido."/>
+			<spinner label="Gama:" name="gamma" width="202" tool_tip="(brillo, más bajo es mayor brlilo)"/>
+			<spinner label="Intensidad de la niebla:" name="fog"/>
+			<text name="note">
+				Nota: Las configuraciones de Gama e 
+Intensidad de la Niebla no están disponibles 
+cuando se activan las Sombras de la Atmósfera.
+			</text>
+		</panel>
+	</tab_container>
+	<string name="resolution_format">[RES_X] x [RES_Y]</string>
+	<string name="aspect_ratio_text">[NUM]:[DEN]</string>
 </panel>
+
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_grids.xml b/indra/newview/skins/default/xui/es/panel_preferences_grids.xml
index 42770d881..caff4f8b6 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_grids.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_grids.xml
@@ -1,73 +1,70 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Grids" name="Grids panel">
-	  <!-- Grid Selector -->
-	  <text name="grid_selector_label" >
-			 Elegir un grid:
-	  </text>
-	  <button label="Predeterminado" name="btn_default"/>
-	  <text name="default_grid">
-			 ([DEFAULT])
-	  </text>
-	  <!-- Buttons -->
-	  <button label="Quitar" name="btn_delete" />
-	  <button label="Añadir" name="btn_add"/>
-	  <button label="Copiar" name="btn_copy"/>
-	  <!-- Advanced -->
-	  <button label="Avanzado" name="btn_advanced"/>
-	  <!-- Login URI -->
-	  <text name="loginuri_label">
-			 URL de Inicio:
-	  </text>
-	  <!--<button label="Get Grid Info" label_selected="Get Grid Info" enabled="true" name="btn_gridinfo"
-		height="18" width="100" left="120" bottom_delta="-22"
-		halign="center"
-		follows="left|top" scale_image="true"
-	    font="SansSerifSmall" mouse_opaque="true" />-->
-	  <!-- Platform -->
-	  <text name="platform_label">
-			 Plataforma:
-	  </text>
-	  <!-- Grid Name -->
-	  <text name="gridname_label">
-			 Nombre del Grid:
-	  </text>
- 
-	  <!-- Grid Message -->
-	  <text name="gridmessage_label">
-			 Información del Grid:
-	  </text>
-  
-	  <!-- Advanced settings -->
-  
-	  <!-- Grid Splash Page -->
-	  <text name="loginpage_label">
-			 Página de Bienvenida:
-	  </text>
-	  <!-- Helper URI -->
-	  <text name="helperuri_label">
-			 URL de Ayuda:
-	  </text>
-	  <!-- Web Site -->
-	  <text name="website_label">
-			 Sitio Web:
-	  </text>
-	  <!-- Support URL -->
-	  <text name="support_label">
-			 URL de Soporte:
-	  </text>
-	  <!-- Account URL -->
-	  <text name="register_label">
-			 URL de Usuario:
-	  </text>
-	  <!-- Password URL -->
-	  <text name="password_label">
-			 URL Contraseña:
-	  </text>
-	  <!-- Search URL -->
-	  <text name="search_label">
-			 URL de Búsqueda:
-	  </text>
-	  <!-- Rendering Compatibility -->
-	  <check_box label="Compatibilidad de Renderizado" name="render_compat"/>
-	  <button label="?" name="btn_help_render_compat" left_delta="200" />
+	<!-- Grid Selector -->
+	<text name="grid_selector_label" >
+		Elegir un grid:
+	</text>
+	<button label="Predeterminado" name="btn_default"/>
+	<text name="default_grid">
+		([DEFAULT])
+	</text>
+	<!-- Buttons -->
+	<button label="Quitar" name="btn_delete" />
+	<button label="Añadir" name="btn_add"/>
+	<button label="Copiar" name="btn_copy"/>
+	<!-- Advanced -->
+	<button label="Avanzado" name="btn_advanced"/>
+	<!-- Login URI -->
+	<text name="loginuri_label">
+		URL de Inicio:
+	</text>
+	<!--<button label="Get Grid Info" label_selected="Get Grid Info" enabled="true" name="btn_gridinfo"
+	height="18" width="100" left="120" bottom_delta="-22"
+	halign="center"
+	follows="left|top" scale_image="true"
+		font="SansSerifSmall" mouse_opaque="true" />-->
+	<!-- Platform -->
+	<text name="platform_label">
+		Plataforma:
+	</text>
+	<!-- Grid Name -->
+	<text name="gridname_label">
+		Nombre del Grid:
+	</text>
+	<!-- Grid Message -->
+	<text name="gridmessage_label">
+		Información del Grid:
+	</text>
+	<!-- Advanced settings -->
+	<!-- Grid Splash Page -->
+	<text name="loginpage_label">
+		Página de Bienvenida:
+	</text>
+	<!-- Helper URI -->
+	<text name="helperuri_label">
+		URI de Ayuda:
+	</text>
+	<!-- Web Site -->
+	<text name="website_label">
+		Sitio Web:
+	</text>
+	<!-- Support URL -->
+	<text name="support_label">
+		URL de Soporte:
+	</text>
+	<!-- Account URL -->
+	<text name="register_label">
+		URL de Usuario:
+	</text>
+	<!-- Password URL -->
+	<text name="password_label">
+		URL Contraseña:
+	</text>
+	<!-- Search URL -->
+	<text name="search_label">
+		URL de Búsqueda:
+	</text>
+	<!-- Rendering Compatibility -->
+	<check_box label="Compatibilidad de Renderizado" name="render_compat"/>
+	<button label="?" name="btn_help_render_compat" left_delta="200" />
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_input.xml b/indra/newview/skins/default/xui/es/panel_preferences_input.xml
index 317bfe63e..57f1c4646 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_input.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_input.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Disp. y Cámara" name="Input panel">
-	  <text name=" Mouselook Options:">
-			 Vista Subjetiva:
-	  </text>
-	  <text name=" Mouse Sensitivity:">
-			 Sensibilidad del Ratón:
-	  </text>
-	  <check_box label="Invertir el Ratón" name="invert_mouse"/>
-	  <check_box label="Mostrar Avatar en Vista Subjetiva" name="first_person_avatar_visible"/>
-	  <text name=" Auto Fly Options:">
-			 Opciones de Vuelo:</text>
-	  <check_box label="Despegar/Aterrizar al pulsar RePág/AvPág" name="automatic_fly"/>
-	  <text left="10" name=" Camera Options:">
-			 Opciones de Cámara:
-	  </text>
-	  <text name="camera_fov_label">
-			 �ngula de vista de la Cámara:
-	  </text>
-	  <slider left="336" name="camera_fov"/>
-	  <text name="Camera Follow Distance:" width="198">
-			 Distancia de seguimiento de la Cámara:
-	  </text>
-	  <slider left="336" name="camera_offset_scale"/>
-	  <check_box label="Reorientar la cámara el editar" name="edit_camera_movement" tool_tip="Posicionar la Cámara automáticamente al entrar y salir del modo de Edición"/>
-	  <check_box label="Reorientar la cámara el editar la apariencia" name="appearance_camera_movement" tool_tip="Posicionar la Cámara automáticamente mientras se esté en modo edición del avatar"/>
-	  <check_box label="Levantar el avatar al reiniciar la cámara" name="unsit_on_camera_reset" tool_tip="Levanta al avatar automárticamente cuando presiones la tecla ESC y la cámara cambie a modo de vista en tercera persona"/>
-	  <button label="Configuración Joystick" name="joystick_setup_button"/>
+	<text name=" Mouselook Options:">
+		Vista Subjetiva:
+	</text>
+	<text name=" Mouse Sensitivity:">
+		Sensibilidad del Ratón:
+	</text>
+	<check_box label="Invertir el Ratón" name="invert_mouse"/>
+	<check_box label="Mostrar Avatar en Vista Subjetiva" name="first_person_avatar_visible"/>
+	<text name=" Auto Fly Options:">
+		Opciones de Vuelo:</text>
+	<check_box label="Despegar/Aterrizar al pulsar RePág/AvPág" name="automatic_fly"/>
+	<text left="10" name=" Camera Options:">
+		Opciones de Cámara:
+	</text>
+	<text name="camera_fov_label">
+		�ngulo de vista de la Cámara:
+	</text>
+	<slider left="336" name="camera_fov"/>
+	<text name="Camera Follow Distance:" width="198">
+		Distancia de seguimiento de la Cámara:
+	</text>
+	<slider left="336" name="camera_offset_scale"/>
+	<check_box label="Reorientar la cámara el editar" name="edit_camera_movement" tool_tip="Posicionar la Cámara automáticamente al entrar y salir del modo de Edición"/>
+	<check_box label="Reorientar la cámara el editar la apariencia" name="appearance_camera_movement" tool_tip="Posicionar la Cámara automáticamente mientras se esté en modo edición del avatar"/>
+	<check_box label="Levantar el avatar al reiniciar la cámara" name="unsit_on_camera_reset" tool_tip="Levanta al avatar automárticamente cuando presiones la tecla ESC y la cámara cambie a modo de vista en tercera persona"/>
+	<button label="Configuración Joystick" name="joystick_setup_button"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_network.xml b/indra/newview/skins/default/xui/es/panel_preferences_network.xml
index f55f93dc0..2bec2fe8c 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_network.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_network.xml
@@ -1,62 +1,62 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Red" name="network">
-	  <text name="text_box">
-			 Ancho de banda Máximo:
-	  </text>
-	  <text name="text_box2">
-			 kbps (kilobits por segundo)
-	  </text>
-	  <text name="cache_size_label_l">
-			 Tamaño de Caché de Disco (MB):
-	  </text>
-	  <text name="text_box5">
-			 MB
-	  </text>
-	  <button label="Borrar Caché" name="clear_cache"/>
-	  <text name="cache_location_label">
-			 Ubicación de Caché en Disco:
-	  </text>
-	  <button label="Establecer" label_selected="Establecer" name="set_cache"/>
-	  <button label="Reiniciar" label_selected="Reiniciar" name="reset_cache"/>
-	  <check_box label="Puerto de Conexión Personalizado" name="connection_port_enabled"/>
-	  <spinner label="Puerto Número:" name="connection_port"/>
-	  <text name="socks5_auth_label">
-			 Proxy Http:
-	  </text>
-	  <radio_group name="socks5_http_proxy_type">	  
-			 <radio_item name="None" tool_tip="Sin Proxy Http">
-					Ninguno
-			 </radio_item>
-			 <radio_item name="Socks" tool_tip="Utilizar Socks para el Proxy Http">
-					Socks
-			 </radio_item>
-			 <radio_item name="Web" tool_tip="Utilizar web proxy para el Proxy Http">
-					Web
-			 </radio_item>
-	  </radio_group>
-	  <check_box label="Activar Proxy SOCKS 5" name="socks5_proxy_enabled"/>
-	  <text name="socks5_host_label">
-			 Host Socks 5:
-	  </text>
-	  <line_editor name="socks5_proxy_host" tool_tip="Nombre dirección IP del Proxy SOCKS5 que quieres utilizar"/>
-	  <spinner label="Puerto Número:" name="socks5_proxy_port"/>
-	  <text name="socks5_auth_label2">
-			 Autenticación Socks5:
-	  </text>
-	  <radio_group name="socks5_auth">
-			 <radio_item name="None" tool_tip="Sin Autenticación">
-					Ninguna
-			 </radio_item>
-			 <radio_item name="UserPass" tool_tip="Usuario / Contraseña de autenticación">
-					Usuario / Contraseña
-			 </radio_item>
-	  </radio_group>
-	  <text name="socks5_username_label">
-			 Usuario:
-	  </text>
-	  <line_editor name="socks5_proxy_username" tool_tip="Usuario para el Proxy Socks5"/>
-	  <text name="socks5_password_label">
-			 Contraseña:
-	  </text>
-	  <line_editor name="socks5_proxy_password" tool_tip="Contraseña para el Proxy Socks5"/>
+	<text name="text_box">
+		Ancho de banda Máximo:
+	</text>
+	<text name="text_box2">
+		kbps (kilobits por segundo)
+	</text>
+	<text name="cache_size_label_l">
+		Tamaño de Caché de Disco (MB):
+	</text>
+	<text name="text_box5">
+		MB
+	</text>
+	<button label="Borrar Caché" name="clear_cache"/>
+	<text name="cache_location_label">
+		Ubicación del Caché en Disco:
+	</text>
+	<button label="Establecer" label_selected="Establecer" name="set_cache"/>
+	<button label="Reiniciar" label_selected="Reiniciar" name="reset_cache"/>
+	<check_box label="Puerto de Conexión Personalizado" name="connection_port_enabled"/>
+	<spinner label="Puerto Número:" name="connection_port"/>
+	<text name="socks5_auth_label">
+		Proxy Http:
+	</text>
+	<radio_group name="socks5_http_proxy_type">	  
+		<radio_item name="None" tool_tip="Sin Proxy Http">
+			Ninguno
+		</radio_item>
+		<radio_item name="Socks" tool_tip="Utilizar Socks para el Proxy Http">
+			Socks
+		</radio_item>
+		<radio_item name="Web" tool_tip="Utilizar web proxy para el Proxy Http">
+			Web
+		</radio_item>
+	</radio_group>
+	<check_box label="Activar Proxy SOCKS 5" name="socks5_proxy_enabled"/>
+	<text name="socks5_host_label">
+		Host Socks 5:
+	</text>
+	<line_editor name="socks5_proxy_host" tool_tip="Nombre dirección IP del Proxy SOCKS5 que quieres utilizar"/>
+	<spinner label="Puerto Número:" name="socks5_proxy_port"/>
+	<text name="socks5_auth_label2">
+		Autenticación Socks5:
+	</text>
+	<radio_group name="socks5_auth">
+		<radio_item name="None" tool_tip="Sin Autenticación">
+			Ninguna
+		</radio_item>
+		<radio_item name="UserPass" tool_tip="Usuario / Contraseña de autenticación">
+			Usuario / Contraseña
+		</radio_item>
+	</radio_group>
+	<text name="socks5_username_label">
+		Usuario:
+	</text>
+	<line_editor name="socks5_proxy_username" tool_tip="Usuario para el Proxy Socks5"/>
+	<text name="socks5_password_label">
+		Contraseña:
+	</text>
+	<line_editor name="socks5_proxy_password" tool_tip="Contraseña para el Proxy Socks5"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_skins.xml b/indra/newview/skins/default/xui/es/panel_preferences_skins.xml
index 6c12cd2da..a08f2dcd0 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_skins.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_skins.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Pieles" name="Skins panel">
-	  <text name="Skin_txt1">
-			 Piel Seleccionada
-	  </text>
-	  <combo_box name="custom_skin_combo" />
-	  <text name="Skin_txt2">
-			 Autor Principal
-	  </text>
-	  <text name="custom_skin_author">
-			 Autor de la Piel
-	  </text>
-	  <text name="Skin_txt3">
-			 Autores Adicionales
-	  </text>
-	  <text name="custom_skin_ad_authors">
-			 Autores Adicionales de la Piel
-	  </text>
-	  <text name="Skin_txt4">
-			 Carpeta de la Piel
-	  </text>
-	  <text name="custom_skin_folder">
-			 Carpeta de la Piel
-	  </text>
-	  <button label="" name="custom_skin_preview" tool_tip="Vista Previa de la Piel"/>
-	  <text name="Skin_txt5">
-			 Información Adicional
-	  </text>
+	<text name="Skin_txt1">
+		Piel Seleccionada
+	</text>
+	<combo_box name="custom_skin_combo" />
+	<text name="Skin_txt2">
+		Autor Principal
+	</text>
+	<text name="custom_skin_author">
+		Autor de la Piel
+	</text>
+	<text name="Skin_txt3">
+		Autores Adicionales
+	</text>
+	<text name="custom_skin_ad_authors">
+		Autores Adicionales de la Piel
+	</text>
+	<text name="Skin_txt4">
+		Carpeta de la Piel
+	</text>
+	<text name="custom_skin_folder">
+		Carpeta de la Piel
+	</text>
+	<button label="" name="custom_skin_preview" tool_tip="Vista Previa de la Piel"/>
+	<text name="Skin_txt5">
+		Información Adicional
+	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_voice.xml b/indra/newview/skins/default/xui/es/panel_preferences_voice.xml
index 382abd065..049aa9f0a 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_voice.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_voice.xml
@@ -1,41 +1,43 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="Chat de Voz" name="chat">
-	  <text name="voice_unavailable">
-			 El Chat de Voz no está Disponible
-	  </text>
-	  <check_box bottom_delta="0" follows="top" height="16" initial_value="false" label="Enable voice chat" left="8" name="enable_voice_check"/>
-	  <radio_group bottom_delta="-46" draw_border="false" follows="top" height="40" left_delta="20" name="ear_location" width="364">
-			 <radio_item name="0">
-					Oir el chat desde la posición de la cámara.
-			 </radio_item>
-			 <radio_item name="1">
-					Oir el chat desde la posición del avatar.
-			 </radio_item>
-	  </radio_group>
-	  <text name="push_to_talk_heading">
-			 Apretar para Hablar
-	  </text>
-	  <text name="voice_chat_description">
-El modo Apretar para Hablar controla cuándo tu voz se transmite. En el modo 'un toque', 
+	<text name="voice_unavailable">
+		El Chat de Voz no está Disponible
+	</text>
+	<check_box bottom_delta="0" follows="top" height="16" initial_value="false" label="Enable voice chat" left="8" name="enable_voice_check"/>
+	<radio_group bottom_delta="-46" draw_border="false" follows="top" height="40" left_delta="20" name="ear_location" width="364">
+		<radio_item name="0">
+			Oir el chat desde la posición de la cámara.
+		</radio_item>
+		<radio_item name="1">
+			Oir el chat desde la posición del avatar.
+		</radio_item>
+	</radio_group>
+	<text name="push_to_talk_heading">
+		Apretar para Hablar
+	</text>
+	<text name="voice_chat_description">
+		El modo Apretar para Hablar controla cuándo tu voz se transmite. En el modo 'un toque', 
 pulsa y suelta el botón Apretar para Hablar para activar y desactivar su micrófono. Si no se está 
 en el modo 'un toque', el micrófono está activo sólo cuando se mantiene pulsado el botón.
-	  </text>
-	  <check_box label="Usar Apretar para Hablar en el modo 'Un Toque'" name="push_to_talk_toggle_check"/>
-	  <text name="push_to_talk_label">
-			 Botón Apretar para Hablar:
-	  </text>
-	  <button label="Definir Tecla" name="set_voice_hotkey_button" width="115"/>
-	  <button label="Botón medio del Ratón" left_delta="120" name="set_voice_middlemouse_button" width="160"/>
-	  <text name="lip_sync_heading" width="445">
-			 Activar animación de Labios
-	  </text>
-	  <check_box label="Activar Animación de Labios" left_delta="20" name="enable_lip_sync_check"/>
-	  <text name="privacy_heading">
-			 Opciones de Privacidad
-	  </text>
-	  <check_box label="Aceptar llamadas sólo de mis contactos" left_delta="20" name="voice_call_friends_only_check"/>
-	  <check_box label="Apagar el micrófono al terminar la llamada por MI" name="auto_disengage_mic_check"/>
-	  <button label="Configuración de Dispositivos" left="28" mouse_opaque="true" name="device_settings_btn" width="155"/>
-	  <text name="device_settings_text">NOTA: Ejecutar esta configuración te desconectará temporalmente del chat de voz, 
-y los cambios se aplicarán inmediatamente..</text>
+	</text>
+	<check_box label="Usar Apretar para Hablar en el modo 'Un Toque'" name="push_to_talk_toggle_check"/>
+	<text name="push_to_talk_label">
+		Botón Apretar para Hablar:
+	</text>
+	<button label="Definir Tecla" name="set_voice_hotkey_button" width="115"/>
+	<button label="Botón medio del Ratón" left_delta="120" name="set_voice_middlemouse_button" width="160"/>
+	<text name="lip_sync_heading" width="445">
+		Activar animación de Labios
+	</text>
+	<check_box label="Activar Animación de Labios" left_delta="20" name="enable_lip_sync_check"/>
+	<text name="privacy_heading">
+		Opciones de Privacidad
+	</text>
+	<check_box label="Aceptar llamadas sólo de mis contactos" left_delta="20" name="voice_call_friends_only_check"/>
+	<check_box label="Apagar el micrófono al terminar la llamada por MI" name="auto_disengage_mic_check"/>
+	<button label="Configuración de Dispositivos" left="28" mouse_opaque="true" name="device_settings_btn" width="155"/>
+	<text name="device_settings_text">
+		NOTA: Ejecutar esta configuración te desconectará temporalmente del chat de voz, 
+y los cambios se aplicarán inmediatamente..
+	</text>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_progress.xml b/indra/newview/skins/default/xui/es/panel_progress.xml
index da8ae77d5..4d5b4faa2 100644
--- a/indra/newview/skins/default/xui/es/panel_progress.xml
+++ b/indra/newview/skins/default/xui/es/panel_progress.xml
@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="0" follows="left|bottom|right|top" height="768" left="0" name="login_progress_panel" width="1024" visible="true">
-  <layout_stack name="stack1" orientation="horizontal" left="0" bottom="0" width="1024" height="768" follows="left|right|top|bottom">
-    <layout_panel name="panel1" user_resize="false" min_width="10" width="150"/>
-    <layout_panel name="panel2" user_resize="false" min_width="640" width="640" height="768">
-      <layout_stack name="stack2" orientation="vertical" left="0" bottom="0" height="768" width="640" follows="left|right|top|bottom">
-        <layout_panel name="panel3" min_height="10" height="200" width="640"/>
-        <layout_panel name="panel4" min_height="250" height="250" width="640" auto_resize="false">
-          <icon image_name="rounded_square.tga" color="LoginProgressBoxCenterColor" left="0" bottom="0" width="640" height="250" follows="left|right|bottom|top"/>
-          <text name="title_text" halign="center" font="SansSerif" left="0" bottom="-70" width="640" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/>
-          <text name="progress_text" halign="center" font="SansSerif" left="0" bottom="-95" width="640" height="20" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top"/>
-          <progress_bar name="login_progress_bar" color="255,255,255,245" height="16" bottom="135" left="45" right="-45" follows="left|right|top" />
-          <text name="message_text" halign="center" line_spacing="8" font="SansSerif" left="20" bottom="5" width="600" height="100" text_color="LoginProgressBoxTextColor" font-shadow="hard" follows="left|right|top|bottom"/>
-        </layout_panel>
-        <layout_panel name="panel5" min_width="10" height="200" width="640"/>
-      </layout_stack>
-    </layout_panel>
-    <layout_panel name="panel6" user_resize="false" min_width="10" width="150"/>
-  </layout_stack>
-  <button name="cancel_btn" left="-86" bottom="16" width="70" height="22" follows="right|bottom"/>
+<panel name="login_progress_panel">
+  <layout_stack name="stack1" >
+		<layout_panel name="panel1"/>
+		<layout_panel name="panel2">
+			<layout_stack name="stack2">
+				<layout_panel name="panel3"/>
+				<layout_panel name="panel4">
+					<progress_bar name="login_progress_bar"/>
+				</layout_panel>
+				<layout_panel name="panel5"/>
+			</layout_stack>
+		</layout_panel>
+		<layout_panel name="panel6"/>
+	</layout_stack>
+	<button name="cancel_btn"/>
 </panel>
 
diff --git a/indra/newview/skins/default/xui/es/panel_region_covenant.xml b/indra/newview/skins/default/xui/es/panel_region_covenant.xml
index 9bbdbd303..82c4d88ec 100644
--- a/indra/newview/skins/default/xui/es/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_covenant.xml
@@ -1,142 +1,80 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" follows="top|left" height="320" label="Covenant"
-     left="0" name="Covenant" width="480">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-25" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="20" left="5"
-	     mouse_opaque="false" name="estate_section_lbl" v_pad="0" width="100">
-		Estate:
+<panel label="Convenio" name="Covenant">
+	<text name="estate_section_lbl">
+		Estado:
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-45" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-	     mouse_opaque="false" name="estate_name_lbl" v_pad="0" width="100">
-		Name:
+	<text name="estate_name_lbl">
+		Nombre:
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-45" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-	     mouse_opaque="false" name="estate_name_text" v_pad="0" width="150">
+	<text name="estate_name_text">
 		mainland
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-65" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-	     mouse_opaque="false" name="estate_owner_lbl" v_pad="0" width="100">
-		Owner:
+	<text name="estate_owner_lbl">
+		Propietario:
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-65" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-	     mouse_opaque="false" name="estate_owner_text" v_pad="0" width="150">
-		(none)
+	<text name="estate_owner_text">
+		(ninguno)
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-85" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-	     mouse_opaque="false" name="estate_cov_lbl" v_pad="0" width="100">
-		Covenant:
+	<text name="estate_cov_lbl">
+		Convenio:
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-85" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-	     mouse_opaque="false" name="covenant_timestamp_text" v_pad="0" width="300">
-		Last Modified Wed Dec 31 16:00:00 1969
+	<text name="covenant_timestamp_text">
+		Última Modificación Mie Dic 31 16:00:00 1969
 	</text>
-	<button bottom="-82" follows="right|top" font="SansSerifSmall" height="18" label="?"
-	     name="covenant_help" right="462" width="18" />
-	<text_editor type="string" length="1" bottom="-279" embedded_items="false" enabled="false"
-	     follows="left|top" font="SansSerifSmall" height="194"
-	     left="120" max_length="65535" mouse_opaque="true" name="covenant_editor"
-	     width="340" word_wrap="true" spell_check="true">
-		There is no Covenant provided for this Estate.
+	<button label="?" name="covenant_help"/>
+	<text_editor name="covenant_editor">
+		No se ha provisto un Convenio para este Estado.
 	</text_editor>
-	<button bottom_delta="-25" follows="left|top" font="SansSerifSmall" height="18"
-	     label="Reset" name="reset_covenant" right="460" width="90" />
-	<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left="120"
-	     name="covenant_help_text" width="460">
-		Changes to the covenant will show on all parcels in the estate.
+	<button label="Reinicar" name="reset_covenant"/>
+	<text name="covenant_help_text">
+		Los cambios en el Convenio serán mostrados en todas las parcelas del Estado.
 	</text>
-	<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-	     left_delta="0" name="covenant_instructions" width="465">
-		Drag and drop a notecard to change the Covenant for this Estate.
+	<text name="covenant_instructions">
+		Arrastra y suelta una nota para cambiar el Convenio para este Estado.
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerif" h_pad="0" halign="left" height="20" left="5"
-	     mouse_opaque="false" name="region_section_lbl" v_pad="0" width="100">
-		Region:
+	<text name="region_section_lbl">
+		Región:
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-	     mouse_opaque="false" name="region_name_lbl" v_pad="0" width="100">
-		Name:
+	<text name="region_name_lbl">
+		Nombre:
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-	     mouse_opaque="false" name="region_name_text" v_pad="0" width="150">
+	<text name="region_name_text">
 		leyla
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-	     mouse_opaque="false" name="region_landtype_lbl" v_pad="0" width="100">
-		Type:
+	<text name="region_landtype_lbl">
+		Tipo:
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-	     mouse_opaque="false" name="region_landtype_text" v_pad="0" width="150">
+	<text name="region_landtype_text">
 		Mainland / Homestead
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-	     mouse_opaque="false" name="region_maturity_lbl" v_pad="0" width="100">
-		Rating:
+	<text name="region_maturity_lbl">
+		Calificación:
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-	     mouse_opaque="false" name="region_maturity_text" v_pad="0" width="150">
-		Adult
+	<text name="region_maturity_text">
+		Adulto
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-	     mouse_opaque="false" name="resellable_lbl" v_pad="0" width="100">
-		Resale:
+	<text name="resellable_lbl">
+		Revender:
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="120"
-	     mouse_opaque="false" name="resellable_clause" v_pad="0" width="330">
-		Land in this region may not be resold.
+	<text name="resellable_clause">
+		Las parcelas en esta región no pueden ser revendidas.
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-	     mouse_opaque="false" name="changeable_lbl" v_pad="0" width="100">
-		Subdivide:
+	<text name="changeable_lbl">
+		Subdividir:
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-10" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="30" left="120"
-	     mouse_opaque="false" name="changeable_clause" v_pad="0" width="330">
-		Land in this region may not be joined/subdivided.
+	<text name="changeable_clause">
+		Las parcelas en esta región no pueden ser unidas ni subdivididas.
 	</text>
 	<string name="can_resell">
-		Purchased land in this region may be resold.
+		Los terrenos comprados en esta región pueden ser revendidos.
 	</string>
 	<string name="can_not_resell">
-		Purchased land in this region may not be resold.
+		Los terrenos comprados en esta región no pueden ser revendidos.
 	</string>
 	<string name="can_change">
-		Purchased land in this region may be joined or subdivided.
+		Los terrenos comprados en esta región pueden ser unidos o subdivididos.
 	</string>
 	<string name="can_not_change">
-		Purchased land in this region may not be joined or subdivided.
+		Los terrenos comprados en esta región no pueden ser unidos ni subdivididos.
 	</string>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_debug.xml b/indra/newview/skins/default/xui/es/panel_region_debug.xml
index c0dfdbf3e..b9eee97c5 100644
--- a/indra/newview/skins/default/xui/es/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_debug.xml
@@ -1,80 +1,40 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" follows="top|left" height="320" label="Debug" left="0"
-     name="Debug" width="480">
-	<text bottom="-30" follows="left|top" font="SansSerif" height="20" left="10"
-	     name="region_text_lbl" width="100">
-		Region:
+<panel name="region_text_lbl">
+		Región:
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
-	     name="region_text" width="400">
-		unknown
+	<text name="region_text">
+		desconocida
 	</text>
-	<check_box bottom_delta="-20" follows="left|top" height="20" label="Disable Scripts"
-	     left="10" name="disable_scripts_check"
-	     tool_tip="Disable all scripts in this region" width="80" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="160" name="disable_scripts_help" width="18" />
-	<check_box bottom_delta="-20" follows="left|top" height="20" label="Disable Collisions"
-	     left="10" name="disable_collisions_check"
-	     tool_tip="Disable non-avatar collisions in this region" width="80" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="160" name="disable_collisions_help" width="18" />
-	<check_box bottom_delta="-20" follows="left|top" height="20" label="Disable Physics"
-	     left="10" name="disable_physics_check"
-	     tool_tip="Disable all physics in this region" width="80" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="160" name="disable_physics_help" width="18" />
-	<button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
-	     left="60" name="apply_btn" width="100" />
-	<text bottom_delta="-50" follows="left|top" height="20" left="10" width="90" name="objret_text_lbl">
-	  Object Return
+	<check_box label="Disactivar Scripts" name="disable_scripts_check" tool_tip="Desactiva todos los scripts en esta región"/>
+	<button label="?" name="disable_scripts_help"/>
+	<check_box label="Disactivar Colisiones" name="disable_collisions_check" tool_tip="Desactiva las colisiones provocadas por objetos en esta región"/>
+	<button label="?" name="disable_collisions_help"/>
+	<check_box label="Desactivar Físicas" name="disable_physics_check" tool_tip="Desactiva todas las propiedades físicas en esta región"/>
+	<button label="?" name="disable_physics_help"/>
+	<button label="Aplicar" name="apply_btn"/>
+	<text name="objret_text_lbl">
+	  Devolver Objeto
 	</text>
-	<text bottom_delta="-25" follows="left|top" height="20" left="30" width="60" name="resident_text_lbl">
-	  Resident:
+	<text name="resident_text_lbl">
+	  Residente:
 	</text>
-	<line_editor bottom_delta="2" follows="left|top" height="20" left="90" 
-		 border_style="line" border_thickness="1" enabled="false" max_length="254" mouse_opaque="false"
-	     name="target_avatar_name" width="180">
-	  (none)
-    </line_editor>
-	<button bottom_delta="0" follows="left|top" height="20" label="Choose..."
-	     left="280" name="choose_avatar_btn" width="80" />
-	<text bottom_delta="-25" follows="left|top" height="20" left="30" width="60" name="options_text_lbl">
-	  Options:
+	<line_editor name="target_avatar_name">
+	  (nadie)
+	</line_editor>
+	<button label="Elegir..." name="choose_avatar_btn"/>
+	<text name="options_text_lbl">
+	  Opciones:
 	</text>
-    <check_box bottom_delta="0" follows="left|top" height="20" label="Return only those objects with scripts"
-         left="90" name="return_scripts"
-         tool_tip="Return only objects which have scripts." width="80" />
-    <check_box bottom_delta="-20" follows="left|top" height="20" label="Return only those objects on someone else's land"
-         left="90" name="return_other_land"
-         tool_tip="Return only objects which are on land belonging to someone else" width="80" />
-    <check_box bottom_delta="-20" follows="left|top" height="20" label="Return objects in every region of this estate"
-         left="90" name="return_estate_wide"
-         tool_tip="Return objects in all of the regions that make up this estate" width="80" />
-	<button bottom_delta="-25" follows="left|top" height="20"
-	     label="Return"
-	     left="30" name="return_btn" width="80" />
-	<button bottom_delta="-50" follows="left|top" height="20" label="Get Top Colliders..."
-	     left="10" name="top_colliders_btn"
-	     tool_tip="List of objects experiencing the most potential collisions"
-	     width="150" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="170" name="top_colliders_help" width="18" />
-	<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" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="170" name="top_scripts_help" width="18" />
-  <button bottom_delta="-50" follows="left|top" height="20" label="Restart Region"
-	     left="10" name="restart_btn"
-	     tool_tip="Give x second countdown and restart region" width="130" />
-  <spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16"
-             increment="1" initial_val="120" left_delta="135" max_val="3600" min_val="15"
-             mouse_opaque="true" name="rcount" label="Seconds:" label_width="50" width="105" />
-  <button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="255" name="restart_help" width="18" />
-  <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" />
+	<check_box label="Devolver sólo los objetos con scritps" name="return_scripts" tool_tip="Devuelve solamente los objetos que tienen scripts"/>
+	<check_box label="Devolver sólo los objetos en terreno ajeno" name="return_other_land" tool_tip="Devuelve solamente los objetos que están en terrenos pertenecientes a otras personas"/>
+	<check_box label="Devolver los objetos de todas las regiones de este estado" name="return_estate_wide" tool_tip="Devuelve los objetos que están en todas las regiones que conforman este estado"/>
+	<button label="Devolver" name="return_btn"/>
+	<button label="Obtener Top Colisionadores..." name="top_colliders_btn" tool_tip="Lista de los objetos que experimetan un mayor potencial de colisiones"/>
+	<button label="?" name="top_colliders_help"/>
+	<button label="Obtener Top Scripts..." name="top_scripts_btn" tool_tip="Lista de los objetos que consumen mayor cantidad de tiempo ejecutando scripts"/>
+	<button label="?" name="top_scripts_help"/>
+	<button label="Reiniciar Región" name="restart_btn" tool_tip="Inicia la cuenta regresiva en x segundos y reinicia la región"/>
+	<spinner name="rcount" label="Segundos:"/>
+	<button label="?" name="restart_help"/>
+	<button label="Retrasar el Reinicio" name="cancel_restart_btn" tool_tip="Retrasa una hora el reinicio de la región"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_estate.xml b/indra/newview/skins/default/xui/es/panel_region_estate.xml
index 84ce9d050..08ff49b29 100644
--- a/indra/newview/skins/default/xui/es/panel_region_estate.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_estate.xml
@@ -1,145 +1,69 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" follows="top|left" height="320" label="Estate"
-     left="0" name="Estate" width="480">
-	<text bottom="-46" follows="left|top" font="SansSerifSmall" height="32" left="10"
-	     name="estate_help_text" width="300">
-		Changes to settings on this tab will affect all
-regions in the estate.
+<panel label="Estado" name="Estate">
+	<text name="estate_help_text">
+		Los cambios de configuración en esta pestaña
+afectarán a todas las regiones en este estado.
 	</text>
-	<text bottom_delta="-22" follows="left|top" font="SansSerif" height="20" left="10"
-	     name="estate_text" width="80">
-		Estate:
+	<text name="estate_text">
+		Estado:
 	</text>
-	<text bottom_delta="-16" follows="left|top"
-	     font="SansSerif" height="20" left_delta="0" name="estate_name"
-	     width="150">
-		(unknown)
+	<text name="estate_name">
+		(ninguno)
 	</text>
-	<text bottom_delta="-22" follows="left|top" font="SansSerif" height="20" left="10"
-	     name="owner_text" width="80">
-		Owner:
+	<text name="owner_text">
+		Propietario:
 	</text>
-	<text bottom_delta="-16" follows="left|top"
-	     font="SansSerif" height="20" left_delta="0" name="estate_owner"
-	     width="150">
-		(unknown)
+	<text name="estate_owner">
+		(desconocido)
 	</text>
-	<view_border bevel_style="in" border="true" border_thickness="1" bottom_delta="-295"
-	     follows="top|left" height="290" left="6" width="250" />
-	<check_box bottom_delta="265" follows="left|top" height="20" label="Use Global Time"
-	     left="12" name="use_global_time_check" width="200" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     name="use_global_time_help" right="250" width="18" />
-	<check_box bottom_delta="-20" follows="left|top" height="20" label="Fixed Sun" left="12"
-	     name="fixed_sun_check" width="100" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     name="fixed_sun_help" right="250" width="18" />
-	<icon bottom_delta="-25" follows="left|top" height="20"
-	     image_name="icon_day_cycle.tga" left="47" name="daycycle" width="165" />
-	<slider bottom_delta="-25" follows="left|top" height="20" increment="0.001"
-	     label="Phase" left="12" max_val="30" min_val="6" name="sun_hour_slider"
-	     show_text="false" width="200" />
-	<check_box bottom_delta="-26" follows="left|top" height="20" label="Allow Public Access"
-	     left="12" name="externally_visible_check" width="200" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     name="externally_visible_help" right="250" width="18" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-18" drop_shadow_visible="true" enabled="true"
-	     follows="top|left" font="SansSerifSmall" h_pad="0" halign="left"
-	     height="16" left="32" mouse_opaque="true" name="Only Allow" v_pad="0"
-	     width="278">
-		Restrict Access To:
+	<check_box label="Usar Tiempo Global" name="use_global_time_check"/>
+	<button label="?" name="use_global_time_help"/>
+	<check_box label="Sol Fijo" name="fixed_sun_check"/>
+	<button label="?" name="fixed_sun_help"/>
+	<slider label="Fase" name="sun_hour_slider"/>
+	<check_box label="Permitir Acceso Público" name="externally_visible_check"/>
+	<button label="?" name="externally_visible_help"/>
+	<text name="Only Allow">
+		Acceso Restringido para:
 	</text>
-	<check_box bottom_delta="-18" enabled="true" follows="top|left" font="SansSerifSmall"
-	     height="16" initial_value="false"
-	     label="Residents with payment info on file" left_delta="0"
-	     mouse_opaque="true" name="limit_payment" radio_style="false"
-	     tool_tip="Ban unidentified residents." width="278" />
-	<check_box bottom_delta="-18" enabled="true" follows="top|left" font="SansSerifSmall"
-	     height="16" initial_value="false" label="Age-verified adults"
-	     left_delta="0" mouse_opaque="true" name="limit_age_verified"
-	     radio_style="false"
-	     tool_tip="Ban residents who have not verified their age. See support.secondlife.com for more information."
-	     width="278" />
-	<check_box bottom_delta="-22" follows="left|top" height="20" label="Allow Voice Chat"
-	     left="12" name="voice_chat_check" width="200" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     name="voice_chat_help" right="250" width="18" />
-	<check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Direct Teleport"
-	     left="12" name="allow_direct_teleport" width="80" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     name="allow_direct_teleport_help" right="250" width="18" />
-	<text bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="20"
-	     left="10" name="abuse_email_text" width="180">
-		Abuse email address:
+	<check_box label="Residentes con información de pago en Archivo" name="limit_payment" tool_tip="Prohibir residentes sin identificar"/>
+	<check_box label="Adultos con edad verificada" name="limit_age_verified" tool_tip="Prohibir residentes que no hayan verificado su edad. Ver support.secondlife.com para mayor información."/>
+	<check_box label="Permitir Chat de Voz" name="voice_chat_check"/>
+	<button label="?" name="voice_chat_help"/>
+	<check_box label="Permitir Teleporte Directo" name="allow_direct_teleport"/>
+	<button label="?" name="allow_direct_teleport_help"/>
+	<text name="abuse_email_text">
+		Dirección de email par Reportes:
 	</text>
-	<line_editor bottom_delta="-16" follows="top|left" height="19" left="15" max_length="254"
-	     name="abuse_email_address" width="205" />
-	<string name="email_unsupported">Feature unsupported</string>
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     name="abuse_email_address_help" right="250" width="18" />
-	<button bottom_delta="-26" enabled="false" follows="left|top" height="20" label="Apply"
-	     name="apply_btn" right="250" width="90" />
-	<button bottom="-468" enabled="true" follows="left|top" height="20"
-	     label="Kick User from Estate..." left="8" name="kick_user_from_estate_btn"
-	     width="250" />
-	<button bottom_delta="23" follows="left|top" height="20"
-	     label="Send Message To Estate..." left="8" name="message_estate_btn"
-	     width="250" />
-	<text bottom="-34" follows="left|top" height="20" name="estate_manager_label"
-	     right="470" width="200">
-		Estate Managers:
+	<string name="email_unsupported">
+		Característica no soportada
+	</string>
+	<button label="?" name="abuse_email_address_help"/>
+	<button label="Aplicar" name="apply_btn"/>
+	<button label="Expulsar usuario del estado..." name="kick_user_from_estate_btn"/>
+	<button label="Enviar Mensaje al Estado..." name="message_estate_btn"/>
+	<text name="estate_manager_label">
+		Administradores del Estado:
 	</text>
-	<button bottom_delta="3" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     name="estate_manager_help" right="470" width="18" />
-	<view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
-	     height="60" right="470" width="200" />
-	<name_list bottom_delta="0" follows="left|top" height="60" left_delta="0" multi_select="true"
-	     name="estate_manager_name_list" width="200" />
-	<button bottom_delta="-26" enabled="true" follows="left|top" height="20"
-	     label="Remove..." name="remove_estate_manager_btn" right="470" width="90" />
-	<button bottom_delta="0" enabled="true" follows="left|top" height="20" label="Add..."
-	     left="270" name="add_estate_manager_btn" width="90" />
-	<text bottom_delta="-34" follows="left|top" height="20" left_delta="0"
-	     name="allow_resident_label" width="200">
-		Allowed Residents:
+	<button label="?" name="estate_manager_help"/>
+	<button label="Quitar..." name="remove_estate_manager_btn"/>
+	<button label="Añadir..." name="add_estate_manager_btn"/>
+	<text name="allow_resident_label">
+		Residentes Permitidos:
 	</text>
-	<button bottom_delta="3" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     name="allow_resident_help" right="470" width="18" />
-	<view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
-	     height="60" right="470" width="200" />
-	<name_list bottom_delta="0" follows="left|top" height="60" left_delta="0" multi_select="true"
-	     name="allowed_avatar_name_list" width="200" />
-	<button bottom_delta="-26" enabled="true" follows="left|top" height="20"
-	     label="Remove..." name="remove_allowed_avatar_btn" right="470" width="90" />
-	<button bottom_delta="0" enabled="true" follows="left|top" height="20" label="Add..."
-	     left="270" name="add_allowed_avatar_btn" width="90" />
-	<text bottom_delta="-34" follows="left|top" height="20" left_delta="0"
-	     name="allow_group_label" width="200">
-		Allowed Groups:
+	<button label="?" name="allow_resident_help"/>
+	<button label="Quitar..." name="remove_allowed_avatar_btn"/>
+	<button label="Add..." name="add_allowed_avatar_btn"/>
+	<text name="allow_group_label">
+		Grupos Permitidos:
 	</text>
-	<button bottom_delta="3" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     name="allow_group_help" right="470" width="18" />
-	<view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
-	     height="60" right="470" width="200" />
-	<name_list bottom_delta="0" follows="left|top" height="60" left_delta="0" multi_select="true"
-	     name="allowed_group_name_list" width="200" />
-	<button bottom_delta="-26" enabled="true" follows="left|top" height="20"
-	     label="Remove..." name="remove_allowed_group_btn" right="470" width="90" />
-	<button bottom_delta="0" enabled="true" follows="left|top" height="20" label="Add..."
-	     left="270" name="add_allowed_group_btn" width="90" />
-	<text bottom_delta="-34" follows="left|top" height="20" left_delta="0"
-	     name="ban_resident_label" width="200">
-		Banned Residents:
+	<button label="?" name="allow_group_help"/>
+	<button label="Quitar..." name="remove_allowed_group_btn"/>
+	<button label="Añadir..." name="add_allowed_group_btn"/>
+	<text name="ban_resident_label">
+		Residentes Prohibidos:
 	</text>
-	<button bottom_delta="3" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     name="ban_resident_help" right="470" width="18" />
-	<view_border bevel_style="none" border_thickness="1" bottom_delta="-60" follows="top|left"
-	     height="60" right="470" width="200" />
-	<name_list bottom_delta="0" follows="left|top" height="60" left_delta="0" multi_select="true" 
-	     name="banned_avatar_name_list" width="200" />
-	<button bottom_delta="-26" enabled="true" follows="left|top" height="20"
-	     label="Remove..." name="remove_banned_avatar_btn" right="470" width="90" />
-	<button bottom_delta="0" enabled="true" follows="left|top" height="20" label="Add..."
-	     left="270" name="add_banned_avatar_btn" width="90" />
+	<button label="?" name="ban_resident_help"/>
+	<button label="Quitar..." name="remove_banned_avatar_btn"/>
+	<button label="Añadir..." name="add_banned_avatar_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml
index 6302428c8..f8fae43af 100644
--- a/indra/newview/skins/default/xui/es/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_general.xml
@@ -1,98 +1,59 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" follows="top|left" height="320" label="Region"
-     left="0" name="General" width="480">
-	<text bottom="-30" follows="left|top" font="SansSerif" height="20" left="10"
-	     name="region_text_lbl" width="100">
-		Region:
+<panel label="Región" name="General">
+	<text name="region_text_lbl">
+		Región:
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
-	     name="region_text" width="400">
-		unknown
+	<text name="region_text">
+		desconocida
 	</text>
-	<text bottom="-50" follows="left|top" font="SansSerif" height="20" left="10"
-	     name="version_channel_text_lbl" width="100">
-		Version: 
+	<text name="version_channel_text_lbl">
+		Versión: 
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
-	     name="version_channel_text" width="200">
-		unknown
+	<text name="version_channel_text">
+		desconocida
 	</text>
-	<text bottom="-70" follows="left|top" font="SansSerif" height="20" left="10"
-	     name="region_type_lbl" width="100">
-		Type: 
+	<text name="region_type_lbl">
+		Tipo: 
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
-	     name="region_type" width="200">
-		unknown
+	<text name="region_type">
+		desconocido
 	</text>
-	<check_box bottom_delta="-20" follows="left|top" height="20" label="Block Terraform"
-	     left="10" name="block_terraform_check" width="80" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="205" name="terraform_help" width="18" />
-	<check_box bottom_delta="-20" follows="left|top" height="20" label="Block Fly" left="10"
-	     name="block_fly_check" width="80" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="205" name="fly_help" width="18" />
-	<check_box bottom_delta="-20" follows="left|top" height="20" label="Allow Damage"
-	     left="10" name="allow_damage_check" width="80" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="205" name="damage_help" width="18" />
-	<check_box bottom_delta="-20" follows="left|top" height="20" label="Restrict Pushing"
-	     left="10" name="restrict_pushobject" width="80" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="205" name="restrict_pushobject_help" width="18" />
-	<check_box bottom_delta="-30" follows="left|top" height="20" label="Allow Land Resell"
-	     left="10" name="allow_land_resell_check" width="80" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="205" name="land_resell_help" width="18" />
-	<check_box bottom_delta="-20" follows="left|top" height="20"
-	     label="Allow Land Join/Divide" left="10" name="allow_parcel_changes_check"
-	     width="80" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="205" name="parcel_changes_help" width="18" />
-	<check_box bottom_delta="-20" follows="left|top" height="20"
-	     label="Block Land Show in Search" left="10"
-	     name="block_parcel_search_check"
-	     tool_tip="Let people see this region and its parcels in search results"
-	     width="80" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="205" name="parcel_search_help" width="18" />
-	<spinner bottom_delta="-40" follows="left|top" height="20" increment="1"
-	     label="Agent Limit" label_width="97" left="10" max_val="100" min_val="1"
-	     name="agent_limit_spin" width="170" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="205" name="agent_limit_help" width="18" />
-	<spinner bottom_delta="-20" follows="left|top" height="20" increment="0.5"
-	     label="Object Bonus" label_width="97" left="10" max_val="10" min_val="1"
-	     name="object_bonus_spin" width="170" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="205" name="object_bonus_help" width="18" />
-	<text bottom_delta="-30" follows="left|top" height="20" label="Maturity" left="10"
-	     name="access_text" width="100">
-		Rating:
+	<check_box label="Bloquear Terraformado" name="block_terraform_check"/>
+	<button label="?" name="terraform_help"/>
+	<check_box label="Bloquear Volar" name="block_fly_check"/>
+	<button label="?" name="fly_help"/>
+	<check_box label="Permitir Daño" name="allow_damage_check"/>
+	<button label="?" name="damage_help"/>
+	<check_box label="Restringir Empujones" name="restrict_pushobject"/>
+	<button label="?" name="restrict_pushobject_help"/>
+	<check_box label="Permitir reventa de terreno" name="allow_land_resell_check"/>
+	<button label="?" name="land_resell_help"/>
+	<check_box label="Permitir Unir/Dividir Terreno" name="allow_parcel_changes_check"/>
+	<button label="?" name="parcel_changes_help"/>
+	<check_box label="Bloquear Mostrar Parcela en la Búsqueda" name="block_parcel_search_check" tool_tip="Permitir (o no) que la gente vea a esta región y sus parcelas en los resultados de las búsquedas"/>
+	<button label="?" name="parcel_search_help"/>
+	<spinner label="Límite de Avatares" name="agent_limit_spin"/>
+	<button label="?" name="agent_limit_help"/>
+	<spinner label="Bonus de Objetos" name="object_bonus_spin"/>
+	<button label="?" name="object_bonus_help"/>
+	<text label="Calificación" name="access_text">
+		Calificación:
 	</text>
-	<combo_box bottom_delta="0" follows="left|top" height="20" label="Mature" left="110"
-	     name="access_combo" width="85">
-		<combo_item name="Adult" value="42">
-			Adult
+	<combo_box label="Contenido" name="access_combo">
+		<combo_item name="Adult">
+			Adulto
 		</combo_item>
-		<combo_item name="Mature" value="21">
+		<combo_item name="Mature">
 			Mature
 		</combo_item>
-		<combo_item name="PG" value="13">
+		<combo_item name="PG">
 			PG
 		</combo_item>
 	</combo_box>
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="205" name="access_help" width="18" />
-	<button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
-	     left="108" name="apply_btn" width="100" />
-	<button bottom_delta="-60" follows="left|top" height="20"
-	     label="Teleport Home One User..." left="10" name="kick_btn" width="250" />
-	<button bottom_delta="-23" follows="left|top" height="20"
-	     label="Teleport Home All Users..." left="10" name="kick_all_btn" width="250" />
-	<button bottom_delta="-40" follows="left|top" height="20"
-	     label="Send Message To Region..." left="10" name="im_btn" width="200" />
-	<button bottom="-90" follows="left|top" height="20" label="Manage Telehub..."
-	     left="250" name="manage_telehub_btn" width="150" />
+	<button label="?" name="access_help"/>
+	<button label="Aplicar" name="apply_btn"/>
+	<button label="Teleportar Usuario a su Base..." name="kick_btn"/>
+	<button label="Teleportar a todos los usuarios a su base..." name="kick_all_btn"/>
+	<button label="Enviar mensaje a la Región..."/>
+	<button label="Administrar Telepuerto..." name="manage_telehub_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_terrain.xml b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
index e93e87cd6..e93a1879e 100644
--- a/indra/newview/skins/default/xui/es/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
@@ -1,60 +1,27 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" follows="top|left" height="320" label="Terrain"
-     left="0" name="Terrain" width="480">
-	<text bottom="-30" follows="left|top" font="SansSerif" height="20" left="10"
-	     name="region_text_lbl" width="100">
-		Region:
+<panel label="Terreno" name="Terrain">
+	<text name="region_text_lbl">
+		Región:
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
-	     name="region_text" width="400">
-		unknown
+	<text name="region_text">
+		desconocida
 	</text>
-	<spinner bottom_delta="-30" follows="left|top" height="20" increment=".1"
-	     label="Water Height" label_width="120" left="15" max_val="100" min_val="0"
-	     name="water_height_spin" width="180" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="200" name="water_height_help" width="18" />
-	<spinner bottom_delta="-20" follows="left|top" height="20" increment=".2"
-	     label="Terrain Raise Limit" label_width="120" left="15" max_val="100"
-	     min_val="0" name="terrain_raise_spin" width="180" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="200" name="terrain_raise_help" width="18" />
-	<spinner bottom_delta="-20" follows="left|top" height="20" increment=".2"
-	     label="Terrain Lower Limit" label_width="120" left="15" max_val="0"
-	     min_val="-100" name="terrain_lower_spin" width="180" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="200" name="terrain_lower_help" width="18" />
-	<check_box bottom="-55" follows="left|top" height="20" label="Use Estate Sun" left="250"
-	     name="use_estate_sun_check" width="100" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="420" name="use_estate_sun_help" width="18" />
-	<check_box bottom_delta="-20" follows="left|top" height="20" label="Fixed Sun" left="250"
-	     name="fixed_sun_check" width="100" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="420" name="fixed_sun_help" width="18" />
-	<icon bottom_delta="-25" follows="left|top" height="20"
-	     image_name="icon_day_cycle.tga" left="285" name="daycycle" width="165" />
-	<slider bottom_delta="-25" follows="left|top" height="20" increment="0.001"
-	     label="Phase" left="250" max_val="30" min_val="6" name="sun_hour_slider"
-	     show_text="false" width="200" />
-	<button bottom_delta="-30" enabled="false" follows="left|top" height="20" label="Apply"
-	     left="350" name="apply_btn" width="90" />
-	<view_border bevel_style="none" border_thickness="1" bottom_delta="-5" follows="top|left"
-	     height="130" left="8" width="460" />
-	<button bottom_delta="-80" follows="left|top" height="20"
-	     label="Download RAW terrain..." left="10" name="download_raw_btn"
-	     tool_tip="Available only to estate owners, not managers" width="170" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="190" name="download_raw_help" width="18" />
-	<button bottom_delta="-23" follows="left|top" height="20" label="Upload RAW terrain..."
-	     left="10" name="upload_raw_btn"
-	     tool_tip="Available only to estate owners, not managers" width="170" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="190" name="upload_raw_help" width="18" />
-	<button bottom_delta="-40" follows="left|top" height="20" label="Bake Terrain"
-	     left="10" name="bake_terrain_btn"
-	     tool_tip="Set current terrain as mid-point for raise/lower limits"
-	     width="100" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="18" label="?"
-	     left="120" name="bake_terrain_help" width="18" />
+	<spinner label="Altura del Agua" name="water_height_spin"/>
+	<button label="?" name="water_height_help"/>
+	<spinner label="Límite de elevación del Terreno" label_width="120"name="terrain_raise_spin"/>
+	<button label="?" name="terrain_raise_help"/>
+	<spinner label="Límite de bajada del Terreno" label_width="120" name="terrain_lower_spin"/>
+	<button label="?" name="terrain_lower_help"/>
+	<check_box label="Usar Sol del Estado" name="use_estate_sun_check"/>
+	<button label="?" name="use_estate_sun_help"/>
+	<check_box label="Sol Fijo" name="fixed_sun_check"/>
+	<button label="?" name="fixed_sun_help"/>
+	<slider label="Fase" name="sun_hour_slider"/>
+	<button label="Aplicar" name="apply_btn"/>
+	<button label="Descargar el RAW del terreno..." name="download_raw_btn" tool_tip="Disponible sólo para propietarios de estado, no para los administradores"/>
+	<button label="?" name="download_raw_help"/>
+	<button label="Subir un RAW de terreno..." name="upload_raw_btn" tool_tip="Disponible sólo para propietarios de estado, no para los administradores"/>
+	<button label="?" name="upload_raw_help"/>
+	<button label="Predeterminar Terreno" name="bake_terrain_btn" tool_tip="Definir el terreno actual como punto medio para los límites de elevación/bajada"/>
+	<button label="?" name="bake_terrain_help"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_texture.xml b/indra/newview/skins/default/xui/es/panel_region_texture.xml
index 9b9a58b06..aace7b8a3 100644
--- a/indra/newview/skins/default/xui/es/panel_region_texture.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_texture.xml
@@ -1,98 +1,57 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" follows="top|left" height="320"
-     label="Ground Textures" left="0" name="Textures" width="480">
-	<text bottom="-30" follows="left|top" font="SansSerif" height="20" left="10"
-	     name="region_text_lbl" width="100">
-		Region:
+<panel label="Texturas del Terreno" name="Textures">
+	<text name="region_text_lbl">
+		Región:
 	</text>
-	<text bottom_delta="0" follows="left|top" font="SansSerif" height="20" left="60"
-	     name="region_text" width="400">
-		unknown
+	<text name="region_text">
+		desconocida
 	</text>
-	<text bottom_delta="-26" follows="left|top" height="20" left="10"
-	     name="detail_texture_text" width="300">
-		Terrain Textures (requires 512x512, 24 bit .tga files)
+	<text name="detail_texture_text">
+		Texturas del Terreno (requiere archivos tga de 512x512, 24 bit)
 	</text>
-	<texture_picker bottom_delta="-100" follows="left|top" height="100" left="10"
-	     name="texture_detail_0" width="100" />
-	<texture_picker bottom_delta="0" follows="left|top" height="100" left="120"
-	     name="texture_detail_1" width="100" />
-	<texture_picker bottom_delta="0" follows="left|top" height="100" left="230"
-	     name="texture_detail_2" width="100" />
-	<texture_picker bottom_delta="0" follows="left|top" height="100" left="340"
-	     name="texture_detail_3" width="100" />
-	<text bottom_delta="-10" follows="left|top" height="20" left="10"
-	     name="height_text_lbl" width="65">
-		1 (Low)
+	<text name="height_text_lbl">
+		1 (baja)
 	</text>
-	<text bottom_delta="0" follows="left|top" height="20" left="120"
-	     name="height_text_lbl2" width="100">
+	<text name="height_text_lbl2">
 		2
 	</text>
-	<text bottom_delta="0" follows="left|top" height="20" left="230"
-	     name="height_text_lbl3" width="100">
+	<text name="height_text_lbl3">
 		3
 	</text>
-	<text bottom_delta="0" follows="left|top" height="20" left="340"
-	     name="height_text_lbl4" width="100">
-		4 (High)
+	<text name="height_text_lbl4">
+		4 (Alta)
 	</text>
-	<text bottom_delta="-40" follows="left|top" height="20" left="10"
-	     name="height_text_lbl5" width="300">
-		Texture Elevation Ranges
+	<text name="height_text_lbl5">
+		Rangos de elevación de la Textura
 	</text>
-	<text bottom_delta="-15" follows="left|top" height="20" left="51"
-	     name="height_text_lbl6" width="100">
-		Southwest
+	<text name="height_text_lbl6">
+		Suroeste
 	</text>
-	<text bottom_delta="0" follows="left|top" height="20" left="161"
-	     name="height_text_lbl7" width="100">
-		Northwest
+	<text name="height_text_lbl7">
+		Noroeste
 	</text>
-	<text bottom_delta="0" follows="left|top" height="20" left="271"
-	     name="height_text_lbl8" width="100">
-		Southeast
+	<text name="height_text_lbl8">
+		Sudeste
 	</text>
-	<text bottom_delta="0" follows="left|top" height="20" left="381"
-	     name="height_text_lbl9" width="100">
-		Northeast
+	<text name="height_text_lbl9">
+		Noreste
 	</text>
-	<spinner bottom_delta="-20" follows="left|top" height="20" increment="0.5" label="Low"
-	     label_width="37" left="10" max_val="500" min_val="-500"
-	     name="height_start_spin_0" width="100" />
-	<spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="Low"
-	     label_width="37" left="120" max_val="500" min_val="-500"
-	     name="height_start_spin_1" width="100" />
-	<spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="Low"
-	     label_width="37" left="230" max_val="500" min_val="-500"
-	     name="height_start_spin_2" width="100" />
-	<spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="Low"
-	     label_width="37" left="340" max_val="500" min_val="-500"
-	     name="height_start_spin_3" width="100" />
-	<spinner bottom_delta="-20" follows="left|top" height="20" increment="0.5" label="High"
-	     label_width="37" left="10" max_val="500" min_val="-500"
-	     name="height_range_spin_0" width="100" />
-	<spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="High"
-	     label_width="37" left="120" max_val="500" min_val="-500"
-	     name="height_range_spin_1" width="100" />
-	<spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="High"
-	     label_width="37" left="230" max_val="500" min_val="-500"
-	     name="height_range_spin_2" width="100" />
-	<spinner bottom_delta="0" follows="left|top" height="20" increment="0.5" label="High"
-	     label_width="37" left="340" max_val="500" min_val="-500"
-	     name="height_range_spin_3" width="100" />
-	<text bottom_delta="-40" follows="left|top" height="20" left="25"
-	     name="height_text_lbl10" width="480">
-		These values represent the blend range for the textures above.
+	<spinner label="Baja" name="height_start_spin_0"/>
+	<spinner label="Baja" name="height_start_spin_1"/>
+	<spinner label="Baja" name="height_start_spin_2"/>
+	<spinner label="Baja" name="height_start_spin_3"/>
+	<spinner label="Alta" name="height_range_spin_0"/>
+	<spinner label="Alta" name="height_range_spin_1"/>
+	<spinner label="Alta" name="height_range_spin_2"/>
+	<spinner label="Alta" name="height_range_spin_3"/>
+	<text name="height_text_lbl10">
+		Estos valores representan la gama de mezclas para las texturas superiores.
 	</text>
-	<text bottom_delta="-16" follows="left|top" height="20" left="25"
-	     name="height_text_lbl11" width="450">
-		Measured in meters, the LOW value is the MAXIMUM height of Texture #1,
+	<text name="height_text_lbl11">
+		Medido en metros, el valor BAJA es la altura M�XIMA de la textura #1,
 	</text>
-	<text bottom_delta="-16" follows="left|top" height="20" left="25"
-	     name="height_text_lbl12" width="480">
-		and the HIGH value is the MINIMUM height of Texture #4.
+	<text name="height_text_lbl12">
+		y el valor ALTA es la altura M�NIMA de la textura #4.
 	</text>
-	<button bottom="10" enabled="false" follows="left|bottom" height="20" label="Apply"
-	     left="350" name="apply_btn" width="100" />
+	<button label="Aplicar" name="apply_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_scrolling_param.xml b/indra/newview/skins/default/xui/es/panel_scrolling_param.xml
index b4281a229..a5715f430 100644
--- a/indra/newview/skins/default/xui/es/panel_scrolling_param.xml
+++ b/indra/newview/skins/default/xui/es/panel_scrolling_param.xml
@@ -1,42 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="0" enabled="true" height="152" left="0" mouse_opaque="true"
-     name="LLScrollingPanelParam" width="270">
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-132" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-	     mouse_opaque="true" name="min param text" v_pad="0" width="128" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-132" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="138"
-	     mouse_opaque="true" name="max param text" v_pad="0" width="128" />
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-27" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="8"
-	     mouse_opaque="true" name="Loading..." v_pad="0" width="128">
-		Loading...
+<panel name="LLScrollingPanelParam">
+	<text name="Loading...">
+		Cargando...
 	</text>
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-27" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="142"
-	     mouse_opaque="true" name="Loading...2" v_pad="0" width="128">
-		Loading...
+	<text name="Loading...2">
+		Cargando...
 	</text>
-	<button bottom="-132" enabled="false" font="SansSerif" halign="center" height="132"
-	     image_disabled="square_btn_32x128.tga"
-	     image_disabled_selected="square_btn_selected_32x128.tga"
-	     image_selected="square_btn_selected_32x128.tga"
-	     image_unselected="square_btn_32x128.tga" label="" label_selected=""
-	     left="2" mouse_opaque="true" name="less" scale_image="true"
-	     tab_stop="false" width="132" />
-	<button bottom="-132" enabled="false" font="SansSerif" halign="center" height="132"
-	     image_disabled="square_btn_32x128.tga"
-	     image_disabled_selected="square_btn_selected_32x128.tga"
-	     image_selected="square_btn_selected_32x128.tga"
-	     image_unselected="square_btn_32x128.tga" label="" label_selected=""
-	     left="136" mouse_opaque="true" name="more" scale_image="true"
-	     tab_stop="false" width="132" />
-	<slider bottom="-150" can_edit_text="true" decimal_digits="0" enabled="false"
-	     height="16" increment="1" initial_val="0" label="[DESC]" label_width="100"
-	     left="6" max_val="100" min_val="0" mouse_opaque="true" name="param slider"
-	     show_text="true" value="0" width="258" />
+	<button label="" label_selected="" name="less"/>
+	<button label="" label_selected="" name="more"/>
+	<slider label="[DESC]" name="param slider"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_speaker_controls.xml b/indra/newview/skins/default/xui/es/panel_speaker_controls.xml
index 9ea1d591f..cc249b254 100644
--- a/indra/newview/skins/default/xui/es/panel_speaker_controls.xml
+++ b/indra/newview/skins/default/xui/es/panel_speaker_controls.xml
@@ -1,31 +1,44 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bevel_style="in" border="false" bottom="0" follows="left|bottom|right" height="120" left="0" name="active_speakers_panel" width="140">
-	<string name="moderator_label">(Moderator)</string>
-	<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="123" left="0" orientation="vertical" tab_group="1" width="140" name="panels">
-		<layout_panel auto_resize="false" bottom="0" can_resize="false" height="25" left="0" min_height="25" name="moderation_mode_panel" top_delta="0" user_resize="false" visible="false" width="140">
-			<combo_box bottom="0" follows="left|top|right|bottom" height="20" left="5" name="moderation_mode" width="130">
-				<combo_item name="OpenVoice" value="unmoderated">Voices on by default</combo_item>
-				<combo_item name="ModeratedVoice" value="moderated">Voices off by default</combo_item>
+<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 activada por defecto
+				</combo_item>
+				<combo_item name="ModeratedVoice">
+					Voz Apagada por Defecto
+				</combo_item>
 			</combo_box>
 		</layout_panel>
-		<layout_panel auto_resize="true" bottom="0" can_resize="false" height="120" min_height="100" name="moderate_chat_panel" top_delta="0" user_resize="false" visible="true" width="140">
-			<scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true" draw_stripes="false" follows="left|top|bottom|right" left="0" multi_select="false" name="speakers_list" right="140" search_column="1" sort_column="2" top="120">
-				<column name="icon_speaking_status" sort="speaking_status" width="20"/>
-				<column dynamicwidth="true" label="Name" name="speaker_name"/>
-				<column label="" name="speaking_status" width="0"/>
+		<layout_panel name="moderate_chat_panel">
+			<scroll_list name="speakers_list">
+				<column name="icon_speaking_status"/>
+				<column label="Nombre" name="speaker_name"/>
+				<column label="" name="speaking_status"/>
 			</scroll_list>
-			<panel border="false" bottom="0" can_resize="false" follows="left|bottom|right" height="77" left="0" name="speaker_controls" width="140">
-				<button bottom="-28" enabled="false" follows="left|top" height="20" image_overlay="icon_avatar_offline.tga" label="" left="4" name="profile_btn" right="34" scale_image="true"/>
-				<text bottom_delta="9" follows="left|top|right" left_delta="34" name="resident_name" valign="center" width="140">Rumplstiltskin Califragilistic</text>
-				<volume_slider bottom_delta="-29" follows="left|top" height="15" increment="0.05" initial_val="0.5" left="0" max_val="1.0" min_val="0.0" name="speaker_volume" width="110"/>
-				<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" left_delta="110" name="mute_btn" tool_tip="Mute voice for this resident" width="25"/>
-				<check_box bottom_delta="-25" enabled="false" follows="left|top" height="25" label="Mute Text" left="3" name="mute_text_btn"/>
+			<panel name="speaker_controls">
+				<button label="" name="profile_btn"/>
+				<text name="resident_name">
+					Rumplstiltskin Califragilistic
+				</text>
+				<button label="" name="mute_btn" tool_tip="Ignorar voz de este residente"/>
+				<check_box label="Ignorar Texto" name="mute_text_btn"/>
 			</panel>
 		</layout_panel>
-		<layout_panel auto_resize="false" bottom="0" can_resize="false" height="60" left="0" name="moderator_controls" top_delta="0" user_resize="false" visible="false" width="140">
-			<text bottom="-20" follows="left|right|top|bottom" height="20" left="5" name="moderator_controls_label" right="-5">Moderator Controls:</text>
-			<check_box bottom_delta="-16" follows="left|right|top|bottom" height="20" name="moderator_allow_voice">Allow voice chat</check_box>
-			<check_box bottom_delta="-20" follows="left|right|top|bottom" height="20" name="moderator_allow_text">Allow text chat</check_box>
+		<layout_panel name="moderator_controls">
+			<text name="moderator_controls_label">
+				Controles de Moderación:
+			</text>
+			<check_box name="moderator_allow_voice">
+				Permitir Chat de Voz
+			</check_box>
+			<check_box name="moderator_allow_text">
+				Permitir Chat de Texto
+			</check_box>
 		</layout_panel>
 	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_status_bar.xml b/indra/newview/skins/default/xui/es/panel_status_bar.xml
index 1d83d3681..f89d462c3 100644
--- a/indra/newview/skins/default/xui/es/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/es/panel_status_bar.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <panel name="status">
-	  <text name="ParcelNameText" tool_tip="Nombre de la parcela en la que estás. Pulsa aquí para ver Acerca del Terreno.">
+	<text name="ParcelNameText" tool_tip="Nombre de la parcela en la que estás. Pulsa aquí para ver Acerca del Terreno.">
 		El nombre de la parcela va aquí
-	  </text>
+	</text>
 	<text name="BalanceText" tool_tip="Saldo de tu cuenta">
-			 Cargando...
+		Cargando...
 	</text>
 	<button name="buycurrency" tool_tip="Comprar dinero"/>
 	<text type="string" name="TimeText" tool_tip="Hora actual (Del Pacífico)">
 		24:00
 	</text>
 	<string name="StatBarDaysOfWeek">
-			 Domingo:Lunes:Martes:Miércoles:Viernes:Sábado
+		Domingo:Lunes:Martes:Miércoles:Viernes:Sábado
 	</string>
 	<string name="StatBarMonthsOfYear">
-			 Enero:Febrero:Marzo:Abril:Mayo:Junio:Julio:Agosto:Setiembre:Octubre:Noviembre:Diciembre
+		Enero:Febrero:Marzo:Abril:Mayo:Junio:Julio:Agosto:Setiembre:Octubre:Noviembre:Diciembre
 	</string>
 	<button name="scriptout" tool_tip="Aviso de Errores de Scripts" />
 	<button name="health" tool_tip="Salud"/>
diff --git a/indra/newview/skins/default/xui/es/panel_toolbar.xml b/indra/newview/skins/default/xui/es/panel_toolbar.xml
index 66abd855c..34992b5f8 100644
--- a/indra/newview/skins/default/xui/es/panel_toolbar.xml
+++ b/indra/newview/skins/default/xui/es/panel_toolbar.xml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="toolbar">    
-	  <string name="Redock Windows">
-			 Reacoplar Ventana
-	  </string>
-	  <panel filename="panel_bg_toolbar.xml"/>
-	  <layout_stack name="toolbar_stack" >
-			 <button label="" name="chat_btn" tool_tip="Mostrar Barra de Chat. (Intro)"/>
-			 <flyout_button label="Comunicación" name="communicate_btn" tool_tip="Comunícate con tus amigos o grupos.(Ctrl-T)" />
-			 <button label="Radar" name="radar_list_btn" tool_tip="Ver lista de avatares cercanos.(Ctrl-Shift-A)"/>
-			 <button label="Volar" label_selected="Stop Flying" name="fly_btn" tool_tip="Despegar(F o Inicio). Usa E/C o AvPáa/RePág para ascender o descender"/>
-			 <button label="Capturar" name="snapshot_btn" tool_tip="Guardar una captura de pantalla al disco o al inventario.(Ctrl-Shift-S para abrir el flotante, Ctrl-`(~) toma la captura sin el flotante)"/>
-			 <button label="Buscar" name="directory_btn" tool_tip="Buscar lugares, eventos, personas, y más.(Ctrl-F)"/>
-			 <button label="Construir" name="build_btn" tool_tip="Crear nuevos objetos. (B)"/>
-			 <button label="Mapa" name="map_btn" tool_tip="Mapa del Mundo. (Ctrl-M)"/>
-			 <button label="MiniMapa" name="radar_btn" tool_tip="Mapa del área a tu alrededor. (Ctrl-Shift-M)"/>
-			 <button label="Inventario" name="inventory_btn" tool_tip="Tus items. (Ctrl-I)"/>
-	  </layout_stack>
+	<string name="Redock Windows">
+		Reacoplar Ventana
+	</string>
+	<panel filename="panel_bg_toolbar.xml"/>
+	<layout_stack name="toolbar_stack" >
+		<button label="" name="chat_btn" tool_tip="Mostrar Barra de Chat. (Intro)"/>
+		<flyout_button label="Comunicación" name="communicate_btn" tool_tip="Comunícate con tus amigos o grupos.(Ctrl-T)" />
+		<button label="Radar" name="radar_list_btn" tool_tip="Ver lista de avatares cercanos.(Ctrl-Shift-A)"/>
+		<button label="Volar" label_selected="Stop Flying" name="fly_btn" tool_tip="Despegar(F o Inicio). Usa E/C o AvPáa/RePág para ascender o descender"/>
+		<button label="Foto" name="snapshot_btn" tool_tip="Guardar una captura de pantalla al disco o al inventario.(Ctrl-Shift-S para abrir el flotante, Ctrl-`(~) toma la captura sin el flotante)"/>
+		<button label="Buscar" name="directory_btn" tool_tip="Buscar lugares, eventos, personas, y más.(Ctrl-F)"/>
+		<button label="Construir" name="build_btn" tool_tip="Crear nuevos objetos. (B)"/>
+		<button label="Mapa" name="map_btn" tool_tip="Mapa del Mundo. (Ctrl-M)"/>
+		<button label="MiniMapa" name="radar_btn" tool_tip="Mapa del área a tu alrededor. (Ctrl-Shift-M)"/>
+		<button label="Inventario" name="inventory_btn" tool_tip="Tus items. (Ctrl-I)"/>
+	</layout_stack>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_top_pick.xml b/indra/newview/skins/default/xui/es/panel_top_pick.xml
index 73f1accb5..b8c4bebda 100644
--- a/indra/newview/skins/default/xui/es/panel_top_pick.xml
+++ b/indra/newview/skins/default/xui/es/panel_top_pick.xml
@@ -1,29 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="false" bottom="20" follows="bottom|left" height="470" left="330"
-     name="Pick" title="Pick" width="450">
-	<texture_picker bottom="-315" follows="left|top" height="300" left="20" name="snapshot_ctrl"
-	     width="400" />
-	<line_editor bottom_delta="-8" enabled="false" follows="left|top"
-	     font="SansSerif" height="20" left="20" name="given_name_editor"
-	     width="400" />
-	<text_editor enabled="false" follows="left|top" font="SansSerif"
-	     height="90" left="20" max_length="1023" name="desc_editor"
-	     width="400" word_wrap="true" spell_check="true" />
-	<line_editor enabled="false" follows="left|top" font="SansSerif"
-	     height="20" left="20" name="location_editor" 
-	     width="400" />
-	<button bottom_delta="0" follows="left|top" height="20" label="Set" left="380"
-	     name="set_location_btn" width="60" />
-	<button bottom_delta="-30" follows="left|top" height="20" label="Teleport" left="20"
-	     name="pick_teleport_btn" width="80" />
-	<button bottom_delta="0" follows="left|top" height="20" label="Show on Map" left="105"
-	     name="pick_map_btn" width="100" />
-	<text bottom_delta="0" follows="left|top" height="20" left="290"
-	     name="sort_order_text" width="30">
-		Sort:
+<panel name="Pick" title="Destacados">
+	<button label="Definir" name="set_location_btn"/>
+	<button label="Teleportar" name="pick_teleport_btn"/>
+	<button label="Mostrar en el Mapa" name="pick_map_btn"/>
+	<text name="sort_order_text">
+		Ordenar:
 	</text>
-	<line_editor bottom_delta="5" follows="left|top" height="16" left="320"
-	     name="sort_order_editor" width="25" />
-	<check_box bottom_delta="0" follows="left|top" height="20" label="Enabled" left="360"
-	     name="enabled_check" width="80" />
+	<check_box label="Activado" name="enabled_check"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_voice_controls.xml b/indra/newview/skins/default/xui/es/panel_voice_controls.xml
index 1d558c3c3..49dfe80bb 100644
--- a/indra/newview/skins/default/xui/es/panel_voice_controls.xml
+++ b/indra/newview/skins/default/xui/es/panel_voice_controls.xml
@@ -1,19 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bg_visible="false" border="false" border_visible="false" bottom="2"
-     enabled="true" follows="right|bottom" height="20" left="0"
-     mouse_opaque="true" name="voice_controls" width="128">
-	<button bottom="-22" height="22" image_overlay="active_speakers.tga" label="" left="2"
-	     name="speakers_btn"
-	     tool_tip="Show list of residents using voice chat around you" width="38" />
-	<button bottom="-22" height="22" pad_left="16" label="Talk" left_delta="40" name="push_to_talk"
-	     tab_stop="false" tool_tip="Hold the button to talk" width="60" />
-	<button bottom="-19" height="16" image_selected="ptt_lock_on.tga"
-	     image_unselected="ptt_lock_off.tga" label="" left_delta="4" name="ptt_lock"
-	     scale_image="false" toggle="true"
-	     tool_tip="Click lock to switch to talk mode" width="16" />
-	<icon bottom="-19" height="16" image_name="icn_voice_ptt-off.tga" left_delta="42"
-	     name="voice_volume" width="16" />
-	<button bottom="-22" control_name="ShowVoiceChannelPopup" height="22" label=""
-	     left_delta="16" name="show_channel" scale_image="true" toggle="true"
-	     tool_tip="Click to show current voice channel" width="22" />
+<panel name="voice_controls">
+	<button label="" name="speakers_btn" tool_tip="Mostrar la lista de residentes cercanos usando el chat de voz"/>
+	<button label="Halbar" name="push_to_talk" tool_tip="Mantén presionado el botón para hablar"/>
+	<button label="" name="ptt_lock" tool_tip="Pulsa en Bloquear para cambiar al modo Hablar"/>
+	<button label="" name="show_channel" tool_tip="Pulsa para ver el canal actual de voz"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_voice_enable.xml b/indra/newview/skins/default/xui/es/panel_voice_enable.xml
index 98325311b..c92965139 100644
--- a/indra/newview/skins/default/xui/es/panel_voice_enable.xml
+++ b/indra/newview/skins/default/xui/es/panel_voice_enable.xml
@@ -1,37 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="false" bottom="4" enabled="true" height="240" left="8"
-     mouse_opaque="true" name="content_panel" width="404">
-	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false"
-	     enabled="false" font="SansSerifSmall" height="85" hide_border="true"
-	     hide_scrollbar="true" left_delta="0" max_length="65535" mouse_opaque="true"
-	     name="voice_intro_text1" tab_stop="false" width="400" word_wrap="true">
-		Welcome to Second Life Voice Chat! Voice Chat enables you to speak with other Residents. This wizard will guide you through the steps necessary to set up Voice Chat. Using Voice Chat requires audio speakers and, if you wish to speak with others, a microphone or stereo headset with microphone.
+<panel name="content_panel">
+	<text_editor name="voice_intro_text1">
+		¡Bienvenido al chat de voz de Second Life! El chat de voz te permite hablar con otros residentes. Este asistente te guiará a través de los pasos necesarios para configurar el chat de voz. Para usar el chat de voz necesitas altavoces y, si quieres hablar con otros, un micrófono o unos auriculares que lo lleven.
 	</text_editor>
-	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false"
-	     enabled="false" font="SansSerifSmall" height="50" hide_border="true"
-	     hide_scrollbar="true" left_delta="0" max_length="65535" mouse_opaque="true"
-	     name="voice_intro_text2" tab_stop="false" width="400" word_wrap="true">
-		Voice Chat is enabled by default. Do you wish to continue using Voice Chat?
+	<text_editor name="voice_intro_text2">
+		El chat de voz está activado por defecto. ¿Quieres seguir usándolo?
 	</text_editor>
-	<radio_group bottom_delta="-30" draw_border="false" enabled="true" follows="left|top"
-	     height="40" left="10" mouse_opaque="true" name="voice_enable" width="364">
-		<radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="1" width="315">
-			Yes, continue using Voice Chat.
+	<radio_group name="voice_enable">
+		<radio_item name="1">
+			Si, continuar usando el Chat de Voz.
 		</radio_item>
-		<radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="0" width="315">
-			No, disable Voice Chat.
+		<radio_item name="0">
+			No, desactivar el Chat de Voz.
 		</radio_item>
 	</radio_group>
-	<text_editor length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-50"
-	     embedded_items="false" enabled="false" font="SansSerifSmall" height="40"
-	     hide_border="true" hide_scrollbar="true" left="0" max_length="65535"
-	     name="voice_intro_text3" tab_stop="false" width="400" word_wrap="true">
-		You can enable Voice Chat at any time by going to the Voice Chat tab in Preferences.
+	<text_editor name="voice_intro_text3">
+		Puedes activar el chat de voz en cualquier momento yendo a la pestaña Chat de Voz en las Preferencias.
 	</text_editor>
-	<text_editor length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="0"
-	     embedded_items="false" enabled="false" font="SansSerifSmall" height="40"
-	     hide_border="true" hide_scrollbar="true" left="0" max_length="65535"
-	     name="voice_intro_text4" tab_stop="false" width="400" word_wrap="true">
-		Click the Next button to configure Voice Chat preferences or click Finish to continue using Singularity Viewer.
+	<text_editor name="voice_intro_text4">
+		Pulsa el botón Siguiente para configurar las preferencias del chat de voz, o pulsa Finalizar para seguir usando Singularity Viewer.	
 	</text_editor>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_voice_options.xml b/indra/newview/skins/default/xui/es/panel_voice_options.xml
index 4c6edfd60..79700a7ab 100644
--- a/indra/newview/skins/default/xui/es/panel_voice_options.xml
+++ b/indra/newview/skins/default/xui/es/panel_voice_options.xml
@@ -1,43 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="false" bottom="36" height="240" left="8" name="content_panel"
-     width="404">
-	<text_editor type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" embedded_items="false"
-	     enabled="false" font="SansSerifSmall" height="30" hide_border="true"
-	     hide_scrollbar="true" left_delta="0" max_length="65535"
-	     name="voice_intro_text1" tab_stop="false" width="414" word_wrap="true">
-		Use the options below to configure your Voice Chat experience.
+<panel name="content_panel">
+	<text_editor name="voice_intro_text1">
+		Usa las opciones de abajo para configurar tu chat de voz.
 	</text_editor>
-	<radio_group bottom_delta="-40" draw_border="false" follows="left|top" height="40" left="10"
-	     name="ear_location" width="364">
-		<radio_item type="string" length="1" bottom="-19" follows="left|top" height="16" left="3" name="0" width="315">
-			Hear Voice Chat from camera position.
+	<radio_group name="ear_location">
+		<radio_item name="0">
+			Escuchar la voz desde la posición de la cámara.
 		</radio_item>
-		<radio_item type="string" length="1" bottom="-35" follows="left|top" height="16" left="3" name="1" width="315">
-			Hear Voice Chat from avatar position.
+		<radio_item name="1">
+			Escuchar la voz desde la posición del avatar
 		</radio_item>
 	</radio_group>
-	<check_box bottom_delta="-20" control_name="VoiceCallsFriendsOnly" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Only allow Friends to initiate Voice Calls with me" left="20"
-	     left_delta="2" name="friends_only_check" width="200" />
-	<check_box bottom_delta="-20" control_name="PushToTalkToggle" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Use Push-to-Talk in toggle mode" left_delta="0"
-	     name="push_to_talk_toggle_check" width="200" />
-	<text type="string" length="1" allow_html="false" bg_readonly_color="0 0 0 0" bottom_delta="-20"
-	     embedded_items="false" follows="left|top" font="SansSerifSmall" height="16"
-	     hide_border="true" hide_scrollbar="true" left_delta="4" max_length="65535"
-	     name="push_to_talk_label" width="445" word_wrap="true">
-		Push-to-Talk trigger:
+	<check_box label="Permitir sólo a mis amigos iniciar llamadas de Voz conmigo" name="friends_only_check"/>
+	<check_box label="Usar Apretar para Hablar en el modo Un Toque" name="push_to_talk_toggle_check"/>
+	<text name="push_to_talk_label">
+		Botón Apretar para Hablar:
 	</text>
-	<line_editor border_drop_shadow_visible="false" border_visible="false" bottom_delta="-20"
-	     control_name="PushToTalkButton" drop_shadow_visible="true" enabled="false"
-	     follows="top|left" font="SansSerifSmall" halign="right" height="19"
-	     left_delta="0" max_length="254" name="modifier_combo" width="280" />
-	<button bottom_delta="-25" follows="left|top" font="SansSerif" halign="center"
-	     height="20" label="Set Key" left_delta="0" name="set_voice_hotkey_button"
-	     width="115" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="20" label="Middle Mouse Button" left_delta="120"
-	     name="set_voice_middlemouse_button" width="160" />
+	<button label="Botón Medio del Ratón" name="set_voice_middlemouse_button"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_voice_remote.xml b/indra/newview/skins/default/xui/es/panel_voice_remote.xml
index c98b86bf2..e3917fab8 100644
--- a/indra/newview/skins/default/xui/es/panel_voice_remote.xml
+++ b/indra/newview/skins/default/xui/es/panel_voice_remote.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bg_visible="false" border="false" border_visible="false" bottom="0"
-     enabled="true" follows="right|bottom" height="20" left="0"
-     mouse_opaque="true" name="voice_remote" use_bounding_rect="true"
-     width="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 name="voice_remote">
+	<panel name="panel_bg_tab"/>
+	<panel name="panel_voice_controls"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_voice_remote_expanded.xml b/indra/newview/skins/default/xui/es/panel_voice_remote_expanded.xml
index 08d7a2812..eda484f14 100644
--- a/indra/newview/skins/default/xui/es/panel_voice_remote_expanded.xml
+++ b/indra/newview/skins/default/xui/es/panel_voice_remote_expanded.xml
@@ -1,20 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<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" 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"
-	     image_disabled_selected="icn_rounded-text-field.tga"
-	     image_hover_selected="icn_rounded-text-field.tga"
-	     image_hover_unselected="icn_rounded-text-field.tga"
-	     image_selected="icn_rounded-text-field.tga"
-	     image_unselected="icn_rounded-text-field.tga" label="" left_delta="23"
-	     name="voice_channel_bg" scale_image="true" width="102" />
-	<icon bottom="-18" height="16" image_name="icn_voice-localchat.tga" label=""
-	     left_delta="4" mouse_opaque="false" name="voice_channel_icon" width="16" />
-	<text bottom="-19" font="SansSerifSmall" height="16" label="" left_delta="18"
-	     mouse_opaque="false" name="channel_label" text_color="0 0 0" width="65" />
-	<panel bottom="13" filename="panel_voice_controls.xml" left="1" />
+<panel name="voice_remote">
+	<panel name="panel_bg_tab"/>
+	<button label="" name="end_call_btn" tool_tip="Pulsa para terminar la llamada"/>
+	<button label="" name="voice_channel_bg"/>
+	<icon label="" name="voice_channel_icon"/>
+	<text label="" name="channel_label"/>
+	<panel filename="panel_voice_controls.xml"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/rlva_strings.xml b/indra/newview/skins/default/xui/es/rlva_strings.xml
index 8beadd514..cb2bf5ae4 100644
--- a/indra/newview/skins/default/xui/es/rlva_strings.xml
+++ b/indra/newview/skins/default/xui/es/rlva_strings.xml
@@ -1,77 +1,148 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <rlva_strings>
-
   <strings>
-    <!-- Primarily used when @showloc restricted -->
-    <string name="hidden_generic">(Hidden)</string>
-    <string name="hidden_parcel">(Hidden parcel)</string>
-    <string name="hidden_region">(Hidden region)</string>
-
-    <!-- Received/sent IMs will be replaced by the matching string when @recvim/sendim restricted -->
-    <string name="blocked_recvim">*** IM blocked by your viewer</string>
-    <string name="blocked_sendim">*** IM blocked by sender's viewer</string>
-
-    <!-- Shown as notifications -->
-    <string name="blocked_generic">Unable to perform action due to RLV restrictions</string>
-    <string name="blocked_permattach">Attempt to attach '[OBJECT]' was denied due to RLV restrictions</string>
-    <string name="blocked_startim">Unable to start IM session with [RECIPIENT] due to RLV restrictions</string>
-    <string name="blocked_startconf">Unable to start conference with [RECIPIENT] due to RLV restrictions</string>
-    <string name="blocked_teleport">Unable to initiate teleport due to RLV restrictions</string>
-    <string name="blocked_viewxxx">Unable to open [TYPE] due to RLV restrictions</string>
-
-    <!-- Sent as "Busy" messages to the remote party -->
-    <string name="blocked_recvim_remote">
-      The Resident you messaged is prevented from reading your instant messages at the moment, please try again later.
-    </string>
-    <string name="blocked_tplure_remote">
-      The Resident you invited is prevented from accepting teleport offers. Please try again later.
-    </string>
-
-    <!-- Shown in local chat when dropping inventory onto a nearby agent (moved to strings.xml since it needs to be accesible by LLTrans) -->
-    <!--
-    <string name="inventory_item_offered_rlv">
-      Inventory item offered to [NAME]
-    </string>
-    -->
-  </strings>
-
-  <!-- Generic names used to replace resident names when @shownames restricted -->
-  <anonyms>
-    <anonym>A resident</anonym>
-    <anonym>This resident</anonym>
-    <anonym>That resident</anonym>
-    <anonym>An individual</anonym>
-    <anonym>This individual</anonym>
-    <anonym>That individual</anonym>
-    <anonym>A person</anonym>
-    <anonym>This person</anonym>
-    <anonym>That person</anonym>
-    <anonym>A stranger</anonym>
-    <anonym>This stranger</anonym>
-    <anonym>That stranger</anonym>
-    <anonym>A being</anonym>
-    <anonym>This being</anonym>
-    <anonym>That being</anonym>
-    <anonym>An agent</anonym>
-    <anonym>This agent</anonym>
-    <anonym>That agent</anonym>
-    <anonym>A soul</anonym>
-    <anonym>This soul</anonym>
-    <anonym>That soul</anonym>
-    <anonym>Somebody</anonym>
-    <anonym>Some people</anonym>
-    <anonym>Someone</anonym>
-    <anonym>Mysterious one</anonym>
-    <anonym>An unknown being</anonym>
-    <anonym>Unidentified one</anonym>
-    <anonym>An unknown person</anonym>
-  </anonyms>
-
-  <behaviour-notifications>
-    <!-- 
-    <notification behaviour="defaultwear" type="add">Text goes here</notification>
-    <notification behaviour="defaultwear" type="rem">Text goes here</notification>
-    -->
-  </behaviour-notifications>
+		<!-- Primarily used when @showloc restricted -->
+		<string name="hidden_generic">
+			(Oculto)
+		</string>
+		<string name="hidden_parcel">
+			(Parcela Oculta)
+		</string>
+		<string name="hidden_region">
+			(Regióon oculta)
+		</string>
+		<!-- Received/sent IMs will be replaced by the matching string when @recvim/sendim restricted -->
+		<string name="blocked_recvim">
+			*** MI bloqueado por tu visor
+		</string>
+		<string name="blocked_sendim">
+			*** MI bloqueado por el visor del remitente
+		</string>
+		<!-- Shown as notifications -->
+		<string name="blocked_generic">
+			No se puede realizar la acción debido a las restricciones RLV
+		</string>
+		<string name="blocked_permattach">
+			El intento de anexar el '[OBJECT]' fué denegado debido a las restricciones RLV
+		</string>
+		<string name="blocked_startim">
+			No se puede iniciar sesión de MI con [RECIPIENT] debido a las restricciones RLV
+		</string>
+		<string name="blocked_startconf">
+			No se puede iniciar una conferencia con [RECIPIENT] debido a las restricciones RLV
+		</string>
+		<string name="blocked_teleport">
+			No se puede iniciar el Teleporte debido a las restricciones RLV
+		</string>
+		<string name="blocked_viewxxx">
+			No se puede abrir [TYPE] debido a las restricciones RLV
+		</string>
+		<!-- Sent as "Busy" messages to the remote party -->
+		<string name="blocked_recvim_remote">
+			El residente al que le has enviado el mensaje está impedido momentáneamente de leer tus Mensajes Instantáneos, por favor, inténtalo más tarde.
+		</string>
+		<string name="blocked_tplure_remote">
+			El residente al que has invitado está impedido para aceptar ofertas de Teleporte, por favor, inténtalo más tarde.
+		</string>
+		<!-- Shown in local chat when dropping inventory onto a nearby agent (moved to strings.xml since it needs to be accesible by LLTrans) -->
+		<!--
+		<string name="inventory_item_offered_rlv">
+			Inventory item offered to [NAME]
+		</string>
+		-->
+	</strings>
+	<!-- Generic names used to replace resident names when @shownames restricted -->
+	<anonyms>
+		<anonym>
+			Un residente
+		</anonym>
+		<anonym>
+			Este residente
+		</anonym>
+		<anonym>
+			Ese residente
+		</anonym>
+		<anonym>
+			Un individuo
+		</anonym>
+		<anonym>
+			Este individuo
+		</anonym>
+		<anonym>
+			Ese individuo
+		</anonym>
+		<anonym>
+			Una persona
+		</anonym>
+		<anonym>
+			Esta persona
+		</anonym>
+		<anonym>
+			Esa persona
+		</anonym>
+		<anonym>
+			Un desconocido
+		</anonym>
+		<anonym>
+			Este desconocido
+		</anonym>
+		<anonym>
+			Ese desconocido
+		</anonym>
+		<anonym>
+			Un ser
+		</anonym>
+		<anonym>
+			Este ser
+		</anonym>
+		<anonym>
+			Ese ser
+		</anonym>
+		<anonym>
+			Un agente
+		</anonym>
+		<anonym>
+			Este agente
+		</anonym>
+		<anonym>
+			Ese agente
+		</anonym>
+		<anonym>
+			Un espíritu
+		</anonym>
+		<anonym>
+			Este espíritu
+		</anonym>
+		<anonym>
+			Ese espíritu
+		</anonym>
+		<anonym>
+			Alguien
+		</anonym>
+		<anonym>
+			Algunas personas
+		</anonym>
+		<anonym>
+			Alguien
+		</anonym>
+		<anonym>
+			Alguien misterioso
+		</anonym>
+		<anonym>
+			Un ser desconocido
+		</anonym>
+		<anonym>
+			Alguien no identicado
+		</anonym>
+		<anonym>
+			Una Persona desconocida
+		</anonym>
+	</anonyms>
 
+	<behaviour-notifications>
+		<!-- 
+		<notification behaviour="defaultwear" type="add">Text goes here</notification>
+		<notification behaviour="defaultwear" type="rem">Text goes here</notification>
+		-->
+	</behaviour-notifications>
 </rlva_strings>
diff --git a/indra/newview/skins/default/xui/es/role_actions.xml b/indra/newview/skins/default/xui/es/role_actions.xml
index ef97c7d28..d80b7c8e8 100644
--- a/indra/newview/skins/default/xui/es/role_actions.xml
+++ b/indra/newview/skins/default/xui/es/role_actions.xml
@@ -1,136 +1,239 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <role_actions>
-	  <action_set description="Estas capacidades incluyen poderes para añadir o quitar miembros del grupo, y para pemitir que se sumen nuevos miembros sin necesidad de invitación." name="Membership">
-			 <action description="Invitar Personas al Grupo" longdescription="Invitar personas al grupo usando el botón &apos;Invitar a un nuevo miembro&apos; en Miembros y Roles &gt; subpestaña Miembros." name="member invite" value="1" />
-			 <action description="Expulsar a miembros del grupo usando el botón &apos;Expulsar del grupo&apos; en Miembros y Roles &gt; subpestaña Miembros. Un propietario puede expulsar a cualquiera, excepto a otro propietario. Si no eres un propietario, un miembro del grupo puede expulsarte sólo si tiene concedida esta capacidad específica. Para quitar capacidades a los miembros, debes tener la de &apos;Quitar capacidades a miembros&apos;." name="member eject" value="2" />
-			 <action description="Activar/desactivar &apos;Inscripción libre&apos; y cambiar &apos;Cuota de inscripción&apos;" longdescription="Activar/desactivar &apos;Inscripción libre&apos; para permitir o no que se unan sin invitación nuevos miembros, y cambiar la &apos;Cuota de inscripción&apos; en la sección Preferencias del grupo de la pestaña General." name="member options" value="3" />
-	  </action_set>
-	  <action_set description="Estas habilidades incluyen el poder añadir, quitar y cambiar roles, asignarlos a  miembros, y darles capacidades" name="Roles"> 
-			 <action description="Crear nuevos roles" longdescription="Crear nuevos roles en Miembros y Roles &gt; pestaña Roles &gt; botón Crear un rol nuevo." name="role create" value="4" />
-			 <action description="Borrar Roles" longdescription="Borrar roles en Miembros y Roles &gt; pestaña Roles &gt; botón Eliminar el rol." name="role delete" value="5" />
-			 <action description="Cambiar nombres de roles, títulos, descripciones y si los integrantes de lo roles son visibles."
-		     longdescription="Cambiar nombres de roles, títulos, descripciones y si los integrantes de lo roles son visibles. Esto se hace al pié de la pestaña Miembros y Roles &gt; subpestaña Roles luego de seleccionar un rol." name="role properties" value="6" />
-			 <action description="Designar miembros para el rol de Asignador" longdescription="Designar miembros para un rol en la sección Roles asignados de la pestaña Miembros y Roles &gt; subpestaña Miembros. Un miembro con este poder sólo puede asignar a otros el rol que él posee." name="role assign member limited" value="7" />
-			 <action description="Designar miembros para cualquier Rol" longdescription="Designar miembros para cualquier rol en la sección Roles asignados de la pestaña Miembros y Roles &gt; subpestaña Miembros. *AVISO* Todos los miembros con esta capacidad podrán asignarse a sí mismos (y a otros miembros) roles con mayores poderes de los que actualmente tienen. Potencialmente, podrían elevarse hasta poderes cercanos a los del propietario. Asegúrate de lo que estás haciendo antes de otorgar esta capacidad." name="role assign member" value="8" />
-			 <action description="Quitar miembros de los roles" longdescription="Quitar miembros de roles en la sección Capacidades asignadas de Miembros y Roles &gt; subpestaña Roles. No se pueden quitar a los Propietarios." name="role remove member" value="9" />
-		<action description="Añadir o quitar capacidades a los roles" longdescription="Añadir o quitar capacidades a los roles en la sección Capacidades asignadas de Miembros y Roles &gt; subpestaña Roles. *AVISO* Todos los miembros con esta capacidad podrán asignarse a sí mismos -y a otros miembros- roles con mayores poderes de los que actualmente tienen. Potencialmente, podrían elevarse hasta poderes cercanos a los del propietario. Asegúrate de lo que estás haciendo antes de otorgar esta capacidad." name="role change actions" value="10" /> 
-	  </action_set>
-	  <action_set description="Estas capacidades incluyen poderes para modificar la identidad del grupo, como su visibilidad pública, su carta o su emblema." name="Group Identity">
-			 <action
-		     description="Cambiar la carta, emblema y &apos;Mostrar en la búsqueda&apos;" longdescription="Cambiar la carta, emblema y &apos;Mostrar en la búsqueda&apos;, y qué miembros serán visibles en la información del grupo de la pestaña General." name="group change identity" value="11" />
-	  </action_set>
-	  <action_set description="Estas capacidades incluyen poderes para transferir, modificar y vender terrenos del grupo. Ve al menú Mundo &gt; Acerca del terreno, o pulsa con el botón derecho en el terreno y selecciona &apos;Acerca del terreno...&apos;, o pulsa en la información de la parcela en la barra superior del menú." name="Parcel Management">
-			 <action description="Transferir  y comprar terreno para el grupo" longdescription="Transferir y comprar terreno para el grupo. Se hace en Acerca del terreno &gt; pestaña General." name="land deed" value="12" />
-			 <action description="Abandonar terreno a favor de Governor Linden"
-		     longdescription="Abandonar al terreno a favor de Governor Linden. *AVISO* Todos los miembros del Rol con esta capacidad pueden abandonar terreno perteneciente al grupo en Acerca del terreno &gt; pestaña General, devolviendo la posesión a Linden ¡gratuitamente! Asegúrate de lo que estás haciendo antes de otorgar esta capacidad." name="land release" value="13" />
-			 <action description="Vender terreno"
-		     longdescription="Vender terreno. *AVISO* Todos los miembros del ROl con esta capacidad pueden vender terreno perteneciente al grupo -¡en la forma en que quieran!- en Acerca del terreno &gt; pestaña General. Asegúrate de lo que estás haciendo antes de otorgar esta capacidad." name="land set sale info" value="14" />
-			 <action description="Dividir y unir parcelas" longdescription="Dividir y unir parcelas. Se hace pulsando con el botón derecho en el terreno, &apos;Modificar el terreno&apos;, y dibujando en el terreno con el ratón lo que se quiere seleccionar. Para dividir, selecciona la parte que quieres separar y pulsa &apos;Subdividir...&apos;. Para unir, selecciona dos o más parcelas contiguas y pulsa &apos;Unir...&apos;." name="land divide join" value="15" />
-	  </action_set>
-	  <action_set description="Estas capacidades incluyen poder cambiar el nombre de la parcela y su configuración pública, también si se muestra en la Búsqueda y las opciones del punto de llegada y el de teleporte." name="Parcel Identity">
-			 <action description="Activar/Desactivar &apos;Mostrar en Búsqueda&apos; y el definir la Categoría" longdescription="Activar/Desactivar el &apos;Mostrar en Búsqueda&apos; y en que Categoría se mostrará en Acerca del terreno &gt; pestaña Opciones." name="land find places" value="17" />
-			 <action description="Cambiar el nombre de la parcela, la descripción, y la configuración de &apos;Mostrar en Búsqueda&apos;" longdescription="Cambiar el nombre y descripción de la parcela, y la configuración de &apos;Mostrar en Búsqueda&apos;. Se hace en Acerca del terreno &gt; pestaña Opciones." name="land change identity" value="18" />
-			 <action description="Definir los puntos de llegada y teleporte" longdescription="En una parcela perteneciente al grupo, los miembros con un rol que tenga esta capacidad pueden definir el Punto de Llegada o el de Teleporte para un mejor control. Se hace en Acerca del terreno &gt; pestaña Opciones." name="land set landing point" value="19" />
-	  </action_set>
-	  <action_set description="Estas capacidades incluyen poderes que afectan a las opciones de la parcela, como &apos;Crear objetos&apos;, &apos;Editar el terreno&apos; y las configuraciones de la música y los media." name="Parcel Settings">
-			 <action description="Cambiar música y configuraciones de los media"
-		     longdescription="Cambiar la música en streaming y las configuraciones de vídeo en Acerca del terreno &gt; pestaña Media." name="land change media" value="20" />
-			 <action description="Activar/desactivar &apos;Editar el terreno&apos;" longdescription="Activar/desactivar &apos;Editar el terreno&apos;. *AVISO* Acerca del terreno &gt; pestaña Opciones &gt; Editar el terreno, permite a cualquiera alterar la forma de tu terreno y sustituir y mover plantas Linden. Asegúrate de lo que estás haciendo antes de otorgar esta capacidad. La edición del terreno se activada/desactiva en Acerca del terreno &gt; pestaña Opciones." name="land edit" value="21" />
-			 <action description="Activar/desactivar varios ítems de Acerca del terreno &gt; Opciones" longdescription="Activar/desactivar en un terreno del grupo los ítems de Acerca del terreno &gt; pestaña Opciones: &apos;Seguro (sin daño)&apos;, &apos;Volar&apos;, y permitir a otros residentes: &apos;Crear objetos&apos;, &apos;Editar el terreno&apos;, &apos;Crear hitos&apos;, y &apos;Ejecutar scripts&apos;." name="land options" value="22" />
-	  </action_set>
-	  <action_set description="Estas capacidades incluyen poderes que permiten a los miembros rebasar las restricciones de parcelas pertenecientes al grupo." name="Parcel Powers">
-			 <action description="Permitir siempre &apos;Editar el terreno&apos;" longdescription="Los Miembros del rol con esta capacidad pueden editar el terreno de una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones." name="land allow edit land" value="23" />
-			 <action description="Permitir siempre &apos;Volar&apos;" longdescription="Los Miembros del rol con esta capacidad pueden volar sobre una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones." name="land allow fly" value="24" />
-			 <action description="Permitir siempre &apos;Crear objetos&apos;" longdescription="Los Miembros del rol con esta capacidad pueden crear objetos en una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones." name="land allow create" value="25" />
-			 <action description="Permitir siempre &apos;Crear hitos&apos;" longdescription="Los Miembros del rol con esta capacidad pueden crear un hito en una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones." name="land allow landmark" value="26" />
-			 <action description="Permitir &apos;Fijar Base&apos; en el terreno del grupo"  longdescription="Los Miembros del rol con esta capacidad pueden usar el menú Mundo &gt; Fijar mi Base aquí en una parcela transferida al grupo." name="land allow set home" value="28" />
-			 <action description="Allow &apos;Event Hosting&apos; on group land"
-		     longdescription="Members in a Role with this Ability can select group owned parcels as venus when hosting an event."
-		     name="land allow host event" value="41" />			 
+	<action_set 
+		description="Estas capacidades incluyen poderes para añadir o quitar miembros del grupo, y para pemitir que se sumen nuevos miembros sin necesidad de invitación." 
+		name="Membership">
+		<action 
+			description="Invitar Personas al Grupo" 
+			longdescription="Invitar personas al grupo usando el botón &apos;Invitar a un nuevo miembro&apos; en Miembros y Roles &gt; subpestaña Miembros." 
+			name="member invite"/>
+		<action 
+			description="Expulsar a miembros del grupo" 
+			longdescription="Expulsar a miembros del grupo usando el botón &apos;Expulsar del grupo&apos; en Miembros y Roles &gt; subpestaña Miembros. Un propietario puede expulsar a cualquiera, excepto a otro propietario. Si no eres un propietario, un miembro del grupo puede expulsarte sólo si tiene concedida esta capacidad específica. Para quitar capacidades a los miembros, debes tener la de &apos;Quitar capacidades a miembros&apos;." 
+			name="member eject"/>
+		<action 
+			description="Activar/desactivar &apos;Inscripción libre&apos; y cambiar &apos;Cuota de inscripción&apos;" 
+			longdescription="Activar/desactivar &apos;Inscripción libre&apos; para permitir o no que se unan sin invitación nuevos miembros, y cambiar la &apos;Cuota de inscripción&apos; en la sección Preferencias del grupo de la pestaña General." 
+			name="member options"/>
+	</action_set>
+	<action_set 
+		description="Estas habilidades incluyen el poder añadir, quitar y cambiar roles, asignarlos a  miembros, y darles capacidades" 
+		name="Roles">
+		<action 
+			description="Crear nuevos roles" 
+			longdescription="Crear nuevos roles en Miembros y Roles &gt; pestaña Roles &gt; botón Crear un rol nuevo." 
+			name="role create"/>
+		<action 
+			description="Borrar Roles" 
+			longdescription="Borrar roles en Miembros y Roles &gt; pestaña Roles &gt; botón Eliminar el rol." 
+			name="role delete"/>
+		<action 
+			description="Cambiar nombres de roles, títulos, descripciones y si los integrantes de lo roles son visibles." 
+			longdescription="Cambiar nombres de roles, títulos, descripciones y si los integrantes de lo roles son visibles. Esto se hace al pié de la pestaña Miembros y Roles &gt; subpestaña Roles luego de seleccionar un rol." 
+			name="role properties"/>
+		<action 
+			description="Designar miembros para el rol de Asignador" 
+			longdescription="Designar miembros para un rol en la sección Roles asignados de la pestaña Miembros y Roles &gt; subpestaña Miembros. Un miembro con este poder sólo puede asignar a otros el rol que él posee." 
+			name="role assign member limited"/>
+		<action 
+			description="Designar miembros para cualquier Rol" 
+			longdescription="Designar miembros para cualquier rol en la sección Roles asignados de la pestaña Miembros y Roles &gt; subpestaña Miembros. *AVISO* Todos los miembros con esta capacidad podrán asignarse a sí mismos (y a otros miembros) roles con mayores poderes de los que actualmente tienen. Potencialmente, podrían elevarse hasta poderes cercanos a los del propietario. Asegúrate de lo que estás haciendo antes de otorgar esta capacidad." 
+			name="role assign member"/>
+		<action 
+			description="Quitar miembros de los roles" 
+			longdescription="Quitar miembros de roles en la sección Capacidades asignadas de Miembros y Roles &gt; subpestaña Roles. No se pueden quitar a los Propietarios." 
+			name="role remove member"/>
+		<action 
+			description="Añadir o quitar capacidades a los roles" 
+			longdescription="Añadir o quitar capacidades a los roles en la sección Capacidades asignadas de Miembros y Roles &gt; subpestaña Roles. *AVISO* Todos los miembros con esta capacidad podrán asignarse a sí mismos -y a otros miembros- roles con mayores poderes de los que actualmente tienen. Potencialmente, podrían elevarse hasta poderes cercanos a los del propietario. Asegúrate de lo que estás haciendo antes de otorgar esta capacidad." 
+			name="role change actions"/> 
+	</action_set>
+	<action_set 
+		description="Estas capacidades incluyen poderes para modificar la identidad del grupo, como su visibilidad pública, su carta o su emblema." 
+		name="Group Identity">
+		<action 
+			description="Cambiar la carta, emblema y &apos;Mostrar en la búsqueda&apos;" 
+			longdescription="Cambiar la carta, emblema y &apos;Mostrar en la búsqueda&apos;, y qué miembros serán visibles en la información del grupo de la pestaña General." 
+			name="group change identity"/>
+	</action_set>
+	<action_set 
+		description="Estas capacidades incluyen poderes para transferir, modificar y vender terrenos del grupo. Ve al menú Mundo &gt; Acerca del terreno, o pulsa con el botón derecho en el terreno y selecciona &apos;Acerca del terreno...&apos;, o pulsa en la información de la parcela en la barra superior del menú." 
+		name="Parcel Management">
+		<action 
+			description="Transferir  y comprar terreno para el grupo" 
+			longdescription="Transferir y comprar terreno para el grupo. Se hace en Acerca del terreno &gt; pestaña General." 
+			name="land deed"/>
+		<action 
+			description="Abandonar terreno a favor de Governor Linden" 
+			longdescription="Abandonar al terreno a favor de Governor Linden. *AVISO* Todos los miembros del Rol con esta capacidad pueden abandonar terreno perteneciente al grupo en Acerca del terreno &gt; pestaña General, devolviendo la posesión a Linden ¡gratuitamente! Asegúrate de lo que estás haciendo antes de otorgar esta capacidad." 
+			name="land release"/>
+		<action 
+			description="Vender terreno" 
+			longdescription="Vender terreno. *AVISO* Todos los miembros del ROl con esta capacidad pueden vender terreno perteneciente al grupo -¡en la forma en que quieran!- en Acerca del terreno &gt; pestaña General. Asegúrate de lo que estás haciendo antes de otorgar esta capacidad." 
+			name="land set sale info"/>
+		<action 
+			description="Dividir y unir parcelas" 
+			longdescription="Dividir y unir parcelas. Se hace pulsando con el botón derecho en el terreno, &apos;Modificar el terreno&apos;, y dibujando en el terreno con el ratón lo que se quiere seleccionar. Para dividir, selecciona la parte que quieres separar y pulsa &apos;Subdividir...&apos;. Para unir, selecciona dos o más parcelas contiguas y pulsa &apos;Unir...&apos;." 
+			name="land divide join"/>
+	</action_set>
+	<action_set 
+		description="Estas capacidades incluyen poder cambiar el nombre de la parcela y su configuración pública, también si se muestra en la Búsqueda y las opciones del punto de llegada y el de teleporte." 
+		name="Parcel Identity">
+		<action 
+			description="Activar/Desactivar &apos;Mostrar en Búsqueda&apos; y el definir la Categoría" longdescription="Activar/Desactivar el &apos;Mostrar en Búsqueda&apos; y en que Categoría se mostrará en Acerca del terreno &gt; pestaña Opciones." 
+			name="land find places"/>
+		<action 
+			description="Cambiar el nombre de la parcela, la descripción, y la configuración de &apos;Mostrar en Búsqueda&apos;" 
+			longdescription="Cambiar el nombre y descripción de la parcela, y la configuración de &apos;Mostrar en Búsqueda&apos;. Se hace en Acerca del terreno &gt; pestaña Opciones." 
+			name="land change identity"/>
+		<action 
+			description="Definir los puntos de llegada y teleporte" 
+			longdescription="En una parcela perteneciente al grupo, los miembros con un rol que tenga esta capacidad pueden definir el Punto de Llegada o el de Teleporte para un mejor control. Se hace en Acerca del terreno &gt; pestaña Opciones." 
+			name="land set landing point"/>
+	</action_set>
+	<action_set 
+		description="Estas capacidades incluyen poderes que afectan a las opciones de la parcela, como &apos;Crear objetos&apos;, &apos;Editar el terreno&apos; y las configuraciones de la música y los media." 
+		name="Parcel Settings">
+		<action 
+			description="Cambiar música y configuraciones de los media" longdescription="Cambiar la música en streaming y las configuraciones de vídeo en Acerca del terreno &gt; pestaña Media." 
+			name="land change media"/>
+		<action 
+			description="Activar/desactivar &apos;Editar el terreno&apos;" 
+			longdescription="Activar/desactivar &apos;Editar el terreno&apos;. *AVISO* Acerca del terreno &gt; pestaña Opciones &gt; Editar el terreno, permite a cualquiera alterar la forma de tu terreno y sustituir y mover plantas Linden. Asegúrate de lo que estás haciendo antes de otorgar esta capacidad. La edición del terreno se activada/desactiva en Acerca del terreno &gt; pestaña Opciones." 
+			name="land edit"/>
+		<action 
+			description="Activar/desactivar varios ítems de Acerca del terreno &gt; Opciones" 
+			longdescription="Activar/desactivar en un terreno del grupo los ítems de Acerca del terreno &gt; pestaña Opciones: &apos;Seguro (sin daño)&apos;, &apos;Volar&apos;, y permitir a otros residentes: &apos;Crear objetos&apos;, &apos;Editar el terreno&apos;, &apos;Crear hitos&apos;, y &apos;Ejecutar scripts&apos;." 
+			name="land options"/>
+	</action_set>
+	<action_set 
+		description="Estas capacidades incluyen poderes que permiten a los miembros rebasar las restricciones de parcelas pertenecientes al grupo." 
+		name="Parcel Powers">
+		<action 
+			description="Permitir siempre &apos;Editar el terreno&apos;" 
+			longdescription="Los Miembros del rol con esta capacidad pueden editar el terreno de una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones." 
+			name="land allow edit land"/>
+		<action 
+			description="Permitir siempre &apos;Volar&apos;" 
+			longdescription="Los Miembros del rol con esta capacidad pueden volar sobre una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones." 
+			name="land allow fly"/>
+		<action 
+			description="Permitir siempre &apos;Crear objetos&apos;" 
+			longdescription="Los Miembros del rol con esta capacidad pueden crear objetos en una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones." 
+			name="land allow create"/>
+		<action 
+			description="Permitir siempre &apos;Crear hitos&apos;" 
+			longdescription="Los Miembros del rol con esta capacidad pueden crear un hito en una parcela perteneciente al grupo aunque eso esté desactivado en Acerca del terreno &gt; pestaña Opciones." 
+			name="land allow landmark"/>
+		<action 
+			description="Permitir &apos;Fijar Base&apos; en el terreno del grupo" 
+			longdescription="Los Miembros del rol con esta capacidad pueden usar el menú Mundo &gt; Fijar mi Base aquí en una parcela transferida al grupo." 
+			name="land allow set home"/>
+		<action 
+			description="Permitir &quot;Organización de eventos&quot; en un terreno de grupo" 
+			longdescription="Los miembros con un rol que tenga esta capacidad pueden seleccionar parcelas propiedad de un grupo como sede de la organización de eventos."
+			name="land allow host event"/>			 
 	</action_set>
 	<action_set
-	     description="These Abilities include powers to allow or restrict access to group-owned parcels, including freezing and ejecting Residents."
-	     name="Parcel Access">
-		<action description="Manage parcel Access lists"
-		     longdescription="Manage parcel Access lists in About Land &gt; Access tab."
-		     name="land manage allowed" value="29" />
-		<action description="Manage parcel Ban lists"
-		     longdescription="Manage parcel Ban lists in About Land &gt; Ban tab."
-		     name="land manage banned" value="30" />
-		<action description="Change parcel &apos;Sell passes...&apos; settings"
-		     longdescription="Change parcel &apos;Sell passes...&apos; settings in About Land &gt; Access tab."
-		     name="land manage passes" value="31" />
-		<action description="Eject and freeze Residents on parcels"
-		     longdescription="Members in a Role with this Ability can handle an unwelcome Resident on a group-owned parcel by right-clicking them, More &gt;, and selecting &apos;Eject...&apos; or &apos;Freeze...&apos;."
-		     name="land admin" value="32" />
+		description="Estas capacidades incluyen poderes para permitir o restringir el acceso a parcelas pertenecientes al grupo, incluyendo el congelar y expulsar a residentes."
+		name="Parcel Access">
+		<action 
+			description="Administrar las listas de Acceso a la Parcela"
+			longdescription="Administra las listas de acceso a la parcela en Acerca del terreno &gt; pestaña Acceso."
+			name="land manage allowed"/>
+		<action 
+			description="Administrar la lista de residentes con acceso prohibido"
+			longdescription="Administrar la lista de residentes con el acceso prohibido a la parcela en Acerca del terreno &gt; pestaña Acceso."
+			name="land manage banned"/>
+		<action 
+			description="Cambiar en la parcela el &apos;Vender pases a...&apos;"
+			longdescription="Cambiar la configuración de &apos;Vender pases a...&apos; en Acerca del terreno &gt; pestaña Acceso."
+			name="land manage passes"/>
+		<action 
+			description="Expulsar y congelar residentes en las parcelas"
+			longdescription="Los miembros con el rol con esta capacidad pueden actuar frente a un residente indeseado en una parcela del grupo pulsando con el botón derecho sobre él, Más &gt; y seleccionando &apos;Expulsar...&apos; o &apos;Congelar...&apos;."
+			name="land admin"/>
 	</action_set>
 	<action_set
-	     description="These Abilities include powers to allow members to return objects and place and move Linden plants. This is useful for Members to clean up litter and do landscaping, but it should also be used with care, because there&apos;s no undo for returning objects."
-	     name="Parcel Content">
-		<action description="Return objects owned by group"
-		     longdescription="Return objects on group-owned parcels that are owned by the group in About Land &gt; Objects tab."
-		     name="land return group owned" value="48" />
-		<action description="Return objects set to group"
-		     longdescription="Return objects on group-owned parcels that are set to the group in About Land &gt; Objects tab."
-		     name="land return group set" value="33" />
-		<action description="Return non-group objects"
-		     longdescription="Return objects on group-owned parcels that are non-group in About Land &gt; Objects tab."
-		     name="land return non group" value="34" />
-		<action description="Landscaping using Linden plants"
-		     longdescription="Landscaping ability to place and move Linden trees, plants, and grasses. These items can be found in your inventory&apos;s Library &gt; Objects folder or they can be created via the Build button."
-		     name="land gardening" value="35" />
+		description="Estas capacidades incluyen poderes que permiten a los miembros devolver objetos y poner y mover plantas Linden. Es útil para que los miembros organicen el paisaje, pero debe ser usado con cuidado, ya que no se pueden deshacer los cambios en los objetos retornados."
+		name="Parcel Content">
+		<action 
+			description="Devolver objetos que pertenecen al grupo"
+			longdescription="Devolver objetos pertenecientes al grupo en parcelas de su propiedad en Acerca del terreno &gt; pestaña Objetos."
+			name="land return group owned"/>
+		<action 
+			description="Devolver objetos definidos para el grupo"
+			longdescription="Devolver objetos en parcelas pertenecientes al grupo en Acerca del terreno &gt; pestaña Objetos."
+			name="land return group set"/>
+		<action 
+			description="Devolver objetos que no pertenecen al grupo"
+			longdescription="Devolver objetos que estén en una parcela del grupo y pertenezcan a alguien que no sea del grupo en Acerca del terreno &gt; pestaña Objetos."
+			name="land return non group"/>
+		<action 
+			description="Modificar el paisaje usando plantas Linden"
+			longdescription="La capacidad de modificar el paisaje permite poner y mover árboles Linden, plantas y arbustos. Estos ítems están en la &apos;s Biblioteca de tu Inventario &gt; carpeta Objetos, o pueden crearse con el botón Construir."
+			name="land gardening"/>
 	</action_set>
 	<action_set
-	     description="These Abilities include powers to deed, modify, and sell group-owned objects. These changes are done in the Edit Tools &gt; General Tab. Right-click an object and Edit to see its settings. "
-	     name="Object Management">
-		<action description="Deed objects to group"
-		     longdescription="Deed objects to group in the Edit Tools &gt; General Tab."
-		     name="object deed" value="36" />
-		<action description="Manipulate (move, copy, modify) group-owned objects"
-		     longdescription="Manipulate (move, copy, modify) group-owned objects in the Edit Tools &gt; General Tab."
-		     name="object manipulate" value="38" />
-		<action description="Set group-owned objects for sale"
-		     longdescription="Set group-owned objects for sale in the Edit Tools &gt; General tab."
-		     name="object set sale" value="39" />
+		description="Estas capacidades incluyen poderes para transferir, modificar y vender objetos pertenecientes al grupo. Estos cambios se hacen en la pestaña General de la herramienta de edición. Para ver sus configuraciones, pulsa en un objeto con el botón derecho y elige Editar."
+		name="Object Management">
+		<action 
+			description="Transferir objetos al grupo"
+			longdescription="Transferir objetos al grupo en Editar &gt; pestaña General."
+			name="object deed"/>
+		<action 
+			description="Manipular (mover, copiar, y modificar) objetos del grupo"
+			longdescription="Manipular (mover, copiar, y modificar) objetos pertenecientes al grupo en Editar &gt; pestaña General."
+			name="object manipulate"/>
+		<action 
+			description="Poner a la venta objetos propiedad del grupo"
+			longdescription="Poner a la venta objetos pertenecientes al grupo en Editar &gt; pestaña General."
+			name="object set sale"/>
 	</action_set>
 	<action_set
-	     description="These Abilities include powers which require Members to pay group liabilities and receive group dividends, and restrict access to group account history."
+	     description="Estas habilidades incluyen poderes para que los miembros paguen deudas del grupo o reciban sus dividendos, y para limitar el acceso al historial de la cuenta del grupo."
 	     name="Accounting">
-		<action description="Pay group liabilities and receive group dividends"
-		     longdescription="Members in a Role with this Ability will automatically pay group liabilities and receive group dividends. This means they will receive a portion of group-owned land sales which are distributed daily, as well as contribute towards things like parcel listing fees. "
-		     name="accounting accountable" value="40" />
+		<action 
+			description="Pagar deudas y recibir dividendos del grupo"
+			longdescription="Los miembros del rol con esta capacidad, automáticamente pagarán deudas del grupo y recibirán sus dividendos. Esto significa que recibirán una parte de las ventas de terrenos del grupo, y que contribuirá a cosas como, por ejemplo, las cuotas por posesión de terreno."
+			name="accounting accountable"/>
 	</action_set>
 	<action_set
-	     description="These Abilities include powers to allow Members to send, receive, and view group Notices."
-	     name="Notices">
-		<action description="Send Notices"
-		     longdescription="Members in a Role with this Ability can send Notices in Group Information &gt; Notices tab."
-		     name="notices send" value="42" />
-		<action description="Receive Notices and view past Notices"
-		     longdescription="Members in a Role with this Ability can receive Notices and view past Notices in Group Information &gt; Notices tab."
-		     name="notices receive" value="43" />
+		description="Estas habilidades incluyen poderes para enviar, recibir y ver avisos de grupo."
+		name="Notices">
+		<action 
+			description="Enviar Avisos"
+			longdescription="Los miembros del rol con esta capacidad pueden enviar avisos en Información del Grupo &gt; pestaña Avisos."
+			name="notices send"/>
+		<action 
+			description="Recibir nuevos avisos y ver los anteriores"
+			longdescription="Los miembros del rol con esta capacidad pueden recibir los avisos nuevos, y ver los anteriores en Información del grupo &gt; pestaña Avisos."
+			name="notices receive"/>
 	</action_set>
 	<action_set
-	     description="These Abilities include powers to allow Members to set up Proposals, vote on Proposals, and view voting history."
-	     name="Proposals">
-		<action description="Create Proposals"
-		     longdescription="Members in a Role with this Ability can create proposals to be voted on in Group Information &gt; Proposals tab."
-		     name="proposal start" value="44" />
-		<action description="Vote on Proposals"
-		     longdescription="Members in a Role with this Ability can vote on proposals in Group Information &gt; Proposals tab."
-		     name="proposal vote" value="45" />
+		description="Estas habilidades incluyen poderes para permitir a los miembros crear propuestas, votarlas, y ver el historial de votaciones."
+		name="Proposals">
+		<action 
+			description="Crear Propuestas"
+			longdescription="Los miembros del rol con esta capacidad pueden crear propuestas para que sean votadas en Información del grupo &gt; pestaña Propuestas."
+			name="proposal start"/>
+		<action 
+			description="Votar las Propuestas"
+			longdescription="Los miembros del rol con esta capacidad pueden votar las propuestas en Información del grupo &gt; pestaña Propuestas."
+			name="proposal vote"/>
 	</action_set>
 	<action_set
-	     description="These Abilities include powers to allow or restrict access to group chat sessions and group voice chat." 
-	     name="Chat">
-		<action description="Join Group Chat"
-		     longdescription="Members in a Role with this Ability can join group chat sessions, for text and voice."
-		     name="join group chat" value="16" />
-		<action description="Join Group Voice Chat"
-		     longdescription="Members in a Role with this Ability can join group voice chat sessions.  NOTE: The Join Group Chat ability is required to access the voice chat session."
-		     name="join voice chat" value="27" />	
-		<action description="Moderate Group Chat"
-		     longdescription="Members in a Role with this Ability can control access and participation in group voice and text chat sessions."
-		     name="moderate group chat" value="37" />
+		description="Estas capacidades incluyen poderes para permitir o no el aceso a las sesiones de chat del grupo y al chat de voz del mismo." 
+		name="Chat">
+		<action 
+			description="Unirse al Chat de Grupo"
+			longdescription="Los miembros del rol con esta capacidad pueden abrir sesiones de chat del grupo, tanto de texto como de voz."
+			name="join group chat"/>
+		<action description="Unirse al Chat de Voz"
+			longdescription="Los miembros del rol con esta capacidad pueden abrir sesiones de chat de voz del grupo. NOTA: para acceder al chat de voz debe tenerse la capacidad &apos;Unirse al Chat de Ggrupo&apos;."
+			name="join voice chat"/>	
+		<action description="Moderar el Chat de Grupo"
+			longdescription="Los miembros del rol con esta capacidad pueden controlar el acceso y las participaciones en los chats de texto y de voz del grupo."
+			name="moderate group chat"/>
 	</action_set>
 </role_actions>
diff --git a/indra/newview/skins/default/xui/es/sh_floater_media_ticker.xml b/indra/newview/skins/default/xui/es/sh_floater_media_ticker.xml
index 3191e0dbb..47ff58c13 100644
--- a/indra/newview/skins/default/xui/es/sh_floater_media_ticker.xml
+++ b/indra/newview/skins/default/xui/es/sh_floater_media_ticker.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="mediaticker" title="">
-	  <text name="artist_label">
-			 Artista:
-	  </text>
-	  <text name="title_label">
-			 Título:
-	  </text>
-	
-	  <string name="paused">
-			 (Sin Reproducir)
-	  </string>
-	  <string name="loading">
-			 (Cargando...)
-	  </string>		
+	<text name="artist_label">
+		Artista:
+	</text>
+	<text name="title_label">
+		Título:
+	</text>
+	<string name="paused">
+		(Sin Reproducir)
+	</string>
+	<string name="loading">
+		(Cargando...)
+	</string>		
 </floater>
diff --git a/indra/newview/skins/default/xui/es/sh_floater_media_ticker_visualizer.xml b/indra/newview/skins/default/xui/es/sh_floater_media_ticker_visualizer.xml
index 4ccc48771..0d88fc0ee 100644
--- a/indra/newview/skins/default/xui/es/sh_floater_media_ticker_visualizer.xml
+++ b/indra/newview/skins/default/xui/es/sh_floater_media_ticker_visualizer.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater name="mediaticker" title="" >
-	  <text name="artist_label">
-			 Artista:
-	  </text>
-	  <text name="title_label">
-			 Título:
-	  </text>
-	
-	  <string name="paused">
-			 (Sin Reproducir)
-	  </string>
-	  <string name="loading">
-			 (Cargando...)
-	  </string>		
+	<text name="artist_label">
+		Artista:
+	</text>
+	<text name="title_label">
+		Título:
+	</text>
+	<string name="paused">
+		(Sin Reproducir)
+	</string>
+	<string name="loading">
+		(Cargando...)
+	</string>		
 </floater>
diff --git a/indra/newview/skins/default/xui/es/strings.xml b/indra/newview/skins/default/xui/es/strings.xml
index 23daaf448..d8e166a7e 100644
--- a/indra/newview/skins/default/xui/es/strings.xml
+++ b/indra/newview/skins/default/xui/es/strings.xml
@@ -3,310 +3,273 @@
      It is only for those strings which don'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="CURRENCY">L$</string>
-			 <string name="GRID_OWNER">Linden Lab</string>
-
-			 <string name="hippo_label_free">free</string>
-			 <string name="hippo_label_week">week</string>
-			 <string name="TeleportOfferMaturity">
-					[NAME] te ofrece un TP a [DESTINATION]
-			 </string>
-			 <string name="TeleportLureMaturity">
-					[NAME]'s teleport lure is to [DESTINATION]
-			 </string>
-			 <string name="AvatarIdle">
-					Inactivo por [MINUTES]min
-			 </string>
-
-			 <!-- Default Args - these arguments will be replaced in all strings -->
-			 <string name="SECOND_LIFE">Second Life</string>
-			 <string name="APP_NAME">Singularity Viewer</string>
-			 <string name="CAPITALIZED_APP_NAME">SINGULARITY VIEWER</string>
-			 <string name="SECOND_LIFE_GRID">Grid Second Life</string>
-			 <string name="SUPPORT_SITE">Portal de Soporte de Second Life</string>
-
-			 <!-- starting up -->
-			 <string name="StartupDetectingHardware">Detectando hardware...</string>
-			 <string name="StartupLoading">Cargando [APP_NAME]...</string>
-			 <string name="StartupClearingCache">Limpiadno caché...</string>
-			 <string name="StartupInitializingTextureCache">Inicializando Caché de Testuras...</string>
-			 <string name="StartupInitializingVFS">Inicializando VFS...</string>
-			 <string name="StartupRequireDriverUpdate">¡Ha fallado la inicialización gráfica. Por favor, actualiza los controladores gráficos!</string>
-
-			 <!--  progress -->
-			 <string name="ProgressRestoring">Restaurando...</string>
-			 <string name="ProgressChangingResolution">Cmabiando la Ressolución...</string>
-			 <!-- Login -->
-			 <string name="LoginInProgress">Iniciando sesión. [APP_NAME] puede aparecer congelado.  Espera por favor.</string>
-			 <string name="LoginInProgressNoFrozen">Iniciando sesión...</string>
-			 <string name="LoginAuthenticating">Autenticando</string>
-			 <string name="LoginMaintenance">Realizando mantenimiento de cuentas...</string>
-			 <string name="LoginAttempt">Ha fallado el inicio de sesión previo. Iniciando sesión, intento [NUMBER]</string>
-			 <string name="LoginPrecaching">Cargando el Mundo...</string>
-			 <string name="LoginInitializingBrowser">iniciando navegador web incorporado...</string>
-			 <string name="LoginInitializingMultimedia">Inicializando multimedia...</string>
-			 <string name="LoginInitializingFonts">Cargando fuentes...</string>
-			 <string name="LoginVerifyingCache">Verificando archivos de caché (puede demorar entre 60-90 segundos)...</string>
-			 <string name="LoginProcessingResponse">Procesando Respuesta...</string>
-			 <string name="LoginInitializingWorld">Inicializando el Mundo...</string>
-			 <string name="LoginDecodingImages">Decodificando Imágenes...</string>
-			 <string name="LoginInitializingQuicktime">Inicializando QuickTime...</string>
-			 <string name="LoginQuicktimeNotFound">No se ha encontrado QuickTime - incapaz de iniciarlo.</string>
-			 <string name="LoginQuicktimeOK">QuickTime ha sido inicializado satisfactoriamente.</string>
-			 <string name="LoginRequestSeedCapGrant">Solicitando capacidades de la Región...</string>
-			 <string name="LoginRetrySeedCapGrant">Solicitando capacidades de la Región, intento [NUMBER]...</string>
-			 <string name="LoginWaitingForRegionHandshake">Esperando saludo de la Región...</string>
-			 <string name="LoginConnectingToRegion">Conectando a la región...</string>
-			 <string name="LoginDownloadingClothing">Descargando ropas...</string>
-
-			 <string name="LoginFailed">Inicio de sesión fallido.</string>
-			 <string name="Quit">Salir</string>
-
-			 <!-- Disconnection -->
-			 <string name="AgentLostConnection">Esta región está experimentando problemas.  Revisa por favor tu conexión a Internet.</string>
-			 <string name="SavingSettings">Guardando tus configuraciones...</string>
-			 <string name="LoggingOut">Cerrando sesión...</string>
-			 <string name="ShuttingDown">Cerrando...</string>
-			 <string name="YouHaveBeenDisconnected">Has sido desconectado de la región donde te encontrabas.</string>
-			 <string name="SentToInvalidRegion">Se te ha enviado a una región no válida.</string>
-
-			 <!-- Tooltip, llhoverview.cpp -->
-			 <string name="TooltipPerson">Persona</string><!-- Object under mouse pointer is an avatar -->
-			 <string name="TooltipNoName">(sin nombre)</string> <!-- No name on an object -->
-			 <string name="TooltipOwner">Propietario:</string> <!-- Owner name follows -->
-			 <string name="TooltipPublic">Público</string> <!-- Public permissions on an object -->
-			 <string name="TooltipIsGroup">(Grupo)</string> <!-- The name before this text is that of a group -->
-			 <string name="TooltipFlagScript">Script</string>
-			 <string name="TooltipFlagPhysics">Físico</string>
-			 <string name="TooltipFlagTouch">Tocar</string>
-			 <string name="TooltipFlagL$">[CURRENCY]</string>
-			 <string name="TooltipFlagDropInventory">Soltar Inventario</string>
-			 <string name="TooltipFlagPhantom">Fantasma</string>
-			 <string name="TooltipFlagTemporary">Temporario</string>
-			 <string name="TooltipFlagRightClickMenu">(Botón derecho para menú)</string>
-			 <string name="TooltipFreeToCopy">Libre para copiar</string>
-			 <string name="TooltipForSaleL$">En venta: [CURRENCY][AMOUNT]</string> <!-- L$ version -->
-			 <string name="TooltipForSaleMsg">En venta: [MESSAGE]</string> <!-- Message (RetrievingData) -->
-			 <string name="TooltipFlagGroupBuild">Construir Grupo</string>
-			 <string name="TooltipFlagNoBuild">No Construir</string>
-			 <string name="TooltipFlagNoEdit">Construir Grupo</string>
-			 <string name="TooltipFlagNotSafe">No seguro</string><!-- damage area -->
-			 <string name="TooltipFlagNoFly">No volar</string>
-			 <string name="TooltipFlagGroupScripts">Scripts de Grupo</string>
-			 <string name="TooltipFlagNoScripts">Sin Scripts</string>
-			 <string name="TooltipLand">Terreno:</string>
-			 <string name="TooltipMustSingleDrop">Sólo un único item puede ser arrastrado aquí</string>
-
-			 <string name="TooltipOutboxDragToWorld">No puedes rezear item en tu Merchant Outbox</string>
-			 <string name="TooltipOutboxNoTransfer">Uno o más de estos objetos no pueden ser vendidos o transferidos.</string>
-			 <string name="TooltipOutboxNotInInventory">Tu Merchant Outbox solo puede aceptar items de tu inventario</string>
-			 <string name="TooltipOutboxWorn">No puedes colocar items que tienes vestidos en tu Merchant Outbox</string>
-			 <string name="TooltipOutboxCallingCard">No puedes colocar Tarjetas de LLamada en tu Merchant OutBox</string>
-			 <string name="TooltipOutboxFolderLevels">La profundidad de carpetas anidades es superior a 3</string>
-			 <string name="TooltipOutboxTooManyFolders">El recuento de subcarpetas en el nivel superior supera las 20</string>
-			 <string name="TooltipOutboxTooManyObjects">El recuento de items en la carpeta de nivel superior supera los 200</string>
-	
-			 <string name="TooltipDragOntoOwnChild">No puedes mover una carpeta a su carpeta secundaria</string>
-			 <string name="TooltipDragOntoSelf">No puedes mover una carpeta en si misma</string>
-
-			 <!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. -->
-			 <string name="RetrievingData">Recuperando...</string>
-
-			 <string name="ReleaseNotes">Notas de Lanzamiento</string>
-
-			 <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
-			 <string name="LoadingData">Cargando...</string>
-
-
-			 <!-- namecache -->
-			 <!-- Avatar name: text shown for LLUUID::null -->
-			 <string name="AvatarNameNobody">(nadie)</string>
-
-			 <!-- Avatar name: text shown while fetching name -->
-			 <string name="AvatarNameWaiting">(esperando)</string>
-
-			 <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. -->
-			 <string name="AvatarNameHippos">(hippos)</string>
-
-			 <!-- Group name: text shown for LLUUID::null -->
-			 <string name="GroupNameNone">(ninguno)</string>
-
-			 <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
-			 <string name="AssetErrorNone">Sin errores</string>
-			 <string name="AssetErrorRequestFailed">Petición de Asset: fallida</string>
-			 <string name="AssetErrorNonexistentFile">Petición de Asset: archivo inexistente</string>
-			 <string name="AssetErrorNotInDatabase">Petición de Asset: activo no hallado en la base de datos</string>
-			 <string name="AssetErrorEOF">Fin de archivo</string>
-			 <string name="AssetErrorCannotOpenFile">No se puede abrir el archivo</string>
-			 <string name="AssetErrorFileNotFound">Archivo no encontrado</string>
-			 <string name="AssetErrorTCPTimeout">Tiempo de espera en transferencia de archivo agotado</string>
-			 <string name="AssetErrorCircuitGone">El circuito se ha ido</string>
-			 <string name="AssetErrorPriceMismatch">El Visor y el Servidor no coinciden con el precio</string>
-			 <string name="AssetErrorUnknownStatus">Estado desconocido</string>
-
-			 <!-- llvoavatar. Displayed in the avatar's chat bubble -->
-			 <string name="AvatarEditingAppearance">(Editando Apariencia)</string>
-			 <string name="AvatarAway">Ausente</string>
-			 <string name="AvatarBusy">Ocupado</string>
-			 <string name="AvatarMuted">Bloqueado</string>
-
-			 <!-- animations -->
-			 <string name="anim_express_afraid">Miedo</string>
-			 <string name="anim_express_anger">Enfado</string>
-			 <string name="anim_away">Ausente</string>
-			 <string name="anim_backflip">alto mortal atrás</string>
-			 <string name="anim_express_laugh">Carcajada</string>
-			 <string name="anim_express_toothsmile">Gran sonrisa</string>
-			 <string name="anim_blowkiss">Mandar un beso</string>
-			 <string name="anim_express_bored">Aburrimiento</string>
-			 <string name="anim_bow">Reverencia</string>
-			 <string name="anim_clap">Aplauso</string>
-			 <string name="anim_courtbow">Reverencia floreada</string>
-			 <string name="anim_express_cry">Llanto</string>
-			 <string name="anim_dance1">Baile 1</string>
-			 <string name="anim_dance2">Baile 2</string>
-			 <string name="anim_dance3">Baile 3</string>
-			 <string name="anim_dance4">Baile 4</string>
-			 <string name="anim_dance5">Baile 5</string>
-			 <string name="anim_dance6">Baile 6</string>
-			 <string name="anim_dance7">Baile 7</string>
-			 <string name="anim_dance8">Baile 8</string>
-			 <string name="anim_express_disdain">Desdén</string>
-			 <string name="anim_drink">Beber</string>
-			 <string name="anim_express_embarrased">Avergonzado</string>
-			 <string name="anim_angry_fingerwag">Negar con el dedo</string>
-			 <string name="anim_fist_pump">Gesto de Victoria</string>
-			 <string name="anim_yoga_float">Yoga flotando</string>
-			 <string name="anim_express_frown">Fruncir el ceño</string>
-			 <string name="anim_impatient">Impaciente</string>
-			 <string name="anim_jumpforjoy">Salto de alegría</string>
-			 <string name="anim_kissmybutt">Bésame el culo</string>
-			 <string name="anim_express_kiss">Besar</string>
-			 <string name="anim_laugh_short">Reír</string>
-			 <string name="anim_musclebeach">Sacar músculo</string>
-			 <string name="anim_no_unhappy">No (con enfado)</string>
-			 <string name="anim_no_head">No</string>
-			 <string name="anim_nyanya">Ña-Ña-Ña</string>
-			 <string name="anim_punch_onetwo">Puñetazo uno-dos</string>
-			 <string name="anim_express_open_mouth">Abrir la boca</string>
-			 <string name="anim_peace">Paz</string>
-			 <string name="anim_point_you">Señalar a otro/a</string>
-			 <string name="anim_point_me">Señalarse</string>
-			 <string name="anim_punch_l">Puñetazo izquierdo</string>
-			 <string name="anim_punch_r">Puñetazo derecho</string>
-			 <string name="anim_rps_countdown">PPT cuenta</string>
-			 <string name="anim_rps_paper">PPT papel</string>
-			 <string name="anim_rps_rock">PPT piedra</string>
-			 <string name="anim_rps_scissors">PPT tijera</string>
-			 <string name="anim_express_repulsed">Rechazo</string>
-			 <string name="anim_kick_roundhouse_r">Patada circular</string>
-			 <string name="anim_express_sad">Triste</string>
-			 <string name="anim_salute">Saludo militar</string>
-			 <string name="anim_shout">Gritar</string>
-			 <string name="anim_express_shrug">Encogerse de hombros</string>
-			 <string name="anim_express_smile">Sonreír</string>
-			 <string name="anim_smoke_idle">Fumar: en la mano</string>
-			 <string name="anim_smoke_inhale">Fumar: Inhalar</string>
-			 <string name="anim_smoke_throw_down">Fumar: tirar el cigarro</string>
-			 <string name="anim_express_surprise">Sorpresa</string>
-			 <string name="anim_sword_strike_r">Estocada</string>
-			 <string name="anim_angry_tantrum">Berrinche</string>
-			 <string name="anim_express_tongue_out">Sacar la lengua</string>
-			 <string name="anim_hello">Agitar la mano</string>
-			 <string name="anim_whisper">Susurrar</string>
-			 <string name="anim_whistle">Silbar</string>
-			 <string name="anim_express_wink">Guiño</string>
-			 <string name="anim_wink_hollywood">Guiño (Hollywood)</string>
-			 <string name="anim_express_worry">Preocuparse</string>
-			 <string name="anim_yes_happy">Sí (contento)</string>
-			 <string name="anim_yes_head">Si</string>
-
-			 <string name="texture_loading">Cargando...</string>
-			 <string name="worldmap_offline">Desconectado</string>
-
-			 <!-- animations uploading status codes -->
-			 <string name="Ok">OK</string>
-			 <!-- Chat -->
-			 <string name="whisper">Susurros:</string>
-			 <string name="shout">Gritos:</string>
-
-			 <!-- Sim Access labels -->
-			 <string name="SIM_ACCESS_PG">PG</string>
-			 <string name="SIM_ACCESS_MATURE">Mature</string>
-			 <string name="SIM_ACCESS_ADULT">Adulto</string>
-			 <string name="SIM_ACCESS_DOWN">Desconectado</string>
-			 <string name="SIM_ACCESS_MIN">Desconocido</string>
-
-			 <!-- For use when we do not have land type back from the server -->
-			 <string name="land_type_unknown">(Desconocido)</string>
-
-			 <!-- Covenant info -->
-			 <string name="covenant_never_modified">Última Modificación: (nunca)</string>
-			 <string name="covenant_modified">Última Modificación: </string>
-
-			 <!-- File load/save dialogs -->
-			 <string name="all_files">Todos los Archivos</string>
-			 <string name="sound_files">Sonidos</string>
-			 <string name="animation_files">Animaciones</string>
-			 <string name="image_files">Imágenes</string>
-			 <string name="save_file_verb">Guardar</string>
-			 <string name="load_file_verb">Cargar</string>
-			 <string name="targa_image_files">Imágenes Targa</string>
-			 <string name="bitmap_image_files">Imágenes de Mapa de Bits</string>
-			 <string name="avi_movie_file">Película AVI</string>
-			 <string name="xaf_animation_file">Animación XAF</string>
-			 <string name="xml_file">Archivo XML</string>
-			 <string name="raw_file">Archivo RAW</string>
-			 <string name="compressed_image_files">Imágenes Comprimidas</string>
-			 <string name="load_files">Cargar Archivos</string>
-			 <string name="choose_the_directory">Seleccionar Directorio</string>
-
- 
-			 <!-- LSL Usage Hover Tips -->
-			 <string name="LSLTipSleepTime">
-					Pausa el script por [SLEEP_TIME] segundos.
-			 </string>
-
-			 <string name="LSLTipText_llSin">
-					float llSin(float theta)
+	<strings>
+	<string name="CURRENCY">L$</string>
+	<string name="GRID_OWNER">Linden Lab</string>
+	<string name="hippo_label_free">free</string>
+	<string name="hippo_label_week">semana</string>
+	<string name="TeleportOfferMaturity">[NAME] te ofrece un TP a [DESTINATION]</string>
+	<string name="TeleportLureMaturity">[NAME] te ofrece una invitación de teleporte a [DESTINATION]</string>
+	<string name="AvatarIdle">Inactivo por [MINUTES] min</string>
+	<!-- Default Args - these arguments will be replaced in all strings -->
+	<string name="SECOND_LIFE">Second Life</string>
+	<string name="APP_NAME">Singularity Viewer</string>
+	<string name="CAPITALIZED_APP_NAME">SINGULARITY VIEWER</string>
+	<string name="SECOND_LIFE_GRID">Grid Second Life</string>
+	<string name="SUPPORT_SITE">Portal de Soporte de Second Life</string>
+	<!-- starting up -->
+	<string name="StartupDetectingHardware">Detectando hardware...</string>
+	<string name="StartupLoading">Cargando [APP_NAME]...</string>
+	<string name="StartupClearingCache">Limpiando caché...</string>
+	<string name="StartupInitializingTextureCache">Inicializando Caché de Texturas...</string>
+	<string name="StartupInitializingVFS">Inicializando VFS...</string>
+	<string name="StartupRequireDriverUpdate">¡Ha fallado la inicialización gráfica. Por favor, actualiza los controladores gráficos!</string>
+	<!--  progress -->
+	<string name="ProgressRestoring">Restaurando...</string>
+	<string name="ProgressChangingResolution">Cambiando la Resolución...</string>
+	<!-- Login -->
+	<string name="LoginInProgress">Iniciando sesión. [APP_NAME] puede aparecer congelado.  Espera por favor.</string>
+	<string name="LoginInProgressNoFrozen">Iniciando sesión...</string>
+	<string name="LoginAuthenticating">Autenticando</string>
+	<string name="LoginMaintenance">Realizando mantenimiento de cuentas...</string>
+	<string name="LoginAttempt">Ha fallado el inicio de sesión previo. Iniciando sesión, intento [NUMBER]</string>
+	<string name="LoginPrecaching">Cargando el Mundo...</string>
+	<string name="LoginInitializingBrowser">iniciando navegador web incorporado...</string>
+	<string name="LoginInitializingMultimedia">Inicializando multimedia...</string>
+	<string name="LoginInitializingFonts">Cargando fuentes...</string>
+	<string name="LoginVerifyingCache">Verificando archivos de caché (puede demorar entre 60-90 segundos)...</string>
+	<string name="LoginProcessingResponse">Procesando Respuesta...</string>
+	<string name="LoginInitializingWorld">Inicializando el Mundo...</string>
+	<string name="LoginDecodingImages">Decodificando Imágenes...</string>
+	<string name="LoginInitializingQuicktime">Inicializando QuickTime...</string>
+	<string name="LoginQuicktimeNotFound">No se ha encontrado QuickTime - incapaz de iniciarlo.</string>
+	<string name="LoginQuicktimeOK">QuickTime ha sido inicializado satisfactoriamente.</string>
+	<string name="LoginRequestSeedCapGrant">Solicitando capacidades de la Región...</string>
+	<string name="LoginRetrySeedCapGrant">Solicitando capacidades de la Región, intento [NUMBER]...</string>
+	<string name="LoginWaitingForRegionHandshake">Esperando saludo de la Región...</string>
+	<string name="LoginConnectingToRegion">Conectando a la región...</string>
+	<string name="LoginDownloadingClothing">Descargando ropas...</string>
+	<string name="LoginFailed">Inicio de sesión fallido.</string>
+	<string name="Quit">Salir</string>
+	<!-- Disconnection -->
+	<string name="AgentLostConnection">Esta región está experimentando problemas.  Revisa por favor tu conexión a Internet.</string>
+	<string name="SavingSettings">Guardando tus configuraciones...</string>
+	<string name="LoggingOut">Cerrando sesión...</string>
+	<string name="ShuttingDown">Cerrando...</string>
+	<string name="YouHaveBeenDisconnected">Has sido desconectado de la región donde te encontrabas.</string>
+	<string name="SentToInvalidRegion">Se te ha enviado a una región no válida.</string>
+	<!-- Tooltip, llhoverview.cpp -->
+	<string name="TooltipPerson">Persona</string><!-- Object under mouse pointer is an avatar -->
+	<string name="TooltipNoName">(sin nombre)</string> <!-- No name on an object -->
+	<string name="TooltipOwner">Propietario:</string> <!-- Owner name follows -->
+	<string name="TooltipPublic">Público</string> <!-- Public permissions on an object -->
+	<string name="TooltipIsGroup">(Grupo)</string> <!-- The name before this text is that of a group -->
+	<string name="TooltipFlagScript">Script</string>
+	<string name="TooltipFlagPhysics">Material</string>
+	<string name="TooltipFlagTouch">Tocar</string>
+	<string name="TooltipFlagL$">[CURRENCY]</string>
+	<string name="TooltipFlagDropInventory">Soltar Inventario</string>
+	<string name="TooltipFlagPhantom">Fantasma</string>
+	<string name="TooltipFlagTemporary">Temporario</string>
+	<string name="TooltipFlagRightClickMenu">(Botón derecho para menú)</string>
+	<string name="TooltipFreeToCopy">Libre para copiar</string>
+	<string name="TooltipForSaleL$">En venta: [CURRENCY][AMOUNT]</string> <!-- L$ version -->
+	<string name="TooltipForSaleMsg">En venta: [MESSAGE]</string> <!-- Message (RetrievingData) -->
+	<string name="TooltipFlagGroupBuild">Construir Grupo</string>
+	<string name="TooltipFlagNoBuild">No Construir</string>
+	<string name="TooltipFlagNoEdit">Construir Grupo</string>
+	<string name="TooltipFlagNotSafe">No seguro</string><!-- damage area -->
+	<string name="TooltipFlagNoFly">No volar</string>
+	<string name="TooltipFlagGroupScripts">Scripts de Grupo</string>
+	<string name="TooltipFlagNoScripts">Sin Scripts</string>
+	<string name="TooltipLand">Terreno:</string>
+	<string name="TooltipMustSingleDrop">Sólo un único item puede ser arrastrado aquí</string>
+	<string name="TooltipOutboxDragToWorld">No puedes rezear ítems en tu Merchant Outbox</string>
+	<string name="TooltipOutboxNoTransfer">Uno o más de estos objetos no pueden ser vendidos o transferidos.</string>
+	<string name="TooltipOutboxNotInInventory">Tu Merchant Outbox solo puede aceptar ítems de tu inventario</string>
+	<string name="TooltipOutboxWorn">No puedes colocar ítems que tienes vestidos en tu Merchant Outbox</string>
+	<string name="TooltipOutboxCallingCard">No puedes colocar Tarjetas de LLamada en tu Merchant OutBox</string>
+	<string name="TooltipOutboxFolderLevels">La profundidad de carpetas anidades es superior a 3</string>
+	<string name="TooltipOutboxTooManyFolders">El recuento de subcarpetas en el nivel superior supera las 20</string>
+	<string name="TooltipOutboxTooManyObjects">El recuento de items en la carpeta de nivel superior supera los 200</string>
+	<string name="TooltipDragOntoOwnChild">No puedes mover una carpeta a su carpeta secundaria</string>
+	<string name="TooltipDragOntoSelf">No puedes mover una carpeta en si misma</string>
+	<!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. -->
+	<string name="RetrievingData">Recuperando...</string>
+	<string name="ReleaseNotes">Notas de Lanzamiento</string>
+	<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
+	<string name="LoadingData">Cargando...</string>
+	<!-- namecache -->
+	<!-- Avatar name: text shown for LLUUID::null -->
+	<string name="AvatarNameNobody">(nadie)</string>
+	<!-- Avatar name: text shown while fetching name -->
+	<string name="AvatarNameWaiting">(esperando)</string>
+	<!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. -->
+	<string name="AvatarNameHippos">(hippos)</string>
+	<!-- Group name: text shown for LLUUID::null -->
+	<string name="GroupNameNone">(ninguno)</string>
+	<!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
+	<string name="AssetErrorNone">Sin errores</string>
+	<string name="AssetErrorRequestFailed">Petición de Activos: fallida</string>
+	<string name="AssetErrorNonexistentFile">Petición de Activos: archivo inexistente</string>
+	<string name="AssetErrorNotInDatabase">Petición de Activos: activo no hallado en la base de datos</string>
+	<string name="AssetErrorEOF">Fin de archivo</string>
+	<string name="AssetErrorCannotOpenFile">No se puede abrir el archivo</string>
+	<string name="AssetErrorFileNotFound">Archivo no encontrado</string>
+	<string name="AssetErrorTCPTimeout">Tiempo de espera en transferencia de archivo agotado</string>
+	<string name="AssetErrorCircuitGone">El circuito se ha ido</string>
+	<string name="AssetErrorPriceMismatch">El Visor y el Servidor no coinciden con el precio</string>
+	<string name="AssetErrorUnknownStatus">Estado desconocido</string>
+	<!-- llvoavatar. Displayed in the avatar's chat bubble -->
+	<string name="AvatarEditingAppearance">(Editando Apariencia)</string>
+	<string name="AvatarAway">Ausente</string>
+	<string name="AvatarBusy">Ocupado</string>
+	<string name="AvatarMuted">Bloqueado</string>
+	<!-- animations -->
+	<string name="anim_express_afraid">Miedo</string>
+	<string name="anim_express_anger">Enfado</string>
+	<string name="anim_away">Ausente</string>
+	<string name="anim_backflip">Salto mortal atrás</string>
+	<string name="anim_express_laugh">Carcajada</string>
+	<string name="anim_express_toothsmile">Gran sonrisa</string>
+	<string name="anim_blowkiss">Mandar un beso</string>
+	<string name="anim_express_bored">Aburrimiento</string>
+	<string name="anim_bow">Reverencia</string>
+	<string name="anim_clap">Aplauso</string>
+	<string name="anim_courtbow">Reverencia floreada</string>
+	<string name="anim_express_cry">Llanto</string>
+	<string name="anim_dance1">Baile 1</string>
+	<string name="anim_dance2">Baile 2</string>
+	<string name="anim_dance3">Baile 3</string>
+	<string name="anim_dance4">Baile 4</string>
+	<string name="anim_dance5">Baile 5</string>
+	<string name="anim_dance6">Baile 6</string>
+	<string name="anim_dance7">Baile 7</string>
+	<string name="anim_dance8">Baile 8</string>
+	<string name="anim_express_disdain">Desdén</string>
+	<string name="anim_drink">Beber</string>
+	<string name="anim_express_embarrased">Avergonzado</string>
+	<string name="anim_angry_fingerwag">Negar con el dedo</string>
+	<string name="anim_fist_pump">Gesto de Victoria</string>
+	<string name="anim_yoga_float">Yoga flotando</string>
+	<string name="anim_express_frown">Fruncir el ceño</string>
+	<string name="anim_impatient">Impaciente</string>
+	<string name="anim_jumpforjoy">Salto de alegría</string>
+	<string name="anim_kissmybutt">Bésame el culo</string>
+	<string name="anim_express_kiss">Besar</string>
+	<string name="anim_laugh_short">Reír</string>
+	<string name="anim_musclebeach">Sacar músculo</string>
+	<string name="anim_no_unhappy">No (con enfado)</string>
+	<string name="anim_no_head">No</string>
+	<string name="anim_nyanya">Ña-Ña-Ña</string>
+	<string name="anim_punch_onetwo">Puñetazo uno-dos</string>
+	<string name="anim_express_open_mouth">Abrir la boca</string>
+	<string name="anim_peace">Paz</string>
+	<string name="anim_point_you">Señalar a otro/a</string>
+	<string name="anim_point_me">Señalarse</string>
+	<string name="anim_punch_l">Puñetazo izquierdo</string>
+	<string name="anim_punch_r">Puñetazo derecho</string>
+	<string name="anim_rps_countdown">PPT cuenta</string>
+	<string name="anim_rps_paper">PPT papel</string>
+	<string name="anim_rps_rock">PPT piedra</string>
+	<string name="anim_rps_scissors">PPT tijera</string>
+	<string name="anim_express_repulsed">Rechazo</string>
+	<string name="anim_kick_roundhouse_r">Patada circular</string>
+	<string name="anim_express_sad">Triste</string>
+	<string name="anim_salute">Saludo militar</string>
+	<string name="anim_shout">Gritar</string>
+	<string name="anim_express_shrug">Encogerse de hombros</string>
+	<string name="anim_express_smile">Sonreír</string>
+	<string name="anim_smoke_idle">Fumar: en la mano</string>
+	<string name="anim_smoke_inhale">Fumar: Inhalar</string>
+	<string name="anim_smoke_throw_down">Fumar: tirar el cigarro</string>
+	<string name="anim_express_surprise">Sorpresa</string>
+	<string name="anim_sword_strike_r">Estocada</string>
+	<string name="anim_angry_tantrum">Berrinche</string>
+	<string name="anim_express_tongue_out">Sacar la lengua</string>
+	<string name="anim_hello">Agitar la mano</string>
+	<string name="anim_whisper">Susurrar</string>
+	<string name="anim_whistle">Silbar</string>
+	<string name="anim_express_wink">Guiño</string>
+	<string name="anim_wink_hollywood">Guiño (Hollywood)</string>
+	<string name="anim_express_worry">Preocuparse</string>
+	<string name="anim_yes_happy">Sí (contento)</string>
+	<string name="anim_yes_head">Si</string>
+	<string name="texture_loading">Cargando...</string>
+	<string name="worldmap_offline">Desconectado</string>
+	<!-- animations uploading status codes -->
+	<string name="Ok">OK</string>
+	<!-- Chat -->
+	<string name="whisper">Susurros:</string>
+	<string name="shout">Gritos:</string>
+	<!-- Sim Access labels -->
+	<string name="SIM_ACCESS_PG">PG</string>
+	<string name="SIM_ACCESS_MATURE">Mature</string>
+	<string name="SIM_ACCESS_ADULT">Adulto</string>
+	<string name="SIM_ACCESS_DOWN">Desconectado</string>
+	<string name="SIM_ACCESS_MIN">Desconocido</string>
+	<!-- For use when we do not have land type back from the server -->
+	<string name="land_type_unknown">(Desconocido)</string>
+	<!-- Covenant info -->
+	<string name="covenant_never_modified">Última Modificación: (nunca)</string>
+	<string name="covenant_modified">Última Modificación: </string>
+	<!-- File load/save dialogs -->
+	<string name="all_files">Todos los Archivos</string>
+	<string name="sound_files">Sonidos</string>
+	<string name="animation_files">Animaciones</string>
+	<string name="image_files">Imágenes</string>
+	<string name="save_file_verb">Guardar</string>
+	<string name="load_file_verb">Cargar</string>
+	<string name="targa_image_files">Imágenes Targa</string>
+	<string name="bitmap_image_files">Imágenes de Mapa de Bits</string>
+	<string name="avi_movie_file">Película AVI</string>
+	<string name="xaf_animation_file">Animación XAF</string>
+	<string name="xml_file">Archivo XML</string>
+	<string name="raw_file">Archivo RAW</string>
+	<string name="compressed_image_files">Imágenes Comprimidas</string>
+	<string name="load_files">Cargar Archivos</string>
+	<string name="choose_the_directory">Seleccionar Directorio</string>
+	<string name="Sound: ">Sonido: </string>
+	<!-- LSL Usage Hover Tips -->
+	<string name="LSLTipSleepTime">Pausa el script por [SLEEP_TIME] segundos.</string>
+	<string name="LSLTipText_llSin">
+		float llSin(float theta)
 Devuelve el seno de theta (theta en radianes)
-			 </string>
-			 <string name="LSLTipText_llCos">
-					float llCos(float theta)
+	</string>
+	<string name="LSLTipText_llCos">
+		float llCos(float theta)
 Devuelve el coseno de theta (theta en radianes)
-			 </string>
-			 <string name="LSLTipText_llTan">
-					float llTan(float theta)
-Returns the tangent of theta (theta in radians)
+	</string>
+	<string name="LSLTipText_llTan">
+		float llTan(float theta)
+Devuelve la tangente de theta (theta en radianes)
   </string>
   <string name="LSLTipText_llAtan2">
-float llAtan2(float y, float x)
-Returns the arctangent2 of y, x
+		float llAtan2(float y, float x)
+Devuelve el arcotangente2 de y, x
   </string>
   <string name="LSLTipText_llSqrt">
-float llSqrt(float val)
-Returns the square root of val, or returns 0 and triggers a Math Error for imaginary results
+		float llSqrt(float val)
+Devuelve la raíz cuadrada de val, o devuelve 0 y desencadena un error para resultados imaginarios
   </string>
   <string name="LSLTipText_llPow">
-float llPow(float base, float exponent)
-Returns the base raised to the power exponent, or returns 0 and triggers Math Error for imaginary results
+		float llPow(float base, float exponent)
+Devuelve la base elevada a la potencia del exponente, o devuelve 0 y desencadena un error para resultados imaginarios		
   </string>
   <string name="LSLTipText_llAbs">
-integer llAbs(integer val)
-Returns the positive version of val
+		integer llAbs(integer val)
+Devuelve el positivo de val
   </string>
   <string name="LSLTipText_llFabs">
-float llFabs(float val)
-Returns the positive version of val
+	float llFabs(float val)
+Devuelve el positivo de val
   </string>
-  <string name="LSLTipText_llFrand">
-float llFrand(float mag)
-Returns a pseudo random number in the range [0,mag) or (mag,0]
+	<string name="LSLTipText_llFrand">
+		float llFrand(float mag)
+Devuelve un número seudo aleatoreo en el rango [0,mag) o (mag,0]
   </string>
   <string name="LSLTipText_llFloor">
-integer llFloor(float val)
+		integer llFloor(float val)
 Returns largest integer value &lt;= val
   </string>
   <string name="LSLTipText_llCeil">
@@ -1821,148 +1784,145 @@ key llAvatarOnLinkSitTarget( integer link )
 Returns a key that is the UUID of the user seated on the prim.
   </string>
 
-
 <!-- No info on these functions yet....
   <string name="LSLTipText_llSetVelocity">
   </string>
   <string name="LSLTipText_llSetRotationalVelocity">
   </string>
 -->
-  <!-- Avatar busy/away mode -->
-	<string name="AvatarSetNotAway">Not Away</string>
-	<string name="AvatarSetAway">Away</string>
-	<string name="AvatarSetNotBusy">Not Busy</string>
-	<string name="AvatarSetBusy">Busy</string>
-
-
-
+	<!-- Avatar busy/away mode -->
+	<string name="AvatarSetNotAway">No ausente</string>
+	<string name="AvatarSetAway">Ausente</string>
+	<string name="AvatarSetNotBusy">No Ocupado</string>
+	<string name="AvatarSetBusy">Ocupado</string>
 	<string name="ok">OK</string>
 	<!-- mouselook -->
-	<string name="LeaveMouselook">Press ESC to return to World View</string>
+	<string name="LeaveMouselook">Pulsa ESC para regresar a la vista del mundo</string>
 	<!-- use value="" because they have preceding spaces -->
-	<string name="no_transfer" value=" (no transfer)" />
-	<string name="no_modify"   value=" (no modify)" />
-	<string name="no_copy"     value=" (no copy)" />
-	<string name="temporary"   value=" (temporary)" />
-	<string name="worn"        value=" (worn)" />
-	<string name="locked" value=" (locked)" />
-	<string name="link"        value=" (link)" />
-	<string name="broken_link" value=" (broken_link)" />
-	<string name="LoadingContents">Loading contents...</string>
-	<string name="NoContents">No contents</string>
-	<string name="WornOnAttachmentPoint" value=" (worn on [ATTACHMENT_POINT])" />
-	<string name="LockedOnAttachmentPoint" value=" (locked to [ATTACHMENT_POINT])" />
-	<string name="ActiveGesture" value="[GESLABEL] (active)"/>
+	<string name="no_transfer" value=" (no transferible)" />
+	<string name="no_modify"   value=" (no modificable)" />
+	<string name="no_copy"     value=" (no copiable)" />
+	<string name="temporary"   value=" (temporal)" />
+	<string name="worn"        value=" (vestido)" />
+	<string name="locked" value=" (bloqueado)" />
+	<string name="link"        value=" (enlace)" />
+	<string name="broken_link" value=" (enlace roto)" />
+	<string name="LoadingContents">Cargando contenidos...</string>
+	<string name="NoContents">Sin Contenido</string>
+	<string name="WornOnAttachmentPoint" value=" (vestido en [ATTACHMENT_POINT])" />
+	<string name="LockedOnAttachmentPoint" value=" (bloqueado en[ATTACHMENT_POINT])" />
+	<string name="ActiveGesture" value="[GESLABEL] (activo)"/>
 	<!-- Gestures labels -->
     <!-- use value="" because they have preceding spaces -->
     <string name="Chat Message"  value=" Chat : " />
-    <string name="Sound"         value=" Sound : " />
-	<string name="Wait"          value=" --- Wait : " />
-	<string name="AnimFlagStop"  value=" Stop Animation :    " />
-	<string name="AnimFlagStart" value=" Start Animation :   " />
-	<string name="Wave"          value=" Wave " />
-	<string name="GestureActionNone" value="None" />
-	<string name="HelloAvatar"   value=" Hello, avatar! " />
-	<string name="ViewAllGestures"  value="  View All &gt;&gt;" />
-	<string name="GetMoreGestures"  value="  Get More &gt;&gt;" />
-	<string name="Stone">Stone</string>
+    <string name="Sound"         value=" Sonido : " />
+	<string name="Wait"          value=" --- Esperar : " />
+	<string name="AnimFlagStop"  value=" Detener Animación :    " />
+	<string name="AnimFlagStart" value=" Iniciar Animación :   " />
+	<string name="Wave"          value=" Onda " />
+	<string name="GestureActionNone" value="Nada" />
+	<string name="HelloAvatar"   value=" ¡Hola Avatar! " />
+	<string name="ViewAllGestures"  value="  Ver Todo &gt;&gt;" />
+	<string name="GetMoreGestures"  value="  Obtener Más &gt;&gt;" />
+	<string name="Stone">Piedra</string>
 	<string name="Metal">Metal</string>
-	<string name="Glass">Glass</string>
-	<string name="Wood">Wood</string>
-	<string name="Flesh">Flesh</string>
-	<string name="Plastic">Plastic</string>
-	<string name="Rubber">Rubber</string>
-	<string name="Light">Light</string>
-	<string name="Unknown">(Unknown)</string>
+	<string name="Glass">Vidrio</string>
+	<string name="Wood">Madera</string>
+	<string name="Flesh">Carne</string>
+	<string name="Plastic">Plástico</string>
+	<string name="Rubber">Goma</string>
+	<string name="Light">Luz</string>
+	<string name="Unknown">(Desconocido)</string>
 	<!-- Environment settings -->
 	<string name="Local">Local</string>
-	<string name="LocalSettings">Local Settings</string>
-	<string name="Region">Region</string>
-	<string name="RegionSettings">Region Settings</string>
+	<string name="LocalSettings">Configuración Local</string>
+	<string name="Region">Región</string>
+	<string name="RegionSettings">Configuración de Región</string>
 	<!-- menu accelerators -->
 	<string name="accel-mac-control">Ctrl-</string>
 	<string name="accel-mac-command">Cmd-</string>
 	<string name="accel-mac-option">Opt-</string>
-	<string name="accel-mac-shift">Shift-</string>
+	<string name="accel-mac-shift">Mayús</string>
 	<string name="accel-win-control">Ctrl-</string>
 	<string name="accel-win-alt">Alt-</string>
-	<string name="accel-win-shift">Shift-</string>
+	<string name="accel-win-shift">Mayús</string>
 	<!-- OSMessageBox messages -->
 	<string name="MBCmdLineError">
-		An error was found parsing the command line.
-Please see: http://wiki.secondlife.com/wiki/Client_parameters
+		Se ha encontrado un error analizando la línea de comandos-
+Por favor, mira en: http://wiki.secondlife.com/wiki/Client_parameters
 Error:
 	</string>
-	<string name="MBCmdLineUsg">[APP_NAME] Command line usage:</string>
+	<string name="MBCmdLineUsg">[APP_NAME] Uso de la Línea de Comandos:</string>
 	<string name="MBUnableToAccessFile">
-		[APP_NAME] is unable to access a file that it needs.
+		[APP_NAME] es incapaz de acceder a un archivo que necesita.
 
-This can be because you somehow have multiple copies running, or your system incorrectly thinks a file is open.
-If this message persists, restart your computer and try again.
-If it continues to persist, you may need to completely uninstall [APP_NAME] and reinstall it.
+Esto puede ser porque de alguna manera tienes varias copias en ejecución, o tu sistema de forma incorrecta piensa que un archivo está abierto.
+Si este mensaje persiste, reinicia el equipo y vuelve a intentarlo.
+Si persiste, puede que tengas que desinstalar completamente [APP_NAME] y volver a instalarlo.
 	</string>
-	<string name="MBRequiresAltiVec"> [APP_NAME] requires a processor with AltiVec (G4 or later).</string>
+	<string name="MBRequiresAltiVec"> [APP_NAME] requiere un procesador con AltiVec (G4 o posterior).</string>
 	<string name="MBAlreadyRunning">
-		[APP_NAME] is already running.
-Check your task bar for a minimized copy of the program.
-If this message persists, restart your computer.
+		[APP_NAME] ya está siendo ejecutado.
+Revisa tu barra de tareas y busca copia minimizada del programa.
+Si este mensaje persiste, reinicia tu equipo.
 	</string>
 	<string name="MBFrozenCrashed">
-		[APP_NAME] appears to have frozen or crashed on the previous run.
-Would you like to send a crash report?
+		[APP_NAME] parece haberse congelado o sufrido un fallo en la ejecución anterior.
+¿Quieres enviar un reporte de fallos?
 	</string>
-	<string name="MBAlert">Notification</string>
+	<string name="MBAlert">Notificación</string>
 	<string name="MBNoDirectX">
-		[APP_NAME] is unable to detect DirectX 9.0b or greater.
-[APP_NAME] uses DirectX to detect hardware and/or outdated drivers that can cause stability problems, poor performance and crashes.  While you can run [APP_NAME] without it, we highly recommend running with DirectX 9.0b.
+		[APP_NAME] es incapaz de detectar DirectX 9.0b o superior.
+[APP_NAME] usa DirecX para detectar el hardware y/o los controladores desactualizados que pueden causar inestabilidad, pobre rendmiento y caídas. Si bien puedes ejecutar [APP_NAME] sin esto, recomendamos encarecidamente ejecutarlo con DirectX 9.0b.
 
-Do you wish to continue?
+¿Quieres continuar?
 	</string>
-	<string name="MBWarning">Warning</string>
-	<string name="MBRegClassFailed">RegisterClass failed</string>
+	<string name="MBWarning">Cuidado</string>
+	<string name="MBRegClassFailed">Fallo de RegisterClass</string>
 	<string name="MBError">Error</string>
 	<string name="MBFullScreenErr">
-		Unable to run fullscreen at [WIDTH] x [HEIGHT].
-Running in window.
+		Incapaz de ejecutar a pantalla completa en [WIDTH] x [HEIGHT].
+Ejecutando en ventana.
 	</string>
-	<string name="MBDestroyWinFailed">Shutdown Error while destroying window (DestroyWindow() failed)</string>
-	<string name="MBShutdownErr">Shutdown Error</string>
-	<string name="MBDevContextErr">Can't make GL device context</string>
+	<string name="MBDestroyWinFailed">Error de cierre mientras se destruía la ventana (falló DestroyWindow())</string>
+	<string name="MBShutdownErr">Error de Cierre</string>
+	<string name="MBDevContextErr">Imposible crear el contexto de dispositivo GL</string>
 	<string name="MBPixelFmtErr">Can't find suitable pixel format</string>
 	<string name="MBPixelFmtDescErr">Can't get pixel format description</string>
 	<string name="MBTrueColorWindow">
-		[APP_NAME] requires True Color (32-bit) to run.
-Please go to your computer's display settings and set the color mode to 32-bit.
+		[APP_NAME] requiere True Color (32-bit) para ser ejecutado.
+Por favor, ve a la configuración de pantalla de tu equipo y configura el modo de color en 32-bit.
 	</string>
 	<string name="MBAlpha">
-		[APP_NAME] is unable to run because it can't get an 8 bit alpha channel.  Usually this is due to video card driver issues.
-Please make sure you have the latest video card drivers installed.
-Also be sure your monitor is set to True Color (32-bit) in Control Panels &gt; Display &gt; Settings.
-If you continue to receive this message, contact the [SUPPORT_SITE].
+		[APP_NAME] es incapaz de ejecutarse porque no puede obtener un canal alfa de 8 bit.  Usualmente esto ocurre debido a problemas con la tarjeta gráfica.
+Por favor, asegurate que tienes actualizados los controladores de tu tarjeta gráfica.
+Además, asegurate que tu pantalla esta definida en Color Verdadero (32-bit) En el Panel de Control &gt; Pantalla &gt; Configuraciones.
+
+Si continuas recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	</string>
 	<string name="MBPixelFmtSetErr">Can't set pixel format</string>
 	<string name="MBGLContextErr">Can't create GL rendering context</string>
 	<string name="MBGLContextActErr">Can't activate GL rendering context</string>
 	<string name="MBVideoDrvErr">
-		[APP_NAME] is unable to run because your video card drivers did not install properly, are out of date, or are for unsupported hardware. Please make sure you have the latest video card drivers and even if you do have the latest, try reinstalling them.
+		[APP_NAME] es incapaz de ejecutarse porque tu tarjeta gráfica no está instalada correctamente, es obsoleta o no está soportada. Por favor, asegurate que tienes actualizados los controladores de tu tarjeta gráfica, incluso, si están actualizados, intenta reinstalarlos..
 
-If you continue to receive this message, contact the [SUPPORT_SITE].
+Si continuas recibiendo este mensaje, contacta con [SUPPORT_SITE].
 	</string>
 	
-  <string name="group_role_everyone">Everyone</string>
-  <string name="group_role_officers">Officers</string>
-  <string name="group_role_owners">Owners</string>	
-  <string name="group_member_status_online">Online</string>
+  <string name="group_role_everyone">Cualquiera</string>
+  <string name="group_role_officers">Oficiales</string>
+  <string name="group_role_owners">Propietarios</string>	
+  <string name="group_member_status_online">Conectado</string>
   
   <string name="Chat">Chat</string>
 
-  <string name="DefaultMimeType">none/none</string>
+  <string name="DefaultMimeType">ninguno/ninguno</string>
 
  <!-- External editor status codes -->
- <string name="ExternalEditorNotSet">Select an editor using the ExternalEditor setting.</string>
- <string name="ExternalEditorNotFound">Cannot find the external editor you specified.
-Try enclosing path to the editor with double quotes.
-(e.g. "/path to my/editor" "%s")</string>
+ <string name="ExternalEditorNotSet">Escoge un editor usando las configuraciones de Editor Externo.</string>
+ <string name="ExternalEditorNotFound">No se puede hallar el editor externo que has especificado.
+Intenta entrecomillando el camino al editor.
+(P.ej. "/Camino al/editor" "%s")</string>
  <string name="ExternalEditorCommandParseError">Error parsing the external editor command.</string>
  <string name="ExternalEditorFailedToRun">External editor failed to run.</string>
 
diff --git a/indra/newview/skins/default/xui/es/teleport_strings.xml b/indra/newview/skins/default/xui/es/teleport_strings.xml
index 5ac701b36..0f34ccbee 100644
--- a/indra/newview/skins/default/xui/es/teleport_strings.xml
+++ b/indra/newview/skins/default/xui/es/teleport_strings.xml
@@ -1,82 +1,82 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <teleport_messages>
-  <message_set name="errors">
-    <message name="invalid_tport">
-      Ha habido un problema al procesar tu petición de teleporte. Debes volver a iniciar sesión para poder teleportarte. Si te sigue apareciendo este mensaje, revisa, por favor, las preguntas frecuentes en el Soporte técnico:
+	<message_set name="errors">
+		<message name="invalid_tport">
+			Ha habido un problema al procesar tu petición de teleporte. Debes volver a iniciar sesión para poder teleportarte. Si te sigue apareciendo este mensaje, revisa, por favor, las preguntas frecuentes en el Soporte técnico:
 www.secondlife.com/support
-    </message>
-    <message name="invalid_region_handoff">
-      Ha habido un problema al procesar tu paso a otra región. Debes volver a iniciar sesión para poder pasar de región a región. Si te sigue apareciendo este mensaje, revisa, por favor, las preguntas frecuentes en el Soporte técnico:
+		</message>
+		<message name="invalid_region_handoff">
+			Ha habido un problema al procesar tu paso a otra región. Debes volver a iniciar sesión para poder pasar de región a región. Si te sigue apareciendo este mensaje, revisa, por favor, las preguntas frecuentes en el Soporte técnico:
 www.secondlife.com/support      
-    </message>
-    <message name="blocked_tport">
-      Lo sentimos, en estos momentos los teleportes están bloqueados. Vuelve a intentarlo en un momento. Si sigues sin poder teleportarte, desconéctate y vuelve a iniciar sesión para solucionar el problema.      
-    </message>
-    <message name="nolandmark_tport">
-      Lo sentimos, pero el sistema no ha podido localizar el destino de este hito.      
-    </message>
-    <message name="timeout_tport">
-      Lo sentimos, pero el sistema no ha podido completar el teleporte.
+		</message>
+		<message name="blocked_tport">
+			Lo sentimos, en estos momentos los teleportes están bloqueados. Vuelve a intentarlo en un momento. Si sigues sin poder teleportarte, desconéctate y vuelve a iniciar sesión para solucionar el problema.      
+		</message>
+		<message name="nolandmark_tport">
+			Lo sentimos, pero el sistema no ha podido localizar el destino de este hito.      
+		</message>
+		<message name="timeout_tport">
+			Lo sentimos, pero el sistema no ha podido completar el teleporte.
 Vuelve a intentarlo en un momento.
- 	</message>
-    <message name="noaccess_tport">
-      Lo sentimos, pero no tienes acceso al destino de este teleporte.    
- 	</message>
- 	<message name="missing_attach_tport">
-      Aún no han llegado tus objetos anexados. Espera unos segundos más o desconéctate y vuelve a iniciar sesión antes de teleportarte.
+		</message>
+		<message name="noaccess_tport">
+			Lo sentimos, pero no tienes acceso al destino de este teleporte.    
+		</message>
+		<message name="missing_attach_tport">
+			Aún no han llegado tus objetos anexados. Espera unos segundos más o desconéctate y vuelve a iniciar sesión antes de teleportarte.
 		</message>
 		<message name="too_many_uploads_tport">
-			The asset queue in this region is currently clogged so your teleport
-request will not be able to succeed in a timely manner. Please try again
-in a few minutes or go to a less busy area.
+			La cola de espera en esta región está actualmente obstruida, 
+por lo que tu petición de teleporte no se atenderá en un tiempo prudencial. 
+Por favor, vuelve a intentarlo en unos minutos o ve a una zona menos ocupada.		
 		</message>
 		<message name="expired_tport">
-			Sorry, but the system was unable to complete your teleport request
-in a timely fashion. Please try again in a few minutes.
+			Lo sentimos, pero el sistema no ha podido atender a tu petición de teleporte 
+en un tiempo prudencial. Por favor, vuelve a intentarlo en unos pocos minutos.
 		</message>
 		<message name="expired_region_handoff">
-			Sorry, but the system was unable to complete your region crossing
-in a timely fashion. Please try again in a few minutes.
+			Lo sentimos, pero el sistema no ha podido completar tu paso a otra región 
+en un tiempo prudencial. Por favor, vuelve a intentarlo en unos pocos minutos.
 		</message>
 		<message name="no_host">
-			Unable to find teleport destination. The destination may be
-temporarily unavailable or no longer exists. Please try again
-in a few minutes.
+			Ha sido imposible encontrar el destino del teleporte: 
+o está desactivado temporalmente o ya no existe. 
+Por favor, vuelve a intentarlo en unos pocos minutos.
 		</message>
 		<message name="no_inventory_host">
-			The inventory system is currently unavailable.
+			En estos momentos no está disponible el sistema del inventario.
 		</message>
 	</message_set>
 	<message_set name="progress">
 		<message name="sending_dest">
-			Sending to destination.
+			Enviando al destino.
 		</message>
 		<message name="redirecting">
-			Redirecting to different location.
+			Redirigiendo a una ubicación diferente.
 		</message>
 		<message name="relaying">
-			Relaying to destination.
+			Reorientando el destino.
 		</message>
 		<message name="sending_home">
-			Sending home location request.
+			Enviando la petición de posición de la Base.
 		</message>
 		<message name="sending_landmark">
-			Sending landmark location request.
+			Enviando la petición de posición del hito.
 		</message>
 		<message name="completing">
-			Completing teleport.
+			Completando el teleporte.
 		</message>
 		<message name="resolving">
-			Resolving destination.
+			Resolviendo el destino.
 		</message>
 		<message name="contacting">
-			Contacting new region.
+			Contactando con la nueva región.
 		</message>
 		<message name="arriving">
-			Arriving...
+			Llegando...
 		</message>
 		<message name="requesting">
-			Requesting Teleport...
+			Solicitando Teleporte...
 		</message>
 	</message_set>
 </teleport_messages>
diff --git a/indra/newview/skins/default/xui/es/ui_strings.xml b/indra/newview/skins/default/xui/es/ui_strings.xml
index d5c9727f2..375c19bcb 100644
--- a/indra/newview/skins/default/xui/es/ui_strings.xml
+++ b/indra/newview/skins/default/xui/es/ui_strings.xml
@@ -9,9 +9,9 @@
 	<string name="accel-mac-control">Ctrl-</string>
 	<string name="accel-mac-command">Cmd-</string>
 	<string name="accel-mac-option">Opt-</string>
-	<string name="accel-mac-shift">Mayus-</string>
+	<string name="accel-mac-shift">Mayús-</string>
 	<string name="accel-win-control">Ctrl-</string>
 	<string name="accel-win-alt">Alt-</string>
-	<string name="accel-win-shift">Mayus-</string>
+	<string name="accel-win-shift">Mayús-</string>
 
 </strings>
diff --git a/indra/newview/skins/default/xui/es/wlfPanel_AdvSettings_expanded.xml b/indra/newview/skins/default/xui/es/wlfPanel_AdvSettings_expanded.xml
index 381bd0f97..e65851cea 100644
--- a/indra/newview/skins/default/xui/es/wlfPanel_AdvSettings_expanded.xml
+++ b/indra/newview/skins/default/xui/es/wlfPanel_AdvSettings_expanded.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel name="Adv_Settings">
-  <panel filename="panel_bg_tab.xml"/>
-    <slider control_name="RenderFarClip" label="Distancia de Dibujo:" name="DrawDistance" tool_tip="Cambiar la distancia máxima de dibujo"/>
-    <slider control_name="ThrottleBandwidthKBPS" label="Ancho de Banda:" name="max_bandwidth" tool_tip="Definir el ancho de banda de tu conexión en kbps (kilobits por segundos)"/>
-    <slider control_name="RenderMaxPartCount" label="Partículas:" name="MaxParticleCount" tool_tip="Cantidad de Partículas a Renderizar"/>
-    <slider control_name="RenderAvatarMaxVisible" label="Max Avs:" name="RenderAvatarMaxVisible" tool_tip="Cuantos avatares se renderizarán en forma completa. Disminuyendo este valor incrementará los FPS en lugares saturados. Requiere que Avatar Impostors esté activado. [Por Defecto 35]"/>
-    <slider control_name="RenderVolumeLODFactor" label="Detalle de Obj.:" name="Object Detail" tool_tip="Controla el nivel de detalle de los prims (multiplicar por el área de pantalla utilizado para calcular el nivel de detalle[0.5 to 2.0 es un valor  estable])"/>
-    <button name="EnvAdvancedSkyButton" label="" tool_tip="Cielo Avanzado"/>
-    <combo_box name="WLSkyPresetsCombo" tool_tip="WindLight preestablecidos para el cielo."/>
-    <button label="&lt;" name="WLprev"/>
-    <button label="&gt;" name="WLnext"/>
-    <button name="EnvAdvancedWaterButton" label="" tool_tip="Agua Avanzado"/>
-    <combo_box name="WLWaterPresetsCombo" tool_tip="WindLight preestablecido para el Agua."/>
-    <button label="&lt;" name="WWprev"/>
-    <button label="&gt;" name="WWnext"/>
-    <check_box label="Entorno de la Región" control_name="UseEnvironmentFromRegion" name="use_estate_wl" tool_tip="Usar la configuración de entorno de la región/parcela cuando esté disponible."/>
-  <check_box label="¿Siempre?" control_name="UseEnvironmentFromRegionAlways" name="Always" tool_tip="Usar siempre la configuración de la región/parcela, cuando exista, en forma automática."/>
-    <icon image_name="icon_day_cycle.tga"/>
-    <slider control_name="EnvTimeSlider" label=""name="EnvTimeSlider"/>
-    <button label="" name="expand" tool_tip="Ocultar el Panel de Configuraciones""/>
+	<panel filename="panel_bg_tab.xml"/>
+	<slider label="Distancia de Dibujo:" name="DrawDistance" tool_tip="Cambiar la distancia máxima de dibujo"/>
+	<slider label="Ancho de Banda:" name="max_bandwidth" tool_tip="Definir el ancho de banda de tu conexión en kbps (kilobits por segundos)"/>
+	<slider label="Partículas:" name="MaxParticleCount" tool_tip="Cantidad de Partículas a Renderizar"/>
+	<slider label="Max Avs:" name="RenderAvatarMaxVisible" tool_tip="Cuantos avatares se renderizarán en forma completa. Disminuyendo este valor incrementará los FPS en lugares saturados. Requiere que Avatar Impostors esté activado. [Por Defecto 35]"/>
+	<slider label="Detalle de Obj.:" name="Object Detail" tool_tip="Controla el nivel de detalle de los prims (multiplicar por el área de pantalla utilizado para calcular el nivel de detalle[0.5 to 2.0 es un valor  estable])"/>
+	<button name="EnvAdvancedSkyButton" label="" tool_tip="Cielo Avanzado"/>
+	<combo_box name="WLSkyPresetsCombo" tool_tip="WindLight preestablecidos para el cielo."/>
+	<button label="&lt;" name="WLprev"/>
+	<button label="&gt;" name="WLnext"/>
+	<button name="EnvAdvancedWaterButton" label="" tool_tip="Agua Avanzado"/>
+	<combo_box name="WLWaterPresetsCombo" tool_tip="WindLight preestablecido para el Agua."/>
+	<button label="&lt;" name="WWprev"/>
+	<button label="&gt;" name="WWnext"/>
+	<check_box label="Entorno de la Región" control_name="UseEnvironmentFromRegion" name="use_estate_wl" tool_tip="Usar la configuración de entorno de la región/parcela cuando esté disponible."/>
+<!--		<check_box label="¿Siempre?" control_name="UseEnvironmentFromRegionAlways" name="Always" tool_tip="Usar siempre la configuración de la región/parcela, cuando exista, en forma automática."/> -->
+	<check_box label="¿Transición?" name="Crossfade" tool_tip="Si está desmarcado, los cambios del cielo en Windlight se aplicarán inmediatamente, sin transiciones."/>
+	<slider control_name="EnvTimeSlider" label=""name="EnvTimeSlider"/>
+	<button label="" name="expand" tool_tip="Ocultar el Panel de Configuraciones"/>
 </panel>

From abc1d185b789e07cee0c23ed7459d699eb16b538 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Thu, 2 Aug 2012 10:22:01 -0400
Subject: [PATCH 122/199] Gemini keywords update.

---
 indra/newview/skins/gemini/keywords.ini | 312 +++++++++++++-----------
 1 file changed, 174 insertions(+), 138 deletions(-)

diff --git a/indra/newview/skins/gemini/keywords.ini b/indra/newview/skins/gemini/keywords.ini
index bbf8e5a3e..373412a44 100644
--- a/indra/newview/skins/gemini/keywords.ini
+++ b/indra/newview/skins/gemini/keywords.ini
@@ -14,7 +14,7 @@ key				Key type.  Use NULL_KEY to test for empty keys
 vector			Vector type of 3 floats.  Used to represent 3D motion, Euler angles, and color.:Access components by .x, .y. or .z
 rotation		Rotation type of 4 floats.  Used to represent rotation.:Access components by .x, .y., .z, or .w
 list			List of various data types
-quaternion      Rotation type of 4 floats. Used to represent rotation.:Access components by .x, .y, .z, or .w
+quaternion		Rotation type of 4 floats. Used to represent rotation.:Access components by .x, .y, .z, or .w
 
 # events
 [word .47, .62, .91]
@@ -52,7 +52,7 @@ changed			changed( integer change ):Triggered various event change the task:(tes
 remote_data     remote_data(integer event_type, key channel, key message_id, string sender,integer idata, string sdata):Triggered by various XML-RPC calls (event_type will be one of REMOTE_DATA_CHANNEL, REMOTE_DATA_REQUEST, REMOTE_DATA_REPLY)
 http_response   http_response(key request_id, integer status, list metadata, string body):Triggered when task receives a response to one of its llHTTPRequests
 http_request	http_request(key id, string method, string body):Triggered when task receives an http request against a public URL
-transaction_result	transaction_result(key id, integer success, string data):Triggered when task receives asynchronous data.
+transaction_result		transaction_result(key id, integer success, string data):Triggered when task receives asynchronous data.
 path_update		path_update(integer type, list reserved):Triggered when the state of a pathfinder character changes. Note; "list reserved" is not currently used
 
 # integer constants
@@ -70,9 +70,10 @@ STATUS_BLOCK_GRAB_OBJECT This status flag keeps the object from being moved by g
 STATUS_DIE_AT_EDGE Passed in the llSetStatus library function.  If TRUE, objects that reach the edge of the world just die:rather than teleporting back to the owner
 STATUS_RETURN_AT_EDGE Passed in the llSetStatus library function.  If TRUE, script rezzed objects that reach the edge of the world:are returned rather than killed:STATUS_RETURN_AT_EDGE trumps STATUS_DIE_AT_EDGE if both are set
 STATUS_CAST_SHADOWS	Passed in the llSetStatus library function.  If TRUE, object casts shadows on other objects
+
 AGENT			Passed in llSensor library function to look for other Agents; DEPRECATED: Use AGENT_BY_LEGACY_NAME
-AGENT_BY_USERNAME			Passed in llSensor library function to look for other Agents by username
-AGENT_BY_LEGACY_NAME			Passed in llSensor library function to look for other Agents by legacy name
+AGENT_BY_LEGACY_NAME	Passed in llSensor library function to look for other Agents by legacy name
+AGENT_BY_USERNAME	Passed in llSensor library function to look for other Agents by username
 ACTIVE			Passed in llSensor library function to look for moving objects
 PASSIVE			Passed in llSensor library function to look for objects that aren't moving
 SCRIPTED		Passed in llSensor library function to look for scripted objects
@@ -171,10 +172,10 @@ OBJECT_VELOCITY			Used with llGetObjectDetails to get an object's velocity
 OBJECT_OWNER			Used with llGetObjectDetails to get an object's owner's key.  Will be NULL_KEY if group owned
 OBJECT_GROUP			Used with llGetObjectDetails to get an object's group's key
 OBJECT_CREATOR			Used with llGetObjectDetails to get an object's creator's key
-OBJECT_RUNNING_SCRIPT_COUNT			Used with llGetObjectDetails to get an object's velocity.
-OBJECT_TOTAL_SCRIPT_COUNT			Used with llGetObjectDetails to get an object's owner's key.  Will be NULL_KEY if group owned.
-OBJECT_SCRIPT_MEMORY			Used with llGetObjectDetails to get an object's group's key.
-OBJECT_SCRIPT_TIME			Used with llGetObjectDetails to get an object's creator's key.
+OBJECT_RUNNING_SCRIPT_COUNT	Gets the number of running scripts attached to the object or agent
+OBJECT_TOTAL_SCRIPT_COUNT	Gets the number of scripts, both running and stopped, attached to the object or agent.
+OBJECT_SCRIPT_MEMORY		Gets the total amount of script memory allocated to the object or agent, in bytes. 
+OBJECT_SCRIPT_TIME		Gets the total amount of average script CPU time used by the object or agent, in seconds. 
 OBJECT_PRIM_EQUIVALENCE		Gets the prim equivalence of the object.
 OBJECT_SERVER_COST			Used with llGetObjectDetails to get the server cost.
 OBJECT_STREAMING_COST		Used with llGetObjectDetails to get the streaming (download) cost.
@@ -185,8 +186,8 @@ VEHICLE_TYPE_NONE		Used with llSetVehicleType to turn off vehicle support
 VEHICLE_TYPE_SLED		Used with llSetVehicleType to make a simple vehicle that bumps along the ground, and likes to move along its local x-axis
 VEHICLE_TYPE_CAR		Used with llSetVehicleType to make a vehicle that bounces along the ground but needs the motors to be driven from external controls or timer events
 VEHICLE_TYPE_BOAT		Used with llSetVehicleType to make a vehicle that hovers over water with lots of friction and some angular deflection
-VEHICLE_TYPE_AIRPLANE	Used with llSetVehicleType to make a vehicle that uses linear deflection for lift, and banking to turn, but doesn't hover
-VEHICLE_TYPE_BALLOON	Used with llSetVehicleType to make a vehicle that uses hover, and friction, but doesn't use deflection
+VEHICLE_TYPE_AIRPLANE		Used with llSetVehicleType to make a vehicle that uses linear deflection for lift, and banking to turn, but doesn't hover
+VEHICLE_TYPE_BALLOON		Used with llSetVehicleType to make a vehicle that uses hover, and friction, but doesn't use deflection
 
 VEHICLE_REFERENCE_FRAME		Rotation of vehicle axes relative to local frame
 
@@ -289,14 +290,14 @@ ATTACH_LLLEG		Passed to llAttachToAvatar to attach task to left lower leg
 ATTACH_BELLY		Passed to llAttachToAvatar to attach task to belly
 ATTACH_LEFT_PEC		Passed to llAttachToAvatar to attach task to left pectoral
 ATTACH_RIGHT_PEC	Passed to llAttachToAvatar to attach task to right pectoral
+ATTACH_HUD_BOTTOM	Passed to llAttachToAvatar to attach task to bottom hud area
+ATTACH_HUD_BOTTOM_LEFT	Passed to llAttachToAvatar to attach task to bottom left hud area
+ATTACH_HUD_BOTTOM_RIGHT Passed to llAttachToAvatar to attach task to bottom right hud area
+ATTACH_HUD_CENTER_1	Passed to llAttachToAvatar to attach task to center 1 hud area
 ATTACH_HUD_CENTER_2	Passed to llAttachToAvatar to attach task to center 2 hud area
-ATTACH_HUD_TOP_RIGHT	Passed to llAttachToAvatar to attach task to top right hud area
 ATTACH_HUD_TOP_CENTER	Passed to llAttachToAvatar to attach task to top center hud area
 ATTACH_HUD_TOP_LEFT	Passed to llAttachToAvatar to attach task to top left hud area
-ATTACH_HUD_CENTER_1	Passed to llAttachToAvatar to attach task to center 1 hud area
-ATTACH_HUD_BOTTOM_LEFT	Passed to llAttachToAvatar to attach task to bottom left hud area
-ATTACH_HUD_BOTTOM	Passed to llAttachToAvatar to attach task to bottom hud area
-ATTACH_HUD_BOTTOM_RIGHT	Passed to llAttachToAvatar to attach task to bottom right hud area
+ATTACH_HUD_TOP_RIGHT	Passed to llAttachToAvatar to attach task to top right hud area
 ##The following attachment points exist only as numbers thus far, but will be ready when the time comes.
 #ATTACH_NECK		Passed to llAttachToAvatar to attach task to neck
 #ATTACH_ROOT		Passed to llAttachToAvatar to attach task to avatar center/root
@@ -369,29 +370,28 @@ REMOTE_DATA_REPLY	Value of event_type in remote_event if XML-RPC reply is receiv
 PRIM_NAME			For primitive name (from server v1.40 onwards). Followed by a string.
 PRIM_DESC			For primitive description (from server v1.40 onwards). Followed by a string.
 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_SLICE			Get and set the 'slice' parameter of all shapes. Takes a vector parameter of the form <start_slice, end_slice, 0>
-PRIM_PHYSICS_SHAPE_TYPE		For primitive physics shape type. Followed with either PRIM_PHYSICS_SHAPE_PRIM, PRIM_PHYSICS_SHAPE_NONE or PRIM_PHYSICS_SHAPE_CONVEX.
 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		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_TEMP_ON_REZ	Sets temporary 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
 PRIM_POSITION		Sets primitive position to a vector position
-PRIM_POS_LOCAL		Sets the prim's local position
 PRIM_SIZE			Sets primitive size to a vector size
 PRIM_ROTATION		Sets primitive rotation
-PRIM_ROT_LOCAL		Sets the prim's local rotation
+PRIM_TEXT		Used to get or set the object's floating text. 
 PRIM_TEXTURE		Followed by an integer face, key id, vector repeats, vector offsets,:and float rotation in radians
-PRIM_TEXT			For primitive hovertext. Followed by a string, a vector color and a float alpha
 PRIM_COLOR			Followed by an integer face, vector color, and float alpha
 PRIM_BUMP_SHINY		Followed by an integer face, one of PRIM_SHINY_NONE, PRIM_SHINY_LOW,:PRIM_SHINY_MEDIUM, or PRIM_SHINY_HIGH,:and one of PRIM_BUMP_NONE, PRIM_BUMP_BRIGHT, PRIM_BUMP_DARK, etc
 PRIM_FULLBRIGHT		Followed by an integer face, and TRUE or FALSE
 PRIM_TEXGEN			Followed by an integer face, and one of PRIM_TEXGEN_DEFAULT or PRIM_TEXGEN_PLANAR
 PRIM_GLOW			Followed by an integer face, and a float from 0.0 to 1.0 specifying glow amount
-PRIM_OMEGA			Makes the object spin at the specified axis and rate
+PRIM_POS_LOCAL		Sets the prim's local position
+PRIM_ROT_LOCAL		Sets the prim's local rotation
+PRIM_OMEGA		Makes the object spin at the specified axis and rate
 PRIM_LINK_TARGET	Used to get or set multiple links with a single PrimParameters call
+PRIM_SLICE         Get and set the 'slice' parameter of all shapes. Takes a vector parameter of the form <start_slice, end_slice, 0>
 
 PROFILE_NONE		Disables profiling
 PROFILE_SCRIPT_MEMORY	Enables memory profiling
@@ -454,9 +454,10 @@ PRIM_SCULPT_TYPE_MASK		Mask used to determine stitching type
 PRIM_SCULPT_FLAG_INVERT     Flag to specify that the surface normals should be inverted
 PRIM_SCULPT_FLAG_MIRROR     Flag to specify that the prim should be reflected along X axis
 
+PRIM_PHYSICS_SHAPE_TYPE		For primitive physics shape type. Followed with either PRIM_PHYSICS_SHAPE_PRIM, PRIM_PHYSICS_SHAPE_NONE or PRIM_PHYSICS_SHAPE_CONVEX.
 PRIM_PHYSICS_SHAPE_PRIM		Use the normal prim shape for physics (this is the default for all non-mesh objects)
-PRIM_PHYSICS_SHAPE_CONVEX	Ignore this prim in the physics shape. This cannot be applied to the root prim.
 PRIM_PHYSICS_SHAPE_NONE		Use the convex hull of the prim shape for physics (this is the default for mesh objects)
+PRIM_PHYSICS_SHAPE_CONVEX	Ignore this prim in the physics shape. This cannot be applied to the root prim.
 
 MASK_BASE				Base permissions
 MASK_OWNER				Owner permissions
@@ -526,19 +527,13 @@ REGION_FLAG_BLOCK_FLY				Used with llGetRegionFlags to find if a region blocks f
 REGION_FLAG_ALLOW_DIRECT_TELEPORT	Used with llGetRegionFlags to find if a region allows direct teleports
 REGION_FLAG_RESTRICT_PUSHOBJECT		Used with llGetRegionFlags to find if a region restricts llPushObject() calls
 
-ESTATE_ACCESS_ALLOWED_AGENT_ADD		Used with llManageEstateAccess to add an agent to this estate's allowed residents list.
-ESTATE_ACCESS_ALLOWED_AGENT_REMOVE	Used with llManageEstateAccess to remove an agent from this estate's allowed residents list.
-ESTATE_ACCESS_ALLOWED_GROUP_ADD		Used with llManageEstateAccess to add a group to this estate's allowed groups list.
-ESTATE_ACCESS_ALLOWED_GROUP_REMOVE	Used with llManageEstateAccess to remove a group from this estate's allowed groups list.
-ESTATE_ACCESS_BANNED_AGENT_ADD		Used with llManageEstateAccess to add an agent to this estate's banned residents list.
-ESTATE_ACCESS_BANNED_AGENT_REMOVE	Used with llManageEstateAccess to remove an agent from this estate's banned residents list.
-
 HTTP_METHOD                         Used with llHTTPRequest to specify the method, "GET", "POST", "PUT", or "DELETE"
 HTTP_MIMETYPE                       Used with llHTTPRequest to specify the MIME type, defaults to "text/plain"
 HTTP_BODY_MAXLENGTH                 Used with llHTTPRequest to specify the maximum response body to return
 HTTP_VERIFY_CERT                    Used with llHTTPRequest to specify SSL certificate verification
 HTTP_BODY_TRUNCATED                 Used with http_response to indicate truncation point in bytes
 HTTP_VERBOSE_THROTTLE               Used with llHTTPRequest to shout error messages to DEBUG_CHANNEL if the outgoing request rate exceeds the server limit.
+HTTP_BODY_MAXLENGTH                 Used with llHTTPRequest to specify the maximum body size for the date returned from the request. Mono scripts can request from 1byte to 16k, non-mono scripts can request from 1byte to 4k. The default is 2k.
 
 PARCEL_COUNT_TOTAL		Used with llGetParcelPrimCount to get the total number of prims on the parcel
 PARCEL_COUNT_OWNER		Used with llGetParcelPrimCount to get the number of prims on the parcel owned by the owner
@@ -613,7 +608,132 @@ STATUS_NOT_SUPPORTED                   Feature not supported
 STATUS_INTERNAL_ERROR                  An internal error occurred
 STATUS_WHITELIST_FAILED                URL failed to pass whitelist
 
-# windlight constants
+RC_DATA_FLAGS				Option for llCastRay() followed with a bitwise combination of RC_GET_NORMAL, RC_GET_ROOT_KEY and RC_GET_LINK_NUM.
+RC_DETECT_PHANTOM			Option for llCastRay() followed with TRUE to detect phantom AND volume detect objects, FASLE otherwise.
+RC_GET_LINK_NUM				Flag used in the RC_DATA_FLAGS mask to get link numbers in llCastRay() results.
+RC_GET_NORMAL				Flag used in the RC_DATA_FLAGS mask to get hit normals in llCastRay() results.
+RC_GET_ROOT_KEY				Flag used in the RC_DATA_FLAGS mask to get root keys in llCastRay() results.
+RC_MAX_HITS					Option for llCastRay() followed with an integer specifying the maximum number of hits to return (must be <= 256).
+RC_REJECT_TYPES				Option for llCastRay() used to ignore specific types of objects, followed with a bitwise combination of RC_REJECT_AGENTS, RC_REJECT_PHYSICAL, RC_REJECT_NONPHYSICAL and RC_REJECT_LAND.
+RC_REJECT_AGENTS			Flag used in the RC_REJECT_TYPES mask to reject agents in llCastRay().
+RC_REJECT_PHYSICAL			Flag used in the RC_REJECT_TYPES mask to reject physical objects in llCastRay().
+RC_REJECT_NONPHYSICAL		Flag used in the RC_REJECT_TYPES mask to reject non-physical objects in llCastRay().
+RC_REJECT_LAND				Flag used in the RC_REJECT_TYPES mask to reject land in llCastRay().
+
+RCERR_CAST_TIME_EXCEEDED	Returned by llCastRay() when the raycast failed because the parcel or agent has exceeded the maximum time allowed for raycasting.
+RCERR_SIM_PERF_LOW			Returned by llCastRay() when the raycast failed because simulator performance is low.
+RCERR_UNKNOWN				Returned by llCastRay() when the raycast failed for an unspecified reason.
+
+ESTATE_ACCESS_ALLOWED_AGENT_ADD		Used with llManageEstateAccess to add an agent to this estate's allowed residents list.
+ESTATE_ACCESS_ALLOWED_AGENT_REMOVE	Used with llManageEstateAccess to remove an agent from this estate's allowed residents list.
+ESTATE_ACCESS_ALLOWED_GROUP_ADD		Used with llManageEstateAccess to add a group to this estate's allowed groups list.
+ESTATE_ACCESS_ALLOWED_GROUP_REMOVE	Used with llManageEstateAccess to remove a group from this estate's allowed groups list.
+ESTATE_ACCESS_BANNED_AGENT_ADD		Used with llManageEstateAccess to add an agent to this estate's banned residents list.
+ESTATE_ACCESS_BANNED_AGENT_REMOVE	Used with llManageEstateAccess to remove an agent from this estate's banned residents list.
+
+DENSITY 			For use with llSetPhysicsMaterial() as a bitwise value in its material_bits parameter, to set the density.
+FRICTION 			For use with llSetPhysicsMaterial() as a bitwise value in its material_bits parameter, to set the friction.
+RESTITUTION 		For use with llSetPhysicsMaterial() as a bitwise value in its material_bits parameter, to set the restitution.
+GRAVITY_MULTIPLIER 	For use with llSetPhysicsMaterial() as a bitwise value in its material_bits parameter, to set the gravity multiplier.
+
+KFM_COMMAND			Option for llSetKeyframedMotion(), followed by one of KFM_CMD_STOP, KFM_CMD_PLAY, KFM_CMD_PAUSE. Note that KFM_COMMAND must be the only option in the list, and cannot be specified in the same function call that sets the keyframes list.
+KFM_CMD_PLAY		Option for llSetKeyframedMotion(), used after KFM_COMMAND to play the motion.
+KFM_CMD_STOP		Option for llSetKeyframedMotion(), used after KFM_COMMAND to stop the motion.
+KFM_CMD_PAUSE		Option for llSetKeyframedMotion(), used after KFM_COMMAND to pause the motion.
+KFM_CMD_SET_MODE	TODO: add documentation
+KFM_MODE			Option for llSetKeyframedMotion(), used to specify the playback mode, followed by one of KFM_FORWARD, KFM_LOOP, KFM_PING_PONG or KFM_REVERSE.
+KFM_FORWARD			Option for llSetKeyframedMotion(), used after KFM_MODE to specify the forward playback mode.
+KFM_LOOP			Option for llSetKeyframedMotion(), used after KFM_MODE to specify the loop playback mode.
+KFM_PING_PONG		Option for llSetKeyframedMotion(), used after KFM_MODE to specify the ping pong playback mode.
+KFM_REVERSE			Option for llSetKeyframedMotion(), used after KFM_MODE to specify the reverse playback mode.
+KFM_DATA			Option for llSetKeyframedMotion(), followed by a bitwise combination of KFM_TRANSLATION and KFM_ROTATION. If you specify one or the other, you should only include translations or rotations in your keyframe list.
+KFM_ROTATION 		Option for llSetKeyframedMotion(), used after KFM_DATA, possibly as a bitwise combination with KFM_TRANSLATION.
+KFM_TRANSLATION		Option for llSetKeyframedMotion(), used after KFM_DATA, possibly as a bitwise combination with KFM_ROTATION.
+
+CHARACTER_CMD_STOP	TODO: add documentation
+CHARACTER_CMD_JUMP	TODO: add documentation
+
+CHARACTER_DESIRED_SPEED		TODO: add documentation
+CHARACTER_RADIUS			TODO: add documentation
+CHARACTER_LENGTH			TODO: add documentation
+CHARACTER_ORIENTATION		TODO: add documentation
+CHARACTER_AVOIDANCE_MODE	TODO: add documentation
+PURSUIT_OFFSET				TODO: add documentation
+REQUIRE_LINE_OF_SIGHT		TODO: add documentation
+PURSUIT_FUZZ_FACTOR			TODO: add documentation
+PURSUIT_INTERCEPT			TODO: add documentation
+FORCE_DIRECT_PATH			TODO: add documentation
+VERTICAL					TODO: add documentation
+HORIZONTAL					TODO: add documentation
+AVOID_CHARACTERS			TODO: add documentation
+AVOID_DYNAMIC_OBSTACLES		TODO: add documentation
+
+PU_EVADE_HIDDEN                  Triggered when an llEvade character thinks it has hidden from its pursuer.
+PU_EVADE_SPOTTED                 Triggered when an llEvade character switches from hiding to running
+PU_FAILURE_INVALID_GOAL          Goal is not on the navigation-mesh and cannot be reached.
+PU_FAILURE_INVALID_START         Character cannot navigate from the current location - e.g., the character is off the navmesh or too high above it.
+PU_FAILURE_NO_VALID_DESTINATION  There's no good place for the character to go - e.g., it is patrolling and all the patrol points are now unreachable.
+PU_FAILURE_OTHER			     Unknown failure
+PU_FAILURE_TARGET_GONE           Target (for llPursue or llEvade) can no longer be tracked - e.g., it left the region or is an avatar that is now more than about 30m outside the region.
+PU_FAILURE_UNREACHABLE           Goal is no longer reachable for some reason - e.g., an obstacle blocks the path.
+PU_GOAL_REACHED                  Character has reached the goal and will stop or choose a new goal (if wandering).
+PU_SLOWDOWN_DISTANCE_REACHED     Character is near current goal.
+
+CHARACTER_TYPE			TODO: add documentation
+CHARACTER_TYPE_A		TODO: add documentation
+CHARACTER_TYPE_B		TODO: add documentation
+CHARACTER_TYPE_C		TODO: add documentation
+CHARACTER_TYPE_D		TODO: add documentation
+CHARACTER_TYPE_NONE		TODO: add documentation
+
+TRAVERSAL_TYPE			TODO: add documentation
+TRAVERSAL_TYPE_SLOW		TODO: add documentation
+TRAVERSAL_TYPE_FAST		TODO: add documentation
+TRAVERSAL_TYPE_NONE		TODO: add documentation
+
+CHARACTER_MAX_ACCEL				TODO: add documentation
+CHARACTER_MAX_DECEL				TODO: add documentation
+CHARACTER_MAX_ANGULAR_SPEED		TODO: add documentation
+CHARACTER_MAX_ANGULAR_ACCEL		TODO: add documentation
+CHARACTER_TURN_SPEED_MULTIPLIER	TODO: add documentation
+CHARACTER_DESIRED_TURN_SPEED	TODO: add documentation
+CHARACTER_MAX_TURN_RADIUS		TODO: add documentation
+# --- OpenSim and Aurora-Sim constants Below ---
+# OpenSim Constants (\OpenSim\Region\ScriptEngine\Shared\Api\Runtime\LSL_Constants.cs)
+# Constants for cmWindlight (\OpenSim\Region\ScriptEngine\Shared\Api\Runtime\CM_Constants.cs)
+CHANGED_ANIMATION           OpenSim change event animation change detection.
+# osGetRegionStats
+STATS_TIME_DILATION      returned value from osGetRegionStats(), 1st of 21 items in returned list.
+STATS_SIM_FPS	         returned value from osGetRegionStats(), 2nd of 21 items in returned list.
+STATS_PHYSICS_FPS	     returned value from osGetRegionStats(), 3rd of 21 items in returned list.
+STATS_AGENT_UPDATES      returned value from osGetRegionStats(), 4th of 21 items in returned list.
+STATS_ROOT_AGENTS 	     returned value from osGetRegionStats(), 5th of 21 items in returned list.
+STATS_CHILD_AGENTS 	     returned value from osGetRegionStats(), 6th of 21 items in returned list.
+STATS_TOTAL_PRIMS 	     returned value from osGetRegionStats(), 7th of 21 items in returned list.
+STATS_ACTIVE_PRIMS 	     returned value from osGetRegionStats(), 8th of 21 items in returned list.
+STATS_FRAME_MS 	         returned value from osGetRegionStats(), 9th of 21 items in returned list.
+STATS_NET_MS 	         returned value from osGetRegionStats(), 10th of 21 items in returned list.
+STATS_PHYSICS_MS 	     returned value from osGetRegionStats(), 11th of 21 items in returned list.
+STATS_IMAGE_MS 	         returned value from osGetRegionStats(), 12th of 21 items in returned list.
+STATS_OTHER_MS 	         returned value from osGetRegionStats(), 13th of 21 items in returned list.
+STATS_IN_PACKETS_PER_SECOND   returned value from osGetRegionStats(), 14th of 21 items in returned list.
+STATS_OUT_PACKETS_PER_SECOND  returned value from osGetRegionStats(), 15th of 21 items in returned list.
+STATS_UNACKED_BYTES      returned value from osGetRegionStats(), 16th of 21 items in returned list.
+STATS_AGENT_MS	         returned value from osGetRegionStats(), 17th of 21 items in returned list.
+STATS_PENDING_DOWNLOADS	 returned value from osGetRegionStats(), 18th of 21 items in returned list.
+STATS_PENDING_UPLOADS	 returned value from osGetRegionStats(), 19th of 21 items in returned list.
+STATS_ACTIVE_SCRIPTS	 returned value from osGetRegionStats(), 20th of 21 items in returned list.
+STATS_SCRIPT_LPS	     returned value from osGetRegionStats(), 21st of 21 items in returned list.
+# OpenSim NPC
+OS_NPC_FLY	            used by osNPC.
+OS_NPC_NO_FLY	        used by osNPC.
+OS_NPC_LAND_AT_TARGET   used by osNPC.
+OS_NPC_SIT_NOW	        used by osNPC.
+OS_NPC_CREATOR_OWNED    used by osNPC.
+OS_NPC_NOT_OWNED	    used by osNPC.
+OS_NPC_SENSE_AS_AGENT   used by osNPC.
+OS_NPC_RUNNING          used by osNPC.
+# Windlight/Lightshare
 WL_WATER_COLOR					Windlight Water Colour
 WL_WATER_FOG_DENSITY_EXPONENT	Windlight Water Fog Density Exponent
 WL_UNDERWATER_FOG_MODIFIER		Windlight Underwater Fog Modifier
@@ -651,112 +771,28 @@ WL_CLOUD_SCROLL_Y				Windlight Cloud Scroll Y
 WL_CLOUD_SCROLL_Y_LOCK			Windlight Cloud Scroll Y Lock
 WL_CLOUD_SCROLL_X_LOCK			Windlight Cloud Scroll X Lock
 WL_DRAW_CLASSIC_CLOUDS			Windlight Draw Classic Clouds
-
-# keyframe constants
-KFM_COMMAND			Option for llSetKeyframedMotion(), followed by one of KFM_CMD_STOP, KFM_CMD_PLAY, KFM_CMD_PAUSE. Note that KFM_COMMAND must be the only option in the list, and cannot be specified in the same function call that sets the keyframes list.
-KFM_MODE			Option for llSetKeyframedMotion(), used to specify the playback mode, followed by one of KFM_FORWARD, KFM_LOOP, KFM_PING_PONG or KFM_REVERSE.
-KFM_DATA			Option for llSetKeyframedMotion(), followed by a bitwise combination of KFM_TRANSLATION and KFM_ROTATION. If you specify one or the other, you should only include translations or rotations in your keyframe list.
-KFM_FORWARD			Option for llSetKeyframedMotion(), used after KFM_MODE to specify the forward playback mode.
-KFM_LOOP			Option for llSetKeyframedMotion(), used after KFM_MODE to specify the loop playback mode.
-KFM_PING_PONG		Option for llSetKeyframedMotion(), used after KFM_MODE to specify the ping pong playback mode.
-KFM_REVERSE			Option for llSetKeyframedMotion(), used after KFM_MODE to specify the reverse playback mode.
-KFM_ROTATION 		Option for llSetKeyframedMotion(), used after KFM_DATA, possibly as a bitwise combination with KFM_TRANSLATION.
-KFM_TRANSLATION		Option for llSetKeyframedMotion(), used after KFM_DATA, possibly as a bitwise combination with KFM_ROTATION.
-KFM_CMD_PLAY		Option for llSetKeyframedMotion(), used after KFM_COMMAND to play the motion.
-KFM_CMD_STOP		Option for llSetKeyframedMotion(), used after KFM_COMMAND to stop the motion.
-KFM_CMD_PAUSE		Option for llSetKeyframedMotion(), used after KFM_COMMAND to pause the motion.
-
-# OSSL constants
-STATS_TIME_DILATION
-STATS_SIM_FPS
-STATS_PHYSICS_FPS
-STATS_AGENT_UPDATES
-STATS_ROOT_AGENTS
-STATS_CHILD_AGENTS
-STATS_TOTAL_PRIMS
-STATS_ACTIVE_PRIMS
-STATS_FRAME_MS
-STATS_NET_MS
-STATS_PHYSICS_MS
-STATS_IMAGE_MS
-STATS_OTHER_MS
-STATS_IN_PACKETS_PER_SECOND
-STATS_OUT_PACKETS_PER_SECOND
-STATS_UNACKED_BYTES
-STATS_AGENT_MS
-STATS_PENDING_DOWNLOADS
-STATS_PENDING_UPLOADS
-STATS_ACTIVE_SCRIPTS
-STATS_SCRIPT_LPS
-
-## Constants for osNpc* functions
-NPC
-OS_NPC_CREATOR_OWNED
-OS_NPC_NOT_OWNED
-OS_NPC_SENSE_AS_AGENT
-OS_NPC_FLY
-OS_NPC_NO_FLY
-OS_NPC_LAND_AT_TARGET
-OS_NPC_SIT_NOW
-
-## Missing LSL constants (from http://wiki.secondlife.com/wiki/Category:LSL_Constants)
-
-# physics constants
-DENSITY						For use with llSetPhysicsMaterial() as a bitwise value in its material_bits parameter, to set the density.
-FRICTION					For use with llSetPhysicsMaterial() as a bitwise value in its material_bits parameter, to set the friction.
-RESTITUTION					For use with llSetPhysicsMaterial() as a bitwise value in its material_bits parameter, to set the restitution.
-GRAVITY_MULTIPLIER			For use with llSetPhysicsMaterial() as a bitwise value in its material_bits parameter, to set the gravity multiplier.
-
-##Even more missing constants, thanks to Justin Clark Casey for pointing me into the right direction
-##Liru: Were these supposed to be LSL? They're undocumented, commenting out for now.
-#CAMERA_FOCUS_OFFSET_X
-#CAMERA_FOCUS_OFFSET_Y
-#CAMERA_FOCUS_OFFSET_Z
-#CAMERA_FOCUS_X
-#CAMERA_FOCUS_Y
-#CAMERA_FOCUS_Z
-#CAMERA_POSITION_X
-#CAMERA_POSITION_Y
-#CAMERA_POSITION_Z
-#CHANGED_ANIMATION
-#CHANGED_REGION_RESTART
-#DATA_SIM_RELEASE
-#LIST_STAT_HARMONIC_MEAN
-#PARCEL_DETAILS_CLAIMDATE
-#VEHICLE_FLAG_LOCK_HOVER_HEIGHT
-#VEHICLE_FLAG_LOCK_ROTATION
-#VEHICLE_FLAG_NO_X
-#VEHICLE_FLAG_NO_Y
-#VEHICLE_FLAG_NO_Z
-#VEHICLE_RANGE_BLOCK
-#VEHICLE_ROLL_FRAME
-#LSL_STATUS_BOUNDS_ERROR
-#LSL_STATUS_INTERNAL_ERROR
-#LSL_STATUS_MALFORMED_PARAMS
-#LSL_STATUS_NOT_FOUND
-#LSL_STATUS_NOT_SUPPORTED
-#LSL_STATUS_OK
-#LSL_STATUS_TYPE_MISMATCH
-#LSL_STATUS_WHITELIST_FAILED
-
-# castray constants
-RCERR_UNKNOWN				Returned by llCastRay() when the raycast failed for an unspecified reason.
-RCERR_SIM_PERF_LOW			Returned by llCastRay() when the raycast failed because simulator performance is low.
-RCERR_CAST_TIME_EXCEEDED	Returned by llCastRay() when the raycast failed because the parcel or agent has exceeded the maximum time allowed for raycasting.
-
-RC_REJECT_TYPES				Option for llCastRay() used to ignore specific types of objects, followed with a bitwise combination of RC_REJECT_AGENTS, RC_REJECT_PHYSICAL, RC_REJECT_NONPHYSICAL and RC_REJECT_LAND.
-RC_DETECT_PHANTOM			Option for llCastRay() followed with TRUE to detect phantom AND volume detect objects, FASLE otherwise.
-RC_DATA_FLAGS				Option for llCastRay() followed with a bitwise combination of RC_GET_NORMAL, RC_GET_ROOT_KEY and RC_GET_LINK_NUM.
-RC_MAX_HITS					Option for llCastRay() followed with an integer specifying the maximum number of hits to return (must be <= 256).
-
-RC_REJECT_AGENTS			Flag used in the RC_REJECT_TYPES mask to reject agents in llCastRay().
-RC_REJECT_PHYSICAL			Flag used in the RC_REJECT_TYPES mask to reject physical objects in llCastRay().
-RC_REJECT_NONPHYSICAL		Flag used in the RC_REJECT_TYPES mask to reject non-physical objects in llCastRay().
-RC_REJECT_LAND				Flag used in the RC_REJECT_TYPES mask to reject land in llCastRay().
-
-RC_GET_NORMAL				Flag used in the RC_DATA_FLAGS mask to get hit normals in llCastRay() results.
-RC_GET_ROOT_KEY				Flag used in the RC_DATA_FLAGS mask to get root keys in llCastRay() results.
-RC_GET_LINK_NUM				Flag used in the RC_DATA_FLAGS mask to get link numbers in llCastRay() results.
+# Aurora-Sim Constants  (\Aurora\AuroraDotNetEngine\APIs\AA_Constants.cs) -->
+ENABLE_GRAVITY	                enable_gravity.
+GRAVITY_FORCE_X	                gravity_force_x.
+GRAVITY_FORCE_Y	                gravity_force_y.
+GRAVITY_FORCE_Z	                gravity_force_z.
+ADD_GRAVITY_POINT	            add_gravity_point.
+ADD_GRAVITY_FORCE	            add_gravity_force.
+START_TIME_REVERSAL_SAVING	    start_time_reversal_saving.
+STOP_TIME_REVERSAL_SAVING	    stop_time_reversal_saving.
+START_TIME_REVERSAL	            start_time_reversal.
+STOP_TIME_REVERSAL	            stop_time_reversal.
+# Aurora botFunctions
+BOT_FOLLOW_FLAG_NONE	        value 0.
+BOT_FOLLOW_FLAG_INDEFINITELY    value 1.
+BOT_TAG_FIND_ALL	            value AllBots.
+BOT_FOLLOW_WALK	                value 0.
+BOT_FOLLOW_RUN	                value 1.
+BOT_FOLLOW_FLY	                value 2.
+BOT_FOLLOW_TELEPORT	            value 3.
+BOT_FOLLOW_WAIT	                value 4.
+BOT_FOLLOW_TRIGGER_HERE_EVENT	value 1.
+BOT_FOLLOW_FLAG_FORCEDIRECTPATH value 4.
 
 # string constants
 [word .48, .72, .84]
@@ -797,7 +833,7 @@ jump				jump statement:jump label;:
 return				Leave current function or event handler
 
 # flow control label
-[word .47, .62, .91]
+[line .47, .62, .91]
 @					Label:Target for jump statement
 
 # Comment

From 2c65da3397d3248e0fe8a15f48ea64430105bdc5 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Thu, 2 Aug 2012 15:50:20 -0400
Subject: [PATCH 123/199] Make viewer_manifest.py smarter.

Use newlines as delimiter to avoid strange characters and spaces breaking xargs.
---
 indra/newview/viewer_manifest.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index e595d9e13..bfa82b9eb 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -740,8 +740,8 @@ class LinuxManifest(ViewerManifest):
         if self.args['buildtype'].lower() in ['release', 'releasesse2']:
             print "* Going strip-crazy on the packaged binaries, since this is a RELEASE build"
             # makes some small assumptions about our packaged dir structure
-            self.run_command("find %(d)r/bin %(d)r/lib* -type f | xargs --no-run-if-empty strip --strip-unneeded" % {'d': self.get_dst_prefix()} )
-            self.run_command("find %(d)r/bin %(d)r/lib* -type f -not -name \\*.so | xargs --no-run-if-empty strip -s" % {'d': self.get_dst_prefix()} )
+            self.run_command("find %(d)r/bin %(d)r/lib* -type f | xargs -d '\n' --no-run-if-empty strip --strip-unneeded" % {'d': self.get_dst_prefix()} )
+            self.run_command("find %(d)r/bin %(d)r/lib* -type f -not -name \\*.so | xargs -d '\n' --no-run-if-empty strip -s" % {'d': self.get_dst_prefix()} )
 
         # Fix access permissions
         self.run_command("""

From 4650636e5aefa3275991f9e574dc82b0d9304b64 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Thu, 2 Aug 2012 22:33:01 +0200
Subject: [PATCH 124/199] Use TCP socket pair instead of UDP

---
 indra/llmessage/aicurlthread.cpp | 240 ++++++++++++++++++++-----------
 1 file changed, 158 insertions(+), 82 deletions(-)

diff --git a/indra/llmessage/aicurlthread.cpp b/indra/llmessage/aicurlthread.cpp
index ea1c4b5ba..59457c54d 100644
--- a/indra/llmessage/aicurlthread.cpp
+++ b/indra/llmessage/aicurlthread.cpp
@@ -763,10 +763,7 @@ class AICurlThread : public LLThread
 	void create_wakeup_fds(void);
 	void cleanup_wakeup_fds(void);
 
-#if !WINDOWS_CODE
-	//On Windows, single socket is used for communicating with itself! -SG
 	curl_socket_t mWakeUpFd_in;
-#endif
 	curl_socket_t mWakeUpFd;
 
 	int mZeroTimeOut;
@@ -779,9 +776,7 @@ AICurlThread* AICurlThread::sInstance = NULL;
 
 // MAIN-THREAD
 AICurlThread::AICurlThread(void) : LLThread("AICurlThread"),
-#if !WINDOWS_CODE
     mWakeUpFd_in(CURL_SOCKET_BAD),
-#endif
 	mWakeUpFd(CURL_SOCKET_BAD),
 	mZeroTimeOut(0), mRunning(true), mWakeUpFlag(false)
 {
@@ -796,7 +791,7 @@ AICurlThread::~AICurlThread()
   cleanup_wakeup_fds();
 }
 
-#if WINDOWS_CODE
+#if LL_WINDOWS
 static std::string formatWSAError()
 {
 	std::ostringstream r;
@@ -807,11 +802,7 @@ static std::string formatWSAError()
 		FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
 		NULL, e, 0, (LPTSTR)&error_str, 0, NULL))
 	{
-#if LL_LINUX
-		r << " " << error_str;
-#else
 		r << " " << utf16str_to_utf8str(error_str);
-#endif
 		LocalFree(error_str);
 	}
 	else
@@ -820,58 +811,112 @@ static std::string formatWSAError()
 	}
 	return r.str();
 }
+#else if WINDOWS_CODE
+static std::string formatWSAError()
+{
+	return "NOT IMPLEMENTED";
+}
+#endif
+
+#if LL_WINDOWS
+ /* Copyright 2007, 2010 by Nathan C. Myers <ncm@cantrip.org>
+ * This code is Free Software.  It may be copied freely, in original or 
+ * modified form, subject only to the restrictions that (1) the author is
+ * relieved from all responsibilities for any use for any purpose, and (2)
+ * this copyright notice must be retained, unchanged, in its entirety.  If
+ * for any reason the author might be held responsible for any consequences
+ * of copying or use, license is withheld.  
+ */
+static int dumb_socketpair(SOCKET socks[2], bool make_overlapped)
+{
+    union {
+       struct sockaddr_in inaddr;
+       struct sockaddr addr;
+    } a;
+    SOCKET listener;
+    int e;
+    socklen_t addrlen = sizeof(a.inaddr);
+    DWORD flags = (make_overlapped ? WSA_FLAG_OVERLAPPED : 0);
+    int reuse = 1;
+
+    if (socks == 0) {
+      WSASetLastError(WSAEINVAL);
+      return SOCKET_ERROR;
+    }
+
+    listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    if (listener == INVALID_SOCKET) 
+        return SOCKET_ERROR;
+
+    memset(&a, 0, sizeof(a));
+    a.inaddr.sin_family = AF_INET;
+    a.inaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+    a.inaddr.sin_port = 0; 
+
+    socks[0] = socks[1] = INVALID_SOCKET;
+    do {
+        if (setsockopt(listener, SOL_SOCKET, SO_REUSEADDR, 
+               (char*) &reuse, (socklen_t) sizeof(reuse)) == -1)
+            break;
+        if  (bind(listener, &a.addr, sizeof(a.inaddr)) == SOCKET_ERROR)
+            break;
+
+        memset(&a, 0, sizeof(a));
+        if  (getsockname(listener, &a.addr, &addrlen) == SOCKET_ERROR)
+            break;
+        // win32 getsockname may only set the port number, p=0.0005.
+        // ( http://msdn.microsoft.com/library/ms738543.aspx ):
+        a.inaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+        a.inaddr.sin_family = AF_INET;
+
+        if (listen(listener, 1) == SOCKET_ERROR)
+            break;
+
+        socks[0] = WSASocket(AF_INET, SOCK_STREAM, 0, NULL, 0, flags);
+        if (socks[0] == INVALID_SOCKET)
+            break;
+        if (connect(socks[0], &a.addr, sizeof(a.inaddr)) == SOCKET_ERROR)
+            break;
+
+        socks[1] = accept(listener, NULL, NULL);
+        if (socks[1] == INVALID_SOCKET)
+            break;
+
+        closesocket(listener);
+        return 0;
+
+    } while (0);
+
+    e = WSAGetLastError();
+    closesocket(listener);
+    closesocket(socks[0]);
+    closesocket(socks[1]);
+    WSASetLastError(e);
+    return SOCKET_ERROR;
+}
+#else
+int dumb_socketpair(int socks[2], int dummy)
+{
+    (void) dummy;
+    return socketpair(AF_LOCAL, SOCK_STREAM, 0, socks);
+}
 #endif
 
 // MAIN-THREAD
 void AICurlThread::create_wakeup_fds(void)
 {
 #if WINDOWS_CODE
-#if LL_LINUX
-  mWakeUpFd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-#else
-  mWakeUpFd = WSASocket(AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, 0, 0);
-#endif
-  if(mWakeUpFd == INVALID_SOCKET)
-  {
-	  llerrs << "Failed to create wake-up socket: " << formatWSAError() << llendl;
-  }
-  int error;
-  sockaddr_in addr;
-  memset(&addr, 0, sizeof(addr));
-  addr.sin_family = AF_INET;
-  addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-#if LL_LINUX
-  socklen_t addrlen = sizeof(addr);
-#else
-  int addrlen = sizeof(addr);
-#endif
-  error = bind(mWakeUpFd, (sockaddr*) &addr, addrlen);
-  if(error)
-  {
-	  llerrs << "Failed to bind wake-up socket: " << formatWSAError() << llendl;
-  }
-  error = getsockname(mWakeUpFd, (sockaddr*) &addr, &addrlen);
-  if(error)
-  {
-	  llerrs << "Failed to detect wake-up socket: " << formatWSAError() << llendl;
-  }
-  error = connect(mWakeUpFd, (sockaddr*) &addr, addrlen);
-  if(error)
-  {
-	  llerrs << "Failed to connect wake-up socket: " <<formatWSAError() << llendl;
-  }
-#if LL_LINUX
-  long flags = O_NONBLOCK;
-  error = fcntl(mWakeUpFd, F_SETFL, flags);
-#else
-  u_long nonblocking_enable = TRUE;
-  error = ioctlsocket(mWakeUpFd, FIONBIO, &nonblocking_enable);
-#endif
-  if(error)
-  {
-	  llerrs << "Failed to set wake-up socket nonblocking: " << formatWSAError() << llendl;
-  }
-
+	//SGTODO
+	SOCKET socks[2];
+	if (dumb_socketpair(socks, false) == SOCKET_ERROR)
+	{
+		llerrs << "Failed to generate wake-up socket pair" << formatWSAError() << llendl;
+	}
+	else
+	{
+		mWakeUpFd = socks[0];
+		mWakeUpFd_in = socks[1];
+	}
 #else
   int pipefd[2];
   if (pipe(pipefd))
@@ -895,14 +940,23 @@ void AICurlThread::create_wakeup_fds(void)
 void AICurlThread::cleanup_wakeup_fds(void)
 {
 #if WINDOWS_CODE
-  if (mWakeUpFd != CURL_SOCKET_BAD)
-  {
-	int error = closesocket(mWakeUpFd);
-	if (error)
+	//SGTODO
+	if (mWakeUpFd != CURL_SOCKET_BAD)
 	{
-		llwarns << "Error closing wake-up socket" << formatWSAError() << llendl;
+		int error = closesocket(mWakeUpFd);
+		if (error)
+		{
+			llwarns << "Error closing wake-up socket" << formatWSAError() << llendl;
+		}
+	}
+	if (mWakeUpFd_in != CURL_SOCKET_BAD)
+	{
+		int error = closesocket(mWakeUpFd_in);
+		if (error)
+		{
+			llwarns << "Error closing wake-up input socket" << formatWSAError() << llendl;
+		}
 	}
-  }
 #else
   if (mWakeUpFd_in != CURL_SOCKET_BAD)
 	close(mWakeUpFd_in);
@@ -927,11 +981,15 @@ void AICurlThread::wakeup_thread(void)
 
 #if WINDOWS_CODE
   //SGTODO
-  int len = send(mWakeUpFd, "!", 1, 0);
+  Dout(dc::curl, "ENTERING send()");
+  int len = send(mWakeUpFd_in, "!", 1, 0);
+  Dout(dc::curl, "LEAVING send()");
   if (len == SOCKET_ERROR)
   {
 	  llerrs << "Send to wake-up socket failed: " << formatWSAError() << llendl;
   }
+  llassert_always(len == 1);
+  //SGTODO: handle EAGAIN if needed
   llinfos << "Sent wakeup signal" << llendl;
 #else
   // If write() is interrupted by a signal before it writes any data, it shall return -1 with errno set to [EINTR].
@@ -962,31 +1020,49 @@ void AICurlThread::wakeup(AICurlMultiHandle_wat const& multi_handle_w)
   DoutEntering(dc::curl, "AICurlThread::wakeup");
 
 #if WINDOWS_CODE
-  char buf;
-  int len;
+  //SGTODO
+  char buf[256];
   bool got_data = false;
-  do
+  for(;;)
   {
-	  len = recv(mWakeUpFd, &buf, sizeof(buf), 0);
-	  llinfos << "recv returns " << len << llendl;
-	  if(len != SOCKET_ERROR)
+	int len = recv(mWakeUpFd, buf, sizeof(buf), 0);
+	if (len > 0)
+	{
+	  // Data was read from the pipe.
+	  got_data = true;
+	  if (len < sizeof(buf))
+		break;
+	}
+	else if (len == SOCKET_ERROR)
+	{
+	  // An error occurred.
+	  if (errno == EWOULDBLOCK)
 	  {
-		  got_data = true;
-		  llinfos << "Received wakeup signal" << llendl;
+		if (got_data)
+		  break;
+		// There was no data, even though select() said so. If this ever happens at all(?), lets just return and enter select() again.
+		return;
 	  }
-  } while(len != SOCKET_ERROR);
-  int error = WSAGetLastError();
-  llinfos << "left loop, errorlevel " << error << llendl;
-  if(error != WSAEWOULDBLOCK)
-  {
-	  llerrs << "Wake-up socket drain error: " << formatWSAError() << llendl;
-  }
-  if(!got_data)
-  {
-	  llinfos << "Wakeup called but socket is empty" << llendl;
+	  else if (errno == EINTR)
+	  {
+		continue;
+	  }
+	  else
+	  {
+		llerrs << "read(3) from mWakeUpFd: " << formatWSAError() << llendl;
+		return;
+	  }
+	}
+	else
+	{
+	  // pipe(2) returned 0.
+	  llwarns << "read(3) from mWakeUpFd returned 0, indicating that the pipe on the other end was closed! Shutting down curl thread." << llendl;
+	  closesocket(mWakeUpFd);
+	  mWakeUpFd = CURL_SOCKET_BAD;
+	  mRunning = false;
 	  return;
+	}
   }
-  llinfos << "Passing control to process_commands" << llendl;
 #else
   // If a read() is interrupted by a signal before it reads any data, it shall return -1 with errno set to [EINTR].
   // If a read() is interrupted by a signal after it has successfully read some data, it shall return the number of bytes read.

From 08d72b12abf60486647add8578a33fd808b3b695 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Thu, 2 Aug 2012 23:03:03 +0200
Subject: [PATCH 125/199] Fix compilation on linux. Remove trailing ^M's

---
 indra/llmessage/aicurlthread.cpp | 160 +++++++++++++++----------------
 1 file changed, 80 insertions(+), 80 deletions(-)

diff --git a/indra/llmessage/aicurlthread.cpp b/indra/llmessage/aicurlthread.cpp
index 59457c54d..98116398f 100644
--- a/indra/llmessage/aicurlthread.cpp
+++ b/indra/llmessage/aicurlthread.cpp
@@ -811,94 +811,94 @@ static std::string formatWSAError()
 	}
 	return r.str();
 }
-#else if WINDOWS_CODE
+#elif WINDOWS_CODE
 static std::string formatWSAError()
 {
-	return "NOT IMPLEMENTED";
+	return strerror(errno);
 }
 #endif
 
 #if LL_WINDOWS
- /* Copyright 2007, 2010 by Nathan C. Myers <ncm@cantrip.org>
- * This code is Free Software.  It may be copied freely, in original or 
- * modified form, subject only to the restrictions that (1) the author is
- * relieved from all responsibilities for any use for any purpose, and (2)
- * this copyright notice must be retained, unchanged, in its entirety.  If
- * for any reason the author might be held responsible for any consequences
- * of copying or use, license is withheld.  
+ /* Copyright 2007, 2010 by Nathan C. Myers <ncm@cantrip.org>
+ * This code is Free Software.  It may be copied freely, in original or 
+ * modified form, subject only to the restrictions that (1) the author is
+ * relieved from all responsibilities for any use for any purpose, and (2)
+ * this copyright notice must be retained, unchanged, in its entirety.  If
+ * for any reason the author might be held responsible for any consequences
+ * of copying or use, license is withheld.  
  */
-static int dumb_socketpair(SOCKET socks[2], bool make_overlapped)
-{
-    union {
-       struct sockaddr_in inaddr;
-       struct sockaddr addr;
-    } a;
-    SOCKET listener;
-    int e;
-    socklen_t addrlen = sizeof(a.inaddr);
-    DWORD flags = (make_overlapped ? WSA_FLAG_OVERLAPPED : 0);
-    int reuse = 1;
-
-    if (socks == 0) {
-      WSASetLastError(WSAEINVAL);
-      return SOCKET_ERROR;
-    }
-
-    listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    if (listener == INVALID_SOCKET) 
-        return SOCKET_ERROR;
-
-    memset(&a, 0, sizeof(a));
-    a.inaddr.sin_family = AF_INET;
-    a.inaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-    a.inaddr.sin_port = 0; 
-
-    socks[0] = socks[1] = INVALID_SOCKET;
-    do {
-        if (setsockopt(listener, SOL_SOCKET, SO_REUSEADDR, 
-               (char*) &reuse, (socklen_t) sizeof(reuse)) == -1)
-            break;
-        if  (bind(listener, &a.addr, sizeof(a.inaddr)) == SOCKET_ERROR)
-            break;
-
-        memset(&a, 0, sizeof(a));
-        if  (getsockname(listener, &a.addr, &addrlen) == SOCKET_ERROR)
-            break;
-        // win32 getsockname may only set the port number, p=0.0005.
-        // ( http://msdn.microsoft.com/library/ms738543.aspx ):
-        a.inaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-        a.inaddr.sin_family = AF_INET;
-
-        if (listen(listener, 1) == SOCKET_ERROR)
-            break;
-
-        socks[0] = WSASocket(AF_INET, SOCK_STREAM, 0, NULL, 0, flags);
-        if (socks[0] == INVALID_SOCKET)
-            break;
-        if (connect(socks[0], &a.addr, sizeof(a.inaddr)) == SOCKET_ERROR)
-            break;
-
-        socks[1] = accept(listener, NULL, NULL);
-        if (socks[1] == INVALID_SOCKET)
-            break;
-
-        closesocket(listener);
-        return 0;
-
-    } while (0);
-
-    e = WSAGetLastError();
-    closesocket(listener);
-    closesocket(socks[0]);
-    closesocket(socks[1]);
-    WSASetLastError(e);
-    return SOCKET_ERROR;
+static int dumb_socketpair(SOCKET socks[2], bool make_overlapped)
+{
+    union {
+       struct sockaddr_in inaddr;
+       struct sockaddr addr;
+    } a;
+    SOCKET listener;
+    int e;
+    socklen_t addrlen = sizeof(a.inaddr);
+    DWORD flags = (make_overlapped ? WSA_FLAG_OVERLAPPED : 0);
+    int reuse = 1;
+
+    if (socks == 0) {
+      WSASetLastError(WSAEINVAL);
+      return SOCKET_ERROR;
+    }
+
+    listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    if (listener == INVALID_SOCKET) 
+        return SOCKET_ERROR;
+
+    memset(&a, 0, sizeof(a));
+    a.inaddr.sin_family = AF_INET;
+    a.inaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+    a.inaddr.sin_port = 0; 
+
+    socks[0] = socks[1] = INVALID_SOCKET;
+    do {
+        if (setsockopt(listener, SOL_SOCKET, SO_REUSEADDR, 
+               (char*) &reuse, (socklen_t) sizeof(reuse)) == -1)
+            break;
+        if  (bind(listener, &a.addr, sizeof(a.inaddr)) == SOCKET_ERROR)
+            break;
+
+        memset(&a, 0, sizeof(a));
+        if  (getsockname(listener, &a.addr, &addrlen) == SOCKET_ERROR)
+            break;
+        // win32 getsockname may only set the port number, p=0.0005.
+        // ( http://msdn.microsoft.com/library/ms738543.aspx ):
+        a.inaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+        a.inaddr.sin_family = AF_INET;
+
+        if (listen(listener, 1) == SOCKET_ERROR)
+            break;
+
+        socks[0] = WSASocket(AF_INET, SOCK_STREAM, 0, NULL, 0, flags);
+        if (socks[0] == INVALID_SOCKET)
+            break;
+        if (connect(socks[0], &a.addr, sizeof(a.inaddr)) == SOCKET_ERROR)
+            break;
+
+        socks[1] = accept(listener, NULL, NULL);
+        if (socks[1] == INVALID_SOCKET)
+            break;
+
+        closesocket(listener);
+        return 0;
+
+    } while (0);
+
+    e = WSAGetLastError();
+    closesocket(listener);
+    closesocket(socks[0]);
+    closesocket(socks[1]);
+    WSASetLastError(e);
+    return SOCKET_ERROR;
 }
 #else
-int dumb_socketpair(int socks[2], int dummy)
-{
-    (void) dummy;
-    return socketpair(AF_LOCAL, SOCK_STREAM, 0, socks);
+int dumb_socketpair(int socks[2], int dummy)
+{
+    (void) dummy;
+    return socketpair(AF_LOCAL, SOCK_STREAM, 0, socks);
 }
 #endif
 
@@ -907,7 +907,7 @@ void AICurlThread::create_wakeup_fds(void)
 {
 #if WINDOWS_CODE
 	//SGTODO
-	SOCKET socks[2];
+	curl_socket_t socks[2];
 	if (dumb_socketpair(socks, false) == SOCKET_ERROR)
 	{
 		llerrs << "Failed to generate wake-up socket pair" << formatWSAError() << llendl;

From 98c740f2047790766f6db5b4cb09e50249a8deff Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Fri, 3 Aug 2012 00:56:41 +0200
Subject: [PATCH 126/199] Remove debug output

---
 indra/llmessage/aicurlthread.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/indra/llmessage/aicurlthread.cpp b/indra/llmessage/aicurlthread.cpp
index 98116398f..86eef7764 100644
--- a/indra/llmessage/aicurlthread.cpp
+++ b/indra/llmessage/aicurlthread.cpp
@@ -981,9 +981,7 @@ void AICurlThread::wakeup_thread(void)
 
 #if WINDOWS_CODE
   //SGTODO
-  Dout(dc::curl, "ENTERING send()");
   int len = send(mWakeUpFd_in, "!", 1, 0);
-  Dout(dc::curl, "LEAVING send()");
   if (len == SOCKET_ERROR)
   {
 	  llerrs << "Send to wake-up socket failed: " << formatWSAError() << llendl;

From dc5bfc1c416fa03735954a77a3d60ec77cc29398 Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Thu, 2 Aug 2012 23:19:07 -0400
Subject: [PATCH 127/199] Bit of cleanup

More cleanup and updates to llcommon
Removed legacy code and files
---
 indra/llcommon/llassettype.cpp                |  11 +-
 indra/llcommon/llinitparam.h                  |  16 +-
 indra/llcommon/llkeythrottle.h                |   1 +
 indra/llcommon/llprocessor.cpp                |  16 +-
 indra/llcommon/llprocessor.h                  |   3 +-
 indra/llcommon/llstl.h                        |  52 ++++++-
 indra/llcommon/lltypeinfolookup.h             | 141 +++++++++---------
 indra/llcommon/lluuid.cpp                     |  81 +++++-----
 indra/llcommon/lluuid.h                       |   1 +
 indra/newview/CMakeLists.txt                  |   1 -
 indra/newview/___llviewerstats___cpp___aipcaa |   0
 indra/newview/llappviewer.cpp                 |  23 ---
 indra/newview/llfloaterchat.cpp               |  14 --
 indra/newview/llfloaterpreference.cpp         |  31 ----
 indra/newview/llpanelLCD.cpp                  | 132 ----------------
 indra/newview/llpanelLCD.h                    |  63 --------
 indra/newview/llviewerstats.cpp               |  16 +-
 indra/newview/llviewerstats.h                 |   5 +-
 18 files changed, 179 insertions(+), 428 deletions(-)
 create mode 100644 indra/newview/___llviewerstats___cpp___aipcaa
 delete mode 100644 indra/newview/llpanelLCD.cpp
 delete mode 100644 indra/newview/llpanelLCD.h

diff --git a/indra/llcommon/llassettype.cpp b/indra/llcommon/llassettype.cpp
index 88c64bde1..e0c24fc97 100644
--- a/indra/llcommon/llassettype.cpp
+++ b/indra/llcommon/llassettype.cpp
@@ -148,7 +148,7 @@ const char *LLAssetType::lookup(LLAssetType::EType asset_type)
 }
 
 // static
-LLAssetType::EType LLAssetType::lookup( const char* name )
+LLAssetType::EType LLAssetType::lookup(const char* name)
 {
 	return lookup(ll_safe_string(name));
 }
@@ -186,7 +186,7 @@ const char *LLAssetType::lookupHumanReadable(LLAssetType::EType asset_type)
 }
 
 // static
-LLAssetType::EType LLAssetType::lookupHumanReadable( const char* name )
+LLAssetType::EType LLAssetType::lookupHumanReadable(const char* name)
 {
 	return lookupHumanReadable(ll_safe_string(name));
 }
@@ -208,12 +208,9 @@ LLAssetType::EType LLAssetType::lookupHumanReadable(const std::string& readable_
 	return AT_NONE;
 }
 
-//NOTE: LLAssetType::lookupDragAndDropType & LLAssetType::generateDescriptionFor moved to newview/llviewerassettype.h
-
 // static
 bool LLAssetType::lookupCanLink(EType asset_type)
 {
-	//Check that enabling all these other types as linkable doesn't break things.
 	const LLAssetDictionary *dict = LLAssetDictionary::getInstance();
 	const AssetEntry *entry = dict->lookup(asset_type);
 	if (entry)
@@ -221,9 +218,6 @@ bool LLAssetType::lookupCanLink(EType asset_type)
 		return entry->mCanLink;
 	}
 	return false;
-	
-	/*return (asset_type == AT_CLOTHING || asset_type == AT_OBJECT || asset_type == AT_CATEGORY ||
-			asset_type == AT_BODYPART || asset_type == AT_GESTURE);*/
 }
 
 // static
@@ -268,4 +262,3 @@ bool LLAssetType::lookupIsAssetIDKnowable(EType asset_type)
 	}
 	return false;
 }
-
diff --git a/indra/llcommon/llinitparam.h b/indra/llcommon/llinitparam.h
index 542b4ab15..993f16d04 100644
--- a/indra/llcommon/llinitparam.h
+++ b/indra/llcommon/llinitparam.h
@@ -35,7 +35,7 @@
 #include <boost/shared_ptr.hpp>
 
 #include "llerror.h"
-#include "lltypeinfolookup.h"
+#include "llstl.h"
 
 namespace LLInitParam
 {
@@ -212,14 +212,6 @@ namespace LLInitParam
 
 	public:
 		
-		struct CompareTypeID
-		{
-			bool operator()(const std::type_info* lhs, const std::type_info* rhs) const
-			{
-				return lhs->before(*rhs);
-			}
-		};
-
 		typedef std::vector<std::pair<std::string, bool> >					name_stack_t;
 		typedef std::pair<name_stack_t::iterator, name_stack_t::iterator>	name_stack_range_t;
 		typedef std::vector<std::string>									possible_values_t;
@@ -228,9 +220,9 @@ namespace LLInitParam
 		typedef bool (*parser_write_func_t)(Parser& parser, const void*, name_stack_t&);
 		typedef boost::function<void (name_stack_t&, S32, S32, const possible_values_t*)>	parser_inspect_func_t;
 
-		typedef LLTypeInfoLookup<parser_read_func_t>		parser_read_func_map_t;
-		typedef LLTypeInfoLookup<parser_write_func_t>		parser_write_func_map_t;
-		typedef LLTypeInfoLookup<parser_inspect_func_t>		parser_inspect_func_map_t;
+		typedef std::map<const std::type_info*, parser_read_func_t>		parser_read_func_map_t;
+		typedef std::map<const std::type_info*, parser_write_func_t>	parser_write_func_map_t;
+		typedef std::map<const std::type_info*, parser_inspect_func_t>	parser_inspect_func_map_t;
 
 		Parser(parser_read_func_map_t& read_map, parser_write_func_map_t& write_map, parser_inspect_func_map_t& inspect_map)
 		:	mParseSilently(false),
diff --git a/indra/llcommon/llkeythrottle.h b/indra/llcommon/llkeythrottle.h
index 4ac689163..7544ab1d1 100644
--- a/indra/llcommon/llkeythrottle.h
+++ b/indra/llcommon/llkeythrottle.h
@@ -174,6 +174,7 @@ public:
 		F64 averageCount = curr.count + prevCount * (1.0 - timeInCurrent);
 		return averageCount;
 	}
+
 	// call each time the key wants use
 	State noteAction(const T& id, S32 weight = 1)
 	{
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp
index dee0d50e1..9532410b7 100644
--- a/indra/llcommon/llprocessor.cpp
+++ b/indra/llcommon/llprocessor.cpp
@@ -376,24 +376,24 @@ private:
 // uses the MSVC compiler intrinsics __cpuid() and __rdtsc().
 
 // Delays for the specified amount of milliseconds
-static	void	_Delay(unsigned int ms)
+static void _Delay(unsigned int ms)
 {
-   LARGE_INTEGER	freq, c1, c2;
-	__int64		x;
+	LARGE_INTEGER freq, c1, c2;
+	__int64 x;
 
-   // Get High-Res Timer frequency
+	// Get High-Res Timer frequency
 	if (!QueryPerformanceFrequency(&freq))	
 		return;
-		
+
 	// Convert ms to High-Res Timer value
 	x = freq.QuadPart/1000*ms;		
 
-   // Get first snapshot of High-Res Timer value
+	// Get first snapshot of High-Res Timer value
 	QueryPerformanceCounter(&c1);		
 	do
 	{
-            // Get second snapshot
-	    QueryPerformanceCounter(&c2);	
+		// Get second snapshot
+		QueryPerformanceCounter(&c2);	
 	}while(c2.QuadPart-c1.QuadPart < x);
 	// Loop while (second-first < x)	
 }
diff --git a/indra/llcommon/llprocessor.h b/indra/llcommon/llprocessor.h
index 00cd5a555..fc2c8dacf 100644
--- a/indra/llcommon/llprocessor.h
+++ b/indra/llcommon/llprocessor.h
@@ -52,5 +52,4 @@ private:
 	LLProcessorInfoImpl* mImpl;
 };
 
-
-#endif
+#endif // LLPROCESSOR_H
diff --git a/indra/llcommon/llstl.h b/indra/llcommon/llstl.h
index 18842f276..105b69d34 100644
--- a/indra/llcommon/llstl.h
+++ b/indra/llcommon/llstl.h
@@ -39,7 +39,7 @@
 #include <vector>
 #include <set>
 #include <deque>
-#include "stdtypes.h"	// llcommon/stdtypes.h, needed for S32 and U32.
+#include <typeinfo>
 
 // Use to compare the first element only of a pair
 // e.g. typedef std::set<std::pair<int, Data*>, compare_pair<int, Data*> > some_pair_set_t; 
@@ -477,4 +477,54 @@ llbind2nd(const _Operation& __oper, const _Tp& __x)
   return llbinder2nd<_Operation>(__oper, _Arg2_type(__x));
 }
 
+/**
+ * Compare std::type_info* pointers a la std::less. We break this out as a
+ * separate function for use in two different std::less specializations.
+ */
+inline
+bool before(const std::type_info* lhs, const std::type_info* rhs)
+{
+#if LL_LINUX && defined(__GNUC__) && ((__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 4))
+    // If we're building on Linux with gcc, and it's either gcc 3.x or
+    // 4.{0,1,2,3}, then we have to use a workaround. Note that we use gcc on
+    // Mac too, and some people build with gcc on Windows (cygwin or mingw).
+    // On Linux, different load modules may produce different type_info*
+    // pointers for the same type. Have to compare name strings to get good
+    // results.
+    return strcmp(lhs->name(), rhs->name()) < 0;
+#else  // not Linux, or gcc 4.4+
+    // Just use before(), as we normally would
+    return lhs->before(*rhs);
+#endif
+}
+
+/**
+ * Specialize std::less<std::type_info*> to use std::type_info::before().
+ * See MAINT-1175. It is NEVER a good idea to directly compare std::type_info*
+ * because, on Linux, you might get different std::type_info* pointers for the
+ * same type (from different load modules)!
+ */
+namespace std
+{
+	template <>
+	struct less<const std::type_info*>:
+		public std::binary_function<const std::type_info*, const std::type_info*, bool>
+	{
+		bool operator()(const std::type_info* lhs, const std::type_info* rhs) const
+		{
+			return before(lhs, rhs);
+		}
+	};
+
+	template <>
+	struct less<std::type_info*>:
+		public std::binary_function<std::type_info*, std::type_info*, bool>
+	{
+		bool operator()(std::type_info* lhs, std::type_info* rhs) const
+		{
+			return before(lhs, rhs);
+		}
+	};
+} // std
+
 #endif // LL_LLSTL_H
diff --git a/indra/llcommon/lltypeinfolookup.h b/indra/llcommon/lltypeinfolookup.h
index 7510cc12e..0b6862444 100644
--- a/indra/llcommon/lltypeinfolookup.h
+++ b/indra/llcommon/lltypeinfolookup.h
@@ -12,9 +12,49 @@
 #if ! defined(LL_LLTYPEINFOLOOKUP_H)
 #define LL_LLTYPEINFOLOOKUP_H
 
-#include "llsortedvector.h"
+#include <boost/unordered_map.hpp>
+#include <boost/functional/hash.hpp>
+#include <boost/optional.hpp>
+#include <functional>               // std::binary_function
 #include <typeinfo>
 
+/**
+ * The following helper classes are based on the Boost.Unordered documentation:
+ * http://www.boost.org/doc/libs/1_45_0/doc/html/unordered/hash_equality.html
+ */
+
+/**
+ * Compute hash for a string passed as const char*
+ */
+struct const_char_star_hash: public std::unary_function<const char*, std::size_t>
+{
+    std::size_t operator()(const char* str) const
+    {
+        std::size_t seed = 0;
+        for ( ; *str; ++str)
+        {
+            boost::hash_combine(seed, *str);
+        }
+        return seed;
+    }
+};
+
+/**
+ * Compute equality for strings passed as const char*
+ *
+ * I (nat) suspect that this is where the default behavior breaks for the
+ * const char* values returned from std::type_info::name(). If you compare the
+ * two const char* pointer values, as a naive, unspecialized implementation
+ * will surely do, they'll compare unequal.
+ */
+struct const_char_star_equal: public std::binary_function<const char*, const char*, bool>
+{
+    bool operator()(const char* lhs, const char* rhs) const
+    {
+        return strcmp(lhs, rhs) == 0;
+    }
+};
+
 /**
  * LLTypeInfoLookup is specifically designed for use cases for which you might
  * consider std::map<std::type_info*, VALUE>. We have several such data
@@ -23,88 +63,55 @@
  * different load modules will produce different std::type_info*.
  * LLTypeInfoLookup contains a workaround to address this issue.
  *
- * Specifically, when we don't find the passed std::type_info*,
- * LLTypeInfoLookup performs a linear search over registered entries to
- * compare name() strings. Presuming that this succeeds, we cache the new
- * (previously unrecognized) std::type_info* to speed future lookups.
- *
- * This worst-case fallback search (linear search with string comparison)
- * should only happen the first time we look up a given type from a particular
- * load module other than the one from which we initially registered types.
- * (However, a lookup which wouldn't succeed anyway will always have
- * worst-case performance.) This class is probably best used with less than a
- * few dozen different types.
+ * The API deliberately diverges from std::map in several respects:
+ * * It avoids iterators, not only begin()/end() but also as return values
+ *   from insert() and find(). This bypasses transform_iterator overhead.
+ * * Since we literally use compile-time types as keys, the essential insert()
+ *   and find() methods accept the key type as a @em template parameter,
+ *   accepting and returning value_type as a normal runtime value. This is to
+ *   permit future optimization (e.g. compile-time type hashing) without
+ *   changing the API.
  */
 template <typename VALUE>
 class LLTypeInfoLookup
 {
+    // Use this for our underlying implementation: lookup by
+    // std::type_info::name() string. This is one of the rare cases in which I
+    // dare use const char* directly, rather than std::string, because I'm
+    // sure that every value returned by std::type_info::name() is static.
+    // HOWEVER, specify our own hash + equality functors: naively comparing
+    // distinct const char* values won't work.
+    typedef boost::unordered_map<const char*, VALUE,
+                                 const_char_star_hash, const_char_star_equal> impl_map_type;
+
 public:
-    typedef LLTypeInfoLookup<VALUE> self;
-    typedef LLSortedVector<const std::type_info*, VALUE> vector_type;
-    typedef typename vector_type::key_type key_type;
-    typedef typename vector_type::mapped_type mapped_type;
-    typedef typename vector_type::value_type value_type;
-    typedef typename vector_type::iterator iterator;
-    typedef typename vector_type::const_iterator const_iterator;
+    typedef VALUE value_type;
 
     LLTypeInfoLookup() {}
 
-    iterator begin() { return mVector.begin(); }
-    iterator end()   { return mVector.end(); }
-    const_iterator begin() const { return mVector.begin(); }
-    const_iterator end()   const { return mVector.end(); }
-    bool empty() const { return mVector.empty(); }
-    std::size_t size() const { return mVector.size(); }
+    bool empty() const { return mMap.empty(); }
+    std::size_t size() const { return mMap.size(); }
 
-    std::pair<iterator, bool> insert(const std::type_info* key, const VALUE& value)
+    template <typename KEY>
+    bool insert(const value_type& value)
     {
-        return insert(value_type(key, value));
+        // Obtain and store the std::type_info::name() string as the key.
+        // Return just the bool from std::map::insert()'s return pair.
+        return mMap.insert(typename impl_map_type::value_type(typeid(KEY).name(), value)).second;
     }
 
-    std::pair<iterator, bool> insert(const value_type& pair)
+    template <typename KEY>
+    boost::optional<value_type> find() const
     {
-        return mVector.insert(pair);
-    }
-
-    // const find() forwards to non-const find(): this can alter mVector!
-    const_iterator find(const std::type_info* key) const
-    {
-        return const_cast<self*>(this)->find(key);
-    }
-
-    // non-const find() caches previously-unknown type_info* to speed future
-    // lookups.
-    iterator find(const std::type_info* key)
-    {
-        iterator found = mVector.find(key);
-        if (found != mVector.end())
-        {
-            // If LLSortedVector::find() found, great, we're done.
-            return found;
-        }
-        // Here we didn't find the passed type_info*. On Linux, though, even
-        // for the same type, typeid(sametype) produces a different type_info*
-        // when used in different load modules. So the fact that we didn't
-        // find the type_info* we seek doesn't mean this type isn't
-        // registered. Scan for matching name() string.
-        for (typename vector_type::iterator ti(mVector.begin()), tend(mVector.end());
-             ti != tend; ++ti)
-        {
-            if (std::string(ti->first->name()) == key->name())
-            {
-                // This unrecognized 'key' is for the same type as ti->first.
-                // To speed future lookups, insert a new entry that lets us
-                // look up ti->second using this same 'key'.
-                return insert(key, ti->second).first;
-            }
-        }
-        // We simply have never seen a type with this type_info* from any load
-        // module.
-        return mVector.end();
+        // Use the std::type_info::name() string as the key.
+        typename impl_map_type::const_iterator found = mMap.find(typeid(KEY).name());
+        if (found == mMap.end())
+            return boost::optional<value_type>();
+        return found->second;
     }
 
 private:
-    vector_type mVector;
+    impl_map_type mMap;
 };
 
 #endif /* ! defined(LL_LLTYPEINFOLOOKUP_H) */
diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp
index 74874585c..38084811b 100644
--- a/indra/llcommon/lluuid.cpp
+++ b/indra/llcommon/lluuid.cpp
@@ -33,9 +33,9 @@
 
 // We can't use WIN32_LEAN_AND_MEAN here, needs lots of includes.
 #if LL_WINDOWS
-#	undef WIN32_LEAN_AND_MEAN
-#	include <winsock2.h>
-#	include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#include <winsock2.h>
+#include <windows.h>
 #endif
 
 #include "lldefs.h"
@@ -452,7 +452,8 @@ static void get_random_bytes(void *buf, int nbytes)
 	return;	
 }
 
-#if LL_WINDOWS
+#if	LL_WINDOWS
+
 typedef struct _ASTAT_
 {
 	ADAPTER_STATUS adapt;
@@ -460,58 +461,44 @@ typedef struct _ASTAT_
 }ASTAT, * PASTAT;
 
 // static
-S32 LLUUID::getNodeID(unsigned char *node_id)
+S32	LLUUID::getNodeID(unsigned char	*node_id)
 {
-	  ASTAT Adapter;
-      NCB Ncb;
-      UCHAR uRetCode;
-      LANA_ENUM   lenum;
-      int      i;
-	  int retval = 0;
+	ASTAT Adapter;
+	NCB Ncb;
+	UCHAR uRetCode;
+	LANA_ENUM   lenum;
+	int      i;
+	int retval = 0;
 
-      memset( &Ncb, 0, sizeof(Ncb) );
-      Ncb.ncb_command = NCBENUM;
-      Ncb.ncb_buffer = (UCHAR *)&lenum;
-      Ncb.ncb_length = sizeof(lenum);
-      uRetCode = Netbios( &Ncb );
- //     printf( "The NCBENUM return code is: 0x%x \n", uRetCode );
+	memset( &Ncb, 0, sizeof(Ncb) );
+	Ncb.ncb_command = NCBENUM;
+	Ncb.ncb_buffer = (UCHAR *)&lenum;
+	Ncb.ncb_length = sizeof(lenum);
+	uRetCode = Netbios( &Ncb );
 
-      for(i=0; i < lenum.length ;i++)
-      {
-          memset( &Ncb, 0, sizeof(Ncb) );
-          Ncb.ncb_command = NCBRESET;
-          Ncb.ncb_lana_num = lenum.lana[i];
+	for(i=0; i < lenum.length ;i++)
+	{
+		memset( &Ncb, 0, sizeof(Ncb) );
+		Ncb.ncb_command = NCBRESET;
+		Ncb.ncb_lana_num = lenum.lana[i];
 
-          uRetCode = Netbios( &Ncb );
- //         printf( "The NCBRESET on LANA %d return code is: 0x%x \n",
- //                 lenum.lana[i], uRetCode );
+		uRetCode = Netbios( &Ncb );
 
-          memset( &Ncb, 0, sizeof (Ncb) );
-          Ncb.ncb_command = NCBASTAT;
-          Ncb.ncb_lana_num = lenum.lana[i];
+		memset( &Ncb, 0, sizeof (Ncb) );
+		Ncb.ncb_command = NCBASTAT;
+		Ncb.ncb_lana_num = lenum.lana[i];
 
-          strcpy( (char *)Ncb.ncb_callname,  "*              " );		/* Flawfinder: ignore */
-          Ncb.ncb_buffer = (unsigned char *)&Adapter;
-          Ncb.ncb_length = sizeof(Adapter);
+		strcpy( (char *)Ncb.ncb_callname,  "*              " );		/* Flawfinder: ignore */
+		Ncb.ncb_buffer = (unsigned char *)&Adapter;
+		Ncb.ncb_length = sizeof(Adapter);
 
-          uRetCode = Netbios( &Ncb );
-//          printf( "The NCBASTAT on LANA %d return code is: 0x%x \n",
-//                 lenum.lana[i], uRetCode );
-          if ( uRetCode == 0 )
-          {
-//            printf( "The Ethernet Number on LANA %d is: %02x%02x%02x%02x%02x%02x\n",
-//	 			  lenum.lana[i],
-//                  Adapter.adapt.adapter_address[0],
-//                  Adapter.adapt.adapter_address[1],
-//                  Adapter.adapt.adapter_address[2],
-//                  Adapter.adapt.adapter_address[3],
-//                  Adapter.adapt.adapter_address[4],
-//                  Adapter.adapt.adapter_address[5] );
+		uRetCode = Netbios( &Ncb );
+		if ( uRetCode == 0 )
+		{
 			memcpy(node_id,Adapter.adapt.adapter_address,6);		/* Flawfinder: ignore */
 			retval = 1;
-
-          }
-	  }
+		}
+	}
 	return retval;
 }
 
diff --git a/indra/llcommon/lluuid.h b/indra/llcommon/lluuid.h
index d7ded1a26..3a0d66e4a 100644
--- a/indra/llcommon/lluuid.h
+++ b/indra/llcommon/lluuid.h
@@ -132,6 +132,7 @@ public:
 
 	U8 mData[UUID_BYTES];
 };
+
 typedef std::vector<LLUUID> uuid_vec_t;
 
 // Construct
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 7e40b6560..fcbee7548 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -860,7 +860,6 @@ set(viewer_HEADER_FILES
     llpanellandmedia.h
     llpanellandobjects.h
     llpanellandoptions.h
-    llpanelLCD.h
     llpanellogin.h
     llpanelmaininventory.h
     llpanelmorph.h
diff --git a/indra/newview/___llviewerstats___cpp___aipcaa b/indra/newview/___llviewerstats___cpp___aipcaa
new file mode 100644
index 000000000..e69de29bb
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index c0bb21085..018ed51f0 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -216,11 +216,6 @@
 
 ////// Windows-specific includes to the bottom - nasty defines in these pollute the preprocessor
 //
-#if LL_WINDOWS && LL_LCD_COMPILE
-	#include "lllcd.h"
-#endif
-
-
 //----------------------------------------------------------------------------
 // viewer.cpp - these are only used in viewer, should be easily moved.
 
@@ -810,13 +805,6 @@ bool LLAppViewer::init()
 	// call all self-registered classes
 	LLInitClassList::instance().fireCallbacks();
 
-#if LL_LCD_COMPILE
-		// start up an LCD window on a logitech keyboard, if there is one
-		HINSTANCE hInstance = GetModuleHandle(NULL);
-		gLcdScreen = new LLLCD(hInstance);
-		CreateLCDDebugWindows();
-#endif
-
 	LLFolderViewItem::initClass(); // SJB: Needs to happen after initWindow(), not sure why but related to fonts
 		
 	gGLManager.getGLInfo(gDebugInfo);
@@ -1198,11 +1186,6 @@ bool LLAppViewer::mainLoop()
 					pingMainloopTimeout("Main:Snapshot");
 					LLFloaterSnapshot::update(); // take snapshots
 					gGLActive = FALSE;
-#if LL_LCD_COMPILE
-					// update LCD Screen
-					pingMainloopTimeout("Main:LCD");
-					gLcdScreen->UpdateDisplay();
-#endif
 				}
 
 			}
@@ -1570,12 +1553,6 @@ bool LLAppViewer::cleanup()
 	//	gDXHardware.cleanup();
 	//#endif // LL_WINDOWS
 
-#if LL_LCD_COMPILE
-	// shut down the LCD window on a logitech keyboard, if there is one
-	delete gLcdScreen;
-	gLcdScreen = NULL;
-#endif
-
 	LLVolumeMgr* volume_manager = LLPrimitive::getVolumeManager();
 	if (!volume_manager->cleanup())
 	{
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index dec68245d..ec503267d 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -452,20 +452,6 @@ void LLFloaterChat::addChat(const LLChat& chat,
 	}
 // [/RLVa:KB]
 
-#if LL_LCD_COMPILE
-	// add into LCD displays
-	if (!invisible_script_debug_chat)
-	{
-		if (!from_instant_message)
-		{
-			AddNewChatToLCD(chat.mText);
-		}
-		else
-		{
-			AddNewIMToLCD(chat.mText);
-		}
-	}
-#endif
 	if (!invisible_script_debug_chat 
 		&& !chat.mMuted 
 		&& gConsole 
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index d5e9702d7..f973a7619 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -58,7 +58,6 @@
 #include "llpanelgeneral.h"
 #include "llpanelinput.h"
 #include "llpanellogin.h"
-#include "llpanelLCD.h"
 #include "llpanelmsgs.h"
 #include "llpanelweb.h"
 #include "llpanelskins.h"
@@ -179,20 +178,6 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
 	mTabContainer->addTabPanel(mPrefsIM->getPanel(), mPrefsIM->getPanel()->getLabel());
 	mPrefsIM->getPanel()->setDefaultBtn(default_btn);
 
-#if LL_LCD_COMPILE
-
-	// only add this option if we actually have a logitech keyboard / speaker set
-	if (gLcdScreen->Enabled())
-	{
-		mLCDPanel = new LLPanelLCD();
-		mTabContainer->addTabPanel(mLCDPanel, mLCDPanel->getLabel());
-		mLCDPanel->setDefaultBtn(default_btn);
-	}
-
-#else
-	mLCDPanel = NULL;
-#endif
-
 	mMsgPanel = new LLPanelMsgs();
 	mTabContainer->addTabPanel(mMsgPanel, mMsgPanel->getLabel());
 	mMsgPanel->setDefaultBtn(default_btn);
@@ -322,14 +307,6 @@ void LLPreferenceCore::apply()
 	LLFloaterHardwareSettings::instance()->apply();
 
 	mWebPanel->apply();
-#if LL_LCD_COMPILE
-	// only add this option if we actually have a logitech keyboard / speaker set
-	if (gLcdScreen->Enabled())
-	{
-		mLCDPanel->apply();
-	}
-#endif
-//	mWebPanel->apply();
 }
 
 
@@ -354,14 +331,6 @@ void LLPreferenceCore::cancel()
 	LLFloaterHardwareSettings::instance()->cancel();
 
 	mWebPanel->cancel();
-#if LL_LCD_COMPILE
-	// only add this option if we actually have a logitech keyboard / speaker set
-	if (gLcdScreen->Enabled())
-	{
-		mLCDPanel->cancel();
-	}
-#endif
-//	mWebPanel->cancel();
 }
 
 // static
diff --git a/indra/newview/llpanelLCD.cpp b/indra/newview/llpanelLCD.cpp
deleted file mode 100644
index ba7efba7b..000000000
--- a/indra/newview/llpanelLCD.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/** 
- * @file llpanellcd.cpp
- * @brief lcd options panel
- *
- * $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 "llpanelLCD.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 "llradiogroup.h"
-#include "llresmgr.h"
-#include "lltextbox.h"
-#include "llui.h"
-#include "llviewercontrol.h"
-
-//Ventrella
-#include "llagent.h"
-//end Ventrella
-
-// for Logitech LCD keyboards / speakers
-#ifndef LL_LCD_H
-#include "lllcd.h"
-#endif
-
-
-//
-// Globals
-//
-
-//
-// Static functions
-//
-
-
-LLPanelLCD::LLPanelLCD() 
-{
-	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_lcd.xml");
-}
-
-BOOL LLPanelLCD::postBuild()
-{
-	requires<LLRadioGroup>("LCDDestination");
-	requires<LLCheckBoxCtrl>("DisplayLinden");
-	requires<LLCheckBoxCtrl>("DisplayDebug");
-	requires<LLCheckBoxCtrl>("DisplayDebugConsole");
-	requires<LLCheckBoxCtrl>("DisplayRegion");
-	requires<LLCheckBoxCtrl>("DisplayChat");
-	requires<LLCheckBoxCtrl>("DisplayIM");
-
-	if (!checkRequirements())
-	{
-		return FALSE;
-	}	
-
-	refresh();
-
-	return TRUE;
-}
-
-
-LLPanelLCD::~LLPanelLCD()
-{
-	// Children all cleaned up by default view destructor.
-}
-
-void LLPanelLCD::refresh()
-{
-	mLCDDestination = gSavedSettings.getS32("LCDDestination");
-	mDisplayChat = gSavedSettings.getBOOL("DisplayChat");
-	mDisplayIM = gSavedSettings.getBOOL("DisplayIM");
-	mDisplayRegion = gSavedSettings.getBOOL("DisplayRegion");
-	mDisplayDebug = gSavedSettings.getBOOL("DisplayDebug");
-	mDisplayDebugConsole = gSavedSettings.getBOOL("DisplayDebugConsole");
-	mDisplayLinden = gSavedSettings.getBOOL("DisplayLinden");
-
-	LLPanel::refresh();
-}
-
-void LLPanelLCD::apply()
-{
-	// nothing really to do here.
-}
-
-
-void LLPanelLCD::cancel()
-{
-	// doing this to restore situation when we entered this function
-	gSavedSettings.setS32("LCDDestination", mLCDDestination);
-	gSavedSettings.setBOOL("DisplayChat", mDisplayChat);
-	gSavedSettings.setBOOL("DisplayIM", mDisplayIM);
-	gSavedSettings.setBOOL("DisplayRegion", mDisplayRegion);
-	gSavedSettings.setBOOL("DisplayDebug", mDisplayDebug);
-	gSavedSettings.setBOOL("DisplayDebugConsole", mDisplayDebugConsole);
-	gSavedSettings.setBOOL("DisplayLinden", mDisplayLinden);
-}
\ No newline at end of file
diff --git a/indra/newview/llpanelLCD.h b/indra/newview/llpanelLCD.h
deleted file mode 100644
index 21eec3fc0..000000000
--- a/indra/newview/llpanelLCD.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/** 
- * @file llpanelLCD.h
- * @brief lcd options panel
- *
- * $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$
- */
-
-#ifndef LL_PANEL_LCD_H
-#define LL_PANEL_LCD_H
-
-#include "llpanel.h"
-
-class LLCheckBoxCtrl;
-
-
-class LLPanelLCD : public LLPanel
-{
-public:
-	LLPanelLCD();
-	virtual ~LLPanelLCD();
-
-	virtual BOOL postBuild();
-	virtual void refresh();
-	void apply();
-	void cancel();
-
-protected:
-	S32  mLCDDestination;
-	BOOL mDisplayChat;
-	BOOL mDisplayRegion;
-	BOOL mDisplayDebug;
-	BOOL mDisplayDebugConsole;
-	BOOL mDisplayLinden;
-	BOOL mDisplayIM;
-
-};
-
-#endif
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp
index 4166cc5f2..98962a0fa 100644
--- a/indra/newview/llviewerstats.cpp
+++ b/indra/newview/llviewerstats.cpp
@@ -62,9 +62,6 @@
 #include "llviewernetwork.h"
 #include "llmeshrepository.h" //for LLMeshRepository::sBytesReceived
 #include "sgmemstat.h"
-#if LL_LCD_COMPILE
-#include "lllcd.h"
-#endif
 
 
 class StatAttributes
@@ -201,10 +198,7 @@ const StatAttributes STAT_INFO[LLViewerStats::ST_COUNT] =
 	// ST_TEX_BAKES
 	StatAttributes("Texture Bakes", FALSE, FALSE),
 	// ST_TEX_REBAKES
-	StatAttributes("Texture Rebakes", FALSE, FALSE),
-
-	// ST_LOGITECH_KEYBOARD
-	StatAttributes("Logitech LCD", FALSE, FALSE)
+	StatAttributes("Texture Rebakes", FALSE, FALSE)
 
 };
 
@@ -699,14 +693,6 @@ void update_statistics(U32 frame_count)
 			mem_stats_timer.reset();
 		}
 	}
-
-	
-#if LL_LCD_COMPILE
-	bool LCDenabled = gLcdScreen->Enabled();
-	LLViewerStats::getInstance()->setStat(LLViewerStats::ST_LOGITECH_LCD, LCDenabled);
-#else
-	LLViewerStats::getInstance()->setStat(LLViewerStats::ST_LOGITECH_LCD, false);
-#endif
 }
 
 class ViewerStatsResponder : public LLHTTPClient::Responder
diff --git a/indra/newview/llviewerstats.h b/indra/newview/llviewerstats.h
index ec91b7efd..93d482da7 100644
--- a/indra/newview/llviewerstats.h
+++ b/indra/newview/llviewerstats.h
@@ -181,9 +181,8 @@ public:
 		ST_WINDOW_HEIGHT = 55,
 		ST_TEX_BAKES = 56,
 		ST_TEX_REBAKES = 57,
-		ST_LOGITECH_LCD = 58,
 		
-		ST_COUNT = 59
+		ST_COUNT = 58
 	};
 
 
@@ -282,7 +281,7 @@ public:
 	};
 
 	StatsAccumulator mAgentPositionSnaps;
-	
+
 private:
 	F64	mStats[ST_COUNT];
 

From fb8175488009d5b2c242035c901bd608439a1d91 Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Thu, 2 Aug 2012 23:29:12 -0400
Subject: [PATCH 128/199] STUPID TEMP FILES

---
 indra/newview/___llviewerstats___cpp___aipcaa | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 indra/newview/___llviewerstats___cpp___aipcaa

diff --git a/indra/newview/___llviewerstats___cpp___aipcaa b/indra/newview/___llviewerstats___cpp___aipcaa
deleted file mode 100644
index e69de29bb..000000000

From af89351432b1959de77b09c81bbf786214174279 Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Fri, 3 Aug 2012 08:49:01 -0400
Subject: [PATCH 129/199] Cookies.

Enabled use of the cookie store.
---
 indra/newview/llappviewer.cpp   |   1 +
 indra/newview/llstartup.cpp     |   4 +-
 indra/newview/llviewermedia.cpp | 352 ++++++++++++++++++++++++++++++--
 indra/newview/llviewermedia.h   |  38 +++-
 4 files changed, 368 insertions(+), 27 deletions(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 018ed51f0..c6c19d6e5 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1655,6 +1655,7 @@ bool LLAppViewer::cleanup()
 	
 	writeDebugInfo();
 
+	LLViewerMedia::saveCookieFile();
 	// Stop the plugin read thread if it's running.
 	LLPluginProcessParent::setUseReadThread(false);
 
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 26773586c..08a260871 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1094,12 +1094,14 @@ bool idle_startup()
 			// END TODO
 			LLPanelLogin::close();
 		}
-		
+
 		//For HTML parsing in text boxes.
 		LLTextEditor::setLinkColor( gSavedSettings.getColor4("HTMLLinkColor") );
 
 		// Load URL History File
 		LLURLHistory::loadFile("url_history.xml");
+		// Load media plugin cookies
+		LLViewerMedia::loadCookieFile();
 				
 		//-------------------------------------------------
 		// Handle startup progress screen
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 56f0403e9..c76b4b335 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -33,21 +33,29 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llviewermedia.h"
-#include "llviewermediafocus.h"
-#include "llhoverview.h"
-#include "llmimetypes.h"
-#include "llviewercontrol.h"
-#include "llviewerwindow.h"
-#include "llviewertexturelist.h"
-//#include "viewerversion.h"
 
-#include "llpluginclassmedia.h"
-
-#include "llnotifications.h"
+#include "llappviewer.h"
+#include "lldir.h"
+#include "lldiriterator.h"
 #include "llevent.h"		// LLSimpleListener
-#include "llnotificationsutil.h"
-#include "lluuid.h"
+#include "llhoverview.h"
 #include "llkeyboard.h"
+#include "llmimetypes.h"
+#include "llnotifications.h"
+#include "llnotificationsutil.h"
+#include "llpluginclassmedia.h"
+#include "llplugincookiestore.h"
+#include "llurldispatcher.h"
+#include "lluuid.h"
+#include "llviewermediafocus.h"
+#include "llviewercontrol.h"
+#include "llviewertexture.h"
+#include "llviewertexturelist.h"
+#include "llviewerwindow.h"
+#include "llvieweraudio.h"
+#include "llweb.h"
+
+//#include "viewerversion.h"
 
 // Merov: Temporary definitions while porting the new viewer media code to Snowglobe
 const int LEFT_BUTTON  = 0;
@@ -98,6 +106,9 @@ public:
 };
 typedef std::list<LLViewerMediaImpl*> impl_list;
 static impl_list sViewerMediaImplList;
+LLPluginCookieStore *LLViewerMedia::sCookieStore = NULL;
+static std::string sUpdatedCookies;
+static const char *PLUGIN_COOKIE_FILE_NAME = "plugin_cookies.txt";
 
 //////////////////////////////////////////////////////////////////////////////////////////
 // LLViewerMedia
@@ -105,10 +116,12 @@ static impl_list sViewerMediaImplList;
 //////////////////////////////////////////////////////////////////////////////////////////
 // static
 viewer_media_t LLViewerMedia::newMediaImpl(const std::string& media_url,
-														 const LLUUID& texture_id,
-														 S32 media_width, S32 media_height, U8 media_auto_scale,
-														 U8 media_loop,
-														 std::string mime_type)
+											 const LLUUID& texture_id,
+											 S32 media_width, 
+											 S32 media_height, 
+											 U8 media_auto_scale,
+											 U8 media_loop,
+											 std::string mime_type)
 {
 	LLViewerMediaImpl* media_impl = getMediaImplFromTextureID(texture_id);
 	if(media_impl == NULL || texture_id.isNull())
@@ -255,7 +268,8 @@ void LLViewerMedia::setVolume(F32 volume)
 	for(; iter != end; iter++)
 	{
 		LLViewerMediaImpl* pimpl = *iter;
-		pimpl->setVolume(volume);
+		LLPluginClassMedia* plugin = pimpl->getMediaPlugin();
+		plugin->setVolume(volume);
 	}
 }
 
@@ -263,6 +277,13 @@ void LLViewerMedia::setVolume(F32 volume)
 // static
 void LLViewerMedia::updateMedia()
 {
+	sUpdatedCookies = getCookieStore()->getChangedCookies();
+	if(!sUpdatedCookies.empty())
+	{
+		lldebugs << "updated cookies will be sent to all loaded plugins: " << llendl;
+		lldebugs << sUpdatedCookies << llendl;
+	}
+	
 	impl_list::iterator iter = sViewerMediaImplList.begin();
 	impl_list::iterator end = sViewerMediaImplList.end();
 
@@ -273,6 +294,235 @@ void LLViewerMedia::updateMedia()
 	}
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////
+// static
+void LLViewerMedia::clearAllCookies()
+{
+	// Clear all cookies for all plugins
+	impl_list::iterator iter = sViewerMediaImplList.begin();
+	impl_list::iterator end = sViewerMediaImplList.end();
+	for (; iter != end; iter++)
+	{
+		LLViewerMediaImpl* pimpl = *iter;
+		LLPluginClassMedia* plugin = pimpl->getMediaPlugin();
+		if(plugin)
+		{
+			plugin->clear_cookies();
+		}
+	}
+	
+	// Clear all cookies from the cookie store
+	getCookieStore()->setAllCookies("");
+
+	// FIXME: this may not be sufficient, since the on-disk cookie file won't get written until some browser instance exits cleanly.
+	// It also won't clear cookies for other accounts, or for any account if we're not logged in, and won't do anything at all if there are no webkit plugins loaded.
+	// Until such time as we can centralize cookie storage, the following hack should cover these cases:
+	
+	// HACK: Look for cookie files in all possible places and delete them.
+	// NOTE: this assumes knowledge of what happens inside the webkit plugin (it's what adds 'browser_profile' to the path and names the cookie file)
+	
+	// Places that cookie files can be:
+	// <getOSUserAppDir>/browser_profile/cookies
+	// <getOSUserAppDir>/first_last/browser_profile/cookies  (note that there may be any number of these!)
+	// <getOSUserAppDir>/first_last/plugin_cookies.txt  (note that there may be any number of these!)
+	
+	std::string base_dir = gDirUtilp->getOSUserAppDir() + gDirUtilp->getDirDelimiter();
+	std::string target;
+	std::string filename;
+	
+	lldebugs << "base dir = " << base_dir << llendl;
+
+	// The non-logged-in version is easy
+	target = base_dir;
+	target += "browser_profile";
+	target += gDirUtilp->getDirDelimiter();
+	target += "cookies";
+	lldebugs << "target = " << target << llendl;
+	if(LLFile::isfile(target))
+	{
+		LLFile::remove(target);
+	}
+	
+	// the hard part: iterate over all user directories and delete the cookie file from each one
+	LLDirIterator dir_iter(base_dir, "*_*");
+	while (dir_iter.next(filename))
+	{
+		target = base_dir;
+		target += filename;
+		target += gDirUtilp->getDirDelimiter();
+		target += "browser_profile";
+		target += gDirUtilp->getDirDelimiter();
+		target += "cookies";
+		lldebugs << "target = " << target << llendl;
+		if(LLFile::isfile(target))
+		{	
+			LLFile::remove(target);
+		}
+		
+		// Other accounts may have new-style cookie files too -- delete them as well
+		target = base_dir;
+		target += filename;
+		target += gDirUtilp->getDirDelimiter();
+		target += PLUGIN_COOKIE_FILE_NAME;
+		lldebugs << "target = " << target << llendl;
+		if(LLFile::isfile(target))
+		{	
+			LLFile::remove(target);
+		}
+	}
+}
+	
+/////////////////////////////////////////////////////////////////////////////////////////
+// static 
+void LLViewerMedia::clearAllCaches()
+{
+	// Clear all plugins' caches
+	impl_list::iterator iter = sViewerMediaImplList.begin();
+	impl_list::iterator end = sViewerMediaImplList.end();
+	for (; iter != end; iter++)
+	{
+		LLViewerMediaImpl* pimpl = *iter;
+		pimpl->clearCache();
+	}
+}
+	
+/////////////////////////////////////////////////////////////////////////////////////////
+// static 
+void LLViewerMedia::setCookiesEnabled(bool enabled)
+{
+	// Set the "cookies enabled" flag for all loaded plugins
+	impl_list::iterator iter = sViewerMediaImplList.begin();
+	impl_list::iterator end = sViewerMediaImplList.end();
+	for (; iter != end; iter++)
+	{
+		LLViewerMediaImpl* pimpl = *iter;
+		LLPluginClassMedia* plugin = pimpl->getMediaPlugin();
+		if(plugin)
+		{
+			plugin->enable_cookies(enabled);
+		}
+	}
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// static 
+LLPluginCookieStore *LLViewerMedia::getCookieStore()
+{
+	if(sCookieStore == NULL)
+	{
+		sCookieStore = new LLPluginCookieStore;
+	}
+	
+	return sCookieStore;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// static
+void LLViewerMedia::loadCookieFile()
+{
+	// build filename for each user
+	std::string resolved_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, PLUGIN_COOKIE_FILE_NAME);
+
+	if (resolved_filename.empty())
+	{
+		llinfos << "can't get path to plugin cookie file - probably not logged in yet." << llendl;
+		return;
+	}
+	
+	// open the file for reading
+	llifstream file(resolved_filename);
+	if (!file.is_open())
+	{
+		llwarns << "can't load plugin cookies from file \"" << PLUGIN_COOKIE_FILE_NAME << "\"" << llendl;
+		return;
+	}
+	
+	getCookieStore()->readAllCookies(file, true);
+
+	file.close();
+	
+	// send the clear_cookies message to all loaded plugins
+	impl_list::iterator iter = sViewerMediaImplList.begin();
+	impl_list::iterator end = sViewerMediaImplList.end();
+	for (; iter != end; iter++)
+	{
+		LLViewerMediaImpl* pimpl = *iter;
+		LLPluginClassMedia* plugin = pimpl->getMediaPlugin();
+		if(plugin)
+		{
+			plugin->clear_cookies();
+		}
+	}
+}
+
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// static
+void LLViewerMedia::saveCookieFile()
+{
+	// build filename for each user
+	std::string resolved_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, PLUGIN_COOKIE_FILE_NAME);
+
+	if (resolved_filename.empty())
+	{
+		llinfos << "can't get path to plugin cookie file - probably not logged in yet." << llendl;
+		return;
+	}
+
+	// open a file for writing
+	llofstream file (resolved_filename);
+	if (!file.is_open())
+	{
+		llwarns << "can't open plugin cookie file \"" << PLUGIN_COOKIE_FILE_NAME << "\" for writing" << llendl;
+		return;
+	}
+
+	getCookieStore()->writePersistentCookies(file);
+
+	file.close();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// static
+void LLViewerMedia::addCookie(const std::string &name, const std::string &value, const std::string &domain, const LLDate &expires, const std::string &path, bool secure)
+{
+	std::stringstream cookie;
+	
+	cookie << name << "=" << LLPluginCookieStore::quoteString(value);
+	
+	if(expires.notNull())
+	{
+		cookie << "; expires=" << expires.asRFC1123();
+	}
+	
+	cookie << "; domain=" << domain;
+
+	cookie << "; path=" << path;
+	
+	if(secure)
+	{
+		cookie << "; secure";
+	}
+	
+	getCookieStore()->setCookies(cookie.str());
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// static
+void LLViewerMedia::addSessionCookie(const std::string &name, const std::string &value, const std::string &domain, const std::string &path, bool secure)
+{
+	// A session cookie just has a NULL date.
+	addCookie(name, value, domain, LLDate(), path, secure);
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// static
+void LLViewerMedia::removeCookie(const std::string &name, const std::string &domain, const std::string &path )
+{
+	// To remove a cookie, add one with the same name, domain, and path that expires in the past.
+	
+	addCookie(name, "", domain, LLDate(LLDate::now().secondsSinceEpoch() - 1.0), path);
+}
 //////////////////////////////////////////////////////////////////////////////////////////
 // static
 void LLViewerMedia::cleanupClass()
@@ -309,7 +559,8 @@ LLViewerMediaImpl::LLViewerMediaImpl(const std::string& media_url,
 	mTextureUsedWidth(0),
 	mTextureUsedHeight(0),
 	mSuspendUpdates(false),
-	mVisible(true)
+	mVisible(true),
+	mClearCache(false)
 { 
 	createMediaSource();
 }
@@ -379,7 +630,7 @@ void LLViewerMediaImpl::setMediaType(const std::string& media_type)
 LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_type, LLPluginClassMediaOwner *owner /* may be NULL */, S32 default_width, S32 default_height)
 {
 	std::string plugin_basename = LLMIMETypes::implType(media_type);
-
+	
 	if(plugin_basename.empty())
 	{
 		LL_WARNS("Media") << "Couldn't find plugin for media type " << media_type << LL_ENDL;
@@ -391,6 +642,19 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
 		std::string user_data_path = gDirUtilp->getOSUserAppDir();
 		user_data_path += gDirUtilp->getDirDelimiter();
 
+		// Fix for EXT-5960 - make browser profile specific to user (cache, cookies etc.)
+		// If the linden username returned is blank, that can only mean we are
+		// at the login page displaying login Web page or Web browser test via Develop menu.
+		// In this case we just use whatever gDirUtilp->getOSUserAppDir() gives us (this
+		// is what we always used before this change)
+		std::string linden_user_dir = gDirUtilp->getLindenUserDir();
+		if ( ! linden_user_dir.empty() )
+		{
+			// gDirUtilp->getLindenUserDir() is whole path, not just Linden name
+			user_data_path = linden_user_dir;
+			user_data_path += gDirUtilp->getDirDelimiter();
+		};
+
 		// See if the plugin executable exists
 		llstat s;
 		if(LLFile::stat(launcher_name, &s))
@@ -421,7 +685,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
 			// collect 'javascript enabled' setting from prefs and send to embedded browser
 			bool javascript_enabled = gSavedSettings.getBOOL( "BrowserJavascriptEnabled" );
 			media_source->setJavascriptEnabled( javascript_enabled );
-		
+
 			bool media_plugin_debugging_enabled = gSavedSettings.getBOOL("MediaPluginDebugging");
 			media_source->enableMediaPluginDebugging( media_plugin_debugging_enabled );
 
@@ -463,7 +727,7 @@ bool LLViewerMediaImpl::initializePlugin(const std::string& media_type)
 	// and unconditionally set the mime type
 	mMimeType = media_type;
 
-	LLPluginClassMedia* media_source = newSourceFromMediaType(media_type, this, mMediaWidth, mMediaHeight);
+	LLPluginClassMedia* media_source = newSourceFromMediaType(mMimeType, this, mMediaWidth, mMediaHeight);
 	
 	if (media_source)
 	{
@@ -484,6 +748,23 @@ bool LLViewerMediaImpl::initializePlugin(const std::string& media_type)
 		std::string ca_path = gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "CA.pem" );
 		media_source->addCertificateFilePath( ca_path );
 
+		if(mClearCache)
+		{
+			mClearCache = false;
+			media_source->clear_cache();
+		}
+		
+		// TODO: Only send cookies to plugins that need them
+		//  Ideally, the plugin should tell us whether it handles cookies or not -- either via the init response or through a separate message.
+		//  Due to the ordering of messages, it's possible we wouldn't get that information back in time to send cookies before sending a navigate message,
+		//  which could cause odd race conditions.
+		std::string all_cookies = LLViewerMedia::getCookieStore()->getAllCookies();
+		lldebugs << "setting cookies: " << all_cookies << llendl;
+		if(!all_cookies.empty())
+		{
+			media_source->set_cookies(all_cookies);
+		}
+
 		mPluginBase = media_source;
 
 		return true;
@@ -600,6 +881,19 @@ void LLViewerMediaImpl::focus(bool focus)
 	}
 }
 
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::clearCache()
+{
+	LLPluginClassMedia* plugin = getMediaPlugin();
+	if(plugin)
+	{
+		plugin->clear_cache();
+	}
+	else
+	{
+		mClearCache = true;
+	}
+}
 //////////////////////////////////////////////////////////////////////////////////////////
 void LLViewerMediaImpl::mouseDown(S32 x, S32 y)
 {
@@ -883,6 +1177,16 @@ void LLViewerMediaImpl::updateMovieImage(const LLUUID& uuid, BOOL active)
 void LLViewerMediaImpl::update()
 {
 	LLPluginClassMedia* plugin = getMediaPlugin();
+
+  	if(plugin)
+	{
+  		// If we didn't just create the impl, it may need to get cookie updates.
+		if(!sUpdatedCookies.empty())
+		{
+			// TODO: Only send cookies to plugins that need them
+			plugin->set_cookies(sUpdatedCookies);
+		}
+	}
 	if (!plugin)
 	{
 		return;
@@ -1154,6 +1458,12 @@ void LLViewerMediaImpl::handleMediaEvent(LLPluginClassMedia* self, LLPluginClass
 	// Just chain the event to observers.
 	emitEvent(self, event);
 }
+////////////////////////////////////////////////////////////////////////////////
+// virtual
+void LLViewerMediaImpl::handleCookieSet(LLPluginClassMedia* self, const std::string &cookie)
+{
+	LLViewerMedia::getCookieStore()->setCookies(cookie);
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 // virtual
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index aebfbec76..5e4f49489 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -33,15 +33,19 @@
 #ifndef LLVIEWERMEDIA_H
 #define LLVIEWERMEDIA_H
 
-#include "llviewermediaeventemitter.h"
-#include "llviewerpluginmanager.h"
 #include "llfocusmgr.h"
 #include "llpanel.h"
+#include "llviewermediaeventemitter.h"
+#include "llviewerpluginmanager.h"
+#include "llpluginclassmedia.h"
+#include "v4color.h"
+#include "llurl.h"
 
 class LLViewerMediaImpl;
 class LLUUID;
 class LLSD;
 class LLViewerTexture;
+class LLPluginCookieStore;
 
 typedef LLPointer<LLViewerMediaImpl> viewer_media_t;
 
@@ -72,6 +76,24 @@ class LLViewerMedia
 
 		static void cleanupClass();
 
+	// Clear all cookies for all plugins
+	static void clearAllCookies();
+	
+	// Clear all plugins' caches
+	static void clearAllCaches();
+	
+	// Set the "cookies enabled" flag for all loaded plugins
+	static void setCookiesEnabled(bool enabled);
+	
+	static LLPluginCookieStore *getCookieStore();
+	static void loadCookieFile();
+	static void saveCookieFile();
+	static void addCookie(const std::string &name, const std::string &value, const std::string &domain, const LLDate &expires, const std::string &path = std::string("/"), bool secure = false );
+	static void addSessionCookie(const std::string &name, const std::string &value, const std::string &domain, const std::string &path = std::string("/"), bool secure = false );
+	static void removeCookie(const std::string &name, const std::string &domain, const std::string &path = std::string("/") );
+	
+private:
+	static LLPluginCookieStore *sCookieStore;
 };
 
 // Implementation functions not exported into header file
@@ -81,6 +103,9 @@ class LLViewerMediaImpl
 	LOG_CLASS(LLViewerMediaImpl);
 public:
 
+	friend class LLViewerMedia;
+	friend class LLMimeDiscoveryResponder;
+
 	LLViewerMediaImpl(const std::string& media_url,
 		const LLUUID& texture_id,
 		S32 media_width, 
@@ -124,6 +149,7 @@ public:
 	std::string getMediaURL() { return mMediaURL; }
 	std::string getHomeURL() { return mHomeURL; }
 	void setHomeURL(const std::string& home_url) { mHomeURL = home_url; }
+	void clearCache();
 	std::string getMimeType() { return mMimeType; }
 	void getTextureSize(S32 *texture_width, S32 *texture_height);
 	void scaleMouse(S32 *mouse_x, S32 *mouse_y);
@@ -174,6 +200,7 @@ public:
 
 	// Inherited from LLPluginClassMediaOwner
 	/*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, LLPluginClassMediaOwner::EMediaEvent);
+	/*virtual*/ void handleCookieSet(LLPluginClassMedia* self, const std::string &cookie);
 
 	// LLEditMenuHandler overrides
 	/*virtual*/ void	cut();
@@ -184,8 +211,9 @@ public:
 
 	/*virtual*/ void	paste();
 	/*virtual*/ BOOL	canPaste() const;
-	
-public:
+
+	bool mNeedsNewTexture;
+private:
 	// a single media url with some data and an impl.
 	LLUUID mTextureId;
 	bool  mMovieImageHasMips;
@@ -198,11 +226,11 @@ public:
 	S32 mMediaHeight;
 	bool mMediaAutoScale;
 	bool mMediaLoop;
-	bool mNeedsNewTexture;
 	S32 mTextureUsedWidth;
 	S32 mTextureUsedHeight;
 	bool mSuspendUpdates;
 	bool mVisible;
+	bool mClearCache;
 
 private:
 	/*LLViewerMediaTexture*/LLViewerTexture *updatePlaceholderImage();

From c90c8e0f4beda031c78bc000cd270e4ae7df0831 Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Fri, 3 Aug 2012 11:32:36 -0400
Subject: [PATCH 130/199] OpenID

Added support into client for openid
---
 indra/newview/app_settings/settings.xml |  11 ++
 indra/newview/llfloateravatarinfo.cpp   |  11 ++
 indra/newview/llfloateravatarinfo.h     |   1 +
 indra/newview/llstartup.cpp             |   9 +-
 indra/newview/llurl.cpp                 |   6 +
 indra/newview/llurl.h                   |   1 +
 indra/newview/llviewermedia.cpp         | 192 +++++++++++++++++++++++-
 indra/newview/llviewermedia.h           |  14 +-
 indra/newview/llweb.cpp                 |  73 ++++++++-
 indra/newview/llweb.h                   |   4 +
 10 files changed, 308 insertions(+), 14 deletions(-)

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a60999386..97ce9b953 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -7154,6 +7154,17 @@
       <key>Value</key>
       <string>help/index.html</string>
     </map>
+    <key>WebProfileURL</key>
+    <map>
+      <key>Comment</key>
+      <string>URL for Web Profiles</string>
+      <key>Persist</key>
+      <integer>0</integer>
+      <key>Type</key>
+      <string>String</string>
+      <key>Value</key>
+      <string>https://my.secondlife.com/[AGENT_NAME]</string>
+    </map>
     <key>HighResSnapshot</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfloateravatarinfo.cpp b/indra/newview/llfloateravatarinfo.cpp
index d3fc5596d..f60e24623 100644
--- a/indra/newview/llfloateravatarinfo.cpp
+++ b/indra/newview/llfloateravatarinfo.cpp
@@ -42,6 +42,7 @@
 #include "llcommandhandler.h"
 #include "llpanelavatar.h"
 #include "lluictrlfactory.h"
+#include "llweb.h"
 
 // linden library includes
 #include "llinventory.h"
@@ -293,3 +294,13 @@ LLPreview::EAssetStatus LLFloaterAvatarInfo::getAssetStatus()
 	}
 	return mAssetStatus;
 }
+
+std::string getProfileURL(const std::string& agent_name)
+{
+	std::string url = gSavedSettings.getString("WebProfileURL");
+	LLSD subs;
+	subs["AGENT_NAME"] = agent_name;
+	url = LLWeb::expandURLSubstitutions(url,subs);
+	LLStringUtil::toLower(url);
+	return url;
+}
diff --git a/indra/newview/llfloateravatarinfo.h b/indra/newview/llfloateravatarinfo.h
index 9d78e18ec..6e608e9e4 100644
--- a/indra/newview/llfloateravatarinfo.h
+++ b/indra/newview/llfloateravatarinfo.h
@@ -101,5 +101,6 @@ private:
 	EOnlineStatus	mSuggestedOnlineStatus;
 };
 
+std::string getProfileURL(const std::string& agent_name);
 
 #endif
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 08a260871..10e21ad92 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -4306,7 +4306,6 @@ bool process_login_success_response(std::string& password)
 #endif
 	}
 
-	
 	// Override grid info with anything sent in the login response
 	std::string tmp = response["gridname"].asString();
 	if (!tmp.empty()) gHippoGridManager->getConnectedGrid()->setGridName(tmp);
@@ -4351,6 +4350,14 @@ bool process_login_success_response(std::string& password)
 	gHippoGridManager->saveFile();
 	gHippoLimits->setLimits();
 
+	// Start the process of fetching the OpenID session cookie for this user login
+	std::string openid_url = response["openid_url"];
+	if(!openid_url.empty())
+	{
+		std::string openid_token = response["openid_token"];
+		LLViewerMedia::openIDSetup(openid_url, openid_token);
+	}
+
 	gIMMgr->loadIgnoreGroup();
 
 	bool success = false;
diff --git a/indra/newview/llurl.cpp b/indra/newview/llurl.cpp
index ab65ead4c..83a5839a9 100644
--- a/indra/newview/llurl.cpp
+++ b/indra/newview/llurl.cpp
@@ -286,5 +286,11 @@ const char * LLURL::getFullPath()
 	return(sReturnString);
 }
 
+const char * LLURL::getAuthority()
+{
+	strncpy(LLURL::sReturnString,mAuthority, LL_MAX_PATH -1);               /* Flawfinder: ignore */
+	LLURL::sReturnString[LL_MAX_PATH -1] = '\0';
+	return(sReturnString);
+}
 
 char LLURL::sReturnString[LL_MAX_PATH] = "";
diff --git a/indra/newview/llurl.h b/indra/newview/llurl.h
index 9a089dd83..e41b83d29 100644
--- a/indra/newview/llurl.h
+++ b/indra/newview/llurl.h
@@ -79,6 +79,7 @@ public:
 
 	virtual const char *getFQURL() const;
 	virtual const char *getFullPath();
+	virtual const char *getAuthority();
 
 	virtual const char *updateRelativePath(const LLURL &url);
 
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index c76b4b335..508dc1f5a 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -55,6 +55,7 @@
 #include "llvieweraudio.h"
 #include "llweb.h"
 
+#include "llfloateravatarinfo.h"	// for getProfileURL() function
 //#include "viewerversion.h"
 
 // Merov: Temporary definitions while porting the new viewer media code to Snowglobe
@@ -83,11 +84,6 @@ public:
 		completeAny(status, mime_type);
 	}
 
-	virtual void error( U32 status, const std::string& reason )
-	{
-		// completeAny(status, "none/none");
-	}
-
 	void completeAny(U32 status, const std::string& mime_type)
 	{
 		if(!mInitialized && ! mime_type.empty())
@@ -104,9 +100,81 @@ public:
 		viewer_media_t mMediaImpl;
 		bool mInitialized;
 };
+
+class LLViewerMediaOpenIDResponder : public LLHTTPClient::Responder
+{
+LOG_CLASS(LLViewerMediaOpenIDResponder);
+public:
+	LLViewerMediaOpenIDResponder( )
+	{
+	}
+
+	~LLViewerMediaOpenIDResponder()
+	{
+	}
+
+	/* virtual */ void completedHeader(U32 status, const std::string& reason, const LLSD& content)
+	{
+		LL_DEBUGS("MediaAuth") << "status = " << status << ", reason = " << reason << LL_ENDL;
+		LL_DEBUGS("MediaAuth") << content << LL_ENDL;
+		std::string cookie = content["set-cookie"].asString();
+		
+		LLViewerMedia::openIDCookieResponse(cookie);
+	}
+
+	/* virtual */ void completedRaw(
+		U32 status,
+		const std::string& reason,
+		const LLChannelDescriptors& channels,
+		const LLIOPipe::buffer_ptr_t& buffer)
+	{
+		// This is just here to disable the default behavior (attempting to parse the response as llsd).
+		// We don't care about the content of the response, only the set-cookie header.
+	}
+
+};
+
+class LLViewerMediaWebProfileResponder : public LLHTTPClient::Responder
+{
+LOG_CLASS(LLViewerMediaWebProfileResponder);
+public:
+	LLViewerMediaWebProfileResponder(std::string host)
+	{
+		mHost = host;
+	}
+
+	~LLViewerMediaWebProfileResponder()
+	{
+	}
+
+	/* virtual */ void completedHeader(U32 status, const std::string& reason, const LLSD& content)
+	{
+		LL_WARNS("MediaAuth") << "status = " << status << ", reason = " << reason << LL_ENDL;
+		LL_WARNS("MediaAuth") << content << LL_ENDL;
+
+		std::string cookie = content["set-cookie"].asString();
+
+		LLViewerMedia::getCookieStore()->setCookiesFromHost(cookie, mHost);
+	}
+
+	 void completedRaw(
+		U32 status,
+		const std::string& reason,
+		const LLChannelDescriptors& channels,
+		const LLIOPipe::buffer_ptr_t& buffer)
+	{
+		// This is just here to disable the default behavior (attempting to parse the response as llsd).
+		// We don't care about the content of the response, only the set-cookie header.
+	}
+
+	std::string mHost;
+};
+
+LLPluginCookieStore *LLViewerMedia::sCookieStore = NULL;
+LLURL LLViewerMedia::sOpenIDURL;
+std::string LLViewerMedia::sOpenIDCookie;
 typedef std::list<LLViewerMediaImpl*> impl_list;
 static impl_list sViewerMediaImplList;
-LLPluginCookieStore *LLViewerMedia::sCookieStore = NULL;
 static std::string sUpdatedCookies;
 static const char *PLUGIN_COOKIE_FILE_NAME = "plugin_cookies.txt";
 
@@ -370,6 +438,9 @@ void LLViewerMedia::clearAllCookies()
 			LLFile::remove(target);
 		}
 	}
+	
+	// If we have an OpenID cookie, re-add it to the cookie store.
+	setOpenIDCookie();
 }
 	
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -453,6 +524,9 @@ void LLViewerMedia::loadCookieFile()
 			plugin->clear_cookies();
 		}
 	}
+	
+	// If we have an OpenID cookie, re-add it to the cookie store.
+	setOpenIDCookie();
 }
 
 
@@ -523,6 +597,112 @@ void LLViewerMedia::removeCookie(const std::string &name, const std::string &dom
 	
 	addCookie(name, "", domain, LLDate(LLDate::now().secondsSinceEpoch() - 1.0), path);
 }
+
+
+LLSD LLViewerMedia::getHeaders()
+{
+	LLSD headers = LLSD::emptyMap();
+	headers["Accept"] = "*/*";
+	headers["Content-Type"] = "application/xml";
+	headers["Cookie"] = sOpenIDCookie;
+	headers["User-Agent"] = getCurrentUserAgent();
+
+	return headers;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// static
+void LLViewerMedia::setOpenIDCookie()
+{
+	if(!sOpenIDCookie.empty())
+	{
+		// The LLURL can give me the 'authority', which is of the form: [username[:password]@]hostname[:port]
+		// We want just the hostname for the cookie code, but LLURL doesn't seem to have a way to extract that.
+		// We therefore do it here.
+		std::string authority = sOpenIDURL.mAuthority;
+		std::string::size_type host_start = authority.find('@'); 
+		if(host_start == std::string::npos)
+		{
+			// no username/password
+			host_start = 0;
+		}
+		else
+		{
+			// Hostname starts after the @. 
+			// (If the hostname part is empty, this may put host_start at the end of the string.  In that case, it will end up passing through an empty hostname, which is correct.)
+			++host_start;
+		}
+		std::string::size_type host_end = authority.rfind(':'); 
+		if((host_end == std::string::npos) || (host_end < host_start))
+		{
+			// no port
+			host_end = authority.size();
+		}
+		
+		getCookieStore()->setCookiesFromHost(sOpenIDCookie, authority.substr(host_start, host_end - host_start));
+		
+		// Do a web profile get so we can store the cookie 
+		LLSD headers = LLSD::emptyMap();
+		headers["Accept"] = "*/*";
+		headers["Cookie"] = sOpenIDCookie;
+		headers["User-Agent"] = getCurrentUserAgent();
+
+		std::string profile_url = getProfileURL("");
+		LLURL raw_profile_url( profile_url.c_str() );
+
+		LL_DEBUGS("MediaAuth") << "Requesting " << profile_url << llendl;
+		LL_DEBUGS("MediaAuth") << "sOpenIDCookie = [" << sOpenIDCookie << "]" << llendl;
+		LLHTTPClient::get(profile_url,  
+			new LLViewerMediaWebProfileResponder(raw_profile_url.getAuthority()),
+			headers);
+	}
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// static
+void LLViewerMedia::openIDSetup(const std::string &openid_url, const std::string &openid_token)
+{
+	LL_DEBUGS("MediaAuth") << "url = \"" << openid_url << "\", token = \"" << openid_token << "\"" << LL_ENDL;
+
+	// post the token to the url 
+	// the responder will need to extract the cookie(s).
+
+	// Save the OpenID URL for later -- we may need the host when adding the cookie.
+	sOpenIDURL.init(openid_url.c_str());
+	
+	// We shouldn't ever do this twice, but just in case this code gets repurposed later, clear existing cookies.
+	sOpenIDCookie.clear();
+
+	LLSD headers = LLSD::emptyMap();
+	// Keep LLHTTPClient from adding an "Accept: application/llsd+xml" header
+	headers["Accept"] = "*/*";
+	// and use the expected content-type for a post, instead of the LLHTTPClient::postRaw() default of "application/octet-stream"
+	headers["Content-Type"] = "application/x-www-form-urlencoded";
+
+	// postRaw() takes ownership of the buffer and releases it later, so we need to allocate a new buffer here.
+	size_t size = openid_token.size();
+	U8 *data = new U8[size];
+	memcpy(data, openid_token.data(), size);
+
+	LLHTTPClient::postRaw( 
+		openid_url, 
+		data, 
+		size, 
+		new LLViewerMediaOpenIDResponder(),
+		headers);
+			
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+// static
+void LLViewerMedia::openIDCookieResponse(const std::string &cookie)
+{
+	LL_DEBUGS("MediaAuth") << "Cookie received: \"" << cookie << "\"" << LL_ENDL;
+	
+	sOpenIDCookie += cookie;
+
+	setOpenIDCookie();
+}
 //////////////////////////////////////////////////////////////////////////////////////////
 // static
 void LLViewerMedia::cleanupClass()
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index 5e4f49489..ada13304c 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -92,8 +92,17 @@ class LLViewerMedia
 	static void addSessionCookie(const std::string &name, const std::string &value, const std::string &domain, const std::string &path = std::string("/"), bool secure = false );
 	static void removeCookie(const std::string &name, const std::string &domain, const std::string &path = std::string("/") );
 	
+	static void openIDSetup(const std::string &openid_url, const std::string &openid_token);
+	static void openIDCookieResponse(const std::string &cookie);
+
+	static LLSD getHeaders();
+
 private:
+	static void setOpenIDCookie();
+
 	static LLPluginCookieStore *sCookieStore;
+	static LLURL sOpenIDURL;
+	static std::string sOpenIDCookie;
 };
 
 // Implementation functions not exported into header file
@@ -104,7 +113,6 @@ class LLViewerMediaImpl
 public:
 
 	friend class LLViewerMedia;
-	friend class LLMimeDiscoveryResponder;
 
 	LLViewerMediaImpl(const std::string& media_url,
 		const LLUUID& texture_id,
@@ -123,9 +131,6 @@ public:
 	LLPluginClassMedia* getMediaPlugin() const { return (LLPluginClassMedia*)mPluginBase; }
 	void setSize(int width, int height);
 
-	// Inherited from LLViewerPluginManager.
-	/*virtual*/ void update();
-
 	void play();
 	void stop();
 	void pause();
@@ -155,6 +160,7 @@ public:
 	void scaleMouse(S32 *mouse_x, S32 *mouse_y);
 
 	void updateMovieImage(const LLUUID& image_id, BOOL active);
+	void update();
 	void updateImagesMediaStreams();
 	LLUUID getMediaTextureID();
 	
diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp
index 28bfe034a..4dbcfc578 100644
--- a/indra/newview/llweb.cpp
+++ b/indra/newview/llweb.cpp
@@ -35,11 +35,20 @@
 
 #include "llweb.h"
 
-#include "llviewerwindow.h"
-#include "llwindow.h"
+// Library includes
+#include "llwindow.h"	// spawnWebBrowser()
 
-#include "llviewercontrol.h"
+#include "llagent.h"
+#include "llappviewer.h"
 #include "llfloatermediabrowser.h"
+#include "llparcel.h"
+#include "llviewercontrol.h"
+#include "llviewernetwork.h"
+#include "llviewerparcelmgr.h"
+#include "llviewerregion.h"
+#include "llviewerwindow.h"
+
+#include "sgversion.h"
 
 // static
 void LLWeb::initClass()
@@ -125,6 +134,64 @@ std::string LLWeb::escapeURL(const std::string& url)
 	return escaped_url;
 }
 
+//static
+std::string LLWeb::expandURLSubstitutions(const std::string &url,
+										  const LLSD &default_subs)
+{
+    gCurrentVersion = llformat("%s %d.%d.%d.%d",
+        gVersionChannel,
+        gVersionMajor,
+        gVersionMinor,
+        gVersionPatch,
+        gVersionBuild );
+
+	LLSD substitution = default_subs;
+	substitution["VERSION"] = gCurrentVersion;
+	substitution["VERSION_MAJOR"] = gVersionMajor;
+	substitution["VERSION_MINOR"] = gVersionMinor;
+	substitution["VERSION_PATCH"] = gVersionPatch;
+	substitution["VERSION_BUILD"] = gVersionBuild;
+	substitution["CHANNEL"] = gVersionChannel;
+	substitution["GRID"] = LLViewerLogin::getInstance()->getGridLabel();
+	substitution["OS"] = LLAppViewer::instance()->getOSInfo().getOSStringSimple();
+	substitution["SESSION_ID"] = gAgent.getSessionID();
+	substitution["FIRST_LOGIN"] = gAgent.isFirstLogin();
+
+	// work out the current language
+	std::string lang = LLUI::getLanguage();
+	if (lang == "en-us")
+	{
+		// *HACK: the correct fix is to change English.lproj/language.txt,
+		// but we're late in the release cycle and this is a less risky fix
+		lang = "en";
+	}
+	substitution["LANGUAGE"] = lang;
+
+	// find the region ID
+	LLUUID region_id;
+	LLViewerRegion *region = gAgent.getRegion();
+	if (region)
+	{
+		region_id = region->getRegionID();
+	}
+	substitution["REGION_ID"] = region_id;
+
+	// find the parcel local ID
+	S32 parcel_id = 0;
+	LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
+	if (parcel)
+	{
+		parcel_id = parcel->getLocalID();
+	}
+	substitution["PARCEL_ID"] = llformat("%d", parcel_id);
+
+	// expand all of the substitution strings and escape the url
+	std::string expanded_url = url;
+	LLStringUtil::format(expanded_url, substitution);
+
+	return LLWeb::escapeURL(expanded_url);
+}
+
 // virtual
 void LLWeb::URLLoader::load(const std::string& url)
 {
diff --git a/indra/newview/llweb.h b/indra/newview/llweb.h
index 8dd13ffcb..73f5c7ebe 100644
--- a/indra/newview/llweb.h
+++ b/indra/newview/llweb.h
@@ -57,6 +57,10 @@ public:
 	// Returns escaped (eg, " " to "%20") url
 	static std::string escapeURL(const std::string& url);
 
+	/// Expands various strings like [LANG], [VERSION], etc. in a URL
+	static std::string expandURLSubstitutions(const std::string &url,
+											  const LLSD &default_subs);
+
 	class URLLoader : public LLAlertDialog::URLLoader
 	{
 		virtual void load(const std::string& url);

From b91a670c05c80ed55c85a6a24f8ed4b82fe99df2 Mon Sep 17 00:00:00 2001
From: Damian Zhaoying <damian.zhaoying@avataresargentinos.com.ar>
Date: Fri, 3 Aug 2012 14:13:19 -0300
Subject: [PATCH 131/199] some spanish language files fixes

---
 .../xui/en-us/panel_preferences_ascent_system.xml    |  2 +-
 .../default/xui/es/panel_preferences_ascent_chat.xml | 10 +++++-----
 .../xui/es/panel_preferences_ascent_system.xml       |  3 +--
 .../default/xui/es/panel_preferences_general.xml     |  2 +-
 .../default/xui/es/panel_preferences_graphics1.xml   |  4 ++--
 .../skins/default/xui/es/panel_preferences_grids.xml |  2 +-
 .../skins/default/xui/es/panel_preferences_im.xml    |  7 ++++---
 .../skins/default/xui/es/panel_preferences_skins.xml | 12 ++++++------
 .../skins/default/xui/es/panel_preferences_voice.xml |  9 +++++----
 .../skins/default/xui/es/panel_region_covenant.xml   |  5 +++--
 .../skins/default/xui/es/panel_region_debug.xml      |  7 ++++---
 .../skins/default/xui/es/panel_region_general.xml    |  2 +-
 .../skins/default/xui/es/panel_region_terrain.xml    |  2 +-
 13 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
index 5bb4eeed8..e43ab6d30 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
@@ -120,7 +120,7 @@
       <spinner bottom_delta="60" decimal_digits="0" follows="top" height="16" increment="1" label="Alpha" label_width="45" left_delta="70" max_val="100" min_val="0" name="alpha" width="97" control_name="EmeraldBuildPrefs_Alpha"/>
       <spinner bottom_delta="-20" decimal_digits="2" follows="top" height="16" increment="0.05" label="Glow" label_width="45" max_val="1" min_val="0" name="glow" width="97" control_name="EmeraldBuildPrefs_Glow"/>
       <check_box follows="top" height="16" label="Full Bright" name="EmFBToggle" control_name="EmeraldBuildPrefs_FullBright"/>
-      <text follows="top">Shine</text>
+      <text name="shine" follows="top">Shine</text>
       <combo_box bottom_delta="-5" follows="top" left_delta="33" height="18" name="combobox shininess" tool_tip="Set the amount of shine for the object" width="64" control_name="EmeraldBuildPrefs_Shiny">
         <combo_item name="None" value="None">None</combo_item>
         <combo_item name="Low" value="Low">Low</combo_item>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_ascent_chat.xml
index c42c2355b..d43c17ada 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_chat.xml
@@ -3,9 +3,9 @@
 	<tab_container label="Chat Avanzado" name="Ascent Chat">
 		<panel label="Chat/MI" name="Chat/IM">
 			<text name="objects_link_text_box">
-				MIs:
+				Mensajes Instantáneos:
 			</text>
-			<check_box label="Usar Pestañas de MI Verticales (Requiere reiniciar)" name="use_vertical_ims_check"/>
+			<check_box label="Usar Pestañas Verticales (Requiere reiniciar)" name="use_vertical_ims_check"/>
 			<check_box label="Anunciar Mensajes Instantáneos Entrantes" tool_tip="Abre una ventana de MI cuando alguien comienza a escribirte un MI. Esto te permite conocer cuando alguien te abre un MI antes de enviartelo." name="quickstart_im_check"/>
 			<check_box label="No enviar '[nombre] está escribiendo...'  en MIs" tool_tip="Tu contacto de MI no verá '______ está escribiendo...' cuando le respondes." name="hide_typing_check"/>
 			<check_box label="Mostrar nombre del grupo en el chat" tool_tip="El nombre del grupo también será mostrado si el MI es de un chat de grupo." name="append_group_name_check"/>
@@ -33,7 +33,7 @@
 			<text name="time_format_text_box">
 				Formato de Hora:
 			</text>
-			<combo_box tool_tip="Muestras las horas o bien en formato 12-23 o 12PM-11PM." name="time_format_combobox">
+			<combo_box tool_tip="Muestras las horas o bien en formato 12-23 o 12PM-11PM." name="time_format_combobox" left="105" width="120">
 				<combo_item name="24hours">
 					Reloj de 24-horas
 				</combo_item>
@@ -45,7 +45,7 @@
 			<text name="date_format_text_box">
 				Formato de Fecha:
 			</text>
-			<combo_box name="date_format_combobox">
+			<combo_box name="date_format_combobox" left="105" width="120">
 				<combo_item name="year_first">
 					YYYY-MM-DD
 				</combo_item>
@@ -61,7 +61,7 @@
 			<check_box label="Responder a no amigos" name="AscentInstantMessageResponseFriends" tool_tip="Envia un mensaje pre-grabado de tu elección cuando alguien te abre un IM. (Escribe tu mensaje en el área de texto  de la Ventana Texto de Respuesta."/>
 			<check_box label="Responder a quienes tienes ignorados" name="AscentInstantMessageResponseMuted" tool_tip="Envia un mensaje pre-grabado de tu elección cuando alguien te abre un IM. (Escribe tu mensaje en el área de texto  de la Ventana Texto de Respuesta."/>
 			<check_box label="Enviar apenas comienzan a escribir" name="AscentInstantMessageShowOnTyping"/>
-			<check_box label="No mostrar MIs contestados automáticamente" name="AscentInstantMessageShowResponded"/>
+			<check_box label="No mostrar MIs autorespondidos" name="AscentInstantMessageShowResponded"/>
 			<check_box label="Responder a todos los mensajes" name="AscentInstantMessageResponseRepeat"/>
 			<check_box label="Enviar un item junto con la respuesta" name="AscentInstantMessageResponseItem" tool_tip="Puedes incluir un item de tu inventario para enviar junto con tu respuesta automática, arrástrandolo desde tu inventario al cuadro inferior"/>
 			<text name="im_give_disp_rect_txt" tool_tip="Arrastra un ítem del Inventario hasta aquí para entregarlo junto con tu respuesta automática">
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml b/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
index 5e979a621..b644decf7 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_ascent_system.xml
@@ -133,7 +133,7 @@
 			<spinner label="Alfa" name="alpha" />
 			<spinner label="Brillo" name="glow"/>
 			<check_box label="Brillo Total" name="EmFBToggle"/>
-			<text follows="top">
+			<text name="shine" follows="top">
 				Brillar
 			</text>
 			<combo_box label="Brillo" name="combobox shininess" tool_tip="Fijar la intensidad de brillo para el objeto">
@@ -151,7 +151,6 @@
 				</combo_item>
 			</combo_box>
 			<check_box name="EmeraldBuildPrefsEmbedItem" label="Colocar un item dentro del nuevo objeto"/>
-			<check_box name="EmeraldBuildPrefsEmbedItem" label="Colocar un item dentro del nuevo objeto"/>
 			<text name="Give inventory">
 				Soltar aquí item de Invent.
 			</text>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_general.xml b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
index 4b8c96cdb..b6eb958de 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_general.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel label="General" name="general_panel">
-	<radio_group name="default_start_location">
+	<radio_group name="default_start_location" width="250">
 		<radio_item name="MyHome" tool_tip="Iniciar sesión de forma predeterminada en Mi Base.">
 			Mi Base
 		</radio_item>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
index 351162fb4..29874a65f 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_graphics1.xml
@@ -2,7 +2,7 @@
 <panel label="Gráficos" name="Display panel">
 	<check_box label="Ejecutar el Visor en Ventana" name="windowed mode" tool_tip="Si está desmarcado, el visor se ejecutará a pantalla completa cuando inicies sesión."/>
 	<text name="WindowSizeLabel">
-		Tamaño de Ventana:
+		Tamaño de la Ventana:
 	</text>
 	<combo_box name="windowsize combo">
 		<combo_item name="800x600">
@@ -73,7 +73,7 @@
 			<text name="QualityText2">
 				Alta Calidad
 			</text>
-			<check_box label="Personalizar" name="CustomSettings"/>
+			<check_box left="385" label="Personalizar" name="CustomSettings"/>
 			<text name="ShadersText">
 				Sombreado:
 			</text>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_grids.xml b/indra/newview/skins/default/xui/es/panel_preferences_grids.xml
index caff4f8b6..c5ea85f22 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_grids.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_grids.xml
@@ -38,7 +38,7 @@
 	<!-- Advanced settings -->
 	<!-- Grid Splash Page -->
 	<text name="loginpage_label">
-		Página de Bienvenida:
+		Pág. de Bienvenida:
 	</text>
 	<!-- Helper URI -->
 	<text name="helperuri_label">
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_im.xml b/indra/newview/skins/default/xui/es/panel_preferences_im.xml
index 046787cd7..0bee8d60d 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_im.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_im.xml
@@ -14,8 +14,9 @@
 	<check_box label="Incluir MI en la consola de Chat" name="include_im_in_chat_console"/>
 	<check_box label="Mostrar horario en los IMI" name="show_timestamps_check"/>
 	<check_box label="Mostrar notificaciones cuando los amigos inician/terminan sesión" name="friends_online_notify_checkbox"/>
-	<text name="text_box3">
-		Respuesta en Modo Ocupado:
+	<text name="text_box3" heigh="42">
+		Respuesta en 
+Modo Ocupado:
 	</text>
 	<text name="text_box4">
 		Opciones de Registro:
@@ -28,5 +29,5 @@
 	<check_box label="Mostrar MI recibidos en el registro de chat local" name="log_chat_IM"/>
 	<check_box label="Incluir fecha con horario" name="log_date_timestamp"/>
 	<check_box label="Agregar fecha al nombre de archivo de registro" name="logfile_name_datestamp"/>
-	<button label="Cambiar Ruta" label_selected="Cambiar Ruta" name="log_path_button"/>
+	<button label="Cambiar Ruta" label_selected="Cambiar Ruta" name="log_path_button" left="50" width="110"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_skins.xml b/indra/newview/skins/default/xui/es/panel_preferences_skins.xml
index a08f2dcd0..1fe20b5d0 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_skins.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_skins.xml
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel label="Pieles" name="Skins panel">
+<panel label="Apariencias" name="Skins panel">
 	<text name="Skin_txt1">
-		Piel Seleccionada
+		Apariencia Seleccionada
 	</text>
 	<combo_box name="custom_skin_combo" />
 	<text name="Skin_txt2">
 		Autor Principal
 	</text>
 	<text name="custom_skin_author">
-		Autor de la Piel
+		Autor de la Apariencia
 	</text>
 	<text name="Skin_txt3">
 		Autores Adicionales
 	</text>
 	<text name="custom_skin_ad_authors">
-		Autores Adicionales de la Piel
+		Autores Adicionales de la Apariencia
 	</text>
 	<text name="Skin_txt4">
-		Carpeta de la Piel
+		Carpeta de la Apariencia
 	</text>
 	<text name="custom_skin_folder">
-		Carpeta de la Piel
+		Carpeta de la Apariencia
 	</text>
 	<button label="" name="custom_skin_preview" tool_tip="Vista Previa de la Piel"/>
 	<text name="Skin_txt5">
diff --git a/indra/newview/skins/default/xui/es/panel_preferences_voice.xml b/indra/newview/skins/default/xui/es/panel_preferences_voice.xml
index 049aa9f0a..d7bf178a6 100644
--- a/indra/newview/skins/default/xui/es/panel_preferences_voice.xml
+++ b/indra/newview/skins/default/xui/es/panel_preferences_voice.xml
@@ -16,9 +16,10 @@
 		Apretar para Hablar
 	</text>
 	<text name="voice_chat_description">
-		El modo Apretar para Hablar controla cuándo tu voz se transmite. En el modo 'un toque', 
-pulsa y suelta el botón Apretar para Hablar para activar y desactivar su micrófono. Si no se está 
-en el modo 'un toque', el micrófono está activo sólo cuando se mantiene pulsado el botón.
+		El modo Apretar para Hablar controla cuándo tu voz se transmite. En el modo 
+'un toque', pulsa y suelta el botón Apretar para Hablar para activar y desactivar 
+tu micrófono. Si no se está en el modo 'un toque', el micrófono está activo
+sólo cuando se mantiene pulsado el botón.
 	</text>
 	<check_box label="Usar Apretar para Hablar en el modo 'Un Toque'" name="push_to_talk_toggle_check"/>
 	<text name="push_to_talk_label">
@@ -35,7 +36,7 @@ en el modo 'un toque', el micrófono está activo sólo cuando se mantiene pulsa
 	</text>
 	<check_box label="Aceptar llamadas sólo de mis contactos" left_delta="20" name="voice_call_friends_only_check"/>
 	<check_box label="Apagar el micrófono al terminar la llamada por MI" name="auto_disengage_mic_check"/>
-	<button label="Configuración de Dispositivos" left="28" mouse_opaque="true" name="device_settings_btn" width="155"/>
+	<button label="Configuración de Dispositivos" left="28" name="device_settings_btn" width="200"/>
 	<text name="device_settings_text">
 		NOTA: Ejecutar esta configuración te desconectará temporalmente del chat de voz, 
 y los cambios se aplicarán inmediatamente..
diff --git a/indra/newview/skins/default/xui/es/panel_region_covenant.xml b/indra/newview/skins/default/xui/es/panel_region_covenant.xml
index 82c4d88ec..d41607dc1 100644
--- a/indra/newview/skins/default/xui/es/panel_region_covenant.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_covenant.xml
@@ -27,9 +27,10 @@
 	</text_editor>
 	<button label="Reinicar" name="reset_covenant"/>
 	<text name="covenant_help_text">
-		Los cambios en el Convenio serán mostrados en todas las parcelas del Estado.
+		Los cambios en el Convenio serán mostrados en todas las parcelas 
+del Estado.
 	</text>
-	<text name="covenant_instructions">
+	<text bottom_delta="-28" name="covenant_instructions">
 		Arrastra y suelta una nota para cambiar el Convenio para este Estado.
 	</text>
 	<text name="region_section_lbl">
diff --git a/indra/newview/skins/default/xui/es/panel_region_debug.xml b/indra/newview/skins/default/xui/es/panel_region_debug.xml
index b9eee97c5..8ec67c040 100644
--- a/indra/newview/skins/default/xui/es/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_debug.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="region_text_lbl">
+<panel label="Depurador" name="Debug">
+	<text name="region_text_lbl">
 		Región:
 	</text>
 	<text name="region_text">
 		desconocida
 	</text>
-	<check_box label="Disactivar Scripts" name="disable_scripts_check" tool_tip="Desactiva todos los scripts en esta región"/>
+	<check_box label="Desactivar Scripts" name="disable_scripts_check" tool_tip="Desactiva todos los scripts en esta región"/>
 	<button label="?" name="disable_scripts_help"/>
-	<check_box label="Disactivar Colisiones" name="disable_collisions_check" tool_tip="Desactiva las colisiones provocadas por objetos en esta región"/>
+	<check_box label="Desactivar Colisiones" name="disable_collisions_check" tool_tip="Desactiva las colisiones provocadas por objetos en esta región"/>
 	<button label="?" name="disable_collisions_help"/>
 	<check_box label="Desactivar Físicas" name="disable_physics_check" tool_tip="Desactiva todas las propiedades físicas en esta región"/>
 	<button label="?" name="disable_physics_help"/>
diff --git a/indra/newview/skins/default/xui/es/panel_region_general.xml b/indra/newview/skins/default/xui/es/panel_region_general.xml
index f8fae43af..84ea5e116 100644
--- a/indra/newview/skins/default/xui/es/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_general.xml
@@ -54,6 +54,6 @@
 	<button label="Aplicar" name="apply_btn"/>
 	<button label="Teleportar Usuario a su Base..." name="kick_btn"/>
 	<button label="Teleportar a todos los usuarios a su base..." name="kick_all_btn"/>
-	<button label="Enviar mensaje a la Región..."/>
+	<button label="Enviar mensaje a la Región..." name="im_btn"/>
 	<button label="Administrar Telepuerto..." name="manage_telehub_btn"/>
 </panel>
diff --git a/indra/newview/skins/default/xui/es/panel_region_terrain.xml b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
index e93a1879e..8536e1d72 100644
--- a/indra/newview/skins/default/xui/es/panel_region_terrain.xml
+++ b/indra/newview/skins/default/xui/es/panel_region_terrain.xml
@@ -8,7 +8,7 @@
 	</text>
 	<spinner label="Altura del Agua" name="water_height_spin"/>
 	<button label="?" name="water_height_help"/>
-	<spinner label="Límite de elevación del Terreno" label_width="120"name="terrain_raise_spin"/>
+	<spinner label="Límite de elevación del Terreno" label_width="120" name="terrain_raise_spin"/>
 	<button label="?" name="terrain_raise_help"/>
 	<spinner label="Límite de bajada del Terreno" label_width="120" name="terrain_lower_spin"/>
 	<button label="?" name="terrain_lower_help"/>

From c385133c8452d1c9aff0ff3069bb35554bdae768 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 3 Aug 2012 13:10:16 -0500
Subject: [PATCH 132/199] Fixed noisemap not binding for the nightvision
 shader.

---
 indra/llrender/llpostprocess.cpp | 44 ++++++++++++++++----------------
 indra/llrender/llrender.cpp      |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/indra/llrender/llpostprocess.cpp b/indra/llrender/llpostprocess.cpp
index e09d0f349..868a2e4b1 100644
--- a/indra/llrender/llpostprocess.cpp
+++ b/indra/llrender/llpostprocess.cpp
@@ -357,13 +357,20 @@ void LLPostProcess::createScreenTextures()
 	if(mDepthTexture)
 		LLImageGL::deleteTextures(type, 0, 0, 1, &mDepthTexture, true);
 
-	LLImageGL::generateTextures(type, GL_DEPTH_COMPONENT24, 1, &mDepthTexture);
-	gGL.getTexUnit(0)->bindManual(type, mDepthTexture);
-	LLImageGL::setManualImage(LLTexUnit::getInternalType(type), 0, GL_DEPTH_COMPONENT24, mScreenWidth, mScreenHeight, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL, false);
-	stop_glerror();
-	gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_POINT);
-	gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_CLAMP);
-	stop_glerror();
+	for(std::list<LLPointer<LLPostProcessShader> >::iterator it=mShaders.begin();it!=mShaders.end();++it)
+	{
+		if((*it)->getDepthChannel()>=0)
+		{
+			LLImageGL::generateTextures(type, GL_DEPTH_COMPONENT24, 1, &mDepthTexture);
+			gGL.getTexUnit(0)->bindManual(type, mDepthTexture);
+			LLImageGL::setManualImage(LLTexUnit::getInternalType(type), 0, GL_DEPTH_COMPONENT24, mScreenWidth, mScreenHeight, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL, false);
+			stop_glerror();
+			gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_POINT);
+			gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_CLAMP);
+			stop_glerror();
+			break;
+		}
+	}
 }
 
 void LLPostProcess::createNoiseTexture()
@@ -375,22 +382,15 @@ void LLPostProcess::createNoiseTexture()
 		}
 	}
 
-	for(std::list<LLPointer<LLPostProcessShader> >::iterator it=mShaders.begin();it!=mShaders.end();++it)
+	mNoiseTexture = new LLImageGL(FALSE) ;
+	if(mNoiseTexture->createGLTexture())
 	{
-		if((*it)->getDepthChannel()>=0)
-		{
-			mNoiseTexture = new LLImageGL(FALSE) ;
-			if(mNoiseTexture->createGLTexture())
-			{
-				gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, mNoiseTexture->getTexName());
-				LLImageGL::setManualImage(GL_TEXTURE_2D, 0, GL_LUMINANCE, NOISE_SIZE, NOISE_SIZE, GL_LUMINANCE, GL_UNSIGNED_BYTE, &buffer[0]);
-				stop_glerror();
-				gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_BILINEAR);
-				gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_WRAP);
-				stop_glerror();
-				break;
-			}
-		}
+		gGL.getTexUnit(0)->bindManual(LLTexUnit::TT_TEXTURE, mNoiseTexture->getTexName());
+		LLImageGL::setManualImage(GL_TEXTURE_2D, 0, GL_LUMINANCE, NOISE_SIZE, NOISE_SIZE, GL_LUMINANCE, GL_UNSIGNED_BYTE, &buffer[0]);
+		stop_glerror();
+		gGL.getTexUnit(0)->setTextureFilteringOption(LLTexUnit::TFO_BILINEAR);
+		gGL.getTexUnit(0)->setTextureAddressMode(LLTexUnit::TAM_WRAP);
+		stop_glerror();
 	}
 }
 
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index b952a0e4b..d73b17a51 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -380,7 +380,7 @@ bool LLTexUnit::bind(LLRenderTarget* renderTarget, bool bindDepth)
 
 	if (bindDepth)
 	{
-		if (renderTarget->hasStencil() && renderTarget->getFBO())
+		if (renderTarget->hasStencil())
 		{
 			llerrs << "Cannot bind a render buffer for sampling.  Allocate render target without a stencil buffer if sampling of depth buffer is required." << llendl;
 		}

From d9e5601e1061e31af6d91bf4471f5dbbb166869f Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 3 Aug 2012 13:12:02 -0500
Subject: [PATCH 133/199] Manually vectorized some of the UI vertex operations.

---
 indra/llrender/llrender.cpp | 41 +++++++++--------
 indra/llrender/llrender.h   | 12 ++---
 indra/llui/llui.cpp         | 88 ++++++++++++++++++-------------------
 3 files changed, 73 insertions(+), 68 deletions(-)

diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index d73b17a51..2d5fbf1b6 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -1480,9 +1480,8 @@ void LLRender::translateUI(F32 x, F32 y, F32 z)
 		llerrs << "Need to push a UI translation frame before offsetting" << llendl;
 	}
 
-	mUIOffset.back().mV[0] += x;
-	mUIOffset.back().mV[1] += y;
-	mUIOffset.back().mV[2] += z;
+	LLVector4a add(x,y,x);
+	mUIOffset.back()->add(add);
 }
 
 void LLRender::scaleUI(F32 x, F32 y, F32 z)
@@ -1492,27 +1491,28 @@ void LLRender::scaleUI(F32 x, F32 y, F32 z)
 		llerrs << "Need to push a UI transformation frame before scaling." << llendl;
 	}
 
-	mUIScale.back().scaleVec(LLVector3(x,y,z));
+	LLVector4a scale(x,y,z);
+	mUIScale.back()->mul(scale);
 }
 
 void LLRender::pushUIMatrix()
 {
 	if (mUIOffset.empty())
 	{
-		mUIOffset.push_back(LLVector3(0,0,0));
+		mUIOffset.push_back(new LLVector4a(0.f));
 	}
 	else
 	{
-		mUIOffset.push_back(mUIOffset.back());
+		mUIOffset.push_back(new LLVector4a(*mUIOffset.back()));
 	}
 	
 	if (mUIScale.empty())
 	{
-		mUIScale.push_back(LLVector3(1,1,1));
+		mUIScale.push_back(new LLVector4a(1.f));
 	}
 	else
 	{
-		mUIScale.push_back(mUIScale.back());
+		mUIScale.push_back(new LLVector4a(*mUIScale.back()));
 	}
 }
 
@@ -1522,7 +1522,9 @@ void LLRender::popUIMatrix()
 	{
 		llerrs << "UI offset stack blown." << llendl;
 	}
+	delete mUIOffset.back();
 	mUIOffset.pop_back();
+	delete mUIScale.back();
 	mUIScale.pop_back();
 }
 
@@ -1532,7 +1534,7 @@ LLVector3 LLRender::getUITranslation()
 	{
 		return LLVector3(0,0,0);
 	}
-	return mUIOffset.back();
+	return LLVector3(mUIOffset.back()->getF32ptr());
 }
 
 LLVector3 LLRender::getUIScale()
@@ -1541,7 +1543,7 @@ LLVector3 LLRender::getUIScale()
 	{
 		return LLVector3(1,1,1);
 	}
-	return mUIScale.back();
+	return LLVector3(mUIOffset.back()->getF32ptr());
 }
 
 
@@ -1551,8 +1553,8 @@ void LLRender::loadUIIdentity()
 	{
 		llerrs << "Need to push UI translation frame before clearing offset." << llendl;
 	}
-	mUIOffset.back().setVec(0,0,0);
-	mUIScale.back().setVec(1,1,1);
+	mUIOffset.back()->splat(0.f);
+	mUIScale.back()->splat(1.f);
 }
 
 void LLRender::setColorMask(bool writeColor, bool writeAlpha)
@@ -1935,12 +1937,15 @@ void LLRender::vertex3f(const GLfloat& x, const GLfloat& y, const GLfloat& z)
 
 	if (mUIOffset.empty())
 	{
-		mVerticesp[mCount] = LLVector3(x,y,z);
+		mVerticesp[mCount].set(x,y,z);
 	}
 	else
 	{
-		LLVector3 vert = (LLVector3(x,y,z)+mUIOffset.back()).scaledVec(mUIScale.back());
-		mVerticesp[mCount] = vert;
+		//LLVector3 vert = (LLVector3(x,y,z)+mUIOffset.back()).scaledVec(mUIScale.back());
+		LLVector4a& vert = mVerticesp[mCount];
+		vert.set(x,y,z);
+		vert.add(*mUIOffset.back());
+		vert.mul(*mUIScale.back());
 	}
 
 	if (mMode == LLRender::QUADS && LLRender::sGLCoreProfile)
@@ -1968,7 +1973,7 @@ void LLRender::vertex3f(const GLfloat& x, const GLfloat& y, const GLfloat& z)
 	mTexcoordsp[mCount] = mTexcoordsp[mCount-1];	
 }
 
-void LLRender::vertexBatchPreTransformed(LLVector3* verts, S32 vert_count)
+void LLRender::vertexBatchPreTransformed(LLVector4a* verts, S32 vert_count)
 {
 	if (mCount + vert_count > 4094)
 	{
@@ -2025,7 +2030,7 @@ void LLRender::vertexBatchPreTransformed(LLVector3* verts, S32 vert_count)
 	mVerticesp[mCount] = mVerticesp[mCount-1];
 }
 
-void LLRender::vertexBatchPreTransformed(LLVector3* verts, LLVector2* uvs, S32 vert_count)
+void LLRender::vertexBatchPreTransformed(LLVector4a* verts, LLVector2* uvs, S32 vert_count)
 {
 	if (mCount + vert_count > 4094)
 	{
@@ -2083,7 +2088,7 @@ void LLRender::vertexBatchPreTransformed(LLVector3* verts, LLVector2* uvs, S32 v
 	mTexcoordsp[mCount] = mTexcoordsp[mCount-1];
 }
 
-void LLRender::vertexBatchPreTransformed(LLVector3* verts, LLVector2* uvs, LLColor4U* colors, S32 vert_count)
+void LLRender::vertexBatchPreTransformed(LLVector4a* verts, LLVector2* uvs, LLColor4U* colors, S32 vert_count)
 {
 	if (mCount + vert_count > 4094)
 	{
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index 5032c0e08..a4c1cf2b5 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -387,9 +387,9 @@ public:
 	void diffuseColor4fv(const F32* c);
 	void diffuseColor4ubv(const U8* c);
 
-	void vertexBatchPreTransformed(LLVector3* verts, S32 vert_count);
-	void vertexBatchPreTransformed(LLVector3* verts, LLVector2* uvs, S32 vert_count);
-	void vertexBatchPreTransformed(LLVector3* verts, LLVector2* uvs, LLColor4U*, S32 vert_count);
+	void vertexBatchPreTransformed(LLVector4a* verts, S32 vert_count);
+	void vertexBatchPreTransformed(LLVector4a* verts, LLVector2* uvs, S32 vert_count);
+	void vertexBatchPreTransformed(LLVector4a* verts, LLVector2* uvs, LLColor4U*, S32 vert_count);
 
 	void setColorMask(bool writeColor, bool writeAlpha);
 	void setColorMask(bool writeColorR, bool writeColorG, bool writeColorB, bool writeAlpha);
@@ -449,7 +449,7 @@ private:
 	F32				mCurrAlphaFuncVal;
 
 	LLPointer<LLVertexBuffer>	mBuffer;
-	LLStrider<LLVector3>		mVerticesp;
+	LLStrider<LLVector4a>		mVerticesp;
 	LLStrider<LLVector2>		mTexcoordsp;
 	LLStrider<LLColor4U>		mColorsp;
 	std::vector<LLTexUnit*>		mTexUnits;
@@ -463,8 +463,8 @@ private:
 
 	F32				mMaxAnisotropy;
 
-	std::vector<LLVector3> mUIOffset;
-	std::vector<LLVector3> mUIScale;
+	std::vector<LLVector4a*> mUIOffset;
+	std::vector<LLVector4a*> mUIScale;
 
 };
 
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp
index bf5fc316d..c5cf582e5 100644
--- a/indra/llui/llui.cpp
+++ b/indra/llui/llui.cpp
@@ -520,7 +520,7 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLTex
 	
 	const S32 NUM_VERTICES = 9 * 4; // 9 quads
 	LLVector2 uv[NUM_VERTICES];
-	LLVector3 pos[NUM_VERTICES];
+	LLVector4a pos[NUM_VERTICES];
 
 	S32 index = 0;
 
@@ -528,157 +528,157 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLTex
 	{
 		// draw bottom left
 		uv[index] = LLVector2(uv_outer_rect.mLeft, uv_outer_rect.mBottom);
-		pos[index] = LLVector3(draw_outer_rect.mLeft, draw_outer_rect.mBottom, 0.f);
+		pos[index].set(draw_outer_rect.mLeft, draw_outer_rect.mBottom, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_center_rect.mLeft, uv_outer_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_outer_rect.mBottom, 0.f);
+		pos[index].set(draw_center_rect.mLeft, draw_outer_rect.mBottom, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mBottom, 0.f);
+		pos[index].set(draw_center_rect.mLeft, draw_center_rect.mBottom, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_outer_rect.mLeft, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_outer_rect.mLeft, draw_center_rect.mBottom, 0.f);
+		pos[index].set(draw_outer_rect.mLeft, draw_center_rect.mBottom, 0.f);
 		index++;
 
 		// draw bottom middle
 		uv[index] = LLVector2(uv_center_rect.mLeft, uv_outer_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_outer_rect.mBottom, 0.f);
+		pos[index].set(draw_center_rect.mLeft, draw_outer_rect.mBottom, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_center_rect.mRight, uv_outer_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_outer_rect.mBottom, 0.f);
+		pos[index].set(draw_center_rect.mRight, draw_outer_rect.mBottom, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mBottom, 0.f);
+		pos[index].set(draw_center_rect.mRight, draw_center_rect.mBottom, 0.f);
 		index++;
 
-		uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mBottom, 0.f);
+		uv[index].set(uv_center_rect.mLeft, uv_center_rect.mBottom);
+		pos[index].set(draw_center_rect.mLeft, draw_center_rect.mBottom, 0.f);
 		index++;
 
 		// draw bottom right
 		uv[index] = LLVector2(uv_center_rect.mRight, uv_outer_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_outer_rect.mBottom, 0.f);
+		pos[index].set(draw_center_rect.mRight, draw_outer_rect.mBottom, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_outer_rect.mRight, uv_outer_rect.mBottom);
-		pos[index] = LLVector3(draw_outer_rect.mRight, draw_outer_rect.mBottom, 0.f);
+		pos[index].set(draw_outer_rect.mRight, draw_outer_rect.mBottom, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_outer_rect.mRight, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_outer_rect.mRight, draw_center_rect.mBottom, 0.f);
+		pos[index].set(draw_outer_rect.mRight, draw_center_rect.mBottom, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mBottom, 0.f);
+		pos[index].set(draw_center_rect.mRight, draw_center_rect.mBottom, 0.f);
 		index++;
 
 		// draw left 
 		uv[index] = LLVector2(uv_outer_rect.mLeft, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_outer_rect.mLeft, draw_center_rect.mBottom, 0.f);
+		pos[index].set(draw_outer_rect.mLeft, draw_center_rect.mBottom, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mBottom, 0.f);
+		pos[index].set(draw_center_rect.mLeft, draw_center_rect.mBottom, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mTop, 0.f);
+		pos[index].set(draw_center_rect.mLeft, draw_center_rect.mTop, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_outer_rect.mLeft, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_outer_rect.mLeft, draw_center_rect.mTop, 0.f);
+		pos[index].set(draw_outer_rect.mLeft, draw_center_rect.mTop, 0.f);
 		index++;
 
 		// draw middle
 		uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mBottom, 0.f);
+		pos[index].set(draw_center_rect.mLeft, draw_center_rect.mBottom, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mBottom, 0.f);
+		pos[index].set(draw_center_rect.mRight, draw_center_rect.mBottom, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mTop, 0.f);
+		pos[index].set(draw_center_rect.mRight, draw_center_rect.mTop, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mTop, 0.f);
+		pos[index].set(draw_center_rect.mLeft, draw_center_rect.mTop, 0.f);
 		index++;
 
 		// draw right 
 		uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mBottom, 0.f);
+		pos[index].set(draw_center_rect.mRight, draw_center_rect.mBottom, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_outer_rect.mRight, uv_center_rect.mBottom);
-		pos[index] = LLVector3(draw_outer_rect.mRight, draw_center_rect.mBottom, 0.f);
+		pos[index].set(draw_outer_rect.mRight, draw_center_rect.mBottom, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_outer_rect.mRight, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_outer_rect.mRight, draw_center_rect.mTop, 0.f);
+		pos[index].set(draw_outer_rect.mRight, draw_center_rect.mTop, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mTop, 0.f);
+		pos[index].set(draw_center_rect.mRight, draw_center_rect.mTop, 0.f);
 		index++;
 
 		// draw top left
 		uv[index] = LLVector2(uv_outer_rect.mLeft, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_outer_rect.mLeft, draw_center_rect.mTop, 0.f);
+		pos[index].set(draw_outer_rect.mLeft, draw_center_rect.mTop, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mTop, 0.f);
+		pos[index].set(draw_center_rect.mLeft, draw_center_rect.mTop, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_center_rect.mLeft, uv_outer_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_outer_rect.mTop, 0.f);
+		pos[index].set(draw_center_rect.mLeft, draw_outer_rect.mTop, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_outer_rect.mLeft, uv_outer_rect.mTop);
-		pos[index] = LLVector3(draw_outer_rect.mLeft, draw_outer_rect.mTop, 0.f);
+		pos[index].set(draw_outer_rect.mLeft, draw_outer_rect.mTop, 0.f);
 		index++;
 
 		// draw top middle
 		uv[index] = LLVector2(uv_center_rect.mLeft, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_center_rect.mTop, 0.f);
+		pos[index].set(draw_center_rect.mLeft, draw_center_rect.mTop, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mTop, 0.f);
+		pos[index].set(draw_center_rect.mRight, draw_center_rect.mTop, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_center_rect.mRight, uv_outer_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_outer_rect.mTop, 0.f);
+		pos[index].set(draw_center_rect.mRight, draw_outer_rect.mTop, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_center_rect.mLeft, uv_outer_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mLeft, draw_outer_rect.mTop, 0.f);
+		pos[index].set(draw_center_rect.mLeft, draw_outer_rect.mTop, 0.f);
 		index++;
 
 		// draw top right
 		uv[index] = LLVector2(uv_center_rect.mRight, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_center_rect.mTop, 0.f);
+		pos[index].set(draw_center_rect.mRight, draw_center_rect.mTop, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_outer_rect.mRight, uv_center_rect.mTop);
-		pos[index] = LLVector3(draw_outer_rect.mRight, draw_center_rect.mTop, 0.f);
+		pos[index].set(draw_outer_rect.mRight, draw_center_rect.mTop, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_outer_rect.mRight, uv_outer_rect.mTop);
-		pos[index] = LLVector3(draw_outer_rect.mRight, draw_outer_rect.mTop, 0.f);
+		pos[index].set(draw_outer_rect.mRight, draw_outer_rect.mTop, 0.f);
 		index++;
 
 		uv[index] = LLVector2(uv_center_rect.mRight, uv_outer_rect.mTop);
-		pos[index] = LLVector3(draw_center_rect.mRight, draw_outer_rect.mTop, 0.f);
+		pos[index].set(draw_center_rect.mRight, draw_outer_rect.mTop, 0.f);
 		index++;
-
+		
 		gGL.vertexBatchPreTransformed(pos, uv, NUM_VERTICES);
 	}
 	gGL.end();
@@ -720,7 +720,7 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre
 	{
 		const S32 NUM_VERTICES = 4; // 9 quads
 		LLVector2 uv[NUM_VERTICES];
-		LLVector3 pos[NUM_VERTICES];
+		LLVector4a pos[NUM_VERTICES];
 
 		gGL.begin(LLRender::QUADS);
 		{
@@ -734,19 +734,19 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre
 			S32 scaled_height = llround(height * ui_scale.mV[VY]);
 
 			uv[index] = LLVector2(uv_rect.mRight, uv_rect.mTop);
-			pos[index] = LLVector3(ui_translation.mV[VX] + scaled_width, ui_translation.mV[VY] + scaled_height, 0.f);
+			pos[index].set(ui_translation.mV[VX] + scaled_width, ui_translation.mV[VY] + scaled_height, 0.f);
 			index++;
 
 			uv[index] = LLVector2(uv_rect.mLeft, uv_rect.mTop);
-			pos[index] = LLVector3(ui_translation.mV[VX], ui_translation.mV[VY] + scaled_height, 0.f);
+			pos[index].set(ui_translation.mV[VX], ui_translation.mV[VY] + scaled_height, 0.f);
 			index++;
 
 			uv[index] = LLVector2(uv_rect.mLeft, uv_rect.mBottom);
-			pos[index] = LLVector3(ui_translation.mV[VX], ui_translation.mV[VY], 0.f);
+			pos[index].set(ui_translation.mV[VX], ui_translation.mV[VY], 0.f);
 			index++;
 
 			uv[index] = LLVector2(uv_rect.mRight, uv_rect.mBottom);
-			pos[index] = LLVector3(ui_translation.mV[VX] + scaled_width, ui_translation.mV[VY], 0.f);
+			pos[index].set(ui_translation.mV[VX] + scaled_width, ui_translation.mV[VY], 0.f);
 			index++;
 
 			gGL.vertexBatchPreTransformed(pos, uv, NUM_VERTICES);

From ef601d33453bfba64d02705cb32a8f8f244d628c Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 3 Aug 2012 13:20:26 -0500
Subject: [PATCH 134/199] Implemented a hash-map for first-level children of ui
 elements. First-level child lookups are prolificly abused on a per-frame
 basis, and a plain old loop with a string comparison each iteraton was
 somewhat of a hotspot. (The recursive loop after is even more expensive,
 however)

---
 indra/llui/llview.cpp | 17 ++++++++++++++++-
 indra/llui/llview.h   |  2 ++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index c476e25d3..b0e95c54a 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -336,6 +336,7 @@ bool LLView::addChild(LLView* child, S32 tab_group)
 
 	// add to front of child list, as normal
 	mChildList.push_front(child);
+	mChildHashMap[child->getName()]=child;
 
 	// add to ctrl list if is LLUICtrl
 	if (child->isCtrl())
@@ -374,6 +375,14 @@ void LLView::removeChild(LLView* child)
 		// if we are removing an item we are currently iterating over, that would be bad
 		llassert(child->mInDraw == false);
 		mChildList.remove( child );
+		for(boost::unordered_map<const std::string, LLView*>::iterator it=mChildHashMap.begin(); it != mChildHashMap.end(); ++it)
+		{
+			if(it->second == child)
+			{
+				mChildHashMap.erase(it);
+				break;
+			}
+		}
 		child->mParentView = NULL;
 		if (child->isCtrl())
 		{
@@ -607,6 +616,7 @@ void LLView::deleteAllChildren()
 		LLView* viewp = mChildList.front();
 		delete viewp; // will remove the child from mChildList
 	}
+	mChildHashMap.clear();
 }
 
 void LLView::setAllChildrenEnabled(BOOL b)
@@ -1506,13 +1516,18 @@ LLView* LLView::getChildView(const std::string& name, BOOL recurse, BOOL create_
 	//if(name.empty())
 	//	return NULL;
 	// Look for direct children *first*
-	BOOST_FOREACH(LLView* childp, mChildList)
+	/*BOOST_FOREACH(LLView* childp, mChildList)
 	{
 		llassert(childp);
 		if (childp->getName() == name)
 		{
 			return childp;
 		}
+	}*/
+	boost::unordered_map<const std::string, LLView*>::const_iterator it = mChildHashMap.find(name);
+	if(it != mChildHashMap.end())
+	{
+		return it->second;
 	}
 	if (recurse)
 	{
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 721c82fbb..bec83dfeb 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -56,6 +56,7 @@
 #include "llcursortypes.h"
 #include "llinitparam.h"
 #include "llfocusmgr.h"
+#include <boost/unordered_map.hpp>
 
 const U32	FOLLOWS_NONE	= 0x00;
 const U32	FOLLOWS_LEFT	= 0x01;
@@ -454,6 +455,7 @@ public:
 	const child_list_t*	getChildList() const { return &mChildList; }
 	child_list_const_iter_t	beginChild() const { return mChildList.begin(); }
 	child_list_const_iter_t	endChild() const { return mChildList.end(); }
+	boost::unordered_map<const std::string, LLView*> mChildHashMap;
 
 	// LLMouseHandler functions
 	//  Default behavior is to pass events to children

From d2b13f515d436df9d3ef110bde90f2a7f83a6115 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 3 Aug 2012 20:51:53 -0500
Subject: [PATCH 135/199] Avoid several excessive per-frame
 LLView::getChildView calls by instead caching the results in postBuild.
 (Added CachedUICtrl, which is basically just a self-nulling pointer to not
 have to make ui ctors dirtier)

---
 indra/llrender/llrender.cpp               | 30 +++-----------------
 indra/llrender/llrender.h                 | 14 ++++++----
 indra/llui/llview.h                       |  9 ++++++
 indra/newview/llchatbar.cpp               |  7 +++--
 indra/newview/llchatbar.h                 |  3 ++
 indra/newview/llfloateractivespeakers.cpp | 25 +++++++++--------
 indra/newview/llfloateractivespeakers.h   | 10 +++++++
 indra/newview/llfloaterchat.cpp           |  7 +++--
 indra/newview/llfloaterchat.h             |  4 +++
 indra/newview/llimpanel.cpp               | 29 ++++++++++++-------
 indra/newview/llimpanel.h                 |  9 ++++++
 indra/newview/llmediaremotectrl.cpp       | 34 +++++++++++++++--------
 indra/newview/llmediaremotectrl.h         | 11 ++++++++
 indra/newview/lloverlaybar.cpp            | 34 +++++++++++++++++------
 indra/newview/lloverlaybar.h              | 12 +++++++-
 indra/newview/lltoolbar.cpp               | 26 +++++++++++------
 indra/newview/lltoolbar.h                 |  9 ++++++
 indra/newview/llviewerwindow.cpp          |  2 +-
 indra/newview/llvoiceremotectrl.cpp       | 26 ++++++++++-------
 indra/newview/llvoiceremotectrl.h         |  8 ++++++
 20 files changed, 210 insertions(+), 99 deletions(-)

diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index 2d5fbf1b6..31cc03994 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -1915,7 +1915,7 @@ void LLRender::flush()
 	}
 }
 
-void LLRender::vertex3f(const GLfloat& x, const GLfloat& y, const GLfloat& z)
+void LLRender::vertex4a(const LLVector4a& vertex)
 { 
 	//the range of mVerticesp, mColorsp and mTexcoordsp is [0, 4095]
 	if (mCount > 2048)
@@ -1937,15 +1937,13 @@ void LLRender::vertex3f(const GLfloat& x, const GLfloat& y, const GLfloat& z)
 
 	if (mUIOffset.empty())
 	{
-		mVerticesp[mCount].set(x,y,z);
+		mVerticesp[mCount]=vertex;
 	}
 	else
 	{
 		//LLVector3 vert = (LLVector3(x,y,z)+mUIOffset.back()).scaledVec(mUIScale.back());
-		LLVector4a& vert = mVerticesp[mCount];
-		vert.set(x,y,z);
-		vert.add(*mUIOffset.back());
-		vert.mul(*mUIScale.back());
+		mVerticesp[mCount].setAdd(vertex,*mUIOffset.back());
+		mVerticesp[mCount].mul(*mUIScale.back());
 	}
 
 	if (mMode == LLRender::QUADS && LLRender::sGLCoreProfile)
@@ -2148,26 +2146,6 @@ void LLRender::vertexBatchPreTransformed(LLVector4a* verts, LLVector2* uvs, LLCo
 	mColorsp[mCount] = mColorsp[mCount-1];
 }
 
-void LLRender::vertex2i(const GLint& x, const GLint& y)
-{
-	vertex3f((GLfloat) x, (GLfloat) y, 0);	
-}
-
-void LLRender::vertex2f(const GLfloat& x, const GLfloat& y)
-{ 
-	vertex3f(x,y,0);
-}
-
-void LLRender::vertex2fv(const GLfloat* v)
-{ 
-	vertex3f(v[0], v[1], 0);
-}
-
-void LLRender::vertex3fv(const GLfloat* v)
-{
-	vertex3f(v[0], v[1], v[2]);
-}
-
 void LLRender::texCoord2f(const GLfloat& x, const GLfloat& y)
 { 
 	mTexcoordsp[mCount] = LLVector2(x,y);
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h
index a4c1cf2b5..6e412926d 100644
--- a/indra/llrender/llrender.h
+++ b/indra/llrender/llrender.h
@@ -364,12 +364,14 @@ public:
 
 	void begin(const GLuint& mode);
 	void end();
-	void vertex2i(const GLint& x, const GLint& y);
-	void vertex2f(const GLfloat& x, const GLfloat& y);
-	void vertex3f(const GLfloat& x, const GLfloat& y, const GLfloat& z);
-	void vertex2fv(const GLfloat* v);
-	void vertex3fv(const GLfloat* v);
-	
+
+	LL_FORCE_INLINE void vertex2i(const GLint& x, const GLint& y) { vertex4a(LLVector4a((GLfloat)x,(GLfloat)y,0.f)); }
+	LL_FORCE_INLINE void vertex2f(const GLfloat& x, const GLfloat& y) { vertex4a(LLVector4a(x,y,0.f)); }
+	LL_FORCE_INLINE void vertex3f(const GLfloat& x, const GLfloat& y, const GLfloat& z) { vertex4a(LLVector4a(x,y,z)); }
+	LL_FORCE_INLINE void vertex2fv(const GLfloat* v) { vertex4a(LLVector4a(v[0],v[1],0.f)); }
+	LL_FORCE_INLINE void vertex3fv(const GLfloat* v) { vertex4a(LLVector4a(v[0],v[1],v[2])); }
+	void vertex4a(const LLVector4a& v);
+
 	void texCoord2i(const GLint& x, const GLint& y);
 	void texCoord2f(const GLfloat& x, const GLfloat& y);
 	void texCoord2fv(const GLfloat* tc);
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index bec83dfeb..2d507636c 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -187,6 +187,15 @@ public:
 
 	void initFromParams(const LLView::Params&);
 
+	template<typename T>
+	struct CachedUICtrl
+	{
+		CachedUICtrl():mPtr(NULL){}
+		T* connect(LLView* parent,const char* pName){return mPtr = parent->getChild<T>(pName);}
+		T* operator->(){return mPtr;}
+		operator T*() const{return mPtr;}
+		T* mPtr;
+	};
 protected:
 	LLView(const LLView::Params&);
 	//friend class LLUICtrlFactory;
diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
index c34fee56b..12e26b1c4 100644
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -165,6 +165,9 @@ BOOL LLChatBar::postBuild()
 		mInputEditor->setEnableLineHistory(TRUE);
 	}
 
+	mHistoryBtn.connect(this,"History");
+	mSayBtn.connect(this,"Say");
+
 	mIsBuilt = TRUE;
 
 	return TRUE;
@@ -228,9 +231,9 @@ void LLChatBar::refresh()
 		gAgent.stopTyping();
 	}
 
-	childSetValue("History", LLFloaterChat::instanceVisible(LLSD()));
+	mHistoryBtn->setValue(LLFloaterChat::instanceVisible(LLSD()));
 
-	childSetEnabled("Say", mInputEditor->getText().size() > 0);
+	mSayBtn->setEnabled(mInputEditor->getText().size() > 0);
 	//childSetEnabled("Shout", mInputEditor->getText().size() > 0); createDummyWidget Making Dummy -HgB
 
 }
diff --git a/indra/newview/llchatbar.h b/indra/newview/llchatbar.h
index c4fed67d9..5e0391d08 100644
--- a/indra/newview/llchatbar.h
+++ b/indra/newview/llchatbar.h
@@ -110,6 +110,9 @@ protected:
 	LLComboBox*		mGestureCombo;
 
 	LLChatBarGestureObserver* mObserver;
+
+	CachedUICtrl<LLButton> mHistoryBtn;
+	CachedUICtrl<LLButton> mSayBtn;
 };
 
 extern LLChatBar *gChatBar;
diff --git a/indra/newview/llfloateractivespeakers.cpp b/indra/newview/llfloateractivespeakers.cpp
index 321a825f1..ea902fa9d 100644
--- a/indra/newview/llfloateractivespeakers.cpp
+++ b/indra/newview/llfloateractivespeakers.cpp
@@ -353,6 +353,13 @@ BOOL LLPanelActiveSpeakers::postBuild()
 	childSetCommitCallback("moderator_allow_text", onModeratorMuteText, this);
 	childSetCommitCallback("moderation_mode", onChangeModerationMode, this);
 
+	mVolumeSlider.connect(this,"speaker_volume");
+	mModeratorCtrlLbl.connect(this,"moderator_controls_label");
+	mModeratorAllowVoiceCheckbox.connect(this,"moderator_allow_voice");
+	mModeratorAllowTextCheckbox.connect(this,"moderator_allow_text");
+	mModeratorModePanel.connect(this,"moderation_mode_panel");
+	mModeratorControlsPanel.connect(this,"moderator_controls");
+
 	// update speaker UI
 	handleSpeakerSelect();
 
@@ -618,25 +625,21 @@ void LLPanelActiveSpeakers::refreshSpeakers()
 								//&& !LLMuteList::getInstance()->isLinden(selected_speakerp->mDisplayName));
 								&& !LLMuteList::getInstance()->isLinden(selected_speakerp->mLegacyName));
 	}
-	childSetValue("speaker_volume", gVoiceClient->getUserVolume(selected_id));
-	childSetEnabled("speaker_volume", LLVoiceClient::voiceEnabled()
+	mVolumeSlider->setValue(gVoiceClient->getUserVolume(selected_id));
+	mVolumeSlider->setEnabled(LLVoiceClient::voiceEnabled()
 					&& gVoiceClient->getVoiceEnabled(selected_id)
 					&& selected_id.notNull() 
 					&& selected_id != gAgent.getID() 
 					&& (selected_speakerp.notNull() && (selected_speakerp->mType == LLSpeaker::SPEAKER_AGENT || selected_speakerp->mType == LLSpeaker::SPEAKER_EXTERNAL)));
 
-	childSetEnabled(
-		"moderator_controls_label",
-		selected_id.notNull());
+	mModeratorCtrlLbl->setEnabled(selected_id.notNull());
 
-	childSetEnabled(
-		"moderator_allow_voice", 
+	mModeratorAllowVoiceCheckbox->setEnabled(
 		selected_id.notNull() 
 		&& mSpeakerMgr->isVoiceActive()
 		&& gVoiceClient->getVoiceEnabled(selected_id));
 
-	childSetEnabled(
-		"moderator_allow_text", 
+	mModeratorAllowTextCheckbox->setEnabled(
 		selected_id.notNull());
 
 	if (mProfileBtn)
@@ -661,8 +664,8 @@ void LLPanelActiveSpeakers::refreshSpeakers()
 	LLPointer<LLSpeaker> self_speakerp = mSpeakerMgr->findSpeaker(gAgent.getID());
 	if(self_speakerp)
 	{
-		childSetVisible("moderation_mode_panel", self_speakerp->mIsModerator && mSpeakerMgr->isVoiceActive());
-		childSetVisible("moderator_controls", self_speakerp->mIsModerator);
+		mModeratorModePanel->setVisible(self_speakerp->mIsModerator && mSpeakerMgr->isVoiceActive());
+		mModeratorControlsPanel->setVisible(self_speakerp->mIsModerator);
 	}
 
 	// keep scroll value stable
diff --git a/indra/newview/llfloateractivespeakers.h b/indra/newview/llfloateractivespeakers.h
index 97221cb60..b8a9ece01 100644
--- a/indra/newview/llfloateractivespeakers.h
+++ b/indra/newview/llfloateractivespeakers.h
@@ -46,6 +46,9 @@ class LLButton;
 class LLPanelActiveSpeakers;
 class LLSpeakerMgr;
 class LLVoiceChannel;
+class LLSlider;
+class LLTextBox;
+class LLCheckBoxCtrl;
 
 
 // data for a given participant in a voice channel
@@ -296,6 +299,13 @@ protected:
 	LLPointer<SpeakerAddListener> mSpeakerAddListener;
 	LLPointer<SpeakerRemoveListener> mSpeakerRemoveListener;
 	LLPointer<SpeakerClearListener> mSpeakerClearListener;
+
+	CachedUICtrl<LLUICtrl> mVolumeSlider;
+	CachedUICtrl<LLTextBox> mModeratorCtrlLbl;
+	CachedUICtrl<LLCheckBoxCtrl> mModeratorAllowVoiceCheckbox;
+	CachedUICtrl<LLCheckBoxCtrl> mModeratorAllowTextCheckbox;
+	CachedUICtrl<LLPanel> mModeratorModePanel;
+	CachedUICtrl<LLPanel> mModeratorControlsPanel;
 };
 
 
diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index dec68245d..ed55ecbae 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -135,9 +135,9 @@ void LLFloaterChat::draw()
 {
 	// enable say and shout only when text available
 		
-	childSetValue("toggle_active_speakers_btn", childIsVisible("active_speakers_panel"));
+	mToggleActiveSpeakersBtn->setValue(mPanel->getVisible());
 
-	LLChatBar* chat_barp = getChild<LLChatBar>("chat_panel", TRUE);
+	LLChatBar* chat_barp = mChatPanel;
 	if (chat_barp)
 	{
 		chat_barp->refresh();
@@ -156,6 +156,9 @@ BOOL LLFloaterChat::postBuild()
 	{
 		chat_barp->setGestureCombo(getChild<LLComboBox>( "Gesture"));
 	}
+
+	mToggleActiveSpeakersBtn.connect(this,"toggle_active_speakers_btn");
+	mChatPanel.connect(this,"chat_panel");
 	return TRUE;
 }
 
diff --git a/indra/newview/llfloaterchat.h b/indra/newview/llfloaterchat.h
index 4f9a03be5..a3ef23fd0 100644
--- a/indra/newview/llfloaterchat.h
+++ b/indra/newview/llfloaterchat.h
@@ -50,6 +50,7 @@ class LLUUID;
 class LLCheckBoxCtrl;
 class LLPanelActiveSpeakers;
 class LLLogChat;
+class LLChatBar;
 
 class LLFloaterChat
 	:	public LLFloater, public LLUISingleton<LLFloaterChat, LLFloaterChat>
@@ -95,6 +96,9 @@ public:
 
 	LLPanelActiveSpeakers* mPanel;
 	BOOL mScrolledToEnd;
+
+	CachedUICtrl<LLButton> mToggleActiveSpeakersBtn;
+	CachedUICtrl<LLChatBar> mChatPanel;
 };
 
 #endif
diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp
index ed2349717..27774273a 100644
--- a/indra/newview/llimpanel.cpp
+++ b/indra/newview/llimpanel.cpp
@@ -1411,6 +1411,15 @@ BOOL LLFloaterIMPanel::postBuild()
 		}
 
 		setDefaultBtn("send_btn");
+
+		mActiveSpeakersPanel.connect(this,"active_speakers_panel");
+		mToggleActiveSpeakersBtn.connect(this,"toggle_active_speakers_btn");
+		mVolumeSlider.connect(this,"speaker_volume");
+		mEndCallBtn.connect(this,"end_call_btn");
+		mStartCallBtn.connect(this,"start_call_btn");
+		mSendBtn.connect(this,"send_btn");
+		mMuteBtn.connect(this,"mute_btn");
+
 		return TRUE;
 	}
 
@@ -1466,10 +1475,10 @@ void LLFloaterIMPanel::draw()
 					  && mCallBackEnabled;
 
 	// hide/show start call and end call buttons
-	childSetVisible("end_call_btn", LLVoiceClient::voiceEnabled() && mVoiceChannel->getState() >= LLVoiceChannel::STATE_CALL_STARTED);
-	childSetVisible("start_call_btn", LLVoiceClient::voiceEnabled() && mVoiceChannel->getState() < LLVoiceChannel::STATE_CALL_STARTED);
-	childSetEnabled("start_call_btn", enable_connect);
-	childSetEnabled("send_btn", !childGetValue("chat_editor").asString().empty());
+	mEndCallBtn->setVisible(LLVoiceClient::voiceEnabled() && mVoiceChannel->getState() >= LLVoiceChannel::STATE_CALL_STARTED);
+	mStartCallBtn->setVisible(LLVoiceClient::voiceEnabled() && mVoiceChannel->getState() < LLVoiceChannel::STATE_CALL_STARTED);
+	mStartCallBtn->setEnabled(enable_connect);
+	mSendBtn->setEnabled(!childGetValue("chat_editor").asString().empty());
 	
 	LLPointer<LLSpeaker> self_speaker = mSpeakers->findSpeaker(gAgent.getID());
 	if(!mTextIMPossible)
@@ -1497,10 +1506,10 @@ void LLFloaterIMPanel::draw()
 	// show speakers window when voice first connects
 	if (mShowSpeakersOnConnect && mVoiceChannel->isActive())
 	{
-		childSetVisible("active_speakers_panel", TRUE);
+		mActiveSpeakersPanel->setVisible(true);
 		mShowSpeakersOnConnect = FALSE;
 	}
-	childSetValue("toggle_active_speakers_btn", childIsVisible("active_speakers_panel"));
+	mToggleActiveSpeakersBtn->setValue(mActiveSpeakersPanel->getVisible());
 
 	if (mTyping)
 	{
@@ -1531,11 +1540,11 @@ void LLFloaterIMPanel::draw()
 	else
 	{
 		// refresh volume and mute checkbox
-		childSetVisible("speaker_volume", LLVoiceClient::voiceEnabled() && mVoiceChannel->isActive());
-		childSetValue("speaker_volume", gVoiceClient->getUserVolume(mOtherParticipantUUID));
+		mVolumeSlider->setVisible(LLVoiceClient::voiceEnabled() && mVoiceChannel->isActive());
+		mVolumeSlider->setValue(gVoiceClient->getUserVolume(mOtherParticipantUUID));
 
-		childSetValue("mute_btn", LLMuteList::getInstance()->isMuted(mOtherParticipantUUID, LLMute::flagVoiceChat));
-		childSetVisible("mute_btn", LLVoiceClient::voiceEnabled() && mVoiceChannel->isActive());
+		mMuteBtn->setValue(LLMuteList::getInstance()->isMuted(mOtherParticipantUUID, LLMute::flagVoiceChat));
+		mMuteBtn->setVisible(LLVoiceClient::voiceEnabled() && mVoiceChannel->isActive());
 	}
 	LLFloater::draw();
 }
diff --git a/indra/newview/llimpanel.h b/indra/newview/llimpanel.h
index 9daed909f..943bd37c1 100644
--- a/indra/newview/llimpanel.h
+++ b/indra/newview/llimpanel.h
@@ -48,6 +48,8 @@ class LLInventoryItem;
 class LLInventoryCategory;
 class LLIMSpeakerMgr;
 class LLPanelActiveSpeakers;
+class LLPanel;
+class LLButton;
 
 class LLVoiceChannel : public LLVoiceClientStatusObserver
 {
@@ -385,6 +387,13 @@ private:
 	boost::signals2::connection mFocusLostSignal;
 
 
+	CachedUICtrl<LLPanel> mActiveSpeakersPanel;
+	CachedUICtrl<LLButton> mToggleActiveSpeakersBtn;
+	CachedUICtrl<LLUICtrl> mVolumeSlider;
+	CachedUICtrl<LLButton> mEndCallBtn;
+	CachedUICtrl<LLButton> mStartCallBtn;
+	CachedUICtrl<LLButton> mSendBtn;
+	CachedUICtrl<LLButton> mMuteBtn;
 
 	void disableWhileSessionStarting();
 
diff --git a/indra/newview/llmediaremotectrl.cpp b/indra/newview/llmediaremotectrl.cpp
index 68db6b6b3..e8d04ff2b 100644
--- a/indra/newview/llmediaremotectrl.cpp
+++ b/indra/newview/llmediaremotectrl.cpp
@@ -89,6 +89,16 @@ BOOL LLMediaRemoteCtrl::postBuild()
 	childSetAction("media_pause",LLOverlayBar::toggleMediaPlay,this);
 	childSetAction("music_pause",LLOverlayBar::toggleMusicPlay,this);
 
+	mMusicPlayBtn.connect(this,"music_play");
+	mMusicStopBtn.connect(this,"music_stop");
+	mMusicPauseBtn.connect(this,"music_pause");
+	mMediaPlayBtn.connect(this,"media_play");
+	mMediaStopBtn.connect(this,"media_stop");
+	mMediaPauseBtn.connect(this,"media_pause");
+	mMediaIcon.connect(this,"media_icon");
+	mMusicIcon.connect(this,"music_icon");
+	mExpandBtn.connect(this,"expand");
+
 	childSetAction("expand", onClickExpandBtn, this);
 
 	LLButton *pause = getChild<LLButton>("music_pause");
@@ -101,7 +111,7 @@ void LLMediaRemoteCtrl::draw()
 {
 	enableMediaButtons();
 	
-	LLButton* expand_button = getChild<LLButton>("expand");
+	LLButton* expand_button = mExpandBtn;
 	if (expand_button)
 	{
 		if (expand_button->getToggleState())
@@ -147,8 +157,8 @@ void LLMediaRemoteCtrl::setToolTip(const std::string& msg)
 	std::string tool_tip = LLMIMETypes::findToolTip(mime_type);
 	std::string play_tip = LLMIMETypes::findPlayTip(mime_type);
 	// childSetToolTip("media_stop", mControls->getString("stop_label") + "\n" + tool_tip);
-	childSetToolTip("media_icon", tool_tip);
-	childSetToolTip("media_play", play_tip);
+	mMediaIcon->setToolTip(tool_tip);
+	mMediaIcon->setToolTip(play_tip);
 }
 
 void LLMediaRemoteCtrl::enableMediaButtons()
@@ -227,13 +237,13 @@ void LLMediaRemoteCtrl::enableMediaButtons()
 		// Don't test the mime-type: this is not updated in a consistent basis. The existence of a valid gAudiop is enough guarantee.
 	}
 	const std::string media_icon_name = LLMIMETypes::findIcon(media_type);
-	LLButton* music_play_btn = getChild<LLButton>("music_play");
-	LLButton* music_stop_btn = getChild<LLButton>("music_stop");
-	LLButton* music_pause_btn = getChild<LLButton>("music_pause");
-	LLButton* media_play_btn = getChild<LLButton>("media_play");
-	LLButton* media_stop_btn = getChild<LLButton>("media_stop");
-	LLButton* media_pause_btn = getChild<LLButton>("media_pause");
-	LLIconCtrl* media_icon = getChild<LLIconCtrl>("media_icon");
+	LLButton* music_play_btn = mMusicPlayBtn;
+	LLButton* music_stop_btn = mMusicStopBtn;
+	LLButton* music_pause_btn = mMusicPauseBtn;
+	LLButton* media_play_btn = mMediaPlayBtn;
+	LLButton* media_stop_btn = mMediaPlayBtn;
+	LLButton* media_pause_btn = mMediaPauseBtn;
+	LLIconCtrl* media_icon = mMediaIcon;
 
 	music_play_btn->setEnabled(play_music_enabled);
 	music_stop_btn->setEnabled(stop_music_enabled);
@@ -262,7 +272,7 @@ void LLMediaRemoteCtrl::enableMediaButtons()
 			music_pause_btn->setToolTip(mCachedPauseTip);
 	}
 
-	childSetColor("music_icon", music_icon_color);
+	mMusicIcon->setColor(music_icon_color);
 	if(!media_icon_name.empty())
 	{
 		media_icon->setImage(media_icon_name);
@@ -273,7 +283,7 @@ void LLMediaRemoteCtrl::enableMediaButtons()
 	media_pause_btn->setEnabled(media_show_pause);
 	media_pause_btn->setVisible(media_show_pause);
 	media_play_btn->setVisible(! media_show_pause);
-	childSetColor("media_icon", media_icon_color);
+	mMediaIcon->setColor(media_icon_color);
 
 	setToolTip(media_url);
 }
diff --git a/indra/newview/llmediaremotectrl.h b/indra/newview/llmediaremotectrl.h
index 9fedfd386..22ff29866 100644
--- a/indra/newview/llmediaremotectrl.h
+++ b/indra/newview/llmediaremotectrl.h
@@ -36,6 +36,7 @@
 #include "llpanel.h"
 
 class LLButton;
+class LLIconCtrl;
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -61,6 +62,16 @@ protected:
 	void build();
 
 	std::string mCachedPauseTip;
+
+	CachedUICtrl<LLButton> mMusicPlayBtn;
+	CachedUICtrl<LLButton> mMusicStopBtn;
+	CachedUICtrl<LLButton> mMusicPauseBtn;
+	CachedUICtrl<LLButton> mMediaPlayBtn;
+	CachedUICtrl<LLButton> mMediaStopBtn;
+	CachedUICtrl<LLButton> mMediaPauseBtn;
+	CachedUICtrl<LLButton> mExpandBtn;
+	CachedUICtrl<LLIconCtrl> mMediaIcon;
+	CachedUICtrl<LLIconCtrl> mMusicIcon;
 };
 
 #endif
diff --git a/indra/newview/lloverlaybar.cpp b/indra/newview/lloverlaybar.cpp
index ebbe2d114..78b162c1c 100644
--- a/indra/newview/lloverlaybar.cpp
+++ b/indra/newview/lloverlaybar.cpp
@@ -189,7 +189,16 @@ BOOL LLOverlayBar::postBuild()
 	setFocusRoot(TRUE);
 	mBuilt = true;
 
-	mOriginalIMLabel = getChild<LLButton>("New IM")->getLabelSelected();
+	mChatbarAndButtons.connect(this,"chatbar_and_buttons");
+	mNewIM.connect(this,"New IM");
+	mNotBusy.connect(this,"Set Not Busy");
+	mMouseLook.connect(this,"Mouselook");
+	mStandUp.connect(this,"Stand Up");
+	mFlyCam.connect(this,"Flycam");
+	mChatBar.connect(this,"chat_bar");
+	mVoiceRemoteContainer.connect(this,"voice_remote_container");
+
+	mOriginalIMLabel = mNewIM->getLabelSelected();
 
 	layoutButtons();
 
@@ -203,6 +212,7 @@ BOOL LLOverlayBar::postBuild()
 	childSetVisible("AdvSettings_container_exp", sAdvSettingsPopup);
 	childSetVisible("ao_remote_container", gSavedSettings.getBOOL("EnableAORemote"));	
 
+
 	return TRUE;
 }
 
@@ -214,6 +224,12 @@ LLOverlayBar::~LLOverlayBar()
 // virtual
 void LLOverlayBar::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
+	S32 delta_width = width - getRect().getWidth();
+	S32 delta_height = height - getRect().getHeight();
+
+	if (!delta_width && !delta_height && !sForceReshape)
+		return;
+
 	LLView::reshape(width, height, called_from_parent);
 
 	if (mBuilt) 
@@ -266,7 +282,7 @@ void LLOverlayBar::refresh()
 
 	BOOL im_received = gIMMgr->getIMReceived();
 	int unread_count = gIMMgr->getIMUnreadCount();
-	LLButton* button = getChild<LLButton>("New IM");
+	LLButton* button = mNewIM;
 
 	if ((button && button->getVisible() != im_received) ||
 			(button && button->getVisible()))
@@ -291,7 +307,7 @@ void LLOverlayBar::refresh()
 	}
 
 	BOOL busy = gAgent.getBusy();
-	button = getChild<LLButton>("Set Not Busy");
+	button = mNotBusy;
 	if (button && button->getVisible() != busy)
 	{
 		button->setVisible(busy);
@@ -301,7 +317,7 @@ void LLOverlayBar::refresh()
 	}
 
 	BOOL flycam = LLViewerJoystick::getInstance()->getOverrideCamera();
-	button = getChild<LLButton>("Flycam");
+	button = mFlyCam;
 	if (button && button->getVisible() != flycam)
 	{
 		button->setVisible(flycam);
@@ -313,7 +329,7 @@ void LLOverlayBar::refresh()
 	BOOL mouselook_grabbed;
 	mouselook_grabbed = gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_DOWN_INDEX)
 		|| gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_UP_INDEX);
-	button = getChild<LLButton>("Mouselook");
+	button = mMouseLook;
 
 	if (button && button->getVisible() != mouselook_grabbed)
 	{
@@ -331,7 +347,7 @@ void LLOverlayBar::refresh()
 		sitting = gAgentAvatarp->isSitting() && !gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT);
 // [/RLVa:KB]
 	}
-	button = getChild<LLButton>("Stand Up");
+	button = mStandUp;
 
 	if (button && button->getVisible() != sitting)
 	{
@@ -355,7 +371,7 @@ void LLOverlayBar::refresh()
 	}
 
 
-	button = getChild<LLButton>("Cancel TP");
+	button = mCancelBtn;
 
 	if (button && button->getVisible() != teleporting)
 	{
@@ -398,11 +414,11 @@ void LLOverlayBar::refresh()
 		}
 	}
 	if(!in_mouselook)
-		childSetVisible("voice_remote_container", LLVoiceClient::voiceEnabled());
+		mVoiceRemoteContainer->setVisible(LLVoiceClient::voiceEnabled());
 
 	// always let user toggle into and out of chatbar
 	static const LLCachedControl<bool> chat_visible("ChatVisible",true);
-	childSetVisible("chat_bar", chat_visible);
+	mChatBar->setVisible(chat_visible);
 
 	if (buttons_changed)
 	{
diff --git a/indra/newview/lloverlaybar.h b/indra/newview/lloverlaybar.h
index 8f9c8ed2f..06ebebe47 100644
--- a/indra/newview/lloverlaybar.h
+++ b/indra/newview/lloverlaybar.h
@@ -52,6 +52,7 @@ class LLSlider;
 class LLVoiceRemoteCtrl;
 class wlfPanel_AdvSettings;
 class AORemoteCtrl;
+class LLChatBar;
 
 class LLOverlayBar
 :	public LLPanel
@@ -68,6 +69,8 @@ public:
 
 	// helpers for returning desired state
 	BOOL musicPlaying() { return mMusicState == PLAYING; }
+
+	LLView* getChatbarAndButtons() const {return mChatbarAndButtons;}
 	
 	static void onClickIMReceived(void* data);
 	static void onClickSetNotBusy(void* data);
@@ -114,7 +117,14 @@ protected:
 	S32 mMusicState;
 	std::string			mOriginalIMLabel;
 	
-
+	CachedUICtrl<LLView> mChatbarAndButtons;
+	CachedUICtrl<LLButton> mNewIM;
+	CachedUICtrl<LLButton> mNotBusy;
+	CachedUICtrl<LLButton> mMouseLook;
+	CachedUICtrl<LLButton> mStandUp;
+	CachedUICtrl<LLButton> mFlyCam;
+	CachedUICtrl<LLChatBar> mChatBar;
+	CachedUICtrl<LLPanel> mVoiceRemoteContainer;
 private:
 	
 
diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp
index 08a1b26ef..f668f5bfc 100644
--- a/indra/newview/lltoolbar.cpp
+++ b/indra/newview/lltoolbar.cpp
@@ -161,6 +161,13 @@ BOOL LLToolBar::postBuild()
 	childSetAction("inventory_btn", onClickInventory, this);
 	childSetControlName("inventory_btn", "ShowInventory");
 
+	mCommunicateBtn.connect(this, "communicate_btn");
+	mFlyBtn.connect(this, "fly_btn");
+	mBuildBtn.connect(this, "build_btn");
+	mMapBtn.connect(this, "map_btn");
+	mRadarBtn.connect(this, "radar_btn");
+	mInventoryBtn.connect(this, "inventory_button");
+
 	for (child_list_const_iter_t child_iter = getChildList()->begin();
 		 child_iter != getChildList()->end(); ++child_iter)
 	{
@@ -292,7 +299,9 @@ void LLToolBar::refresh()
 	if(!isAgentAvatarValid())
 		return;
 
-	BOOL show = gSavedSettings.getBOOL("ShowToolBar");
+	static LLCachedControl<bool> show("ShowToolBar", true);
+	static LLCachedControl<bool> ascent_fly_always_enabled("AscentFlyAlwaysEnabled", true);
+	static LLCachedControl<bool> ascent_build_always_enabled("AscentBuildAlwaysEnabled", true);
 	BOOL mouselook = gAgentCamera.cameraMouselook();
 	setVisible(show && !mouselook);
 
@@ -302,9 +311,8 @@ void LLToolBar::refresh()
 		sitting = gAgentAvatarp->isSitting();
 	}
 
-	childSetEnabled("fly_btn", (gAgent.canFly() || gAgent.getFlying() || gSavedSettings.getBOOL("AscentFlyAlwaysEnabled")) && !sitting );
-
-	childSetEnabled("build_btn", (LLViewerParcelMgr::getInstance()->allowAgentBuild() || gSavedSettings.getBOOL("AscentBuildAlwaysEnabled")) );
+	mFlyBtn->setEnabled((gAgent.canFly() || gAgent.getFlying() || ascent_fly_always_enabled) && !sitting );
+	mBuildBtn->setEnabled((LLViewerParcelMgr::getInstance()->allowAgentBuild() || ascent_build_always_enabled));
 
 	// Check to see if we're in build mode
 	BOOL build_mode = LLToolMgr::getInstance()->inEdit();
@@ -323,11 +331,11 @@ void LLToolBar::refresh()
 	{
 		// If we're rez-restricted, we can still edit => allow build floater
 		// If we're edit-restricted, we can still rez => allow build floater
-		childSetEnabled("build_btn", !(gRlvHandler.hasBehaviour(RLV_BHVR_REZ) && gRlvHandler.hasBehaviour(RLV_BHVR_EDIT)) );
+		mBuildBtn->setEnabled(!(gRlvHandler.hasBehaviour(RLV_BHVR_REZ) && gRlvHandler.hasBehaviour(RLV_BHVR_EDIT)));
 
-		childSetEnabled("map_btn", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWWORLDMAP) );
-		childSetEnabled("radar_btn", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWMINIMAP) );
-		childSetEnabled("inventory_btn", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWINV) );
+		mMapBtn->setEnabled(!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWWORLDMAP));
+		mRadarBtn->setEnabled(!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWMINIMAP));
+		mInventoryBtn->setEnabled(!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWINV));
 	}
 // [/RLVa:KB]
 
@@ -339,7 +347,7 @@ void LLToolBar::refresh()
 
 void LLToolBar::updateCommunicateList()
 {
-	LLFlyoutButton* communicate_button = getChild<LLFlyoutButton>("communicate_btn");
+	LLFlyoutButton* communicate_button = mCommunicateBtn;
 	LLSD selected = communicate_button->getValue();
 
 	communicate_button->removeall();
diff --git a/indra/newview/lltoolbar.h b/indra/newview/lltoolbar.h
index 197d16dd3..24b05c8ae 100644
--- a/indra/newview/lltoolbar.h
+++ b/indra/newview/lltoolbar.h
@@ -44,6 +44,8 @@ extern S32 TOOL_BAR_HEIGHT;
 	class LLFakeResizeHandle;
 #endif // LL_DARWIN
 
+class LLFlyoutButton;
+
 class LLToolBar
 :	public LLPanel
 {
@@ -97,6 +99,13 @@ private:
 #if LL_DARWIN
 	LLFakeResizeHandle *mResizeHandle;
 #endif // LL_DARWIN
+
+	CachedUICtrl<LLFlyoutButton> mCommunicateBtn;
+	CachedUICtrl<LLButton> mFlyBtn;
+	CachedUICtrl<LLButton> mBuildBtn;
+	CachedUICtrl<LLButton> mMapBtn;
+	CachedUICtrl<LLButton> mRadarBtn;
+	CachedUICtrl<LLButton> mInventoryBtn;
 };
 
 extern LLToolBar *gToolBar;
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index d31c262ea..6c807c255 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -3094,7 +3094,7 @@ void LLViewerWindow::updateUI()
 		}
 
 		// snap floaters to top of chat bar/button strip
-		LLView* chatbar_and_buttons = gOverlayBar->getChild<LLView>("chatbar_and_buttons", TRUE);
+		LLView* chatbar_and_buttons = gOverlayBar->getChatbarAndButtons();
 		// find top of chatbar and state buttons, if either are visible
 		if (chatbar_and_buttons && chatbar_and_buttons->getLocalBoundingRect().notEmpty())
 		{
diff --git a/indra/newview/llvoiceremotectrl.cpp b/indra/newview/llvoiceremotectrl.cpp
index b496f07a7..f89a3cf27 100644
--- a/indra/newview/llvoiceremotectrl.cpp
+++ b/indra/newview/llvoiceremotectrl.cpp
@@ -90,7 +90,12 @@ BOOL LLVoiceRemoteCtrl::postBuild()
 
 	childSetAction("voice_channel_bg", onClickVoiceChannel, this);
 
-
+	mEndCallBtn.connect(this,"end_call_btn");
+	mVoiceVolIcon.connect(this,"voice_volume");
+	mVoiceChanIcon.connect(this,"voice_channel_icon");
+	mVoiceChanBgBtn.connect(this,"voice_channel_bg");
+	mChanLabelTextBox.connect(this,"channel_label");
+	mShowChanBtn.connect(this,"show_channel");
 	return TRUE;
 }
 
@@ -106,14 +111,15 @@ void LLVoiceRemoteCtrl::draw()
 	mTalkBtn->setEnabled(voice_active);
 	mTalkLockBtn->setEnabled(voice_active);
 
+	static LLCachedControl<bool> ptt_currently_enabled("PPTCurrentlyEnabled",false);
 	// propagate ptt state to button display,
 	if (!mTalkBtn->hasMouseCapture())
 	{
 		// not in push to talk mode, or push to talk is active means I'm talking
-		mTalkBtn->setToggleState(!gSavedSettings.getBOOL("PTTCurrentlyEnabled") || gVoiceClient->getUserPTTState());
+		mTalkBtn->setToggleState(!ptt_currently_enabled || gVoiceClient->getUserPTTState());
 	}
 	mSpeakersBtn->setToggleState(LLFloaterActiveSpeakers::instanceVisible(LLSD()));
-	mTalkLockBtn->setToggleState(!gSavedSettings.getBOOL("PTTCurrentlyEnabled"));
+	mTalkLockBtn->setToggleState(!ptt_currently_enabled);
 
 	std::string talk_blip_image;
 	if (gVoiceClient->getIsSpeaking(gAgent.getID()))
@@ -148,7 +154,7 @@ void LLVoiceRemoteCtrl::draw()
 		talk_blip_image = "icn_voice_ptt-off.tga";
 	}
 
-	LLIconCtrl* icon = getChild<LLIconCtrl>("voice_volume");
+	LLIconCtrl* icon = mVoiceVolIcon;
 	if (icon)
 	{
 		icon->setImage(talk_blip_image);
@@ -162,23 +168,23 @@ void LLVoiceRemoteCtrl::draw()
 	}
 
 	LLVoiceChannel* current_channel = LLVoiceChannel::getCurrentVoiceChannel();
-	childSetEnabled("end_call_btn", LLVoiceClient::voiceEnabled() 
+	mEndCallBtn->setEnabled(LLVoiceClient::voiceEnabled() 
 								&& current_channel
 								&& current_channel->isActive()
 								&& current_channel != LLVoiceChannelProximal::getInstance());
 
-	childSetValue("channel_label", active_channel_name);
-	childSetToolTip("voice_channel_bg", active_channel_name);
+	mChanLabelTextBox->setValue(active_channel_name);
+	mVoiceChanBgBtn->setToolTip(active_channel_name);
 
 	if (current_channel)
 	{
-		LLIconCtrl* voice_channel_icon = getChild<LLIconCtrl>("voice_channel_icon");
+		LLIconCtrl* voice_channel_icon = mVoiceChanIcon;
 		if (voice_channel_icon && voice_floater)
 		{
 			voice_channel_icon->setImage(voice_floater->getString("voice_icon"));
 		}
 
-		LLButton* voice_channel_bg = getChild<LLButton>("voice_channel_bg");
+		LLButton* voice_channel_bg = mVoiceChanBgBtn;
 		if (voice_channel_bg)
 		{
 			LLColor4 bg_color;
@@ -198,7 +204,7 @@ void LLVoiceRemoteCtrl::draw()
 		}
 	}
 
-	LLButton* expand_button = getChild<LLButton>("show_channel");
+	LLButton* expand_button = mShowChanBtn;
 	if (expand_button)
 	{
 		if (expand_button->getToggleState())
diff --git a/indra/newview/llvoiceremotectrl.h b/indra/newview/llvoiceremotectrl.h
index 8522a6f37..86504fe38 100644
--- a/indra/newview/llvoiceremotectrl.h
+++ b/indra/newview/llvoiceremotectrl.h
@@ -36,6 +36,8 @@
 #include "llpanel.h"
 
 class LLButton;
+class LLIconCtrl;
+class LLTextBox;
 
 class LLVoiceRemoteCtrl : public LLPanel
 {
@@ -59,6 +61,12 @@ protected:
 	LLButton* mTalkBtn;
 	LLButton* mTalkLockBtn;
 	LLButton* mSpeakersBtn;
+	CachedUICtrl<LLButton> mEndCallBtn;
+	CachedUICtrl<LLIconCtrl> mVoiceVolIcon;
+	CachedUICtrl<LLIconCtrl> mVoiceChanIcon;
+	CachedUICtrl<LLButton> mVoiceChanBgBtn;
+	CachedUICtrl<LLTextBox> mChanLabelTextBox;
+	CachedUICtrl<LLButton> mShowChanBtn;
 };
 
 #endif // LL_LLVOICEREMOTECTRL_H

From 769a7b89d24f8806adb8f0d9e8f7cd2d06e09161 Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Fri, 3 Aug 2012 23:14:03 -0400
Subject: [PATCH 136/199] More Media Updates

Further updated llviewermedia
---
 indra/llplugin/llpluginclassmedia.h |   2 +-
 indra/llui/llview.h                 |   2 +-
 indra/newview/llfolderview.h        |  26 ++---
 indra/newview/llmediactrl.cpp       |  26 ++---
 indra/newview/llmediactrl.h         |   1 +
 indra/newview/lltoolpie.cpp         |   4 +-
 indra/newview/llviewermedia.cpp     | 161 ++++++++++++++++++++++++----
 indra/newview/llviewermedia.h       |  20 +++-
 8 files changed, 183 insertions(+), 59 deletions(-)

diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index b58d0c95f..4ad2a3fef 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -239,7 +239,7 @@ public:
 	std::string	getHoverText() const { return mHoverText; };
 	std::string	getHoverLink() const { return mHoverLink; };
 	
-	std::string getMediaName() const { return mMediaName; };
+	const std::string& getMediaName() const { return mMediaName; };
 	std::string getMediaDescription() const { return mMediaDescription; };
 
 	// Crash the plugin.  If you use this outside of a testbed, you will be punished.
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 721c82fbb..150c47e2c 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -467,7 +467,7 @@ public:
 	/*virtual*/ BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask);
 	/*virtual*/ BOOL	handleRightMouseUp(S32 x, S32 y, MASK mask);	
 	/*virtual*/ BOOL	handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect); // Display mToolTipMsg if no child handles it.
-	/*virtual*/ const std::string&	getName() const;
+	/*virtual*/ const std::string& getName() const;
 	/*virtual*/ void	onMouseCaptureLost();
 	/*virtual*/ BOOL	hasMouseCapture();
 	/*virtual*/ BOOL isView(); // Hack to support LLFocusMgr
diff --git a/indra/newview/llfolderview.h b/indra/newview/llfolderview.h
index ebb0cb1aa..8563b98a4 100644
--- a/indra/newview/llfolderview.h
+++ b/indra/newview/llfolderview.h
@@ -118,20 +118,20 @@ public:
 	virtual void setOpenArrangeRecursively(BOOL openitem, ERecurseType recurse);
 	virtual BOOL addFolder( LLFolderViewFolder* folder);
 
-	// Finds width and height of this object and it's children.  Also
-	// makes sure that this view and it's children are the right size.
+	// Find width and height of this object and its children. Also
+	// makes sure that this view and its children are the right size.
 	virtual S32 arrange( S32* width, S32* height, S32 filter_generation );
 
 	void arrangeAll() { mArrangeGeneration++; }
 	S32 getArrangeGeneration() { return mArrangeGeneration; }
 
-	// applies filters to control visibility of inventory items
+	// Apply filters to control visibility of inventory items
 	virtual void filter( LLInventoryFilter& filter);
 
-	// get the last selected item
+	// Get the last selected item
 	virtual LLFolderViewItem* getCurSelectedItem( void );
 
-	// Record the selected item and pass it down the hierachy.
+	// Record the selected item and pass it down the hierarchy.
 	virtual BOOL setSelection(LLFolderViewItem* selection, BOOL openitem,
 		BOOL take_keyboard_focus);
 
@@ -141,13 +141,13 @@ public:
 	// Called once a frame to update the selection if mSelectThisID has been set
 	void updateSelection();
 
-	// This method is used to toggle the selection of an item. Walks
-	// children, and keeps track of selected objects.
+	// This method is used to toggle the selection of an item. 
+	// Walks children and keeps track of selected objects.
 	virtual BOOL changeSelection(LLFolderViewItem* selection, BOOL selected);
 
 	virtual std::set<LLUUID> getSelectionList() const;
 
-	// make sure if ancestor is selected, descendents are not
+	// Make sure if ancestor is selected, descendents are not
 	void sanitizeSelection();
 	void clearSelection();
 	void addToSelectionList(LLFolderViewItem* item);
@@ -158,21 +158,21 @@ public:
 	void setDraggingOverItem(LLFolderViewItem* item) { mDraggingOverItem = item; }
 	LLFolderViewItem* getDraggingOverItem() { return mDraggingOverItem; }
 
-	// deletion functionality
+	// Deletion functionality
  	void removeSelectedItems();
 
-	// open the selected item.
+	// Open the selected item
 	void openSelectedItems( void );
 	void propertiesSelectedItems( void );
 
-	// change the folder type
+	// Change the folder type
 	void changeType(LLInventoryModel *model, LLFolderType::EType new_folder_type);
 
 	void autoOpenItem(LLFolderViewFolder* item);
 	void closeAutoOpenedFolders();
 	BOOL autoOpenTest(LLFolderViewFolder* item);
 
-	// copy & paste
+	// Copy & paste
 	virtual void	copy();
 	virtual BOOL	canCopy() const;
 
@@ -185,7 +185,7 @@ public:
 	virtual void	doDelete();
 	virtual BOOL	canDoDelete() const;
 
-	// public rename functionality - can only start the process
+	// Public rename functionality - can only start the process
 	void startRenamingSelectedItem( void );
 
 	// These functions were used when there was only one folderview,
diff --git a/indra/newview/llmediactrl.cpp b/indra/newview/llmediactrl.cpp
index 43fa98fbd..a203559c1 100644
--- a/indra/newview/llmediactrl.cpp
+++ b/indra/newview/llmediactrl.cpp
@@ -170,7 +170,7 @@ BOOL LLMediaCtrl::handleHover( S32 x, S32 y, MASK mask )
 
 	if (mMediaSource)
 	{
-		mMediaSource->mouseMove(x, y);
+		mMediaSource->mouseMove(x, y, mask);
 
 		gViewerWindow->setCursor(mLastSetCursor);
 	}
@@ -198,7 +198,7 @@ BOOL LLMediaCtrl::handleMouseUp( S32 x, S32 y, MASK mask )
 
 	if (mMediaSource)
 	{
-		mMediaSource->mouseUp(x, y);
+		mMediaSource->mouseUp(x, y, mask);
 
 		/*// *HACK: LLMediaImplLLMozLib automatically takes focus on mouseup,
 		// in addition to the onFocusReceived() call below.  Undo this. JC
@@ -222,7 +222,7 @@ BOOL LLMediaCtrl::handleMouseDown( S32 x, S32 y, MASK mask )
 	convertInputCoords(x, y);
 
 	if (mMediaSource)
-		mMediaSource->mouseDown(x, y);
+		mMediaSource->mouseDown(x, y, mask);
 	
 	gFocusMgr.setMouseCapture( this );
 
@@ -265,11 +265,11 @@ BOOL LLMediaCtrl::handleRightMouseDown( S32 x, S32 y, MASK mask )
 {
 	if (LLUICtrl::handleRightMouseDown(x, y, mask)) return TRUE;
 
-	/*S32 media_x = x, media_y = y;
+	S32 media_x = x, media_y = y;
 	convertInputCoords(media_x, media_y);
 
 	if (mMediaSource)
-		mMediaSource->mouseDown(media_x, media_y);
+		mMediaSource->mouseDown(media_x, media_y, mask, 1);
 	
 	gFocusMgr.setMouseCapture( this );
 
@@ -277,7 +277,7 @@ BOOL LLMediaCtrl::handleRightMouseDown( S32 x, S32 y, MASK mask )
 	{
 		setFocus( TRUE );
 	}
-	*/
+
 	return TRUE;
 }
 
@@ -289,7 +289,7 @@ BOOL LLMediaCtrl::handleDoubleClick( S32 x, S32 y, MASK mask )
 	convertInputCoords(x, y);
 
 	if (mMediaSource)
-		mMediaSource->mouseLeftDoubleClick( x, y);
+		mMediaSource->mouseDoubleClick( x, y, mask);
 
 	gFocusMgr.setMouseCapture( this );
 
@@ -916,20 +916,16 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
 		
 		case MEDIA_EVENT_NAVIGATE_BEGIN:
 		{
-			LL_INFOS("Media") <<  "Media event:  MEDIA_EVENT_NAVIGATE_BEGIN, url is " << self->getNavigateURI() << LL_ENDL;
-			if(mMediaSource && mHideLoading)
-			{
-				mMediaSource->suspendUpdates(true);
-			}
+			LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_NAVIGATE_BEGIN, url is " << self->getNavigateURI() << LL_ENDL;
 		};
 		break;
 		
 		case MEDIA_EVENT_NAVIGATE_COMPLETE:
 		{
-			LL_INFOS("Media") <<  "Media event:  MEDIA_EVENT_NAVIGATE_COMPLETE, result string is: " << self->getNavigateResultString() << LL_ENDL;
-			if(mMediaSource && mHideLoading)
+			LL_DEBUGS("Media") <<  "Media event:  MEDIA_EVENT_NAVIGATE_COMPLETE, result string is: " << self->getNavigateResultString() << LL_ENDL;
+			if(mHidingInitialLoad)
 			{
-				mMediaSource->suspendUpdates(false);
+				mHidingInitialLoad = false;
 			}
 		};
 		break;
diff --git a/indra/newview/llmediactrl.h b/indra/newview/llmediactrl.h
index 602a1f153..ef25ae0e3 100644
--- a/indra/newview/llmediactrl.h
+++ b/indra/newview/llmediactrl.h
@@ -177,6 +177,7 @@ class LLMediaCtrl :
 		bool mStretchToFill;
 		bool mMaintainAspectRatio;
 		bool mHideLoading;
+		bool mHidingInitialLoad;
 		bool mDecoupleTextureSize;
 		S32 mTextureWidth;
 		S32 mTextureHeight;
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 7d9f0a136..c97113e19 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -927,7 +927,7 @@ static bool handle_media_click(const LLPickInfo& pick)
 		}
 		else
 		{
-			media_impl->mouseDown(pick.mXYCoords.mX, pick.mXYCoords.mY);
+			media_impl->mouseDown(pick.mXYCoords.mX, pick.mXYCoords.mY, gKeyboard->currentMask(TRUE));
 			media_impl->mouseCapture(); // the mouse-up will happen when capture is lost
 		}
 
@@ -973,7 +973,7 @@ static bool handle_media_hover(const LLPickInfo& pick)
 	{
 		if(LLViewerMediaFocus::getInstance()->getFocus())
 		{
-			media_impl->mouseMove(pick.mXYCoords.mX, pick.mXYCoords.mY);
+			media_impl->mouseMove(pick.mXYCoords.mX, pick.mXYCoords.mY, gKeyboard->currentMask(TRUE));
 		}
 
 		// Set mouse over flag if unset
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 508dc1f5a..2feb641ba 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -52,6 +52,7 @@
 #include "llviewertexture.h"
 #include "llviewertexturelist.h"
 #include "llviewerwindow.h"
+#include "llwindow.h"
 #include "llvieweraudio.h"
 #include "llweb.h"
 
@@ -477,6 +478,8 @@ void LLViewerMedia::setCookiesEnabled(bool enabled)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 // static 
+/////////////////////////////////////////////////////////////////////////////////////////
+// static
 LLPluginCookieStore *LLViewerMedia::getCookieStore()
 {
 	if(sCookieStore == NULL)
@@ -640,7 +643,7 @@ void LLViewerMedia::setOpenIDCookie()
 		}
 		
 		getCookieStore()->setCookiesFromHost(sOpenIDCookie, authority.substr(host_start, host_end - host_start));
-		
+
 		// Do a web profile get so we can store the cookie 
 		LLSD headers = LLSD::emptyMap();
 		headers["Accept"] = "*/*";
@@ -740,7 +743,9 @@ LLViewerMediaImpl::LLViewerMediaImpl(const std::string& media_url,
 	mTextureUsedHeight(0),
 	mSuspendUpdates(false),
 	mVisible(true),
-	mClearCache(false)
+	mHasFocus(false),
+	mClearCache(false),
+	mBackgroundColor(LLColor4::white)
 { 
 	createMediaSource();
 }
@@ -813,7 +818,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
 	
 	if(plugin_basename.empty())
 	{
-		LL_WARNS("Media") << "Couldn't find plugin for media type " << media_type << LL_ENDL;
+		LL_WARNS_ONCE("Media") << "Couldn't find plugin for media type " << media_type << LL_ENDL;
 	}
 	else
 	{
@@ -839,12 +844,12 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
 		llstat s;
 		if(LLFile::stat(launcher_name, &s))
 		{
-			LL_WARNS("Media") << "Couldn't find launcher at " << launcher_name << LL_ENDL;
+			LL_WARNS_ONCE("Media") << "Couldn't find launcher at " << launcher_name << LL_ENDL;
 			llassert(false);	// Fail in debugging mode.
 		}
 		else if(LLFile::stat(plugin_name, &s))
 		{
-			LL_WARNS("Media") << "Couldn't find plugin at " << plugin_name << LL_ENDL;
+			LL_WARNS_ONCE("Media") << "Couldn't find plugin at " << plugin_name << LL_ENDL;
 			llassert(false);	// Fail in debugging mode.
 		}
 		else
@@ -915,6 +920,8 @@ bool LLViewerMediaImpl::initializePlugin(const std::string& media_type)
 		media_source->setLoop(mMediaLoop);
 		media_source->setAutoScale(mMediaAutoScale);
 		media_source->setBrowserUserAgent(LLViewerMedia::getCurrentUserAgent());
+		media_source->focus(mHasFocus);
+		media_source->setBackgroundColor(mBackgroundColor);
 
 		if(gSavedSettings.getBOOL("BrowserIgnoreSSLCertErrors"))
 		{
@@ -1046,6 +1053,8 @@ void LLViewerMediaImpl::setVolume(F32 volume)
 //////////////////////////////////////////////////////////////////////////////////////////
 void LLViewerMediaImpl::focus(bool focus)
 {
+	mHasFocus = focus;
+
 	LLPluginClassMedia* plugin = getMediaPlugin();
 	if (plugin)
 	{
@@ -1062,6 +1071,12 @@ void LLViewerMediaImpl::focus(bool focus)
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
+bool LLViewerMediaImpl::hasFocus() const
+{
+	// FIXME: This might be able to be a bit smarter by hooking into LLViewerMediaFocus, etc.
+	return mHasFocus;
+}
+
 void LLViewerMediaImpl::clearCache()
 {
 	LLPluginClassMedia* plugin = getMediaPlugin();
@@ -1074,8 +1089,9 @@ void LLViewerMediaImpl::clearCache()
 		mClearCache = true;
 	}
 }
+
 //////////////////////////////////////////////////////////////////////////////////////////
-void LLViewerMediaImpl::mouseDown(S32 x, S32 y)
+void LLViewerMediaImpl::mouseDown(S32 x, S32 y, MASK mask, S32 button)
 {
 	LLPluginClassMedia* plugin = getMediaPlugin();
 	scaleMouse(&x, &y);
@@ -1083,12 +1099,12 @@ void LLViewerMediaImpl::mouseDown(S32 x, S32 y)
 	mLastMouseY = y;
 	if (plugin)
 	{
-		plugin->mouseEvent(LLPluginClassMedia::MOUSE_EVENT_DOWN, LEFT_BUTTON, x, y, 0);
+		plugin->mouseEvent(LLPluginClassMedia::MOUSE_EVENT_DOWN, button, x, y, mask);
 	}
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
-void LLViewerMediaImpl::mouseUp(S32 x, S32 y)
+void LLViewerMediaImpl::mouseUp(S32 x, S32 y, MASK mask, S32 button)
 {
 	LLPluginClassMedia* plugin = getMediaPlugin();
 	scaleMouse(&x, &y);
@@ -1096,12 +1112,12 @@ void LLViewerMediaImpl::mouseUp(S32 x, S32 y)
 	mLastMouseY = y;
 	if (plugin)
 	{
-		plugin->mouseEvent(LLPluginClassMedia::MOUSE_EVENT_UP, LEFT_BUTTON, x, y, 0);
+		plugin->mouseEvent(LLPluginClassMedia::MOUSE_EVENT_UP, button, x, y, mask);
 	}
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
-void LLViewerMediaImpl::mouseMove(S32 x, S32 y)
+void LLViewerMediaImpl::mouseMove(S32 x, S32 y, MASK mask)
 {
 	LLPluginClassMedia* plugin = getMediaPlugin();
 	scaleMouse(&x, &y);
@@ -1109,12 +1125,75 @@ void LLViewerMediaImpl::mouseMove(S32 x, S32 y)
 	mLastMouseY = y;
 	if (plugin)
 	{
-		plugin->mouseEvent(LLPluginClassMedia::MOUSE_EVENT_MOVE, LEFT_BUTTON, x, y, 0);
+		plugin->mouseEvent(LLPluginClassMedia::MOUSE_EVENT_MOVE, 0, x, y, mask);
+	}
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////////////
+//static 
+void LLViewerMediaImpl::scaleTextureCoords(const LLVector2& texture_coords, S32 *x, S32 *y)
+{
+	LLPluginClassMedia* plugin = getMediaPlugin();
+	F32 texture_x = texture_coords.mV[VX];
+	F32 texture_y = texture_coords.mV[VY];
+	
+	// Deal with repeating textures by wrapping the coordinates into the range [0, 1.0)
+	texture_x = fmodf(texture_x, 1.0f);
+	if(texture_x < 0.0f)
+		texture_x = 1.0 + texture_x;
+		
+	texture_y = fmodf(texture_y, 1.0f);
+	if(texture_y < 0.0f)
+		texture_y = 1.0 + texture_y;
+
+	// scale x and y to texel units.
+	*x = llround(texture_x * plugin->getTextureWidth());
+	*y = llround((1.0f - texture_y) * plugin->getTextureHeight());
+
+	// Adjust for the difference between the actual texture height and the amount of the texture in use.
+	*y -= (plugin->getTextureHeight() - plugin->getHeight());
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::mouseDown(const LLVector2& texture_coords, MASK mask, S32 button)
+{
+	LLPluginClassMedia* plugin = getMediaPlugin();
+	if(plugin)
+	{
+		S32 x, y;
+		scaleTextureCoords(texture_coords, &x, &y);
+
+		mouseDown(x, y, mask, button);
+	}
+}
+
+void LLViewerMediaImpl::mouseUp(const LLVector2& texture_coords, MASK mask, S32 button)
+{
+	LLPluginClassMedia* plugin = getMediaPlugin();
+	if(plugin)
+	{		
+		S32 x, y;
+		scaleTextureCoords(texture_coords, &x, &y);
+
+		mouseUp(x, y, mask, button);
+	}
+}
+
+void LLViewerMediaImpl::mouseMove(const LLVector2& texture_coords, MASK mask)
+{
+	LLPluginClassMedia* plugin = getMediaPlugin();
+	if(plugin)
+	{		
+		S32 x, y;
+		scaleTextureCoords(texture_coords, &x, &y);
+
+		mouseMove(x, y, mask);
 	}
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
-void LLViewerMediaImpl::mouseLeftDoubleClick(S32 x, S32 y)
+void LLViewerMediaImpl::mouseDoubleClick(S32 x, S32 y, MASK mask, S32 button)
 {
 	LLPluginClassMedia* plugin = getMediaPlugin();
 	scaleMouse(&x, &y);
@@ -1122,7 +1201,20 @@ void LLViewerMediaImpl::mouseLeftDoubleClick(S32 x, S32 y)
 	mLastMouseY = y;
 	if (plugin)
 	{
-		plugin->mouseEvent(LLPluginClassMedia::MOUSE_EVENT_DOUBLE_CLICK, LEFT_BUTTON, x, y, 0);
+		plugin->mouseEvent(LLPluginClassMedia::MOUSE_EVENT_DOUBLE_CLICK, button, x, y, mask);
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////
+void LLViewerMediaImpl::scrollWheel(S32 x, S32 y, MASK mask)
+{
+	LLPluginClassMedia* plugin = getMediaPlugin();
+	scaleMouse(&x, &y);
+	mLastMouseX = x;
+	mLastMouseY = y;
+	if (plugin)
+	{
+		plugin->scrollEvent(x, y, mask);
 	}
 }
 
@@ -1132,7 +1224,7 @@ void LLViewerMediaImpl::onMouseCaptureLost()
 	LLPluginClassMedia* plugin = getMediaPlugin();
 	if (plugin)
 	{
-		plugin->mouseEvent(LLPluginClassMedia::MOUSE_EVENT_UP, LEFT_BUTTON, mLastMouseX, mLastMouseY, 0);
+		plugin->mouseEvent(LLPluginClassMedia::MOUSE_EVENT_UP, 0, mLastMouseX, mLastMouseY, 0);
 	}
 }
 
@@ -1150,6 +1242,18 @@ BOOL LLViewerMediaImpl::handleMouseUp(S32 x, S32 y, MASK mask)
 
 	return TRUE; 
 }
+
+//////////////////////////////////////////////////////////////////////////////////////////
+const std::string& LLViewerMediaImpl::getName() const 
+{ 
+	LLPluginClassMedia* plugin = getMediaPlugin();
+	if (plugin)
+	{
+		return plugin->getMediaName();
+	}
+	
+	return LLStringUtil::null; 
+};
 //////////////////////////////////////////////////////////////////////////////////////////
 void LLViewerMediaImpl::navigateHome()
 {
@@ -1261,7 +1365,7 @@ bool LLViewerMediaImpl::handleKeyHere(KEY key, MASK mask)
 		if(!result)
 		{
 			
-			LLSD native_key_data = LLSD::emptyMap(); 
+			LLSD native_key_data = gViewerWindow->getWindow()->getNativeKeyData();
 			
 			result = plugin->keyEvent(LLPluginClassMedia::KEY_EVENT_DOWN ,key, mask, native_key_data);
 			// Since the viewer internal event dispatching doesn't give us key-up events, simulate one here.
@@ -1284,7 +1388,7 @@ bool LLViewerMediaImpl::handleUnicodeCharHere(llwchar uni_char)
 		if (uni_char >= 32 // discard 'control' characters
 			&& uni_char != 127) // SDL thinks this is 'delete' - yuck.
 		{
-			LLSD native_key_data = LLSD::emptyMap(); 
+			LLSD native_key_data = gViewerWindow->getWindow()->getNativeKeyData();
 			
 			plugin->textInput(wstring_to_utf8str(LLWString(1, uni_char)), gKeyboard->currentMask(FALSE), native_key_data);
 		}
@@ -1367,6 +1471,7 @@ void LLViewerMediaImpl::update()
 			plugin->set_cookies(sUpdatedCookies);
 		}
 	}
+
 	if (!plugin)
 	{
 		return;
@@ -1446,21 +1551,21 @@ void LLViewerMediaImpl::updateImagesMediaStreams()
 	}
 	
 	LLViewerMediaTexture* placeholder_image = (LLViewerMediaTexture*)LLViewerTextureManager::getFetchedTexture( mTextureId );
-	LLPluginClassMedia* plugin = getMediaPlugin();
-
 	placeholder_image->getLastReferencedTimer()->reset();
 
+	LLPluginClassMedia* plugin = getMediaPlugin();
+
 	if (mNeedsNewTexture 
 		|| placeholder_image->getUseMipMaps()
-		|| ! placeholder_image->mIsMediaTexture
+		|| !placeholder_image->mIsMediaTexture
 		|| (placeholder_image->getWidth() != plugin->getTextureWidth())
 		|| (placeholder_image->getHeight() != plugin->getTextureHeight())
 		|| (mTextureUsedWidth != plugin->getWidth())
 		|| (mTextureUsedHeight != plugin->getHeight())
 		)
 	{
-		llinfos << "initializing media placeholder" << llendl;
-		llinfos << "movie image id " << mTextureId << llendl;
+		LL_DEBUGS("Media") << "initializing media placeholder" << LL_ENDL;
+		LL_DEBUGS("Media") << "movie image id " << mTextureId << LL_ENDL;
 
 		int texture_width = plugin->getTextureWidth();
 		int texture_height = plugin->getTextureHeight();
@@ -1474,7 +1579,9 @@ void LLViewerMediaImpl::updateImagesMediaStreams()
 		// MEDIAOPT: seems insane that we actually have to make an imageraw then
 		// immediately discard it
 		LLPointer<LLImageRaw> raw = new LLImageRaw(texture_width, texture_height, texture_depth);
-		raw->clear(0x0f, 0x0f, 0x0f, 0xff);
+		// Clear the texture to the background color, ignoring alpha.
+		// convert background color channels from [0.0, 1.0] to [0, 255];
+		raw->clear(int(mBackgroundColor.mV[VX] * 255.0f), int(mBackgroundColor.mV[VY] * 255.0f), int(mBackgroundColor.mV[VZ] * 255.0f), 0xff);
 		int discard_level = 0;
 
 		// ask media source for correct GL image format constants
@@ -1711,3 +1818,13 @@ LLViewerMediaImpl::canPaste() const
 		return FALSE;
 }
 
+void LLViewerMediaImpl::setBackgroundColor(LLColor4 color)
+{
+	mBackgroundColor = color; 
+
+	LLPluginClassMedia* plugin = getMediaPlugin();
+	if(plugin)
+	{
+		plugin->setBackgroundColor(mBackgroundColor);
+	}
+};
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h
index ada13304c..f33b3f13a 100644
--- a/indra/newview/llviewermedia.h
+++ b/indra/newview/llviewermedia.h
@@ -138,10 +138,16 @@ public:
 	void seek(F32 time);
 	void setVolume(F32 volume);
 	void focus(bool focus);
-	void mouseDown(S32 x, S32 y);
-	void mouseUp(S32 x, S32 y);
-	void mouseMove(S32 x, S32 y);
-	void mouseLeftDoubleClick(S32 x,S32 y );
+	// True if the impl has user focus.
+	bool hasFocus() const;
+	void mouseDown(S32 x, S32 y, MASK mask, S32 button = 0);
+	void mouseUp(S32 x, S32 y, MASK mask, S32 button = 0);
+	void mouseMove(S32 x, S32 y, MASK mask);
+	void mouseDown(const LLVector2& texture_coords, MASK mask, S32 button = 0);
+	void mouseUp(const LLVector2& texture_coords, MASK mask, S32 button = 0);
+	void mouseMove(const LLVector2& texture_coords, MASK mask);
+	void mouseDoubleClick(S32 x,S32 y, MASK mask, S32 button = 0);
+	void scrollWheel(S32 x, S32 y, MASK mask);
 	void mouseCapture();
 
 	void navigateHome();
@@ -158,6 +164,7 @@ public:
 	std::string getMimeType() { return mMimeType; }
 	void getTextureSize(S32 *texture_width, S32 *texture_height);
 	void scaleMouse(S32 *mouse_x, S32 *mouse_y);
+	void scaleTextureCoords(const LLVector2& texture_coords, S32 *x, S32 *y);
 
 	void updateMovieImage(const LLUUID& image_id, BOOL active);
 	void update();
@@ -198,7 +205,7 @@ public:
 	/*virtual*/ BOOL	handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen) { return FALSE; };
 	/*virtual*/ BOOL	handleMiddleMouseDown(S32 x, S32 y, MASK mask) { return FALSE; };
 	/*virtual*/ BOOL	handleMiddleMouseUp(S32 x, S32 y, MASK mask) {return FALSE; };
-	/*virtual*/ const std::string& getName() const { return LLStringUtil::null; };
+	/*virtual*/ const std::string& getName() const;
 	/*virtual*/ BOOL isView() const { return FALSE; };
 	/*virtual*/ void	screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const {};
 	/*virtual*/ void	localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const {};
@@ -219,6 +226,7 @@ public:
 	/*virtual*/ BOOL	canPaste() const;
 
 	bool mNeedsNewTexture;
+	void setBackgroundColor(LLColor4 color);
 private:
 	// a single media url with some data and an impl.
 	LLUUID mTextureId;
@@ -236,7 +244,9 @@ private:
 	S32 mTextureUsedHeight;
 	bool mSuspendUpdates;
 	bool mVisible;
+	bool mHasFocus;
 	bool mClearCache;
+	LLColor4 mBackgroundColor;
 
 private:
 	/*LLViewerMediaTexture*/LLViewerTexture *updatePlaceholderImage();

From 7122a7c174ba77b026ba3b3e5eb76fcd1d696081 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sat, 4 Aug 2012 13:43:32 -0500
Subject: [PATCH 137/199] Added sim console.

---
 etc/message.xml                               |  49 ++--
 indra/newview/CMakeLists.txt                  |   2 +
 indra/newview/llfloaterregiondebugconsole.cpp | 237 ++++++++++++++++++
 indra/newview/llfloaterregiondebugconsole.h   |  63 +++++
 indra/newview/llviewermenu.cpp                |  19 +-
 indra/newview/llviewerregion.cpp              |   4 +-
 indra/newview/shfloatermediaticker.cpp        |   4 -
 indra/newview/shfloatermediaticker.h          |   1 -
 .../en-us/floater_region_debug_console.xml    |  44 ++++
 9 files changed, 394 insertions(+), 29 deletions(-)
 create mode 100644 indra/newview/llfloaterregiondebugconsole.cpp
 create mode 100644 indra/newview/llfloaterregiondebugconsole.h
 create mode 100644 indra/newview/skins/default/xui/en-us/floater_region_debug_console.xml

diff --git a/etc/message.xml b/etc/message.xml
index 330ecee48..4d303be40 100644
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -50,7 +50,7 @@
 				<key>OpenCircuit</key>
 				<map>
 					<key>flavor</key>
-					<string>template</string>
+					<string>llsd</string>
 					<key>trusted-sender</key>
 					<boolean>false</boolean>
 				</map>
@@ -370,6 +370,14 @@
 				</map>
 
 				<!-- Server to client -->
+				<key>DisplayNameUpdate</key>
+				<map>
+					<key>flavor</key>
+					<string>llsd</string>
+					<key>trusted-sender</key>
+					<boolean>true</boolean>
+				</map>
+                
 				<key>ParcelVoiceInfo</key>
 				<map>
 					<key>flavor</key>
@@ -419,6 +427,22 @@
           <boolean>true</boolean>
         </map>
 
+        <key>SetDisplayNameReply</key>
+        <map>
+          <key>flavor</key>
+          <string>llsd</string>
+          <key>trusted-sender</key>
+          <boolean>true</boolean>
+        </map>
+
+        <key>SimConsoleResponse</key>
+        <map>
+          <key>flavor</key>
+          <string>llsd</string>
+          <key>trusted-sender</key>
+          <boolean>true</boolean>
+        </map>
+
         <key>DirLandReply</key>
         <map>
           <key>flavor</key>
@@ -569,26 +593,9 @@
 				<map>
 					<key>flavor</key>
 					<string>llsd</string>
-					<key>trusted-sender</key>
-					<boolean>true</boolean>
-				</map>
-
-                <!-- Server to client -->
-                <key>DisplayNameUpdate</key>
-                <map>
-                  <key>flavor</key>
-                  <string>llsd</string>
-                  <key>trusted-sender</key>
-                  <boolean>true</boolean>
-                </map>
- 
-                <key>SetDisplayNameReply</key>
-                <map>
-                  <key>flavor</key>
-                  <string>llsd</string>
-                  <key>trusted-sender</key>
-                  <boolean>true</boolean>
-                </map>
+          <key>trusted-sender</key>
+          <boolean>true</boolean>
+        </map>
 
 		  </map>
   	  	<key>capBans</key>
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index bd27204b6..102dfdbe1 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -250,6 +250,7 @@ set(viewer_SOURCE_FILES
     llfloaterpostprocess.cpp
     llfloaterpreference.cpp
     llfloaterproperties.cpp
+    llfloaterregiondebugconsole.cpp
     llfloaterregioninfo.cpp
     llfloaterreporter.cpp
     llfloatersearchreplace.cpp
@@ -747,6 +748,7 @@ set(viewer_HEADER_FILES
     llfloaterpreference.h
     llfloaterperms.h
     llfloaterproperties.h
+    llfloaterregiondebugconsole.h
     llfloaterregioninfo.h
     llfloaterreporter.h
     llfloatersearchreplace.h
diff --git a/indra/newview/llfloaterregiondebugconsole.cpp b/indra/newview/llfloaterregiondebugconsole.cpp
new file mode 100644
index 000000000..9312781c4
--- /dev/null
+++ b/indra/newview/llfloaterregiondebugconsole.cpp
@@ -0,0 +1,237 @@
+/** 
+ * @file llfloaterregiondebugconsole.h
+ * @author Brad Kittenbrink <brad@lindenlab.com>
+ * @brief Quick and dirty console for region debug settings
+ *
+ * $LicenseInfo:firstyear=2010&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloaterregiondebugconsole.h"
+
+#include "llagent.h"
+#include "llhttpclient.h"
+#include "llhttpnode.h"
+#include "lllineeditor.h"
+#include "lltexteditor.h"
+#include "llviewerregion.h"
+#include "lluictrlfactory.h"
+
+// Two versions of the sim console API are supported.
+//
+// SimConsole capability (deprecated):
+// This is the initial implementation that is supported by some versions of the
+// simulator. It is simple and straight forward, just POST a command and the
+// body of the response has the result. This API is deprecated because it
+// doesn't allow the sim to use any asynchronous API.
+//
+// SimConsoleAsync capability:
+// This capability replaces the original SimConsole capability. It is similar
+// in that the command is POSTed to the SimConsoleAsync cap, but the response
+// comes in through the event poll, which gives the simulator more flexibility
+// and allows it to perform complex operations without blocking any frames.
+//
+// We will assume the SimConsoleAsync capability is available, and fall back to
+// the SimConsole cap if it is not. The simulator will only support one or the
+// other.
+
+namespace
+{
+	// Signal used to notify the floater of responses from the asynchronous
+	// API.
+	console_reply_signal_t sConsoleReplySignal;
+
+	const std::string PROMPT("\n\n> ");
+	const std::string UNABLE_TO_SEND_COMMAND(
+		"ERROR: The last command was not received by the server.");
+	const std::string CONSOLE_UNAVAILABLE(
+		"ERROR: No console available for this region/simulator.");
+	const std::string CONSOLE_NOT_SUPPORTED(
+		"This region does not support the simulator console.");
+
+	// This responder handles the initial response. Unless error() is called
+	// we assume that the simulator has received our request. Error will be
+	// called if this request times out.
+	class AsyncConsoleResponder : public LLHTTPClient::Responder
+	{
+	public:
+		/* virtual */
+		void error(U32 status, const std::string& reason)
+		{
+			sConsoleReplySignal(UNABLE_TO_SEND_COMMAND);
+		}
+	};
+
+	class ConsoleResponder : public LLHTTPClient::Responder
+	{
+	public:
+		ConsoleResponder(LLTextEditor *output) : mOutput(output)
+		{
+		}
+
+		/*virtual*/
+		void error(U32 status, const std::string& reason)
+		{
+			if (mOutput)
+			{
+				mOutput->appendText(
+					UNABLE_TO_SEND_COMMAND + PROMPT,
+					false, false);
+			}
+		}
+
+		/*virtual*/
+		void result(const LLSD& content)
+		{
+			if (mOutput)
+			{
+				mOutput->appendText(
+					content.asString() + PROMPT, false, false);
+			}
+		}
+
+		LLTextEditor * mOutput;
+	};
+
+	// This handles responses for console commands sent via the asynchronous
+	// API.
+	class ConsoleResponseNode : public LLHTTPNode
+	{
+	public:
+		/* virtual */
+		void post(
+			LLHTTPNode::ResponsePtr reponse,
+			const LLSD& context,
+			const LLSD& input) const
+		{
+			llinfos << "Received response from the debug console: "
+				<< input << llendl;
+			sConsoleReplySignal(input["body"].asString());
+		}
+	};
+}
+
+boost::signals2::connection LLFloaterRegionDebugConsole::setConsoleReplyCallback(const console_reply_signal_t::slot_type& cb)
+{
+	return sConsoleReplySignal.connect(cb);
+}
+
+LLFloaterRegionDebugConsole::LLFloaterRegionDebugConsole()
+: LLFloater(), mOutput(NULL)
+{
+	mReplySignalConnection = sConsoleReplySignal.connect(
+		boost::bind(
+			&LLFloaterRegionDebugConsole::onReplyReceived,
+			this,
+			_1));
+
+	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_region_debug_console.xml");
+}
+
+LLFloaterRegionDebugConsole::~LLFloaterRegionDebugConsole()
+{
+	mReplySignalConnection.disconnect();
+}
+
+BOOL LLFloaterRegionDebugConsole::postBuild()
+{
+	LLLineEditor* input = getChild<LLLineEditor>("region_debug_console_input");
+	input->setEnableLineHistory(true);
+	input->setCommitCallback(boost::bind(&LLFloaterRegionDebugConsole::onInput, this, _1, _2));
+	input->setFocus(true);
+	input->setCommitOnFocusLost(false);
+
+	mOutput = getChild<LLTextEditor>("region_debug_console_output");
+
+	std::string url = gAgent.getRegion()->getCapability("SimConsoleAsync");
+	if (url.empty())
+	{
+		// Fall back to see if the old API is supported.
+		url = gAgent.getRegion()->getCapability("SimConsole");
+		if (url.empty())
+		{
+			mOutput->appendText(
+				CONSOLE_NOT_SUPPORTED + PROMPT,
+				false, false);
+			return TRUE;
+		}
+	}
+
+	mOutput->appendText("> ", false, false);
+	return TRUE;
+}
+
+void LLFloaterRegionDebugConsole::onClose(bool app_quitting)
+{
+	LLFloater::onClose(app_quitting);
+
+	if (!app_quitting)
+	{
+		delete this;
+	}
+}
+
+void LLFloaterRegionDebugConsole::onInput(LLUICtrl* ctrl, const LLSD& param)
+{
+	LLLineEditor* input = static_cast<LLLineEditor*>(ctrl);
+	std::string text = input->getText() + "\n";
+
+	std::string url = gAgent.getRegion()->getCapability("SimConsoleAsync");
+	if (url.empty())
+	{
+		// Fall back to the old API
+		url = gAgent.getRegion()->getCapability("SimConsole");
+		if (url.empty())
+		{
+			text += CONSOLE_UNAVAILABLE + PROMPT;
+		}
+		else
+		{
+			// Using SimConsole (deprecated)
+			LLHTTPClient::post(
+				url,
+				LLSD(input->getText()),
+				new ConsoleResponder(mOutput));
+		}
+	}
+	else
+	{
+		// Using SimConsoleAsync
+		LLHTTPClient::post(
+			url,
+			LLSD(input->getText()),
+			new AsyncConsoleResponder);
+	}
+
+	mOutput->appendText(text, false, false);
+	input->clear();
+}
+
+void LLFloaterRegionDebugConsole::onReplyReceived(const std::string& output)
+{
+	mOutput->appendText(output + PROMPT, false, false);
+}
+
+LLHTTPRegistration<ConsoleResponseNode>
+	gHTTPRegistrationMessageDebugConsoleResponse(
+		"/message/SimConsoleResponse");
diff --git a/indra/newview/llfloaterregiondebugconsole.h b/indra/newview/llfloaterregiondebugconsole.h
new file mode 100644
index 000000000..bc20ea9c4
--- /dev/null
+++ b/indra/newview/llfloaterregiondebugconsole.h
@@ -0,0 +1,63 @@
+/** 
+ * @file llfloaterregiondebugconsole.h
+ * @author Brad Kittenbrink <brad@lindenlab.com>
+ * @brief Quick and dirty console for region debug settings
+ *
+ * $LicenseInfo:firstyear=2010&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLFLOATERREGIONDEBUGCONSOLE_H
+#define LL_LLFLOATERREGIONDEBUGCONSOLE_H
+
+#include <boost/signals2.hpp>
+
+#include "llfloater.h"
+#include "llhttpclient.h"
+
+class LLTextEditor;
+
+typedef boost::signals2::signal<
+	void (const std::string& output)> console_reply_signal_t;
+
+class LLFloaterRegionDebugConsole : public LLFloater, public LLHTTPClient::Responder, public LLSingleton<LLFloaterRegionDebugConsole>
+{
+public:
+	LLFloaterRegionDebugConsole();
+	virtual ~LLFloaterRegionDebugConsole();
+
+	// virtual
+	BOOL postBuild();
+	void onClose(bool app_quitting);
+	
+	void onInput(LLUICtrl* ctrl, const LLSD& param);
+
+	LLTextEditor * mOutput;
+
+	static boost::signals2::connection setConsoleReplyCallback(const console_reply_signal_t::slot_type& cb);
+
+ private:
+	void onReplyReceived(const std::string& output);
+
+	boost::signals2::connection mReplySignalConnection;
+};
+
+#endif // LL_LLFLOATERREGIONDEBUGCONSOLE_H
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 669c57d43..f586026f9 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -143,6 +143,7 @@
 #include "llfloaterperms.h"
 #include "llfloaterpostprocess.h"
 #include "llfloaterpreference.h"
+#include "llfloaterregiondebugconsole.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterreporter.h"
 #include "llfloaterscriptdebug.h"
@@ -418,6 +419,21 @@ void handle_god_mode(void*);
 // God menu
 void handle_leave_god_mode(void*);
 
+//Generic handler for singleton-based floaters.
+template<typename T>
+BOOL handle_singleton_check(void *)
+{
+	return T::instanceExists();
+}
+template<typename T>
+void handle_singleton_toggle(void *)
+{
+	if(!T::instanceExists())
+		T::getInstance();
+	else
+		T::getInstance()->close();
+}
+
 // <edit>
 void handle_fake_away_status(void*);
 void handle_area_search(void*);
@@ -811,7 +827,7 @@ void init_menus()
 	menu->addChild(new LLMenuItemCallGL(	"Asset Blacklist",
 											&handle_blacklist, NULL));
 	menu->addChild(new LLMenuItemCheckGL(  "Streaming Audio Display", 
-											&handle_ticker_toggle, &handle_ticker_enabled, &handle_ticker_check, NULL ));
+											&handle_ticker_toggle, &handle_ticker_enabled, &handle_singleton_check<SHFloaterMediaTicker>, NULL ));
 	
 	
 	
@@ -1282,6 +1298,7 @@ void init_debug_ui_menu(LLMenuGL* menu)
 		(void*)"DoubleClickTeleport"));
 	menu->addSeparator();
 //	menu->addChild(new LLMenuItemCallGL( "Print Packets Lost",			&print_packets_lost, NULL, NULL, 'L', MASK_SHIFT ));
+	menu->addChild(new LLMenuItemCheckGL("Region Debug", handle_singleton_toggle<LLFloaterRegionDebugConsole>, NULL, handle_singleton_check<LLFloaterRegionDebugConsole>,NULL,'`', MASK_CONTROL|MASK_SHIFT));
 	menu->addChild(new LLMenuItemCheckGL("Debug SelectMgr", menu_toggle_control, NULL, menu_check_control, (void*)"DebugSelectMgr"));
 	menu->addChild(new LLMenuItemToggleGL("Debug Clicks", &gDebugClicks));
 	menu->addChild(new LLMenuItemToggleGL("Debug Views", &LLView::sDebugRects));
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 6755005a8..153bd2f67 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1611,10 +1611,10 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("SendUserReport");
 	capabilityNames.append("SendUserReportWithScreenshot");
 	capabilityNames.append("ServerReleaseNotes");
-	//capabilityNames.append("SimConsole");
+	capabilityNames.append("SimConsole");
 	capabilityNames.append("SimulatorFeatures");
 	capabilityNames.append("SetDisplayName");
-	//capabilityNames.append("SimConsoleAsync");
+	capabilityNames.append("SimConsoleAsync");
 	capabilityNames.append("StartGroupProposal");
 	capabilityNames.append("TextureStats");
 	capabilityNames.append("UntrustedSimulatorMessage");
diff --git a/indra/newview/shfloatermediaticker.cpp b/indra/newview/shfloatermediaticker.cpp
index f3e1849af..a2c995153 100644
--- a/indra/newview/shfloatermediaticker.cpp
+++ b/indra/newview/shfloatermediaticker.cpp
@@ -255,10 +255,6 @@ BOOL handle_ticker_enabled(void *)
 {
 	return gAudiop && gAudiop->getStreamingAudioImpl() && gAudiop->getStreamingAudioImpl()->supportsMetaData();
 }
-BOOL handle_ticker_check(void *)
-{
-	return SHFloaterMediaTicker::instanceExists();
-}
 void handle_ticker_toggle(void *)
 {
 	if(!handle_ticker_enabled(NULL))
diff --git a/indra/newview/shfloatermediaticker.h b/indra/newview/shfloatermediaticker.h
index 3fa23bdda..4668f33bd 100644
--- a/indra/newview/shfloatermediaticker.h
+++ b/indra/newview/shfloatermediaticker.h
@@ -54,6 +54,5 @@ private:
 
 //Menu callbacks.
 BOOL handle_ticker_enabled(void *);
-BOOL handle_ticker_check(void *);
 void handle_ticker_toggle(void *);
 
diff --git a/indra/newview/skins/default/xui/en-us/floater_region_debug_console.xml b/indra/newview/skins/default/xui/en-us/floater_region_debug_console.xml
new file mode 100644
index 000000000..d97efb1c7
--- /dev/null
+++ b/indra/newview/skins/default/xui/en-us/floater_region_debug_console.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+  can_close="true"
+  can_minimize="true"
+  name="region_debug_console"
+  title="Region Debug"
+  can_resize="true"
+  layout="topleft"
+  min_height="300"
+  min_width="300"
+  height="400"
+  width="600"
+  default_tab_group="1">
+  <text_editor
+   left="10"
+   type="string"
+   length="1"
+   follows="all"
+   font="Monospace"
+   bottom="-373"
+   height="353"
+   width="576"
+   ignore_tab="false"
+   layout="topleft"
+   max_length="65536"
+   name="region_debug_console_output"
+   show_line_numbers="false" 
+   word_wrap="true"
+   track_bottom="true"
+   enabled="false">
+  </text_editor>
+  <line_editor
+   border_style="line"
+   border_thickness="1"
+   tab_group="1" 
+   follows="left|bottom|right"
+   font="SansSerif"
+   height="19"
+   layout="topleft"
+   bottom_delta="-20"
+   max_length="127"
+   name="region_debug_console_input"
+   width="576" />
+</floater>

From aca3e8f6c4a27375f6cc35f95be4e30fe9b9ff9e Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sat, 4 Aug 2012 18:18:22 -0500
Subject: [PATCH 138/199] Cleanup. Removal of dead code. Added/renamed object
 flag accessors.

---
 indra/llmessage/message_prehash.cpp    |   3 -
 indra/llmessage/message_prehash.h      |   3 -
 indra/llprimitive/object_flags.h       |  92 ++++++++++------------
 indra/newview/importtracker.cpp        |   2 +-
 indra/newview/llfloatertools.cpp       |  22 ------
 indra/newview/llhoverview.cpp          |   6 +-
 indra/newview/llpanelobject.cpp        |  37 +--------
 indra/newview/llpanelobject.h          |   4 -
 indra/newview/llselectmgr.cpp          |  51 -------------
 indra/newview/llselectmgr.h            |   3 -
 indra/newview/lltoolgrab.cpp           |   4 +-
 indra/newview/lltoolpie.cpp            |   6 +-
 indra/newview/llviewermenu.cpp         |  25 ------
 indra/newview/llviewermessage.cpp      |   4 +-
 indra/newview/llviewerobject.cpp       | 101 +++++++++----------------
 indra/newview/llviewerobject.h         |  19 +++--
 indra/newview/llviewerobjectbackup.cpp |   9 +--
 indra/newview/llviewerobjectlist.cpp   |  20 +----
 indra/newview/llvoavatarself.cpp       |   2 +-
 indra/newview/pipeline.cpp             |   2 +-
 20 files changed, 113 insertions(+), 302 deletions(-)

diff --git a/indra/llmessage/message_prehash.cpp b/indra/llmessage/message_prehash.cpp
index 58389f932..fbc663347 100644
--- a/indra/llmessage/message_prehash.cpp
+++ b/indra/llmessage/message_prehash.cpp
@@ -945,7 +945,6 @@ char const* const _PREHASH_SysGPU = LLMessageStringTable::getInstance()->getStri
 char const* const _PREHASH_AvatarInterestsReply = LLMessageStringTable::getInstance()->getString("AvatarInterestsReply");
 char const* const _PREHASH_StartLure = LLMessageStringTable::getInstance()->getString("StartLure");
 char const* const _PREHASH_SysRAM = LLMessageStringTable::getInstance()->getString("SysRAM");
-char const* const _PREHASH_ObjectPosition = LLMessageStringTable::getInstance()->getString("ObjectPosition");
 char const* const _PREHASH_SitPosition = LLMessageStringTable::getInstance()->getString("SitPosition");
 char const* const _PREHASH_StartTime = LLMessageStringTable::getInstance()->getString("StartTime");
 char const* const _PREHASH_BornOn = LLMessageStringTable::getInstance()->getString("BornOn");
@@ -1001,7 +1000,6 @@ char const* const _PREHASH_SnapshotID = LLMessageStringTable::getInstance()->get
 char const* const _PREHASH_Aspect = LLMessageStringTable::getInstance()->getString("Aspect");
 char const* const _PREHASH_ParamSize = LLMessageStringTable::getInstance()->getString("ParamSize");
 char const* const _PREHASH_VoteCast = LLMessageStringTable::getInstance()->getString("VoteCast");
-char const* const _PREHASH_CastsShadows = LLMessageStringTable::getInstance()->getString("CastsShadows");
 char const* const _PREHASH_EveryoneMask = LLMessageStringTable::getInstance()->getString("EveryoneMask");
 char const* const _PREHASH_ObjectSpinUpdate = LLMessageStringTable::getInstance()->getString("ObjectSpinUpdate");
 char const* const _PREHASH_MaturePublish = LLMessageStringTable::getInstance()->getString("MaturePublish");
@@ -1050,7 +1048,6 @@ char const* const _PREHASH_SimIP = LLMessageStringTable::getInstance()->getStrin
 char const* const _PREHASH_GodID = LLMessageStringTable::getInstance()->getString("GodID");
 char const* const _PREHASH_TeleportMinPrice = LLMessageStringTable::getInstance()->getString("TeleportMinPrice");
 char const* const _PREHASH_VoteItem = LLMessageStringTable::getInstance()->getString("VoteItem");
-char const* const _PREHASH_ObjectRotation = LLMessageStringTable::getInstance()->getString("ObjectRotation");
 char const* const _PREHASH_SitRotation = LLMessageStringTable::getInstance()->getString("SitRotation");
 char const* const _PREHASH_SnapSelection = LLMessageStringTable::getInstance()->getString("SnapSelection");
 char const* const _PREHASH_SoundTrigger = LLMessageStringTable::getInstance()->getString("SoundTrigger");
diff --git a/indra/llmessage/message_prehash.h b/indra/llmessage/message_prehash.h
index 48ad2c743..b4523ea8e 100644
--- a/indra/llmessage/message_prehash.h
+++ b/indra/llmessage/message_prehash.h
@@ -945,7 +945,6 @@ extern char const* const _PREHASH_SysGPU;
 extern char const* const _PREHASH_AvatarInterestsReply;
 extern char const* const _PREHASH_StartLure;
 extern char const* const _PREHASH_SysRAM;
-extern char const* const _PREHASH_ObjectPosition;
 extern char const* const _PREHASH_SitPosition;
 extern char const* const _PREHASH_StartTime;
 extern char const* const _PREHASH_BornOn;
@@ -1001,7 +1000,6 @@ extern char const* const _PREHASH_SnapshotID;
 extern char const* const _PREHASH_Aspect;
 extern char const* const _PREHASH_ParamSize;
 extern char const* const _PREHASH_VoteCast;
-extern char const* const _PREHASH_CastsShadows;
 extern char const* const _PREHASH_EveryoneMask;
 extern char const* const _PREHASH_ObjectSpinUpdate;
 extern char const* const _PREHASH_MaturePublish;
@@ -1050,7 +1048,6 @@ extern char const* const _PREHASH_SimIP;
 extern char const* const _PREHASH_GodID;
 extern char const* const _PREHASH_TeleportMinPrice;
 extern char const* const _PREHASH_VoteItem;
-extern char const* const _PREHASH_ObjectRotation;
 extern char const* const _PREHASH_SitRotation;
 extern char const* const _PREHASH_SnapSelection;
 extern char const* const _PREHASH_SoundTrigger;
diff --git a/indra/llprimitive/object_flags.h b/indra/llprimitive/object_flags.h
index c873f502b..7def340df 100644
--- a/indra/llprimitive/object_flags.h
+++ b/indra/llprimitive/object_flags.h
@@ -2,31 +2,25 @@
  * @file object_flags.h
  * @brief Flags for object creation and transmission
  *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$
  * 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
+ * Copyright (C) 2010, Linden Research, Inc.
  * 
- * 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
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
  * 
- * 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.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
 
@@ -34,43 +28,39 @@
 #define LL_OBJECT_FLAGS_H
 
 // downstream flags from sim->viewer
-const U32	FLAGS_USE_PHYSICS			= 0x00000001;
-const U32	FLAGS_CREATE_SELECTED		= 0x00000002;
-const U32	FLAGS_OBJECT_MODIFY			= 0x00000004;
-const U32	FLAGS_OBJECT_COPY			= 0x00000008;
-const U32	FLAGS_OBJECT_ANY_OWNER		= 0x00000010;
-const U32	FLAGS_OBJECT_YOU_OWNER		= 0x00000020;
-const U32	FLAGS_SCRIPTED				= 0x00000040;
-const U32	FLAGS_HANDLE_TOUCH			= 0x00000080;
-const U32	FLAGS_OBJECT_MOVE			= 0x00000100;
-const U32	FLAGS_TAKES_MONEY			= 0x00000200;
-const U32	FLAGS_PHANTOM				= 0x00000400;
-const U32	FLAGS_INVENTORY_EMPTY		= 0x00000800;
+const U32   FLAGS_USE_PHYSICS          = (1U << 0);
+const U32   FLAGS_CREATE_SELECTED      = (1U << 1);
+const U32   FLAGS_OBJECT_MODIFY        = (1U << 2);
+const U32   FLAGS_OBJECT_COPY          = (1U << 3);
+const U32   FLAGS_OBJECT_ANY_OWNER     = (1U << 4);
+const U32   FLAGS_OBJECT_YOU_OWNER     = (1U << 5);
+const U32   FLAGS_SCRIPTED             = (1U << 6);
+const U32   FLAGS_HANDLE_TOUCH         = (1U << 7);
+const U32   FLAGS_OBJECT_MOVE          = (1U << 8);
+const U32   FLAGS_TAKES_MONEY          = (1U << 9);
+const U32   FLAGS_PHANTOM              = (1U << 10);
+const U32   FLAGS_INVENTORY_EMPTY      = (1U << 11);
 
-const U32	FLAGS_JOINT_HINGE			= 0x00001000;
-const U32	FLAGS_JOINT_P2P				= 0x00002000;
-const U32	FLAGS_JOINT_LP2P			= 0x00004000;
-// const U32	FLAGS_JOINT_WHEEL		= 0x00008000;
-const U32	FLAGS_INCLUDE_IN_SEARCH		= 0x00008000;
+const U32   FLAGS_INCLUDE_IN_SEARCH    = (1U << 15);
 
-const U32	FLAGS_ALLOW_INVENTORY_DROP	= 0x00010000;
-const U32	FLAGS_OBJECT_TRANSFER		= 0x00020000;
-const U32	FLAGS_OBJECT_GROUP_OWNED	= 0x00040000;
-//const U32	FLAGS_OBJECT_YOU_OFFICER	= 0x00080000;
+const U32   FLAGS_ALLOW_INVENTORY_DROP = (1U << 16);
+const U32   FLAGS_OBJECT_TRANSFER      = (1U << 17);
+const U32   FLAGS_OBJECT_GROUP_OWNED   = (1U << 18);
+//const U32 FLAGS_UNUSED_000           = (1U << 19); // was FLAGS_OBJECT_YOU_OFFICER
 
-const U32 	FLAGS_CAMERA_DECOUPLED 		= 0x00100000;
-const U32	FLAGS_ANIM_SOURCE			= 0x00200000;
-const U32	FLAGS_CAMERA_SOURCE			= 0x00400000;
+const U32   FLAGS_CAMERA_DECOUPLED     = (1U << 20);
+const U32   FLAGS_ANIM_SOURCE          = (1U << 21);
+const U32   FLAGS_CAMERA_SOURCE        = (1U << 22);
 
-const U32	FLAGS_CAST_SHADOWS			= 0x00800000;
+//const U32 FLAGS_UNUSED_001           = (1U << 23); // was FLAGS_CAST_SHADOWS
 
-const U32	FLAGS_OBJECT_OWNER_MODIFY	= 0x10000000;
+const U32   FLAGS_OBJECT_OWNER_MODIFY  = (1U << 28);
 
-const U32	FLAGS_TEMPORARY_ON_REZ		= 0x20000000;
-const U32	FLAGS_TEMPORARY				= 0x40000000;
-const U32	FLAGS_ZLIB_COMPRESSED		= 0x80000000;
+const U32   FLAGS_TEMPORARY_ON_REZ     = (1U << 29);
+const U32	FLAGS_TEMPORARY			   = (1U << 30);
+//const U32 FLAGS_UNUSED_007           = (1U << 31); // was FLAGS_ZLIB_COMPRESSED
 
-const U32	FLAGS_LOCAL					= FLAGS_ANIM_SOURCE | FLAGS_CAMERA_SOURCE;
+const U32   FLAGS_LOCAL                = FLAGS_ANIM_SOURCE | FLAGS_CAMERA_SOURCE;
 
 typedef enum e_havok_joint_type
 {
diff --git a/indra/newview/importtracker.cpp b/indra/newview/importtracker.cpp
index b926d7aac..ce2e6bb1e 100644
--- a/indra/newview/importtracker.cpp
+++ b/indra/newview/importtracker.cpp
@@ -203,7 +203,7 @@ void ImportTracker::get_update(S32 newid, BOOL justCreated, BOOL createSelected)
 				msg->addBOOLFast(_PREHASH_UsePhysics, gSavedSettings.getBOOL("EmeraldBuildPrefs_Physical"));
 				msg->addBOOLFast(_PREHASH_IsTemporary, gSavedSettings.getBOOL("EmeraldBuildPrefs_Temporary"));
 				msg->addBOOLFast(_PREHASH_IsPhantom, gSavedSettings.getBOOL("EmeraldBuildPrefs_Phantom") );
-				msg->addBOOL("CastsShadows", true );
+				msg->addBOOL("CastsShadows", false );
 				msg->sendReliable(gAgent.getRegion()->getHost());
 
 				if(gSavedSettings.getBOOL("EmeraldBuildPrefs_EmbedItem"))
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 07fae3df2..74f82e884 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -110,9 +110,6 @@ void click_popup_minimize(void*);
 void click_popup_grab_drag(LLUICtrl *, void*);
 void click_popup_grab_lift(LLUICtrl *, void*);
 void click_popup_grab_spin(LLUICtrl *, void*);
-void click_popup_rotate_left(void*);
-void click_popup_rotate_reset(void*);
-void click_popup_rotate_right(void*);
 void click_popup_dozer_mode(LLUICtrl *, void *user);
 void commit_slider_dozer_size(LLUICtrl *, void*);
 void commit_slider_dozer_force(LLUICtrl *, void*);
@@ -947,25 +944,6 @@ void commit_slider_zoom(LLUICtrl *ctrl, void*)
 	gAgentCamera.setCameraZoomFraction(zoom_level);
 }
 
-void click_popup_rotate_left(void*)
-{
-	LLSelectMgr::getInstance()->selectionRotateAroundZ( 45.f );
-	dialog_refresh_all();
-}
-
-void click_popup_rotate_reset(void*)
-{
-	LLSelectMgr::getInstance()->selectionResetRotation();
-	dialog_refresh_all();
-}
-
-void click_popup_rotate_right(void*)
-{
-	LLSelectMgr::getInstance()->selectionRotateAroundZ( -45.f );
-	dialog_refresh_all();
-}
-
-
 void click_popup_dozer_mode(LLUICtrl *, void *user)
 {
 	S32 mode = (S32)(intptr_t) user;
diff --git a/indra/newview/llhoverview.cpp b/indra/newview/llhoverview.cpp
index ce2bb321a..f6cff6f16 100644
--- a/indra/newview/llhoverview.cpp
+++ b/indra/newview/llhoverview.cpp
@@ -408,7 +408,7 @@ void LLHoverView::updateText()
 				LLViewerObject *parent = (LLViewerObject *)object->getParent();
 
 				if (object &&
-					(object->usePhysics() ||
+					(object->flagUsePhysics() ||
 					 object->flagScripted() || 
 					 object->flagHandleTouch() || (parent && parent->flagHandleTouch()) ||
 					 object->flagTakesMoney() || (parent && parent->flagTakesMoney()) ||
@@ -423,7 +423,7 @@ void LLHoverView::updateText()
 						line.append(LLTrans::getString("TooltipFlagScript") + " ");
 					}
 
-					if (object->usePhysics())
+					if (object->flagUsePhysics())
 					{
 						line.append(LLTrans::getString("TooltipFlagPhysics") + " ");
 					}
@@ -456,7 +456,7 @@ void LLHoverView::updateText()
 						line.append(LLTrans::getString("TooltipFlagTemporary") + " ");
 					}
 
-					if (object->usePhysics() || 
+					if (object->flagUsePhysics() || 
 						object->flagHandleTouch() ||
 						(parent && parent->flagHandleTouch()) )
 					{
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index fc78ecae6..c8da43083 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -394,7 +394,6 @@ LLPanelObject::LLPanelObject(const std::string& name)
 	mIsPhysical(FALSE),
 	mIsTemporary(FALSE),
 	mIsPhantom(FALSE),
-	mCastShadows(TRUE),
 	mSelectedType(MI_BOX)
 {
 }
@@ -659,7 +658,7 @@ void LLPanelObject::getState( )
 	BOOL is_flexible = volobjp && volobjp->isFlexible();
 
 	// Physics checkbox
-	mIsPhysical = root_objectp->usePhysics();
+	mIsPhysical = root_objectp->flagUsePhysics();
 	mCheckPhysics->set( mIsPhysical );
 	mCheckPhysics->setEnabled( roots_selected>0 
 								&& (editable || gAgent.isGodlike()) 
@@ -673,12 +672,6 @@ void LLPanelObject::getState( )
 	mCheckPhantom->set( mIsPhantom );
 	mCheckPhantom->setEnabled( roots_selected>0 && editable && !is_flexible );
 
-#if 0 // 1.9.2
-	mCastShadows = root_objectp->flagCastShadows();
-	mCheckCastShadows->set( mCastShadows );
-	mCheckCastShadows->setEnabled( roots_selected==1 && editable );
-#endif
-	
 	// Update material part
 	// slightly inefficient - materials are unique per object, not per TE
 	U8 material_code = 0;
@@ -1525,22 +1518,6 @@ void LLPanelObject::sendIsPhantom()
 	}
 }
 
-void LLPanelObject::sendCastShadows()
-{
-	BOOL value = mCheckCastShadows->get();
-	if( mCastShadows != value )
-	{
-		LLSelectMgr::getInstance()->selectionUpdateCastShadows(value);
-		mCastShadows = value;
-
-		llinfos << "update cast shadows sent" << llendl;
-	}
-	else
-	{
-		llinfos << "update cast shadows not changed" << llendl;
-	}
-}
-
 // static
 void LLPanelObject::onCommitMaterial( LLUICtrl* ctrl, void* userdata )
 {
@@ -2369,10 +2346,6 @@ void LLPanelObject::clearCtrls()
 	mCheckTemporary	->setEnabled( FALSE );
 	mCheckPhantom	->set(FALSE);
 	mCheckPhantom	->setEnabled( FALSE );
-#if 0 // 1.9.2
-	mCheckCastShadows->set(FALSE);
-	mCheckCastShadows->setEnabled( FALSE );
-#endif
 	mComboMaterial	->setEnabled( FALSE );
 	mLabelMaterial	->setEnabled( FALSE );
 	// Disable text labels
@@ -2468,14 +2441,6 @@ void LLPanelObject::onCommitPhantom( LLUICtrl* ctrl, void* userdata )
 	self->sendIsPhantom();
 }
 
-// static
-void LLPanelObject::onCommitCastShadows( LLUICtrl* ctrl, void* userdata )
-{
-	LLPanelObject* self = (LLPanelObject*) userdata;
-	self->sendCastShadows();
-}
-
-
 // static
 void LLPanelObject::onSelectSculpt(LLUICtrl* ctrl, void* userdata)
 {
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h
index 504e3d94f..6bcf109ad 100644
--- a/indra/newview/llpanelobject.h
+++ b/indra/newview/llpanelobject.h
@@ -72,7 +72,6 @@ public:
 	static void 	onCommitPhysics(		LLUICtrl* ctrl, void* userdata);
 	static void 	onCommitTemporary(		LLUICtrl* ctrl, void* userdata);
 	static void 	onCommitPhantom(		LLUICtrl* ctrl, void* userdata);
-	static void 	onCommitCastShadows(	LLUICtrl* ctrl, void* userdata);
 
 	static void		onLinkObj(				void* user_data);
 	static void		onUnlinkObj(			void* user_data);
@@ -110,7 +109,6 @@ protected:
 	void			sendIsPhysical();
 	void			sendIsTemporary();
 	void			sendIsPhantom();
-	void			sendCastShadows();
 	void            sendSculpt();
 	
 	void 			getVolumeParams(LLVolumeParams& volume_params);
@@ -207,7 +205,6 @@ protected:
 	LLCheckBoxCtrl	*mCheckPhysics;
 	LLCheckBoxCtrl	*mCheckTemporary;
 	LLCheckBoxCtrl	*mCheckPhantom;
-	LLCheckBoxCtrl	*mCheckCastShadows;
 
 	LLTextureCtrl   *mCtrlSculptTexture;
 	LLTextBox       *mLabelSculptType;
@@ -222,7 +219,6 @@ protected:
 	BOOL			mIsPhysical;			// to avoid sending "physical" when not changed
 	BOOL			mIsTemporary;			// to avoid sending "temporary" when not changed
 	BOOL			mIsPhantom;				// to avoid sending "phantom" when not changed
-	BOOL			mCastShadows;			// to avoid sending "cast shadows" when not changed
 	S32				mSelectedType;			// So we know what selected type we last were
 
 	LLUUID          mSculptTextureRevert;   // so we can revert the sculpt texture on cancel
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 223b6cf80..8d8232c8f 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -2292,50 +2292,6 @@ void LLSelectMgr::packObjectIDAsParam(LLSelectNode* node, void *)
 	gMessageSystem->addString("Parameter", buf);
 }
 
-//-----------------------------------------------------------------------------
-// Rotation options
-//-----------------------------------------------------------------------------
-void LLSelectMgr::selectionResetRotation()
-{
-	struct f : public LLSelectedObjectFunctor
-	{
-		virtual bool apply(LLViewerObject* object)
-		{
-			LLQuaternion identity(0.f, 0.f, 0.f, 1.f);
-			object->setRotation(identity);
-			if (object->mDrawable.notNull())
-			{
-				gPipeline.markMoved(object->mDrawable, TRUE);
-			}
-			object->sendRotationUpdate();
-			return true;
-		}
-	} func;
-	getSelection()->applyToRootObjects(&func);
-}
-
-void LLSelectMgr::selectionRotateAroundZ(F32 degrees)
-{
-	LLQuaternion rot( degrees * DEG_TO_RAD, LLVector3(0,0,1) );
-	struct f : public LLSelectedObjectFunctor
-	{
-		LLQuaternion mRot;
-		f(const LLQuaternion& rot) : mRot(rot) {}
-		virtual bool apply(LLViewerObject* object)
-		{
-			object->setRotation( object->getRotationEdit() * mRot );
-			if (object->mDrawable.notNull())
-			{
-				gPipeline.markMoved(object->mDrawable, TRUE);
-			}
-			object->sendRotationUpdate();
-			return true;
-		}
-	} func(rot);
-	getSelection()->applyToRootObjects(&func);	
-}
-
-
 //-----------------------------------------------------------------------------
 // selectionTexScaleAutofit()
 //-----------------------------------------------------------------------------
@@ -4200,13 +4156,6 @@ void LLSelectMgr::selectionUpdatePhantom(BOOL is_phantom)
 	getSelection()->applyToObjects(&func);	
 }
 
-void LLSelectMgr::selectionUpdateCastShadows(BOOL cast_shadows)
-{
-	LLSelectMgrApplyFlags func(	FLAGS_CAST_SHADOWS, cast_shadows);
-	getSelection()->applyToObjects(&func);	
-}
-
-
 //----------------------------------------------------------------------
 // Helpful packing functions for sendObjectMessage()
 //----------------------------------------------------------------------
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index 9961710d5..82f9e064f 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -505,7 +505,6 @@ public:
 	void selectionUpdatePhysics(BOOL use_physics);
 	void selectionUpdateTemporary(BOOL is_temporary);
 	void selectionUpdatePhantom(BOOL is_ghost);
-	void selectionUpdateCastShadows(BOOL cast_shadows);
 	void selectionDump();
 
 	BOOL selectionAllPCode(LLPCode code);		// all objects have this PCode
@@ -543,8 +542,6 @@ public:
 	void selectionTexScaleAutofit(F32 repeats_per_meter);
 	void adjustTexturesByScale(BOOL send_to_sim, BOOL stretch);
 
-	void selectionResetRotation();				// sets rotation quat to identity
-	void selectionRotateAroundZ(F32 degrees);
 	bool selectionMove(const LLVector3& displ, F32 rx, F32 ry, F32 rz,
 					   U32 update_type);
 	void sendSelectionMove();
diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp
index 32aa96c65..eefcfc195 100644
--- a/indra/newview/lltoolgrab.cpp
+++ b/indra/newview/lltoolgrab.cpp
@@ -214,9 +214,9 @@ BOOL LLToolGrab::handleObjectHit(const LLPickInfo& info)
 
 	// Clicks on scripted or physical objects are temporary grabs, so
 	// not "Build mode"
-	mHideBuildHighlight = script_touch || objectp->usePhysics();
+	mHideBuildHighlight = script_touch || objectp->flagUsePhysics();
 
-	if (!objectp->usePhysics())
+	if (!objectp->flagUsePhysics())
 	{
 		// In mouselook, we shouldn't be able to grab non-physical, 
 		// non-touchable objects.  If it has a touch handler, we
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 7d9f0a136..a447a3330 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -275,7 +275,7 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
 	// Switch to grab tool if physical or triggerable
 	if (object && 
 		!object->isAvatar() && 
-		((object->usePhysics() || (parent && !parent->isAvatar() && parent->usePhysics())) || touchable) && 
+		((object->flagUsePhysics() || (parent && !parent->isAvatar() && parent->flagUsePhysics())) || touchable) && 
 		!always_show)
 	{
 // [RLVa:KB] - Checked: 2010-01-02 (RLVa-1.1.0l) | Modified: RLVa-1.1.0l
@@ -703,8 +703,8 @@ BOOL LLToolPie::handleHover(S32 x, S32 y, MASK mask)
 			gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
 		}
 // [/RLVa:KB]
-		else if ((object && !object->isAvatar() && object->usePhysics()) 
-				 || (parent && !parent->isAvatar() && parent->usePhysics()))
+		else if ((object && !object->isAvatar() && object->flagUsePhysics()) 
+				 || (parent && !parent->isAvatar() && parent->flagUsePhysics()))
 		{
 			gViewerWindow->getWindow()->setCursor(UI_CURSOR_TOOLGRAB);
 		}
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index f586026f9..1ec24b18d 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -564,7 +564,6 @@ BOOL get_visibility(void*);
 void request_friendship(const LLUUID& agent_id);
 
 // Tools menu
-void handle_force_unlock(void*);
 void handle_selected_texture_info(void*);
 void handle_dump_image_list(void*);
 
@@ -6337,30 +6336,6 @@ void dump_inventory(void*)
 	gInventory.dumpInventory();
 }
 
-// forcibly unlock an object
-void handle_force_unlock(void*)
-{
-	// First, make it public.
-	LLSelectMgr::getInstance()->sendOwner(LLUUID::null, LLUUID::null, TRUE);
-
-	// Second, lie to the viewer and mark it editable and unowned
-
-	struct f : public LLSelectedObjectFunctor
-	{
-		virtual bool apply(LLViewerObject* object)
-		{
-			object->mFlags |= FLAGS_OBJECT_MOVE;
-			object->mFlags |= FLAGS_OBJECT_MODIFY;
-			object->mFlags |= FLAGS_OBJECT_COPY;
-
-			object->mFlags &= ~FLAGS_OBJECT_ANY_OWNER;
-			object->mFlags &= ~FLAGS_OBJECT_YOU_OWNER;
-			return true;
-		}
-	} func;
-	LLSelectMgr::getInstance()->getSelection()->applyToObjects(&func);
-}
-
 void handle_dump_followcam(void*)
 {
 	LLFollowCamMgr::dump();
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 00ec70cd1..b581e3b84 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -5231,7 +5231,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
 				LLViewerObject* object = gObjectList.findObject(object_id);
 				if (object)
 				{
-					object->mFlags |= FLAGS_ANIM_SOURCE;
+					object->setFlagsWithoutUpdate(FLAGS_ANIM_SOURCE, TRUE);
 
 					BOOL anim_found = FALSE;
 					LLVOAvatar::AnimSourceIterator anim_it = avatarp->mAnimationSources.find(object_id);
@@ -5378,7 +5378,7 @@ void process_set_follow_cam_properties(LLMessageSystem *mesgsys, void **user_dat
 	LLViewerObject* objectp = gObjectList.findObject(source_id);
 	if (objectp)
 	{
-		objectp->mFlags |= FLAGS_CAMERA_SOURCE;
+		objectp->setFlagsWithoutUpdate(FLAGS_CAMERA_SOURCE, TRUE);
 	}
 
 	S32 num_objects = mesgsys->getNumberOfBlocks("CameraProperty");
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 54ed9ac8d..f769c08ee 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -460,7 +460,7 @@ void LLViewerObject::dump() const
 	/*
 	llinfos << "Velocity: " << getVelocity() << llendl;
 	llinfos << "AnyOwner: " << permAnyOwner() << " YouOwner: " << permYouOwner() << " Edit: " << mPermEdit << llendl;
-	llinfos << "UsePhysics: " << usePhysics() << " CanSelect " << mbCanSelect << " UserSelected " << mUserSelected << llendl;
+	llinfos << "UsePhysics: " << flagUsePhysics() << " CanSelect " << mbCanSelect << " UserSelected " << mUserSelected << llendl;
 	llinfos << "AppAngle: " << mAppAngle << llendl;
 	llinfos << "PixelArea: " << mPixelArea << llendl;
 
@@ -2068,6 +2068,8 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 	//
 	//
 
+	// If we're going to skip this message, why are we 
+	// doing all the parenting, etc above?
 	U32 packet_id = mesgsys->getCurrentRecvPacketID(); 
 	if (packet_id < mLatestRecvPacketID && 
 		mLatestRecvPacketID - packet_id < 65536)
@@ -2128,12 +2130,11 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
 		}
 	}
 
-	if (new_rot != mLastRot
+	if (new_rot != getRotation()
 		|| new_angv != old_angv)
 	{
-		if (new_rot != mLastRot)
+		if (new_rot != getRotation())
 		{
-			mLastRot = new_rot;
 			setRotation(new_rot);
 		}
 		
@@ -4164,38 +4165,6 @@ void LLViewerObject::sendMaterialUpdate() const
 
 }
 
-// formerly send_object_rotation
-void LLViewerObject::sendRotationUpdate() const
-{
-	LLViewerRegion* regionp = getRegion();
-	if(!regionp) return;
-	gMessageSystem->newMessageFast(_PREHASH_ObjectRotation);
-	gMessageSystem->nextBlockFast(_PREHASH_AgentData);
-	gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
-	gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-	gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
-	gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, mLocalID);
-	gMessageSystem->addQuatFast(_PREHASH_Rotation, getRotationEdit());
-	//llinfos << "Sent rotation " << getRotationEdit() << llendl;
-	gMessageSystem->sendReliable( regionp->getHost() );
-}
-
-/* Obsolete, we use MultipleObjectUpdate instead
-//// formerly send_object_position_global
-//void LLViewerObject::sendPositionUpdate() const
-//{
-//	gMessageSystem->newMessageFast(_PREHASH_ObjectPosition);
-//	gMessageSystem->nextBlockFast(_PREHASH_AgentData);
-//	gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
-//	gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-//	gMessageSystem->nextBlockFast(_PREHASH_ObjectData);
-//	gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID,	mLocalID );
-//	gMessageSystem->addVector3Fast(_PREHASH_Position, getPositionRegion());
-//	LLViewerRegion* regionp = getRegion();
-//	gMessageSystem->sendReliable(regionp->getHost());
-//}
-*/
-
 //formerly send_object_shape(LLViewerObject *object)
 void LLViewerObject::sendShapeUpdate()
 {
@@ -5280,7 +5249,7 @@ BOOL LLViewerObject::permAnyOwner() const
 { 
 	if (isRootEdit())
 	{
-		return ((mFlags & FLAGS_OBJECT_ANY_OWNER) != 0); 
+		return flagObjectAnyOwner(); 
 	}
 	else
 	{
@@ -5302,7 +5271,7 @@ BOOL LLViewerObject::permYouOwner() const
 			return TRUE;
 		}
 # endif
-		return ((mFlags & FLAGS_OBJECT_YOU_OWNER) != 0); 
+		return flagObjectYouOwner(); 
 #endif
 	}
 	else
@@ -5316,7 +5285,7 @@ BOOL LLViewerObject::permGroupOwner() const
 { 
 	if (isRootEdit())
 	{
-		return ((mFlags & FLAGS_OBJECT_GROUP_OWNED) != 0); 
+		return flagObjectGroupOwned(); 
 	}
 	else
 	{
@@ -5339,7 +5308,7 @@ BOOL LLViewerObject::permOwnerModify() const
 			return TRUE;
 	}
 # endif
-		return ((mFlags & FLAGS_OBJECT_OWNER_MODIFY) != 0); 
+		return flagObjectOwnerModify(); 
 #endif
 	}
 	else
@@ -5363,7 +5332,7 @@ BOOL LLViewerObject::permModify() const
 			return TRUE;
 	}
 # endif
-		return ((mFlags & FLAGS_OBJECT_MODIFY) != 0); 
+		return flagObjectModify(); 
 #endif
 	}
 	else
@@ -5387,7 +5356,7 @@ BOOL LLViewerObject::permCopy() const
 			return TRUE;
 		}
 # endif
-		return ((mFlags & FLAGS_OBJECT_COPY) != 0); 
+		return flagObjectCopy();
 #endif
 	}
 	else
@@ -5411,7 +5380,7 @@ BOOL LLViewerObject::permMove() const
 			return TRUE;
 		}
 # endif
-		return ((mFlags & FLAGS_OBJECT_MOVE) != 0); 
+		return flagObjectMove(); 
 #endif
 	}
 	else
@@ -5435,7 +5404,7 @@ BOOL LLViewerObject::permTransfer() const
 			return TRUE;
 		}
 # endif
-		return ((mFlags & FLAGS_OBJECT_TRANSFER) != 0); 
+		return flagObjectTransfer(); 
 #endif
 	}
 	else
@@ -5483,19 +5452,12 @@ void LLViewerObject::markForUpdate(BOOL priority)
 
 bool LLViewerObject::getIncludeInSearch() const
 {
-	return ((mFlags & FLAGS_INCLUDE_IN_SEARCH) != 0);
+	return flagIncludeInSearch();
 }
 
 void LLViewerObject::setIncludeInSearch(bool include_in_search)
 {
-	if (include_in_search)
-	{
-		mFlags |= FLAGS_INCLUDE_IN_SEARCH;
-	}
-	else
-	{
-		mFlags &= ~FLAGS_INCLUDE_IN_SEARCH;
-	}
+	setFlags(FLAGS_INCLUDE_IN_SEARCH, include_in_search);
 }
 
 void LLViewerObject::setRegion(LLViewerRegion *regionp)
@@ -5520,8 +5482,8 @@ void LLViewerObject::setRegion(LLViewerRegion *regionp)
 
 bool LLViewerObject::specialHoverCursor() const
 {
-	return (mFlags & FLAGS_USE_PHYSICS)
-			|| (mFlags & FLAGS_HANDLE_TOUCH)
+	return flagUsePhysics()
+			|| flagHandleTouch()
 			|| (mClickAction != 0);
 }
 
@@ -5534,10 +5496,15 @@ void LLViewerObject::updateFlags(BOOL physics_changed)
 	gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
 	gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
 	gMessageSystem->addU32Fast(_PREHASH_ObjectLocalID, getLocalID() );
-	gMessageSystem->addBOOLFast(_PREHASH_UsePhysics, usePhysics() );
+	gMessageSystem->addBOOLFast(_PREHASH_UsePhysics, flagUsePhysics() );
 	gMessageSystem->addBOOL("IsTemporary", flagTemporaryOnRez() );
 	gMessageSystem->addBOOL("IsPhantom", flagPhantom() );
-	gMessageSystem->addBOOL("CastsShadows", flagCastShadows() );
+
+	// stinson 02/28/2012 : This CastsShadows BOOL is no longer used in either the viewer or the simulator
+	// The simulator code does not even unpack this value when the message is received.
+	// This could be potentially hijacked in the future for another use should the urgent need arise.
+	gMessageSystem->addBOOL("CastsShadows", FALSE );
+
 	if (physics_changed)
 	{
 		gMessageSystem->nextBlock("ExtraPhysics");
@@ -5551,6 +5518,19 @@ void LLViewerObject::updateFlags(BOOL physics_changed)
 }
 
 BOOL LLViewerObject::setFlags(U32 flags, BOOL state)
+{
+	BOOL setit = setFlagsWithoutUpdate(flags, state);
+
+	// BUG: Sometimes viewer physics and simulator physics get
+	// out of sync.  To fix this, always send update to simulator.
+// 	if (setit)
+	{
+		updateFlags();
+	}
+	return setit;
+}
+
+BOOL LLViewerObject::setFlagsWithoutUpdate(U32 flags, BOOL state)
 {
 	BOOL setit = FALSE;
 	if (state)
@@ -5569,13 +5549,6 @@ BOOL LLViewerObject::setFlags(U32 flags, BOOL state)
 			setit = TRUE;
 		}
 	}
-
-	// BUG: Sometimes viewer physics and simulator physics get
-	// out of sync.  To fix this, always send update to simulator.
-// 	if (setit)
-	{
-		updateFlags();
-	}
 	return setit;
 }
 
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 403b27490..5b7aa0e8c 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -314,7 +314,6 @@ public:
 
 	inline void setRotation(const F32 x, const F32 y, const F32 z, BOOL damped = FALSE);
 	inline void setRotation(const LLQuaternion& quat, BOOL damped = FALSE);
-	void sendRotationUpdate() const;
 
 	/*virtual*/	void	setNumTEs(const U8 num_tes);
 	/*virtual*/	void	setTE(const U8 te, const LLTextureEntry &texture_entry);
@@ -483,20 +482,27 @@ public:
 	BOOL			permCopy() const;	
 	BOOL			permMove() const;		
 	BOOL			permTransfer() const;
-	inline BOOL		usePhysics() const				{ return ((mFlags & FLAGS_USE_PHYSICS) != 0); }
+	inline BOOL		flagUsePhysics() const			{ return ((mFlags & FLAGS_USE_PHYSICS) != 0); }
+	inline BOOL		flagObjectAnyOwner() const		{ return ((mFlags & FLAGS_OBJECT_ANY_OWNER) != 0); }
+	inline BOOL		flagObjectYouOwner() const		{ return ((mFlags & FLAGS_OBJECT_YOU_OWNER) != 0); }
+	inline BOOL		flagObjectGroupOwned() const	{ return ((mFlags & FLAGS_OBJECT_GROUP_OWNED) != 0); }
+	inline BOOL		flagObjectOwnerModify() const	{ return ((mFlags & FLAGS_OBJECT_OWNER_MODIFY) != 0); }
+	inline BOOL		flagObjectModify() const		{ return ((mFlags & FLAGS_OBJECT_MODIFY) != 0); }
+	inline BOOL		flagObjectCopy() const			{ return ((mFlags & FLAGS_OBJECT_COPY) != 0); }
+	inline BOOL		flagObjectMove() const			{ return ((mFlags & FLAGS_OBJECT_MOVE) != 0); }
+	inline BOOL		flagObjectTransfer() const		{ return ((mFlags & FLAGS_OBJECT_TRANSFER) != 0); }
+	inline BOOL		flagIncludeInSearch() const     { return ((mFlags & FLAGS_INCLUDE_IN_SEARCH) != 0); }
 	inline BOOL		flagScripted() const			{ return ((mFlags & FLAGS_SCRIPTED) != 0); }
 	inline BOOL		flagHandleTouch() const			{ return ((mFlags & FLAGS_HANDLE_TOUCH) != 0); }
 	inline BOOL		flagTakesMoney() const			{ return ((mFlags & FLAGS_TAKES_MONEY) != 0); }
 	inline BOOL		flagPhantom() const				{ return ((mFlags & FLAGS_PHANTOM) != 0); }
 	inline BOOL		flagInventoryEmpty() const		{ return ((mFlags & FLAGS_INVENTORY_EMPTY) != 0); }
-	inline BOOL		flagCastShadows() const			{ return ((mFlags & FLAGS_CAST_SHADOWS) != 0); }
 	inline BOOL		flagAllowInventoryAdd() const	{ return ((mFlags & FLAGS_ALLOW_INVENTORY_DROP) != 0); }
 	inline BOOL		flagTemporary() const			{ return ((mFlags & FLAGS_TEMPORARY) != 0); }
 	inline BOOL		flagTemporaryOnRez() const		{ return ((mFlags & FLAGS_TEMPORARY_ON_REZ) != 0); }
 	inline BOOL		flagAnimSource() const			{ return ((mFlags & FLAGS_ANIM_SOURCE) != 0); }
 	inline BOOL		flagCameraSource() const		{ return ((mFlags & FLAGS_CAMERA_SOURCE) != 0); }
 	inline BOOL		flagCameraDecoupled() const		{ return ((mFlags & FLAGS_CAMERA_DECOUPLED) != 0); }
-	inline BOOL		flagObjectMove() const			{ return ((mFlags & FLAGS_OBJECT_MOVE) != 0); }
 
 	U8       getPhysicsShapeType() const;
 	inline F32      getPhysicsGravity() const       { return mPhysicsGravity; }
@@ -519,6 +525,7 @@ public:
 
 	void updateFlags(BOOL physics_changed = FALSE);
 	BOOL setFlags(U32 flag, BOOL state);
+	BOOL setFlagsWithoutUpdate(U32 flag, BOOL state);
 	void setPhysicsShapeType(U8 type);
 	void setPhysicsGravity(F32 gravity);
 	void setPhysicsFriction(F32 friction);
@@ -610,9 +617,11 @@ public:
 	U32				mGLName;			// GL "name" used by selection code
 	BOOL			mbCanSelect;		// true if user can select this object by clicking
 
+private:
 	// Grabbed from UPDATE_FLAGS
 	U32				mFlags;
 
+public:
 	// Sent to sim in UPDATE_FLAGS, received in ObjectPhysicsProperties
 	U8              mPhysicsShapeType;
 	F32             mPhysicsGravity;
@@ -690,6 +699,7 @@ protected:
 	F64				mLastInterpUpdateSecs;			// Last update for purposes of interpolation
 	F64				mLastMessageUpdateSecs;			// Last update from a message from the simulator
 	TPACKETID		mLatestRecvPacketID;			// Latest time stamp on message from simulator
+
 	// extra data sent from the sim...currently only used for tree species info
 	U8* mData;
 public://Jay: IDGAF
@@ -731,7 +741,6 @@ protected:
 
 	F32				mTimeDilation;				// Time dilation sent with the object.
 	F32				mRotTime;					// Amount (in seconds) that object has rotated according to angular velocity (llSetTargetOmega)
-	LLQuaternion	mLastRot;					// last rotation received from the simulator
 
 	LLVOJointInfo*  mJointInfo;
 	U8				mState;	// legacy
diff --git a/indra/newview/llviewerobjectbackup.cpp b/indra/newview/llviewerobjectbackup.cpp
index 9b0100f6e..138916f79 100644
--- a/indra/newview/llviewerobjectbackup.cpp
+++ b/indra/newview/llviewerobjectbackup.cpp
@@ -650,9 +650,9 @@ LLSD LLObjectBackup::primsToLLSD(LLViewerObject::child_list_t child_list, bool i
 		prim_llsd["scale"] = object->getScale().getValue();
 
 		// Flags
-		prim_llsd["shadows"] = object->flagCastShadows();
+		prim_llsd["shadows"] = FALSE;
 		prim_llsd["phantom"] = object->flagPhantom();
-		prim_llsd["physical"] = (BOOL)(object->mFlags & FLAGS_USE_PHYSICS);
+		prim_llsd["physical"] = object->flagUsePhysics();
 
 		// Volume params
 		LLVolumeParams params = object->getVolume()->getParams();
@@ -994,9 +994,9 @@ void LLObjectBackup::xmlToPrim(LLSD prim_llsd, LLViewerObject* object)
 
 	object->setScale(prim_llsd["scale"]);
 
-	if (prim_llsd.has("shadows"))
+	/*if (prim_llsd.has("shadows"))
 		if (prim_llsd["shadows"].asInteger() == 1)
-			object->setFlags(FLAGS_CAST_SHADOWS, true);
+			object->setFlags(FLAGS_CAST_SHADOWS, true);*/
 
 	if (prim_llsd.has("phantom"))
 		if (prim_llsd["phantom"].asInteger() == 1)
@@ -1068,7 +1068,6 @@ void LLObjectBackup::xmlToPrim(LLSD prim_llsd, LLViewerObject* object)
 	//if (mPrimImportIter != mThisGroup.endMap())
 	//	mPrimImportIter++;
 
-	object->sendRotationUpdate();
 	object->sendTEUpdate();	
 	object->sendShapeUpdate();
 	LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_SCALE | UPD_POSITION);
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp
index 758a8c3e9..475950f5d 100644
--- a/indra/newview/llviewerobjectlist.cpp
+++ b/indra/newview/llviewerobjectlist.cpp
@@ -406,9 +406,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 		}
 		else if (compressed)
 		{
-			U8							compbuffer[2048];
 			S32							uncompressed_length = 2048;
-			S32							compressed_length;
 			compressed_dp.reset();
 
 			U32 flags = 0;
@@ -417,21 +415,9 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 				mesgsys->getU32Fast(_PREHASH_ObjectData, _PREHASH_UpdateFlags, flags, i);
 			}
 			
-			if (flags & FLAGS_ZLIB_COMPRESSED)
-			{
-				compressed_length = mesgsys->getSizeFast(_PREHASH_ObjectData, i, _PREHASH_Data);
-				mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_Data, compbuffer, 0, i);
-				uncompressed_length = 2048;
-				uncompress(compressed_dpbuffer, (unsigned long *)&uncompressed_length,
-						   compbuffer, compressed_length);
-				compressed_dp.assignBuffer(compressed_dpbuffer, uncompressed_length);
-			}
-			else
-			{
-				uncompressed_length = mesgsys->getSizeFast(_PREHASH_ObjectData, i, _PREHASH_Data);
-				mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_Data, compressed_dpbuffer, 0, i);
-				compressed_dp.assignBuffer(compressed_dpbuffer, uncompressed_length);
-			}
+			uncompressed_length = mesgsys->getSizeFast(_PREHASH_ObjectData, i, _PREHASH_Data);
+			mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_Data, compressed_dpbuffer, 0, i);
+			compressed_dp.assignBuffer(compressed_dpbuffer, uncompressed_length);
 
 
 			if (update_type != OUT_TERSE_IMPROVED)
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index fdfc565e3..76006a315 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -713,7 +713,7 @@ void LLVOAvatarSelf::stopMotionFromSource(const LLUUID& source_id)
 	LLViewerObject* object = gObjectList.findObject(source_id);
 	if (object)
 	{
-		object->mFlags &= ~FLAGS_ANIM_SOURCE;
+		object->setFlagsWithoutUpdate(FLAGS_ANIM_SOURCE, FALSE);
 	}
 }
 
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 27632dcfc..79aab8164 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -3132,7 +3132,7 @@ void renderPhysicalBeacons(LLDrawable* drawablep)
 	if (vobj 
 		&& !vobj->isAvatar() 
 		//&& !vobj->getParent()
-		&& vobj->usePhysics())
+		&& vobj->flagUsePhysics())
 	{
 		if (gPipeline.sRenderBeacons)
 		{

From b847c5339542d52bb88d1928ecbe54633ab6aff8 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sat, 4 Aug 2012 20:46:51 -0500
Subject: [PATCH 139/199] Implemented basic 'awareness' of objects flagged as
 permanent.

---
 indra/llprimitive/object_flags.h              |   8 +
 indra/newview/llmaniprotate.cpp               |  24 +-
 indra/newview/llmanipscale.cpp                |  30 +-
 indra/newview/llmaniptranslate.cpp            |   9 +-
 indra/newview/llpanelcontents.cpp             |   5 +-
 indra/newview/llpanelface.cpp                 |   2 +-
 indra/newview/llpanelobject.cpp               |  42 +-
 indra/newview/llpanelpermissions.cpp          |  22 +-
 indra/newview/llpanelvolume.cpp               |   6 +-
 indra/newview/llselectmgr.cpp                 | 404 ++++++++++++++++--
 indra/newview/llselectmgr.h                   |  27 ++
 indra/newview/lltoolgrab.cpp                  |  37 +-
 indra/newview/llviewermenu.cpp                |  14 +-
 indra/newview/llviewerobject.cpp              |   5 +
 indra/newview/llviewerobject.h                |   5 +
 indra/newview/llviewerwindow.cpp              |   5 +-
 indra/newview/llvovolume.cpp                  |   2 +-
 .../skins/default/xui/en-us/notifications.xml |  54 +++
 18 files changed, 605 insertions(+), 96 deletions(-)

diff --git a/indra/llprimitive/object_flags.h b/indra/llprimitive/object_flags.h
index 7def340df..f48b97d58 100644
--- a/indra/llprimitive/object_flags.h
+++ b/indra/llprimitive/object_flags.h
@@ -41,6 +41,9 @@ const U32   FLAGS_TAKES_MONEY          = (1U << 9);
 const U32   FLAGS_PHANTOM              = (1U << 10);
 const U32   FLAGS_INVENTORY_EMPTY      = (1U << 11);
 
+const U32   FLAGS_AFFECTS_NAVMESH      = (1U << 12);
+const U32   FLAGS_CHARACTER            = (1U << 13);
+const U32   FLAGS_VOLUME_DETECT        = (1U << 14);
 const U32   FLAGS_INCLUDE_IN_SEARCH    = (1U << 15);
 
 const U32   FLAGS_ALLOW_INVENTORY_DROP = (1U << 16);
@@ -54,6 +57,11 @@ const U32   FLAGS_CAMERA_SOURCE        = (1U << 22);
 
 //const U32 FLAGS_UNUSED_001           = (1U << 23); // was FLAGS_CAST_SHADOWS
 
+//const U32 FLAGS_UNUSED_002           = (1U << 24);
+//const U32 FLAGS_UNUSED_003           = (1U << 25);
+//const U32 FLAGS_UNUSED_004           = (1U << 26);
+//const U32 FLAGS_UNUSED_005           = (1U << 27);
+
 const U32   FLAGS_OBJECT_OWNER_MODIFY  = (1U << 28);
 
 const U32   FLAGS_TEMPORARY_ON_REZ     = (1U << 29);
diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp
index 2940b764f..b0b8fe7f8 100644
--- a/indra/newview/llmaniprotate.cpp
+++ b/indra/newview/llmaniprotate.cpp
@@ -479,9 +479,12 @@ BOOL LLManipRotate::handleMouseUp(S32 x, S32 y, MASK mask)
 		{
 			LLSelectNode* selectNode = *iter;
 			LLViewerObject* object = selectNode->getObject();
+			LLViewerObject* root_object = (object == NULL) ? NULL : object->getRootEdit();
 
 			// have permission to move and object is root of selection or individually selected
-			if (object->permMove() && (object->isRootEdit() || selectNode->mIndividualSelection))
+			if (object->permMove() && !object->isPermanentEnforced() &&
+				((root_object == NULL) || !root_object->isPermanentEnforced()) &&
+				(object->isRootEdit() || selectNode->mIndividualSelection))
 			{
 				object->mUnselectedChildrenPositions.clear() ;
 			}
@@ -567,9 +570,12 @@ void LLManipRotate::drag( S32 x, S32 y )
 	{
 		LLSelectNode* selectNode = *iter;
 		LLViewerObject* object = selectNode->getObject();
+		LLViewerObject* root_object = (object == NULL) ? NULL : object->getRootEdit();
 
 		// have permission to move and object is root of selection or individually selected
-		if (object->permMove() && (object->isRootEdit() || selectNode->mIndividualSelection))
+		if (object->permMove() && !object->isPermanentEnforced() &&
+			((root_object == NULL) || !root_object->isPermanentEnforced()) &&
+			(object->isRootEdit() || selectNode->mIndividualSelection))
 		{
 			if (!object->isRootEdit())
 			{
@@ -621,9 +627,11 @@ void LLManipRotate::drag( S32 x, S32 y )
 	{
 		LLSelectNode* selectNode = *iter;
 		LLViewerObject* object = selectNode->getObject();
+		LLViewerObject* root_object = (object == NULL) ? NULL : object->getRootEdit();
 
 		// to avoid cumulative position changes we calculate the objects new position using its saved position
-		if (object && object->permMove())
+		if (object && object->permMove() && !object->isPermanentEnforced() &&
+			((root_object == NULL) || !root_object->isPermanentEnforced()))
 		{
 			LLVector3 center   = gAgent.getPosAgentFromGlobal( mRotationCenter );
 
@@ -704,7 +712,10 @@ void LLManipRotate::drag( S32 x, S32 y )
 	{
 		LLSelectNode* selectNode = *iter;
 		LLViewerObject*cur = selectNode->getObject();
-		if( cur->permModify() && cur->permMove() && !cur->isAvatar())
+		LLViewerObject *root_object = (cur == NULL) ? NULL : cur->getRootEdit();
+		if( cur->permModify() && cur->permMove() && !cur->isPermanentEnforced() &&
+			((root_object == NULL) || !root_object->isPermanentEnforced()) &&
+			!cur->isAvatar())
 		{
 			selectNode->mLastRotation = cur->getRotation();
 			selectNode->mLastPositionLocal = cur->getPosition();
@@ -1872,7 +1883,10 @@ BOOL LLManipRotate::canAffectSelection()
 		{
 			virtual bool apply(LLViewerObject* objectp)
 			{
-				return objectp->permMove() && (objectp->permModify() || !gSavedSettings.getBOOL("EditLinkedParts"));
+				LLViewerObject *root_object = (objectp == NULL) ? NULL : objectp->getRootEdit();
+				return objectp->permMove() && !objectp->isPermanentEnforced() &&
+					((root_object == NULL) || !root_object->isPermanentEnforced()) &&
+					(objectp->permModify() || !gSavedSettings.getBOOL("EditLinkedParts"));
 			}
 		} func;
 		can_rotate = mObjectSelection->applyToObjects(&func);
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp
index 9d09c30cf..bb282fb4d 100644
--- a/indra/newview/llmanipscale.cpp
+++ b/indra/newview/llmanipscale.cpp
@@ -825,7 +825,10 @@ void LLManipScale::drag( S32 x, S32 y )
 	{
 		LLSelectNode* selectNode = *iter;
 		LLViewerObject*cur = selectNode->getObject();
-		if( cur->permModify() && cur->permMove() && !cur->isAvatar())
+		LLViewerObject *root_object = (cur == NULL) ? NULL : cur->getRootEdit();
+		if( cur->permModify() && cur->permMove() && !cur->isPermanentEnforced() &&
+			((root_object == NULL) || !root_object->isPermanentEnforced()) &&
+			!cur->isAvatar())
 		{
 			selectNode->mLastScale = cur->getScale();
 			selectNode->mLastPositionLocal = cur->getPosition();
@@ -972,7 +975,10 @@ void LLManipScale::dragCorner( S32 x, S32 y )
 	{
 		LLSelectNode* selectNode = *iter;
 		LLViewerObject* cur = selectNode->getObject();
-		if(  cur->permModify() && cur->permMove() && !cur->isAvatar() )
+		LLViewerObject *root_object = (cur == NULL) ? NULL : cur->getRootEdit();
+		if(  cur->permModify() && cur->permMove() && !cur->isPermanentEnforced() &&
+			((root_object == NULL) || !root_object->isPermanentEnforced()) &&
+			!cur->isAvatar() )
 		{
 			const LLVector3& scale = selectNode->mSavedScale;
 
@@ -994,7 +1000,10 @@ void LLManipScale::dragCorner( S32 x, S32 y )
 	{
 		LLSelectNode* selectNode = *iter;
 		LLViewerObject* cur = selectNode->getObject();
-		if( cur->permModify() && cur->permMove() && !cur->isAvatar() && cur->isRootEdit() )
+		LLViewerObject *root_object = (cur == NULL) ? NULL : cur->getRootEdit();
+		if( cur->permModify() && cur->permMove() && !cur->isPermanentEnforced() &&
+			((root_object == NULL) || !root_object->isPermanentEnforced()) &&
+			!cur->isAvatar() && cur->isRootEdit() )
 		{
 			const LLVector3& scale = selectNode->mSavedScale;
 			cur->setScale( scale_factor * scale );
@@ -1042,7 +1051,10 @@ void LLManipScale::dragCorner( S32 x, S32 y )
 	{
 		LLSelectNode* selectNode = *iter;
 		LLViewerObject*cur = selectNode->getObject();
-		if( cur->permModify() && cur->permMove() && !cur->isAvatar() && !cur->isRootEdit() )
+		LLViewerObject *root_object = (cur == NULL) ? NULL : cur->getRootEdit();
+		if( cur->permModify() && cur->permMove() && !cur->isPermanentEnforced() &&
+			((root_object == NULL) || !root_object->isPermanentEnforced()) &&
+			!cur->isAvatar() && !cur->isRootEdit() )
 		{
 			const LLVector3& scale = selectNode->mSavedScale;
 			cur->setScale( scale_factor * scale, FALSE );
@@ -1250,7 +1262,10 @@ void LLManipScale::stretchFace( const LLVector3& drag_start_agent, const LLVecto
 	{
 		LLSelectNode* selectNode = *iter;
 		LLViewerObject*cur = selectNode->getObject();
-		if( cur->permModify() && cur->permMove() && !cur->isAvatar() )
+		LLViewerObject *root_object = (cur == NULL) ? NULL : cur->getRootEdit();
+		if( cur->permModify() && cur->permMove() && !cur->isPermanentEnforced() &&
+			((root_object == NULL) || !root_object->isPermanentEnforced()) &&
+			!cur->isAvatar() )
 		{
 			LLBBox cur_bbox			= cur->getBoundingBoxAgent();
 			LLVector3 start_local	= cur_bbox.agentToLocal( drag_start_agent );
@@ -2057,7 +2072,10 @@ BOOL LLManipScale::canAffectSelection()
 		{
 			virtual bool apply(LLViewerObject* objectp)
 			{
-				return objectp->permModify() && objectp->permMove() && !objectp->isSeat();
+				LLViewerObject *root_object = (objectp == NULL) ? NULL : objectp->getRootEdit();
+				return objectp->permModify() && objectp->permMove() && !objectp->isPermanentEnforced() &&
+					((root_object == NULL) || !root_object->isPermanentEnforced()) &&
+					!objectp->isSeat();
 			}
 		} func;
 		can_scale = mObjectSelection->applyToObjects(&func);
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp
index b6feb554a..7c86889a1 100644
--- a/indra/newview/llmaniptranslate.cpp
+++ b/indra/newview/llmaniptranslate.cpp
@@ -705,7 +705,9 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 			}
 		}
 
-		if (object->permMove())
+		LLViewerObject* root_object = (object == NULL) ? NULL : object->getRootEdit();
+		if (object->permMove() && !object->isPermanentEnforced() &&
+			((root_object == NULL) || !root_object->isPermanentEnforced()))
 		{
 			// handle attachments in local space
 			if (object->isAttachment() && object->mDrawable.notNull())
@@ -2328,7 +2330,10 @@ BOOL LLManipTranslate::canAffectSelection()
 		{
 			virtual bool apply(LLViewerObject* objectp)
 			{
-				return objectp->permMove() && (objectp->permModify() || !gSavedSettings.getBOOL("EditLinkedParts"));
+				LLViewerObject *root_object = (objectp == NULL) ? NULL : objectp->getRootEdit();
+				return objectp->permMove() && !objectp->isPermanentEnforced() &&
+					((root_object == NULL) || !root_object->isPermanentEnforced()) &&
+					(objectp->permModify() || !gSavedSettings.getBOOL("EditLinkedParts"));
 			}
 		} func;
 		can_move = mObjectSelection->applyToObjects(&func);
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp
index cd03f92c6..c92e7c62d 100644
--- a/indra/newview/llpanelcontents.cpp
+++ b/indra/newview/llpanelcontents.cpp
@@ -121,7 +121,7 @@ void LLPanelContents::getState(LLViewerObject *objectp )
 
 	// BUG? Check for all objects being editable?
 	bool editable = gAgent.isGodlike()
-					|| (objectp->permModify()
+					|| (objectp->permModify() && !objectp->isPermanentEnforced()
 					       && ( objectp->permYouOwner() || ( !group_id.isNull() && gAgent.isInGroup(group_id) )));  // solves SL-23488
 	BOOL all_volume = LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME );
 
@@ -150,6 +150,9 @@ void LLPanelContents::getState(LLViewerObject *objectp )
 		all_volume &&
 		((LLSelectMgr::getInstance()->getSelection()->getRootObjectCount() == 1)
 			|| (LLSelectMgr::getInstance()->getSelection()->getObjectCount() == 1)));
+
+	getChildView("button permissions")->setEnabled(!objectp->isPermanentEnforced());
+	mPanelInventory->setEnabled(!objectp->isPermanentEnforced());
 }
 
 
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 271ea92c4..d63cde2aa 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -516,7 +516,7 @@ void LLPanelFace::getState()
 		&& objectp->getPCode() == LL_PCODE_VOLUME
 		&& objectp->permModify())
 	{
-		BOOL editable = objectp->permModify();
+		BOOL editable = objectp->permModify() && !objectp->isPermanentEnforced();
 
 
 		// only turn on auto-adjust button if there is a media renderer and the media is loaded
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index c8da43083..4c2d0a38f 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -477,10 +477,10 @@ void LLPanelObject::getState( )
 	}
 
 	// can move or rotate only linked group with move permissions, or sub-object with move and modify perms
-	BOOL enable_move	= objectp->permMove() && ((!objectp->isAttachment() && objectp->permModify()) || !gSavedSettings.getBOOL("EditLinkedParts"));
-	BOOL enable_scale	= objectp->permMove() && objectp->permModify();
-	BOOL enable_rotate	= objectp->permMove() && ((objectp->permModify() && !objectp->isAttachment()) || !gSavedSettings.getBOOL("EditLinkedParts"));
-	BOOL enable_link	= objectp->permMove() && ((!objectp->isAttachment() && objectp->permModify()) || !gSavedSettings.getBOOL("EditLinkedParts"));
+	BOOL enable_move	= objectp->permMove() && !objectp->isPermanentEnforced() && ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) && !objectp->isAttachment() && (objectp->permModify() || !gSavedSettings.getBOOL("EditLinkedParts"));
+	BOOL enable_scale	= objectp->permMove() && !objectp->isPermanentEnforced() && ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) && objectp->permModify();
+	BOOL enable_rotate	= objectp->permMove() && !objectp->isPermanentEnforced() && ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()) && ( (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 ))
@@ -527,8 +527,8 @@ void LLPanelObject::getState( )
 	mCtrlPosX->setEnabled(enable_move);
 	mCtrlPosY->setEnabled(enable_move);
 	mCtrlPosZ->setEnabled(enable_move);
-	mBtnLinkObj->setEnabled((enable_link && !single_volume));
-	mBtnUnlinkObj->setEnabled((enable_link && (selected_count > 1)));
+	mBtnLinkObj->setEnabled((enable_move && !single_volume));
+	mBtnUnlinkObj->setEnabled((enable_move && (selected_count > 1)));
 	mBtnCopyPos->setEnabled(enable_move);
 	mBtnPastePos->setEnabled(enable_move);
 	mBtnPastePosClip->setEnabled(enable_move);
@@ -623,9 +623,15 @@ void LLPanelObject::getState( )
 		childSetVisible("select_single", TRUE);
 		childSetEnabled("select_single", TRUE);
 	}
+	BOOL is_flexible = volobjp && volobjp->isFlexible();
+	BOOL is_permanent = root_objectp->flagObjectPermanent();
+	BOOL is_permanent_enforced = root_objectp->isPermanentEnforced();
+	BOOL is_character = root_objectp->flagCharacter();
+	llassert(!is_permanent || !is_character); // should never have a permanent object that is also a character
+
 	// Lock checkbox - only modifiable if you own the object.
 	BOOL self_owned = (gAgent.getID() == owner_id);
-	mCheckLock->setEnabled( roots_selected > 0 && self_owned );
+	mCheckLock->setEnabled( roots_selected > 0 && self_owned && !is_permanent_enforced);
 
 	// More lock and debit checkbox - get the values
 	BOOL valid;
@@ -655,22 +661,26 @@ void LLPanelObject::getState( )
 		}
 	}
 
-	BOOL is_flexible = volobjp && volobjp->isFlexible();
-
 	// Physics checkbox
 	mIsPhysical = root_objectp->flagUsePhysics();
+	llassert(!is_permanent || !mIsPhysical); // should never have a permanent object that is also physical
+
 	mCheckPhysics->set( mIsPhysical );
 	mCheckPhysics->setEnabled( roots_selected>0 
 								&& (editable || gAgent.isGodlike()) 
-								&& !is_flexible);
+								&& !is_flexible && !is_permanent);
 
 	mIsTemporary = root_objectp->flagTemporaryOnRez();
+	llassert(!is_permanent || !mIsTemporary); // should never has a permanent object that is also temporary
+
 	mCheckTemporary->set( mIsTemporary );
-	mCheckTemporary->setEnabled( roots_selected>0 && editable );
+	mCheckTemporary->setEnabled( roots_selected>0 && editable && !is_permanent);
 
 	mIsPhantom = root_objectp->flagPhantom();
+	BOOL is_volume_detect = root_objectp->flagVolumeDetect();
+	llassert(!is_character || !mIsPhantom); // should never have a character that is also a phantom
 	mCheckPhantom->set( mIsPhantom );
-	mCheckPhantom->setEnabled( roots_selected>0 && editable && !is_flexible );
+	mCheckPhantom->setEnabled( roots_selected>0 && editable && !is_flexible && !is_permanent_enforced && !is_character && !is_volume_detect);
 
 	// Update material part
 	// slightly inefficient - materials are unique per object, not per TE
@@ -724,6 +734,7 @@ void LLPanelObject::getState( )
 	BOOL hole_enabled = FALSE;
 	F32 scale_x=1.f, scale_y=1.f;
 	BOOL isMesh = FALSE;
+	
 	if( !objectp || !objectp->getVolume() || !editable || !single_volume)
 	{
 		// Clear out all geometry fields.
@@ -752,11 +763,10 @@ void LLPanelObject::getState( )
 	{
 		// Only allowed to change these parameters for objects
 		// that you have permissions on AND are not attachments.
-		enabled = root_objectp->permModify();
-
-		const LLVolumeParams &volume_params = objectp->getVolume()->getParams();
-
+		enabled = root_objectp->permModify() && !root_objectp->isPermanentEnforced();
+		
 		// Volume type
+		const LLVolumeParams &volume_params = objectp->getVolume()->getParams();
 		U8 path = volume_params.getPathParams().getCurveType();
 		U8 profile_and_hole = volume_params.getProfileParams().getCurveType();
 		U8 profile	= profile_and_hole & LL_PCODE_PROFILE_MASK;
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index 8e42927fd..c62d2b370 100644
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -280,6 +280,10 @@ void LLPanelPermissions::refresh()
 	BOOL is_perm_modify = (LLSelectMgr::getInstance()->getSelection()->getFirstRootNode() 
 							&& LLSelectMgr::getInstance()->selectGetRootsModify()) 
 							|| LLSelectMgr::getInstance()->selectGetModify();
+	BOOL is_nonpermanent_enforced = (LLSelectMgr::getInstance()->getSelection()->getFirstRootNode() 
+						   && LLSelectMgr::getInstance()->selectGetRootsNonPermanentEnforced())
+		|| LLSelectMgr::getInstance()->selectGetNonPermanentEnforced();
+
 	const LLFocusableElement* keyboard_focus_view = gFocusMgr.getKeyboardFocus();
 	S32 string_index = 0;
 	std::string MODIFY_INFO_STRINGS[] =
@@ -394,12 +398,12 @@ void LLPanelPermissions::refresh()
 		}
 	}
 	
-	childSetEnabled("button set group",owners_identical && (mOwnerID == gAgent.getID()));
+	childSetEnabled("button set group",owners_identical && (mOwnerID == gAgent.getID()) && is_nonpermanent_enforced);
 	childSetEnabled("button open group", group_id.notNull());
 
 	// figure out the contents of the name, description, & category
 	BOOL edit_name_desc = FALSE;
-	if(is_one_object && objectp->permModify())
+	if(is_one_object && objectp->permModify() && !objectp->isPermanentEnforced())
 	{
 		edit_name_desc = TRUE;
 	}
@@ -628,15 +632,13 @@ void LLPanelPermissions::refresh()
 	bool has_change_perm_ability = false;
 	bool has_change_sale_ability = false;
 
-	if(valid_base_perms 
-	   && (self_owned 
-		   || (group_owned && gAgent.hasPowerInGroup(group_id, GP_OBJECT_MANIPULATE))))
+	if(valid_base_perms && is_nonpermanent_enforced &&
+		(self_owned || (group_owned && gAgent.hasPowerInGroup(group_id, GP_OBJECT_MANIPULATE))))
 	{
 		has_change_perm_ability = true;
 	}
-	if(valid_base_perms 
-	   && (self_owned 
-		   || (group_owned && gAgent.hasPowerInGroup(group_id, GP_OBJECT_SET_SALE))))
+	if(valid_base_perms && is_nonpermanent_enforced &&
+		(self_owned || (group_owned && gAgent.hasPowerInGroup(group_id, GP_OBJECT_SET_SALE))))
 	{
 		has_change_sale_ability = true;
 	}
@@ -847,8 +849,8 @@ void LLPanelPermissions::refresh()
 			ComboClickAction->setCurrentByIndex((S32)click_action);
 		}
 	}
-	childSetEnabled("label click action",is_perm_modify && all_volume);
-	childSetEnabled("clickaction",is_perm_modify && all_volume);
+	childSetEnabled("label click action",is_perm_modify && is_nonpermanent_enforced && all_volume);
+	childSetEnabled("clickaction",is_perm_modify && is_nonpermanent_enforced && all_volume);
 }
 
 
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index 17f6ff4a9..262a89bc4 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -246,7 +246,7 @@ void LLPanelVolume::getState( )
 	owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
 
 	// BUG? Check for all objects being editable?
-	BOOL editable = root_objectp->permModify();
+	BOOL editable = root_objectp->permModify() && !root_objectp->isPermanentEnforced();
 	BOOL single_volume = LLSelectMgr::getInstance()->selectionAllPCode( LL_PCODE_VOLUME )
 		&& LLSelectMgr::getInstance()->getSelection()->getObjectCount() == 1;
 
@@ -344,7 +344,7 @@ void LLPanelVolume::getState( )
 	getChild<LLUICtrl>("Flexible1D Checkbox Ctrl")->setValue(is_flexible);
 	if (is_flexible || (volobjp && volobjp->canBeFlexible()))
 	{
-		getChildView("Flexible1D Checkbox Ctrl")->setEnabled(editable && single_volume && volobjp && !volobjp->isMesh());
+		getChildView("Flexible1D Checkbox Ctrl")->setEnabled(editable && single_volume && volobjp && !volobjp->isMesh() && !objectp->isPermanentEnforced());
 	}
 	else
 	{
@@ -449,7 +449,7 @@ void LLPanelVolume::getState( )
 
 	mComboPhysicsShapeType->add(getString("Convex Hull"), LLSD(2));	
 	mComboPhysicsShapeType->setValue(LLSD(objectp->getPhysicsShapeType()));
-	mComboPhysicsShapeType->setEnabled(editable);
+	mComboPhysicsShapeType->setEnabled(editable && !objectp->isPermanentEnforced() && ((root_objectp == NULL) || !root_objectp->isPermanentEnforced()));
 
 	mObject = objectp;
 	mRootObject = root_objectp;
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 8d8232c8f..0e6a57e04 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -2,31 +2,25 @@
  * @file llselectmgr.cpp
  * @brief A manager for selected objects and faces.
  *
- * $LicenseInfo:firstyear=2001&license=viewergpl$
- * 
- * Copyright (c) 2001-2009, Linden Research, Inc.
- * 
+ * $LicenseInfo:firstyear=2001&license=viewerlgpl$
  * 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
+ * Copyright (C) 2010, Linden Research, Inc.
  * 
- * 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
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
  * 
- * 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.
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
 
@@ -281,7 +275,7 @@ void LLSelectMgr::overrideObjectUpdates()
 		virtual bool apply(LLSelectNode* selectNode)
 		{
 			LLViewerObject* object = selectNode->getObject();
-			if (object && object->permMove())
+			if (object && object->permMove() && !object->isPermanentEnforced())
 			{
 				if (!selectNode->mLastPositionLocal.isExactlyZero())
 				{
@@ -600,6 +594,12 @@ bool LLSelectMgr::linkObjects()
 		return true;
 	}
 
+	if (!LLSelectMgr::getInstance()->selectGetRootsNonPermanentEnforced())
+	{
+		LLNotificationsUtil::add("CannotLinkPermanent");
+		return true;
+	}
+
 	LLUUID owner_id;
 	std::string owner_name;
 	if (!LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name))
@@ -645,7 +645,9 @@ bool LLSelectMgr::enableLinkObjects()
 			{
 				virtual bool apply(LLViewerObject* object)
 				{
-					return object->permModify();
+					LLViewerObject *root_object = (object == NULL) ? NULL : object->getRootEdit();
+					return object->permModify() && !object->isPermanentEnforced() &&
+						((root_object == NULL) || !root_object->isPermanentEnforced());
 				}
 			} func;
 			const bool firstonly = true;
@@ -668,10 +670,12 @@ bool LLSelectMgr::enableLinkObjects()
 bool LLSelectMgr::enableUnlinkObjects()
 {
 	LLViewerObject* first_editable_object = LLSelectMgr::getInstance()->getSelection()->getFirstEditableObject();
+	LLViewerObject *root_object = (first_editable_object == NULL) ? NULL : first_editable_object->getRootEdit();
 
 	bool new_value = LLSelectMgr::getInstance()->selectGetAllRootsValid() &&
 		first_editable_object &&
-		!first_editable_object->isAttachment();
+		!first_editable_object->isAttachment() && !first_editable_object->isPermanentEnforced() &&
+		((root_object == NULL) || !root_object->isPermanentEnforced());
 // [RLVa:KB] - Checked: 2011-03-19 (RLVa-1.3.0f) | Modified: RLVa-0.2.0g
 	if ( (new_value) && ((rlv_handler_t::isEnabled()) && (!gRlvHandler.canStand())) )
 	{
@@ -981,7 +985,7 @@ void LLSelectMgr::highlightObjectOnly(LLViewerObject* objectp)
 	}
 	
 	if ((gSavedSettings.getBOOL("SelectOwnedOnly") && !objectp->permYouOwner()) 
-		|| (gSavedSettings.getBOOL("SelectMovableOnly") && !objectp->permMove()))
+		|| (gSavedSettings.getBOOL("SelectMovableOnly") && (!objectp->permMove() ||  objectp->isPermanentEnforced())))
 	{
 		// only select my own objects
 		return;
@@ -2505,6 +2509,341 @@ BOOL LLSelectMgr::selectGetRootsModify()
 }
 
 
+//-----------------------------------------------------------------------------
+// selectGetNonPermanentEnforced() - return TRUE if all objects are not
+// permanent enforced
+//-----------------------------------------------------------------------------
+BOOL LLSelectMgr::selectGetNonPermanentEnforced()
+{
+	for (LLObjectSelection::iterator iter = getSelection()->begin();
+		 iter != getSelection()->end(); iter++ )
+	{
+		LLSelectNode* node = *iter;
+		LLViewerObject* object = node->getObject();
+		if( !object || !node->mValid )
+		{
+			return FALSE;
+		}
+		if( object->isPermanentEnforced())
+		{
+			return FALSE;
+		}
+	}
+	return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// selectGetRootsNonPermanentEnforced() - return TRUE if all root objects are
+// not permanent enforced
+//-----------------------------------------------------------------------------
+BOOL LLSelectMgr::selectGetRootsNonPermanentEnforced()
+{
+	for (LLObjectSelection::root_iterator iter = getSelection()->root_begin();
+		 iter != getSelection()->root_end(); iter++ )
+	{
+		LLSelectNode* node = *iter;
+		LLViewerObject* object = node->getObject();
+		if( !node->mValid )
+		{
+			return FALSE;
+		}
+		if( object->isPermanentEnforced())
+		{
+			return FALSE;
+		}
+	}
+
+	return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// selectGetPermanent() - return TRUE if all objects are permanent
+//-----------------------------------------------------------------------------
+BOOL LLSelectMgr::selectGetPermanent()
+{
+	for (LLObjectSelection::iterator iter = getSelection()->begin();
+		 iter != getSelection()->end(); iter++ )
+	{
+		LLSelectNode* node = *iter;
+		LLViewerObject* object = node->getObject();
+		if( !object || !node->mValid )
+		{
+			return FALSE;
+		}
+		if( !object->flagObjectPermanent())
+		{
+			return FALSE;
+		}
+	}
+	return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// selectGetRootsPermanent() - return TRUE if all root objects are
+// permanent
+//-----------------------------------------------------------------------------
+BOOL LLSelectMgr::selectGetRootsPermanent()
+{
+	for (LLObjectSelection::root_iterator iter = getSelection()->root_begin();
+		 iter != getSelection()->root_end(); iter++ )
+	{
+		LLSelectNode* node = *iter;
+		LLViewerObject* object = node->getObject();
+		if( !node->mValid )
+		{
+			return FALSE;
+		}
+		if( !object->flagObjectPermanent())
+		{
+			return FALSE;
+		}
+	}
+
+	return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// selectGetCharacter() - return TRUE if all objects are character
+//-----------------------------------------------------------------------------
+BOOL LLSelectMgr::selectGetCharacter()
+{
+	for (LLObjectSelection::iterator iter = getSelection()->begin();
+		 iter != getSelection()->end(); iter++ )
+	{
+		LLSelectNode* node = *iter;
+		LLViewerObject* object = node->getObject();
+		if( !object || !node->mValid )
+		{
+			return FALSE;
+		}
+		if( !object->flagCharacter())
+		{
+			return FALSE;
+		}
+	}
+	return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// selectGetRootsCharacter() - return TRUE if all root objects are
+// character
+//-----------------------------------------------------------------------------
+BOOL LLSelectMgr::selectGetRootsCharacter()
+{
+	for (LLObjectSelection::root_iterator iter = getSelection()->root_begin();
+		 iter != getSelection()->root_end(); iter++ )
+	{
+		LLSelectNode* node = *iter;
+		LLViewerObject* object = node->getObject();
+		if( !node->mValid )
+		{
+			return FALSE;
+		}
+		if( !object->flagCharacter())
+		{
+			return FALSE;
+		}
+	}
+
+	return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// selectGetNonPathfinding() - return TRUE if all objects are not pathfinding
+//-----------------------------------------------------------------------------
+BOOL LLSelectMgr::selectGetNonPathfinding()
+{
+	for (LLObjectSelection::iterator iter = getSelection()->begin();
+		 iter != getSelection()->end(); iter++ )
+	{
+		LLSelectNode* node = *iter;
+		LLViewerObject* object = node->getObject();
+		if( !object || !node->mValid )
+		{
+			return FALSE;
+		}
+		if( object->flagObjectPermanent() || object->flagCharacter())
+		{
+			return FALSE;
+		}
+	}
+	return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// selectGetRootsNonPathfinding() - return TRUE if all root objects are not
+// pathfinding
+//-----------------------------------------------------------------------------
+BOOL LLSelectMgr::selectGetRootsNonPathfinding()
+{
+	for (LLObjectSelection::root_iterator iter = getSelection()->root_begin();
+		 iter != getSelection()->root_end(); iter++ )
+	{
+		LLSelectNode* node = *iter;
+		LLViewerObject* object = node->getObject();
+		if( !node->mValid )
+		{
+			return FALSE;
+		}
+		if( object->flagObjectPermanent() || object->flagCharacter())
+		{
+			return FALSE;
+		}
+	}
+
+	return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// selectGetNonPermanent() - return TRUE if all objects are not permanent
+//-----------------------------------------------------------------------------
+BOOL LLSelectMgr::selectGetNonPermanent()
+{
+	for (LLObjectSelection::iterator iter = getSelection()->begin();
+		 iter != getSelection()->end(); iter++ )
+	{
+		LLSelectNode* node = *iter;
+		LLViewerObject* object = node->getObject();
+		if( !object || !node->mValid )
+		{
+			return FALSE;
+		}
+		if( object->flagObjectPermanent())
+		{
+			return FALSE;
+		}
+	}
+	return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// selectGetRootsNonPermanent() - return TRUE if all root objects are not
+// permanent
+//-----------------------------------------------------------------------------
+BOOL LLSelectMgr::selectGetRootsNonPermanent()
+{
+	for (LLObjectSelection::root_iterator iter = getSelection()->root_begin();
+		 iter != getSelection()->root_end(); iter++ )
+	{
+		LLSelectNode* node = *iter;
+		LLViewerObject* object = node->getObject();
+		if( !node->mValid )
+		{
+			return FALSE;
+		}
+		if( object->flagObjectPermanent())
+		{
+			return FALSE;
+		}
+	}
+
+	return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// selectGetNonCharacter() - return TRUE if all objects are not character
+//-----------------------------------------------------------------------------
+BOOL LLSelectMgr::selectGetNonCharacter()
+{
+	for (LLObjectSelection::iterator iter = getSelection()->begin();
+		 iter != getSelection()->end(); iter++ )
+	{
+		LLSelectNode* node = *iter;
+		LLViewerObject* object = node->getObject();
+		if( !object || !node->mValid )
+		{
+			return FALSE;
+		}
+		if( object->flagCharacter())
+		{
+			return FALSE;
+		}
+	}
+	return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// selectGetRootsNonCharacter() - return TRUE if all root objects are not 
+// character
+//-----------------------------------------------------------------------------
+BOOL LLSelectMgr::selectGetRootsNonCharacter()
+{
+	for (LLObjectSelection::root_iterator iter = getSelection()->root_begin();
+		 iter != getSelection()->root_end(); iter++ )
+	{
+		LLSelectNode* node = *iter;
+		LLViewerObject* object = node->getObject();
+		if( !node->mValid )
+		{
+			return FALSE;
+		}
+		if( object->flagCharacter())
+		{
+			return FALSE;
+		}
+	}
+
+	return TRUE;
+}
+
+
+//-----------------------------------------------------------------------------
+// selectGetEditableLinksets() - return TRUE if all objects are editable
+//                               pathfinding linksets
+//-----------------------------------------------------------------------------
+BOOL LLSelectMgr::selectGetEditableLinksets()
+{
+	for (LLObjectSelection::iterator iter = getSelection()->begin();
+		 iter != getSelection()->end(); iter++ )
+	{
+		LLSelectNode* node = *iter;
+		LLViewerObject* object = node->getObject();
+		if( !object || !node->mValid )
+		{
+			return FALSE;
+		}
+		if (object->flagUsePhysics() ||
+			object->flagTemporaryOnRez() ||
+			object->flagCharacter() ||
+			object->flagVolumeDetect() ||
+			object->flagAnimSource() ||
+			(object->getRegion() != gAgent.getRegion()) ||
+			(!gAgent.isGodlike() && 
+			!gAgent.canManageEstate() &&
+			!object->permYouOwner() &&
+			!object->permMove()))
+		{
+			return FALSE;
+		}
+	}
+	return TRUE;
+}
+
+//-----------------------------------------------------------------------------
+// selectGetViewableCharacters() - return TRUE if all objects are characters
+//                        viewable within the pathfinding characters floater
+//-----------------------------------------------------------------------------
+BOOL LLSelectMgr::selectGetViewableCharacters()
+{
+	for (LLObjectSelection::iterator iter = getSelection()->begin();
+		 iter != getSelection()->end(); iter++ )
+	{
+		LLSelectNode* node = *iter;
+		LLViewerObject* object = node->getObject();
+		if( !object || !node->mValid )
+		{
+			return FALSE;
+		}
+		if( !object->flagCharacter() ||
+			(object->getRegion() != gAgent.getRegion()))
+		{
+			return FALSE;
+		}
+	}
+	return TRUE;
+}
+
+
 //-----------------------------------------------------------------------------
 // selectGetRootsTransfer() - return TRUE if current agent can transfer all
 // selected root objects.
@@ -6233,7 +6572,7 @@ BOOL LLSelectMgr::canSelectObject(LLViewerObject* object)
 	}
 
 	if ((gSavedSettings.getBOOL("SelectOwnedOnly") && !object->permYouOwner()) ||
-		(gSavedSettings.getBOOL("SelectMovableOnly") && !object->permMove()))
+		(gSavedSettings.getBOOL("SelectMovableOnly") && (!object->permMove() ||  object->isPermanentEnforced())))
 	{
 		// only select my own objects
 		return FALSE;
@@ -6927,7 +7266,7 @@ LLSelectNode* LLObjectSelection::getFirstMoveableNode(BOOL get_root_first)
 		bool apply(LLSelectNode* node)
 		{
 			LLViewerObject* obj = node->getObject();
-			return obj && obj->permMove();
+			return obj && obj->permMove() && !obj->isPermanentEnforced();
 		}
 	} func;
 	LLSelectNode* res = get_root_first ? getFirstRootNode(&func, TRUE) : getFirstNode(&func);
@@ -6965,9 +7304,10 @@ LLViewerObject* LLObjectSelection::getFirstDeleteableObject()
 			LLViewerObject* obj = node->getObject();
 			// you can delete an object if you are the owner
 			// or you have permission to modify it.
-			if( obj && ( (obj->permModify()) ||
-						 (obj->permYouOwner()) ||
-						 (!obj->permAnyOwner())	))		// public
+			if( obj && !obj->isPermanentEnforced() &&
+				( (obj->permModify()) ||
+				(obj->permYouOwner()) ||
+				(!obj->permAnyOwner())	))		// public
 			{
 				if( !obj->isAttachment() )
 				{
@@ -7007,7 +7347,7 @@ LLViewerObject* LLObjectSelection::getFirstMoveableObject(BOOL get_parent)
 		bool apply(LLSelectNode* node)
 		{
 			LLViewerObject* obj = node->getObject();
-			return obj && obj->permMove();
+			return obj && obj->permMove() && !obj->isPermanentEnforced();
 		}
 	} func;
 	return getFirstSelectedObject(&func, get_parent);
@@ -7076,7 +7416,7 @@ bool LLSelectMgr::selectionMove(const LLVector3& displ,
 	{
 		obj = (*it)->getObject();
 		bool enable_pos = false, enable_rot = false;
-		bool perm_move = obj->permMove();
+		bool perm_move = obj->permMove() && !obj->isPermanentEnforced();
 		bool perm_mod = obj->permModify();
 		
 		LLVector3d sel_center(getSelectionCenterGlobal());
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index 82f9e064f..f3c52dbfe 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -564,6 +564,33 @@ public:
 	BOOL selectGetRootsModify();
 	BOOL selectGetModify();
 
+	// returns TRUE if is all objects are non-permanent-enforced
+	BOOL selectGetRootsNonPermanentEnforced();
+	BOOL selectGetNonPermanentEnforced();
+
+	// returns TRUE if is all objects are permanent
+	BOOL selectGetRootsPermanent();
+	BOOL selectGetPermanent();
+
+	// returns TRUE if is all objects are character
+	BOOL selectGetRootsCharacter();
+	BOOL selectGetCharacter();
+
+	// returns TRUE if is all objects are not permanent
+	BOOL selectGetRootsNonPathfinding();
+	BOOL selectGetNonPathfinding();
+
+	// returns TRUE if is all objects are not permanent
+	BOOL selectGetRootsNonPermanent();
+	BOOL selectGetNonPermanent();
+
+	// returns TRUE if is all objects are not character
+	BOOL selectGetRootsNonCharacter();
+	BOOL selectGetNonCharacter();
+
+	BOOL selectGetEditableLinksets();
+	BOOL selectGetViewableCharacters();
+
 	// returns TRUE if selected objects can be transferred.
 	BOOL selectGetRootsTransfer();
 
diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp
index eefcfc195..0bde80872 100644
--- a/indra/newview/lltoolgrab.cpp
+++ b/indra/newview/lltoolgrab.cpp
@@ -218,24 +218,37 @@ BOOL LLToolGrab::handleObjectHit(const LLPickInfo& info)
 
 	if (!objectp->flagUsePhysics())
 	{
-		// In mouselook, we shouldn't be able to grab non-physical, 
-		// non-touchable objects.  If it has a touch handler, we
-		// do grab it (so llDetectedGrab works), but movement is
-		// blocked on the server side. JC
-		if (gAgentCamera.cameraMouselook() && !script_touch)
+		if (script_touch)
 		{
-			mMode = GRAB_LOCKED;
-			gViewerWindow->hideCursor();
-			gViewerWindow->moveCursorToCenter();
+			mMode = GRAB_NONPHYSICAL;  // if it has a script, use the non-physical grab
 		}
 		else
 		{
-			mMode = GRAB_NONPHYSICAL;
+			// In mouselook, we shouldn't be able to grab non-physical, 
+			// non-touchable objects.  If it has a touch handler, we
+			// do grab it (so llDetectedGrab works), but movement is
+			// blocked on the server side. JC
+			if (gAgentCamera.cameraMouselook())
+			{
+				mMode = GRAB_LOCKED;
+				gViewerWindow->hideCursor();
+				gViewerWindow->moveCursorToCenter();
+			}
+			else if (objectp->permMove() && !objectp->isPermanentEnforced())
+			{
+				mMode = GRAB_ACTIVE_CENTER;
+				gViewerWindow->hideCursor();
+				gViewerWindow->moveCursorToCenter();
+			}
+			else
+			{
+				mMode = GRAB_LOCKED;
+			}
+
+			
 		}
-		// Don't bail out here, go on and grab so buttons can get
-		// their "touched" event.
 	}
-	else if( !objectp->permMove() )
+	else if( objectp->flagCharacter() || !objectp->permMove() || objectp->isPermanentEnforced())
 	{
 		// if mouse is over a physical object without move permission, show feedback if user tries to move it.
 		mMode = GRAB_LOCKED;
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 1ec24b18d..452081724 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -374,7 +374,6 @@ void near_sit_object();
 BOOL is_selection_buy_not_take();
 S32 selection_price();
 BOOL enable_take();
-void handle_take();
 bool confirm_take(const LLSD& notification, const LLSD& response, LLObjectSelectionHandle selection_handle);
 
 void handle_buy_object(LLSaleInfo sale_info);
@@ -4524,8 +4523,9 @@ static bool get_derezzable_objects(
 		{
 		case DRD_TAKE_INTO_AGENT_INVENTORY:
 		case DRD_TRASH:
-			if( (node->mPermissions->allowTransferTo(gAgent.getID()) && object->permModify())
-				|| (node->allowOperationOnNode(PERM_OWNER, GP_OBJECT_MANIPULATE)) )
+			if (!object->isPermanentEnforced() &&
+				((node->mPermissions->allowTransferTo(gAgent.getID()) && object->permModify())
+				|| (node->allowOperationOnNode(PERM_OWNER, GP_OBJECT_MANIPULATE))))
 			{
 				can_derez_current = TRUE;
 			}
@@ -4945,9 +4945,10 @@ BOOL enable_take()
 			return TRUE;
 		}
 # endif
-		if((node->mPermissions->allowTransferTo(gAgent.getID())
+		if(!object->isPermanentEnforced() &&
+			((node->mPermissions->allowTransferTo(gAgent.getID())
 			&& object->permModify())
-		   || (node->mPermissions->getOwner() == gAgent.getID()))
+			|| (node->mPermissions->getOwner() == gAgent.getID())))
 		{
 			return TRUE;
 		}
@@ -7296,6 +7297,7 @@ BOOL object_selected_and_point_valid(void *user_data)
 	return (selection->getRootObjectCount() == 1) && 
 		(selection->getFirstRootObject()->getPCode() == LL_PCODE_VOLUME) && 
 		selection->getFirstRootObject()->permYouOwner() &&
+		!selection->getFirstRootObject()->flagObjectPermanent() &&
 		!((LLViewerObject*)selection->getFirstRootObject()->getRoot())->isAvatar() && 
 		(selection->getFirstRootObject()->getNVPair("AssetContainer") == NULL);
 }
@@ -7971,8 +7973,8 @@ BOOL enable_save_into_inventory(void*)
 			return TRUE;
 		}
 	}
-#endif
 	return FALSE;
+#endif
 }
 
 BOOL enable_save_into_task_inventory(void*)
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index f769c08ee..2e86ac2eb 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -5450,6 +5450,11 @@ void LLViewerObject::markForUpdate(BOOL priority)
 	}
 }
 
+bool LLViewerObject::isPermanentEnforced() const
+{
+	return flagObjectPermanent() && (mRegionp != gAgent.getRegion()) && !gAgent.isGodlike();
+}
+
 bool LLViewerObject::getIncludeInSearch() const
 {
 	return flagIncludeInSearch();
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h
index 5b7aa0e8c..d035f0bcd 100644
--- a/indra/newview/llviewerobject.h
+++ b/indra/newview/llviewerobject.h
@@ -491,6 +491,9 @@ public:
 	inline BOOL		flagObjectCopy() const			{ return ((mFlags & FLAGS_OBJECT_COPY) != 0); }
 	inline BOOL		flagObjectMove() const			{ return ((mFlags & FLAGS_OBJECT_MOVE) != 0); }
 	inline BOOL		flagObjectTransfer() const		{ return ((mFlags & FLAGS_OBJECT_TRANSFER) != 0); }
+	inline BOOL		flagObjectPermanent() const		{ return ((mFlags & FLAGS_AFFECTS_NAVMESH) != 0); }
+	inline BOOL		flagCharacter() const			{ return ((mFlags & FLAGS_CHARACTER) != 0); }
+	inline BOOL		flagVolumeDetect() const		{ return ((mFlags & FLAGS_VOLUME_DETECT) != 0); }
 	inline BOOL		flagIncludeInSearch() const     { return ((mFlags & FLAGS_INCLUDE_IN_SEARCH) != 0); }
 	inline BOOL		flagScripted() const			{ return ((mFlags & FLAGS_SCRIPTED) != 0); }
 	inline BOOL		flagHandleTouch() const			{ return ((mFlags & FLAGS_HANDLE_TOUCH) != 0); }
@@ -509,6 +512,8 @@ public:
 	inline F32      getPhysicsFriction() const      { return mPhysicsFriction; }
 	inline F32      getPhysicsDensity() const       { return mPhysicsDensity; }
 	inline F32      getPhysicsRestitution() const   { return mPhysicsRestitution; }
+	
+	bool            isPermanentEnforced() const;
 
 	bool getIncludeInSearch() const;
 	void setIncludeInSearch(bool include_in_search);
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 833d6412d..abf2ebee2 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -3425,8 +3425,11 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls,
 					{
 						LLSelectNode* nodep = *iter;
 						LLViewerObject* object = nodep->getObject();
+						LLViewerObject *root_object = (object == NULL) ? NULL : object->getRootEdit();
 						BOOL this_object_movable = FALSE;
-						if (object->permMove() && (object->permModify() || selecting_linked_set))
+						if (object->permMove() && !object->isPermanentEnforced() &&
+							((root_object == NULL) || !root_object->isPermanentEnforced()) &&
+							(object->permModify() || selecting_linked_set))
 						{
 							moveable_object_selected = TRUE;
 							this_object_movable = TRUE;
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index d8b34bd30..06ec78a0c 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -2390,7 +2390,7 @@ U32 LLVOVolume::getRenderCost(texture_cost_t &textures) const
 		produces_light = 1;
 	}
 
-	for (S32 i = 0; i < num_faces; ++i)
+	for (S32 i = 0; i < (S32)num_faces; ++i)
 	{
 		const LLFace* face = drawablep->getFace(i);
 		if (!face) continue;
diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml
index a6b797d34..02e4d5bc8 100644
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -1527,6 +1527,13 @@ Unable to link because you don&apos;t have modify permission on all the objects.
 Please make sure none are locked, and that you own all of them.
   </notification>
 
+  <notification
+   icon="alertmodal.tga"
+   name="CannotLinkPermanent"
+   type="alertmodal">
+    Objects cannot be linked across region boundaries.
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="CannotLinkDifferentOwners"
@@ -5942,6 +5949,53 @@ You cannot create objects here.
     <unique/>
   </notification>
 
+  <notification
+     icon="notify.tga"
+     name="PathfindingDirty"
+     type="notify">
+    <unique/>
+    The region has pending pathfinding changes.  If you have build rights, you may rebake the region by clicking on the “Rebake region� button.
+  </notification>
+
+  <notification
+     icon="notify.tga"
+     name="DynamicPathfindingDisabled"
+     type="notify">
+    <unique/>
+    Dynamic pathfinding is not enabled on this region.  Scripted objects using pathfinding LSL calls may not operate as expected on this region.
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingRebakeNavmesh"
+   type="alertmodal">
+    <unique/>
+    Changing certain objects in this region could cause other moving objects to behave incorrectly.  To make moving objects behave correctly, click the “Rebake region� button.  Choose “Help� for more information.
+    <url
+      option="1"
+      name="url"
+      target = "_external">
+      http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer
+    </url>
+    <usetemplate
+     name="okhelpignore"
+     ignoretext="Changing certain objects in this region could cause other moving objects to behave incorrectly."
+     yestext="OK"
+     helptext="Help"
+     />
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingCannotRebakeNavmesh"
+   type="alertmodal">
+    <unique/>
+    An error occurred.  There may be a network or server problem, or you may not have build rights.  Sometimes logging out and back in will solve this problem.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"
+     />
+  </notification>
   <notification
    icon="notify.tga"
    name="ScriptsStopped"

From 761439cc8d2ce88cdcde68fed0140ea9320777c6 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sun, 5 Aug 2012 08:20:31 +0200
Subject: [PATCH 140/199] Setting socket pair non-blocking

---
 indra/llmessage/aicurlthread.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/indra/llmessage/aicurlthread.cpp b/indra/llmessage/aicurlthread.cpp
index 98116398f..5d9b04e5e 100644
--- a/indra/llmessage/aicurlthread.cpp
+++ b/indra/llmessage/aicurlthread.cpp
@@ -911,12 +911,22 @@ void AICurlThread::create_wakeup_fds(void)
 	if (dumb_socketpair(socks, false) == SOCKET_ERROR)
 	{
 		llerrs << "Failed to generate wake-up socket pair" << formatWSAError() << llendl;
+		return;
 	}
-	else
-	{
-		mWakeUpFd = socks[0];
-		mWakeUpFd_in = socks[1];
-	}
+	u_long nonblocking_enable = TRUE;
+	int error = ioctlsocket(socks[0], FIONBIO, &nonblocking_enable);
+	if(error)
+	{
+		llerrs << "Failed to set wake-up socket nonblocking: " << formatWSAError() << llendl;
+	}
+	llassert(nonblocking_enable);
+	error = ioctlsocket(socks[1], FIONBIO, &nonblocking_enable);
+	if(error)
+	{
+		llerrs << "Failed to set wake-up input socket nonblocking: " << formatWSAError() << llendl;
+	}
+	mWakeUpFd = socks[0];
+	mWakeUpFd_in = socks[1];
 #else
   int pipefd[2];
   if (pipe(pipefd))

From caef97ad360697b6584861e00b3e8836ce96826f Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Sun, 5 Aug 2012 18:51:21 +0200
Subject: [PATCH 141/199] Print all libcurl calls if -DDEBUG_CURLIO. Don't
 create static lib for cwdebug.

Basically, cmake doesn't support linking static libs into a shared lib.
The correct way is to just specify source files in subdirectories
directly as source files of the shared library. This patch changes that.

Also, after this commit, when DEBUG_CURLIO is defined, every call to
libcurl is printed to llinfos (or to dc::curl when using libcwd).
---
 indra/CMakeLists.txt                 |   1 -
 indra/cmake/Cwdebug.cmake            |  21 +-
 indra/cwdebug/CMakeLists.txt         |  41 --
 indra/cwdebug/debug.h                |   2 +-
 indra/cwdebug/debug_libcurl.cc       | 769 +++++++++++++++++++++++++++
 indra/cwdebug/debug_libcurl.h        |  83 +++
 indra/llcommon/CMakeLists.txt        |   7 +-
 indra/llmessage/aicurl.h             |   3 +-
 indra/llmessage/llhttpclient.cpp     |   1 -
 indra/llmessage/llproxy.cpp          |   1 -
 indra/newview/hipporestrequest.cpp   |   3 +-
 indra/newview/llappviewer.cpp        |   1 -
 indra/newview/llpanellogin.cpp       |   1 -
 indra/newview/lluserauth.cpp         |   1 -
 indra/newview/llviewerassetstorage.h |   1 -
 indra/newview/llwlparammanager.cpp   |   1 -
 16 files changed, 878 insertions(+), 59 deletions(-)
 delete mode 100644 indra/cwdebug/CMakeLists.txt
 create mode 100644 indra/cwdebug/debug_libcurl.cc
 create mode 100644 indra/cwdebug/debug_libcurl.h

diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index e81965cc6..3ec482baf 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -46,7 +46,6 @@ endif(NOT STANDALONE)
 add_custom_target(prepare DEPENDS ${prepare_depends})
 
 add_subdirectory(cmake)
-add_subdirectory(${LIBS_OPEN_PREFIX}cwdebug)
 add_subdirectory(${LIBS_OPEN_PREFIX}llaudio)
 add_subdirectory(${LIBS_OPEN_PREFIX}llcharacter)
 add_subdirectory(${LIBS_OPEN_PREFIX}llcommon)
diff --git a/indra/cmake/Cwdebug.cmake b/indra/cmake/Cwdebug.cmake
index 9568a625f..f68c7a897 100644
--- a/indra/cmake/Cwdebug.cmake
+++ b/indra/cmake/Cwdebug.cmake
@@ -1 +1,20 @@
-set(CWDEBUG_LIBRARIES cwdebug)
+include_directories (${CMAKE_SOURCE_DIR}/cwdebug)
+
+set(cwdebug_SOURCE_FILES
+    ${CMAKE_SOURCE_DIR}/cwdebug/debug.cc
+    ${CMAKE_SOURCE_DIR}/cwdebug/debug_libcurl.cc
+    )
+
+set(cwdebug_HEADER_FILES
+    ${CMAKE_SOURCE_DIR}/cwdebug/cwdebug.h
+    ${CMAKE_SOURCE_DIR}/cwdebug/sys.h
+    ${CMAKE_SOURCE_DIR}/cwdebug/debug.h
+    ${CMAKE_SOURCE_DIR}/cwdebug/debug_ostream_operators.h
+    ${CMAKE_SOURCE_DIR}/cwdebug/debug_libcurl.h
+    )
+
+set_source_files_properties(${cwdebug_HEADER_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+list(APPEND cwdebug_SOURCE_FILES ${cwdebug_HEADER_FILES})
+
diff --git a/indra/cwdebug/CMakeLists.txt b/indra/cwdebug/CMakeLists.txt
deleted file mode 100644
index cb67f94f7..000000000
--- a/indra/cwdebug/CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- cmake -*-
-
-project(cwdebug)
-
-include(00-Common)
-include(LLCommon)
-include(LLMath)
-include(LLMessage)
-include(LLVFS)
-
-include_directories (${CMAKE_CURRENT_SOURCE_DIR})
-
-set(cwdebug_SOURCE_FILES
-    debug.cc
-    )
-
-set(cwdebug_HEADER_FILES
-    CMakeLists.txt
-
-    cwdebug.h
-    sys.h
-    debug.h
-    debug_ostream_operators.h
-    )
-
-set_source_files_properties(${cwdebug_HEADER_FILES}
-                            PROPERTIES HEADER_FILE_ONLY TRUE)
-
-if(NOT WORD_SIZE EQUAL 32)
-	if(WINDOWS)
-		add_definitions(/FIXED:NO)
-	else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
-		add_definitions(-fPIC)
-	endif(WINDOWS)
-endif (NOT WORD_SIZE EQUAL 32)
-
-add_definitions(-Dcwdebug_EXPORTS)
-
-list(APPEND cwdebug_SOURCE_FILES ${cwdebug_HEADER_FILES})
-
-add_library (cwdebug ${cwdebug_SOURCE_FILES})
diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h
index d49a61512..4161e18f7 100644
--- a/indra/cwdebug/debug.h
+++ b/indra/cwdebug/debug.h
@@ -41,7 +41,7 @@
 #endif // LL_WINDOWS
 
 #if LL_COMMON_LINK_SHARED
-#if defined(cwdebug_EXPORTS) || defined(llcommon_EXPORTS)
+#if defined(llcommon_EXPORTS)
 #define CWD_API CWD_DLLEXPORT
 #else // cwdebug_EXPORTS
 #define CWD_API CWD_DLLIMPORT
diff --git a/indra/cwdebug/debug_libcurl.cc b/indra/cwdebug/debug_libcurl.cc
new file mode 100644
index 000000000..10aa0f28e
--- /dev/null
+++ b/indra/cwdebug/debug_libcurl.cc
@@ -0,0 +1,769 @@
+#ifdef DEBUG_CURLIO
+
+#include "sys.h"
+#include <iostream>
+#include <iomanip>
+#include <stdarg.h>
+#define COMPILING_DEBUG_LIBCURL_CC
+#include "debug_libcurl.h"
+#include "../llcommon/llerror.h"
+
+static struct curl_slist unchanged_slist;
+
+std::ostream& operator<<(std::ostream& os, struct curl_slist const& slist)
+{
+  struct curl_slist const* ptr = &slist;
+  if (ptr == &unchanged_slist)
+	os << " <unchanged> ";
+  else
+  {
+	os << "(curl_slist)@0x" << std::hex << (size_t)ptr << std::dec << "{";
+	do
+	{
+	  os << '"' << ptr->data << '"';
+      ptr = ptr->next;
+	  if (ptr)
+		os << ", ";
+	}
+	while(ptr);
+	os << "}";
+  }
+  return os;
+}
+
+#define CASEPRINT(x) case x: os << #x; break
+
+std::ostream& operator<<(std::ostream& os, CURLINFO info)
+{
+  switch (info)
+  {
+	CASEPRINT(CURLINFO_EFFECTIVE_URL);
+	CASEPRINT(CURLINFO_RESPONSE_CODE);
+	CASEPRINT(CURLINFO_TOTAL_TIME);
+	CASEPRINT(CURLINFO_NAMELOOKUP_TIME);
+	CASEPRINT(CURLINFO_CONNECT_TIME);
+	CASEPRINT(CURLINFO_PRETRANSFER_TIME);
+	CASEPRINT(CURLINFO_SIZE_UPLOAD);
+	CASEPRINT(CURLINFO_SIZE_DOWNLOAD);
+	CASEPRINT(CURLINFO_SPEED_DOWNLOAD);
+	CASEPRINT(CURLINFO_SPEED_UPLOAD);
+	CASEPRINT(CURLINFO_HEADER_SIZE);
+	CASEPRINT(CURLINFO_REQUEST_SIZE);
+	CASEPRINT(CURLINFO_SSL_VERIFYRESULT);
+	CASEPRINT(CURLINFO_FILETIME);
+	CASEPRINT(CURLINFO_CONTENT_LENGTH_DOWNLOAD);
+	CASEPRINT(CURLINFO_CONTENT_LENGTH_UPLOAD);
+	CASEPRINT(CURLINFO_STARTTRANSFER_TIME);
+	CASEPRINT(CURLINFO_CONTENT_TYPE);
+	CASEPRINT(CURLINFO_REDIRECT_TIME);
+	CASEPRINT(CURLINFO_REDIRECT_COUNT);
+	CASEPRINT(CURLINFO_PRIVATE);
+	CASEPRINT(CURLINFO_HTTP_CONNECTCODE);
+	CASEPRINT(CURLINFO_HTTPAUTH_AVAIL);
+	CASEPRINT(CURLINFO_PROXYAUTH_AVAIL);
+	CASEPRINT(CURLINFO_OS_ERRNO);
+	CASEPRINT(CURLINFO_NUM_CONNECTS);
+	CASEPRINT(CURLINFO_SSL_ENGINES);
+	CASEPRINT(CURLINFO_COOKIELIST);
+	CASEPRINT(CURLINFO_LASTSOCKET);
+	CASEPRINT(CURLINFO_FTP_ENTRY_PATH);
+	CASEPRINT(CURLINFO_REDIRECT_URL);
+	CASEPRINT(CURLINFO_PRIMARY_IP);
+	CASEPRINT(CURLINFO_APPCONNECT_TIME);
+	CASEPRINT(CURLINFO_CERTINFO);
+	CASEPRINT(CURLINFO_CONDITION_UNMET);
+	CASEPRINT(CURLINFO_RTSP_SESSION_ID);
+	CASEPRINT(CURLINFO_RTSP_CLIENT_CSEQ);
+	CASEPRINT(CURLINFO_RTSP_SERVER_CSEQ);
+	CASEPRINT(CURLINFO_RTSP_CSEQ_RECV);
+	CASEPRINT(CURLINFO_PRIMARY_PORT);
+	CASEPRINT(CURLINFO_LOCAL_IP);
+	CASEPRINT(CURLINFO_LOCAL_PORT);
+	default:
+      os << "<unknown" << " CURLINFO value (" << (int)info << ")>";
+  }
+  return os;
+}
+
+std::ostream& operator<<(std::ostream& os, CURLcode code)
+{
+  switch(code)
+  {
+	CASEPRINT(CURLE_OK);
+	CASEPRINT(CURLE_UNSUPPORTED_PROTOCOL);
+	CASEPRINT(CURLE_FAILED_INIT);
+	CASEPRINT(CURLE_URL_MALFORMAT);
+	CASEPRINT(CURLE_NOT_BUILT_IN);
+	CASEPRINT(CURLE_COULDNT_RESOLVE_PROXY);
+	CASEPRINT(CURLE_COULDNT_RESOLVE_HOST);
+	CASEPRINT(CURLE_COULDNT_CONNECT);
+	CASEPRINT(CURLE_FTP_WEIRD_SERVER_REPLY);
+	CASEPRINT(CURLE_REMOTE_ACCESS_DENIED);
+	CASEPRINT(CURLE_FTP_ACCEPT_FAILED);
+	CASEPRINT(CURLE_FTP_WEIRD_PASS_REPLY);
+	CASEPRINT(CURLE_FTP_ACCEPT_TIMEOUT);
+	CASEPRINT(CURLE_FTP_WEIRD_PASV_REPLY);
+	CASEPRINT(CURLE_FTP_WEIRD_227_FORMAT);
+	CASEPRINT(CURLE_FTP_CANT_GET_HOST);
+	CASEPRINT(CURLE_OBSOLETE16);
+	CASEPRINT(CURLE_FTP_COULDNT_SET_TYPE);
+	CASEPRINT(CURLE_PARTIAL_FILE);
+	CASEPRINT(CURLE_FTP_COULDNT_RETR_FILE);
+	CASEPRINT(CURLE_OBSOLETE20);
+	CASEPRINT(CURLE_QUOTE_ERROR);
+	CASEPRINT(CURLE_HTTP_RETURNED_ERROR);
+	CASEPRINT(CURLE_WRITE_ERROR);
+	CASEPRINT(CURLE_OBSOLETE24);
+	CASEPRINT(CURLE_UPLOAD_FAILED);
+	CASEPRINT(CURLE_READ_ERROR);
+	CASEPRINT(CURLE_OUT_OF_MEMORY);
+	CASEPRINT(CURLE_OPERATION_TIMEDOUT);
+	CASEPRINT(CURLE_OBSOLETE29);
+	CASEPRINT(CURLE_FTP_PORT_FAILED);
+	CASEPRINT(CURLE_FTP_COULDNT_USE_REST);
+	CASEPRINT(CURLE_OBSOLETE32);
+	CASEPRINT(CURLE_RANGE_ERROR);
+	CASEPRINT(CURLE_HTTP_POST_ERROR);
+	CASEPRINT(CURLE_SSL_CONNECT_ERROR);
+	CASEPRINT(CURLE_BAD_DOWNLOAD_RESUME);
+	CASEPRINT(CURLE_FILE_COULDNT_READ_FILE);
+	CASEPRINT(CURLE_LDAP_CANNOT_BIND);
+	CASEPRINT(CURLE_LDAP_SEARCH_FAILED);
+	CASEPRINT(CURLE_OBSOLETE40);
+	CASEPRINT(CURLE_FUNCTION_NOT_FOUND);
+	CASEPRINT(CURLE_ABORTED_BY_CALLBACK);
+	CASEPRINT(CURLE_BAD_FUNCTION_ARGUMENT);
+	CASEPRINT(CURLE_OBSOLETE44);
+	CASEPRINT(CURLE_INTERFACE_FAILED);
+	CASEPRINT(CURLE_OBSOLETE46);
+	CASEPRINT(CURLE_TOO_MANY_REDIRECTS );
+	CASEPRINT(CURLE_UNKNOWN_OPTION);
+	CASEPRINT(CURLE_TELNET_OPTION_SYNTAX );
+	CASEPRINT(CURLE_OBSOLETE50);
+	CASEPRINT(CURLE_PEER_FAILED_VERIFICATION);
+	CASEPRINT(CURLE_GOT_NOTHING);
+	CASEPRINT(CURLE_SSL_ENGINE_NOTFOUND);
+	CASEPRINT(CURLE_SSL_ENGINE_SETFAILED);
+	CASEPRINT(CURLE_SEND_ERROR);
+	CASEPRINT(CURLE_RECV_ERROR);
+	CASEPRINT(CURLE_OBSOLETE57);
+	CASEPRINT(CURLE_SSL_CERTPROBLEM);
+	CASEPRINT(CURLE_SSL_CIPHER);
+	CASEPRINT(CURLE_SSL_CACERT);
+	CASEPRINT(CURLE_BAD_CONTENT_ENCODING);
+	CASEPRINT(CURLE_LDAP_INVALID_URL);
+	CASEPRINT(CURLE_FILESIZE_EXCEEDED);
+	CASEPRINT(CURLE_USE_SSL_FAILED);
+	CASEPRINT(CURLE_SEND_FAIL_REWIND);
+	CASEPRINT(CURLE_SSL_ENGINE_INITFAILED);
+	CASEPRINT(CURLE_LOGIN_DENIED);
+	CASEPRINT(CURLE_TFTP_NOTFOUND);
+	CASEPRINT(CURLE_TFTP_PERM);
+	CASEPRINT(CURLE_REMOTE_DISK_FULL);
+	CASEPRINT(CURLE_TFTP_ILLEGAL);
+	CASEPRINT(CURLE_TFTP_UNKNOWNID);
+	CASEPRINT(CURLE_REMOTE_FILE_EXISTS);
+	CASEPRINT(CURLE_TFTP_NOSUCHUSER);
+	CASEPRINT(CURLE_CONV_FAILED);
+	CASEPRINT(CURLE_CONV_REQD);
+	CASEPRINT(CURLE_SSL_CACERT_BADFILE);
+	CASEPRINT(CURLE_REMOTE_FILE_NOT_FOUND);
+	CASEPRINT(CURLE_SSH);
+	CASEPRINT(CURLE_SSL_SHUTDOWN_FAILED);
+	CASEPRINT(CURLE_AGAIN);
+	CASEPRINT(CURLE_SSL_CRL_BADFILE);
+	CASEPRINT(CURLE_SSL_ISSUER_ERROR);
+	CASEPRINT(CURLE_FTP_PRET_FAILED);
+	CASEPRINT(CURLE_RTSP_CSEQ_ERROR);
+	CASEPRINT(CURLE_RTSP_SESSION_ERROR);
+	CASEPRINT(CURLE_FTP_BAD_FILE_LIST);
+	CASEPRINT(CURLE_CHUNK_FAILED);
+    default:
+      os << (code == CURL_LAST ? "<illegal" : "<unknown") << " CURLcode value (" << (int)code << ")>";
+  }
+  return os;
+}
+
+struct AICURL;
+struct AICURLM;
+
+std::ostream& operator<<(std::ostream& os, AICURL* curl)
+{
+  os << "(CURL*)0x" << std::hex << (size_t)curl << std::dec;
+  return os;
+}
+
+std::ostream& operator<<(std::ostream& os, AICURLM* curl)
+{
+  os << "(CURLM*)0x" << std::hex << (size_t)curl << std::dec;
+  return os;
+}
+
+std::ostream& operator<<(std::ostream& os, CURLoption option)
+{
+  switch(option)
+  {
+	CASEPRINT(CURLOPT_WRITEDATA);
+	CASEPRINT(CURLOPT_URL);
+	CASEPRINT(CURLOPT_PORT);
+	CASEPRINT(CURLOPT_PROXY);
+	CASEPRINT(CURLOPT_USERPWD);
+	CASEPRINT(CURLOPT_PROXYUSERPWD);
+	CASEPRINT(CURLOPT_RANGE);
+	CASEPRINT(CURLOPT_READDATA);
+	CASEPRINT(CURLOPT_ERRORBUFFER);
+	CASEPRINT(CURLOPT_WRITEFUNCTION);
+	CASEPRINT(CURLOPT_READFUNCTION);
+	CASEPRINT(CURLOPT_TIMEOUT);
+	CASEPRINT(CURLOPT_INFILESIZE);
+	CASEPRINT(CURLOPT_POSTFIELDS);
+	CASEPRINT(CURLOPT_REFERER);
+	CASEPRINT(CURLOPT_FTPPORT);
+	CASEPRINT(CURLOPT_USERAGENT);
+	CASEPRINT(CURLOPT_LOW_SPEED_LIMIT);
+	CASEPRINT(CURLOPT_LOW_SPEED_TIME);
+	CASEPRINT(CURLOPT_RESUME_FROM);
+	CASEPRINT(CURLOPT_COOKIE);
+	CASEPRINT(CURLOPT_RTSPHEADER);
+	CASEPRINT(CURLOPT_HTTPPOST);
+	CASEPRINT(CURLOPT_SSLCERT);
+	CASEPRINT(CURLOPT_KEYPASSWD);
+	CASEPRINT(CURLOPT_CRLF);
+	CASEPRINT(CURLOPT_QUOTE);
+	CASEPRINT(CURLOPT_HEADERDATA);
+	CASEPRINT(CURLOPT_COOKIEFILE);
+	CASEPRINT(CURLOPT_SSLVERSION);
+	CASEPRINT(CURLOPT_TIMECONDITION);
+	CASEPRINT(CURLOPT_TIMEVALUE);
+	CASEPRINT(CURLOPT_CUSTOMREQUEST);
+	CASEPRINT(CURLOPT_STDERR);
+	CASEPRINT(CURLOPT_POSTQUOTE);
+	CASEPRINT(CURLOPT_WRITEINFO);
+	CASEPRINT(CURLOPT_VERBOSE);
+	CASEPRINT(CURLOPT_HEADER);
+	CASEPRINT(CURLOPT_NOPROGRESS);
+	CASEPRINT(CURLOPT_NOBODY);
+	CASEPRINT(CURLOPT_FAILONERROR);
+	CASEPRINT(CURLOPT_UPLOAD);
+	CASEPRINT(CURLOPT_POST);
+	CASEPRINT(CURLOPT_DIRLISTONLY);
+	CASEPRINT(CURLOPT_APPEND);
+	CASEPRINT(CURLOPT_NETRC);
+	CASEPRINT(CURLOPT_FOLLOWLOCATION);
+	CASEPRINT(CURLOPT_TRANSFERTEXT);
+	CASEPRINT(CURLOPT_PUT);
+	CASEPRINT(CURLOPT_PROGRESSFUNCTION);
+	CASEPRINT(CURLOPT_PROGRESSDATA);
+	CASEPRINT(CURLOPT_AUTOREFERER);
+	CASEPRINT(CURLOPT_PROXYPORT);
+	CASEPRINT(CURLOPT_HTTPPROXYTUNNEL);
+	CASEPRINT(CURLOPT_INTERFACE);
+	CASEPRINT(CURLOPT_KRBLEVEL);
+	CASEPRINT(CURLOPT_SSL_VERIFYPEER);
+	CASEPRINT(CURLOPT_CAINFO);
+	CASEPRINT(CURLOPT_MAXREDIRS);
+	CASEPRINT(CURLOPT_FILETIME);
+	CASEPRINT(CURLOPT_TELNETOPTIONS);
+	CASEPRINT(CURLOPT_MAXCONNECTS);
+	CASEPRINT(CURLOPT_CLOSEPOLICY);
+	CASEPRINT(CURLOPT_FRESH_CONNECT);
+	CASEPRINT(CURLOPT_FORBID_REUSE);
+	CASEPRINT(CURLOPT_RANDOM_FILE);
+	CASEPRINT(CURLOPT_EGDSOCKET);
+	CASEPRINT(CURLOPT_CONNECTTIMEOUT);
+	CASEPRINT(CURLOPT_HEADERFUNCTION);
+	CASEPRINT(CURLOPT_HTTPGET);
+	CASEPRINT(CURLOPT_SSL_VERIFYHOST);
+	CASEPRINT(CURLOPT_COOKIEJAR);
+	CASEPRINT(CURLOPT_SSL_CIPHER_LIST);
+	CASEPRINT(CURLOPT_HTTP_VERSION);
+	CASEPRINT(CURLOPT_FTP_USE_EPSV);
+	CASEPRINT(CURLOPT_SSLCERTTYPE);
+	CASEPRINT(CURLOPT_SSLKEY);
+	CASEPRINT(CURLOPT_SSLKEYTYPE);
+	CASEPRINT(CURLOPT_SSLENGINE);
+	CASEPRINT(CURLOPT_SSLENGINE_DEFAULT);
+	CASEPRINT(CURLOPT_DNS_USE_GLOBAL_CACHE);
+	CASEPRINT(CURLOPT_DNS_CACHE_TIMEOUT);
+	CASEPRINT(CURLOPT_PREQUOTE);
+	CASEPRINT(CURLOPT_DEBUGFUNCTION);
+	CASEPRINT(CURLOPT_DEBUGDATA);
+	CASEPRINT(CURLOPT_COOKIESESSION);
+	CASEPRINT(CURLOPT_CAPATH);
+	CASEPRINT(CURLOPT_BUFFERSIZE);
+	CASEPRINT(CURLOPT_NOSIGNAL);
+	CASEPRINT(CURLOPT_SHARE);
+	CASEPRINT(CURLOPT_PROXYTYPE);
+	CASEPRINT(CURLOPT_ACCEPT_ENCODING);
+	CASEPRINT(CURLOPT_PRIVATE);
+	CASEPRINT(CURLOPT_HTTP200ALIASES);
+	CASEPRINT(CURLOPT_UNRESTRICTED_AUTH);
+	CASEPRINT(CURLOPT_FTP_USE_EPRT);
+	CASEPRINT(CURLOPT_HTTPAUTH);
+	CASEPRINT(CURLOPT_SSL_CTX_FUNCTION);
+	CASEPRINT(CURLOPT_SSL_CTX_DATA);
+	CASEPRINT(CURLOPT_FTP_CREATE_MISSING_DIRS);
+	CASEPRINT(CURLOPT_PROXYAUTH);
+	CASEPRINT(CURLOPT_FTP_RESPONSE_TIMEOUT);
+	CASEPRINT(CURLOPT_IPRESOLVE);
+	CASEPRINT(CURLOPT_MAXFILESIZE);
+	CASEPRINT(CURLOPT_INFILESIZE_LARGE);
+	CASEPRINT(CURLOPT_RESUME_FROM_LARGE);
+	CASEPRINT(CURLOPT_MAXFILESIZE_LARGE);
+	CASEPRINT(CURLOPT_NETRC_FILE);
+	CASEPRINT(CURLOPT_USE_SSL);
+	CASEPRINT(CURLOPT_POSTFIELDSIZE_LARGE);
+	CASEPRINT(CURLOPT_TCP_NODELAY);
+	CASEPRINT(CURLOPT_FTPSSLAUTH);
+	CASEPRINT(CURLOPT_IOCTLFUNCTION);
+	CASEPRINT(CURLOPT_IOCTLDATA);
+	CASEPRINT(CURLOPT_FTP_ACCOUNT);
+	CASEPRINT(CURLOPT_COOKIELIST);
+	CASEPRINT(CURLOPT_IGNORE_CONTENT_LENGTH);
+	CASEPRINT(CURLOPT_FTP_SKIP_PASV_IP);
+	CASEPRINT(CURLOPT_FTP_FILEMETHOD);
+	CASEPRINT(CURLOPT_LOCALPORT);
+	CASEPRINT(CURLOPT_LOCALPORTRANGE);
+	CASEPRINT(CURLOPT_CONNECT_ONLY);
+	CASEPRINT(CURLOPT_CONV_FROM_NETWORK_FUNCTION);
+	CASEPRINT(CURLOPT_CONV_TO_NETWORK_FUNCTION);
+	CASEPRINT(CURLOPT_CONV_FROM_UTF8_FUNCTION);
+	CASEPRINT(CURLOPT_MAX_SEND_SPEED_LARGE);
+	CASEPRINT(CURLOPT_MAX_RECV_SPEED_LARGE);
+	CASEPRINT(CURLOPT_FTP_ALTERNATIVE_TO_USER);
+	CASEPRINT(CURLOPT_SOCKOPTFUNCTION);
+	CASEPRINT(CURLOPT_SOCKOPTDATA);
+	CASEPRINT(CURLOPT_SSL_SESSIONID_CACHE);
+	CASEPRINT(CURLOPT_SSH_AUTH_TYPES);
+	CASEPRINT(CURLOPT_SSH_PUBLIC_KEYFILE);
+	CASEPRINT(CURLOPT_SSH_PRIVATE_KEYFILE);
+	CASEPRINT(CURLOPT_FTP_SSL_CCC);
+	CASEPRINT(CURLOPT_TIMEOUT_MS);
+	CASEPRINT(CURLOPT_CONNECTTIMEOUT_MS);
+	CASEPRINT(CURLOPT_HTTP_TRANSFER_DECODING);
+	CASEPRINT(CURLOPT_HTTP_CONTENT_DECODING);
+	CASEPRINT(CURLOPT_NEW_FILE_PERMS);
+	CASEPRINT(CURLOPT_NEW_DIRECTORY_PERMS);
+	CASEPRINT(CURLOPT_POSTREDIR);
+	CASEPRINT(CURLOPT_SSH_HOST_PUBLIC_KEY_MD5);
+	CASEPRINT(CURLOPT_OPENSOCKETFUNCTION);
+	CASEPRINT(CURLOPT_OPENSOCKETDATA);
+	CASEPRINT(CURLOPT_COPYPOSTFIELDS);
+	CASEPRINT(CURLOPT_PROXY_TRANSFER_MODE);
+	CASEPRINT(CURLOPT_SEEKFUNCTION);
+	CASEPRINT(CURLOPT_SEEKDATA);
+	CASEPRINT(CURLOPT_CRLFILE);
+	CASEPRINT(CURLOPT_ISSUERCERT);
+	CASEPRINT(CURLOPT_ADDRESS_SCOPE);
+	CASEPRINT(CURLOPT_CERTINFO);
+	CASEPRINT(CURLOPT_USERNAME);
+	CASEPRINT(CURLOPT_PASSWORD);
+	CASEPRINT(CURLOPT_PROXYUSERNAME);
+	CASEPRINT(CURLOPT_PROXYPASSWORD);
+	CASEPRINT(CURLOPT_NOPROXY);
+	CASEPRINT(CURLOPT_TFTP_BLKSIZE);
+	CASEPRINT(CURLOPT_SOCKS5_GSSAPI_SERVICE);
+	CASEPRINT(CURLOPT_SOCKS5_GSSAPI_NEC);
+	CASEPRINT(CURLOPT_PROTOCOLS);
+	CASEPRINT(CURLOPT_REDIR_PROTOCOLS);
+	CASEPRINT(CURLOPT_SSH_KNOWNHOSTS);
+	CASEPRINT(CURLOPT_SSH_KEYFUNCTION);
+	CASEPRINT(CURLOPT_SSH_KEYDATA);
+	CASEPRINT(CURLOPT_MAIL_FROM);
+	CASEPRINT(CURLOPT_MAIL_RCPT);
+	CASEPRINT(CURLOPT_FTP_USE_PRET);
+	CASEPRINT(CURLOPT_RTSP_REQUEST);
+	CASEPRINT(CURLOPT_RTSP_SESSION_ID);
+	CASEPRINT(CURLOPT_RTSP_STREAM_URI);
+	CASEPRINT(CURLOPT_RTSP_TRANSPORT);
+	CASEPRINT(CURLOPT_RTSP_CLIENT_CSEQ);
+	CASEPRINT(CURLOPT_RTSP_SERVER_CSEQ);
+	CASEPRINT(CURLOPT_INTERLEAVEDATA);
+	CASEPRINT(CURLOPT_INTERLEAVEFUNCTION);
+	CASEPRINT(CURLOPT_WILDCARDMATCH);
+	CASEPRINT(CURLOPT_CHUNK_BGN_FUNCTION);
+	CASEPRINT(CURLOPT_CHUNK_END_FUNCTION);
+	CASEPRINT(CURLOPT_FNMATCH_FUNCTION);
+	CASEPRINT(CURLOPT_CHUNK_DATA);
+	CASEPRINT(CURLOPT_FNMATCH_DATA);
+	CASEPRINT(CURLOPT_RESOLVE);
+	CASEPRINT(CURLOPT_TLSAUTH_USERNAME);
+	CASEPRINT(CURLOPT_TLSAUTH_PASSWORD);
+	CASEPRINT(CURLOPT_TLSAUTH_TYPE);
+	CASEPRINT(CURLOPT_TRANSFER_ENCODING);
+	CASEPRINT(CURLOPT_CLOSESOCKETFUNCTION);
+	CASEPRINT(CURLOPT_CLOSESOCKETDATA);
+	CASEPRINT(CURLOPT_GSSAPI_DELEGATION);
+	CASEPRINT(CURLOPT_DNS_SERVERS);
+	CASEPRINT(CURLOPT_ACCEPTTIMEOUT_MS);
+	CASEPRINT(CURLOPT_TCP_KEEPALIVE);
+	CASEPRINT(CURLOPT_TCP_KEEPIDLE);
+	CASEPRINT(CURLOPT_TCP_KEEPINTVL);
+	CASEPRINT(CURLOPT_SSL_OPTIONS);
+	CASEPRINT(CURLOPT_MAIL_AUTH);
+	default:
+      os << "<unknown CURLoption value (" << (int)option << ")>";
+  }
+  return os;
+}
+
+std::ostream& operator<<(std::ostream& os, CURLMoption option)
+{
+  switch(option)
+  {
+    CASEPRINT(CURLMOPT_SOCKETFUNCTION);
+	CASEPRINT(CURLMOPT_SOCKETDATA);
+	CASEPRINT(CURLMOPT_PIPELINING);
+	CASEPRINT(CURLMOPT_TIMERFUNCTION);
+	CASEPRINT(CURLMOPT_TIMERDATA);
+	CASEPRINT(CURLMOPT_MAXCONNECTS);
+	default:
+      os << "<unknown CURLMoption value (" << (int)option << ")>";
+  }
+  return os;
+}
+
+std::ostream& operator<<(std::ostream& os, CURLMsg* msg)
+{
+  if (msg)
+  {
+	os << "(CURLMsg*){";
+	if (msg->msg == CURLMSG_DONE)
+	  os << "CURLMSG_DONE";
+	else
+	  os << msg->msg;
+	os << ", " << (AICURL*)msg->easy_handle << ", 0x" << std::hex << (size_t)msg->data.whatever << std::dec << '}';
+  }
+  else
+	os << "(CURLMsg*)NULL";
+  return os;
+}
+
+struct EvBitmask {
+  int mBitmask;
+  EvBitmask(int mask) : mBitmask(mask) { }
+};
+
+std::ostream& operator<<(std::ostream& os, EvBitmask const& bitmask)
+{
+  int m = bitmask.mBitmask;
+  if (m == 0)
+	os << '0';
+  if ((m & CURL_CSELECT_IN))
+  {
+	os << "CURL_CSELECT_IN";
+	if ((m & (CURL_CSELECT_OUT|CURL_CSELECT_ERR)))
+	  os << '|';
+  }
+  if ((m & CURL_CSELECT_OUT))
+  {
+	os << "CURL_CSELECT_OUT";
+	if ((m & CURL_CSELECT_ERR))
+	  os << '|';
+  }
+  if ((m & CURL_CSELECT_ERR))
+  {
+	os << "CURL_CSELECT_ERR";
+  }
+  return os;
+}
+
+extern "C" {
+
+void debug_curl_easy_cleanup(CURL* handle)
+{
+  curl_easy_cleanup(handle);
+  Dout(dc::curl, "curl_easy_cleanup(" << (AICURL*)handle << ")");
+}
+
+CURL* debug_curl_easy_duphandle(CURL* handle)
+{
+  CURL* ret;
+  ret = curl_easy_duphandle(handle);
+  Dout(dc::curl, "curl_easy_duphandle(" << (AICURL*)handle << ") = " << (AICURL*)ret);
+  return ret;
+}
+
+char* debug_curl_easy_escape(CURL* curl, char* url, int length)
+{
+  char* ret;
+  ret = curl_easy_escape(curl, url, length);
+  Dout(dc::curl, "curl_easy_escape(" << curl << ", \"" << url << "\", " << length << ") = \"" << ret << '"');
+  return ret;
+}
+
+CURLcode debug_curl_easy_getinfo(CURL* curl, CURLINFO info, ...)
+{
+  CURLcode ret;
+  va_list ap;
+  union param_type {
+	long* long_ptr;
+	char* char_ptr;
+	curl_slist* curl_slist_ptr;
+	double* double_ptr;
+  } param;
+  va_start(ap, info);
+  param.long_ptr = va_arg(ap, long*);
+  va_end(ap);
+  ret = curl_easy_getinfo(curl, info, param.long_ptr);
+  if (info == CURLINFO_PRIVATE)
+  {
+	Dout(dc::curl, "curl_easy_getinfo(" << curl << ", " << info << ", 0x" << std::hex << (size_t)param.char_ptr << std::dec << ") = " << ret);
+  }
+  else
+  {
+	switch((info & CURLINFO_TYPEMASK))
+	{
+	  case CURLINFO_STRING:
+		Dout(dc::curl, "curl_easy_getinfo(" << curl << ", " << info << ", (char*){ \"" << (ret == CURLE_OK ? param.char_ptr : " <unchanged> ") << "\" }) = " << ret);
+		break;
+	  case CURLINFO_LONG:
+		Dout(dc::curl, "curl_easy_getinfo(" << curl << ", " << info << ", (long*){ " << (ret == CURLE_OK ? *param.long_ptr : 0L) << "L }) = " << ret);
+		break;
+	  case CURLINFO_DOUBLE:
+		Dout(dc::curl, "curl_easy_getinfo(" << curl << ", " << info << ", (double*){" << (ret == CURLE_OK ? *param.double_ptr : 0.) << "}) = " << ret);
+		break;
+	  case CURLINFO_SLIST:
+		Dout(dc::curl, "curl_easy_getinfo(" << curl << ", " << info << ", (curl_slist*){ " << (ret == CURLE_OK ? *param.curl_slist_ptr : unchanged_slist) << " }) = " << ret);
+		break;
+	}
+  }
+  return ret;
+}
+
+CURL* debug_curl_easy_init(void)
+{
+  CURL* ret;
+  ret = curl_easy_init();
+  Dout(dc::curl, "curl_easy_init() = " << (AICURL*)ret);
+  return ret;
+}
+
+CURLcode debug_curl_easy_pause(CURL* handle, int bitmask)
+{
+  CURLcode ret;
+  ret = curl_easy_pause(handle, bitmask);
+  Dout(dc::curl, "curl_easy_pause(" << (AICURL*)handle << ", 0x" << std::hex << bitmask << std::dec << ") = " << ret);
+  return ret;
+}
+
+CURLcode debug_curl_easy_perform(CURL* handle)
+{
+  CURLcode ret;
+  ret = curl_easy_perform(handle);
+  Dout(dc::curl, "curl_easy_perform(" << (AICURL*)handle << ") = " << ret);
+  return ret;
+}
+
+void debug_curl_easy_reset(CURL* handle)
+{
+  curl_easy_reset(handle);
+  Dout(dc::curl, "curl_easy_reset(" << (AICURL*)handle << ")");
+}
+
+CURLcode debug_curl_easy_setopt(CURL* handle, CURLoption option, ...)
+{
+  CURLcode ret;
+  va_list ap;
+  union param_type {
+	long along;
+	void* ptr;
+	curl_off_t offset;
+  } param;
+  va_start(ap, option);
+  param.ptr = va_arg(ap, void*);
+  va_end(ap);
+  ret = curl_easy_setopt(handle, option, param.ptr);
+  switch ((option / 10000) * 10000)
+  {
+	case CURLOPTTYPE_LONG:
+	  Dout(dc::curl, "curl_easy_setopt(" << (AICURL*)handle << ", " << option << ", " << param.along << "L) = " << ret);
+	  break;
+	case CURLOPTTYPE_OBJECTPOINT:
+	  Dout(dc::curl, "curl_easy_setopt(" << (AICURL*)handle << ", " << option << ", (object*)0x" << std::hex << (size_t)param.ptr << std::dec << ") = " << ret);
+	  break;
+	case CURLOPTTYPE_FUNCTIONPOINT:
+	  Dout(dc::curl, "curl_easy_setopt(" << (AICURL*)handle << ", " << option << ", (function*)0x" << std::hex << (size_t)param.ptr << std::dec << ") = " << ret);
+	  break;
+	case CURLOPTTYPE_OFF_T:
+	  Dout(dc::curl, "curl_easy_setopt(" << (AICURL*)handle << ", " << option << ", (curl_off_t)" << param.offset << ") = " << ret);
+	  break;
+  }
+  return ret;
+}
+
+char const* debug_curl_easy_strerror(CURLcode errornum)
+{
+  char const* ret;
+  ret = curl_easy_strerror(errornum);
+  Dout(dc::curl, "curl_easy_strerror(" << errornum << ") = \"" << ret << '"');
+  return ret;
+}
+
+char* debug_curl_easy_unescape(CURL* curl, char* url, int inlength, int* outlength)
+{
+  char* ret;
+  ret = curl_easy_unescape(curl, url, inlength, outlength);
+  Dout(dc::curl, "curl_easy_unescape(" << curl << ", \"" << url << "\", " << inlength << ", " << ((ret && outlength) ? *outlength : 1) << ") = \"" << ret << '"');
+  return ret;
+}
+
+void debug_curl_free(char* ptr)
+{
+  curl_free(ptr);
+  Dout(dc::curl, "curl_free(0x" << std::hex << (size_t)ptr << std::dec << ")");
+}
+
+time_t debug_curl_getdate(char const* datestring, time_t* now)
+{
+  time_t ret;
+  ret = curl_getdate(datestring, now);
+  Dout(dc::curl, "curl_getdate(\"" << datestring << "\", " << (now == NULL ? "NULL" : "<erroneous non-NULL value for 'now'>") << ") = " << ret);
+  return ret;
+}
+
+void debug_curl_global_cleanup(void)
+{
+  curl_global_cleanup();
+  Dout(dc::curl, "curl_global_cleanup()");
+}
+
+CURLcode debug_curl_global_init(long flags)
+{
+  CURLcode ret;
+  ret = curl_global_init(flags);
+  Dout(dc::curl, "curl_global_init(0x" << std::hex << flags << std::dec << ") = " << ret);
+  return ret;
+}
+
+CURLMcode debug_curl_multi_add_handle(CURLM* multi_handle, CURL* easy_handle)
+{
+  CURLMcode ret;
+  ret = curl_multi_add_handle(multi_handle, easy_handle);
+  Dout(dc::curl, "curl_multi_add_handle(" << (AICURLM*)multi_handle << ", " << (AICURL*)easy_handle << ") = " << ret);
+  return ret;
+}
+
+CURLMcode debug_curl_multi_assign(CURLM* multi_handle, curl_socket_t sockfd, void* sockptr)
+{
+  CURLMcode ret;
+  ret = curl_multi_assign(multi_handle, sockfd, sockptr);
+  Dout(dc::curl, "curl_multi_assign(" << (AICURLM*)multi_handle << ", " << sockfd << ", " << sockptr << ") = " << ret);
+  return ret;
+}
+
+CURLMcode debug_curl_multi_cleanup(CURLM* multi_handle)
+{
+  CURLMcode ret;
+  ret = curl_multi_cleanup(multi_handle);
+  Dout(dc::curl, "curl_multi_cleanup(" << (AICURLM*)multi_handle << ") = " << ret);
+  return ret;
+}
+
+CURLMsg* debug_curl_multi_info_read(CURLM* multi_handle, int* msgs_in_queue)
+{
+  CURLMsg* ret;
+  ret = curl_multi_info_read(multi_handle, msgs_in_queue);
+  Dout(dc::curl, "curl_multi_info_read(" << (AICURLM*)multi_handle << ", {" << *msgs_in_queue << "}) = " << ret);
+  return ret;
+}
+
+CURLM* debug_curl_multi_init(void)
+{
+  CURLM* ret;
+  ret = curl_multi_init();
+  Dout(dc::curl, "curl_multi_init() = " << (AICURLM*)ret);
+  return ret;
+}
+
+CURLMcode debug_curl_multi_remove_handle(CURLM* multi_handle, CURL* easy_handle)
+{
+  CURLMcode ret;
+  ret = curl_multi_remove_handle(multi_handle, easy_handle);
+  Dout(dc::curl, "curl_multi_remove_handle(" << (AICURLM*)multi_handle << ", " << (AICURL*)easy_handle << ") = " << ret);
+  return ret;
+}
+
+CURLMcode debug_curl_multi_setopt(CURLM* multi_handle, CURLMoption option, ...)
+{
+  CURLMcode ret;
+  va_list ap;
+  union param_type {
+	long along;
+	void* ptr;
+	curl_off_t offset;
+  } param;
+  va_start(ap, option);
+  param.ptr = va_arg(ap, void*);
+  va_end(ap);
+  ret = curl_multi_setopt(multi_handle, option, param.ptr);
+  switch ((option / 10000) * 10000)
+  {
+	case CURLOPTTYPE_LONG:
+	  Dout(dc::curl, "curl_easy_setopt(" << (AICURLM*)multi_handle << ", " << option << ", " << param.along << "L) = " << ret);
+	  break;
+	case CURLOPTTYPE_OBJECTPOINT:
+	  Dout(dc::curl, "curl_easy_setopt(" << (AICURLM*)multi_handle << ", " << option << ", (object*)0x" << std::hex << (size_t)param.ptr << std::dec << ") = " << ret);
+	  break;
+	case CURLOPTTYPE_FUNCTIONPOINT:
+	  Dout(dc::curl, "curl_easy_setopt(" << (AICURLM*)multi_handle << ", " << option << ", (function*)0x" << std::hex << (size_t)param.ptr << std::dec << ") = " << ret);
+	  break;
+	case CURLOPTTYPE_OFF_T:
+	  Dout(dc::curl, "curl_easy_setopt(" << (AICURLM*)multi_handle << ", " << option << ", (curl_off_t)" << param.offset << ") = " << ret);
+	  break;
+  }
+  return ret;
+}
+
+CURLMcode debug_curl_multi_socket_action(CURLM* multi_handle, curl_socket_t sockfd, int ev_bitmask, int* running_handles)
+{
+  CURLMcode ret;
+  ret = curl_multi_socket_action(multi_handle, sockfd, ev_bitmask, running_handles);
+  Dout(dc::curl, "curl_multi_socket_action(" << (AICURLM*)multi_handle << ", " << sockfd <<
+	  ", " << EvBitmask(ev_bitmask) << ", {" << (ret == CURLM_OK ? *running_handles : 0) << "}) = " << ret);
+  return ret;
+}
+
+char const* debug_curl_multi_strerror(CURLMcode errornum)
+{
+  char const* ret;
+  ret = curl_multi_strerror(errornum);
+  Dout(dc::curl, "curl_multi_strerror(" << errornum << ") = \"" << ret << '"');
+  return ret;
+}
+
+struct curl_slist* debug_curl_slist_append(struct curl_slist* list, char const* string)
+{
+  struct curl_slist* ret;
+  ret = curl_slist_append(list, string);
+  Dout(dc::curl, "curl_slist_append((curl_slist)@0x" << std::hex << (size_t)list << std::dec << ", \"" << string << "\") = " << *ret);
+  return ret;
+}
+
+void debug_curl_slist_free_all(struct curl_slist* list)
+{
+  curl_slist_free_all(list);
+  Dout(dc::curl, "curl_slist_free_all((curl_slist)@0x" << std::hex << (size_t)list << std::dec << ")");
+}
+
+char* debug_curl_unescape(char const* url, int length)
+{
+  char* ret;
+  ret = curl_unescape(url, length);
+  Dout(dc::curl, "curl_unescape(\"" << url << "\", " << length << ") = \"" << ret << '"');
+  return ret;
+}
+
+char* debug_curl_version(void)
+{
+  char* ret;
+  ret = curl_version();
+  Dout(dc::curl, "curl_version() = \"" << ret << '"');
+  return ret;
+}
+
+}
+
+#else
+int debug_libcurl_dummy;	// I thought some OS didn't like empty source files.
+#endif
diff --git a/indra/cwdebug/debug_libcurl.h b/indra/cwdebug/debug_libcurl.h
new file mode 100644
index 000000000..bcf15e0f0
--- /dev/null
+++ b/indra/cwdebug/debug_libcurl.h
@@ -0,0 +1,83 @@
+#ifndef DEBUG_LIBCURL
+#define DEBUG_LIBCURL
+
+#ifdef DEBUG_CURLIO
+
+#include <curl/curl.h>
+#include "debug.h"
+
+extern "C" {
+
+extern CWD_API void debug_curl_easy_cleanup(CURL* handle);
+extern CWD_API CURL* debug_curl_easy_duphandle(CURL* handle);
+extern CWD_API char* debug_curl_easy_escape(CURL* curl, char* url, int length);
+extern CWD_API CURLcode debug_curl_easy_getinfo(CURL* curl, CURLINFO info, ...);
+extern CWD_API CURL* debug_curl_easy_init(void);
+extern CWD_API CURLcode debug_curl_easy_pause(CURL* handle, int bitmask);
+extern CWD_API CURLcode debug_curl_easy_perform(CURL* handle);
+extern CWD_API void debug_curl_easy_reset(CURL* handle);
+extern CWD_API CURLcode debug_curl_easy_setopt(CURL* handle, CURLoption option, ...);
+extern CWD_API char const* debug_curl_easy_strerror(CURLcode errornum);
+extern CWD_API char* debug_curl_easy_unescape(CURL* curl, char* url, int inlength, int* outlength); 
+extern CWD_API void debug_curl_free(char* ptr);
+extern CWD_API time_t debug_curl_getdate(char const* datestring, time_t* now);
+extern CWD_API void debug_curl_global_cleanup(void);
+extern CWD_API CURLcode debug_curl_global_init(long flags);
+extern CWD_API CURLMcode debug_curl_multi_add_handle(CURLM* multi_handle, CURL* easy_handle); 
+extern CWD_API CURLMcode debug_curl_multi_assign(CURLM* multi_handle, curl_socket_t sockfd, void* sockptr);
+extern CWD_API CURLMcode debug_curl_multi_cleanup(CURLM* multi_handle);
+extern CWD_API CURLMsg* debug_curl_multi_info_read(CURLM* multi_handle, int* msgs_in_queue);
+extern CWD_API CURLM* debug_curl_multi_init(void);
+extern CWD_API CURLMcode debug_curl_multi_remove_handle(CURLM* multi_handle, CURL* easy_handle);
+extern CWD_API CURLMcode debug_curl_multi_setopt(CURLM* multi_handle, CURLMoption option, ...);
+extern CWD_API CURLMcode debug_curl_multi_socket_action(CURLM* multi_handle, curl_socket_t sockfd, int ev_bitmask, int* running_handles);
+extern CWD_API char const* debug_curl_multi_strerror(CURLMcode errornum);
+extern CWD_API struct curl_slist* debug_curl_slist_append(struct curl_slist* list, char const* string);
+extern CWD_API void debug_curl_slist_free_all(struct curl_slist* list);
+extern CWD_API char* debug_curl_unescape(char const* url, int length);
+extern CWD_API char* debug_curl_version(void);
+
+}
+
+#ifndef COMPILING_DEBUG_LIBCURL_CC
+
+#ifdef curl_easy_setopt
+#undef curl_easy_setopt
+#undef curl_easy_getinfo
+#undef curl_multi_setopt
+#endif
+
+#define curl_easy_cleanup(handle) debug_curl_easy_cleanup(handle)
+#define curl_easy_duphandle(handle) debug_curl_easy_duphandle(handle)
+#define curl_easy_escape(curl, url, length) debug_curl_easy_escape(curl, url, length)
+#define curl_easy_getinfo(curl, info, param) debug_curl_easy_getinfo(curl, info, param)
+#define curl_easy_init() debug_curl_easy_init()
+#define curl_easy_pause(handle, bitmask) debug_curl_easy_pause(handle, bitmask)
+#define curl_easy_perform(handle) debug_curl_easy_perform(handle)
+#define curl_easy_reset(handle) debug_curl_easy_reset(handle)
+#define curl_easy_setopt(handle, option, param) debug_curl_easy_setopt(handle, option, param)
+#define curl_easy_strerror(errornum) debug_curl_easy_strerror(errornum)
+#define curl_easy_unescape(curl, url, inlength, outlength)  debug_curl_easy_unescape(curl, url, inlength, outlength) 
+#define curl_free(ptr) debug_curl_free(ptr)
+#define curl_getdate(datestring, now) debug_curl_getdate(datestring, now)
+#define curl_global_cleanup() debug_curl_global_cleanup()
+#define curl_global_init(flags) debug_curl_global_init(flags)
+#define curl_multi_add_handle(multi_handle, easy_handle)  debug_curl_multi_add_handle(multi_handle, easy_handle) 
+#define curl_multi_assign(multi_handle, sockfd, sockptr) debug_curl_multi_assign(multi_handle, sockfd, sockptr)
+#define curl_multi_cleanup(multi_handle) debug_curl_multi_cleanup(multi_handle)
+#define curl_multi_info_read(multi_handle, msgs_in_queue) debug_curl_multi_info_read(multi_handle, msgs_in_queue)
+#define curl_multi_init() debug_curl_multi_init()
+#define curl_multi_remove_handle(multi_handle, easy_handle) debug_curl_multi_remove_handle(multi_handle, easy_handle)
+#define curl_multi_setopt(multi_handle, option, param) debug_curl_multi_setopt(multi_handle, option, param)
+#define curl_multi_socket_action(multi_handle, sockfd, ev_bitmask, running_handles) debug_curl_multi_socket_action(multi_handle, sockfd, ev_bitmask, running_handles)
+#define curl_multi_strerror(errornum) debug_curl_multi_strerror(errornum)
+#define curl_slist_append(list, string) debug_curl_slist_append(list, string)
+#define curl_slist_free_all(list) debug_curl_slist_free_all(list)
+#define curl_unescape(url, length) debug_curl_unescape(url, length)
+#define curl_version() debug_curl_version()
+
+#endif // !COMPILING_DEBUG_LIBCURL_CC
+
+#endif // DEBUG_CURLIO
+
+#endif // DEBUG_LIBCURL
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 29feeebc4..4be690734 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -250,6 +250,7 @@ set(llcommon_HEADER_FILES
 set_source_files_properties(${llcommon_HEADER_FILES}
                             PROPERTIES HEADER_FILE_ONLY TRUE)
 
+list(APPEND llcommon_SOURCE_FILES ${cwdebug_SOURCE_FILES})
 list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})
 
 add_library (llcommon SHARED ${llcommon_SOURCE_FILES})
@@ -262,15 +263,9 @@ target_link_libraries(
     ${ZLIB_LIBRARIES}
     ${WINDOWS_LIBRARIES}
     ${BOOST_REGEX_LIBRARY}
-    ${CWDEBUG_LIBRARIES}
     ${CORESERVICES_LIBRARY}
     )
 
-if (LINUX)
-    # When linking with llcommon later, we do not want to link with cwdebug.a again.
-    set_property(TARGET llcommon PROPERTY LINK_INTERFACE_LIBRARIES "-lapr-1 -laprutil-1 -lz")
-endif (LINUX)
-
 if (DARWIN)
     # Don't embed a full path in the library's install name
     set_target_properties(
diff --git a/indra/llmessage/aicurl.h b/indra/llmessage/aicurl.h
index 90803e050..4752d1b45 100644
--- a/indra/llmessage/aicurl.h
+++ b/indra/llmessage/aicurl.h
@@ -37,7 +37,8 @@
 #include <stdexcept>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/utility.hpp>
-#include <curl/curl.h>		// CURL, CURLM, CURLMcode, CURLoption, curl_*_callback
+#include <curl/curl.h>		// Needed for files that include this header (also for aicurlprivate.h).
+#include "debug_libcurl.h"
 
 // Make sure we don't use this option: it is not thread-safe.
 #undef CURLOPT_DNS_USE_GLOBAL_CACHE
diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp
index 355eebb77..7320ccb0e 100644
--- a/indra/llmessage/llhttpclient.cpp
+++ b/indra/llmessage/llhttpclient.cpp
@@ -38,7 +38,6 @@
 #include "lluri.h"
 
 #include "message.h"
-#include <curl/curl.h>
 
 
 const F32 HTTP_REQUEST_EXPIRY_SECS = 60.0f;
diff --git a/indra/llmessage/llproxy.cpp b/indra/llmessage/llproxy.cpp
index d46c70f04..448b6606b 100644
--- a/indra/llmessage/llproxy.cpp
+++ b/indra/llmessage/llproxy.cpp
@@ -29,7 +29,6 @@
 #include "llproxy.h"
 
 #include <string>
-#include <curl/curl.h>
 
 #include "llapr.h"
 #include "llcurl.h"
diff --git a/indra/newview/hipporestrequest.cpp b/indra/newview/hipporestrequest.cpp
index 17875f27e..4cd0cc34c 100644
--- a/indra/newview/hipporestrequest.cpp
+++ b/indra/newview/hipporestrequest.cpp
@@ -6,7 +6,6 @@
 #ifndef CURL_STATICLIB
 #define CURL_STATICLIB 1
 #endif
-#include <curl/curl.h>
 
 #include <stdtypes.h>
 #include <llbufferstream.h>
@@ -15,6 +14,8 @@
 #include <llurlrequest.h>
 #include <llxmltree.h>
 
+#include <curl/curl.h>
+#include "debug_libcurl.h"
 
 // ********************************************************************
  
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 96b6166e4..e2c395737 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -63,7 +63,6 @@
 #include "llviewerjoystick.h"
 #include "llfloaterjoystick.h"
 #include "llares.h" 
-#include "llcurl.h"
 #include "llfloatersnapshot.h"
 #include "lltexturestats.h"
 #include "llviewerwindow.h"
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 045b722a4..3483f2577 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -49,7 +49,6 @@
 #include "llcheckboxctrl.h"
 #include "llcommandhandler.h"		// for secondlife:///app/login/
 #include "llcombobox.h"
-#include "llcurl.h"
 #include "llviewercontrol.h"
 #include "llfloaterabout.h"
 #include "llfloatertest.h"
diff --git a/indra/newview/lluserauth.cpp b/indra/newview/lluserauth.cpp
index f2f928850..29930a96e 100644
--- a/indra/newview/lluserauth.cpp
+++ b/indra/newview/lluserauth.cpp
@@ -47,7 +47,6 @@
 #include "stringize.h"
 
 // NOTE: MUST include these after otherincludes since queue gets redefined!?!!
-#include <curl/curl.h>
 #include <xmlrpc-epi/xmlrpc.h>
 
 
diff --git a/indra/newview/llviewerassetstorage.h b/indra/newview/llviewerassetstorage.h
index 15d9a748e..7b85f55d7 100644
--- a/indra/newview/llviewerassetstorage.h
+++ b/indra/newview/llviewerassetstorage.h
@@ -34,7 +34,6 @@
 #define LLVIEWERASSETSTORAGE_H
 
 #include "llassetstorage.h"
-//#include "curl/curl.h"
 
 class LLVFile;
 
diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp
index a87487f55..284da40cd 100644
--- a/indra/newview/llwlparammanager.cpp
+++ b/indra/newview/llwlparammanager.cpp
@@ -77,7 +77,6 @@
 #include "llviewerregion.h"
 #include "llassetuploadresponders.h"
 
-#include "curl/curl.h"
 #include "llstreamtools.h"
 
 // [RLVa:KB] - Checked: 2011-09-04 (RLVa-1.4.1a) | Added: RLVa-1.4.1a

From 65a1aae629949dcb0b91ab6298fc34c60f09d8ac Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Sun, 5 Aug 2012 18:55:27 +0200
Subject: [PATCH 142/199] Bug fix

curl_easy_setopt expects a long int. Before this patch,
uninitialized memory was read, leading to extreme long
time out, instead of the intended disabled time out (so,
in practise this patch has little effect).

This bug was discovered with the previous commit.
---
 indra/newview/llxmlrpctransaction.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp
index b160e2c33..9d729b8da 100644
--- a/indra/newview/llxmlrpctransaction.cpp
+++ b/indra/newview/llxmlrpctransaction.cpp
@@ -250,7 +250,7 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip)
 
 		/* Setting the DNS cache timeout to -1 disables it completely.
 		   This might help with bug #503 */
-		curlEasyRequest_w->setopt(CURLOPT_DNS_CACHE_TIMEOUT, -1);
+		curlEasyRequest_w->setopt(CURLOPT_DNS_CACHE_TIMEOUT, -1L);
 
 		curlEasyRequest_w->addHeader("Content-Type: text/xml");
 

From 0846f8a96325646e75eea9ce7fb73e8f1bfc6439 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 5 Aug 2012 20:40:02 -0400
Subject: [PATCH 143/199] Fixeds and ToDones

-Color Fixies-
Fixed Gemini skin not looking as it originally did.
We now use DefaultListText to color all otherwise uncolored text in scroll list cells.
All of our dark skins have been updated to use white here, as dark skins are intended to have white text...
This includes the Dark we ship with.

LLFloaterActiveSpeakers no longer uses hard coded font colors, it uses SpeakersInactive, DefaultListText, and SpeakersGhost.

LLFloaterAvatarList no longer uses hard coded font colors, it uses DefaultListText, RadarTextChatRange, RadarTextShoutRange, and RadarTextDrawDist, in place of previously hard coded font colors
Since the tooltip defines color meaning, these new colors should only be skinned to change shade.

DefaultListText defaults to black; SpeaksInactive, gray(grey4); SpeakersGhost, Red; RadarTextChatRange, Red; RadarTextShoutRange, Yellow(yellow1); RadarTextDrawDist, Green(green2).


-Translation update and fixies-
Partial credit to viewer-development, thanks for hanging onto old strings!  Also, updated to look more like v-d in translated areas.
Punctuation strings can be used quite a lot.  Brought them all in, just in case.

AscentPrefs*:
Drag and Drop points now use CurrentlySetTo, CurrentlyNotSet, AnItemNotOnThisAccount, and NotLoggedIn. (applies, as well, to FloaterAO)
Power User message is now built from PowerUser1, PowerUser2, Unlocked:, PowerUser3, RightClick, PowerUser4 and PowerUser5; this should give translators enough space to explain any tough to translate, and make the message easier to alter in the future, if necessary.

LLCompileQueue:
Now uses translation strings from upstream
Starting, Done, Resetting, Running, and NotRunning in its xml.
CompileQueueTitle, CompileQueueStart, CompileQueueDownloadedCompiling, CompileQueueScriptNotFound, CompileQueueProblemDownloading, CompileQueueInsufficientPermDownload, CompileQueueInsufficientPermFor, CompileQueueUnknownFailure, ResetQueueTitle, ResetQueueStart, NotRunQueueTitle, and NotRunQueueStart from strings.

LLFloaterAvatarList(floater_radar) now uses has_entered, has_left, the_sim, draw_distance, shout_range, and chat_range in its xml for translatable alerts.

LLFloaterLand(floater_about_land) now uses minutes, 1_minute, 1_second, seconds, and remaining from its xml.
LLFloaterLand, LLFolderView, LLPanelDirBrowser now make use of InventoryNoMatchingItems, NoneFound, and Searching in their searches.
LLFolderView was brought closer to v-d in translation.

LLGroupNotify now uses GroupNotifyGroupNotice, GroupNotifySentBy, GroupNotifyAttached, next (also now used by LLNotify), ok, GroupNotifyGroupNotices, GroupNotifyViewPastNotices, GroupNotifyOpenAttachment, and GroupNotifySaveAttachment.

LLInventoryFilter synced with V-D for translation:
Now uses Animations, Calling Cards, Clothing, Gestures, Landmarks, Notecards, Objects, Scripts, Sounds, Textures, Snapshots, No Filters, Since Logoff, and Worn.

LLManipRotate now uses Direction_Forward, Direction_Left, Direction_Right, Direction_Back, Direction_North, Direction_South, Direction_West, Direction_East, Direction_Up, and Direction_Down, like upstream v-d.

LLPanelAvatar(panel_avatar) now uses None string in its xml for when there are no groups, also removed cruft. Though the None has not been showing up for quite some time, anyway...

LLPanelObjectInventory now uses Buy, LoadingContents and NoContents,
however the last two strings did not seem to show up anyway...
thanks to Latif Khalifa, Jean Horten, theGenius Indigo and Cubbi Bearcat for confirming this happens across many different versions and on both Windows and linux(32 and 64).

LLPreviewScript now uses CompileSuccessful, SaveComplete, ObjectOutOfRange, and CompileSuccessfulSaving.

LLScrollingPanelParam now translates Less and More.
Avatar Shape Information strings now used for customize appearance panels.

LLTextureCtrl now uses multiple_textures.

LLToolpie has been updated to use v-d include order and now uses UnmuteAvatar, MuteAvatar, UnmuteObject, and MuteObject2 strings.
LLVOAvatarSelf now uses BodyParts* strings for translation of toolpie entries pertaining to bodyparts.

LLViewerMenuFile now uses UnknownFileExtension, and UploadingCosts.

LLViewerMessage now uses Cancel(also used by LLViewerDisplay), AcquiredItems, Saved_message, IM_autoresponse_sent_item, IM_autoresponded_to, IM_announce_incoming, InvOfferDecline, InvOfferGaveYou, InvOfferOwnedByUnknownUser, InvOfferAnObjectNamed, InvOfferOwnedBy, InvOfferOwnedByUnknownGroup, and InvOfferOwnedByGroup.


-AvatarRadar Update-
AvatarRadar enhanced with code from both Cool VL Viewer and some avian corpse.
e_radar_alert_type has been reworked to allow bitwise usage in the future.

Cool stuff:
gSavedSettings for radar are now CachedControls,
entering boolean is now checked before going into the switchcase,
Style changes, yay C++ style.

Avian Flu:
Distance for shout range corrected to be 96.
handleKeyHere: If the user hits enter with an avatar on the radar selected, focus camera on selected avatar; ctrl-enter, teleport to selected avatar.

Otherwise:
Tiny spelling fixies, and a suggestive comment.
---
 indra/llui/llscrolllistctrl.cpp               |   5 +
 indra/llui/llscrolllistctrl.h                 |   1 +
 indra/newview/ascentprefschat.cpp             |  11 +-
 indra/newview/ascentprefssys.cpp              |  13 +-
 indra/newview/floaterao.cpp                   |  11 +-
 indra/newview/llcompilequeue.cpp              |  51 +-
 indra/newview/llfloateractivespeakers.cpp     |  17 +-
 indra/newview/llfloateravatarlist.cpp         | 252 +++---
 indra/newview/llfloateravatarlist.h           |   2 +
 indra/newview/llfloaterland.cpp               |  30 +-
 indra/newview/llfolderview.cpp                |   9 +-
 indra/newview/llgroupnotify.cpp               |  21 +-
 indra/newview/llinventoryfilter.cpp           |  76 +-
 indra/newview/llmaniprotate.cpp               |  42 +-
 indra/newview/llnotify.cpp                    |   2 +-
 indra/newview/llpanelavatar.cpp               |   7 +-
 indra/newview/llpaneldirbrowser.cpp           |   4 +-
 indra/newview/llpanelobjectinventory.cpp      |  31 +-
 indra/newview/llpreviewscript.cpp             |  19 +-
 indra/newview/llscrollingpanelparam.cpp       |   5 +-
 indra/newview/lltexturectrl.cpp               |   2 +-
 indra/newview/lltoolpie.cpp                   |  13 +-
 indra/newview/llviewerdisplay.cpp             |   4 +-
 indra/newview/llviewermenufile.cpp            |  14 +-
 indra/newview/llviewermessage.cpp             |  48 +-
 indra/newview/llvoavatarself.cpp              |  27 +-
 indra/newview/skins/dark/colors.xml           |   1 +
 indra/newview/skins/darkgred/colors.xml       |   1 +
 indra/newview/skins/darkorange/colors.xml     |   1 +
 indra/newview/skins/default/colors_base.xml   |   8 +
 .../default/xui/en-us/floater_about_land.xml  |   5 +
 .../skins/default/xui/en-us/floater_radar.xml |  10 +-
 .../xui/en-us/floater_script_queue.xml        |   5 +
 .../skins/default/xui/en-us/panel_avatar.xml  |   1 +
 .../skins/default/xui/en-us/strings.xml       | 723 +++++++++++++++++-
 indra/newview/skins/gemini/colors.xml         |  24 +-
 36 files changed, 1175 insertions(+), 321 deletions(-)

diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp
index e4ad47118..ea168a35c 100644
--- a/indra/llui/llscrolllistctrl.cpp
+++ b/indra/llui/llscrolllistctrl.cpp
@@ -666,6 +666,7 @@ LLScrollListCtrl::LLScrollListCtrl(const std::string& name, const LLRect& rect,
 	mFgUnselectedColor( LLUI::sColorsGroup->getColor("ScrollUnselectedColor") ),
 	mFgDisabledColor( LLUI::sColorsGroup->getColor("ScrollDisabledColor") ),
 	mHighlightedColor( LLUI::sColorsGroup->getColor("ScrollHighlightedColor") ),
+	mDefaultListTextColor( LLUI::sColorsGroup->getColor("DefaultListText") ),
 	mBorderThickness( 2 ),
 	mOnDoubleClickCallback( NULL ),
 	mOnMaximumSelectCallback( NULL ),
@@ -3543,6 +3544,10 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
 			{
 				cell->setColor(color);
 			}
+			else
+			{
+				cell->setColor(mDefaultListTextColor);
+			}
 			new_item->setColumn(index, cell);
 			if (columnp->mHeader && !value.asString().empty())
 			{
diff --git a/indra/llui/llscrolllistctrl.h b/indra/llui/llscrolllistctrl.h
index ada8032f1..4060c1466 100644
--- a/indra/llui/llscrolllistctrl.h
+++ b/indra/llui/llscrolllistctrl.h
@@ -697,6 +697,7 @@ private:
 	LLColor4		mFgUnselectedColor;
 	LLColor4		mFgDisabledColor;
 	LLColor4		mHighlightedColor;
+	LLColor4		mDefaultListTextColor;
 
 	S32				mBorderThickness;
 	void			(*mOnDoubleClickCallback)(void* userdata);
diff --git a/indra/newview/ascentprefschat.cpp b/indra/newview/ascentprefschat.cpp
index 77bc6611e..5960024bd 100644
--- a/indra/newview/ascentprefschat.cpp
+++ b/indra/newview/ascentprefschat.cpp
@@ -42,6 +42,7 @@
 #include "llviewercontrol.h"
 #include "NACLantispam.h"
 #include "lgghunspell_wrapper.h"
+#include "lltrans.h"
 
 #include "llstartup.h"
 
@@ -85,11 +86,11 @@ LLPrefsAscentChat::LLPrefsAscentChat()
 		LLUUID itemid = (LLUUID)gSavedPerAccountSettings.getString("AscentInstantMessageResponseItemData");
 		LLViewerInventoryItem* item = gInventory.getItem(itemid);
 
-		if		(item)				childSetValue("im_give_disp_rect_txt","Currently set to: "+item->getName());
-		else if (itemid.isNull())	childSetValue("im_give_disp_rect_txt","Currently not set");
-		else 						childSetValue("im_give_disp_rect_txt","Currently set to an item not on this account");
+		if		(item)				childSetValue("im_give_disp_rect_txt", LLTrans::getString("CurrentlySetTo") + LLTrans::getString(":") + " " +item->getName());
+		else if (itemid.isNull())	childSetValue("im_give_disp_rect_txt", LLTrans::getString("CurrentlyNotSet"));
+		else 						childSetValue("im_give_disp_rect_txt", LLTrans::getString("CurrentlySetTo") + " " + LLTrans::getString("AnItemNotOnThisAccount"));
 	}
-	else							childSetValue("im_give_disp_rect_txt","Not logged in");
+	else							childSetValue("im_give_disp_rect_txt", LLTrans::getString("NotLoggedIn"));
 
     childSetCommitCallback("im_response", onCommitAutoResponse, this);
 
@@ -240,7 +241,7 @@ void LLPrefsAscentChat::onCommitAutoResponse(LLUICtrl* ctrl, void* user_data)
 void LLPrefsAscentChat::SinguIMResponseItemDrop(LLViewerInventoryItem* item)
 {
 	gSavedPerAccountSettings.setString("AscentInstantMessageResponseItemData", item->getUUID().asString());
-	sInst->childSetValue("im_give_disp_rect_txt","Currently set to: "+item->getName());
+	sInst->childSetValue("im_give_disp_rect_txt", LLTrans::getString("CurrentlySetTo") + LLTrans::getString(":") + " " +item->getName());
 }
 
 //static
diff --git a/indra/newview/ascentprefssys.cpp b/indra/newview/ascentprefssys.cpp
index c9f883c05..684a2fb0a 100644
--- a/indra/newview/ascentprefssys.cpp
+++ b/indra/newview/ascentprefssys.cpp
@@ -45,6 +45,7 @@
 #include "lluictrlfactory.h"
 #include "llviewercontrol.h"
 #include "llstartup.h"
+#include "lltrans.h"
 
 LLDropTarget* mBuildDropTarget;
 LLPrefsAscentSys* LLPrefsAscentSys::sInst;
@@ -102,11 +103,11 @@ LLPrefsAscentSys::LLPrefsAscentSys()
 		LLUUID itemid = (LLUUID)gSavedPerAccountSettings.getString("EmeraldBuildPrefs_Item");
 		LLViewerInventoryItem* item = gInventory.getItem(itemid);
 
-		if		(item)				childSetValue("build_item_add_disp_rect_txt", "Currently set to:\n"+item->getName());
-		else if (itemid.isNull())	childSetValue("build_item_add_disp_rect_txt", "Currently\nnot set");
-		else 						childSetValue("build_item_add_disp_rect_txt", "Currently set to\nan item not on this account");
+		if		(item)				childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlySetTo") + LLTrans::getString(":") + "\n" +item->getName());
+		else if (itemid.isNull())	childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlyNotSet"));
+		else 						childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlySetTo") + "\n" + LLTrans::getString("AnItemNotOnThisAccount"));
 	}
-	else							childSetValue("build_item_add_disp_rect_txt", "You are\nnot logged in");
+	else							childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("NotLoggedIn"));
 
 	refreshValues();
     refresh();
@@ -165,7 +166,7 @@ void LLPrefsAscentSys::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
             gAudiop->triggerSound(LLUUID("58a38e89-44c6-c52b-deb8-9f1ddc527319"), gAgent.getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_UI, lpos_global);
             LLChat chat;
             chat.mSourceType = CHAT_SOURCE_SYSTEM;
-            chat.mText = llformat("You are bestowed with powers beyond mortal comprehension.\nUse your newfound abilities wisely.\nUnlocked:\n- Animation Priority up to 7 - Meant for animations that should override anything and everything at all times. DO NOT USE THIS FOR GENERAL ANIMATIONS.\n- Right click > Destroy objects - Permanently deletes an object immediately, when you don't feel like waiting for the server to respond.\n- Right Click > Explode objects - Turns an object physical, temporary, and delinks it.");
+            chat.mText = LLTrans::getString("PowerUser1") + "\n" + LLTrans::getString("PowerUser2") + "\n" + LLTrans::getString("Unlocked:") + "\n" + LLTrans::getString("PowerUser3") + "\n- " + LLTrans::getString("RightClick") + " > " + LLTrans::getString("PowerUser4") + "\n- " + LLTrans::getString("RightClick") + " > " + LLTrans::getString("PowerUser5");
             LLFloaterChat::addChat(chat);
         }
     }
@@ -247,7 +248,7 @@ void LLPrefsAscentSys::onCommitTexturePicker(LLUICtrl* ctrl, void* userdata)
 void LLPrefsAscentSys::SinguBuildItemDrop(LLViewerInventoryItem* item)
 {
 	gSavedPerAccountSettings.setString("EmeraldBuildPrefs_Item", item->getUUID().asString());
-	sInst->childSetValue("build_item_add_disp_rect_txt","Currently set to:\n"+item->getName());
+	sInst->childSetValue("build_item_add_disp_rect_txt", LLTrans::getString("CurrentlySetTo") + LLTrans::getString(":") + "\n" + item->getName());
 }
 
 void LLPrefsAscentSys::refreshValues()
diff --git a/indra/newview/floaterao.cpp b/indra/newview/floaterao.cpp
index afc0fcb75..ec3fac0e5 100644
--- a/indra/newview/floaterao.cpp
+++ b/indra/newview/floaterao.cpp
@@ -22,6 +22,7 @@
 #include "chatbar_as_cmdline.h"
 //#include "llfloaterchat.h"
 #include "llfirstuse.h"
+#include "lltrans.h"
 
 #include "llinventory.h"
 #include "llinventoryfunctions.h"
@@ -330,20 +331,20 @@ BOOL LLFloaterAO::postBuild()
 		LLViewerInventoryItem* itemimport = gInventory.getItem(itemidimport);
 		if(itemimport)
 		{
-			childSetValue("ao_nc_text","Currently set to: "+itemimport->getName());
+			childSetValue("ao_nc_text", LLTrans::getString("CurrentlySetTo") + LLTrans::getString(":") + " " +itemimport->getName());
 		}
 		else if(itemidimport.isNull())
 		{
-			childSetValue("ao_nc_text","Currently not set");
+			childSetValue("ao_nc_text", LLTrans::getString("CurrentlyNotSet"));
 		}
 		else
 		{
-			childSetValue("ao_nc_text","Currently set to a item not on this account");
+			childSetValue("ao_nc_text", LLTrans::getString("CurrentlySetTo") + " " + LLTrans::getString("AnItemNotOnThisAccount"));
 		}
 	}
 	else
 	{
-		childSetValue("ao_nc_text","Not logged in");
+		childSetValue("ao_nc_text", LLTrans::getString("NotLoggedIn"));
 	}
 	childSetAction("more_btn", onClickMore, this);
 	childSetAction("less_btn", onClickLess, this);
@@ -794,7 +795,7 @@ void LLFloaterAO::setCurrentStandId(const LLUUID& id)
 void LLFloaterAO::AOItemDrop(LLViewerInventoryItem* item)
 {
 	gSavedPerAccountSettings.setString("AOConfigNotecardID", item->getUUID().asString());
-	sInstance->childSetValue("ao_nc_text","Currently set to: "+item->getName());
+	sInstance->childSetValue("ao_nc_text", LLTrans::getString("CurrentlySetTo") + LLTrans::getString(":") + " " +item->getName());
 }
 
 LLUUID LLFloaterAO::GetAnimID(const LLUUID& id)
diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp
index 97831b4b2..5cf8b7fdc 100644
--- a/indra/newview/llcompilequeue.cpp
+++ b/indra/newview/llcompilequeue.cpp
@@ -61,6 +61,7 @@
 #include "llfloaterchat.h"
 #include "llviewerstats.h"
 #include "lluictrlfactory.h"
+#include "lltrans.h"
 
 #include "llselectmgr.h"
 
@@ -68,16 +69,6 @@
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
 
-// *TODO:Translate
-const std::string COMPILE_QUEUE_TITLE("Recompilation Progress");
-const std::string COMPILE_START_STRING("recompile");
-const std::string RESET_QUEUE_TITLE("Reset Progress");
-const std::string RESET_START_STRING("reset");
-const std::string RUN_QUEUE_TITLE("Set Running Progress");
-const std::string RUN_START_STRING("set running");
-const std::string NOT_RUN_QUEUE_TITLE("Set Not Running Progress");
-const std::string NOT_RUN_START_STRING("set not running");
-
 struct LLScriptQueueData
 {
 	LLUUID mQueueID;
@@ -211,8 +202,11 @@ BOOL LLFloaterScriptQueue::start()
 		n_objects = selectHandle->getRootObjectCount();
 	}
 
-	buffer = llformat("Starting %s of %d items.", mStartString.c_str(), n_objects); // *TODO: Translate
-	
+	LLStringUtil::format_map_t args;
+	args["[START]"] = mStartString;
+	args["[COUNT]"] = llformat ("%d", mObjectIDs.count());
+	buffer = getString ("Starting", args);
+
 	LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
 	list->addCommentText(buffer);
 
@@ -250,8 +244,7 @@ BOOL LLFloaterScriptQueue::nextObject()
 		LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
 
 		mDone = TRUE;
-		std::string buffer = "Done."; // *TODO: Translate
-		list->addCommentText(buffer);
+		list->addCommentText(getString("Done"));
 		childSetEnabled("close",TRUE);
 	}
 	return successful_start;
@@ -346,7 +339,7 @@ LLFloaterCompileQueue* LLFloaterCompileQueue::create(BOOL mono)
 }
 
 LLFloaterCompileQueue::LLFloaterCompileQueue(const std::string& name, const LLRect& rect)
-: LLFloaterScriptQueue(name, rect, COMPILE_QUEUE_TITLE, COMPILE_START_STRING)
+: LLFloaterScriptQueue(name, rect, LLTrans::getString("CompileQueueTitle"), LLTrans::getString("CompileQueueStart"))
 { }
 
 LLFloaterCompileQueue::~LLFloaterCompileQueue()
@@ -454,7 +447,7 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
 			else
 			{
 				// It's now in the file, now compile it.
-				buffer = std::string("Downloaded, now compiling: ") + data->mScriptName; // *TODO: Translate
+				buffer = LLTrans::getString("CompileQueueDownloadedCompiling") + (": ") + data->mScriptName;
 
 				// Write script to local file for compilation.
 				LLFILE *fp = LLFile::fopen(filename, "wb");	 /*Flawfinder: ignore*/
@@ -493,19 +486,21 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
 
 		if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status )
 		{
-			LLChat chat(std::string("Script not found on server.")); // *TODO: Translate
+			LLChat chat(LLTrans::getString("CompileQueueScriptNotFound"));
 			LLFloaterChat::addChat(chat);
-			buffer = std::string("Problem downloading: ") + data->mScriptName; // *TODO: Translate
+
+			buffer = LLTrans::getString("CompileQueueProblemDownloading") + LLTrans::getString(":") + " " + data->mScriptName;
 		}
 		else if (LL_ERR_INSUFFICIENT_PERMISSIONS == status)
 		{
-			LLChat chat(std::string("Insufficient permissions to download a script.")); // *TODO: Translate
+			LLChat chat(LLTrans::getString("CompileQueueInsufficientPermDownload"));
 			LLFloaterChat::addChat(chat);
-			buffer = std::string("Insufficient permissions for: ") + data->mScriptName; // *TODO: Translate
+
+			buffer = LLTrans::getString("CompileQueueInsufficientPermFor") + LLTrans::getString(":") + " " + data->mScriptName;
 		}
 		else
 		{
-			buffer = std::string("Unknown failure to download ") + data->mScriptName; // *TODO: Translate
+			buffer = LLTrans::getString("CompileQueueUnknownFailure") + (" ") + data->mScriptName;
 		}
 
 		llwarns << "Problem downloading script asset." << llendl;
@@ -671,7 +666,7 @@ LLFloaterResetQueue* LLFloaterResetQueue::create()
 }
 
 LLFloaterResetQueue::LLFloaterResetQueue(const std::string& name, const LLRect& rect)
-: LLFloaterScriptQueue(name, rect, RESET_QUEUE_TITLE, RESET_START_STRING)
+: LLFloaterScriptQueue(name, rect, LLTrans::getString("ResetQueueTitle"), LLTrans::getString("ResetQueueStart"))
 { }
 
 LLFloaterResetQueue::~LLFloaterResetQueue()
@@ -698,7 +693,7 @@ void LLFloaterResetQueue::handleInventory(LLViewerObject* viewer_obj,
 				LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
 				LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
 				std::string buffer;
-				buffer = std::string("Resetting: ") + item->getName(); // *TODO: Translate
+				buffer = getString("Resetting") + LLTrans::getString(":") + " " + item->getName();
 				list->addCommentText(buffer);
 				LLMessageSystem* msg = gMessageSystem;
 				msg->newMessageFast(_PREHASH_ScriptReset);
@@ -733,7 +728,7 @@ LLFloaterRunQueue* LLFloaterRunQueue::create()
 }
 
 LLFloaterRunQueue::LLFloaterRunQueue(const std::string& name, const LLRect& rect)
-: LLFloaterScriptQueue(name, rect, RUN_QUEUE_TITLE, RUN_START_STRING)
+: LLFloaterScriptQueue(name, rect, LLTrans::getString("RunQueueTitle"), LLTrans::getString("RunQueueStart"))
 { }
 
 LLFloaterRunQueue::~LLFloaterRunQueue()
@@ -741,7 +736,7 @@ LLFloaterRunQueue::~LLFloaterRunQueue()
 }
 
 void LLFloaterRunQueue::handleInventory(LLViewerObject* viewer_obj,
-										   LLInventoryObject::object_list_t* inv)
+										  LLInventoryObject::object_list_t* inv)
 {
 	// find all of the lsl, leaving off duplicates. We'll remove
 	// all matching asset uuids on compilation success.
@@ -760,7 +755,7 @@ void LLFloaterRunQueue::handleInventory(LLViewerObject* viewer_obj,
 				LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
 				LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
 				std::string buffer;
-				buffer = std::string("Running: ") + item->getName(); // *TODO: Translate
+				buffer = getString("Running") + LLTrans::getString(":") + " " + item->getName();
 				list->addCommentText(buffer);
 
 				LLMessageSystem* msg = gMessageSystem;
@@ -797,7 +792,7 @@ LLFloaterNotRunQueue* LLFloaterNotRunQueue::create()
 }
 
 LLFloaterNotRunQueue::LLFloaterNotRunQueue(const std::string& name, const LLRect& rect)
-: LLFloaterScriptQueue(name, rect, NOT_RUN_QUEUE_TITLE, NOT_RUN_START_STRING)
+: LLFloaterScriptQueue(name, rect, LLTrans::getString("NotRunQueueTitle"), LLTrans::getString("NotRunQueueStart"))
 { }
 
 LLFloaterNotRunQueue::~LLFloaterNotRunQueue()
@@ -824,7 +819,7 @@ void LLFloaterNotRunQueue::handleInventory(LLViewerObject* viewer_obj,
 				LLInventoryItem* item = (LLInventoryItem*)((LLInventoryObject*)(*it));
 				LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
 				std::string buffer;
-				buffer = std::string("Not running: ") +item->getName(); // *TODO: Translate
+				buffer = getString("NotRunning") + LLTrans::getString(":") + " " + item->getName();
 				list->addCommentText(buffer);
 	
 				LLMessageSystem* msg = gMessageSystem;
diff --git a/indra/newview/llfloateractivespeakers.cpp b/indra/newview/llfloateractivespeakers.cpp
index 321a825f1..6e49d5d91 100644
--- a/indra/newview/llfloateractivespeakers.cpp
+++ b/indra/newview/llfloateractivespeakers.cpp
@@ -531,15 +531,18 @@ void LLPanelActiveSpeakers::refreshSpeakers()
 		LLScrollListCell* name_cell = itemp->getColumn(1);
 		if (name_cell)
 		{
-			//FIXME: remove hard coding of font colors
 			if (speakerp->mStatus == LLSpeaker::STATUS_NOT_IN_CHANNEL)	
 			{
-				// draw inactive speakers in gray
-				name_cell->setColor(LLColor4::grey4);
+				// draw inactive speakers in different color
+				static LLCachedControl<LLColor4> sSpeakersInactive(gColors, "SpeakersInactive");
+
+				name_cell->setColor(sSpeakersInactive);
 			}
 			else
 			{
-				name_cell->setColor(LLColor4::black);
+				static LLCachedControl<LLColor4> sDefaultListText(gColors, "DefaultListText");
+
+				name_cell->setColor(sDefaultListText);
 			}
 			// <edit>
 			if(!mShowTextChatters && !(speakerp->mStatus == LLSpeaker::STATUS_NOT_IN_CHANNEL) && speakerp->mID != gAgent.getID())
@@ -560,7 +563,11 @@ void LLPanelActiveSpeakers::refreshSpeakers()
 					}
 				}
 				if(!found)
-					name_cell->setColor(LLColor4::red);
+				{
+					static LLCachedControl<LLColor4> sSpeakersGhost(gColors, "SpeakersGhost");
+
+					name_cell->setColor(sSpeakersGhost);
+				}
 			}
 			// </edit>
 
diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index ff2f4247b..801633eaf 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -74,43 +74,55 @@ extern U32 gFrameCount;
 
 typedef enum e_radar_alert_type
 {
-	ALERT_TYPE_SIM = 0,
-	ALERT_TYPE_DRAW = 1,
-	ALERT_TYPE_SHOUTRANGE = 2,
-	ALERT_TYPE_CHATRANGE = 3
+	ALERT_TYPE_SIM = 1,
+	ALERT_TYPE_DRAW = 2,
+	ALERT_TYPE_SHOUTRANGE = 4,
+	ALERT_TYPE_CHATRANGE = 8,
 } ERadarAlertType;
 
 void chat_avatar_status(std::string name, LLUUID key, ERadarAlertType type, bool entering)
 {
-	if (gSavedSettings.getBOOL("RadarChatAlerts"))
+	static LLCachedControl<bool> radar_chat_alerts(gSavedSettings, "RadarChatAlerts");
+	static LLCachedControl<bool> radar_alert_sim(gSavedSettings, "RadarAlertSim");
+	static LLCachedControl<bool> radar_alert_draw(gSavedSettings, "RadarAlertDraw");
+	static LLCachedControl<bool> radar_alert_shout_range(gSavedSettings, "RadarAlertShoutRange");
+	static LLCachedControl<bool> radar_alert_chat_range(gSavedSettings, "RadarAlertChatRange");
+	static LLCachedControl<bool> radar_chat_keys(gSavedSettings, "RadarChatKeys");
+
+	if (radar_chat_alerts)
 	{
 		LLChat chat;
+		LLFloaterAvatarList* self = LLFloaterAvatarList::getInstance();
+		std::string message =  name + " " + self->getString(entering ? "has_entered" : "has_left") + " ";
 		switch(type)
 		{
-		case ALERT_TYPE_SIM:
-			if (gSavedSettings.getBOOL("RadarAlertSim"))
-			{
-				chat.mText = name+" has "+(entering ? "entered" : "left")+" the sim.";
-			}
-			break;
-		case ALERT_TYPE_DRAW:
-			if (gSavedSettings.getBOOL("RadarAlertDraw"))
-			{
-				chat.mText = name+" has "+(entering ? "entered" : "left")+" draw distance.";
-			}
-			break;
-		case ALERT_TYPE_SHOUTRANGE:
-			if (gSavedSettings.getBOOL("RadarAlertShoutRange"))
-			{
-				chat.mText = name+" has "+(entering ? "entered" : "left")+" shout range.";
-			}
-			break;
-		case ALERT_TYPE_CHATRANGE:
-			if (gSavedSettings.getBOOL("RadarAlertChatRange"))
-			{
-				chat.mText = name+" has "+(entering ? "entered" : "left")+" chat range.";
-			}
-			break;
+			case ALERT_TYPE_SIM:
+				if (radar_alert_sim)
+				{
+					chat.mText = message + self->getString("the_sim") + ".";
+				}
+				break;
+
+			case ALERT_TYPE_DRAW:
+				if (radar_alert_draw)
+				{
+					chat.mText = message + self->getString("draw_distance") + ".";
+				}
+				break;
+
+			case ALERT_TYPE_SHOUTRANGE:
+				if (radar_alert_shout_range)
+				{
+					chat.mText = message + self->getString("shout_range") + ".";
+				}
+				break;
+
+			case ALERT_TYPE_CHATRANGE:
+				if (radar_alert_chat_range)
+				{
+					chat.mText = message + self->getString("chat_range") + ".";
+				}
+				break;
 		}
 		if (chat.mText != "")
 		{
@@ -309,6 +321,7 @@ BOOL LLFloaterAvatarList::postBuild()
 
 	// Hide them until some other way is found
 	// Users may not expect to find a Ban feature on the Eject button
+	// Perhaps turn it into a FlyOutButton?
 	childSetVisible("estate_ban_btn", false);
 
 	// Set callbacks
@@ -471,7 +484,7 @@ void LLFloaterAvatarList::updateAvatarList()
 				LLAvatarName avatar_name;
 				if (LLAvatarNameCache::get(avatarp->getID(), &avatar_name))
 				{
-				    static const LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
+				    static LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
 					switch (phoenix_name_system)
 					{
 						case 0 : name = avatar_name.getLegacyName(); break;
@@ -662,7 +675,7 @@ void LLFloaterAvatarList::refreshAvatarList()
 		LLUUID av_id;
 		std::string av_name;
 
-		LLAvatarListEntry *entry = &iter->second;
+		LLAvatarListEntry* entry = &iter->second;
 
 		// Skip if avatar hasn't been around
 		if (entry->isDead())
@@ -738,9 +751,13 @@ void LLFloaterAvatarList::refreshAvatarList()
 			estate_owner = parent_estate->getOwner();
 		}
 
-		static const LLCachedControl<LLColor4> unselected_color(gColors, "ScrollUnselectedColor",LLColor4(LLColor4U(0, 0, 0, 204)) );
+		static const LLCachedControl<LLColor4> unselected_color(gColors, "ScrollUnselectedColor",LLColor4(0.f, 0.f, 0.f, 0.8f));
 
-		LLColor4 name_color = unselected_color;
+		static LLCachedControl<LLColor4> sDefaultListText(gColors, "DefaultListText");
+		static LLCachedControl<LLColor4> sRadarTextChatRange(gColors, "RadarTextChatRange");
+		static LLCachedControl<LLColor4> sRadarTextShoutRange(gColors, "RadarTextShoutRange");
+		static LLCachedControl<LLColor4> sRadarTextDrawDist(gColors, "RadarTextDrawDist");
+		LLColor4 name_color = sDefaultListText;
 
 		//Lindens are always more Linden than your friend, make that take precedence
 		if(LLMuteList::getInstance()->isLinden(av_name))
@@ -772,7 +789,7 @@ void LLFloaterAvatarList::refreshAvatarList()
 		element["columns"][LIST_AVATAR_NAME]["color"] = name_color.getValue();
 
 		char temp[32];
-		LLColor4 color = LLColor4::black;
+		LLColor4 color = sDefaultListText;
 		element["columns"][LIST_DISTANCE]["column"] = "distance";
 		element["columns"][LIST_DISTANCE]["type"] = "text";
 		if (UnknownAltitude)
@@ -780,28 +797,28 @@ void LLFloaterAvatarList::refreshAvatarList()
 			strcpy(temp, "?");
 			if (entry->isDrawn())
 			{
-				color = LLColor4::green2;
+				color = sRadarTextDrawDist;
 			}
 		}
 		else
 		{
-			if (distance < 100.0)
+			if (distance <= 96.0)
 			{
 				snprintf(temp, sizeof(temp), "%.1f", distance);
 				if (distance > 20.0f)
 				{
-					color = LLColor4::yellow1;
+					color = sRadarTextShoutRange;
 				}
 				else
 				{
-					color = LLColor4::red;
+					color = sRadarTextChatRange;
 				}
 			}
 			else
 			{
 				if (entry->isDrawn())
 				{
-					color = LLColor4::green2;
+					color = sRadarTextDrawDist;
 				}
 				snprintf(temp, sizeof(temp), "%d", (S32)distance);
 			}
@@ -893,9 +910,9 @@ void LLFloaterAvatarList::refreshAvatarList()
 		//element["columns"][LIST_METADATA]["column"] = "metadata";
 		//element["columns"][LIST_METADATA]["type"] = "text";
 
-		static const LLCachedControl<LLColor4> avatar_name_color(gColors, "AvatarNameColor",LLColor4(LLColor4U(251, 175, 93, 255)) );
+		static const LLCachedControl<LLColor4> avatar_name_color(gColors, "AvatarNameColor",LLColor4(0.98f, 0.69f, 0.36f, 1.f));
 		LLColor4 client_color(avatar_name_color);
-		LLVOAvatar *avatarp = gObjectList.findAvatar(av_id);
+		LLVOAvatar* avatarp = gObjectList.findAvatar(av_id);
 		if(avatarp)
 		{
 			std::string client = SHClientTagMgr::instance().getClientName(avatarp, false);
@@ -971,9 +988,9 @@ void LLFloaterAvatarList::onClickIM(void* userdata)
 	}
 }
 
-void LLFloaterAvatarList::onClickTeleportOffer(void *userdata)
+void LLFloaterAvatarList::onClickTeleportOffer(void* userdata)
 {
-	LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+	LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
 
 	LLDynamicArray<LLUUID> ids = self->mAvatarList->getSelectedIDs();
 	if (ids.size() > 0)
@@ -982,11 +999,11 @@ void LLFloaterAvatarList::onClickTeleportOffer(void *userdata)
 	}
 }
 
-void LLFloaterAvatarList::onClickTrack(void *userdata)
+void LLFloaterAvatarList::onClickTrack(void* userdata)
 {
-	LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+	LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
 
- 	LLScrollListItem *item =   self->mAvatarList->getFirstSelected();
+	LLScrollListItem* item = self->mAvatarList->getFirstSelected();
 	if (!item) return;
 
 	LLUUID agent_id = item->getUUID();
@@ -1054,15 +1071,15 @@ LLAvatarListEntry * LLFloaterAvatarList::getAvatarEntry(LLUUID avatar)
 }
 
 //static
-void LLFloaterAvatarList::onClickMark(void *userdata)
+void LLFloaterAvatarList::onClickMark(void* userdata)
 {
-	LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+	LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
 	LLDynamicArray<LLUUID> ids = self->mAvatarList->getSelectedIDs();
 
 	for (LLDynamicArray<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
 	{
 		LLUUID avid = *itr;
-		LLAvatarListEntry *entry = self->getAvatarEntry(avid);
+		LLAvatarListEntry* entry = self->getAvatarEntry(avid);
 		if (entry != NULL)
 		{
 			entry->toggleMark();
@@ -1070,11 +1087,38 @@ void LLFloaterAvatarList::onClickMark(void *userdata)
 	}
 }
 
-void LLFloaterAvatarList::onClickFocus(void *userdata)
+BOOL LLFloaterAvatarList::handleKeyHere(KEY key, MASK mask)
 {
-	LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+	LLFloaterAvatarList* self = getInstance();
+	LLScrollListItem* item = self->mAvatarList->getFirstSelected();
+	if(item)
+	{
+		LLUUID agent_id = item->getUUID();
+		if (( KEY_RETURN == key ) && (MASK_NONE == mask))
+		{
+			self->mFocusedAvatar = agent_id;
+			self->focusOnCurrent();
+			return TRUE;
+		}
+		else if (( KEY_RETURN == key ) && (MASK_CONTROL == mask))
+		{
+			LLAvatarListEntry* entry = self->getAvatarEntry(agent_id);
+			if (entry)
+			{
+//				llinfos << "Trying to teleport to " << entry->getName() << " at " << entry->getPosition() << llendl;
+				gAgent.teleportViaLocation(entry->getPosition());
+			}
+			return TRUE;
+		}
+	}
+	return LLPanel::handleKeyHere(key, mask);
+}
 
-	LLScrollListItem *item = self->mAvatarList->getFirstSelected();
+void LLFloaterAvatarList::onClickFocus(void* userdata)
+{
+	LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
+
+	LLScrollListItem* item = self->mAvatarList->getFirstSelected();
 	if (item)
 	{
 		self->mFocusedAvatar = item->getUUID();
@@ -1088,7 +1132,7 @@ void LLFloaterAvatarList::removeFocusFromAll()
 
 	for (iter = mAvatars.begin(); iter != mAvatars.end(); iter++)
 	{
-		LLAvatarListEntry *entry = &iter->second;
+		LLAvatarListEntry* entry = &iter->second;
 		entry->setFocus(FALSE);
 	}
 }
@@ -1096,7 +1140,7 @@ void LLFloaterAvatarList::removeFocusFromAll()
 void LLFloaterAvatarList::focusOnCurrent()
 {
 	std::map<LLUUID, LLAvatarListEntry>::iterator iter;
-	LLAvatarListEntry *entry;
+	LLAvatarListEntry* entry;
 
 	if (mAvatars.size() == 0)
 	{
@@ -1123,8 +1167,8 @@ void LLFloaterAvatarList::focusOnCurrent()
 void LLFloaterAvatarList::focusOnPrev(BOOL marked_only)
 {
 	std::map<LLUUID, LLAvatarListEntry>::iterator iter;
-	LLAvatarListEntry *prev = NULL;
-	LLAvatarListEntry *entry;
+	LLAvatarListEntry* prev = NULL;
+	LLAvatarListEntry* entry;
 
 	if (mAvatars.size() == 0)
 	{
@@ -1162,8 +1206,8 @@ void LLFloaterAvatarList::focusOnNext(BOOL marked_only)
 {
 	std::map<LLUUID, LLAvatarListEntry>::iterator iter;
 	BOOL found = FALSE;
-	LLAvatarListEntry *next = NULL;
-	LLAvatarListEntry *entry;
+	LLAvatarListEntry* next = NULL;
+	LLAvatarListEntry* entry;
 
 	if (mAvatars.size() == 0)
 	{
@@ -1220,38 +1264,38 @@ void LLFloaterAvatarList::lookAtAvatar(LLUUID &uuid)
 }
 
 //static
-void LLFloaterAvatarList::onClickPrevInList(void *userdata)
+void LLFloaterAvatarList::onClickPrevInList(void* userdata)
 {
-	LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+	LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
 	self->focusOnPrev(FALSE);
 }
 
 //static
-void LLFloaterAvatarList::onClickNextInList(void *userdata)
+void LLFloaterAvatarList::onClickNextInList(void* userdata)
 {
-	LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+	LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
 	self->focusOnNext(FALSE);
 }
 
 //static
-void LLFloaterAvatarList::onClickPrevMarked(void *userdata)
+void LLFloaterAvatarList::onClickPrevMarked(void* userdata)
 {
-	LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+	LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
 	self->focusOnPrev(TRUE);
 }
 
 //static
-void LLFloaterAvatarList::onClickNextMarked(void *userdata)
+void LLFloaterAvatarList::onClickNextMarked(void* userdata)
 {
-	LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+	LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
 	self->focusOnNext(TRUE);
 }
 
 //static
 void LLFloaterAvatarList::onClickGetKey(void *userdata)
 {
-	LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
- 	LLScrollListItem *item = self->mAvatarList->getFirstSelected();
+	LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
+	LLScrollListItem* item = self->mAvatarList->getFirstSelected();
 
 	if (NULL == item) return;
 
@@ -1337,7 +1381,7 @@ void LLFloaterAvatarList::sound_trigger_hook(LLMessageSystem* msg,void **)
 	msg->getUUIDFast(_PREHASH_SoundData, _PREHASH_OwnerID, owner_id);
 	if(owner_id == gAgent.getID() && sound_id == LLUUID("76c78607-93f9-f55a-5238-e19b1a181389"))
 	{
-		//lets ask if they want to turn it on.
+		//let's ask if they want to turn it on.
 		if(gSavedSettings.getBOOL("RadarChatKeys"))
 		{
 			LLFloaterAvatarList::getInstance()->sendKeys();
@@ -1412,13 +1456,13 @@ static void send_eject(const LLUUID& avatar_id, bool ban)
 		msg->nextBlock("Data");
 		msg->addUUID("TargetID", avatar_id);
 		msg->addU32("Flags", flags);
-		msg->sendReliable( avatarp->getRegion()->getHost());
+		msg->sendReliable(avatarp->getRegion()->getHost());
 	}
 }
 
 static void send_estate_message(
 	const char* request,
-	const LLUUID &target)
+	const LLUUID& target)
 {
 
 	LLMessageSystem* msg = gMessageSystem;
@@ -1449,21 +1493,21 @@ static void send_estate_message(
 	msg->sendReliable(gAgent.getRegion()->getHost());
 }
 
-static void cmd_freeze(const LLUUID& avatar, const std::string &name)      { send_freeze(avatar, true); }
-static void cmd_unfreeze(const LLUUID& avatar, const std::string &name)    { send_freeze(avatar, false); }
-static void cmd_eject(const LLUUID& avatar, const std::string &name)       { send_eject(avatar, false); }
-static void cmd_ban(const LLUUID& avatar, const std::string &name)         { send_eject(avatar, true); }
-static void cmd_profile(const LLUUID& avatar, const std::string &name)     { LLFloaterAvatarInfo::showFromDirectory(avatar); }
-static void cmd_estate_eject(const LLUUID &avatar, const std::string &name){ send_estate_message("teleporthomeuser", avatar); }
+static void cmd_freeze(const LLUUID& avatar, const std::string& name)      { send_freeze(avatar, true); }
+static void cmd_unfreeze(const LLUUID& avatar, const std::string& name)    { send_freeze(avatar, false); }
+static void cmd_eject(const LLUUID& avatar, const std::string& name)       { send_eject(avatar, false); }
+static void cmd_ban(const LLUUID& avatar, const std::string& name)         { send_eject(avatar, true); }
+static void cmd_profile(const LLUUID& avatar, const std::string& name)     { LLFloaterAvatarInfo::showFromDirectory(avatar); }
+static void cmd_estate_eject(const LLUUID& avatar, const std::string& name){ send_estate_message("teleporthomeuser", avatar); }
 
-void LLFloaterAvatarList::doCommand(void (*func)(const LLUUID &avatar, const std::string &name))
+void LLFloaterAvatarList::doCommand(void (*func)(const LLUUID& avatar, const std::string& name))
 {
 	LLDynamicArray<LLUUID> ids = mAvatarList->getSelectedIDs();
 
 	for (LLDynamicArray<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
 	{
 		LLUUID avid = *itr;
-		LLAvatarListEntry *entry = getAvatarEntry(avid);
+		LLAvatarListEntry* entry = getAvatarEntry(avid);
 		if (entry != NULL)
 		{
 			llinfos << "Executing command on " << entry->getName() << llendl;
@@ -1480,7 +1524,7 @@ std::string LLFloaterAvatarList::getSelectedNames(const std::string& separator)
 	for (LLDynamicArray<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
 	{
 		LLUUID avid = *itr;
-		LLAvatarListEntry *entry = getAvatarEntry(avid);
+		LLAvatarListEntry* entry = getAvatarEntry(avid);
 		if (entry != NULL)
 		{
 			if (!ret.empty()) ret += separator;
@@ -1494,7 +1538,7 @@ std::string LLFloaterAvatarList::getSelectedNames(const std::string& separator)
 std::string LLFloaterAvatarList::getSelectedName()
 {
 	LLUUID id = getSelectedID();
-	LLAvatarListEntry *entry = getAvatarEntry(id);
+	LLAvatarListEntry* entry = getAvatarEntry(id);
 	if (entry)
 	{
 		return entry->getName();
@@ -1504,7 +1548,7 @@ std::string LLFloaterAvatarList::getSelectedName()
 
 LLUUID LLFloaterAvatarList::getSelectedID()
 {
-	LLScrollListItem *item = mAvatarList->getFirstSelected();
+	LLScrollListItem* item = mAvatarList->getFirstSelected();
 	if (item) return item->getUUID();
 	return LLUUID::null;
 }
@@ -1516,11 +1560,11 @@ void LLFloaterAvatarList::callbackFreeze(const LLSD& notification, const LLSD& r
 
 	if (option == 0)
 	{
-		getInstance()->doCommand( cmd_freeze );
+		getInstance()->doCommand(cmd_freeze);
 	}
 	else if (option == 1)
 	{
-		getInstance()->doCommand( cmd_unfreeze );
+		getInstance()->doCommand(cmd_unfreeze);
 	}
 }
 
@@ -1531,11 +1575,11 @@ void LLFloaterAvatarList::callbackEject(const LLSD& notification, const LLSD& re
 
 	if (option == 0)
 	{
-		getInstance()->doCommand( cmd_eject );
+		getInstance()->doCommand(cmd_eject);
 	}
 	else if (option == 1)
 	{
-		getInstance()->doCommand( cmd_ban );
+		getInstance()->doCommand(cmd_ban);
 	}
 }
 
@@ -1546,16 +1590,16 @@ void LLFloaterAvatarList::callbackEjectFromEstate(const LLSD& notification, cons
 
 	if (option == 0)
 	{
-		getInstance()->doCommand( cmd_estate_eject );
+		getInstance()->doCommand(cmd_estate_eject);
 	}
 }
 
 //static
-void LLFloaterAvatarList::callbackIdle(void *userdata)
+void LLFloaterAvatarList::callbackIdle(void* userdata)
 {
 	if (instanceExists())
 	{
-		// Do not update at every frame: this would be insane !
+		// Do not update at every frame: this would be insane!
 		if (gFrameCount % getInstance()->mUpdateRate == 0)
 		{
 			getInstance()->updateAvatarList();
@@ -1563,7 +1607,7 @@ void LLFloaterAvatarList::callbackIdle(void *userdata)
 	}
 }
 
-void LLFloaterAvatarList::onClickFreeze(void *userdata)
+void LLFloaterAvatarList::onClickFreeze(void* userdata)
 {
 	LLSD args;
 	LLSD payload;
@@ -1572,7 +1616,7 @@ void LLFloaterAvatarList::onClickFreeze(void *userdata)
 }
 
 //static
-void LLFloaterAvatarList::onClickEject(void *userdata)
+void LLFloaterAvatarList::onClickEject(void* userdata)
 {
 	LLSD args;
 	LLSD payload;
@@ -1581,9 +1625,9 @@ void LLFloaterAvatarList::onClickEject(void *userdata)
 }
 
 //static
-void LLFloaterAvatarList::onClickMute(void *userdata)
+void LLFloaterAvatarList::onClickMute(void* userdata)
 {
-	LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+	LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
 
 	LLDynamicArray<LLUUID> ids = self->mAvatarList->getSelectedIDs();
 	if (ids.size() > 0)
@@ -1611,7 +1655,7 @@ void LLFloaterAvatarList::onClickMute(void *userdata)
 }
 
 //static
-void LLFloaterAvatarList::onClickEjectFromEstate(void *userdata)
+void LLFloaterAvatarList::onClickEjectFromEstate(void* userdata)
 {
 	LLSD args;
 	LLSD payload;
@@ -1620,14 +1664,14 @@ void LLFloaterAvatarList::onClickEjectFromEstate(void *userdata)
 }
 
 //static
-void LLFloaterAvatarList::onClickAR(void *userdata)
+void LLFloaterAvatarList::onClickAR(void* userdata)
 {
-	LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
- 	LLScrollListItem *item = self->mAvatarList->getFirstSelected();
+	LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
+	LLScrollListItem* item = self->mAvatarList->getFirstSelected();
 	if (item)
 	{
 		LLUUID agent_id = item->getUUID();
-		LLAvatarListEntry *entry = self->getAvatarEntry(agent_id);
+		LLAvatarListEntry* entry = self->getAvatarEntry(agent_id);
 		if (entry)
 		{
 			LLFloaterReporter::showFromObject(entry->getID());
@@ -1638,19 +1682,19 @@ void LLFloaterAvatarList::onClickAR(void *userdata)
 // static
 void LLFloaterAvatarList::onClickProfile(void* userdata)
 {
-	LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
+	LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
 	self->doCommand(cmd_profile);
 }
 
 //static
 void LLFloaterAvatarList::onClickTeleport(void* userdata)
 {
-	LLFloaterAvatarList *self = (LLFloaterAvatarList*)userdata;
- 	LLScrollListItem *item = self->mAvatarList->getFirstSelected();
+	LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
+	LLScrollListItem* item = self->mAvatarList->getFirstSelected();
 	if (item)
 	{
 		LLUUID agent_id = item->getUUID();
-		LLAvatarListEntry *entry = self->getAvatarEntry(agent_id);
+		LLAvatarListEntry* entry = self->getAvatarEntry(agent_id);
 		if (entry)
 		{
 //			llinfos << "Trying to teleport to " << entry->getName() << " at " << entry->getPosition() << llendl;
@@ -1663,11 +1707,11 @@ void LLFloaterAvatarList::onSelectName(LLUICtrl*, void* userdata)
 {
 	LLFloaterAvatarList* self = (LLFloaterAvatarList*)userdata;
 
- 	LLScrollListItem *item = self->mAvatarList->getFirstSelected();
+	LLScrollListItem* item = self->mAvatarList->getFirstSelected();
 	if (item)
 	{
 		LLUUID agent_id = item->getUUID();
-		LLAvatarListEntry *entry = self->getAvatarEntry(agent_id);
+		LLAvatarListEntry* entry = self->getAvatarEntry(agent_id);
 		if (entry)
 		{
 			BOOL enabled = entry->isDrawn();
diff --git a/indra/newview/llfloateravatarlist.h b/indra/newview/llfloateravatarlist.h
index 44bc3df84..6051a8b88 100644
--- a/indra/newview/llfloateravatarlist.h
+++ b/indra/newview/llfloateravatarlist.h
@@ -171,6 +171,8 @@ private:
 public:
 	~LLFloaterAvatarList();
 
+	virtual BOOL	handleKeyHere(KEY key, MASK mask);
+
 	/*virtual*/ void onClose(bool app_quitting);
 	/*virtual*/ void onOpen();
 	/*virtual*/ BOOL postBuild();
diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index 9f9e2d308..20f60e920 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -80,6 +80,7 @@
 #include "llviewercontrol.h"
 #include "roles_constants.h"
 #include "llworld.h"
+#include "lltrans.h"
 
 #include "hippogridmanager.h"
 
@@ -1498,7 +1499,7 @@ void LLPanelLandObjects::onClickRefresh(void* userdata)
 
 	// ready the list for results
 	self->mOwnerList->deleteAllItems();
-	self->mOwnerList->addCommentText(std::string("Searching...")); // *TODO: Translate
+	self->mOwnerList->addCommentText(LLTrans::getString("Searching"));
 	self->mOwnerList->setEnabled(FALSE);
 	self->mFirstReply = TRUE;
 
@@ -1612,7 +1613,7 @@ void LLPanelLandObjects::processParcelObjectOwnersReply(LLMessageSystem *msg, vo
 	// check for no results
 	if (0 == self->mOwnerList->getItemCount())
 	{
-		self->mOwnerList->addCommentText(std::string("None found.")); // *TODO: Translate
+		self->mOwnerList->addCommentText(LLTrans::getString("None_found"));
 	}
 	else
 	{
@@ -2446,7 +2447,6 @@ void LLPanelLandAccess::refresh()
 			childSetToolTipArg("AccessList", "[LISTED]", llformat("%d",count));
 			childSetToolTipArg("AccessList", "[MAX]", llformat("%d",PARCEL_MAX_ACCESS_LIST));
 
-			// *TODO: Translate
 			for (access_map_const_iterator cit = parcel->mAccessList.begin();
 				 cit != parcel->mAccessList.end(); ++cit)
 			{
@@ -2460,19 +2460,23 @@ void LLPanelLandAccess::refresh()
 					suffix.assign(" (");
 					if (seconds >= 120)
 					{
-						std::string buf = llformat("%d minutes", (seconds/60));
+						std::string buf = llformat("%d ", (seconds/60)) + getString("minutes");
 						suffix.append(buf);
 					}
 					else if (seconds >= 60)
 					{
-						suffix.append("1 minute");
+						suffix.append(getString("1_minute"));
+					}
+					else if (seconds == 1)
+					{
+						suffix.append(getString("1_second"));
 					}
 					else
 					{
-						std::string buf = llformat("%d seconds", seconds);
+						std::string buf = llformat("%d ", seconds) + getString("seconds");
 						suffix.append(buf);
 					}
-					suffix.append(" remaining)");
+					suffix.append(" " + getString("remaining") + ")");
 				}
 				if (mListAccess)
 					mListAccess->addNameItem(entry.mID, ADD_SORTED, TRUE, suffix);
@@ -2499,19 +2503,23 @@ void LLPanelLandAccess::refresh()
 					suffix.assign(" (");
 					if (seconds >= 120)
 					{
-						std::string buf = llformat("%d minutes", (seconds/60));
+						std::string buf = llformat("%d ", (seconds/60)) + getString("minutes");
 						suffix.append(buf);
 					}
 					else if (seconds >= 60)
 					{
-						suffix.append("1 minute");
+						suffix.append(getString("1_minute"));
+					}
+					else if (seconds == 1)
+					{
+						suffix.append(getString("1_second"));
 					}
 					else
 					{
-						std::string buf = llformat("%d seconds", seconds);
+						std::string buf = llformat("%d ", seconds) + getString("seconds");
 						suffix.append(buf);
 					}
-					suffix.append(" remaining)");
+					suffix.append(" " + getString("remaining") + ")");
 				}
 				mListBanned->addNameItem(entry.mID, ADD_SORTED, TRUE, suffix);
 			}
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index f7ba56bf8..1fc54068c 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -959,11 +959,16 @@ void LLFolderView::draw()
 		static LLCachedControl<LLColor4> sSearchStatusColor(gColors, "InventorySearchStatusColor", LLColor4::white );
 		if (LLInventoryModelBackgroundFetch::instance().folderFetchActive() || mCompletedFilterGeneration < mFilter->getMinRequiredGeneration())
 		{
-			mStatusText = std::string("Searching..."); // *TODO:translate
+			mStatusText = LLTrans::getString("Searching");
 		}
 		else
 		{
-			mStatusText = std::string("No matching items found in inventory."); // *TODO:translate
+		//	if(getFilter())
+		//	{
+		//		LLStringUtil::format_map_t args;
+		//		args["[SEARCH_TERM]"] = LLURI::escape(getFilter()->getFilterSubStringOrig());
+				mStatusText = LLTrans::getString("InventoryNoMatchingItems"); //, args);
+		//	}
 		}
 		mStatusTextBox->setWrappedText(mStatusText);
 		mStatusTextBox->setVisible( TRUE );
diff --git a/indra/newview/llgroupnotify.cpp b/indra/newview/llgroupnotify.cpp
index 24ff0408e..46f368300 100644
--- a/indra/newview/llgroupnotify.cpp
+++ b/indra/newview/llgroupnotify.cpp
@@ -48,6 +48,7 @@
 #include "llfloatergroupinfo.h"
 #include "llinventoryicon.h"
 #include "llinventory.h"
+#include "lltrans.h"
 
 #include "llglheaders.h"
 #include "llagent.h"
@@ -143,14 +144,14 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
 	};
 
 	// Title
-	addChild(new NoticeText(std::string("title"),LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),std::string("Group Notice"),LLFontGL::getFontSansSerifHuge()));
+	addChild(new NoticeText(std::string("title"),LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),LLTrans::getString("GroupNotifyGroupNotice"),LLFontGL::getFontSansSerifHuge()));
 
 	y -= llfloor(1.5f*LINE_HEIGHT);
 
 	x += HPAD + HPAD + ICON_WIDTH;
 
 	std::stringstream from;
-	from << "Sent by " << from_name << ", " << group_name;
+	from << LLTrans::getString("GroupNotifySentBy") << " " + from_name << LLTrans::getString(",") + " " << group_name;
 
 	addChild(new NoticeText(std::string("group"),LLRect(x,y,RIGHT - HPAD,y - LINE_HEIGHT),from.str(),LLFontGL::getFontSansSerif()));
 	
@@ -216,7 +217,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
 
 	if (mHasInventory)
 	{
-			addChild(new NoticeText(std::string("subjecttitle"),LLRect(x,y,x + LABEL_WIDTH,y - LINE_HEIGHT),std::string("Attached: "),LLFontGL::getFontSansSerif()));
+			addChild(new NoticeText(std::string("subjecttitle"),LLRect(x,y,x + LABEL_WIDTH,y - LINE_HEIGHT),LLTrans::getString("GroupNotifyAttached"),LLFontGL::getFontSansSerif()));
 
 			LLUIImagePtr item_icon = LLInventoryIcon::getIcon(mInventoryOffer->mType,
 													LLInventoryType::IT_TEXTURE,
@@ -244,7 +245,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
 	}
 
 	LLButton* btn;
-	btn = new LLButton(std::string("next"),
+	btn = new LLButton(LLTrans::getString("next"),
 				LLRect(getRect().getWidth()-26, BOTTOM_PAD + 20, getRect().getWidth()-2, BOTTOM_PAD),
 				std::string("notify_next.png"),
 				std::string("notify_next.png"),
@@ -252,7 +253,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
 				onClickNext,
 				this,
 				LLFontGL::getFontSansSerif());
-	btn->setToolTip(std::string("Next")); // *TODO: Translate
+	btn->setToolTip(LLTrans::getString("next"));
 	btn->setScaleImage(TRUE);
 	addChild(btn);
 	mNextBtn = btn;
@@ -267,7 +268,7 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
 								btn_width,
 								BTN_HEIGHT);
 
-	btn = new LLButton(std::string("OK"), btn_rect, LLStringUtil::null, onClickOk, this);
+	btn = new LLButton(LLTrans::getString("ok"), btn_rect, LLStringUtil::null, onClickOk, this);
 	addChild(btn, -1);
 	setDefaultBtn(btn);
 
@@ -279,8 +280,8 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
 								wide_btn_width,
 								BTN_HEIGHT);
 
-	btn = new LLButton(std::string("Group Notices"), btn_rect, LLStringUtil::null, onClickGroupInfo, this);
-	btn->setToolTip(std::string("View past notices or opt-out of receiving these messages here.")); // TODO: Translate
+	btn = new LLButton(LLTrans::getString("GroupNotifyGroupNotices"), btn_rect, LLStringUtil::null, onClickGroupInfo, this);
+	btn->setToolTip(LLTrans::getString("GroupNotifyViewPastNotices"));
 	addChild(btn, -1);
 
 	if (mHasInventory)
@@ -295,11 +296,11 @@ LLGroupNotifyBox::LLGroupNotifyBox(const std::string& subject,
 		std::string btn_lbl("");
 		if(is_openable(mInventoryOffer->mType))
 		{
-			btn_lbl = "Open Attachment";
+			btn_lbl = LLTrans::getString("GroupNotifyOpenAttachment");
 		}
 		else
 		{
-			btn_lbl = "Save Attachment";
+			btn_lbl = LLTrans::getString("GroupNotifySaveAttachment");
 		}
 		mSaveInventoryBtn = new LLButton(btn_lbl, btn_rect, LLStringUtil::null, onClickSaveInventory, this);
 		mSaveInventoryBtn->setVisible(mHasInventory);
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 42a4f5c46..429b68ac0 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -665,133 +665,156 @@ const std::string& LLInventoryFilter::getFilterText()
 
 	if (isFilterObjectTypesWith(LLInventoryType::IT_ANIMATION))
 	{
-		filtered_types += " Animations,";
+		//filtered_types += " Animations,";
+		filtered_types += LLTrans::getString("Animations");
 		filtered_by_type = TRUE;
 		num_filter_types++;
 	}
 	else
 	{
-		not_filtered_types += " Animations,";
+		//not_filtered_types += " Animations,";
+		not_filtered_types += LLTrans::getString("Animations");
+
 		filtered_by_all_types = FALSE;
 	}
 
 	if (isFilterObjectTypesWith(LLInventoryType::IT_CALLINGCARD))
 	{
-		filtered_types += " Calling Cards,";
+		//filtered_types += " Calling Cards,";
+		filtered_types += LLTrans::getString("Calling Cards");
 		filtered_by_type = TRUE;
 		num_filter_types++;
 	}
 	else
 	{
-		not_filtered_types += " Calling Cards,";
+		//not_filtered_types += " Calling Cards,";
+		not_filtered_types += LLTrans::getString("Calling Cards");
 		filtered_by_all_types = FALSE;
 	}
 
 	if (isFilterObjectTypesWith(LLInventoryType::IT_WEARABLE))
 	{
-		filtered_types += " Clothing,";
+		//filtered_types += " Clothing,";
+		filtered_types +=  LLTrans::getString("Clothing");
 		filtered_by_type = TRUE;
 		num_filter_types++;
 	}
 	else
 	{
-		not_filtered_types += " Clothing,";
+		//not_filtered_types += " Clothing,";
+		not_filtered_types +=  LLTrans::getString("Clothing");
 		filtered_by_all_types = FALSE;
 	}
 
 	if (isFilterObjectTypesWith(LLInventoryType::IT_GESTURE))
 	{
-		filtered_types += " Gestures,";
+		//filtered_types += " Gestures,";
+		filtered_types +=  LLTrans::getString("Gestures");
 		filtered_by_type = TRUE;
 		num_filter_types++;
 	}
 	else
 	{
-		not_filtered_types += " Gestures,";
+		//not_filtered_types += " Gestures,";
+		not_filtered_types +=  LLTrans::getString("Gestures");
 		filtered_by_all_types = FALSE;
 	}
 
 	if (isFilterObjectTypesWith(LLInventoryType::IT_LANDMARK))
 	{
-		filtered_types += " Landmarks,";
+		//filtered_types += " Landmarks,";
+		filtered_types +=  LLTrans::getString("Landmarks");
 		filtered_by_type = TRUE;
 		num_filter_types++;
 	}
 	else
 	{
-		not_filtered_types += " Landmarks,";
+		//not_filtered_types += " Landmarks,";
+		not_filtered_types +=  LLTrans::getString("Landmarks");
 		filtered_by_all_types = FALSE;
 	}
 
 	if (isFilterObjectTypesWith(LLInventoryType::IT_NOTECARD))
 	{
-		filtered_types += " Notecards,";
+		//filtered_types += " Notecards,";
+		filtered_types +=  LLTrans::getString("Notecards");
 		filtered_by_type = TRUE;
 		num_filter_types++;
 	}
 	else
 	{
-		not_filtered_types += " Notecards,";
+		//not_filtered_types += " Notecards,";
+		not_filtered_types +=  LLTrans::getString("Notecards");
 		filtered_by_all_types = FALSE;
 	}
 	
 	if (isFilterObjectTypesWith(LLInventoryType::IT_OBJECT) && isFilterObjectTypesWith(LLInventoryType::IT_ATTACHMENT))
 	{
-		filtered_types += " Objects,";
+		//filtered_types += " Objects,";
+		filtered_types +=  LLTrans::getString("Objects");
 		filtered_by_type = TRUE;
 		num_filter_types++;
 	}
 	else
 	{
-		not_filtered_types += " Objects,";
+		//not_filtered_types += " Objects,";
+		not_filtered_types +=  LLTrans::getString("Objects");
 		filtered_by_all_types = FALSE;
 	}
 	
 	if (isFilterObjectTypesWith(LLInventoryType::IT_LSL))
 	{
-		filtered_types += " Scripts,";
+		//filtered_types += " Scripts,";
+		filtered_types +=  LLTrans::getString("Scripts");
 		filtered_by_type = TRUE;
 		num_filter_types++;
 	}
 	else
 	{
-		not_filtered_types += " Scripts,";
+		//not_filtered_types += " Scripts,";
+		not_filtered_types +=  LLTrans::getString("Scripts");
 		filtered_by_all_types = FALSE;
 	}
 	
 	if (isFilterObjectTypesWith(LLInventoryType::IT_SOUND))
 	{
-		filtered_types += " Sounds,";
+		//filtered_types += " Sounds,";
+		filtered_types +=  LLTrans::getString("Sounds");
 		filtered_by_type = TRUE;
 		num_filter_types++;
 	}
 	else
 	{
-		not_filtered_types += " Sounds,";
+		//not_filtered_types += " Sounds,";
+		not_filtered_types +=  LLTrans::getString("Sounds");
 		filtered_by_all_types = FALSE;
 	}
 
 	if (isFilterObjectTypesWith(LLInventoryType::IT_TEXTURE))
 	{
-		filtered_types += " Textures,";
+		//filtered_types += " Textures,";
+		filtered_types +=  LLTrans::getString("Textures");
 		filtered_by_type = TRUE;
 		num_filter_types++;
 	}
 	else
 	{
-		not_filtered_types += " Textures,";
+		//not_filtered_types += " Textures,";
+		not_filtered_types +=  LLTrans::getString("Textures");
 		filtered_by_all_types = FALSE;
 	}
 
 	if (isFilterObjectTypesWith(LLInventoryType::IT_SNAPSHOT))
 	{
-		filtered_types += " Snapshots,";
+		//filtered_types += " Snapshots,";
+		filtered_types +=  LLTrans::getString("Snapshots");
 		filtered_by_type = TRUE;
 		num_filter_types++;
 	}
 	else
 	{
-		not_filtered_types += " Snapshots,";
+		//not_filtered_types += " Snapshots,";
+		not_filtered_types +=  LLTrans::getString("Snapshots");
 		filtered_by_all_types = FALSE;
 	}
 
@@ -806,7 +829,8 @@ const std::string& LLInventoryFilter::getFilterText()
 		}
 		else
 		{
-			mFilterText += "No ";
+			//mFilterText += "No ";
+			mFilterText += LLTrans::getString("No Filters");
 			mFilterText += not_filtered_types;
 		}
 		// remove the ',' at the end
@@ -815,12 +839,14 @@ const std::string& LLInventoryFilter::getFilterText()
 
 	if (isSinceLogoff())
 	{
-		mFilterText += " - Since Logoff";
+		//mFilterText += " - Since Logoff";
+		mFilterText += LLTrans::getString("Since Logoff");
 	}
 	
 	if (getFilterWorn())
 	{
-		mFilterText += " - Worn";
+		//mFilterText += " - Worn";
+		mFilterText += LLTrans::getString("Worn");
 	}
 	
 	return mFilterText;
diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp
index 2940b764f..cd0118ee9 100644
--- a/indra/newview/llmaniprotate.cpp
+++ b/indra/newview/llmaniprotate.cpp
@@ -65,6 +65,7 @@
 #include "pipeline.h"
 #include "lldrawable.h"
 #include "llglheaders.h"
+#include "lltrans.h"
 
 const F32 RADIUS_PIXELS = 100.f;		// size in screen space
 const F32 SQ_RADIUS = RADIUS_PIXELS * RADIUS_PIXELS;
@@ -152,6 +153,7 @@ void LLManipRotate::render()
 
 	gGL.pushMatrix();
 	{
+
 		// are we in the middle of a constrained drag?
 		if (mManipPart >= LL_ROT_X && mManipPart <= LL_ROT_Z)
 		{
@@ -292,6 +294,7 @@ void LLManipRotate::render()
 			// First pass: centers. Second pass: sides.
 			for( S32 i=0; i<2; i++ )
 			{
+
 				gGL.pushMatrix();
 				{
 					if (mHighlightedPart == LL_ROT_Z)
@@ -350,6 +353,7 @@ void LLManipRotate::render()
 				{
 					mManipulatorScales = lerp(mManipulatorScales, LLVector4(1.f, 1.f, 1.f, SELECTED_MANIPULATOR_SCALE), LLCriticalDamp::getInterpolant(MANIPULATOR_SCALE_HALF_LIFE));
 				}
+
 			}
 			
 		}
@@ -363,6 +367,7 @@ void LLManipRotate::render()
 	gGL.popMatrix();
 	gGL.popMatrix();
 
+
 	LLVector3 euler_angles;
 	LLQuaternion object_rot = first_object->getRotationEdit();
 	object_rot.getEulerAngles(&(euler_angles.mV[VX]), &(euler_angles.mV[VY]), &(euler_angles.mV[VZ]));
@@ -922,7 +927,6 @@ void LLManipRotate::renderSnapGuides()
 				}
 				gGL.end();
 
-				// *TODO: Translate
 				//RN: text rendering does own shadow pass, so only render once
 				if (pass == 1 && render_text && i % 16 == 0)
 				{
@@ -930,32 +934,32 @@ void LLManipRotate::renderSnapGuides()
 					{
 						if (i == 0)
 						{
-							renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Forward") : std::string("East"), LLColor4::white);
+							renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Forward" : "Direction_East"), LLColor4::white);
 						}
 						else if (i == 16)
 						{
 							if (constraint_axis.mV[VZ] > 0.f)
 							{
-								renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Left") : std::string("North"), LLColor4::white);
+								renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Left" : "Direction_North"), LLColor4::white);
 							}
 							else
 							{
-								renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Right") : std::string("South"), LLColor4::white);
+								renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Right" : "Direction_South"), LLColor4::white);
 							}
 						}
 						else if (i == 32)
 						{
-							renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Back") : std::string("West"), LLColor4::white);
+							renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Back" : "Direction_West"), LLColor4::white);
 						}
 						else
 						{
 							if (constraint_axis.mV[VZ] > 0.f)
 							{
-								renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Right") : std::string("South"), LLColor4::white);
+								renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Right" : "Direction_South"), LLColor4::white);
 							}
 							else
 							{
-								renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Left") : std::string("North"), LLColor4::white);
+								renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Left" : "Direction_North"), LLColor4::white);
 							}
 						}
 					}
@@ -963,32 +967,32 @@ void LLManipRotate::renderSnapGuides()
 					{
 						if (i == 0)
 						{
-							renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Left") : std::string("North"), LLColor4::white);
+							renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Left" : "Direction_North"), LLColor4::white);
 						}
 						else if (i == 16)
 						{
 							if (constraint_axis.mV[VX] > 0.f)
 							{
-								renderTickText(text_point, std::string("Up"), LLColor4::white);
+								renderTickText(text_point, LLTrans::getString("Direction_Up"), LLColor4::white);
 							}
 							else
 							{
-								renderTickText(text_point, std::string("Down"), LLColor4::white);
+								renderTickText(text_point, LLTrans::getString("Direction_Down"), LLColor4::white);
 							}
 						}
 						else if (i == 32)
 						{
-							renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Right") : std::string("South"), LLColor4::white);
+							renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Right" : "Direction_South"), LLColor4::white);
 						}
 						else
 						{
 							if (constraint_axis.mV[VX] > 0.f)
 							{
-								renderTickText(text_point, std::string("Down"), LLColor4::white);
+								renderTickText(text_point, LLTrans::getString("Direction_Down"), LLColor4::white);
 							}
 							else
 							{
-								renderTickText(text_point, std::string("Up"), LLColor4::white);
+								renderTickText(text_point, LLTrans::getString("Direction_Up"), LLColor4::white);
 							}
 						}
 					}
@@ -996,32 +1000,32 @@ void LLManipRotate::renderSnapGuides()
 					{
 						if (i == 0)
 						{
-							renderTickText(text_point, std::string("Up"), LLColor4::white);
+							renderTickText(text_point, LLTrans::getString("Direction_Up"), LLColor4::white);
 						}
 						else if (i == 16)
 						{
 							if (constraint_axis.mV[VY] > 0.f)
 							{
-								renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Forward") : std::string("East"), LLColor4::white);
+								renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Forward" : "Direction_East"), LLColor4::white);
 							}
 							else
 							{
-								renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Back") : std::string("West"), LLColor4::white);
+								renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Back" : "Direction_West"), LLColor4::white);
 							}
 						}
 						else if (i == 32)
 						{
-							renderTickText(text_point, std::string("Down"), LLColor4::white);
+							renderTickText(text_point, LLTrans::getString("Direction_Down"), LLColor4::white);
 						}
 						else
 						{
 							if (constraint_axis.mV[VY] > 0.f)
 							{
-								renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Back") : std::string("West"), LLColor4::white);
+								renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Back" : "Direction_West"), LLColor4::white);
 							}
 							else
 							{
-								renderTickText(text_point, mObjectSelection->isAttachment() ? std::string("Forward") : std::string("East"), LLColor4::white);
+								renderTickText(text_point, LLTrans::getString(mObjectSelection->isAttachment() ? "Direction_Forward" : "Direction_East"), LLColor4::white);
 							}
 						}
 					}
diff --git a/indra/newview/llnotify.cpp b/indra/newview/llnotify.cpp
index c942aee44..8b7f52afd 100644
--- a/indra/newview/llnotify.cpp
+++ b/indra/newview/llnotify.cpp
@@ -327,7 +327,7 @@ LLNotifyBox::LLNotifyBox(LLNotificationPtr notification,
 						   this,
 						   sFont);
 		btn->setScaleImage(TRUE);
-		btn->setToolTip(std::string("Next")); // *TODO: Translate
+		btn->setToolTip(LLTrans::getString("next"));
 		addChild(btn);
 		mNextBtn = btn;
 
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 6d21cab60..14709805e 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -320,7 +320,7 @@ void LLPanelAvatarSecondLife::processProperties(void* data, EAvatarProcessorType
 //			}
 			if (0 == pAvatarGroups->group_list.size())
 			{
-				group_list->addCommentText(std::string("None")); // *TODO: Translate
+				group_list->addCommentText(getString("None"));
 			}
 
 			for(LLAvatarGroups::group_list_t::const_iterator it = pAvatarGroups->group_list.begin();
@@ -571,11 +571,6 @@ BOOL LLPanelAvatarSecondLife::postBuild(void)
 
 	childSetVisible("online_yes",FALSE);
 
-	// These are cruft but may still exist in some xml files
-	// TODO: remove the following 2 lines once translators grab these changes
-	childSetVisible("online_unknown",FALSE);
-	childSetVisible("online_no",FALSE);
-
 	childSetAction("Find on Map", LLPanelAvatar::onClickTrack, getPanelAvatar());
 	childSetAction("Instant Message...", LLPanelAvatar::onClickIM, getPanelAvatar());
 	childSetAction("GroupInvite_Button", LLPanelAvatar::onClickGroupInvite, getPanelAvatar());
diff --git a/indra/newview/llpaneldirbrowser.cpp b/indra/newview/llpaneldirbrowser.cpp
index a306d4730..4680780da 100644
--- a/indra/newview/llpaneldirbrowser.cpp
+++ b/indra/newview/llpaneldirbrowser.cpp
@@ -212,7 +212,7 @@ void LLPanelDirBrowser::updateResultCount()
 		// add none found response
 		if (list->getItemCount() == 0)
 		{
-			list->addCommentText(std::string("None found.")); // *TODO: Translate
+			list->addCommentText(LLTrans::getString("NoneFound"));
 			list->operateOnAll(LLCtrlListInterface::OP_DESELECT);
 		}
 	}
@@ -1222,7 +1222,7 @@ void LLPanelDirBrowser::setupNewSearch()
 
 	// ready the list for results
 	list->operateOnAll(LLCtrlListInterface::OP_DELETE);
-	list->addCommentText(std::string("Searching...")); // *TODO: Translate
+	list->addCommentText(LLTrans::getString("Searching"));
 	childDisable("results");
 
 	mResultsReceived = 0;
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 31cb8bcc8..c78f3ce21 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -707,14 +707,13 @@ void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 		return;
 	}
 
-	 // *TODO: Translate
 	if(gAgent.allowOperation(PERM_OWNER, item->getPermissions(),
 							 GP_OBJECT_MANIPULATE)
 	   && item->getSaleInfo().isForSale())
 	{
 		items.push_back(std::string("Task Buy"));
 
-		std::string label("Buy");
+		std::string label= LLTrans::getString("Buy");
 		// Check the price of the item.
 		S32 price = getPrice();
 		if (-1 == price)
@@ -1072,13 +1071,12 @@ void LLTaskSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 	std::vector<std::string> items;
 	std::vector<std::string> disabled_items;
 
-	// *TODO: Translate
 	if(item->getPermissions().getOwner() != gAgent.getID()
 	   && item->getSaleInfo().isForSale())
 	{
 		items.push_back(std::string("Task Buy"));
 
-		std::string label("Buy");
+		std::string label= LLTrans::getString("Buy");
 		// Check the price of the item.
 		S32 price = getPrice();
 		if (-1 == price)
@@ -1905,24 +1903,23 @@ void LLPanelObjectInventory::draw()
 
 	if(mIsInventoryEmpty)
 	{
-		// *TODO: Translate
 		if((LLUUID::null != mTaskUUID) && (!mHaveInventory))
 		{
-			LLFontGL::getFontSansSerif()->renderUTF8(std::string("Loading contents..."), 0,
-										 (S32)(getRect().getWidth() * 0.5f),
-										 10,
-										 LLColor4( 1, 1, 1, 1 ),
-										 LLFontGL::HCENTER,
-										 LLFontGL::BOTTOM);
+			LLFontGL::getFontSansSerif()->renderUTF8(LLTrans::getString("LoadingContents"), 0,
+													 (S32)(getRect().getWidth() * 0.5f),
+													 10,
+													 LLColor4( 1, 1, 1, 1 ),
+													 LLFontGL::HCENTER,
+													 LLFontGL::BOTTOM);
 		}
 		else if(mHaveInventory)
 		{
-			LLFontGL::getFontSansSerif()->renderUTF8(std::string("No contents"), 0,
-										 (S32)(getRect().getWidth() * 0.5f),
-										 10,
-										 LLColor4( 1, 1, 1, 1 ),
-										 LLFontGL::HCENTER,
-										 LLFontGL::BOTTOM);
+			LLFontGL::getFontSansSerif()->renderUTF8(LLTrans::getString("NoContents"), 0,
+													 (S32)(getRect().getWidth() * 0.5f),
+													 10,
+													 LLColor4( 1, 1, 1, 1 ),
+													 LLFontGL::HCENTER,
+													 LLFontGL::BOTTOM);
 		}
 	}
 }
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index c7850b9c9..baf963d68 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -1290,9 +1290,8 @@ LLPreviewLSL::LLPreviewLSL(const std::string& name, const LLRect& rect,
 void LLPreviewLSL::callbackLSLCompileSucceeded()
 {
 	llinfos << "LSL Bytecode saved" << llendl;
-	// *TODO: Translate
-	mScriptEd->mErrorList->addCommentText(std::string("Compile successful!"));
-	mScriptEd->mErrorList->addCommentText(std::string("Save complete."));
+	mScriptEd->mErrorList->addCommentText(LLTrans::getString("CompileSuccessful"));
+	mScriptEd->mErrorList->addCommentText(LLTrans::getString("SaveComplete"));
 	closeIfNeeded();
 }
 
@@ -1890,9 +1889,8 @@ void LLLiveLSLEditor::callbackLSLCompileSucceeded(const LLUUID& task_id,
 												  bool is_script_running)
 {
 	lldebugs << "LSL Bytecode saved" << llendl;
-	// *TODO: Translate
-	mScriptEd->mErrorList->addCommentText(std::string("Compile successful!"));
-	mScriptEd->mErrorList->addCommentText(std::string("Save complete."));
+	mScriptEd->mErrorList->addCommentText(LLTrans::getString("CompileSuccessful"));
+	mScriptEd->mErrorList->addCommentText(LLTrans::getString("SaveComplete"));
 	closeIfNeeded();
 }
 
@@ -2244,8 +2242,7 @@ void LLLiveLSLEditor::draw()
 	{
 		// HACK: Display this information in the title bar.
 		// Really ought to put in main window.
-		// *TODO: Translate
-		setTitle(std::string("Script (object out of range)"));
+		setTitle(LLTrans::getString("ObjectOutOfRange"));
 		runningCheckbox->setEnabled(FALSE);
 		// object may have fallen out of range.
 		mHaveRunningInfo = FALSE;
@@ -2468,8 +2465,7 @@ void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
 	else
 	{
 		llinfos << "Compile worked!" << llendl;
-		// *TODO: Translate
-		mScriptEd->mErrorList->addCommentText(std::string("Compile successful, saving..."));
+		mScriptEd->mErrorList->addCommentText(LLTrans::getString("CompileSuccessfulSaving"));
 		if(gAssetStorage)
 		{
 			llinfos << "LLLiveLSLEditor::saveAsset "
@@ -2543,8 +2539,7 @@ void LLLiveLSLEditor::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* use
 		if(self)
 		{
 			// Tell the user that the compile worked.
-			// *TODO: Translate
-			self->mScriptEd->mErrorList->addCommentText(std::string("Save complete."));
+			self->mScriptEd->mErrorList->addCommentText(LLTrans::getString("SaveComplete"));
 			// close the window if this completes both uploads
 			self->getWindow()->decBusyCount();
 			self->mPendingUploads--;
diff --git a/indra/newview/llscrollingpanelparam.cpp b/indra/newview/llscrollingpanelparam.cpp
index 88127e68f..7afcf82c4 100644
--- a/indra/newview/llscrollingpanelparam.cpp
+++ b/indra/newview/llscrollingpanelparam.cpp
@@ -77,9 +77,8 @@ LLScrollingPanelParam::LLScrollingPanelParam( const std::string& name,
 		mHintMin->setAllowsUpdates( FALSE );
 		mHintMax->setAllowsUpdates( FALSE );
 
-		// *TODO::translate
-		std::string min_name = param->getMinDisplayName();
-		std::string max_name = param->getMaxDisplayName();
+		std::string min_name = LLTrans::getString(param->getMinDisplayName());
+		std::string max_name = LLTrans::getString(param->getMaxDisplayName());
 		childSetValue("min param text", min_name);
 		childSetValue("max param text", max_name);
 		mLess = getChild<LLButton>("less");
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index e39f3b7df..990a7228a 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -1099,7 +1099,7 @@ LLTextureCtrl::LLTextureCtrl(
 		LLRect( 
 			0, image_middle + line_height / 2,
 			getRect().getWidth(), image_middle - line_height / 2 ),
-		std::string("Multiple"),
+		LLTrans::getString("multiple_textures"),
 		LLFontGL::getFontSansSerifSmall() );
 	mTentativeLabel->setHAlign( LLFontGL::HCENTER );
 	mTentativeLabel->setFollowsAll();
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp
index 7d9f0a136..f2a9a7138 100644
--- a/indra/newview/lltoolpie.cpp
+++ b/indra/newview/lltoolpie.cpp
@@ -40,7 +40,6 @@
 
 #include "llagent.h"
 #include "llagentcamera.h"
-#include "llviewercontrol.h"
 #include "llfocusmgr.h"
 #include "llfirstuse.h"
 #include "llfloateravatarinfo.h"
@@ -56,8 +55,10 @@
 #include "lltoolgrab.h"
 #include "lltoolmgr.h"
 #include "lltoolselect.h"
+#include "lltrans.h"
 #include "llviewercamera.h"
 #include "llviewerparcelmedia.h"
+#include "llviewercontrol.h"
 #include "llviewermenu.h"
 #include "llviewerobjectlist.h"
 #include "llviewerobject.h"
@@ -65,8 +66,8 @@
 #include "llviewerwindow.h"
 #include "llwindow.h"
 #include "llviewermedia.h"
-#include "llviewermediafocus.h"
 #include "llvoavatarself.h"
+#include "llviewermediafocus.h"
 #include "llworld.h"
 #include "llui.h"
 #include "llweb.h"
@@ -401,12 +402,12 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
 			std::string name = avatar->getFullname();
 			if (LLMuteList::getInstance()->isMuted(avatar->getID(), name))
 			{
-				gMenuHolder->childSetText("Avatar Mute", std::string("Unmute")); // *TODO:Translate
+				gMenuHolder->childSetText("Avatar Mute", LLTrans::getString("UnmuteAvatar"));
 				//gMutePieMenu->setLabel("Unmute");
 			}
 			else
 			{
-				gMenuHolder->childSetText("Avatar Mute", std::string("Mute")); // *TODO:Translate
+				gMenuHolder->childSetText("Avatar Mute", LLTrans::getString("MuteAvatar"));
 				//gMutePieMenu->setLabel("Mute");
 			}
 
@@ -451,12 +452,12 @@ BOOL LLToolPie::pickAndShowMenu(BOOL always_show)
 			}
 			if (LLMuteList::getInstance()->isMuted(object->getID(), name))
 			{
-				gMenuHolder->childSetText("Object Mute", std::string("Unmute")); // *TODO:Translate
+				gMenuHolder->childSetText("Object Mute", LLTrans::getString("UnmuteObject"));
 				//gMuteObjectPieMenu->setLabel("Unmute");
 			}
 			else
 			{
-				gMenuHolder->childSetText("Object Mute", std::string("Mute")); // *TODO:Translate
+				gMenuHolder->childSetText("Object Mute", LLTrans::getString("MuteObject2"));
 				//gMuteObjectPieMenu->setLabel("Mute");
 			}
 			
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 8b8c8b703..64f0b24ba 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -440,7 +440,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot, boo
 		case LLAgent::TELEPORT_START_ARRIVAL:
 			// Transition to ARRIVING.  Viewer has received avatar update, etc., from destination simulator
 			gTeleportArrivalTimer.reset();
-			gViewerWindow->setProgressCancelButtonVisible(FALSE, std::string("Cancel")); //TODO: Translate
+				gViewerWindow->setProgressCancelButtonVisible(FALSE, LLTrans::getString("Cancel"));
 			gViewerWindow->setProgressPercent(75.f);
 			gAgent.setTeleportState( LLAgent::TELEPORT_ARRIVING );
 			gAgent.setTeleportMessage(
@@ -459,7 +459,7 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot, boo
 					LLFirstUse::useTeleport();
 					gAgent.setTeleportState( LLAgent::TELEPORT_NONE );
 				}
-				gViewerWindow->setProgressCancelButtonVisible(FALSE, std::string("Cancel")); //TODO: Translate
+				gViewerWindow->setProgressCancelButtonVisible(FALSE, LLTrans::getString("Cancel"));
 				gViewerWindow->setProgressPercent(  arrival_fraction * 25.f + 75.f);
 				gViewerWindow->setProgressString(message);
 			}
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 63a9e002a..bb1ad75a4 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -46,6 +46,7 @@
 #include "llsdserialize.h"
 #include "llsdutil.h"
 #include "llstring.h"
+#include "lltrans.h"
 #include "lltransactiontypes.h"
 #include "lluictrlfactory.h"
 #include "lluuid.h"
@@ -94,6 +95,7 @@
 #include "lllocalinventory.h"
 // </edit>
 
+#include "hippogridmanager.h"
 #include "importtracker.h"
 
 using namespace LLOldEvents;
@@ -855,8 +857,7 @@ void upload_new_resource(const std::string& src_filename, std::string name,
 	else
 	{
 		// Unknown extension
-		// *TODO: Translate?
-		error_message = llformat("Unknown file extension .%s\nExpected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh", exten.c_str());
+		error_message = llformat(LLTrans::getString("UnknownFileExtension").c_str(), exten.c_str());
 		error = TRUE;;
 	}
 
@@ -1021,10 +1022,11 @@ void upload_done_callback(const LLUUID& uuid, void* user_data, S32 result, LLExt
 
 			if(!(can_afford_transaction(expected_upload_cost)))
 			{
-				LLFloaterBuyCurrency::buyCurrency(
-					llformat("Uploading %s costs",
-							 data->mAssetInfo.getName().c_str()), // *TODO: Translate
-					expected_upload_cost);
+				LLStringUtil::format_map_t args;
+				args["[NAME]"] = data->mAssetInfo.getName();
+				args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
+				args["[AMOUNT]"] = llformat("%d", expected_upload_cost);
+				LLFloaterBuyCurrency::buyCurrency( LLTrans::getString("UploadingCosts", args), expected_upload_cost );
 				is_balance_sufficient = FALSE;
 			}
 			else if(region)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 3b61f7af5..bd5932ad4 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1410,7 +1410,6 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 		itemp = (LLViewerInventoryItem*)gInventory.getItem(mObjectID);
 	}
 
-	// *TODO:translate
 	std::string from_string; // Used in the pop-up.
 	std::string chatHistory_string;  // Used in chat history.
 	if (mFromObject == TRUE)
@@ -1420,13 +1419,18 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 			std::string group_name;
 			if (gCacheName->getGroupName(mFromID, group_name))
 			{
-				from_string = std::string("An object named '") + mFromName + "' owned by the group '" + group_name + "'";
-				chatHistory_string = mFromName + " owned by the group '" + group_name + "'";
+				from_string = LLTrans::getString("InvOfferAnObjectNamed") + " " + LLTrans::getString("'")
+				+ mFromName + LLTrans::getString("'") + " " + LLTrans::getString("InvOfferOwnedByGroup")
+				+ " " + LLTrans::getString("'") + group_name + LLTrans::getString("'");
+
+				chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByGroup")
+				+ " " + group_name +  + LLTrans::getString("'") + LLTrans::getString(".");
 			}
 			else
 			{
-				from_string = std::string("An object named '") + mFromName + "' owned by an unknown group";
-				chatHistory_string = mFromName + " owned by an unknown group";
+				from_string = LLTrans::getString("InvOfferAnObjectNamed") + " " + LLTrans::getString("'")
+				+ mFromName + LLTrans::getString("'") + " " + LLTrans::getString("InvOfferOwnedByUnknownGroup");
+				chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByUnknownGroup" + LLTrans::getString("."));
 			}
 		}
 		else
@@ -1439,16 +1443,19 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 				{
 					full_name = RlvStrings::getAnonym(full_name);
 				}
-				from_string = std::string("An object named '") + mFromName + "' owned by " + full_name;
-				chatHistory_string = mFromName + " owned by " + full_name;
+				from_string = LLTrans::getString("InvOfferAnObjectNamed") + " " + LLTrans::getString("'") + mFromName
+				+ LLTrans::getString("'") +" " + LLTrans::getString("InvOfferOwnedBy") + full_name;
+				chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedBy") + " " + full_name + LLTrans::getString(".");
 // [/RLVa:KB]
 				//from_string = std::string("An object named '") + mFromName + "' owned by " + first_name + " " + last_name;
 				//chatHistory_string = mFromName + " owned by " + first_name + " " + last_name;
 			}
 			else
 			{
-				from_string = std::string("An object named '") + mFromName + "' owned by an unknown user";
-				chatHistory_string = mFromName + " owned by an unknown user";
+
+				from_string = LLTrans::getString("InvOfferAnObjectNamed") + " " + LLTrans::getString("'")
+				+ mFromName + LLTrans::getString("'") + " " + LLTrans::getString("InvOfferOwnedByUnknownUser");
+				chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByUnknownUser") + LLTrans::getString(".");
 			}
 		}
 	}
@@ -1504,7 +1511,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 		//don't spam them if they are getting flooded
 		if (check_offer_throttle(mFromName, true))
 		{
-			log_message = chatHistory_string + " gave you " + mDesc + ".";
+			log_message = chatHistory_string + " " + LLTrans::getString("InvOfferGaveYou") + " " + mDesc + LLTrans::getString(".");
  			chat.mText = log_message;
  			LLFloaterChat::addChatHistory(chat);
 		}
@@ -1590,7 +1597,10 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 		}
 // [/RLVa:KB]
 
-		log_message = "You decline " + mDesc + " from " + mFromName + ".";
+		LLStringUtil::format_map_t log_message_args;
+		log_message_args["[DESC]"] = mDesc;
+		log_message_args["[NAME]"] = mFromName;
+		log_message = LLTrans::getString("InvOfferDecline", log_message_args);
 		chat.mText = log_message;
 		if( LLMuteList::getInstance()->isMuted(mFromID ) && ! LLMuteList::getInstance()->isLinden(mFromName) )  // muting for SL-42269
 		{
@@ -2035,7 +2045,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 					computed_session_id,
 					from_id,
 					name,
-					llformat("%s has begun an IM session with you.",name.c_str()),
+					llformat("%s ",name.c_str()) + LLTrans::getString("IM_announce_incoming"),
 					name,
 					IM_NOTHING_SPECIAL,
 					parent_estate_id,
@@ -2099,7 +2109,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 							computed_session_id,
 							from_id,
 							SYSTEM_FROM,
-							llformat("Autoresponse sent to %s.",name.c_str()),
+							LLTrans::getString("IM_autoresponded_to") + llformat(" %s.",name.c_str()),
 							LLStringUtil::null,
 							IM_NOTHING_SPECIAL,
 							parent_estate_id,
@@ -2217,7 +2227,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 									computed_session_id,
 									from_id,
 									SYSTEM_FROM,
-									llformat("Sent %s auto-response item \"%s\"",name.c_str(),item->getName().c_str()),
+									llformat("%s %s \"%s\"",name.c_str(), LLTrans::getString("IM_autoresponse_sent_item").c_str(), item->getName().c_str()),
 									LLStringUtil::null,
 									IM_NOTHING_SPECIAL,
 									parent_estate_id,
@@ -2368,7 +2378,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			std::string saved;
 			if(offline == IM_OFFLINE)
 			{
-				saved = llformat("(Saved %s) ", formatted_time(timestamp).c_str());
+				LLStringUtil::format_map_t args;
+				args["[LONG_TIMESTAMP]"] = formatted_time(timestamp);
+				saved = LLTrans::getString("Saved_message", args);
 			}
 			buffer = separator_string + saved  + message.substr(message_offset);
 
@@ -3902,7 +3914,7 @@ void process_teleport_start(LLMessageSystem *msg, void**)
 	}
 	else
 	{
-		gViewerWindow->setProgressCancelButtonVisible(TRUE, std::string("Cancel")); // *TODO: Translate
+		gViewerWindow->setProgressCancelButtonVisible(TRUE, LLTrans::getString("Cancel"));
 	}
 
 	// Freeze the UI and show progress bar
@@ -3941,7 +3953,7 @@ void process_teleport_progress(LLMessageSystem* msg, void**)
 	}
 	else
 	{
-		gViewerWindow->setProgressCancelButtonVisible(TRUE, std::string("Cancel")); //TODO: Translate
+		gViewerWindow->setProgressCancelButtonVisible(TRUE, LLTrans::getString("Cancel"));
 	}
 	std::string buffer;
 	msg->getString("Info", "Message", buffer);
@@ -6405,7 +6417,7 @@ void container_inventory_arrived(LLViewerObject* object,
 		LLUUID cat_id;
 		cat_id = gInventory.createNewCategory(gInventory.getRootFolderID(),
 											   LLFolderType::FT_NONE,
-											  std::string("Acquired Items")); //TODO: Translate
+											  LLTrans::getString("AcquiredItems"));
 
 		LLInventoryObject::object_list_t::const_iterator it = inventory->begin();
 		LLInventoryObject::object_list_t::const_iterator end = inventory->end();
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index fdfc565e3..bfa6dc60d 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -256,24 +256,23 @@ BOOL LLVOAvatarSelf::buildMenus()
 	//-------------------------------------------------------------------------
 	if(gNoRender)
 		return TRUE;
-	// *TODO: Translate
 	gAttachBodyPartPieMenus[0] = NULL;
-	gAttachBodyPartPieMenus[1] = new LLPieMenu(std::string("Right Arm >"));
-	gAttachBodyPartPieMenus[2] = new LLPieMenu(std::string("Head >"));
-	gAttachBodyPartPieMenus[3] = new LLPieMenu(std::string("Left Arm >"));
+	gAttachBodyPartPieMenus[1] = new LLPieMenu(LLTrans::getString("BodyPartsRightArm") + " >");
+	gAttachBodyPartPieMenus[2] = new LLPieMenu(LLTrans::getString("BodyPartsHead") + " >");
+	gAttachBodyPartPieMenus[3] = new LLPieMenu(LLTrans::getString("BodyPartsLeftArm") + " >");
 	gAttachBodyPartPieMenus[4] = NULL;
-	gAttachBodyPartPieMenus[5] = new LLPieMenu(std::string("Left Leg >"));
-	gAttachBodyPartPieMenus[6] = new LLPieMenu(std::string("Torso >"));
-	gAttachBodyPartPieMenus[7] = new LLPieMenu(std::string("Right Leg >"));
+	gAttachBodyPartPieMenus[5] = new LLPieMenu(LLTrans::getString("BodyPartsLeftLeg") + " >");
+	gAttachBodyPartPieMenus[6] = new LLPieMenu(LLTrans::getString("BodyPartsTorso") + " >");
+	gAttachBodyPartPieMenus[7] = new LLPieMenu(LLTrans::getString("BodyPartsRightLeg") + " >");
 
 	gDetachBodyPartPieMenus[0] = NULL;
-	gDetachBodyPartPieMenus[1] = new LLPieMenu(std::string("Right Arm >"));
-	gDetachBodyPartPieMenus[2] = new LLPieMenu(std::string("Head >"));
-	gDetachBodyPartPieMenus[3] = new LLPieMenu(std::string("Left Arm >"));
+	gDetachBodyPartPieMenus[1] = new LLPieMenu(LLTrans::getString("BodyPartsRightArm") + " >");
+	gDetachBodyPartPieMenus[2] = new LLPieMenu(LLTrans::getString("BodyPartsHead") + " >");
+	gDetachBodyPartPieMenus[3] = new LLPieMenu(LLTrans::getString("BodyPartsLeftArm") + " >");
 	gDetachBodyPartPieMenus[4] = NULL;
-	gDetachBodyPartPieMenus[5] = new LLPieMenu(std::string("Left Leg >"));
-	gDetachBodyPartPieMenus[6] = new LLPieMenu(std::string("Torso >"));
-	gDetachBodyPartPieMenus[7] = new LLPieMenu(std::string("Right Leg >"));
+	gDetachBodyPartPieMenus[5] = new LLPieMenu(LLTrans::getString("BodyPartsLeftLeg") + " >");
+	gDetachBodyPartPieMenus[6] = new LLPieMenu(LLTrans::getString("BodyPartsTorso") + " >");
+	gDetachBodyPartPieMenus[7] = new LLPieMenu(LLTrans::getString("BodyPartsRightLeg") + " >");
 
 	for (S32 i = 0; i < 8; i++)
 	{
@@ -2744,4 +2743,4 @@ void LLVOAvatarSelf::setInvisible(bool invisible)
 		requestLayerSetUploads();
 		gAgent.sendAgentSetAppearance();
 	}
-}
\ No newline at end of file
+}
diff --git a/indra/newview/skins/dark/colors.xml b/indra/newview/skins/dark/colors.xml
index 032351a88..2766ba09b 100644
--- a/indra/newview/skins/dark/colors.xml
+++ b/indra/newview/skins/dark/colors.xml
@@ -70,6 +70,7 @@
 <ScrollHighlightedColor value="183, 184, 188, 128"/>	<!-- Hover color -->
 <ScrollbarThumbColor value="100, 100, 100, 255"/>
 <ScrollbarTrackColor value="153, 154, 158, 255"/>
+<DefaultListText value="255, 255, 255, 255"/>           <!-- We are replacing all the hardcoded black text with this color so we can make skins with white text on dark background -->
 
 <!-- MENUS -->
 <MenuBarBgColor value="62, 62, 62, 255"/>
diff --git a/indra/newview/skins/darkgred/colors.xml b/indra/newview/skins/darkgred/colors.xml
index d7132d44d..22034c252 100644
--- a/indra/newview/skins/darkgred/colors.xml
+++ b/indra/newview/skins/darkgred/colors.xml
@@ -70,6 +70,7 @@
 <ScrollHighlightedColor value="145, 90, 0, 28" />	<!-- Hover color -->
 <ScrollbarThumbColor value="200, 0, 0, 255" />
 <ScrollbarTrackColor value="70, 0, 0, 255" />
+<DefaultListText value="255, 255, 255, 255"/>           <!-- We are replacing all the hardcoded black text with this color so we can make skins with white text on dark background -->
 
 <!-- MENUS -->
 <MenuBarBgColor value="0, 0, 0, 130" />
diff --git a/indra/newview/skins/darkorange/colors.xml b/indra/newview/skins/darkorange/colors.xml
index f3ff107f0..87e646e51 100644
--- a/indra/newview/skins/darkorange/colors.xml
+++ b/indra/newview/skins/darkorange/colors.xml
@@ -72,6 +72,7 @@
 <ScrollHighlightedColor value="183, 184, 188, 128" />	    <!-- Hover color -->
 <ScrollbarThumbColor value="255, 187, 55, 255" />            <!-- Scroll bar-->
 <ScrollbarTrackColor value="167, 156, 139, 255" />          <!-- Scroll bar background-->
+<DefaultListText value="255, 255, 255, 255"/>           <!-- We are replacing all the hardcoded black text with this color so we can make skins with white text on dark background -->
 
 <!-- MENUS -->
 <MenuBarBgColor value="62, 62, 62, 255" />
diff --git a/indra/newview/skins/default/colors_base.xml b/indra/newview/skins/default/colors_base.xml
index eafb95481..eaed66c4d 100644
--- a/indra/newview/skins/default/colors_base.xml
+++ b/indra/newview/skins/default/colors_base.xml
@@ -73,6 +73,7 @@
 <ScrollHighlightedColor value="183, 184, 188, 128" />	    <!-- Hover color -->
 <ScrollbarThumbColor value="60, 76, 124, 255" />            <!-- Scroll bar-->
 <ScrollbarTrackColor value="153, 154, 158, 255" />          <!-- Scroll bar background-->
+<DefaultListText value="0, 0, 0, 255"/>                     <!-- We are replacing all the hardcoded black text with this color so we can make skins with white text on dark background -->
 
 <!-- MENUS -->
 <MenuBarBgColor value="62, 62, 62, 255" />
@@ -149,6 +150,13 @@
 <RadarLinden value="0, 0, 128, 255" />
 <RadarEstateOwner value="204, 102, 10, 255" />
 <RadarMuted value="128, 128, 128, 255" />
+<RadarTextChatRange value="255, 0, 0, 255"/>
+<RadarTextShoutRange value="255, 255, 0, 128"/>
+<RadarTextDrawDist value="0, 153, 0, 255"/>
+
+<!-- SPEAKERS -->
+<SpeakersInactive value="76, 76, 76, 255"/>
+<SpeakersGhost value="255, 0, 0, 255"/>
 
 <!-- MINI-MAP -->
 <NetMapBackgroundColor value="0, 0, 0, 77" />
diff --git a/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index 0cdb416c2..41ffa8969 100644
--- a/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -1345,6 +1345,11 @@ Select the thumbnail to choose a different texture.
 			<string name="estate_override">
 				One or more of these options is set at the estate level
 			</string>
+			<string name="minutes"/>minutes</string>
+			<string name="1_minute"/>1 minute</string>
+			<string name="1_second"/>1 second</string>
+			<string name="seconds"/>seconds</string>
+			<string name="remaining"/>remaining</string>
 			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 			     height="16" initial_value="false" label="Allow Group Access: [GROUP]"
 			     left="8" mouse_opaque="true" name="GroupCheck" radio_style="false"
diff --git a/indra/newview/skins/default/xui/en-us/floater_radar.xml b/indra/newview/skins/default/xui/en-us/floater_radar.xml
index d0b67529b..75fe1898f 100644
--- a/indra/newview/skins/default/xui/en-us/floater_radar.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_radar.xml
@@ -82,7 +82,7 @@
 			<button
 			       name="teleport_btn"
 			       label="TP to"
-			       tool_tip="Teleport to avatar's position"
+			       tool_tip="Teleport to avatar's position (Ctrl-Enter)"
 			       left_delta="90"
 			       bottom_delta="0"
 			       width="80"
@@ -128,7 +128,7 @@
 			<button
 			       name="focus_btn"
 			       label="Focus"
-			       tool_tip="Focus camera on this avatar in the list"
+			       tool_tip="Focus camera on this avatar in the list (Enter)"
 			       left="10"
 			       bottom_delta="-22"
 			       width="80"
@@ -326,4 +326,10 @@
 			       />
 		</panel>
 	</tab_container>
+	<string name="has_entered">has entered</string>
+	<string name="has_left">has left</string>
+	<string name="the_sim">the sim</string>
+	<string name="draw_distance">draw distance</string>
+	<string name="shout_range">shout range</string>
+	<string name="chat_range">chat range</string>
 </floater>
diff --git a/indra/newview/skins/default/xui/en-us/floater_script_queue.xml b/indra/newview/skins/default/xui/en-us/floater_script_queue.xml
index 90d1ac12e..b626c1cb4 100644
--- a/indra/newview/skins/default/xui/en-us/floater_script_queue.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_script_queue.xml
@@ -3,6 +3,11 @@
      can_resize="true" enabled="true" height="400" left="408" min_height="100"
      min_width="100" mouse_opaque="true" name="queue" title="Reset Progress"
      width="300" border_bevel="none" border_thickness="0">
+	<string name="Starting">Starting [START] of [COUNT] items.</string>
+	<string name="Done">Done.</string>
+	<string name="Resetting">Resetting</string>
+	<string name="Running">Running</string>
+	<string name="NotRunning">Not Running</string>
 	<button bottom="-392" enabled="true" follows="right|bottom" font="SansSerif"
 	     halign="center" height="24" label="Close" label_selected="Close" left="220"
 	     mouse_opaque="true" name="close" width="64" />
diff --git a/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 5607d419e..5b7eb923c 100644
--- a/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -146,6 +146,7 @@
 			<scroll_list background_visible="true" bottom="-282" column_padding="5" draw_border="true"
 			     follows="left|top" height="90" left="79" mouse_opaque="false"
 			     multi_select="false" name="groups" width="321" />
+			<string name="None">None</string>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			     bottom="-304" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="right" height="16" left="4"
diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index 6d6473265..7ae391911 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -38,6 +38,7 @@
 	<!--  progress -->
 	<string name="ProgressRestoring">Restoring...</string>
 	<string name="ProgressChangingResolution">Changing Resolution...</string>
+
 	<!-- Login -->
 	<string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen.  Please wait.</string>
 	<string name="LoginInProgressNoFrozen">Logging in...</string>
@@ -111,6 +112,10 @@
 	<string name="TooltipDragOntoOwnChild">You can't move a folder into its child</string>
 	<string name="TooltipDragOntoSelf">You can't move a folder into itself</string>
 
+	<!-- searching - generic -->
+	<string name="Searching">Searching...</string>
+	<string name="NoneFound">None found.</string>
+
 	<!-- Indicates that an avatar's name or other similar datum is being retrieved. General usage. -->
 	<string name="RetrievingData">Retrieving...</string>
 
@@ -223,6 +228,10 @@
 	<string name="anim_yes_happy">Yes (Happy)</string>
 	<string name="anim_yes_head">Yes</string>
 
+	<!-- build floater -->
+	<string name="multiple_textures">Multiple</string>
+
+	<!-- world map -->
 	<string name="texture_loading">Loading...</string>
 	<string name="worldmap_offline">Offline</string>
 
@@ -2742,6 +2751,12 @@ Where tag = tag string to match.  Removes bot's matching the tag.
 	</string>
 <!-- *** END OF OpenSimulator & Aurora-Sim syntax section *** -->
 
+	<!-- Strings needed by drop targets -->
+	<string name="CurrentlyNotSet">Currently not set</string>
+	<string name="CurrentlySetTo">Currently set to</string>
+	<string name="AnItemNotOnThisAccount">an item not on this account</string>
+	<string name="NotLoggedIn">Not logged in</string>
+
   <!-- Avatar busy/away mode -->
 	<string name="AvatarSetNotAway">Not Away</string>
 	<string name="AvatarSetAway">Away</string>
@@ -2749,10 +2764,32 @@ Where tag = tag string to match.  Removes bot's matching the tag.
 	<string name="AvatarSetBusy">Busy</string>
 
 
-
+	<!-- LLGroupNotify -->
+	<!-- used in the construction of a Group Notice blue dialog box, buttons, tooltip etc. Seems to be no longer utilized by code in Viewer 2.0 -->
+	<string name="next">Next</string>
 	<string name="ok">OK</string>
+	<string name="GroupNotifyGroupNotice">Group Notice</string>
+	<string name="GroupNotifyGroupNotices">Group Notices</string>
+	<string name="GroupNotifySentBy">Sent by</string>
+	<string name="GroupNotifyAttached">Attached:</string>
+	<string name="GroupNotifyViewPastNotices">View past notices or opt-out of receiving these messages here.</string>
+	<string name="GroupNotifyOpenAttachment">Open Attachment</string>
+	<string name="GroupNotifySaveAttachment">Save Attachment</string>
+
+	<!-- body parts -->
+	<string name="BodyPartsRightArm">Right Arm</string>
+	<string name="BodyPartsHead">Head</string>
+	<string name="BodyPartsLeftArm">Left Arm</string>
+	<string name="BodyPartsLeftLeg">Left Leg</string>
+	<string name="BodyPartsTorso">Torso</string>
+	<string name="BodyPartsRightLeg">Right Leg</string>
+
 	<!-- mouselook -->
 	<string name="LeaveMouselook">Press ESC to return to World View</string>
+
+	<!-- inventory -->
+	<string name="InventoryNoMatchingItems">No matching items found in inventory.</string>
+
 	<!-- use value="" because they have preceding spaces -->
 	<string name="no_transfer" value=" (no transfer)" />
 	<string name="no_modify"   value=" (no modify)" />
@@ -2779,6 +2816,29 @@ Where tag = tag string to match.  Removes bot's matching the tag.
 	<string name="HelloAvatar"   value=" Hello, avatar! " />
 	<string name="ViewAllGestures"  value="  View All &gt;&gt;" />
 	<string name="GetMoreGestures"  value="  Get More &gt;&gt;" />
+
+	<!-- inventory filter -->
+    <!-- use value="" because they have preceding spaces -->
+	<string name="Animations"    value=" Animations," />
+	<string name="Calling Cards" value=" Calling Cards," />
+	<string name="Clothing"      value=" Clothing," />
+	<string name="Gestures"      value=" Gestures," />
+	<string name="Landmarks"     value=" Landmarks," />
+	<string name="Notecards"     value=" Notecards," />
+	<string name="Objects"       value=" Objects," />
+	<string name="Scripts"       value=" Scripts," />
+	<string name="Sounds"        value=" Sounds," />
+	<string name="Textures"      value=" Textures," />
+	<string name="Snapshots"     value=" Snapshots," />
+	<string name="No Filters"    value="No " />
+	<string name="Since Logoff"  value=" - Since Logoff" />
+	<string name="Worn"          value=" - Worn" />
+
+
+	<!-- inventory FVBridge -->
+	<!--  This is used in llpanelinventory.cpp when constructing a context menu for an item for Sale  -->
+	<string name="Buy">Buy</string>
+
 	<string name="Stone">Stone</string>
 	<string name="Metal">Metal</string>
 	<string name="Glass">Glass</string>
@@ -2787,12 +2847,59 @@ Where tag = tag string to match.  Removes bot's matching the tag.
 	<string name="Plastic">Plastic</string>
 	<string name="Rubber">Rubber</string>
 	<string name="Light">Light</string>
+
+	<!-- compile queue-->
+	<string name="CompileQueueDownloadedCompiling">Downloaded, now compiling</string>
+	<string name="CompileQueueScriptNotFound">Script not found on server.</string>
+	<string name="CompileQueueProblemDownloading">Problem downloading</string>
+	<string name="CompileQueueInsufficientPermDownload">Insufficient permissions to download a script.</string>
+	<string name="CompileQueueInsufficientPermFor">Insufficient permissions for</string>
+	<string name="CompileQueueUnknownFailure">Unknown failure to download</string>
+	<string name="CompileQueueTitle">Recompilation Progress</string>
+	<string name="CompileQueueStart">recompile</string>
+	<string name="ResetQueueTitle">Reset Progress</string>
+	<string name="ResetQueueStart">reset</string>
+	<string name="RunQueueTitle">Set Running Progress</string>
+	<string name="RunQueueStart">set running</string>
+	<string name="NotRunQueueTitle">Set Not Running Progress</string>
+	<string name="NotRunQueueStart">set not running</string>
+
+	<!-- compile comment text-->
+	<string name="CompileSuccessful">Compile successful!</string>
+	<string name="CompileSuccessfulSaving">Compile successful, saving...</string>
+	<string name="SaveComplete">Save complete.</string>
+	<string name="ObjectOutOfRange">Script (object out of range)</string>
+
 	<string name="Unknown">(Unknown)</string>
 	<!-- Environment settings -->
 	<string name="Local">Local</string>
 	<string name="LocalSettings">Local Settings</string>
 	<string name="Region">Region</string>
 	<string name="RegionSettings">Region Settings</string>
+
+	<!-- inventory offer -->
+	<string name="InvOfferAnObjectNamed">An object named</string>
+	<string name="InvOfferOwnedByGroup">owned by the group</string>
+	<string name="InvOfferOwnedByUnknownGroup">owned by an unknown group</string>
+	<string name="InvOfferOwnedBy">owned by</string>
+	<string name="InvOfferOwnedByUnknownUser">owned by an unknown user</string>
+	<string name="InvOfferGaveYou">gave you</string>
+	<string name="InvOfferDecline">You decline [DESC] from [NAME].</string>
+
+	<!-- Viewer menu -->
+	<string name="AcquiredItems">Acquired Items</string>
+	<string name="Cancel">Cancel</string>
+	<string name="UploadingCosts">Uploading [NAME] costs [CURRENCY] [AMOUNT]</string>
+	<string name="UnknownFileExtension">
+		Unknown file extension .%s
+Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh
+	</string>
+  <string name="MuteObject2">Mute</string>
+  <string name="MuteAvatar">Mute</string>
+  <string name="UnmuteObject">Unmute</string>
+  <string name="UnmuteAvatar">Unmute</string>
+
+
 	<!-- menu accelerators -->
 	<string name="accel-mac-control">Ctrl-</string>
 	<string name="accel-mac-command">Cmd-</string>
@@ -2801,6 +2908,32 @@ Where tag = tag string to match.  Removes bot's matching the tag.
 	<string name="accel-win-control">Ctrl-</string>
 	<string name="accel-win-alt">Alt-</string>
 	<string name="accel-win-shift">Shift-</string>
+
+	<!-- Directions, HUD -->
+	<string name="Direction_Forward">Forward</string>
+	<string name="Direction_Left">Left</string>
+	<string name="Direction_Right">Right</string>
+	<string name="Direction_Back">Back</string>
+	<string name="Direction_North">North</string>
+	<string name="Direction_South">South</string>
+	<string name="Direction_West">West</string>
+	<string name="Direction_East">East</string>
+	<string name="Direction_Up">Up</string>
+	<string name="Direction_Down">Down</string>
+
+	<string name="None">None</string>
+
+	<!-- punctuations -->
+	<string name=":">:</string>
+	<string name=",">,</string>
+	<string name="...">...</string>
+	<string name="***">***</string>
+	<string name="(">(</string>
+	<string name=")">)</string>
+	<string name=".">.</string>
+	<string name="'">'</string>
+	<string name="---">---</string>
+
 	<!-- OSMessageBox messages -->
 	<string name="MBCmdLineError">
 		An error was found parsing the command line.
@@ -2862,12 +2995,594 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 
 If you continue to receive this message, contact the [SUPPORT_SITE].
 	</string>
-	
+
+	<!-- Avatar Shape Information -->
+<string name="5 O'Clock Shadow">5 O'Clock Shadow</string>
+
+<string name="All White">All White</string>
+<string name="Anime Eyes">Anime Eyes</string>
+<string name="Arced">Arched</string>
+<string name="Arm Length">Arm Length</string>
+<string name="Attached">Attached</string>
+<string name="Attached Earlobes">Attached Earlobes</string>
+
+
+<string name="Back Fringe">Back Fringe</string>
+
+<string name="Baggy">Baggy</string>
+<string name="Bangs">Bangs</string>
+
+<string name="Beady Eyes">Beady Eyes</string>
+<string name="Belly Size">Belly Size</string>
+<string name="Big">Big</string>
+<string name="Big Butt">Big Butt</string>
+
+<string name="Big Hair Back">Big Hair: Back</string>
+<string name="Big Hair Front">Big Hair: Front</string>
+<string name="Big Hair Top">Big Hair: Top</string>
+<string name="Big Head">Big Head</string>
+<string name="Big Pectorals">Big Pectorals</string>
+<string name="Big Spikes">Big Spikes</string>
+<string name="Black">Black</string>
+<string name="Blonde">Blonde</string>
+<string name="Blonde Hair">Blonde Hair</string>
+<string name="Blush">Blush</string>
+<string name="Blush Color">Blush Color</string>
+<string name="Blush Opacity">Blush Opacity</string>
+<string name="Body Definition">Body Definition</string>
+<string name="Body Fat">Body Fat</string>
+<string name="Body Freckles">Body Freckles</string>
+<string name="Body Thick">Body Thick</string>
+<string name="Body Thickness">Body Thickness</string>
+<string name="Body Thin">Body Thin</string>
+
+<string name="Bow Legged">Bow Legged</string>
+<string name="Breast Buoyancy">Breast Buoyancy</string>
+<string name="Breast Cleavage">Breast Cleavage</string>
+<string name="Breast Size">Breast Size</string>
+<string name="Bridge Width">Bridge Width</string>
+<string name="Broad">Broad</string>
+<string name="Brow Size">Brow Size</string>
+<string name="Bug Eyes">Bug Eyes</string>
+<string name="Bugged Eyes">Bugged Eyes</string>
+<string name="Bulbous">Bulbous</string>
+<string name="Bulbous Nose">Bulbous Nose</string>
+
+<string name="Breast Physics Mass">Breast Mass</string>
+<string name="Breast Physics Smoothing">Breast Smoothing</string>
+<string name="Breast Physics Gravity">Breast Gravity</string>
+<string name="Breast Physics Drag">Breast Drag</string>
+
+<string name="Breast Physics InOut Max Effect">Max Effect</string>
+<string name="Breast Physics InOut Spring">Spring</string>
+<string name="Breast Physics InOut Gain">Gain</string>
+<string name="Breast Physics InOut Damping">Damping</string>
+
+<string name="Breast Physics UpDown Max Effect">Max Effect</string>
+<string name="Breast Physics UpDown Spring">Spring</string>
+<string name="Breast Physics UpDown Gain">Gain</string>
+<string name="Breast Physics UpDown Damping">Damping</string>
+
+<string name="Breast Physics LeftRight Max Effect">Max Effect</string>
+<string name="Breast Physics LeftRight Spring">Spring</string>
+<string name="Breast Physics LeftRight Gain">Gain</string>
+<string name="Breast Physics LeftRight Damping">Damping</string>
+
+<string name="Belly Physics Mass">Belly Mass</string>
+<string name="Belly Physics Smoothing">Belly Smoothing</string>
+<string name="Belly Physics Gravity">Belly Gravity</string>
+<string name="Belly Physics Drag">Belly Drag</string>
+
+<string name="Belly Physics UpDown Max Effect">Max Effect</string>
+<string name="Belly Physics UpDown Spring">Spring</string>
+<string name="Belly Physics UpDown Gain">Gain</string>
+<string name="Belly Physics UpDown Damping">Damping</string>
+
+<string name="Butt Physics Mass">Butt Mass</string>
+<string name="Butt Physics Smoothing">Butt Smoothing</string>
+<string name="Butt Physics Gravity">Butt Gravity</string>
+<string name="Butt Physics Drag">Butt Drag</string>
+
+<string name="Butt Physics UpDown Max Effect">Max Effect</string>
+<string name="Butt Physics UpDown Spring">Spring</string>
+<string name="Butt Physics UpDown Gain">Gain</string>
+<string name="Butt Physics UpDown Damping">Damping</string>
+
+<string name="Butt Physics LeftRight Max Effect">Max Effect</string>
+<string name="Butt Physics LeftRight Spring">Spring</string>
+<string name="Butt Physics LeftRight Gain">Gain</string>
+<string name="Butt Physics LeftRight Damping">Damping</string>
+
+<string name="Bushy Eyebrows">Bushy Eyebrows</string>
+<string name="Bushy Hair">Bushy Hair</string>
+<string name="Butt Size">Butt Size</string>
+<string name="Butt Gravity">Butt Gravity</string>
+<string name="bustle skirt">Bustle Skirt</string>
+<string name="no bustle">No Bustle</string>
+<string name="more bustle">More Bustle</string>
+
+<string name="Chaplin">Chaplin</string>
+<string name="Cheek Bones">Cheek Bones</string>
+<string name="Chest Size">Chest Size</string>
+<string name="Chin Angle">Chin Angle</string>
+<string name="Chin Cleft">Chin Cleft</string>
+<string name="Chin Curtains">Chin Curtains</string>
+
+<string name="Chin Depth">Chin Depth</string>
+<string name="Chin Heavy">Chin Heavy</string>
+<string name="Chin In">Chin In</string>
+<string name="Chin Out">Chin Out</string>
+<string name="Chin-Neck">Chin-Neck</string>
+<string name="Clear">Clear</string>
+<string name="Cleft">Cleft</string>
+<string name="Close Set Eyes">Close Set Eyes</string>
+<string name="Closed">Closed</string>
+<string name="Closed Back">Closed Back</string>
+<string name="Closed Front">Closed Front</string>
+<string name="Closed Left">Closed Left</string>
+<string name="Closed Right">Closed Right</string>
+<string name="Coin Purse">Coin Purse</string>
+<string name="Collar Back">Collar Back</string>
+
+
+
+<string name="Collar Front">Collar Front</string>
+
+
+
+<string name="Corner Down">Corner Down</string>
+
+<string name="Corner Up">Corner Up</string>
+<string name="Creased">Creased</string>
+<string name="Crooked Nose">Crooked Nose</string>
+
+<string name="Cuff Flare">Cuff Flare</string>
+<string name="Dark">Dark</string>
+<string name="Dark Green">Dark Green</string>
+<string name="Darker">Darker</string>
+<string name="Deep">Deep</string>
+<string name="Default Heels">Default Heels</string>
+
+<string name="Dense">Dense</string>
+
+<string name="Double Chin">Double Chin</string>
+<string name="Downturned">Downturned</string>
+<string name="Duffle Bag">Duffle Bag</string>
+<string name="Ear Angle">Ear Angle</string>
+<string name="Ear Size">Ear Size</string>
+<string name="Ear Tips">Ear Tips</string>
+<string name="Egg Head">Egg Head</string>
+<string name="Eye Bags">Eye Bags</string>
+<string name="Eye Color">Eye Color</string>
+<string name="Eye Depth">Eye Depth</string>
+<string name="Eye Lightness">Eye Lightness</string>
+<string name="Eye Opening">Eye Opening</string>
+<string name="Eye Pop">Eye Pop</string>
+<string name="Eye Size">Eye Size</string>
+<string name="Eye Spacing">Eye Spacing</string>
+
+<string name="Eyebrow Arc">Eyebrow Arc</string>
+<string name="Eyebrow Density">Eyebrow Density</string>
+
+<string name="Eyebrow Height">Eyebrow Height</string>
+<string name="Eyebrow Points">Eyebrow Points</string>
+<string name="Eyebrow Size">Eyebrow Size</string>
+
+<string name="Eyelash Length">Eyelash Length</string>
+<string name="Eyeliner">Eyeliner</string>
+<string name="Eyeliner Color">Eyeliner Color</string>
+
+<string name="Eyes Bugged">Eyes Bugged</string>
+
+
+
+
+
+
+
+
+<string name="Face Shear">Face Shear</string>
+<string name="Facial Definition">Facial Definition</string>
+<string name="Far Set Eyes">Far Set Eyes</string>
+
+<string name="Fat Lips">Fat Lips</string>
+
+<string name="Female">Female</string>
+<string name="Fingerless">Fingerless</string>
+<string name="Fingers">Fingers</string>
+<string name="Flared Cuffs">Flared Cuffs</string>
+<string name="Flat">Flat</string>
+<string name="Flat Butt">Flat Butt</string>
+<string name="Flat Head">Flat Head</string>
+<string name="Flat Toe">Flat Toe</string>
+<string name="Foot Size">Foot Size</string>
+<string name="Forehead Angle">Forehead Angle</string>
+<string name="Forehead Heavy">Forehead Heavy</string>
+<string name="Freckles">Freckles</string>
+
+<string name="Front Fringe">Front Fringe</string>
+
+<string name="Full Back">Full Back</string>
+<string name="Full Eyeliner">Full Eyeliner</string>
+<string name="Full Front">Full Front</string>
+<string name="Full Hair Sides">Full Hair Sides</string>
+<string name="Full Sides">Full Sides</string>
+<string name="Glossy">Glossy</string>
+<string name="Glove Fingers">Glove Fingers</string>
+
+<string name="Glove Length">Glove Length</string>
+
+
+<string name="Hair">Hair</string>
+<string name="Hair Back">Hair: Back</string>
+<string name="Hair Front">Hair: Front</string>
+<string name="Hair Sides">Hair: Sides</string>
+<string name="Hair Sweep">Hair Sweep</string>
+<string name="Hair Thickess">Hair Thickness</string>
+<string name="Hair Thickness">Hair Thickness</string>
+<string name="Hair Tilt">Hair Tilt</string>
+<string name="Hair Tilted Left">Hair Tilted Left</string>
+<string name="Hair Tilted Right">Hair Tilted Right</string>
+<string name="Hair Volume">Hair: Volume</string>
+<string name="Hand Size">Hand Size</string>
+<string name="Handlebars">Handlebars</string>
+<string name="Head Length">Head Length</string>
+<string name="Head Shape">Head Shape</string>
+<string name="Head Size">Head Size</string>
+<string name="Head Stretch">Head Stretch</string>
+<string name="Heel Height">Heel Height</string>
+<string name="Heel Shape">Heel Shape</string>
+<string name="Height">Height</string>
+<string name="High">High</string>
+<string name="High Heels">High Heels</string>
+<string name="High Jaw">High Jaw</string>
+<string name="High Platforms">High Platforms</string>
+<string name="High and Tight">High and Tight</string>
+<string name="Higher">Higher</string>
+<string name="Hip Length">Hip Length</string>
+<string name="Hip Width">Hip Width</string>
+<string name="In">In</string>
+<string name="In Shdw Color">Inner Shadow Color</string>
+<string name="In Shdw Opacity">Inner Shadow Opacity</string>
+<string name="Inner Eye Corner">Inner Eye Corner</string>
+<string name="Inner Eye Shadow">Inner Eye Shadow</string>
+<string name="Inner Shadow">Inner Shadow</string>
+
+
+<string name="Jacket Length">Jacket Length</string>
+
+<string name="Jacket Wrinkles">Jacket Wrinkles</string>
+<string name="Jaw Angle">Jaw Angle</string>
+<string name="Jaw Jut">Jaw Jut</string>
+<string name="Jaw Shape">Jaw Shape</string>
+<string name="Join">Join</string>
+<string name="Jowls">Jowls</string>
+<string name="Knee Angle">Knee Angle</string>
+<string name="Knock Kneed">Knock Kneed</string>
+
+<string name="Large">Large</string>
+<string name="Large Hands">Large Hands</string>
+<string name="Left Part">Left Part</string>
+<string name="Leg Length">Leg Length</string>
+<string name="Leg Muscles">Leg Muscles</string>
+<string name="Less">Less</string>
+<string name="Less Body Fat">Less Body Fat</string>
+<string name="Less Curtains">Less Curtains</string>
+<string name="Less Freckles">Less Freckles</string>
+<string name="Less Full">Less Full</string>
+<string name="Less Gravity">Less Gravity</string>
+<string name="Less Love">Less Love</string>
+<string name="Less Muscles">Less Muscles</string>
+<string name="Less Muscular">Less Muscular</string>
+<string name="Less Rosy">Less Rosy</string>
+<string name="Less Round">Less Round</string>
+<string name="Less Saddle">Less Saddle</string>
+<string name="Less Square">Less Square</string>
+<string name="Less Volume">Less Volume</string>
+<string name="Less soul">Less soul</string>
+<string name="Lighter">Lighter</string>
+<string name="Lip Cleft">Lip Cleft</string>
+<string name="Lip Cleft Depth">Lip Cleft Depth</string>
+<string name="Lip Fullness">Lip Fullness</string>
+<string name="Lip Pinkness">Lip Pinkness</string>
+<string name="Lip Ratio">Lip Ratio</string>
+<string name="Lip Thickness">Lip Thickness</string>
+<string name="Lip Width">Lip Width</string>
+<string name="Lipgloss">Lipgloss</string>
+<string name="Lipstick">Lipstick</string>
+<string name="Lipstick Color">Lipstick Color</string>
+<string name="Long">Long</string>
+<string name="Long Head">Long Head</string>
+<string name="Long Hips">Long Hips</string>
+<string name="Long Legs">Long Legs</string>
+<string name="Long Neck">Long Neck</string>
+<string name="Long Pigtails">Long Pigtails</string>
+<string name="Long Ponytail">Long Ponytail</string>
+<string name="Long Torso">Long Torso</string>
+<string name="Long arms">Long arms</string>
+
+
+<string name="Loose Pants">Loose Pants</string>
+<string name="Loose Shirt">Loose Shirt</string>
+<string name="Loose Sleeves">Loose Sleeves</string>
+
+<string name="Love Handles">Love Handles</string>
+<string name="Low">Low</string>
+<string name="Low Heels">Low Heels</string>
+<string name="Low Jaw">Low Jaw</string>
+<string name="Low Platforms">Low Platforms</string>
+<string name="Low and Loose">Low and Loose</string>
+<string name="Lower">Lower</string>
+<string name="Lower Bridge">Lower Bridge</string>
+<string name="Lower Cheeks">Lower Cheeks</string>
+
+<string name="Male">Male</string>
+<string name="Middle Part">Middle Part</string>
+<string name="More">More</string>
+<string name="More Blush">More Blush</string>
+<string name="More Body Fat">More Body Fat</string>
+<string name="More Curtains">More Curtains</string>
+<string name="More Eyeshadow">More Eyeshadow</string>
+<string name="More Freckles">More Freckles</string>
+<string name="More Full">More Full</string>
+<string name="More Gravity">More Gravity</string>
+<string name="More Lipstick">More Lipstick</string>
+<string name="More Love">More Love</string>
+<string name="More Lower Lip">More Lower Lip</string>
+<string name="More Muscles">More Muscles</string>
+<string name="More Muscular">More Muscular</string>
+<string name="More Rosy">More Rosy</string>
+<string name="More Round">More Round</string>
+<string name="More Saddle">More Saddle</string>
+<string name="More Sloped">More Sloped</string>
+<string name="More Square">More Square</string>
+<string name="More Upper Lip">More Upper Lip</string>
+<string name="More Vertical">More Vertical</string>
+<string name="More Volume">More Volume</string>
+<string name="More soul">More soul</string>
+<string name="Moustache">Moustache</string>
+
+<string name="Mouth Corner">Mouth Corner</string>
+<string name="Mouth Position">Mouth Position</string>
+<string name="Mowhawk">Mohawk</string>
+<string name="Muscular">Muscular</string>
+<string name="Mutton Chops">Mutton Chops</string>
+
+<string name="Nail Polish">Nail Polish</string>
+<string name="Nail Polish Color">Nail Polish Color</string>
+<string name="Narrow">Narrow</string>
+<string name="Narrow Back">Narrow Back</string>
+<string name="Narrow Front">Narrow Front</string>
+<string name="Narrow Lips">Narrow Lips</string>
+<string name="Natural">Natural</string>
+<string name="Neck Length">Neck Length</string>
+<string name="Neck Thickness">Neck Thickness</string>
+<string name="No Blush">No Blush</string>
+<string name="No Eyeliner">No Eyeliner</string>
+<string name="No Eyeshadow">No Eyeshadow</string>
+
+<string name="No Lipgloss">No Lipgloss</string>
+<string name="No Lipstick">No Lipstick</string>
+<string name="No Part">No Part</string>
+<string name="No Polish">No Polish</string>
+<string name="No Red">No Red</string>
+<string name="No Spikes">No Spikes</string>
+<string name="No White">No White</string>
+<string name="No Wrinkles">No Wrinkles</string>
+<string name="Normal Lower">Normal Lower</string>
+<string name="Normal Upper">Normal Upper</string>
+<string name="Nose Left">Nose Left</string>
+<string name="Nose Right">Nose Right</string>
+<string name="Nose Size">Nose Size</string>
+<string name="Nose Thickness">Nose Thickness</string>
+<string name="Nose Tip Angle">Nose Tip Angle</string>
+<string name="Nose Tip Shape">Nose Tip Shape</string>
+<string name="Nose Width">Nose Width</string>
+<string name="Nostril Division">Nostril Division</string>
+<string name="Nostril Width">Nostril Width</string>
+
+
+<string name="Opaque">Opaque</string>
+<string name="Open">Open</string>
+<string name="Open Back">Open Back</string>
+<string name="Open Front">Open Front</string>
+<string name="Open Left">Open Left</string>
+<string name="Open Right">Open Right</string>
+<string name="Orange">Orange</string>
+<string name="Out">Out</string>
+<string name="Out Shdw Color">Outer Shadow Color</string>
+<string name="Out Shdw Opacity">Outer Shadow Opacity</string>
+<string name="Outer Eye Corner">Outer Eye Corner</string>
+<string name="Outer Eye Shadow">Outer Eye Shadow</string>
+<string name="Outer Shadow">Outer Shadow</string>
+<string name="Overbite">Overbite</string>
+
+<string name="Package">Package</string>
+<string name="Painted Nails">Painted Nails</string>
+<string name="Pale">Pale</string>
+<string name="Pants Crotch">Pants Crotch</string>
+<string name="Pants Fit">Pants Fit</string>
+<string name="Pants Length">Pants Length</string>
+
+
+<string name="Pants Waist">Pants Waist</string>
+<string name="Pants Wrinkles">Pants Wrinkles</string>
+<string name="Part">Part</string>
+<string name="Part Bangs">Part Bangs</string>
+<string name="Pectorals">Pectorals</string>
+<string name="Pigment">Pigment</string>
+<string name="Pigtails">Pigtails</string>
+<string name="Pink">Pink</string>
+<string name="Pinker">Pinker</string>
+<string name="Platform Height">Platform Height</string>
+<string name="Platform Width">Platform Width</string>
+<string name="Pointy">Pointy</string>
+<string name="Pointy Heels">Pointy Heels</string>
+
+<string name="Ponytail">Ponytail</string>
+<string name="Poofy Skirt">Poofy Skirt</string>
+<string name="Pop Left Eye">Pop Left Eye</string>
+<string name="Pop Right Eye">Pop Right Eye</string>
+<string name="Puffy">Puffy</string>
+<string name="Puffy Eyelids">Puffy Eyelids</string>
+<string name="Rainbow Color">Rainbow Color</string>
+<string name="Red Hair">Red Hair</string>
+
+<string name="Regular">Regular</string>
+
+<string name="Right Part">Right Part</string>
+<string name="Rosy Complexion">Rosy Complexion</string>
+<string name="Round">Round</string>
+
+<string name="Ruddiness">Ruddiness</string>
+<string name="Ruddy">Ruddy</string>
+<string name="Rumpled Hair">Rumpled Hair</string>
+<string name="Saddle Bags">Saddle Bags</string>
+
+
+<string name="Scrawny Leg">Scrawny Leg</string>
+<string name="Separate">Separate</string>
+
+
+<string name="Shallow">Shallow</string>
+<string name="Shear Back">Shear Back</string>
+<string name="Shear Face">Shear Face</string>
+<string name="Shear Front">Shear Front</string>
+
+<string name="Shear Left Up">Shear Left Up</string>
+
+<string name="Shear Right Up">Shear Right Up</string>
+<string name="Sheared Back">Sheared Back</string>
+<string name="Sheared Front">Sheared Front</string>
+<string name="Shift Left">Shift Left</string>
+<string name="Shift Mouth">Shift Mouth</string>
+<string name="Shift Right">Shift Right</string>
+<string name="Shirt Bottom">Shirt Bottom</string>
+
+<string name="Shirt Fit">Shirt Fit</string>
+
+<string name="Shirt Wrinkles">Shirt Wrinkles</string>
+<string name="Shoe Height">Shoe Height</string>
+
+<string name="Short">Short</string>
+<string name="Short Arms">Short Arms</string>
+<string name="Short Legs">Short Legs</string>
+<string name="Short Neck">Short Neck</string>
+<string name="Short Pigtails">Short Pigtails</string>
+<string name="Short Ponytail">Short Ponytail</string>
+<string name="Short Sideburns">Short Sideburns</string>
+<string name="Short Torso">Short Torso</string>
+<string name="Short hips">Short hips</string>
+<string name="Shoulders">Shoulders</string>
+
+<string name="Side Fringe">Side Fringe</string>
+<string name="Sideburns">Sideburns</string>
+
+<string name="Sides Hair">Sides Hair</string>
+<string name="Sides Hair Down">Sides Hair Down</string>
+<string name="Sides Hair Up">Sides Hair Up</string>
+
+<string name="Skinny Neck">Skinny Neck</string>
+<string name="Skirt Fit">Skirt Fit</string>
+<string name="Skirt Length">Skirt Length</string>
+<string name="Slanted Forehead">Slanted Forehead</string>
+<string name="Sleeve Length">Sleeve Length</string>
+
+
+
+<string name="Sleeve Looseness">Sleeve Looseness</string>
+<string name="Slit Back">Slit: Back</string>
+<string name="Slit Front">Slit: Front</string>
+<string name="Slit Left">Slit: Left</string>
+<string name="Slit Right">Slit: Right</string>
+<string name="Small">Small</string>
+<string name="Small Hands">Small Hands</string>
+<string name="Small Head">Small Head</string>
+<string name="Smooth">Smooth</string>
+<string name="Smooth Hair">Smooth Hair</string>
+<string name="Socks Length">Socks Length</string>
+
+
+<string name="Soulpatch">Soulpatch</string>
+
+<string name="Sparse">Sparse</string>
+<string name="Spiked Hair">Spiked Hair</string>
+<string name="Square">Square</string>
+<string name="Square Toe">Square Toe</string>
+<string name="Squash Head">Squash Head</string>
+
+<string name="Stretch Head">Stretch Head</string>
+<string name="Sunken">Sunken</string>
+<string name="Sunken Chest">Sunken Chest</string>
+<string name="Sunken Eyes">Sunken Eyes</string>
+<string name="Sweep Back">Sweep Back</string>
+<string name="Sweep Forward">Sweep Forward</string>
+
+<string name="Tall">Tall</string>
+<string name="Taper Back">Taper Back</string>
+<string name="Taper Front">Taper Front</string>
+<string name="Thick Heels">Thick Heels</string>
+<string name="Thick Neck">Thick Neck</string>
+<string name="Thick Toe">Thick Toe</string>
+
+<string name="Thin">Thin</string>
+<string name="Thin Eyebrows">Thin Eyebrows</string>
+<string name="Thin Lips">Thin Lips</string>
+<string name="Thin Nose">Thin Nose</string>
+<string name="Tight Chin">Tight Chin</string>
+<string name="Tight Cuffs">Tight Cuffs</string>
+<string name="Tight Pants">Tight Pants</string>
+<string name="Tight Shirt">Tight Shirt</string>
+<string name="Tight Skirt">Tight Skirt</string>
+<string name="Tight Sleeves">Tight Sleeves</string>
+
+<string name="Toe Shape">Toe Shape</string>
+<string name="Toe Thickness">Toe Thickness</string>
+<string name="Torso Length">Torso Length</string>
+<string name="Torso Muscles">Torso Muscles</string>
+<string name="Torso Scrawny">Torso Scrawny</string>
+<string name="Unattached">Unattached</string>
+<string name="Uncreased">Uncreased</string>
+<string name="Underbite">Underbite</string>
+<string name="Unnatural">Unnatural</string>
+<string name="Upper Bridge">Upper Bridge</string>
+<string name="Upper Cheeks">Upper Cheeks</string>
+<string name="Upper Chin Cleft">Upper Chin Cleft</string>
+
+<string name="Upper Eyelid Fold">Upper Eyelid Fold</string>
+<string name="Upturned">Upturned</string>
+<string name="Very Red">Very Red</string>
+<string name="Waist Height">Waist Height</string>
+
+
+<string name="Well-Fed">Well-Fed</string>
+<string name="White Hair">White Hair</string>
+<string name="Wide">Wide</string>
+<string name="Wide Back">Wide Back</string>
+<string name="Wide Front">Wide Front</string>
+<string name="Wide Lips">Wide Lips</string>
+<string name="Wild">Wild</string>
+<string name="Wrinkles">Wrinkles</string>
+
+	<!-- IM system messages -->
+	<string name="IM_announce_incoming">has begun an IM session with you.</string>
+	<string name="IM_autoresponded_to">Autoresponse sent to</string>
+	<string name="IM_autoresponse_sent_item">was sent auto-response item</string>
+	<string name="Unnamed">(Unnamed)</string>
+	<string name="Saved_message">(Saved [LONG_TIMESTAMP])</string>
+	<string name="PowerUser1">You are bestowed with powers beyond mortal comprehension.</string>
+	<string name="PowerUser2">Use your newfound abilities wisely.</string>
+	<string name="Unlocked:">Unlocked:</string>
+	<string name="PowerUser3">- Animation Priority up to 7 - Meant for animations that should override anything and everything at all times. DO NOT USE THIS FOR GENERAL ANIMATIONS.</string>
+	<string name="RightClick">Right click</string>
+	<string name="PowerUser4">Destroy objects - Permanently deletes an object immediately, when you don't feel like waiting for the server to respond.</string>
+	<string name="PowerUser5">Explode objects - Turns an object physical, temporary, and delinks it.</string>
+
   <string name="group_role_everyone">Everyone</string>
   <string name="group_role_officers">Officers</string>
-  <string name="group_role_owners">Owners</string>	
+  <string name="group_role_owners">Owners</string>
   <string name="group_member_status_online">Online</string>
-  
+
   <string name="Chat">Chat</string>
 
   <string name="DefaultMimeType">none/none</string>
diff --git a/indra/newview/skins/gemini/colors.xml b/indra/newview/skins/gemini/colors.xml
index 4f5c5df9a..7e5870fc8 100644
--- a/indra/newview/skins/gemini/colors.xml
+++ b/indra/newview/skins/gemini/colors.xml
@@ -72,6 +72,7 @@
 <ScrollHighlightedColor value="222, 222, 222, 80" />	    <!-- Hover color -->
 <ScrollbarThumbColor value="66, 66, 66, 80" />            <!-- Scroll bar-->
 <ScrollbarTrackColor value="10, 10, 10, 80" />          <!-- Scroll bar background-->
+<DefaultListText value="255, 255, 255, 255"/>                     <!-- We are replacing all the hardcoded black text with this color so we can make skins with white text on dark background -->
 
 <!-- MENUS -->
 <MenuBarBgColor value="33, 33, 33, 255" />
@@ -140,6 +141,21 @@
 <MapLinden value="0, 128, 255, 255" />
 <MapMuted value="110, 110, 110, 220" />
 
+<!-- RADAR -->
+
+<RadarAvatar value="255, 255, 255, 255" />
+<RadarFriend value="70, 128, 70, 255" />
+<RadarLinden value="0, 0, 128, 255" />
+<RadarEstateOwner value="204, 102, 10, 255" />
+<RadarMuted value="33, 33, 33, 255" />
+<RadarTextChatRange value="255, 66, 66, 128"/>
+<RadarTextShoutRange value="255, 255, 66, 128"/>
+<RadarTextDrawDist value="66, 153, 66, 128"/>
+
+<!-- SPEAKERS -->
+<SpeakersInactive value="76, 76, 76, 255"/>
+<SpeakersGhost value="255, 0, 0, 255"/>
+
 <!-- MINI-MAP -->
 <NetMapBackgroundColor value="0, 0, 0, 77" />
 <NetMapYouOwnAboveWater value="0, 255, 255, 255" />
@@ -181,17 +197,11 @@
 <FilterTextColor value="255, 255, 255, 128" />
 <InventoryItemSuffixColor value="128, 128, 128, 255" />     <!-- "worn", "no modify", etc-->
 <InventorySearchStatusColor value="255, 255, 255, 128" />
+<ComboBoxBg value="11, 11, 11, 255"/>
 <ConsoleBackground value="0, 0, 0, 255" />
 <FolderViewLoadingMessageTextColor value="255, 255, 255, 128"/>     <!-- "loading..." in the inv -->
 <InventoryBackgroundColor value="11, 11, 11, 80"/>
 <SHMediaTickerOscillatorColor value ="0, 0, 0, 191"/>
-<DefaultListText value="255, 255, 255, 255"/> <!-- We are replacing all the hardcoded black text with this color so we can make skins with white text on dark background -->
-<ComboBoxBg value="11, 11, 11, 255"/>
-<AvatarListTextDistNormalRange value="255, 255, 255, 255"/>
-<AvatarListTextDistShoutRange value="255, 255, 255, 128"/>
-<AvatarListTextDistOver value="255, 66, 66, 128"/>
-<AvatarListTextAgeYoung value="255, 0, 0, 255"/>
-<AvatarListTextAgeNormal value="255, 255, 255, 255"/>
 
 <!-- Alert box colors -->
 <AlertBoxColor value="33, 33, 33, 255" />               <!-- Warnings floaters, like when returning objects -->

From 4c23ab029ac1d39fd78718a4052235f1c845a607 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Mon, 6 Aug 2012 02:38:09 -0400
Subject: [PATCH 144/199] Missing Strings.

Oops.  Customize Floater wants these for like once case...
---
 indra/newview/skins/default/xui/en-us/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index 7ae391911..59d5fb300 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -3595,4 +3595,7 @@ Try enclosing path to the editor with double quotes.
  <string name="ExternalEditorCommandParseError">Error parsing the external editor command.</string>
  <string name="ExternalEditorFailedToRun">External editor failed to run.</string>
 
+  <string name="Left">Left</string>
+  <string name="Right">Right</string>
+
 </strings>

From 58033d3cbcaa647c28657177a8fbe6ce0f1481d8 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Mon, 6 Aug 2012 10:11:12 -0500
Subject: [PATCH 145/199] Added rebake navmesh button. Brought in rest of the
 underlying navmesh implementation.

---
 etc/message.xml                               |   20 +-
 indra/llcommon/llsdserialize.cpp              |   80 ++
 indra/llcommon/llsdserialize.h                |    4 +
 indra/llui/llview.h                           |    4 +
 indra/newview/CMakeLists.txt                  |   20 +
 indra/newview/app_settings/settings.xml       |    2 +-
 indra/newview/llagent.cpp                     |    4 +
 indra/newview/lloverlaybar.cpp                |  152 +--
 indra/newview/lloverlaybar.h                  |    2 +
 .../llpanelpathfindingrebakenavmesh.cpp       |  279 +++++
 .../newview/llpanelpathfindingrebakenavmesh.h |   96 ++
 indra/newview/llpathfindingcharacter.cpp      |   99 ++
 indra/newview/llpathfindingcharacter.h        |   63 +
 indra/newview/llpathfindingcharacterlist.cpp  |   69 ++
 indra/newview/llpathfindingcharacterlist.h    |   47 +
 indra/newview/llpathfindinglinkset.cpp        |  387 ++++++
 indra/newview/llpathfindinglinkset.h          |  108 ++
 indra/newview/llpathfindinglinksetlist.cpp    |  196 +++
 indra/newview/llpathfindinglinksetlist.h      |   57 +
 indra/newview/llpathfindingmanager.cpp        | 1050 +++++++++++++++++
 indra/newview/llpathfindingmanager.h          |  127 ++
 indra/newview/llpathfindingnavmesh.cpp        |  205 ++++
 indra/newview/llpathfindingnavmesh.h          |   91 ++
 indra/newview/llpathfindingnavmeshstatus.cpp  |  145 +++
 indra/newview/llpathfindingnavmeshstatus.h    |   77 ++
 indra/newview/llpathfindingobject.cpp         |  162 +++
 indra/newview/llpathfindingobject.h           |   80 ++
 indra/newview/llpathfindingobjectlist.cpp     |  112 ++
 indra/newview/llpathfindingobjectlist.h       |   67 ++
 indra/newview/llstartup.cpp                   |    6 +
 indra/newview/llviewermenu.cpp                |   31 +
 indra/newview/llviewerregion.cpp              |    6 +
 indra/newview/llviewerwindow.cpp              |    5 +
 .../xui/en-us/panel_navmesh_rebake.xml        |   46 +
 .../default/xui/en-us/panel_overlaybar.xml    |    6 +-
 .../skins/default/xui/fr/panel_overlaybar.xml |    2 +-
 36 files changed, 3794 insertions(+), 113 deletions(-)
 create mode 100644 indra/newview/llpanelpathfindingrebakenavmesh.cpp
 create mode 100644 indra/newview/llpanelpathfindingrebakenavmesh.h
 create mode 100644 indra/newview/llpathfindingcharacter.cpp
 create mode 100644 indra/newview/llpathfindingcharacter.h
 create mode 100644 indra/newview/llpathfindingcharacterlist.cpp
 create mode 100644 indra/newview/llpathfindingcharacterlist.h
 create mode 100644 indra/newview/llpathfindinglinkset.cpp
 create mode 100644 indra/newview/llpathfindinglinkset.h
 create mode 100644 indra/newview/llpathfindinglinksetlist.cpp
 create mode 100644 indra/newview/llpathfindinglinksetlist.h
 create mode 100644 indra/newview/llpathfindingmanager.cpp
 create mode 100644 indra/newview/llpathfindingmanager.h
 create mode 100644 indra/newview/llpathfindingnavmesh.cpp
 create mode 100644 indra/newview/llpathfindingnavmesh.h
 create mode 100644 indra/newview/llpathfindingnavmeshstatus.cpp
 create mode 100644 indra/newview/llpathfindingnavmeshstatus.h
 create mode 100644 indra/newview/llpathfindingobject.cpp
 create mode 100644 indra/newview/llpathfindingobject.h
 create mode 100644 indra/newview/llpathfindingobjectlist.cpp
 create mode 100644 indra/newview/llpathfindingobjectlist.h
 create mode 100644 indra/newview/skins/default/xui/en-us/panel_navmesh_rebake.xml

diff --git a/etc/message.xml b/etc/message.xml
index 4d303be40..42bbef035 100644
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -539,8 +539,24 @@
 					<key>trusted-sender</key>
 					<boolean>true</boolean>
 				</map>
-				
-				<!-- UDPDeprecated Messages -->
+
+        <key>NavMeshStatusUpdate</key>
+        <map>
+          <key>flavor</key>
+          <string>llsd</string>
+          <key>trusted-sender</key>
+          <boolean>true</boolean>
+        </map>
+
+        <key>AgentStateUpdate</key>
+        <map>
+          <key>flavor</key>
+          <string>llsd</string>
+          <key>trusted-sender</key>
+          <boolean>true</boolean>
+        </map>
+
+        <!-- UDPDeprecated Messages -->
 				<key>ScriptRunningReply</key>
 				<map>
 					<key>flavor</key>
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index dce07410b..61dc62388 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -60,6 +60,9 @@ static const char LEGACY_NON_HEADER[] = "<llsd>";
 const std::string LLSD_BINARY_HEADER("LLSD/Binary");
 const std::string LLSD_XML_HEADER("LLSD/XML");
 
+//used to deflate a gzipped asset (currently used for navmeshes)
+#define windowBits 15
+#define ENABLE_ZLIB_GZIP 32
 /**
  * LLSDSerialize
  */
@@ -2172,3 +2175,80 @@ bool unzip_llsd(LLSD& data, std::istream& is, S32 size)
 	free(result);
 	return true;
 }
+//This unzip function will only work with a gzip header and trailer - while the contents
+//of the actual compressed data is the same for either format (gzip vs zlib ), the headers
+//and trailers are different for the formats.
+U8* unzip_llsdNavMesh( bool& valid, unsigned int& outsize, std::istream& is, S32 size )
+{
+	U8* result = NULL;
+	U32 cur_size = 0;
+	z_stream strm;
+		
+	const U32 CHUNK = 0x4000;
+
+	U8 *in = new U8[size];
+	is.read((char*) in, size); 
+
+	U8 out[CHUNK];
+		
+	strm.zalloc = Z_NULL;
+	strm.zfree = Z_NULL;
+	strm.opaque = Z_NULL;
+	strm.avail_in = size;
+	strm.next_in = in;
+
+	
+	S32 ret = inflateInit2(&strm,  windowBits | ENABLE_ZLIB_GZIP );
+	do
+	{
+		strm.avail_out = CHUNK;
+		strm.next_out = out;
+		ret = inflate(&strm, Z_NO_FLUSH);
+		if (ret == Z_STREAM_ERROR)
+		{
+			inflateEnd(&strm);
+			free(result);
+			delete [] in;
+			valid = false;
+		}
+		
+		switch (ret)
+		{
+		case Z_NEED_DICT:
+			ret = Z_DATA_ERROR;
+		case Z_DATA_ERROR:
+		case Z_MEM_ERROR:
+			inflateEnd(&strm);
+			free(result);
+			delete [] in;
+			valid = false;
+			break;
+		}
+
+		U32 have = CHUNK-strm.avail_out;
+
+		result = (U8*) realloc(result, cur_size + have);
+		memcpy(result+cur_size, out, have);
+		cur_size += have;
+
+	} while (ret == Z_OK);
+
+	inflateEnd(&strm);
+	delete [] in;
+
+	if (ret != Z_STREAM_END)
+	{
+		free(result);
+		valid = false;
+		return NULL;
+	}
+
+	//result now points to the decompressed LLSD block
+	{
+		outsize= cur_size;
+		valid = true;		
+	}
+
+	return result;
+}
+
diff --git a/indra/llcommon/llsdserialize.h b/indra/llcommon/llsdserialize.h
index 9a45f56a7..09150615c 100644
--- a/indra/llcommon/llsdserialize.h
+++ b/indra/llcommon/llsdserialize.h
@@ -755,6 +755,9 @@ public:
 		LLPointer<LLSDXMLParser> p = new LLSDXMLParser;
 		return p->parse(str, sd, LLSDSerialize::SIZE_UNLIMITED);
 	}
+	// Line oriented parser, 30% faster than fromXML(), but can
+	// only be used when you know you have the complete XML
+	// document available in the stream.
 	static S32 fromXMLDocument(LLSD& sd, std::istream& str)
 	{
 		LLPointer<LLSDXMLParser> p = new LLSDXMLParser();
@@ -791,4 +794,5 @@ public:
 //dirty little zip functions -- yell at davep
 LL_COMMON_API std::string zip_llsd(LLSD& data);
 LL_COMMON_API bool unzip_llsd(LLSD& data, std::istream& is, S32 size);
+LL_COMMON_API U8* unzip_llsdNavMesh( bool& valid, unsigned int& outsize,std::istream& is, S32 size);
 #endif // LL_LLSDSERIALIZE_H
diff --git a/indra/llui/llview.h b/indra/llui/llview.h
index 721c82fbb..83a4a1060 100644
--- a/indra/llui/llview.h
+++ b/indra/llui/llview.h
@@ -474,6 +474,10 @@ public:
 	/*virtual*/ void	screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const;
 	/*virtual*/ void	localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const;
 
+	template <class T> T* findChild(const std::string& name)
+	{
+		return getChild<T>(name,true,false);
+	}
 	template <class T> T* getChild(const std::string& name, BOOL recurse = TRUE, BOOL create_if_missing = TRUE) const
 	{
 		LLView* child = getChildView(name, recurse, FALSE);
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 102dfdbe1..81ffca05a 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -380,6 +380,7 @@ set(viewer_SOURCE_FILES
     llpanelmsgs.cpp
     llpanelnetwork.cpp
     llpanelobject.cpp
+    llpanelpathfindingrebakenavmesh.cpp
     llpanelpermissions.cpp
     llpanelpick.cpp
     llpanelplace.cpp
@@ -388,6 +389,15 @@ set(viewer_SOURCE_FILES
     llpanelweb.cpp
     llparcelselection.cpp
     llpatchvertexarray.cpp
+    llpathfindingcharacter.cpp
+    llpathfindingcharacterlist.cpp
+    llpathfindinglinkset.cpp
+    llpathfindinglinksetlist.cpp
+    llpathfindingmanager.cpp
+    llpathfindingnavmesh.cpp
+    llpathfindingnavmeshstatus.cpp
+    llpathfindingobject.cpp
+    llpathfindingobjectlist.cpp
     llphysicsmotion.cpp
     llphysicsshapebuilderutil.cpp
     llpolymesh.cpp
@@ -879,6 +889,7 @@ set(viewer_HEADER_FILES
     llpanelmsgs.h
     llpanelnetwork.h
     llpanelobject.h
+    llpanelpathfindingrebakenavmesh.h
     llpanelpermissions.h
     llpanelpick.h
     llpanelplace.h
@@ -887,6 +898,15 @@ set(viewer_HEADER_FILES
     llpanelweb.h
     llparcelselection.h
     llpatchvertexarray.h
+    llpathfindingcharacter.h
+    llpathfindingcharacterlist.h
+    llpathfindinglinkset.h
+    llpathfindinglinksetlist.h
+    llpathfindingmanager.h
+    llpathfindingnavmesh.h
+    llpathfindingnavmeshstatus.h
+    llpathfindingobject.h
+    llpathfindingobjectlist.h
     llphysicsmotion.h
     llphysicsshapebuilderutil.h
     llpolymesh.h
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index a6a95d8a8..494a7323a 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -13234,7 +13234,7 @@
       <key>Type</key>
       <string>S32</string>
       <key>Value</key>
-      <integer>10</integer>
+      <integer>5</integer>
     </map>
     <key>SystemLanguage</key>
     <map>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index d0ba0a140..0ad15f303 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -49,6 +49,7 @@
 #include "llmoveview.h"
 #include "llchatbar.h"
 #include "llnotificationsutil.h"
+#include "llpanelpathfindingrebakenavmesh.h"
 #include "llparcel.h"
 #include "llrendersphere.h"
 #include "llsdmessage.h"
@@ -1871,6 +1872,8 @@ void LLAgent::endAnimationUpdateUI()
 		gMenuBarView->setVisible(TRUE);
 		gStatusBar->setVisibleForMouselook(true);
 
+		LLPanelPathfindingRebakeNavmesh::getInstance()->setVisible(TRUE);
+
 		LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset);
 
 
@@ -1959,6 +1962,7 @@ void LLAgent::endAnimationUpdateUI()
 		// hide menus
 		gMenuBarView->setVisible(FALSE);
 		gStatusBar->setVisibleForMouselook(false);
+		LLPanelPathfindingRebakeNavmesh::getInstance()->setVisible(FALSE);
 
 		// clear out camera lag effect
 		gAgentCamera.clearCameraLag();
diff --git a/indra/newview/lloverlaybar.cpp b/indra/newview/lloverlaybar.cpp
index ebbe2d114..faecaec97 100644
--- a/indra/newview/lloverlaybar.cpp
+++ b/indra/newview/lloverlaybar.cpp
@@ -79,6 +79,8 @@
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
+#include <boost/foreach.hpp>
+
 //
 // Globals
 //
@@ -224,53 +226,61 @@ void LLOverlayBar::reshape(S32 width, S32 height, BOOL called_from_parent)
 
 void LLOverlayBar::layoutButtons()
 {
-	LLView* state_buttons_panel = getChildView("state_buttons");
+	LLView* state_buttons_panel = getChildView("state_management_buttons_container");
 
 	if (state_buttons_panel->getVisible())
 	{
-		LLViewQuery query;
-		LLWidgetTypeFilter<LLButton> widget_filter;
-		query.addPreFilter(LLEnabledFilter::getInstance());
-		query.addPreFilter(&widget_filter);
+		U32 required_width=0;
+		const child_list_t& view_list = *(state_buttons_panel->getChildList());
+		BOOST_FOREACH(LLView* viewp, view_list)
+		{
+			required_width+=viewp->getRect().getWidth();
+		}
 
-		child_list_t button_list = query(state_buttons_panel);
+		const S32 MAX_BAR_WIDTH = 800;
+		//const S32 MAX_BUTTON_WIDTH = 150;
 
-		const S32 MAX_BAR_WIDTH = 600;
-		S32 bar_width = llclamp(state_buttons_panel->getRect().getWidth(), 0, MAX_BAR_WIDTH);
-
-		// calculate button widths
-		const S32 MAX_BUTTON_WIDTH = 150;
-		S32 segment_width = llclamp(lltrunc((F32)(bar_width) / (F32)button_list.size()), 0, MAX_BUTTON_WIDTH);
-		S32 btn_width = segment_width - gSavedSettings.getS32("StatusBarPad");
+		static LLCachedControl<S32> status_bar_pad("StatusBarPad",10);
+		S32 usable_bar_width = llclamp(state_buttons_panel->getRect().getWidth(), 0, MAX_BAR_WIDTH) - (view_list.size()-1) * status_bar_pad;
+		F32 element_scale = (F32)usable_bar_width / (F32)required_width;
 
 		// Evenly space all buttons, starting from left
 		S32 left = 0;
 		S32 bottom = 1;
 
-		for (child_list_reverse_iter_t child_iter = button_list.rbegin();
-			child_iter != button_list.rend(); ++child_iter)
+		BOOST_REVERSE_FOREACH(LLView* viewp, view_list)
 		{
-			LLView *view = *child_iter;
-			LLRect r = view->getRect();
-			r.setOriginAndSize(left, bottom, btn_width, r.getHeight());
-			view->setRect(r);
-			left += segment_width;
+			LLRect r = viewp->getRect();
+			S32 new_width = r.getWidth() * element_scale;
+			//if(dynamic_cast<LLButton*>(viewp))
+			//	new_width = llclamp(new_width,0,MAX_BUTTON_WIDTH);
+			r.setOriginAndSize(left, bottom, new_width, r.getHeight());
+			viewp->setShape(r,false);
+			left += viewp->getRect().getWidth() + status_bar_pad;
 		}
 	}
 }
 
+LLButton* LLOverlayBar::updateButtonVisiblity(const std::string& button_name, bool visible)
+{
+	LLButton* button = findChild<LLButton>(button_name);
+	if (button && (bool)button->getVisible() != visible)
+	{
+		button->setVisible(visible);
+		sendChildToFront(button);
+		moveChildToBackOfTabGroup(button);
+	}
+	return button;
+}
+
 // Per-frame updates of visibility
 void LLOverlayBar::refresh()
 {
-	BOOL buttons_changed = FALSE;
+	bool buttons_changed = FALSE;
 
-	BOOL im_received = gIMMgr->getIMReceived();
-	int unread_count = gIMMgr->getIMUnreadCount();
-	LLButton* button = getChild<LLButton>("New IM");
-
-	if ((button && button->getVisible() != im_received) ||
-			(button && button->getVisible()))
+	if(LLButton* button = updateButtonVisiblity("New IM",gIMMgr->getIMReceived()))
 	{
+		int unread_count = gIMMgr->getIMUnreadCount();
 		if (unread_count > 0)
 		{
 			if (unread_count > 1)
@@ -284,86 +294,16 @@ void LLOverlayBar::refresh()
 				button->setLabel("1 " + mOriginalIMLabel);
 			}
 		}
-		button->setVisible(im_received);
-		sendChildToFront(button);
-		moveChildToBackOfTabGroup(button);
-		buttons_changed = TRUE;
+		buttons_changed = true;
 	}
-
-	BOOL busy = gAgent.getBusy();
-	button = getChild<LLButton>("Set Not Busy");
-	if (button && button->getVisible() != busy)
-	{
-		button->setVisible(busy);
-		sendChildToFront(button);
-		moveChildToBackOfTabGroup(button);
-		buttons_changed = TRUE;
-	}
-
-	BOOL flycam = LLViewerJoystick::getInstance()->getOverrideCamera();
-	button = getChild<LLButton>("Flycam");
-	if (button && button->getVisible() != flycam)
-	{
-		button->setVisible(flycam);
-		sendChildToFront(button);
-		moveChildToBackOfTabGroup(button);
-		buttons_changed = TRUE;
-	}		
-
-	BOOL mouselook_grabbed;
-	mouselook_grabbed = gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_DOWN_INDEX)
-		|| gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_UP_INDEX);
-	button = getChild<LLButton>("Mouselook");
-
-	if (button && button->getVisible() != mouselook_grabbed)
-	{
-		button->setVisible(mouselook_grabbed);
-		sendChildToFront(button);
-		moveChildToBackOfTabGroup(button);
-		buttons_changed = TRUE;
-	}
-
-	BOOL sitting = FALSE;
-	if (gAgentAvatarp)
-	{
-//		sitting = gAgentAvatarp->isSitting();
+	buttons_changed |= updateButtonVisiblity("Set Not Busy",gAgent.getBusy()) != NULL;
+	buttons_changed |= updateButtonVisiblity("Flycam",LLViewerJoystick::getInstance()->getOverrideCamera()) != NULL;
+	buttons_changed |= updateButtonVisiblity("Mouselook",gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_DOWN_INDEX)||gAgent.isControlGrabbed(CONTROL_ML_LBUTTON_UP_INDEX)) != NULL;
 // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
-		sitting = gAgentAvatarp->isSitting() && !gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT);
+//  buttons_changed |= updateButtonVisiblity("Stand Up", isAgentAvatarValid() && gAgentAvatarp->isSitting()) != NULL;
+	buttons_changed |= updateButtonVisiblity("Stand Up",isAgentAvatarValid() && gAgentAvatarp->isSitting() && !gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) != NULL;
 // [/RLVa:KB]
-	}
-	button = getChild<LLButton>("Stand Up");
-
-	if (button && button->getVisible() != sitting)
-	{
-		button->setVisible(sitting);
-		sendChildToFront(button);
-		moveChildToBackOfTabGroup(button);
-		buttons_changed = TRUE;
-	}
-
-	BOOL teleporting = FALSE;
-	if ((gAgent.getTeleportState() == LLAgent::TELEPORT_START) ||
-		(gAgent.getTeleportState() == LLAgent::TELEPORT_REQUESTED) ||
-		(gAgent.getTeleportState() == LLAgent::TELEPORT_MOVING) ||
-		(gAgent.getTeleportState() == LLAgent::TELEPORT_START))
-	{
-		teleporting = TRUE;
-	}
-	else
-	{
-		teleporting = FALSE;
-	}
-
-
-	button = getChild<LLButton>("Cancel TP");
-
-	if (button && button->getVisible() != teleporting)
-	{
-		button->setVisible(teleporting);
-		sendChildToFront(button);
-		moveChildToBackOfTabGroup(button);
-		buttons_changed = TRUE;
-	}
+	buttons_changed |= updateButtonVisiblity("Cancel TP",(gAgent.getTeleportState() >= LLAgent::TELEPORT_START) &&	(gAgent.getTeleportState() <= LLAgent::TELEPORT_MOVING)) != NULL;
 
 	moveChildToBackOfTabGroup(mAORemote);
 	moveChildToBackOfTabGroup(mMediaRemote);
@@ -384,7 +324,7 @@ void LLOverlayBar::refresh()
 			childSetVisible("AdvSettings_container", FALSE);
 			childSetVisible("AdvSettings_container_exp", FALSE);
 			childSetVisible("ao_remote_container", FALSE);
-			childSetVisible("state_buttons", FALSE);
+			childSetVisible("state_management_buttons_container", FALSE);
 		}
 		else
 		{
@@ -394,7 +334,7 @@ void LLOverlayBar::refresh()
 			childSetVisible("AdvSettings_container", !sAdvSettingsPopup);//!gSavedSettings.getBOOL("wlfAdvSettingsPopup")); 
 			childSetVisible("AdvSettings_container_exp", sAdvSettingsPopup);//gSavedSettings.getBOOL("wlfAdvSettingsPopup")); 
 			childSetVisible("ao_remote_container", gSavedSettings.getBOOL("EnableAORemote"));
-			childSetVisible("state_buttons", TRUE);
+			childSetVisible("state_management_buttons_container", TRUE);
 		}
 	}
 	if(!in_mouselook)
diff --git a/indra/newview/lloverlaybar.h b/indra/newview/lloverlaybar.h
index 8f9c8ed2f..1b8410e89 100644
--- a/indra/newview/lloverlaybar.h
+++ b/indra/newview/lloverlaybar.h
@@ -64,6 +64,8 @@ public:
 	/*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 	/*virtual*/ BOOL postBuild();
 
+	LLButton* updateButtonVisiblity(const std::string& button_name, bool visible);
+
 	void layoutButtons();
 
 	// helpers for returning desired state
diff --git a/indra/newview/llpanelpathfindingrebakenavmesh.cpp b/indra/newview/llpanelpathfindingrebakenavmesh.cpp
new file mode 100644
index 000000000..230fa1b2b
--- /dev/null
+++ b/indra/newview/llpanelpathfindingrebakenavmesh.cpp
@@ -0,0 +1,279 @@
+/** 
+* @file llpanelpathfindingrebakenavmesh.cpp
+* @brief Implementation of llpanelpathfindingrebakenavmesh
+* @author Prep@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpanelpathfindingrebakenavmesh.h"
+
+#include <boost/bind.hpp>
+#include <boost/signals2.hpp>
+
+#include "llagent.h"
+#include "llbutton.h"
+#include "llenvmanager.h"
+#include "llnotificationsutil.h"
+#include "llpanel.h"
+#include "llpathfindingmanager.h"
+#include "llpathfindingnavmesh.h"
+#include "llpathfindingnavmeshstatus.h"
+#include "lltoolbar.h"
+#include "llviewerregion.h"
+#include "llviewerwindow.h"
+#include "lluictrlfactory.h"
+
+
+LLPanelPathfindingRebakeNavmesh* LLPanelPathfindingRebakeNavmesh::getInstance()
+{
+	static LLPanelPathfindingRebakeNavmesh* panel = getPanel();
+	return panel;
+}
+
+BOOL LLPanelPathfindingRebakeNavmesh::postBuild()
+{
+	//Rebake button
+	mNavMeshRebakeButton = getChild<LLButton>("navmesh_btn");
+	llassert(mNavMeshRebakeButton != NULL);
+	mNavMeshRebakeButton->setCommitCallback(boost::bind(&LLPanelPathfindingRebakeNavmesh::onNavMeshRebakeClick, this));
+	//LLHints::registerHintTarget("navmesh_btn", mNavMeshRebakeButton->getHandle());
+	
+	//Sending rebake request
+	mNavMeshSendingButton = findChild<LLButton>("navmesh_btn_sending");
+	llassert(mNavMeshSendingButton != NULL);
+	//LLHints::registerHintTarget("navmesh_btn_sending", mNavMeshSendingButton->getHandle());
+
+	//rebaking...
+	mNavMeshBakingButton = findChild<LLButton>("navmesh_btn_baking");
+	llassert(mNavMeshBakingButton != NULL);
+	//LLHints::registerHintTarget("navmesh_btn_baking", mNavMeshBakingButton->getHandle());
+
+	setMode(kRebakeNavMesh_Default);
+
+	createNavMeshStatusListenerForCurrentRegion();
+
+	if ( !mRegionCrossingSlot.connected() )
+	{
+		mRegionCrossingSlot = LLEnvManagerNew::getInstance()->setRegionChangeCallback(boost::bind(&LLPanelPathfindingRebakeNavmesh::handleRegionBoundaryCrossed, this));
+	}
+
+	if (!mAgentStateSlot.connected())
+	{
+		mAgentStateSlot = LLPathfindingManager::getInstance()->registerAgentStateListener(boost::bind(&LLPanelPathfindingRebakeNavmesh::handleAgentState, this, _1));
+	}
+	LLPathfindingManager::getInstance()->requestGetAgentState();
+
+	return LLPanel::postBuild();
+}
+
+void LLPanelPathfindingRebakeNavmesh::draw()
+{
+	if (doDraw())
+	{
+		updatePosition();
+		LLPanel::draw();
+	}
+}
+
+BOOL LLPanelPathfindingRebakeNavmesh::handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen)
+{
+	gViewerWindow->unblockToolTips();
+
+	if (mNavMeshRebakeButton->getVisible())
+	{
+		msg=mNavMeshRebakeButton->getToolTip();
+		//LLToolTipMgr::instance().show(mNavMeshRebakeButton->getToolTip());
+	}
+	else if (mNavMeshSendingButton->getVisible())
+	{
+		msg=mNavMeshSendingButton->getToolTip();
+		//LLToolTipMgr::instance().show(mNavMeshSendingButton->getToolTip());
+	}
+	else if (mNavMeshBakingButton->getVisible())
+	{
+		msg=mNavMeshBakingButton->getToolTip();
+		//LLToolTipMgr::instance().show(mNavMeshBakingButton->getToolTip());
+	}
+
+	// Convert rect local to screen coordinates
+		localPointToScreen( 
+			0, 0, 
+			&(sticky_rect_screen->mLeft), &(sticky_rect_screen->mBottom) );
+		localPointToScreen(
+			getRect().getWidth(), getRect().getHeight(),
+			&(sticky_rect_screen->mRight), &(sticky_rect_screen->mTop) );
+	return true;//LLPanel::handleToolTip(x, y, mask);
+}
+
+LLPanelPathfindingRebakeNavmesh::LLPanelPathfindingRebakeNavmesh() 
+	: LLPanel(),
+	mCanRebakeRegion(FALSE),
+	mRebakeNavMeshMode(kRebakeNavMesh_Default),
+	mNavMeshRebakeButton(NULL),
+	mNavMeshSendingButton(NULL),
+	mNavMeshBakingButton(NULL),
+	mNavMeshSlot(),
+	mRegionCrossingSlot(),
+	mAgentStateSlot()
+{
+	// make sure we have the only instance of this class
+	static bool b = true;
+	llassert_always(b);
+	b=false;
+}
+
+LLPanelPathfindingRebakeNavmesh::~LLPanelPathfindingRebakeNavmesh() 
+{
+}
+
+LLPanelPathfindingRebakeNavmesh* LLPanelPathfindingRebakeNavmesh::getPanel()
+{
+	LLPanelPathfindingRebakeNavmesh* panel = new LLPanelPathfindingRebakeNavmesh();
+	LLUICtrlFactory::getInstance()->buildPanel(panel,"panel_navmesh_rebake.xml");
+	return panel;
+}
+
+void LLPanelPathfindingRebakeNavmesh::setMode(ERebakeNavMeshMode pRebakeNavMeshMode)
+{
+	if (pRebakeNavMeshMode == kRebakeNavMesh_Available)
+	{
+		LLNotificationsUtil::add("PathfindingRebakeNavmesh");
+	}
+	mNavMeshRebakeButton->setVisible(pRebakeNavMeshMode == kRebakeNavMesh_Available);
+	mNavMeshSendingButton->setVisible(pRebakeNavMeshMode == kRebakeNavMesh_RequestSent);
+	mNavMeshBakingButton->setVisible(pRebakeNavMeshMode == kRebakeNavMesh_InProgress);
+	mRebakeNavMeshMode = pRebakeNavMeshMode;
+}
+
+LLPanelPathfindingRebakeNavmesh::ERebakeNavMeshMode LLPanelPathfindingRebakeNavmesh::getMode() const
+{
+	return mRebakeNavMeshMode;
+}
+
+void LLPanelPathfindingRebakeNavmesh::onNavMeshRebakeClick()
+{
+	setMode(kRebakeNavMesh_RequestSent);
+	LLPathfindingManager::getInstance()->requestRebakeNavMesh(boost::bind(&LLPanelPathfindingRebakeNavmesh::handleRebakeNavMeshResponse, this, _1));
+}
+
+void LLPanelPathfindingRebakeNavmesh::handleAgentState(BOOL pCanRebakeRegion)
+{
+	mCanRebakeRegion = pCanRebakeRegion;
+}
+
+void LLPanelPathfindingRebakeNavmesh::handleRebakeNavMeshResponse(bool pResponseStatus)
+{
+	if (getMode() == kRebakeNavMesh_RequestSent)
+	{
+		setMode(pResponseStatus ? kRebakeNavMesh_InProgress : kRebakeNavMesh_Default);
+	}
+
+	if (!pResponseStatus)
+	{
+		LLNotificationsUtil::add("PathfindingCannotRebakeNavmesh");
+	}
+}
+
+void LLPanelPathfindingRebakeNavmesh::handleNavMeshStatus(const LLPathfindingNavMeshStatus &pNavMeshStatus)
+{
+	ERebakeNavMeshMode rebakeNavMeshMode = kRebakeNavMesh_Default;
+	if (pNavMeshStatus.isValid())
+	{
+		switch (pNavMeshStatus.getStatus())
+		{
+		case LLPathfindingNavMeshStatus::kPending :
+		case LLPathfindingNavMeshStatus::kRepending :
+			rebakeNavMeshMode = kRebakeNavMesh_Available;
+			break;
+		case LLPathfindingNavMeshStatus::kBuilding :
+			rebakeNavMeshMode = kRebakeNavMesh_InProgress;
+			break;
+		case LLPathfindingNavMeshStatus::kComplete :
+			rebakeNavMeshMode = kRebakeNavMesh_NotAvailable;
+			break;
+		default : 
+			rebakeNavMeshMode = kRebakeNavMesh_Default;
+			llassert(0);
+			break;
+		}
+	}
+
+	setMode(rebakeNavMeshMode);
+}
+
+void LLPanelPathfindingRebakeNavmesh::handleRegionBoundaryCrossed()
+{
+	createNavMeshStatusListenerForCurrentRegion();
+	mCanRebakeRegion = FALSE;
+	LLPathfindingManager::getInstance()->requestGetAgentState();
+}
+
+void LLPanelPathfindingRebakeNavmesh::createNavMeshStatusListenerForCurrentRegion()
+{
+	if (mNavMeshSlot.connected())
+	{
+		mNavMeshSlot.disconnect();
+	}
+
+	LLViewerRegion *currentRegion = gAgent.getRegion();
+	if (currentRegion != NULL)
+	{
+		mNavMeshSlot = LLPathfindingManager::getInstance()->registerNavMeshListenerForRegion(currentRegion, boost::bind(&LLPanelPathfindingRebakeNavmesh::handleNavMeshStatus, this, _2));
+		LLPathfindingManager::getInstance()->requestGetNavMeshForRegion(currentRegion, true);
+	}
+}
+
+bool LLPanelPathfindingRebakeNavmesh::doDraw() const
+{
+	return (mCanRebakeRegion && (mRebakeNavMeshMode != kRebakeNavMesh_NotAvailable));
+}
+
+void LLPanelPathfindingRebakeNavmesh::updatePosition()
+{
+	/*S32 y_pos = 0;
+	S32 bottom_tb_center = 0;
+
+	if (LLToolBar* toolbar_bottom = gToolBarView->getChild<LLToolBar>("toolbar_bottom"))
+	{
+		y_pos = toolbar_bottom->getRect().getHeight();
+		bottom_tb_center = toolbar_bottom->getRect().getCenterX();
+	}
+
+	S32 left_tb_width = 0;
+	if (LLToolBar* toolbar_left = gToolBarView->getChild<LLToolBar>("toolbar_left"))
+	{
+		left_tb_width = toolbar_left->getRect().getWidth();
+	}
+
+	if(LLPanel* panel_ssf_container = getRootView()->getChild<LLPanel>("state_management_buttons_container"))
+	{
+		panel_ssf_container->setOrigin(0, y_pos);
+	}
+
+	S32 x_pos = bottom_tb_center-getRect().getWidth()/2 - left_tb_width + 113 /* width of stand/fly button *//* + 10 *//* margin */;
+
+	/*setOrigin( x_pos, 0);*/
+}
diff --git a/indra/newview/llpanelpathfindingrebakenavmesh.h b/indra/newview/llpanelpathfindingrebakenavmesh.h
new file mode 100644
index 000000000..5aa1c68d8
--- /dev/null
+++ b/indra/newview/llpanelpathfindingrebakenavmesh.h
@@ -0,0 +1,96 @@
+/** 
+* @file   llpanelpathfindingrebakenavmesh.h
+* @brief  Header file for llpanelpathfindingrebakenavmesh
+* @author Prep@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+#ifndef LL_LLPANELPATHFINDINGREBAKENAVMESH_H
+#define LL_LLPANELPATHFINDINGREBAKENAVMESH_H
+
+#include <boost/signals2.hpp>
+
+#include "llpanel.h"
+#include "llpathfindingmanager.h"
+#include "llpathfindingnavmesh.h"
+
+class LLButton;
+class LLPathfindingNavMeshStatus;
+
+class LLPanelPathfindingRebakeNavmesh : public LLPanel
+{
+
+	LOG_CLASS(LLPanelPathfindingRebakeNavmesh);
+
+public:
+	static LLPanelPathfindingRebakeNavmesh* getInstance();
+
+	virtual BOOL postBuild();
+
+	virtual void draw();
+	virtual BOOL handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen);
+
+protected:
+
+private:
+	typedef enum
+	{
+		kRebakeNavMesh_Available,
+		kRebakeNavMesh_RequestSent,
+		kRebakeNavMesh_InProgress,
+		kRebakeNavMesh_NotAvailable,
+		kRebakeNavMesh_Default = kRebakeNavMesh_NotAvailable
+	} ERebakeNavMeshMode;
+
+	LLPanelPathfindingRebakeNavmesh();
+	virtual ~LLPanelPathfindingRebakeNavmesh();
+
+	static LLPanelPathfindingRebakeNavmesh* getPanel();
+
+	void               setMode(ERebakeNavMeshMode pRebakeNavMeshMode);
+	ERebakeNavMeshMode getMode() const;
+	
+	void onNavMeshRebakeClick();
+
+	void handleAgentState(BOOL pCanRebakeRegion);
+	void handleRebakeNavMeshResponse(bool pResponseStatus);
+	void handleNavMeshStatus(const LLPathfindingNavMeshStatus &pNavMeshStatus);
+	void handleRegionBoundaryCrossed();
+
+	void createNavMeshStatusListenerForCurrentRegion();
+
+	bool doDraw() const;
+	void updatePosition();
+
+	BOOL                                     mCanRebakeRegion;
+	ERebakeNavMeshMode                       mRebakeNavMeshMode;
+	
+	LLButton*                                mNavMeshRebakeButton;
+	LLButton*                                mNavMeshSendingButton;
+	LLButton*                                mNavMeshBakingButton;
+
+	LLPathfindingNavMesh::navmesh_slot_t     mNavMeshSlot;
+	boost::signals2::connection              mRegionCrossingSlot;
+	LLPathfindingManager::agent_state_slot_t mAgentStateSlot;
+};
+
+#endif // LL_LLPANELPATHFINDINGREBAKENAVMESH_H
diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp
new file mode 100644
index 000000000..00f2ebc4b
--- /dev/null
+++ b/indra/newview/llpathfindingcharacter.cpp
@@ -0,0 +1,99 @@
+/** 
+* @file llpathfindingcharacter.cpp
+* @brief Definition of a pathfinding character that contains various properties required for havok pathfinding.
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpathfindingcharacter.h"
+
+#include <string>
+
+#include "llpathfindingobject.h"
+#include "llsd.h"
+
+#define CHARACTER_CPU_TIME_FIELD   "cpu_time"
+#define CHARACTER_HORIZONTAL_FIELD "horizontal"
+#define CHARACTER_LENGTH_FIELD     "length"
+#define CHARACTER_RADIUS_FIELD     "radius"
+
+//---------------------------------------------------------------------------
+// LLPathfindingCharacter
+//---------------------------------------------------------------------------
+
+LLPathfindingCharacter::LLPathfindingCharacter(const std::string &pUUID, const LLSD& pCharacterData)
+	: LLPathfindingObject(pUUID, pCharacterData),
+	mCPUTime(0U),
+	mIsHorizontal(FALSE),
+	mLength(0.0f),
+	mRadius(0.0f)
+{
+	parseCharacterData(pCharacterData);
+}
+
+LLPathfindingCharacter::LLPathfindingCharacter(const LLPathfindingCharacter& pOther)
+	: LLPathfindingObject(pOther),
+	mCPUTime(pOther.mCPUTime),
+	mIsHorizontal(pOther.mIsHorizontal),
+	mLength(pOther.mLength),
+	mRadius(pOther.mRadius)
+{
+}
+
+LLPathfindingCharacter::~LLPathfindingCharacter()
+{
+}
+
+LLPathfindingCharacter& LLPathfindingCharacter::operator =(const LLPathfindingCharacter& pOther)
+{
+	dynamic_cast<LLPathfindingObject &>(*this) = pOther;
+
+	mCPUTime = pOther.mCPUTime;
+	mIsHorizontal = pOther.mIsHorizontal;
+	mLength = pOther.mLength;
+	mRadius = pOther.mRadius;
+
+	return *this;
+}
+
+void LLPathfindingCharacter::parseCharacterData(const LLSD &pCharacterData)
+{
+	llassert(pCharacterData.has(CHARACTER_CPU_TIME_FIELD));
+	llassert(pCharacterData.get(CHARACTER_CPU_TIME_FIELD).isReal());
+	mCPUTime = pCharacterData.get(CHARACTER_CPU_TIME_FIELD).asReal();
+
+	llassert(pCharacterData.has(CHARACTER_HORIZONTAL_FIELD));
+	llassert(pCharacterData.get(CHARACTER_HORIZONTAL_FIELD).isBoolean());
+	mIsHorizontal = pCharacterData.get(CHARACTER_HORIZONTAL_FIELD).asBoolean();
+
+	llassert(pCharacterData.has(CHARACTER_LENGTH_FIELD));
+	llassert(pCharacterData.get(CHARACTER_LENGTH_FIELD).isReal());
+	mLength = pCharacterData.get(CHARACTER_LENGTH_FIELD).asReal();
+
+	llassert(pCharacterData.has(CHARACTER_RADIUS_FIELD));
+	llassert(pCharacterData.get(CHARACTER_RADIUS_FIELD).isReal());
+	mRadius = pCharacterData.get(CHARACTER_RADIUS_FIELD).asReal();
+}
diff --git a/indra/newview/llpathfindingcharacter.h b/indra/newview/llpathfindingcharacter.h
new file mode 100644
index 000000000..7cf9f401b
--- /dev/null
+++ b/indra/newview/llpathfindingcharacter.h
@@ -0,0 +1,63 @@
+/** 
+* @file   llpathfindingcharacter.h
+* @brief  Definition of a pathfinding character that contains various properties required for havok pathfinding.
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+#ifndef LL_LLPATHFINDINGCHARACTER_H
+#define LL_LLPATHFINDINGCHARACTER_H
+
+#include <string>
+
+#include "llpathfindingobject.h"
+
+class LLSD;
+
+class LLPathfindingCharacter : public LLPathfindingObject
+{
+public:
+	LLPathfindingCharacter(const std::string &pUUID, const LLSD &pCharacterData);
+	LLPathfindingCharacter(const LLPathfindingCharacter& pOther);
+	virtual ~LLPathfindingCharacter();
+
+	LLPathfindingCharacter& operator =(const LLPathfindingCharacter& pOther);
+
+	inline F32  getCPUTime() const   {return mCPUTime;};
+
+	inline BOOL isHorizontal() const {return mIsHorizontal;};
+	inline F32  getLength() const    {return mLength;};
+	inline F32  getRadius() const    {return mRadius;};
+
+protected:
+
+private:
+	void parseCharacterData(const LLSD &pCharacterData);
+
+	F32  mCPUTime;
+
+	BOOL mIsHorizontal;
+	F32  mLength;
+	F32  mRadius;
+};
+
+#endif // LL_LLPATHFINDINGCHARACTER_H
diff --git a/indra/newview/llpathfindingcharacterlist.cpp b/indra/newview/llpathfindingcharacterlist.cpp
new file mode 100644
index 000000000..12340cebf
--- /dev/null
+++ b/indra/newview/llpathfindingcharacterlist.cpp
@@ -0,0 +1,69 @@
+/** 
+* @file llpathfindingcharacterlist.cpp
+* @brief Implementation of llpathfindingcharacterlist
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpathfindingcharacterlist.h"
+
+#include "llpathfindingcharacter.h"
+#include "llpathfindingobject.h"
+#include "llpathfindingobjectlist.h"
+#include "llsd.h"
+
+//---------------------------------------------------------------------------
+// LLPathfindingCharacterList
+//---------------------------------------------------------------------------
+
+LLPathfindingCharacterList::LLPathfindingCharacterList()
+	: LLPathfindingObjectList()
+{
+}
+
+LLPathfindingCharacterList::LLPathfindingCharacterList(const LLSD& pCharacterListData)
+	: LLPathfindingObjectList()
+{
+	parseCharacterListData(pCharacterListData);
+}
+
+LLPathfindingCharacterList::~LLPathfindingCharacterList()
+{
+}
+
+void LLPathfindingCharacterList::parseCharacterListData(const LLSD& pCharacterListData)
+{
+	LLPathfindingObjectMap &objectMap = getObjectMap();
+
+	for (LLSD::map_const_iterator characterDataIter = pCharacterListData.beginMap();
+		characterDataIter != pCharacterListData.endMap(); ++characterDataIter)
+	{
+		const std::string& uuid(characterDataIter->first);
+		const LLSD& characterData = characterDataIter->second;
+		LLPathfindingObjectPtr character(new LLPathfindingCharacter(uuid, characterData));
+		objectMap.insert(std::pair<std::string, LLPathfindingObjectPtr>(uuid, character));
+	}
+}
diff --git a/indra/newview/llpathfindingcharacterlist.h b/indra/newview/llpathfindingcharacterlist.h
new file mode 100644
index 000000000..4ecf70001
--- /dev/null
+++ b/indra/newview/llpathfindingcharacterlist.h
@@ -0,0 +1,47 @@
+/** 
+* @file   llpathfindingcharacterlist.h
+* @brief  Header file for llpathfindingcharacterlist
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+#ifndef LL_LLPATHFINDINGCHARACTERLIST_H
+#define LL_LLPATHFINDINGCHARACTERLIST_H
+
+#include "llpathfindingobjectlist.h"
+
+class LLSD;
+
+class LLPathfindingCharacterList : public LLPathfindingObjectList
+{
+public:
+	LLPathfindingCharacterList();
+	LLPathfindingCharacterList(const LLSD& pCharacterListData);
+	virtual ~LLPathfindingCharacterList();
+
+protected:
+
+private:
+	void parseCharacterListData(const LLSD& pCharacterListData);
+};
+
+#endif // LL_LLPATHFINDINGCHARACTERLIST_H
diff --git a/indra/newview/llpathfindinglinkset.cpp b/indra/newview/llpathfindinglinkset.cpp
new file mode 100644
index 000000000..fe4daabd8
--- /dev/null
+++ b/indra/newview/llpathfindinglinkset.cpp
@@ -0,0 +1,387 @@
+/** 
+* @file llpathfindinglinkset.cpp
+* @brief Definition of a pathfinding linkset that contains various properties required for havok pathfinding.
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpathfindinglinkset.h"
+
+#include <string>
+
+#include "llpathfindingobject.h"
+#include "llsd.h"
+
+#define LINKSET_LAND_IMPACT_FIELD   "landimpact"
+#define LINKSET_MODIFIABLE_FIELD    "modifiable"
+#define LINKSET_CATEGORY_FIELD      "navmesh_category"
+#define LINKSET_CAN_BE_VOLUME       "can_be_volume"
+#define LINKSET_PHANTOM_FIELD       "phantom"
+#define LINKSET_WALKABILITY_A_FIELD "A"
+#define LINKSET_WALKABILITY_B_FIELD "B"
+#define LINKSET_WALKABILITY_C_FIELD "C"
+#define LINKSET_WALKABILITY_D_FIELD "D"
+
+#define LINKSET_CATEGORY_VALUE_INCLUDE 0
+#define LINKSET_CATEGORY_VALUE_EXCLUDE 1
+#define LINKSET_CATEGORY_VALUE_IGNORE  2
+
+//---------------------------------------------------------------------------
+// LLPathfindingLinkset
+//---------------------------------------------------------------------------
+
+const S32 LLPathfindingLinkset::MIN_WALKABILITY_VALUE(0);
+const S32 LLPathfindingLinkset::MAX_WALKABILITY_VALUE(100);
+
+LLPathfindingLinkset::LLPathfindingLinkset(const LLSD& pTerrainData)
+	: LLPathfindingObject(),
+	mIsTerrain(true),
+	mLandImpact(0U),
+	mIsModifiable(FALSE),
+	mCanBeVolume(FALSE),
+	mLinksetUse(kUnknown),
+	mWalkabilityCoefficientA(MIN_WALKABILITY_VALUE),
+	mWalkabilityCoefficientB(MIN_WALKABILITY_VALUE),
+	mWalkabilityCoefficientC(MIN_WALKABILITY_VALUE),
+	mWalkabilityCoefficientD(MIN_WALKABILITY_VALUE)
+{
+	parsePathfindingData(pTerrainData);
+}
+
+LLPathfindingLinkset::LLPathfindingLinkset(const std::string &pUUID, const LLSD& pLinksetData)
+	: LLPathfindingObject(pUUID, pLinksetData),
+	mIsTerrain(false),
+	mLandImpact(0U),
+	mIsModifiable(TRUE),
+	mCanBeVolume(TRUE),
+	mLinksetUse(kUnknown),
+	mWalkabilityCoefficientA(MIN_WALKABILITY_VALUE),
+	mWalkabilityCoefficientB(MIN_WALKABILITY_VALUE),
+	mWalkabilityCoefficientC(MIN_WALKABILITY_VALUE),
+	mWalkabilityCoefficientD(MIN_WALKABILITY_VALUE)
+{
+	parseLinksetData(pLinksetData);
+	parsePathfindingData(pLinksetData);
+}
+
+LLPathfindingLinkset::LLPathfindingLinkset(const LLPathfindingLinkset& pOther)
+	: LLPathfindingObject(pOther),
+	mIsTerrain(pOther.mIsTerrain),
+	mLandImpact(pOther.mLandImpact),
+	mIsModifiable(pOther.mIsModifiable),
+	mCanBeVolume(pOther.mCanBeVolume),
+	mLinksetUse(pOther.mLinksetUse),
+	mWalkabilityCoefficientA(pOther.mWalkabilityCoefficientA),
+	mWalkabilityCoefficientB(pOther.mWalkabilityCoefficientB),
+	mWalkabilityCoefficientC(pOther.mWalkabilityCoefficientC),
+	mWalkabilityCoefficientD(pOther.mWalkabilityCoefficientD)
+{
+}
+
+LLPathfindingLinkset::~LLPathfindingLinkset()
+{
+}
+
+LLPathfindingLinkset& LLPathfindingLinkset::operator =(const LLPathfindingLinkset& pOther)
+{
+	dynamic_cast<LLPathfindingObject &>(*this) = pOther;
+
+	mIsTerrain = pOther.mIsTerrain;
+	mLandImpact = pOther.mLandImpact;
+	mIsModifiable = pOther.mIsModifiable;
+	mCanBeVolume = pOther.mCanBeVolume;
+	mLinksetUse = pOther.mLinksetUse;
+	mWalkabilityCoefficientA = pOther.mWalkabilityCoefficientA;
+	mWalkabilityCoefficientB = pOther.mWalkabilityCoefficientB;
+	mWalkabilityCoefficientC = pOther.mWalkabilityCoefficientC;
+	mWalkabilityCoefficientD = pOther.mWalkabilityCoefficientD;
+
+	return *this;
+}
+
+BOOL LLPathfindingLinkset::isPhantom() const
+{
+	return isPhantom(getLinksetUse());
+}
+
+LLPathfindingLinkset::ELinksetUse LLPathfindingLinkset::getLinksetUseWithToggledPhantom(ELinksetUse pLinksetUse)
+{
+	BOOL isPhantom = LLPathfindingLinkset::isPhantom(pLinksetUse);
+	ENavMeshGenerationCategory navMeshGenerationCategory = getNavMeshGenerationCategory(pLinksetUse);
+
+	return getLinksetUse(!isPhantom, navMeshGenerationCategory);
+}
+
+bool LLPathfindingLinkset::isShowUnmodifiablePhantomWarning(ELinksetUse pLinksetUse) const
+{
+	return (!isModifiable() && (isPhantom() != isPhantom(pLinksetUse)));
+}
+
+bool LLPathfindingLinkset::isShowCannotBeVolumeWarning(ELinksetUse pLinksetUse) const
+{
+	return (!canBeVolume() && ((pLinksetUse == kMaterialVolume) || (pLinksetUse == kExclusionVolume)));
+}
+
+LLSD LLPathfindingLinkset::encodeAlteredFields(ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD) const
+{
+	LLSD itemData;
+
+	if (!isTerrain() && (pLinksetUse != kUnknown) && (getLinksetUse() != pLinksetUse) &&
+		(canBeVolume() || ((pLinksetUse != kMaterialVolume) && (pLinksetUse != kExclusionVolume))))
+	{
+		if (isModifiable())
+		{
+			itemData[LINKSET_PHANTOM_FIELD] = static_cast<bool>(isPhantom(pLinksetUse));
+		}
+
+		itemData[LINKSET_CATEGORY_FIELD] = convertCategoryToLLSD(getNavMeshGenerationCategory(pLinksetUse));
+	}
+
+	if (mWalkabilityCoefficientA != pA)
+	{
+		itemData[LINKSET_WALKABILITY_A_FIELD] = llclamp(pA, MIN_WALKABILITY_VALUE, MAX_WALKABILITY_VALUE);
+	}
+
+	if (mWalkabilityCoefficientB != pB)
+	{
+		itemData[LINKSET_WALKABILITY_B_FIELD] = llclamp(pB, MIN_WALKABILITY_VALUE, MAX_WALKABILITY_VALUE);
+	}
+
+	if (mWalkabilityCoefficientC != pC)
+	{
+		itemData[LINKSET_WALKABILITY_C_FIELD] = llclamp(pC, MIN_WALKABILITY_VALUE, MAX_WALKABILITY_VALUE);
+	}
+
+	if (mWalkabilityCoefficientD != pD)
+	{
+		itemData[LINKSET_WALKABILITY_D_FIELD] = llclamp(pD, MIN_WALKABILITY_VALUE, MAX_WALKABILITY_VALUE);
+	}
+
+	return itemData;
+}
+
+void LLPathfindingLinkset::parseLinksetData(const LLSD &pLinksetData)
+{
+	llassert(pLinksetData.has(LINKSET_LAND_IMPACT_FIELD));
+	llassert(pLinksetData.get(LINKSET_LAND_IMPACT_FIELD).isInteger());
+	llassert(pLinksetData.get(LINKSET_LAND_IMPACT_FIELD).asInteger() >= 0);
+	mLandImpact = pLinksetData.get(LINKSET_LAND_IMPACT_FIELD).asInteger();
+	
+	llassert(pLinksetData.has(LINKSET_MODIFIABLE_FIELD));
+	llassert(pLinksetData.get(LINKSET_MODIFIABLE_FIELD).isBoolean());
+	mIsModifiable = pLinksetData.get(LINKSET_MODIFIABLE_FIELD).asBoolean();
+}
+
+void LLPathfindingLinkset::parsePathfindingData(const LLSD &pLinksetData)
+{
+	bool isPhantom = false;
+	if (pLinksetData.has(LINKSET_PHANTOM_FIELD))
+	{
+		llassert(pLinksetData.get(LINKSET_PHANTOM_FIELD).isBoolean());
+		isPhantom = pLinksetData.get(LINKSET_PHANTOM_FIELD).asBoolean();
+	}
+	
+	llassert(pLinksetData.has(LINKSET_CATEGORY_FIELD));
+	mLinksetUse = getLinksetUse(isPhantom, convertCategoryFromLLSD(pLinksetData.get(LINKSET_CATEGORY_FIELD)));
+
+	if (pLinksetData.has(LINKSET_CAN_BE_VOLUME))
+	{
+		llassert(pLinksetData.get(LINKSET_CAN_BE_VOLUME).isBoolean());
+		mCanBeVolume = pLinksetData.get(LINKSET_CAN_BE_VOLUME).asBoolean();
+	}
+
+	llassert(pLinksetData.has(LINKSET_WALKABILITY_A_FIELD));
+	llassert(pLinksetData.get(LINKSET_WALKABILITY_A_FIELD).isInteger());
+	mWalkabilityCoefficientA = pLinksetData.get(LINKSET_WALKABILITY_A_FIELD).asInteger();
+	llassert(mWalkabilityCoefficientA >= MIN_WALKABILITY_VALUE);
+	llassert(mWalkabilityCoefficientA <= MAX_WALKABILITY_VALUE);
+	
+	llassert(pLinksetData.has(LINKSET_WALKABILITY_B_FIELD));
+	llassert(pLinksetData.get(LINKSET_WALKABILITY_B_FIELD).isInteger());
+	mWalkabilityCoefficientB = pLinksetData.get(LINKSET_WALKABILITY_B_FIELD).asInteger();
+	llassert(mWalkabilityCoefficientB >= MIN_WALKABILITY_VALUE);
+	llassert(mWalkabilityCoefficientB <= MAX_WALKABILITY_VALUE);
+	
+	llassert(pLinksetData.has(LINKSET_WALKABILITY_C_FIELD));
+	llassert(pLinksetData.get(LINKSET_WALKABILITY_C_FIELD).isInteger());
+	mWalkabilityCoefficientC = pLinksetData.get(LINKSET_WALKABILITY_C_FIELD).asInteger();
+	llassert(mWalkabilityCoefficientC >= MIN_WALKABILITY_VALUE);
+	llassert(mWalkabilityCoefficientC <= MAX_WALKABILITY_VALUE);
+	
+	llassert(pLinksetData.has(LINKSET_WALKABILITY_D_FIELD));
+	llassert(pLinksetData.get(LINKSET_WALKABILITY_D_FIELD).isInteger());
+	mWalkabilityCoefficientD = pLinksetData.get(LINKSET_WALKABILITY_D_FIELD).asInteger();
+	llassert(mWalkabilityCoefficientD >= MIN_WALKABILITY_VALUE);
+	llassert(mWalkabilityCoefficientD <= MAX_WALKABILITY_VALUE);
+}
+
+BOOL LLPathfindingLinkset::isPhantom(ELinksetUse pLinksetUse)
+{
+	BOOL retVal;
+
+	switch (pLinksetUse)
+	{
+	case kWalkable :
+	case kStaticObstacle :
+	case kDynamicObstacle :
+		retVal = false;
+		break;
+	case kMaterialVolume :
+	case kExclusionVolume :
+	case kDynamicPhantom :
+		retVal = true;
+		break;
+	case kUnknown :
+	default :
+		retVal = false;
+		llassert(0);
+		break;
+	}
+
+	return retVal;
+}
+
+LLPathfindingLinkset::ELinksetUse LLPathfindingLinkset::getLinksetUse(bool pIsPhantom, ENavMeshGenerationCategory pNavMeshGenerationCategory)
+{
+	ELinksetUse linksetUse = kUnknown;
+
+	if (pIsPhantom)
+	{
+		switch (pNavMeshGenerationCategory)
+		{
+		case kNavMeshGenerationIgnore :
+			linksetUse = kDynamicPhantom;
+			break;
+		case kNavMeshGenerationInclude :
+			linksetUse = kMaterialVolume;
+			break;
+		case kNavMeshGenerationExclude :
+			linksetUse = kExclusionVolume;
+			break;
+		default :
+			linksetUse = kUnknown;
+			llassert(0);
+			break;
+		}
+	}
+	else
+	{
+		switch (pNavMeshGenerationCategory)
+		{
+		case kNavMeshGenerationIgnore :
+			linksetUse = kDynamicObstacle;
+			break;
+		case kNavMeshGenerationInclude :
+			linksetUse = kWalkable;
+			break;
+		case kNavMeshGenerationExclude :
+			linksetUse = kStaticObstacle;
+			break;
+		default :
+			linksetUse = kUnknown;
+			llassert(0);
+			break;
+		}
+	}
+
+	return linksetUse;
+}
+
+LLPathfindingLinkset::ENavMeshGenerationCategory LLPathfindingLinkset::getNavMeshGenerationCategory(ELinksetUse pLinksetUse)
+{
+	ENavMeshGenerationCategory navMeshGenerationCategory;
+	switch (pLinksetUse)
+	{
+	case kWalkable :
+	case kMaterialVolume :
+		navMeshGenerationCategory = kNavMeshGenerationInclude;
+		break;
+	case kStaticObstacle :
+	case kExclusionVolume :
+		navMeshGenerationCategory = kNavMeshGenerationExclude;
+		break;
+	case kDynamicObstacle :
+	case kDynamicPhantom :
+		navMeshGenerationCategory = kNavMeshGenerationIgnore;
+		break;
+	case kUnknown :
+	default :
+		navMeshGenerationCategory = kNavMeshGenerationIgnore;
+		llassert(0);
+		break;
+	}
+
+	return navMeshGenerationCategory;
+}
+
+LLSD LLPathfindingLinkset::convertCategoryToLLSD(ENavMeshGenerationCategory pNavMeshGenerationCategory)
+{
+	LLSD llsd;
+
+	switch (pNavMeshGenerationCategory)
+	{
+		case kNavMeshGenerationIgnore :
+			llsd = static_cast<S32>(LINKSET_CATEGORY_VALUE_IGNORE);
+			break;
+		case kNavMeshGenerationInclude :
+			llsd = static_cast<S32>(LINKSET_CATEGORY_VALUE_INCLUDE);
+			break;
+		case kNavMeshGenerationExclude :
+			llsd = static_cast<S32>(LINKSET_CATEGORY_VALUE_EXCLUDE);
+			break;
+		default :
+			llsd = static_cast<S32>(LINKSET_CATEGORY_VALUE_IGNORE);
+			llassert(0);
+			break;
+	}
+
+	return llsd;
+}
+
+LLPathfindingLinkset::ENavMeshGenerationCategory LLPathfindingLinkset::convertCategoryFromLLSD(const LLSD &llsd)
+{
+	ENavMeshGenerationCategory navMeshGenerationCategory;
+
+	llassert(llsd.isInteger());
+	switch (llsd.asInteger())
+	{
+		case LINKSET_CATEGORY_VALUE_IGNORE :
+			navMeshGenerationCategory = kNavMeshGenerationIgnore;
+			break;
+		case LINKSET_CATEGORY_VALUE_INCLUDE :
+			navMeshGenerationCategory = kNavMeshGenerationInclude;
+			break;
+		case LINKSET_CATEGORY_VALUE_EXCLUDE :
+			navMeshGenerationCategory = kNavMeshGenerationExclude;
+			break;
+		default :
+			navMeshGenerationCategory = kNavMeshGenerationIgnore;
+			llassert(0);
+			break;
+	}
+
+	return navMeshGenerationCategory;
+}
diff --git a/indra/newview/llpathfindinglinkset.h b/indra/newview/llpathfindinglinkset.h
new file mode 100644
index 000000000..73b4d6bad
--- /dev/null
+++ b/indra/newview/llpathfindinglinkset.h
@@ -0,0 +1,108 @@
+/** 
+* @file   llpathfindinglinkset.h
+* @brief  Definition of a pathfinding linkset that contains various properties required for havok pathfinding.
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+#ifndef LL_LLPATHFINDINGLINKSET_H
+#define LL_LLPATHFINDINGLINKSET_H
+
+#include <string>
+
+#include "llpathfindingobject.h"
+
+class LLSD;
+
+class LLPathfindingLinkset : public LLPathfindingObject
+{
+public:
+	typedef enum
+	{
+		kUnknown,
+		kWalkable,
+		kStaticObstacle,
+		kDynamicObstacle,
+		kMaterialVolume,
+		kExclusionVolume,
+		kDynamicPhantom
+	} ELinksetUse;
+
+	LLPathfindingLinkset(const LLSD &pTerrainData);
+	LLPathfindingLinkset(const std::string &pUUID, const LLSD &pLinksetData);
+	LLPathfindingLinkset(const LLPathfindingLinkset& pOther);
+	virtual ~LLPathfindingLinkset();
+
+	LLPathfindingLinkset& operator = (const LLPathfindingLinkset& pOther);
+
+	inline bool        isTerrain() const                   {return mIsTerrain;};
+	inline U32         getLandImpact() const               {return mLandImpact;};
+	BOOL               isModifiable() const                {return mIsModifiable;};
+	BOOL               isPhantom() const;
+	BOOL               canBeVolume() const                 {return mCanBeVolume;};
+	static ELinksetUse getLinksetUseWithToggledPhantom(ELinksetUse pLinksetUse);
+
+	inline ELinksetUse getLinksetUse() const               {return mLinksetUse;};
+
+	inline S32         getWalkabilityCoefficientA() const  {return mWalkabilityCoefficientA;};
+	inline S32         getWalkabilityCoefficientB() const  {return mWalkabilityCoefficientB;};
+	inline S32         getWalkabilityCoefficientC() const  {return mWalkabilityCoefficientC;};
+	inline S32         getWalkabilityCoefficientD() const  {return mWalkabilityCoefficientD;};
+
+	bool               isShowUnmodifiablePhantomWarning(ELinksetUse pLinksetUse) const;
+	bool               isShowCannotBeVolumeWarning(ELinksetUse pLinksetUse) const;
+	LLSD               encodeAlteredFields(ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD) const;
+
+	static const S32 MIN_WALKABILITY_VALUE;
+	static const S32 MAX_WALKABILITY_VALUE;
+	
+protected:
+
+private:
+	typedef enum
+	{
+		kNavMeshGenerationIgnore,
+		kNavMeshGenerationInclude,
+		kNavMeshGenerationExclude
+	} ENavMeshGenerationCategory;
+
+	void                              parseLinksetData(const LLSD &pLinksetData);
+	void                              parsePathfindingData(const LLSD &pLinksetData);
+
+	static BOOL                       isPhantom(ELinksetUse pLinksetUse);
+	static ELinksetUse                getLinksetUse(bool pIsPhantom, ENavMeshGenerationCategory pNavMeshGenerationCategory);
+	static ENavMeshGenerationCategory getNavMeshGenerationCategory(ELinksetUse pLinksetUse);
+	static LLSD                       convertCategoryToLLSD(ENavMeshGenerationCategory pNavMeshGenerationCategory);
+	static ENavMeshGenerationCategory convertCategoryFromLLSD(const LLSD &llsd);
+
+	bool         mIsTerrain;
+	U32          mLandImpact;
+	BOOL         mIsModifiable;
+	BOOL         mCanBeVolume;
+	ELinksetUse  mLinksetUse;
+	S32          mWalkabilityCoefficientA;
+	S32          mWalkabilityCoefficientB;
+	S32          mWalkabilityCoefficientC;
+	S32          mWalkabilityCoefficientD;
+};
+
+#endif // LL_LLPATHFINDINGLINKSET_H
diff --git a/indra/newview/llpathfindinglinksetlist.cpp b/indra/newview/llpathfindinglinksetlist.cpp
new file mode 100644
index 000000000..746fa342a
--- /dev/null
+++ b/indra/newview/llpathfindinglinksetlist.cpp
@@ -0,0 +1,196 @@
+/** 
+* @file llpathfindinglinksetlist.cpp
+* @brief Implementation of llpathfindinglinksetlist
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpathfindinglinksetlist.h"
+
+#include <string>
+#include <map>
+
+#include "llpathfindinglinkset.h"
+#include "llpathfindingobject.h"
+#include "llpathfindingobjectlist.h"
+#include "llsd.h"
+
+//---------------------------------------------------------------------------
+// LLPathfindingLinksetList
+//---------------------------------------------------------------------------
+
+LLPathfindingLinksetList::LLPathfindingLinksetList()
+	: LLPathfindingObjectList()
+{
+}
+
+LLPathfindingLinksetList::LLPathfindingLinksetList(const LLSD& pLinksetListData)
+	: LLPathfindingObjectList()
+{
+	parseLinksetListData(pLinksetListData);
+}
+
+LLPathfindingLinksetList::~LLPathfindingLinksetList()
+{
+}
+
+LLSD LLPathfindingLinksetList::encodeObjectFields(LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD) const
+{
+	LLSD listData;
+
+	for (const_iterator linksetIter = begin(); linksetIter != end(); ++linksetIter)
+	{
+		const LLPathfindingObjectPtr objectPtr = linksetIter->second;
+		const LLPathfindingLinkset *linkset = dynamic_cast<const LLPathfindingLinkset *>(objectPtr.get());
+
+		if (!linkset->isTerrain())
+		{
+			LLSD linksetData = linkset->encodeAlteredFields(pLinksetUse, pA, pB, pC, pD);
+			if (!linksetData.isUndefined())
+			{
+				const std::string& uuid(linksetIter->first);
+				listData[uuid] = linksetData;
+			}
+		}
+	}
+
+	return listData;
+}
+
+LLSD LLPathfindingLinksetList::encodeTerrainFields(LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD) const
+{
+	LLSD terrainData;
+
+	for (const_iterator linksetIter = begin(); linksetIter != end(); ++linksetIter)
+	{
+		const LLPathfindingObjectPtr objectPtr = linksetIter->second;
+		const LLPathfindingLinkset *linkset = dynamic_cast<const LLPathfindingLinkset *>(objectPtr.get());
+
+		if (linkset->isTerrain())
+		{
+			terrainData = linkset->encodeAlteredFields(pLinksetUse, pA, pB, pC, pD);
+			break;
+		}
+	}
+	
+	return terrainData;
+}
+
+bool LLPathfindingLinksetList::isShowUnmodifiablePhantomWarning(LLPathfindingLinkset::ELinksetUse pLinksetUse) const
+{
+	bool isShowWarning = false;
+
+	for (const_iterator objectIter = begin(); !isShowWarning && (objectIter != end()); ++objectIter)
+	{
+		const LLPathfindingObjectPtr objectPtr = objectIter->second;
+		const LLPathfindingLinkset *linkset = dynamic_cast<const LLPathfindingLinkset *>(objectPtr.get());
+		isShowWarning = linkset->isShowUnmodifiablePhantomWarning(pLinksetUse);
+	}
+
+	return isShowWarning;
+}
+
+bool LLPathfindingLinksetList::isShowCannotBeVolumeWarning(LLPathfindingLinkset::ELinksetUse pLinksetUse) const
+{
+	bool isShowWarning = false;
+
+	for (const_iterator objectIter = begin(); !isShowWarning && (objectIter != end()); ++objectIter)
+	{
+		const LLPathfindingObjectPtr objectPtr = objectIter->second;
+		const LLPathfindingLinkset *linkset = dynamic_cast<const LLPathfindingLinkset *>(objectPtr.get());
+		isShowWarning = linkset->isShowCannotBeVolumeWarning(pLinksetUse);
+	}
+
+	return isShowWarning;
+}
+
+void LLPathfindingLinksetList::determinePossibleStates(BOOL &pCanBeWalkable, BOOL &pCanBeStaticObstacle, BOOL &pCanBeDynamicObstacle,
+	BOOL &pCanBeMaterialVolume, BOOL &pCanBeExclusionVolume, BOOL &pCanBeDynamicPhantom) const
+{
+	pCanBeWalkable = FALSE;
+	pCanBeStaticObstacle = FALSE;
+	pCanBeDynamicObstacle = FALSE;
+	pCanBeMaterialVolume = FALSE;
+	pCanBeExclusionVolume = FALSE;
+	pCanBeDynamicPhantom = FALSE;
+
+	for (const_iterator objectIter = begin();
+		!(pCanBeWalkable && pCanBeStaticObstacle && pCanBeDynamicObstacle && pCanBeMaterialVolume && pCanBeExclusionVolume && pCanBeDynamicPhantom) && (objectIter != end());
+		++objectIter)
+	{
+		const LLPathfindingObjectPtr objectPtr = objectIter->second;
+		const LLPathfindingLinkset *linkset = dynamic_cast<const LLPathfindingLinkset *>(objectPtr.get());
+
+		if (linkset->isTerrain())
+		{
+			pCanBeWalkable = TRUE;
+		}
+		else
+		{
+			if (linkset->isModifiable())
+			{
+				pCanBeWalkable = TRUE;
+				pCanBeStaticObstacle = TRUE;
+				pCanBeDynamicObstacle = TRUE;
+				pCanBeDynamicPhantom = TRUE;
+				if (linkset->canBeVolume())
+				{
+					pCanBeMaterialVolume = TRUE;
+					pCanBeExclusionVolume = TRUE;
+				}
+			}
+			else if (linkset->isPhantom())
+			{
+				pCanBeDynamicPhantom = TRUE;
+				if (linkset->canBeVolume())
+				{
+					pCanBeMaterialVolume = TRUE;
+					pCanBeExclusionVolume = TRUE;
+				}
+			}
+			else
+			{
+				pCanBeWalkable = TRUE;
+				pCanBeStaticObstacle = TRUE;
+				pCanBeDynamicObstacle = TRUE;
+			}
+		}
+	}
+}
+
+void LLPathfindingLinksetList::parseLinksetListData(const LLSD& pLinksetListData)
+{
+	LLPathfindingObjectMap &objectMap = getObjectMap();
+
+	for (LLSD::map_const_iterator linksetDataIter = pLinksetListData.beginMap();
+		linksetDataIter != pLinksetListData.endMap(); ++linksetDataIter)
+	{
+		const std::string& uuid(linksetDataIter->first);
+		const LLSD& linksetData = linksetDataIter->second;
+		LLPathfindingObjectPtr linksetPtr(new LLPathfindingLinkset(uuid, linksetData));
+		objectMap.insert(std::pair<std::string, LLPathfindingObjectPtr>(uuid, linksetPtr));
+	}
+}
diff --git a/indra/newview/llpathfindinglinksetlist.h b/indra/newview/llpathfindinglinksetlist.h
new file mode 100644
index 000000000..77c635864
--- /dev/null
+++ b/indra/newview/llpathfindinglinksetlist.h
@@ -0,0 +1,57 @@
+/** 
+* @file   llpathfindinglinksetlist.h
+* @brief  Header file for llpathfindinglinksetlist
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+#ifndef LL_LLPATHFINDINGLINKSETLIST_H
+#define LL_LLPATHFINDINGLINKSETLIST_H
+
+#include "llpathfindinglinkset.h"
+#include "llpathfindingobjectlist.h"
+
+class LLSD;
+
+class LLPathfindingLinksetList : public LLPathfindingObjectList
+{
+public:
+	LLPathfindingLinksetList();
+	LLPathfindingLinksetList(const LLSD& pLinksetListData);
+	virtual ~LLPathfindingLinksetList();
+
+	LLSD encodeObjectFields(LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD) const;
+	LLSD encodeTerrainFields(LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD) const;
+
+	bool isShowUnmodifiablePhantomWarning(LLPathfindingLinkset::ELinksetUse pLinksetUse) const;
+	bool isShowCannotBeVolumeWarning(LLPathfindingLinkset::ELinksetUse pLinksetUse) const;
+
+	void determinePossibleStates(BOOL &pCanBeWalkable, BOOL &pCanBeStaticObstacle, BOOL &pCanBeDynamicObstacle,
+		BOOL &pCanBeMaterialVolume, BOOL &pCanBeExclusionVolume, BOOL &pCanBeDynamicPhantom) const;
+
+protected:
+
+private:
+	void parseLinksetListData(const LLSD& pLinksetListData);
+};
+
+#endif // LL_LLPATHFINDINGLINKSETLIST_H
diff --git a/indra/newview/llpathfindingmanager.cpp b/indra/newview/llpathfindingmanager.cpp
new file mode 100644
index 000000000..48775693a
--- /dev/null
+++ b/indra/newview/llpathfindingmanager.cpp
@@ -0,0 +1,1050 @@
+/** 
+* @file llpathfindingmanager.cpp
+* @brief Implementation of llpathfindingmanager
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpathfindingmanager.h"
+
+#include <string>
+#include <map>
+
+#include <boost/bind.hpp>
+#include <boost/function.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/signals2.hpp>
+
+#include "llagent.h"
+#include "llhttpclient.h"
+#include "llhttpnode.h"
+#include "llnotificationsutil.h"
+#include "llpathfindingcharacterlist.h"
+#include "llpathfindinglinkset.h"
+#include "llpathfindinglinksetlist.h"
+#include "llpathfindingnavmesh.h"
+#include "llpathfindingnavmeshstatus.h"
+#include "llpathfindingobject.h"
+//#include "llpathinglib.h"
+#include "llsingleton.h"
+#include "llsd.h"
+#include "lltrans.h"
+#include "lluuid.h"
+#include "llviewerregion.h"
+#include "llweb.h"
+
+#define CAP_SERVICE_RETRIEVE_NAVMESH        "RetrieveNavMeshSrc"
+
+#define CAP_SERVICE_NAVMESH_STATUS          "NavMeshGenerationStatus"
+
+#define CAP_SERVICE_OBJECT_LINKSETS         "ObjectNavMeshProperties"
+#define CAP_SERVICE_TERRAIN_LINKSETS        "TerrainNavMeshProperties"
+
+#define CAP_SERVICE_CHARACTERS              "CharacterProperties"
+
+#define SIM_MESSAGE_NAVMESH_STATUS_UPDATE   "/message/NavMeshStatusUpdate"
+#define SIM_MESSAGE_AGENT_STATE_UPDATE      "/message/AgentStateUpdate"
+#define SIM_MESSAGE_BODY_FIELD              "body"
+
+#define CAP_SERVICE_AGENT_STATE             "AgentState"
+
+#define AGENT_STATE_CAN_REBAKE_REGION_FIELD "can_modify_navmesh"
+
+//---------------------------------------------------------------------------
+// LLNavMeshSimStateChangeNode
+//---------------------------------------------------------------------------
+
+class LLNavMeshSimStateChangeNode : public LLHTTPNode
+{
+public:
+	virtual void post(ResponsePtr pResponse, const LLSD &pContext, const LLSD &pInput) const;
+};
+
+LLHTTPRegistration<LLNavMeshSimStateChangeNode> gHTTPRegistrationNavMeshSimStateChangeNode(SIM_MESSAGE_NAVMESH_STATUS_UPDATE);
+
+
+//---------------------------------------------------------------------------
+// LLAgentStateChangeNode
+//---------------------------------------------------------------------------
+class LLAgentStateChangeNode : public LLHTTPNode
+{
+public:
+	virtual void post(ResponsePtr pResponse, const LLSD &pContext, const LLSD &pInput) const;
+};
+
+LLHTTPRegistration<LLAgentStateChangeNode> gHTTPRegistrationAgentStateChangeNode(SIM_MESSAGE_AGENT_STATE_UPDATE);
+
+//---------------------------------------------------------------------------
+// NavMeshStatusResponder
+//---------------------------------------------------------------------------
+
+class NavMeshStatusResponder : public LLHTTPClient::Responder
+{
+public:
+	NavMeshStatusResponder(const std::string &pCapabilityURL, LLViewerRegion *pRegion, bool pIsGetStatusOnly);
+	virtual ~NavMeshStatusResponder();
+
+	virtual void result(const LLSD &pContent);
+	virtual void error(U32 pStatus, const std::string& pReason);
+
+protected:
+
+private:
+	std::string    mCapabilityURL;
+	LLViewerRegion *mRegion;
+	LLUUID         mRegionUUID;
+	bool           mIsGetStatusOnly;
+};
+
+//---------------------------------------------------------------------------
+// NavMeshResponder
+//---------------------------------------------------------------------------
+
+class NavMeshResponder : public LLHTTPClient::Responder
+{
+public:
+	NavMeshResponder(const std::string &pCapabilityURL, U32 pNavMeshVersion, LLPathfindingNavMeshPtr pNavMeshPtr);
+	virtual ~NavMeshResponder();
+
+	virtual void result(const LLSD &pContent);
+	virtual void error(U32 pStatus, const std::string& pReason);
+
+protected:
+
+private:
+	std::string             mCapabilityURL;
+	U32                     mNavMeshVersion;
+	LLPathfindingNavMeshPtr mNavMeshPtr;
+};
+
+//---------------------------------------------------------------------------
+// AgentStateResponder
+//---------------------------------------------------------------------------
+
+class AgentStateResponder : public LLHTTPClient::Responder
+{
+public:
+	AgentStateResponder(const std::string &pCapabilityURL);
+	virtual ~AgentStateResponder();
+
+	virtual void result(const LLSD &pContent);
+	virtual void error(U32 pStatus, const std::string& pReason);
+
+protected:
+
+private:
+	std::string mCapabilityURL;
+};
+
+
+//---------------------------------------------------------------------------
+// NavMeshRebakeResponder
+//---------------------------------------------------------------------------
+class NavMeshRebakeResponder : public LLHTTPClient::Responder
+{
+public:
+	NavMeshRebakeResponder(const std::string &pCapabilityURL, LLPathfindingManager::rebake_navmesh_callback_t pRebakeNavMeshCallback);
+	virtual ~NavMeshRebakeResponder();
+
+	virtual void result(const LLSD &pContent);
+	virtual void error(U32 pStatus, const std::string& pReason);
+
+protected:
+
+private:
+	std::string                                     mCapabilityURL;
+	LLPathfindingManager::rebake_navmesh_callback_t mRebakeNavMeshCallback;
+};
+
+//---------------------------------------------------------------------------
+// LinksetsResponder
+//---------------------------------------------------------------------------
+
+class LinksetsResponder
+{
+public:
+	LinksetsResponder(LLPathfindingManager::request_id_t pRequestId, LLPathfindingManager::object_request_callback_t pLinksetsCallback, bool pIsObjectRequested, bool pIsTerrainRequested);
+	virtual ~LinksetsResponder();
+
+	void handleObjectLinksetsResult(const LLSD &pContent);
+	void handleObjectLinksetsError(U32 pStatus, const std::string &pReason, const std::string &pURL);
+	void handleTerrainLinksetsResult(const LLSD &pContent);
+	void handleTerrainLinksetsError(U32 pStatus, const std::string &pReason, const std::string &pURL);
+
+protected:
+
+private:
+	void sendCallback();
+
+	typedef enum
+	{
+		kNotRequested,
+		kWaiting,
+		kReceivedGood,
+		kReceivedError
+	} EMessagingState;
+
+	LLPathfindingManager::request_id_t              mRequestId;
+	LLPathfindingManager::object_request_callback_t mLinksetsCallback;
+
+	EMessagingState                                 mObjectMessagingState;
+	EMessagingState                                 mTerrainMessagingState;
+
+	LLPathfindingObjectListPtr                      mObjectLinksetListPtr;
+	LLPathfindingObjectPtr                          mTerrainLinksetPtr;
+};
+
+typedef boost::shared_ptr<LinksetsResponder> LinksetsResponderPtr;
+
+//---------------------------------------------------------------------------
+// ObjectLinksetsResponder
+//---------------------------------------------------------------------------
+
+class ObjectLinksetsResponder : public LLHTTPClient::Responder
+{
+public:
+	ObjectLinksetsResponder(const std::string &pCapabilityURL, LinksetsResponderPtr pLinksetsResponsderPtr);
+	virtual ~ObjectLinksetsResponder();
+
+	virtual void result(const LLSD &pContent);
+	virtual void error(U32 pStatus, const std::string &pReason);
+
+protected:
+
+private:
+	std::string          mCapabilityURL;
+	LinksetsResponderPtr mLinksetsResponsderPtr;
+};
+
+//---------------------------------------------------------------------------
+// TerrainLinksetsResponder
+//---------------------------------------------------------------------------
+
+class TerrainLinksetsResponder : public LLHTTPClient::Responder
+{
+public:
+	TerrainLinksetsResponder(const std::string &pCapabilityURL, LinksetsResponderPtr pLinksetsResponsderPtr);
+	virtual ~TerrainLinksetsResponder();
+
+	virtual void result(const LLSD &pContent);
+	virtual void error(U32 pStatus, const std::string &pReason);
+
+protected:
+
+private:
+	std::string          mCapabilityURL;
+	LinksetsResponderPtr mLinksetsResponsderPtr;
+};
+
+//---------------------------------------------------------------------------
+// CharactersResponder
+//---------------------------------------------------------------------------
+
+class CharactersResponder : public LLHTTPClient::Responder
+{
+public:
+	CharactersResponder(const std::string &pCapabilityURL, LLPathfindingManager::request_id_t pRequestId, LLPathfindingManager::object_request_callback_t pCharactersCallback);
+	virtual ~CharactersResponder();
+
+	virtual void result(const LLSD &pContent);
+	virtual void error(U32 pStatus, const std::string &pReason);
+
+protected:
+
+private:
+	std::string                                     mCapabilityURL;
+	LLPathfindingManager::request_id_t              mRequestId;
+	LLPathfindingManager::object_request_callback_t mCharactersCallback;
+};
+
+//---------------------------------------------------------------------------
+// LLPathfindingManager
+//---------------------------------------------------------------------------
+
+LLPathfindingManager::LLPathfindingManager()
+	: LLSingleton<LLPathfindingManager>(),
+	mNavMeshMap(),
+	mAgentStateSignal()
+{
+}
+
+LLPathfindingManager::~LLPathfindingManager()
+{	
+	quitSystem();
+}
+
+void LLPathfindingManager::initSystem()
+{
+	/*if (LLPathingLib::getInstance() == NULL)
+	{
+		LLPathingLib::initSystem();
+	}*/
+}
+
+void LLPathfindingManager::quitSystem()
+{
+	/*if (LLPathingLib::getInstance() != NULL)
+	{
+		LLPathingLib::quitSystem();
+	}*/
+}
+
+bool LLPathfindingManager::isPathfindingViewEnabled() const
+{
+	return false;
+	//return (LLPathingLib::getInstance() != NULL);
+}
+
+bool LLPathfindingManager::isPathfindingEnabledForCurrentRegion() const
+{
+	return isPathfindingEnabledForRegion(getCurrentRegion());
+}
+
+bool LLPathfindingManager::isPathfindingEnabledForRegion(LLViewerRegion *pRegion) const
+{
+	std::string retrieveNavMeshURL = getRetrieveNavMeshURLForRegion(pRegion);
+	return !retrieveNavMeshURL.empty();
+}
+
+bool LLPathfindingManager::isAllowViewTerrainProperties() const
+{
+	LLViewerRegion* region = getCurrentRegion();
+	return (gAgent.isGodlike() || ((region != NULL) && region->canManageEstate()));
+}
+
+LLPathfindingNavMesh::navmesh_slot_t LLPathfindingManager::registerNavMeshListenerForRegion(LLViewerRegion *pRegion, LLPathfindingNavMesh::navmesh_callback_t pNavMeshCallback)
+{
+	LLPathfindingNavMeshPtr navMeshPtr = getNavMeshForRegion(pRegion);
+	return navMeshPtr->registerNavMeshListener(pNavMeshCallback);
+}
+
+void LLPathfindingManager::requestGetNavMeshForRegion(LLViewerRegion *pRegion, bool pIsGetStatusOnly)
+{
+	LLPathfindingNavMeshPtr navMeshPtr = getNavMeshForRegion(pRegion);
+
+	if (pRegion == NULL)
+	{
+		navMeshPtr->handleNavMeshNotEnabled();
+	}
+	else if (!pRegion->capabilitiesReceived())
+	{
+		navMeshPtr->handleNavMeshWaitForRegionLoad();
+		pRegion->setCapabilitiesReceivedCallback(boost::bind(&LLPathfindingManager::handleDeferredGetNavMeshForRegion, this, _1, pIsGetStatusOnly));
+	}
+	else if (!isPathfindingEnabledForRegion(pRegion))
+	{
+		navMeshPtr->handleNavMeshNotEnabled();
+	}
+	else
+	{
+		std::string navMeshStatusURL = getNavMeshStatusURLForRegion(pRegion);
+		llassert(!navMeshStatusURL.empty());
+		navMeshPtr->handleNavMeshCheckVersion();
+		LLHTTPClient::ResponderPtr navMeshStatusResponder = new NavMeshStatusResponder(navMeshStatusURL, pRegion, pIsGetStatusOnly);
+		LLHTTPClient::get(navMeshStatusURL, navMeshStatusResponder);
+	}
+}
+
+void LLPathfindingManager::requestGetLinksets(request_id_t pRequestId, object_request_callback_t pLinksetsCallback) const
+{
+	LLPathfindingObjectListPtr emptyLinksetListPtr;
+	LLViewerRegion *currentRegion = getCurrentRegion();
+
+	if (currentRegion == NULL)
+	{
+		pLinksetsCallback(pRequestId, kRequestNotEnabled, emptyLinksetListPtr);
+	}
+	else if (!currentRegion->capabilitiesReceived())
+	{
+		pLinksetsCallback(pRequestId, kRequestStarted, emptyLinksetListPtr);
+		currentRegion->setCapabilitiesReceivedCallback(boost::bind(&LLPathfindingManager::handleDeferredGetLinksetsForRegion, this, _1, pRequestId, pLinksetsCallback));
+	}
+	else
+	{
+		std::string objectLinksetsURL = getObjectLinksetsURLForCurrentRegion();
+		std::string terrainLinksetsURL = getTerrainLinksetsURLForCurrentRegion();
+		if (objectLinksetsURL.empty() || terrainLinksetsURL.empty())
+		{
+			pLinksetsCallback(pRequestId, kRequestNotEnabled, emptyLinksetListPtr);
+		}
+		else
+		{
+			pLinksetsCallback(pRequestId, kRequestStarted, emptyLinksetListPtr);
+
+			bool doRequestTerrain = isAllowViewTerrainProperties();
+			LinksetsResponderPtr linksetsResponderPtr(new LinksetsResponder(pRequestId, pLinksetsCallback, true, doRequestTerrain));
+
+			LLHTTPClient::ResponderPtr objectLinksetsResponder = new ObjectLinksetsResponder(objectLinksetsURL, linksetsResponderPtr);
+			LLHTTPClient::get(objectLinksetsURL, objectLinksetsResponder);
+
+			if (doRequestTerrain)
+			{
+				LLHTTPClient::ResponderPtr terrainLinksetsResponder = new TerrainLinksetsResponder(terrainLinksetsURL, linksetsResponderPtr);
+				LLHTTPClient::get(terrainLinksetsURL, terrainLinksetsResponder);
+			}
+		}
+	}
+}
+
+void LLPathfindingManager::requestSetLinksets(request_id_t pRequestId, const LLPathfindingObjectListPtr &pLinksetListPtr, LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD, object_request_callback_t pLinksetsCallback) const
+{
+	LLPathfindingObjectListPtr emptyLinksetListPtr;
+
+	std::string objectLinksetsURL = getObjectLinksetsURLForCurrentRegion();
+	std::string terrainLinksetsURL = getTerrainLinksetsURLForCurrentRegion();
+	if (objectLinksetsURL.empty() || terrainLinksetsURL.empty())
+	{
+		pLinksetsCallback(pRequestId, kRequestNotEnabled, emptyLinksetListPtr);
+	}
+	else if ((pLinksetListPtr == NULL) || pLinksetListPtr->isEmpty())
+	{
+		pLinksetsCallback(pRequestId, kRequestCompleted, emptyLinksetListPtr);
+	}
+	else 
+	{
+		const LLPathfindingLinksetList *linksetList = dynamic_cast<const LLPathfindingLinksetList *>(pLinksetListPtr.get());
+
+		LLSD objectPostData = linksetList->encodeObjectFields(pLinksetUse, pA, pB, pC, pD);
+		LLSD terrainPostData;
+		if (isAllowViewTerrainProperties())
+		{
+			terrainPostData = linksetList->encodeTerrainFields(pLinksetUse, pA, pB, pC, pD);
+		}
+
+		if (objectPostData.isUndefined() && terrainPostData.isUndefined())
+		{
+			pLinksetsCallback(pRequestId, kRequestCompleted, emptyLinksetListPtr);
+		}
+		else
+		{
+			pLinksetsCallback(pRequestId, kRequestStarted, emptyLinksetListPtr);
+
+			LinksetsResponderPtr linksetsResponderPtr(new LinksetsResponder(pRequestId, pLinksetsCallback, !objectPostData.isUndefined(), !terrainPostData.isUndefined()));
+
+			if (!objectPostData.isUndefined())
+			{
+				LLHTTPClient::ResponderPtr objectLinksetsResponder = new ObjectLinksetsResponder(objectLinksetsURL, linksetsResponderPtr);
+				LLHTTPClient::put(objectLinksetsURL, objectPostData, objectLinksetsResponder);
+			}
+
+			if (!terrainPostData.isUndefined())
+			{
+				LLHTTPClient::ResponderPtr terrainLinksetsResponder = new TerrainLinksetsResponder(terrainLinksetsURL, linksetsResponderPtr);
+				LLHTTPClient::put(terrainLinksetsURL, terrainPostData, terrainLinksetsResponder);
+			}
+		}
+	}
+}
+
+void LLPathfindingManager::requestGetCharacters(request_id_t pRequestId, object_request_callback_t pCharactersCallback) const
+{
+	LLPathfindingObjectListPtr emptyCharacterListPtr;
+
+	LLViewerRegion *currentRegion = getCurrentRegion();
+
+	if (currentRegion == NULL)
+	{
+		pCharactersCallback(pRequestId, kRequestNotEnabled, emptyCharacterListPtr);
+	}
+	else if (!currentRegion->capabilitiesReceived())
+	{
+		pCharactersCallback(pRequestId, kRequestStarted, emptyCharacterListPtr);
+		currentRegion->setCapabilitiesReceivedCallback(boost::bind(&LLPathfindingManager::handleDeferredGetCharactersForRegion, this, _1, pRequestId, pCharactersCallback));
+	}
+	else
+	{
+		std::string charactersURL = getCharactersURLForCurrentRegion();
+		if (charactersURL.empty())
+		{
+			pCharactersCallback(pRequestId, kRequestNotEnabled, emptyCharacterListPtr);
+		}
+		else
+		{
+			pCharactersCallback(pRequestId, kRequestStarted, emptyCharacterListPtr);
+
+			LLHTTPClient::ResponderPtr charactersResponder = new CharactersResponder(charactersURL, pRequestId, pCharactersCallback);
+			LLHTTPClient::get(charactersURL, charactersResponder);
+		}
+	}
+}
+
+LLPathfindingManager::agent_state_slot_t LLPathfindingManager::registerAgentStateListener(agent_state_callback_t pAgentStateCallback)
+{
+	return mAgentStateSignal.connect(pAgentStateCallback);
+}
+
+void LLPathfindingManager::requestGetAgentState()
+{
+	LLViewerRegion *currentRegion = getCurrentRegion();
+
+	if (currentRegion == NULL)
+	{
+		mAgentStateSignal(FALSE);
+	}
+	else
+	{
+		if (!currentRegion->capabilitiesReceived())
+		{
+			currentRegion->setCapabilitiesReceivedCallback(boost::bind(&LLPathfindingManager::handleDeferredGetAgentStateForRegion, this, _1));
+		}
+		else if (!isPathfindingEnabledForRegion(currentRegion))
+		{
+			mAgentStateSignal(FALSE);
+		}
+		else
+		{
+			std::string agentStateURL = getAgentStateURLForRegion(currentRegion);
+			llassert(!agentStateURL.empty());
+			LLHTTPClient::ResponderPtr responder = new AgentStateResponder(agentStateURL);
+			LLHTTPClient::get(agentStateURL, responder);
+		}
+	}
+}
+
+void LLPathfindingManager::requestRebakeNavMesh(rebake_navmesh_callback_t pRebakeNavMeshCallback)
+{
+	LLViewerRegion *currentRegion = getCurrentRegion();
+
+	if (currentRegion == NULL)
+	{
+		pRebakeNavMeshCallback(false);
+	}
+	else if (!isPathfindingEnabledForRegion(currentRegion))
+	{
+		pRebakeNavMeshCallback(false);
+	}
+	else
+	{
+		std::string navMeshStatusURL = getNavMeshStatusURLForCurrentRegion();
+		llassert(!navMeshStatusURL.empty());
+		LLSD postData;			
+		postData["command"] = "rebuild";
+		LLHTTPClient::ResponderPtr responder = new NavMeshRebakeResponder(navMeshStatusURL, pRebakeNavMeshCallback);
+		LLHTTPClient::post(navMeshStatusURL, postData, responder);
+	}
+}
+
+void LLPathfindingManager::sendRequestGetNavMeshForRegion(LLPathfindingNavMeshPtr navMeshPtr, LLViewerRegion *pRegion, const LLPathfindingNavMeshStatus &pNavMeshStatus)
+{
+	if ((pRegion == NULL) || !pRegion->isAlive())
+	{
+		navMeshPtr->handleNavMeshNotEnabled();
+	}
+	else
+	{
+		std::string navMeshURL = getRetrieveNavMeshURLForRegion(pRegion);
+
+		if (navMeshURL.empty())
+		{
+			navMeshPtr->handleNavMeshNotEnabled();
+		}
+		else
+		{
+			navMeshPtr->handleNavMeshStart(pNavMeshStatus);
+			LLHTTPClient::ResponderPtr responder = new NavMeshResponder(navMeshURL, pNavMeshStatus.getVersion(), navMeshPtr);
+
+			LLSD postData;
+			LLHTTPClient::post(navMeshURL, postData, responder);
+		}
+	}
+}
+
+void LLPathfindingManager::handleDeferredGetAgentStateForRegion(const LLUUID &pRegionUUID)
+{
+	LLViewerRegion *currentRegion = getCurrentRegion();
+
+	if ((currentRegion != NULL) && (currentRegion->getRegionID() == pRegionUUID))
+	{
+		requestGetAgentState();
+	}
+}
+
+void LLPathfindingManager::handleDeferredGetNavMeshForRegion(const LLUUID &pRegionUUID, bool pIsGetStatusOnly)
+{
+	LLViewerRegion *currentRegion = getCurrentRegion();
+
+	if ((currentRegion != NULL) && (currentRegion->getRegionID() == pRegionUUID))
+	{
+		requestGetNavMeshForRegion(currentRegion, pIsGetStatusOnly);
+	}
+}
+
+void LLPathfindingManager::handleDeferredGetLinksetsForRegion(const LLUUID &pRegionUUID, request_id_t pRequestId, object_request_callback_t pLinksetsCallback) const
+{
+	LLViewerRegion *currentRegion = getCurrentRegion();
+
+	if ((currentRegion != NULL) && (currentRegion->getRegionID() == pRegionUUID))
+	{
+		requestGetLinksets(pRequestId, pLinksetsCallback);
+	}
+}
+
+void LLPathfindingManager::handleDeferredGetCharactersForRegion(const LLUUID &pRegionUUID, request_id_t pRequestId, object_request_callback_t pCharactersCallback) const
+{
+	LLViewerRegion *currentRegion = getCurrentRegion();
+
+	if ((currentRegion != NULL) && (currentRegion->getRegionID() == pRegionUUID))
+	{
+		requestGetCharacters(pRequestId, pCharactersCallback);
+	}
+}
+
+void LLPathfindingManager::handleNavMeshStatusRequest(const LLPathfindingNavMeshStatus &pNavMeshStatus, LLViewerRegion *pRegion, bool pIsGetStatusOnly)
+{
+	LLPathfindingNavMeshPtr navMeshPtr = getNavMeshForRegion(pNavMeshStatus.getRegionUUID());
+
+	if (!pNavMeshStatus.isValid())
+	{
+		navMeshPtr->handleNavMeshError();
+	}
+	else
+	{
+		if (navMeshPtr->hasNavMeshVersion(pNavMeshStatus))
+		{
+			navMeshPtr->handleRefresh(pNavMeshStatus);
+		}
+		else if (pIsGetStatusOnly)
+		{
+			navMeshPtr->handleNavMeshNewVersion(pNavMeshStatus);
+		}
+		else
+		{
+			sendRequestGetNavMeshForRegion(navMeshPtr, pRegion, pNavMeshStatus);
+		}
+	}
+}
+
+void LLPathfindingManager::handleNavMeshStatusUpdate(const LLPathfindingNavMeshStatus &pNavMeshStatus)
+{
+	LLPathfindingNavMeshPtr navMeshPtr = getNavMeshForRegion(pNavMeshStatus.getRegionUUID());
+
+	if (!pNavMeshStatus.isValid())
+	{
+		navMeshPtr->handleNavMeshError();
+	}
+	else
+	{
+		navMeshPtr->handleNavMeshNewVersion(pNavMeshStatus);
+	}
+}
+
+void LLPathfindingManager::handleAgentState(BOOL pCanRebakeRegion) 
+{
+	mAgentStateSignal(pCanRebakeRegion);
+}
+
+LLPathfindingNavMeshPtr LLPathfindingManager::getNavMeshForRegion(const LLUUID &pRegionUUID)
+{
+	LLPathfindingNavMeshPtr navMeshPtr;
+	NavMeshMap::iterator navMeshIter = mNavMeshMap.find(pRegionUUID);
+	if (navMeshIter == mNavMeshMap.end())
+	{
+		navMeshPtr = LLPathfindingNavMeshPtr(new LLPathfindingNavMesh(pRegionUUID));
+		mNavMeshMap.insert(std::pair<LLUUID, LLPathfindingNavMeshPtr>(pRegionUUID, navMeshPtr));
+	}
+	else
+	{
+		navMeshPtr = navMeshIter->second;
+	}
+
+	return navMeshPtr;
+}
+
+LLPathfindingNavMeshPtr LLPathfindingManager::getNavMeshForRegion(LLViewerRegion *pRegion)
+{
+	LLUUID regionUUID;
+	if (pRegion != NULL)
+	{
+		regionUUID = pRegion->getRegionID();
+	}
+
+	return getNavMeshForRegion(regionUUID);
+}
+
+std::string LLPathfindingManager::getNavMeshStatusURLForCurrentRegion() const
+{
+	return getNavMeshStatusURLForRegion(getCurrentRegion());
+}
+
+std::string LLPathfindingManager::getNavMeshStatusURLForRegion(LLViewerRegion *pRegion) const
+{
+	return getCapabilityURLForRegion(pRegion, CAP_SERVICE_NAVMESH_STATUS);
+}
+
+std::string LLPathfindingManager::getRetrieveNavMeshURLForRegion(LLViewerRegion *pRegion) const
+{
+	return getCapabilityURLForRegion(pRegion, CAP_SERVICE_RETRIEVE_NAVMESH);
+}
+
+std::string LLPathfindingManager::getObjectLinksetsURLForCurrentRegion() const
+{
+	return getCapabilityURLForCurrentRegion(CAP_SERVICE_OBJECT_LINKSETS);
+}
+
+std::string LLPathfindingManager::getTerrainLinksetsURLForCurrentRegion() const
+{
+	return getCapabilityURLForCurrentRegion(CAP_SERVICE_TERRAIN_LINKSETS);
+}
+
+std::string LLPathfindingManager::getCharactersURLForCurrentRegion() const
+{
+	return getCapabilityURLForCurrentRegion(CAP_SERVICE_CHARACTERS);
+}
+
+std::string LLPathfindingManager::getAgentStateURLForRegion(LLViewerRegion *pRegion) const
+{
+	return getCapabilityURLForRegion(pRegion, CAP_SERVICE_AGENT_STATE);
+}
+
+std::string LLPathfindingManager::getCapabilityURLForCurrentRegion(const std::string &pCapabilityName) const
+{
+	return getCapabilityURLForRegion(getCurrentRegion(), pCapabilityName);
+}
+
+std::string LLPathfindingManager::getCapabilityURLForRegion(LLViewerRegion *pRegion, const std::string &pCapabilityName) const
+{
+	std::string capabilityURL("");
+
+	if (pRegion != NULL)
+	{
+		capabilityURL = pRegion->getCapability(pCapabilityName);
+	}
+
+	if (capabilityURL.empty())
+	{
+		llwarns << "cannot find capability '" << pCapabilityName << "' for current region '"
+			<< ((pRegion != NULL) ? pRegion->getName() : "<null>") << "'" << llendl;
+	}
+
+	return capabilityURL;
+}
+
+LLViewerRegion *LLPathfindingManager::getCurrentRegion() const
+{
+	return gAgent.getRegion();
+}
+
+//---------------------------------------------------------------------------
+// LLNavMeshSimStateChangeNode
+//---------------------------------------------------------------------------
+
+void LLNavMeshSimStateChangeNode::post(ResponsePtr pResponse, const LLSD &pContext, const LLSD &pInput) const
+{
+	llassert(pInput.has(SIM_MESSAGE_BODY_FIELD));
+	llassert(pInput.get(SIM_MESSAGE_BODY_FIELD).isMap());
+	LLPathfindingNavMeshStatus navMeshStatus(pInput.get(SIM_MESSAGE_BODY_FIELD));
+	LLPathfindingManager::getInstance()->handleNavMeshStatusUpdate(navMeshStatus);
+}
+
+//---------------------------------------------------------------------------
+// LLAgentStateChangeNode
+//---------------------------------------------------------------------------
+
+void LLAgentStateChangeNode::post(ResponsePtr pResponse, const LLSD &pContext, const LLSD &pInput) const
+{
+	llassert(pInput.has(SIM_MESSAGE_BODY_FIELD));
+	llassert(pInput.get(SIM_MESSAGE_BODY_FIELD).isMap());
+	llassert(pInput.get(SIM_MESSAGE_BODY_FIELD).has(AGENT_STATE_CAN_REBAKE_REGION_FIELD));
+	llassert(pInput.get(SIM_MESSAGE_BODY_FIELD).get(AGENT_STATE_CAN_REBAKE_REGION_FIELD).isBoolean());
+	BOOL canRebakeRegion = pInput.get(SIM_MESSAGE_BODY_FIELD).get(AGENT_STATE_CAN_REBAKE_REGION_FIELD).asBoolean();
+	
+	LLPathfindingManager::getInstance()->handleAgentState(canRebakeRegion);
+}
+
+//---------------------------------------------------------------------------
+// NavMeshStatusResponder
+//---------------------------------------------------------------------------
+
+NavMeshStatusResponder::NavMeshStatusResponder(const std::string &pCapabilityURL, LLViewerRegion *pRegion, bool pIsGetStatusOnly)
+	: LLHTTPClient::Responder(),
+	mCapabilityURL(pCapabilityURL),
+	mRegion(pRegion),
+	mRegionUUID(),
+	mIsGetStatusOnly(pIsGetStatusOnly)
+{
+	if (mRegion != NULL)
+	{
+		mRegionUUID = mRegion->getRegionID();
+	}
+}
+
+NavMeshStatusResponder::~NavMeshStatusResponder()
+{
+}
+
+void NavMeshStatusResponder::result(const LLSD &pContent)
+{
+	LLPathfindingNavMeshStatus navMeshStatus(mRegionUUID, pContent);
+	LLPathfindingManager::getInstance()->handleNavMeshStatusRequest(navMeshStatus, mRegion, mIsGetStatusOnly);
+}
+
+void NavMeshStatusResponder::error(U32 pStatus, const std::string& pReason)
+{
+	llwarns << "error with request to URL '" << mCapabilityURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
+	LLPathfindingNavMeshStatus navMeshStatus(mRegionUUID);
+	LLPathfindingManager::getInstance()->handleNavMeshStatusRequest(navMeshStatus, mRegion, mIsGetStatusOnly);
+}
+
+//---------------------------------------------------------------------------
+// NavMeshResponder
+//---------------------------------------------------------------------------
+
+NavMeshResponder::NavMeshResponder(const std::string &pCapabilityURL, U32 pNavMeshVersion, LLPathfindingNavMeshPtr pNavMeshPtr)
+	: LLHTTPClient::Responder(),
+	mCapabilityURL(pCapabilityURL),
+	mNavMeshVersion(pNavMeshVersion),
+	mNavMeshPtr(pNavMeshPtr)
+{
+}
+
+NavMeshResponder::~NavMeshResponder()
+{
+}
+
+void NavMeshResponder::result(const LLSD &pContent)
+{
+	mNavMeshPtr->handleNavMeshResult(pContent, mNavMeshVersion);
+}
+
+void NavMeshResponder::error(U32 pStatus, const std::string& pReason)
+{
+	mNavMeshPtr->handleNavMeshError(pStatus, pReason, mCapabilityURL, mNavMeshVersion);
+}
+
+//---------------------------------------------------------------------------
+// AgentStateResponder
+//---------------------------------------------------------------------------
+
+AgentStateResponder::AgentStateResponder(const std::string &pCapabilityURL)
+: LLHTTPClient::Responder()
+, mCapabilityURL(pCapabilityURL)
+{
+}
+
+AgentStateResponder::~AgentStateResponder()
+{
+}
+
+void AgentStateResponder::result(const LLSD &pContent)
+{
+	llassert(pContent.has(AGENT_STATE_CAN_REBAKE_REGION_FIELD));
+	llassert(pContent.get(AGENT_STATE_CAN_REBAKE_REGION_FIELD).isBoolean());
+	BOOL canRebakeRegion = pContent.get(AGENT_STATE_CAN_REBAKE_REGION_FIELD).asBoolean();
+	LLPathfindingManager::getInstance()->handleAgentState(canRebakeRegion);
+}
+
+void AgentStateResponder::error(U32 pStatus, const std::string &pReason)
+{
+	llwarns << "error with request to URL '" << mCapabilityURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
+	LLPathfindingManager::getInstance()->handleAgentState(FALSE);
+}
+
+
+//---------------------------------------------------------------------------
+// navmesh rebake responder
+//---------------------------------------------------------------------------
+NavMeshRebakeResponder::NavMeshRebakeResponder(const std::string &pCapabilityURL, LLPathfindingManager::rebake_navmesh_callback_t pRebakeNavMeshCallback)
+	: LLHTTPClient::Responder(),
+	mCapabilityURL(pCapabilityURL),
+	mRebakeNavMeshCallback(pRebakeNavMeshCallback)
+{
+}
+
+NavMeshRebakeResponder::~NavMeshRebakeResponder()
+{
+}
+
+void NavMeshRebakeResponder::result(const LLSD &pContent)
+{
+	mRebakeNavMeshCallback(true);
+}
+
+void NavMeshRebakeResponder::error(U32 pStatus, const std::string &pReason)
+{
+	llwarns << "error with request to URL '" << mCapabilityURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
+	mRebakeNavMeshCallback(false);
+}
+
+//---------------------------------------------------------------------------
+// LinksetsResponder
+//---------------------------------------------------------------------------
+
+LinksetsResponder::LinksetsResponder(LLPathfindingManager::request_id_t pRequestId, LLPathfindingManager::object_request_callback_t pLinksetsCallback, bool pIsObjectRequested, bool pIsTerrainRequested)
+	: mRequestId(pRequestId),
+	mLinksetsCallback(pLinksetsCallback),
+	mObjectMessagingState(pIsObjectRequested ? kWaiting : kNotRequested),
+	mTerrainMessagingState(pIsTerrainRequested ? kWaiting : kNotRequested),
+	mObjectLinksetListPtr(),
+	mTerrainLinksetPtr()
+{
+}
+
+LinksetsResponder::~LinksetsResponder()
+{
+}
+
+void LinksetsResponder::handleObjectLinksetsResult(const LLSD &pContent)
+{
+	mObjectLinksetListPtr = LLPathfindingObjectListPtr(new LLPathfindingLinksetList(pContent));
+
+	mObjectMessagingState = kReceivedGood;
+	if (mTerrainMessagingState != kWaiting)
+	{
+		sendCallback();
+	}
+}
+
+void LinksetsResponder::handleObjectLinksetsError(U32 pStatus, const std::string &pReason, const std::string &pURL)
+{
+	llwarns << "error with request to URL '" << pURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
+	mObjectMessagingState = kReceivedError;
+	if (mTerrainMessagingState != kWaiting)
+	{
+		sendCallback();
+	}
+}
+
+void LinksetsResponder::handleTerrainLinksetsResult(const LLSD &pContent)
+{
+	mTerrainLinksetPtr = LLPathfindingObjectPtr(new LLPathfindingLinkset(pContent));
+
+	mTerrainMessagingState = kReceivedGood;
+	if (mObjectMessagingState != kWaiting)
+	{
+		sendCallback();
+	}
+}
+
+void LinksetsResponder::handleTerrainLinksetsError(U32 pStatus, const std::string &pReason, const std::string &pURL)
+{
+	mTerrainMessagingState = kReceivedError;
+	if (mObjectMessagingState != kWaiting)
+	{
+		sendCallback();
+	}
+}
+
+void LinksetsResponder::sendCallback()
+{
+	llassert(mObjectMessagingState != kWaiting);
+	llassert(mTerrainMessagingState != kWaiting);
+	LLPathfindingManager::ERequestStatus requestStatus =
+		((((mObjectMessagingState == kReceivedGood) || (mObjectMessagingState == kNotRequested)) &&
+		  ((mTerrainMessagingState == kReceivedGood) || (mTerrainMessagingState == kNotRequested))) ?
+		 LLPathfindingManager::kRequestCompleted : LLPathfindingManager::kRequestError);
+
+	if (mObjectMessagingState != kReceivedGood)
+	{
+		mObjectLinksetListPtr = LLPathfindingObjectListPtr(new LLPathfindingLinksetList());
+	}
+
+	if (mTerrainMessagingState == kReceivedGood)
+	{
+		mObjectLinksetListPtr->update(mTerrainLinksetPtr);
+	}
+
+	mLinksetsCallback(mRequestId, requestStatus, mObjectLinksetListPtr);
+}
+
+//---------------------------------------------------------------------------
+// ObjectLinksetsResponder
+//---------------------------------------------------------------------------
+
+ObjectLinksetsResponder::ObjectLinksetsResponder(const std::string &pCapabilityURL, LinksetsResponderPtr pLinksetsResponsderPtr)
+	: LLHTTPClient::Responder(),
+	mCapabilityURL(pCapabilityURL),
+	mLinksetsResponsderPtr(pLinksetsResponsderPtr)
+{
+}
+
+ObjectLinksetsResponder::~ObjectLinksetsResponder()
+{
+}
+
+void ObjectLinksetsResponder::result(const LLSD &pContent)
+{
+	mLinksetsResponsderPtr->handleObjectLinksetsResult(pContent);
+}
+
+void ObjectLinksetsResponder::error(U32 pStatus, const std::string &pReason)
+{
+	mLinksetsResponsderPtr->handleObjectLinksetsError(pStatus, pReason, mCapabilityURL);
+}
+
+//---------------------------------------------------------------------------
+// TerrainLinksetsResponder
+//---------------------------------------------------------------------------
+
+TerrainLinksetsResponder::TerrainLinksetsResponder(const std::string &pCapabilityURL, LinksetsResponderPtr pLinksetsResponsderPtr)
+	: LLHTTPClient::Responder(),
+	mCapabilityURL(pCapabilityURL),
+	mLinksetsResponsderPtr(pLinksetsResponsderPtr)
+{
+}
+
+TerrainLinksetsResponder::~TerrainLinksetsResponder()
+{
+}
+
+void TerrainLinksetsResponder::result(const LLSD &pContent)
+{
+	mLinksetsResponsderPtr->handleTerrainLinksetsResult(pContent);
+}
+
+void TerrainLinksetsResponder::error(U32 pStatus, const std::string &pReason)
+{
+	mLinksetsResponsderPtr->handleTerrainLinksetsError(pStatus, pReason, mCapabilityURL);
+}
+
+//---------------------------------------------------------------------------
+// CharactersResponder
+//---------------------------------------------------------------------------
+
+CharactersResponder::CharactersResponder(const std::string &pCapabilityURL, LLPathfindingManager::request_id_t pRequestId, LLPathfindingManager::object_request_callback_t pCharactersCallback)
+	: LLHTTPClient::Responder(),
+	mCapabilityURL(pCapabilityURL),
+	mRequestId(pRequestId),
+	mCharactersCallback(pCharactersCallback)
+{
+}
+
+CharactersResponder::~CharactersResponder()
+{
+}
+
+void CharactersResponder::result(const LLSD &pContent)
+{
+	LLPathfindingObjectListPtr characterListPtr = LLPathfindingObjectListPtr(new LLPathfindingCharacterList(pContent));
+	mCharactersCallback(mRequestId, LLPathfindingManager::kRequestCompleted, characterListPtr);
+}
+
+void CharactersResponder::error(U32 pStatus, const std::string &pReason)
+{
+	llwarns << "error with request to URL '" << mCapabilityURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
+
+	LLPathfindingObjectListPtr characterListPtr =  LLPathfindingObjectListPtr(new LLPathfindingCharacterList());
+	mCharactersCallback(mRequestId, LLPathfindingManager::kRequestError, characterListPtr);
+}
diff --git a/indra/newview/llpathfindingmanager.h b/indra/newview/llpathfindingmanager.h
new file mode 100644
index 000000000..c61ff244f
--- /dev/null
+++ b/indra/newview/llpathfindingmanager.h
@@ -0,0 +1,127 @@
+/** 
+* @file   llpathfindingmanager.h
+* @brief  Header file for llpathfindingmanager
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+#ifndef LL_LLPATHFINDINGMANAGER_H
+#define LL_LLPATHFINDINGMANAGER_H
+
+#include <string>
+#include <map>
+
+#include <boost/function.hpp>
+#include <boost/signals2.hpp>
+
+#include "llpathfindinglinkset.h"
+#include "llpathfindingobjectlist.h"
+#include "llpathfindingnavmesh.h"
+#include "llsingleton.h"
+
+class LLPathfindingNavMeshStatus;
+class LLUUID;
+class LLViewerRegion;
+
+class LLPathfindingManager : public LLSingleton<LLPathfindingManager>
+{
+	friend class LLNavMeshSimStateChangeNode;
+	friend class NavMeshStatusResponder;
+	friend class LLAgentStateChangeNode;
+	friend class AgentStateResponder;
+public:
+	typedef enum {
+		kRequestStarted,
+		kRequestCompleted,
+		kRequestNotEnabled,
+		kRequestError
+	} ERequestStatus;
+
+	LLPathfindingManager();
+	virtual ~LLPathfindingManager();
+
+	void initSystem();
+	void quitSystem();
+
+	bool isPathfindingViewEnabled() const;
+	bool isPathfindingEnabledForCurrentRegion() const;
+	bool isPathfindingEnabledForRegion(LLViewerRegion *pRegion) const;
+
+	bool isAllowViewTerrainProperties() const;
+
+	LLPathfindingNavMesh::navmesh_slot_t registerNavMeshListenerForRegion(LLViewerRegion *pRegion, LLPathfindingNavMesh::navmesh_callback_t pNavMeshCallback);
+	void requestGetNavMeshForRegion(LLViewerRegion *pRegion, bool pIsGetStatusOnly);
+
+	typedef U32 request_id_t;
+	typedef boost::function<void (request_id_t, ERequestStatus, LLPathfindingObjectListPtr)> object_request_callback_t;
+
+	void requestGetLinksets(request_id_t pRequestId, object_request_callback_t pLinksetsCallback) const;
+	void requestSetLinksets(request_id_t pRequestId, const LLPathfindingObjectListPtr &pLinksetListPtr, LLPathfindingLinkset::ELinksetUse pLinksetUse, S32 pA, S32 pB, S32 pC, S32 pD, object_request_callback_t pLinksetsCallback) const;
+
+	void requestGetCharacters(request_id_t pRequestId, object_request_callback_t pCharactersCallback) const;
+
+	typedef boost::function<void (BOOL)>         agent_state_callback_t;
+	typedef boost::signals2::signal<void (BOOL)> agent_state_signal_t;
+	typedef boost::signals2::connection          agent_state_slot_t;	
+
+	agent_state_slot_t registerAgentStateListener(agent_state_callback_t pAgentStateCallback);
+	void requestGetAgentState();	
+
+	typedef boost::function<void (bool)> rebake_navmesh_callback_t;
+	void requestRebakeNavMesh(rebake_navmesh_callback_t pRebakeNavMeshCallback);
+
+protected:
+
+private:
+	typedef std::map<LLUUID, LLPathfindingNavMeshPtr> NavMeshMap;
+
+	void sendRequestGetNavMeshForRegion(LLPathfindingNavMeshPtr navMeshPtr, LLViewerRegion *pRegion, const LLPathfindingNavMeshStatus &pNavMeshStatus);
+
+	void handleDeferredGetAgentStateForRegion(const LLUUID &pRegionUUID);
+	void handleDeferredGetNavMeshForRegion(const LLUUID &pRegionUUID, bool pIsGetStatusOnly);
+	void handleDeferredGetLinksetsForRegion(const LLUUID &pRegionUUID, request_id_t pRequestId, object_request_callback_t pLinksetsCallback) const;
+	void handleDeferredGetCharactersForRegion(const LLUUID &pRegionUUID, request_id_t pRequestId, object_request_callback_t pCharactersCallback) const;
+
+	void handleNavMeshStatusRequest(const LLPathfindingNavMeshStatus &pNavMeshStatus, LLViewerRegion *pRegion, bool pIsGetStatusOnly);
+	void handleNavMeshStatusUpdate(const LLPathfindingNavMeshStatus &pNavMeshStatus);
+
+	void handleAgentState(BOOL pCanRebakeRegion);
+
+	LLPathfindingNavMeshPtr getNavMeshForRegion(const LLUUID &pRegionUUID);
+	LLPathfindingNavMeshPtr getNavMeshForRegion(LLViewerRegion *pRegion);
+
+	std::string getNavMeshStatusURLForCurrentRegion() const;
+	std::string getNavMeshStatusURLForRegion(LLViewerRegion *pRegion) const;
+	std::string getRetrieveNavMeshURLForRegion(LLViewerRegion *pRegion) const;
+	std::string getObjectLinksetsURLForCurrentRegion() const;
+	std::string getTerrainLinksetsURLForCurrentRegion() const;
+	std::string getCharactersURLForCurrentRegion() const;
+	std::string	getAgentStateURLForRegion(LLViewerRegion *pRegion) const;
+	std::string getCapabilityURLForCurrentRegion(const std::string &pCapabilityName) const;
+	std::string getCapabilityURLForRegion(LLViewerRegion *pRegion, const std::string &pCapabilityName) const;
+	LLViewerRegion *getCurrentRegion() const;
+
+	NavMeshMap           mNavMeshMap;
+	agent_state_signal_t mAgentStateSignal;
+};
+
+#endif // LL_LLPATHFINDINGMANAGER_H
diff --git a/indra/newview/llpathfindingnavmesh.cpp b/indra/newview/llpathfindingnavmesh.cpp
new file mode 100644
index 000000000..e01dd3a15
--- /dev/null
+++ b/indra/newview/llpathfindingnavmesh.cpp
@@ -0,0 +1,205 @@
+/** 
+* @file llpathfindingnavmesh.cpp
+* @brief Implementation of llpathfindingnavmesh
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpathfindingnavmesh.h"
+
+#include <string>
+
+#include "llpathfindingnavmeshstatus.h"
+#include "llsd.h"
+#include "llsdserialize.h"
+#include "lluuid.h"
+
+#define NAVMESH_VERSION_FIELD "navmesh_version"
+#define NAVMESH_DATA_FIELD    "navmesh_data"
+
+//---------------------------------------------------------------------------
+// LLPathfindingNavMesh
+//---------------------------------------------------------------------------
+
+LLPathfindingNavMesh::LLPathfindingNavMesh(const LLUUID &pRegionUUID)
+	: mNavMeshStatus(pRegionUUID),
+	mNavMeshRequestStatus(kNavMeshRequestUnknown),
+	mNavMeshSignal(),
+	mNavMeshData()
+
+{
+}
+
+LLPathfindingNavMesh::~LLPathfindingNavMesh()
+{
+}
+
+LLPathfindingNavMesh::navmesh_slot_t LLPathfindingNavMesh::registerNavMeshListener(navmesh_callback_t pNavMeshCallback)
+{
+	return mNavMeshSignal.connect(pNavMeshCallback);
+}
+
+bool LLPathfindingNavMesh::hasNavMeshVersion(const LLPathfindingNavMeshStatus &pNavMeshStatus) const
+{
+	return ((mNavMeshStatus.getVersion() == pNavMeshStatus.getVersion()) &&
+		((mNavMeshRequestStatus == kNavMeshRequestStarted) || (mNavMeshRequestStatus == kNavMeshRequestCompleted) ||
+		((mNavMeshRequestStatus == kNavMeshRequestChecking) && !mNavMeshData.empty())));
+}
+
+void LLPathfindingNavMesh::handleNavMeshWaitForRegionLoad()
+{
+	setRequestStatus(kNavMeshRequestWaiting);
+}
+
+void LLPathfindingNavMesh::handleNavMeshCheckVersion()
+{
+	setRequestStatus(kNavMeshRequestChecking);
+}
+
+void LLPathfindingNavMesh::handleRefresh(const LLPathfindingNavMeshStatus &pNavMeshStatus)
+{
+	llassert(mNavMeshStatus.getRegionUUID() == pNavMeshStatus.getRegionUUID());
+	llassert(mNavMeshStatus.getVersion() == pNavMeshStatus.getVersion());
+	mNavMeshStatus = pNavMeshStatus;
+	if (mNavMeshRequestStatus == kNavMeshRequestChecking)
+	{
+		llassert(!mNavMeshData.empty());
+		setRequestStatus(kNavMeshRequestCompleted);
+	}
+	else
+	{
+		sendStatus();
+	}
+}
+
+void LLPathfindingNavMesh::handleNavMeshNewVersion(const LLPathfindingNavMeshStatus &pNavMeshStatus)
+{
+	llassert(mNavMeshStatus.getRegionUUID() == pNavMeshStatus.getRegionUUID());
+	if (mNavMeshStatus.getVersion() == pNavMeshStatus.getVersion())
+	{
+		mNavMeshStatus = pNavMeshStatus;
+		sendStatus();
+	}
+	else
+	{
+		mNavMeshData.clear();
+		mNavMeshStatus = pNavMeshStatus;
+		setRequestStatus(kNavMeshRequestNeedsUpdate);
+	}
+}
+
+void LLPathfindingNavMesh::handleNavMeshStart(const LLPathfindingNavMeshStatus &pNavMeshStatus)
+{
+	llassert(mNavMeshStatus.getRegionUUID() == pNavMeshStatus.getRegionUUID());
+	mNavMeshStatus = pNavMeshStatus;
+	setRequestStatus(kNavMeshRequestStarted);
+}
+
+void LLPathfindingNavMesh::handleNavMeshResult(const LLSD &pContent, U32 pNavMeshVersion)
+{
+	llassert(pContent.has(NAVMESH_VERSION_FIELD));
+	if (pContent.has(NAVMESH_VERSION_FIELD))
+	{
+		llassert(pContent.get(NAVMESH_VERSION_FIELD).isInteger());
+		llassert(pContent.get(NAVMESH_VERSION_FIELD).asInteger() >= 0);
+		U32 embeddedNavMeshVersion = static_cast<U32>(pContent.get(NAVMESH_VERSION_FIELD).asInteger());
+		llassert(embeddedNavMeshVersion == pNavMeshVersion); // stinson 03/13/2012 : does this ever occur?
+		if (embeddedNavMeshVersion != pNavMeshVersion)
+		{
+			llwarns << "Mismatch between expected and embedded navmesh versions occurred" << llendl;
+			pNavMeshVersion = embeddedNavMeshVersion;
+		}
+	}
+
+	if (mNavMeshStatus.getVersion() == pNavMeshVersion)
+	{
+		ENavMeshRequestStatus status;
+		if ( pContent.has(NAVMESH_DATA_FIELD) )
+		{
+			const LLSD::Binary &value = pContent.get(NAVMESH_DATA_FIELD).asBinary();
+			unsigned int binSize = value.size();
+			std::string newStr(reinterpret_cast<const char *>(&value[0]), binSize);
+			std::istringstream streamdecomp( newStr );
+			unsigned int decompBinSize = 0;
+			bool valid = false;
+			U8* pUncompressedNavMeshContainer = unzip_llsdNavMesh( valid, decompBinSize, streamdecomp, binSize ) ;
+			if ( !valid )
+			{
+				llwarns << "Unable to decompress the navmesh llsd." << llendl;
+				status = kNavMeshRequestError;
+			}
+			else
+			{
+				llassert(pUncompressedNavMeshContainer);
+				mNavMeshData.resize( decompBinSize );
+				memcpy( &mNavMeshData[0], &pUncompressedNavMeshContainer[0], decompBinSize );
+				status = kNavMeshRequestCompleted;
+			}
+			if ( pUncompressedNavMeshContainer )
+			{
+				free( pUncompressedNavMeshContainer );
+			}
+		}
+		else
+		{
+			llwarns << "No mesh data received" << llendl;
+			status = kNavMeshRequestError;
+		}
+		setRequestStatus(status);
+	}
+}
+
+void LLPathfindingNavMesh::handleNavMeshNotEnabled()
+{
+	mNavMeshData.clear();
+	setRequestStatus(kNavMeshRequestNotEnabled);
+}
+
+void LLPathfindingNavMesh::handleNavMeshError()
+{
+	mNavMeshData.clear();
+	setRequestStatus(kNavMeshRequestError);
+}
+
+void LLPathfindingNavMesh::handleNavMeshError(U32 pStatus, const std::string &pReason, const std::string &pURL, U32 pNavMeshVersion)
+{
+	llwarns << "error with request to URL '" << pURL << "' because " << pReason << " (statusCode:" << pStatus << ")" << llendl;
+	if (mNavMeshStatus.getVersion() == pNavMeshVersion)
+	{
+		handleNavMeshError();
+	}
+}
+
+void LLPathfindingNavMesh::setRequestStatus(ENavMeshRequestStatus pNavMeshRequestStatus)
+{
+	mNavMeshRequestStatus = pNavMeshRequestStatus;
+	sendStatus();
+}
+
+void LLPathfindingNavMesh::sendStatus()
+{
+	mNavMeshSignal(mNavMeshRequestStatus, mNavMeshStatus, mNavMeshData);
+}
diff --git a/indra/newview/llpathfindingnavmesh.h b/indra/newview/llpathfindingnavmesh.h
new file mode 100644
index 000000000..7a844f54c
--- /dev/null
+++ b/indra/newview/llpathfindingnavmesh.h
@@ -0,0 +1,91 @@
+/** 
+* @file   llpathfindingnavmesh.h
+* @brief  Header file for llpathfindingnavmesh
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+#ifndef LL_LLPATHFINDINGNAVMESH_H
+#define LL_LLPATHFINDINGNAVMESH_H
+
+#include <string>
+
+#include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
+#include <boost/signals2.hpp>
+
+#include "llpathfindingnavmeshstatus.h"
+#include "llsd.h"
+
+class LLPathfindingNavMesh;
+class LLUUID;
+
+typedef boost::shared_ptr<LLPathfindingNavMesh> LLPathfindingNavMeshPtr;
+
+class LLPathfindingNavMesh
+{
+public:
+	typedef enum {
+		kNavMeshRequestUnknown,
+		kNavMeshRequestWaiting,
+		kNavMeshRequestChecking,
+		kNavMeshRequestNeedsUpdate,
+		kNavMeshRequestStarted,
+		kNavMeshRequestCompleted,
+		kNavMeshRequestNotEnabled,
+		kNavMeshRequestError
+	} ENavMeshRequestStatus;
+
+	typedef boost::function<void (ENavMeshRequestStatus, const LLPathfindingNavMeshStatus &, const LLSD::Binary &)>         navmesh_callback_t;
+	typedef boost::signals2::signal<void (ENavMeshRequestStatus, const LLPathfindingNavMeshStatus &, const LLSD::Binary &)> navmesh_signal_t;
+	typedef boost::signals2::connection                                                                                     navmesh_slot_t;
+
+	LLPathfindingNavMesh(const LLUUID &pRegionUUID);
+	virtual ~LLPathfindingNavMesh();
+
+	navmesh_slot_t registerNavMeshListener(navmesh_callback_t pNavMeshCallback);
+
+	bool hasNavMeshVersion(const LLPathfindingNavMeshStatus &pNavMeshStatus) const;
+
+	void handleNavMeshWaitForRegionLoad();
+	void handleNavMeshCheckVersion();
+	void handleRefresh(const LLPathfindingNavMeshStatus &pNavMeshStatus);
+	void handleNavMeshNewVersion(const LLPathfindingNavMeshStatus &pNavMeshStatus);
+	void handleNavMeshStart(const LLPathfindingNavMeshStatus &pNavMeshStatus);
+	void handleNavMeshResult(const LLSD &pContent, U32 pNavMeshVersion);
+	void handleNavMeshNotEnabled();
+	void handleNavMeshError();
+	void handleNavMeshError(U32 pStatus, const std::string &pReason, const std::string &pURL, U32 pNavMeshVersion);
+
+protected:
+
+private:
+	void setRequestStatus(ENavMeshRequestStatus pNavMeshRequestStatus);
+	void sendStatus();
+
+	LLPathfindingNavMeshStatus mNavMeshStatus;
+	ENavMeshRequestStatus      mNavMeshRequestStatus;
+	navmesh_signal_t           mNavMeshSignal;
+	LLSD::Binary               mNavMeshData;
+};
+
+#endif // LL_LLPATHFINDINGNAVMESH_H
diff --git a/indra/newview/llpathfindingnavmeshstatus.cpp b/indra/newview/llpathfindingnavmeshstatus.cpp
new file mode 100644
index 000000000..2eaa6075c
--- /dev/null
+++ b/indra/newview/llpathfindingnavmeshstatus.cpp
@@ -0,0 +1,145 @@
+/** 
+* @file llpathfindingnavmeshstatus.cpp
+* @brief Implementation of llpathfindingnavmeshstatus
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpathfindingnavmeshstatus.h"
+
+#include <string>
+
+#include "llsd.h"
+#include "llstring.h"
+#include "lluuid.h"
+
+#define REGION_FIELD  "region_id"
+#define STATUS_FIELD  "status"
+#define VERSION_FIELD "version"
+
+const std::string LLPathfindingNavMeshStatus::sStatusPending("pending");
+const std::string LLPathfindingNavMeshStatus::sStatusBuilding("building");
+const std::string LLPathfindingNavMeshStatus::sStatusComplete("complete");
+const std::string LLPathfindingNavMeshStatus::sStatusRepending("repending");
+
+
+//---------------------------------------------------------------------------
+// LLPathfindingNavMeshStatus
+//---------------------------------------------------------------------------
+
+LLPathfindingNavMeshStatus::LLPathfindingNavMeshStatus()
+	: mIsValid(false),
+	mRegionUUID(),
+	mVersion(0U),
+	mStatus(kComplete)
+{
+}
+
+LLPathfindingNavMeshStatus::LLPathfindingNavMeshStatus(const LLUUID &pRegionUUID)
+	: mIsValid(false),
+	mRegionUUID(pRegionUUID),
+	mVersion(0U),
+	mStatus(kComplete)
+{
+}
+
+LLPathfindingNavMeshStatus::LLPathfindingNavMeshStatus(const LLUUID &pRegionUUID, const LLSD &pContent)
+	: mIsValid(true),
+	mRegionUUID(pRegionUUID),
+	mVersion(0U),
+	mStatus(kComplete)
+{
+	parseStatus(pContent);
+}
+
+LLPathfindingNavMeshStatus::LLPathfindingNavMeshStatus(const LLSD &pContent)
+	: mIsValid(true),
+	mRegionUUID(),
+	mVersion(0U),
+	mStatus(kComplete)
+{
+	llassert(pContent.has(REGION_FIELD));
+	llassert(pContent.get(REGION_FIELD).isUUID());
+	mRegionUUID = pContent.get(REGION_FIELD).asUUID();
+
+	parseStatus(pContent);
+}
+
+LLPathfindingNavMeshStatus::LLPathfindingNavMeshStatus(const LLPathfindingNavMeshStatus &pOther)
+	: mIsValid(pOther.mIsValid),
+	mRegionUUID(pOther.mRegionUUID),
+	mVersion(pOther.mVersion),
+	mStatus(pOther.mStatus)
+{
+}
+
+LLPathfindingNavMeshStatus::~LLPathfindingNavMeshStatus()
+{
+}
+
+LLPathfindingNavMeshStatus &LLPathfindingNavMeshStatus::operator =(const LLPathfindingNavMeshStatus &pOther)
+{
+	mIsValid = pOther.mIsValid;
+	mRegionUUID = pOther.mRegionUUID;
+	mVersion = pOther.mVersion;
+	mStatus = pOther.mStatus;
+
+	return *this;
+}
+
+void LLPathfindingNavMeshStatus::parseStatus(const LLSD &pContent)
+{
+	llassert(pContent.has(VERSION_FIELD));
+	llassert(pContent.get(VERSION_FIELD).isInteger());
+	llassert(pContent.get(VERSION_FIELD).asInteger() >= 0);
+	mVersion = static_cast<U32>(pContent.get(VERSION_FIELD).asInteger());
+
+	llassert(pContent.has(STATUS_FIELD));
+	llassert(pContent.get(STATUS_FIELD).isString());
+	std::string status = pContent.get(STATUS_FIELD).asString();
+
+	if (LLStringUtil::compareStrings(status, sStatusPending) == 0)
+	{
+		mStatus = kPending;
+	}
+	else if (LLStringUtil::compareStrings(status, sStatusBuilding) == 0)
+	{
+		mStatus = kBuilding;
+	}
+	else if (LLStringUtil::compareStrings(status, sStatusComplete) == 0)
+	{
+		mStatus = kComplete;
+	}
+	else if (LLStringUtil::compareStrings(status, sStatusRepending) == 0)
+	{
+		mStatus = kRepending;
+	}
+	else
+	{
+		mStatus = kComplete;
+		llassert(0);
+	}
+}
diff --git a/indra/newview/llpathfindingnavmeshstatus.h b/indra/newview/llpathfindingnavmeshstatus.h
new file mode 100644
index 000000000..74533fa48
--- /dev/null
+++ b/indra/newview/llpathfindingnavmeshstatus.h
@@ -0,0 +1,77 @@
+/** 
+* @file   llpathfindingnavmeshstatus.h
+* @brief  Header file for llpathfindingnavmeshstatus
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+#ifndef LL_LLPATHFINDINGNAVMESHSTATUS_H
+#define LL_LLPATHFINDINGNAVMESHSTATUS_H
+
+#include <string>
+
+#include "lluuid.h"
+
+class LLSD;
+
+class LLPathfindingNavMeshStatus
+{
+public:
+	typedef enum
+	{
+		kPending,
+		kBuilding,
+		kComplete,
+		kRepending
+	} ENavMeshStatus;
+
+	LLPathfindingNavMeshStatus();
+	LLPathfindingNavMeshStatus(const LLUUID &pRegionUUID);
+	LLPathfindingNavMeshStatus(const LLUUID &pRegionUUID, const LLSD &pContent);
+	LLPathfindingNavMeshStatus(const LLSD &pContent);
+	LLPathfindingNavMeshStatus(const LLPathfindingNavMeshStatus &pOther);
+	virtual ~LLPathfindingNavMeshStatus();
+
+	LLPathfindingNavMeshStatus &operator =(const LLPathfindingNavMeshStatus &pOther);
+
+	bool           isValid() const        {return mIsValid;};
+	const LLUUID   &getRegionUUID() const {return mRegionUUID;};
+	U32            getVersion() const     {return mVersion;};
+	ENavMeshStatus getStatus() const      {return mStatus;};
+
+protected:
+
+private:
+	void           parseStatus(const LLSD &pContent);
+
+	bool           mIsValid;
+	LLUUID         mRegionUUID;
+	U32            mVersion;
+	ENavMeshStatus mStatus;
+
+	static const std::string sStatusPending;
+	static const std::string sStatusBuilding;
+	static const std::string sStatusComplete;
+	static const std::string sStatusRepending;
+};
+
+#endif // LL_LLPATHFINDINGNAVMESHSTATUS_H
diff --git a/indra/newview/llpathfindingobject.cpp b/indra/newview/llpathfindingobject.cpp
new file mode 100644
index 000000000..916eceb4c
--- /dev/null
+++ b/indra/newview/llpathfindingobject.cpp
@@ -0,0 +1,162 @@
+/** 
+* @file llpathfindingobject.cpp
+* @brief Implementation of llpathfindingobject
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpathfindingobject.h"
+
+#include <string>
+
+#include "llavatarname.h"
+#include "llavatarnamecache.h"
+#include "llsd.h"
+#include "lluuid.h"
+#include "v3math.h"
+
+#define PATHFINDING_OBJECT_NAME_FIELD           "name"
+#define PATHFINDING_OBJECT_DESCRIPTION_FIELD    "description"
+#define PATHFINDING_OBJECT_OWNER_FIELD          "owner"
+#define PATHFINDING_OBJECT_POSITION_FIELD       "position"
+#define PATHFINDING_OBJECT_IS_GROUP_OWNED_FIELD "owner_is_group"
+
+//---------------------------------------------------------------------------
+// LLPathfindingObject
+//---------------------------------------------------------------------------
+
+LLPathfindingObject::LLPathfindingObject()
+	: mUUID(),
+	mName(),
+	mDescription(),
+	mOwnerUUID(),
+	mHasOwnerName(false),
+	mOwnerName(),
+	mIsGroupOwned(false),
+	mLocation()
+{
+}
+
+LLPathfindingObject::LLPathfindingObject(const std::string &pUUID, const LLSD &pObjectData)
+	: mUUID(pUUID),
+	mName(),
+	mDescription(),
+	mOwnerUUID(),
+	mHasOwnerName(false),
+	mOwnerName(),
+	mIsGroupOwned(false),
+	mLocation()
+{
+	parseObjectData(pObjectData);
+}
+
+LLPathfindingObject::LLPathfindingObject(const LLPathfindingObject& pOther)
+	: mUUID(pOther.mUUID),
+	mName(pOther.mName),
+	mDescription(pOther.mDescription),
+	mOwnerUUID(pOther.mOwnerUUID),
+	mHasOwnerName(false),
+	mOwnerName(),
+	mIsGroupOwned(pOther.mIsGroupOwned),
+	mLocation(pOther.mLocation)
+{
+	fetchOwnerName();
+}
+
+LLPathfindingObject::~LLPathfindingObject()
+{
+}
+
+LLPathfindingObject &LLPathfindingObject::operator =(const LLPathfindingObject& pOther)
+{
+	mUUID = pOther.mUUID;
+	mName = pOther.mName;
+	mDescription = pOther.mDescription;
+	mOwnerUUID = pOther.mOwnerUUID;
+	fetchOwnerName();
+	mIsGroupOwned = pOther.mIsGroupOwned;
+	mLocation = pOther.mLocation;
+
+	return *this;
+}
+
+std::string LLPathfindingObject::getOwnerName() const
+{
+	std::string ownerName;
+
+	if (hasOwner())
+	{
+		ownerName = mOwnerName.getCompleteName();
+	}
+
+	return ownerName;
+}
+
+void LLPathfindingObject::parseObjectData(const LLSD &pObjectData)
+{
+	llassert(pObjectData.has(PATHFINDING_OBJECT_NAME_FIELD));
+	llassert(pObjectData.get(PATHFINDING_OBJECT_NAME_FIELD).isString());
+	mName = pObjectData.get(PATHFINDING_OBJECT_NAME_FIELD).asString();
+	
+	llassert(pObjectData.has(PATHFINDING_OBJECT_DESCRIPTION_FIELD));
+	llassert(pObjectData.get(PATHFINDING_OBJECT_DESCRIPTION_FIELD).isString());
+	mDescription = pObjectData.get(PATHFINDING_OBJECT_DESCRIPTION_FIELD).asString();
+
+	llassert(pObjectData.has(PATHFINDING_OBJECT_OWNER_FIELD));
+	llassert(pObjectData.get(PATHFINDING_OBJECT_OWNER_FIELD).isUUID());
+	mOwnerUUID = pObjectData.get(PATHFINDING_OBJECT_OWNER_FIELD).asUUID();
+	fetchOwnerName();
+
+	if (pObjectData.has(PATHFINDING_OBJECT_IS_GROUP_OWNED_FIELD))
+	{
+		llassert(pObjectData.get(PATHFINDING_OBJECT_IS_GROUP_OWNED_FIELD).isBoolean());
+		mIsGroupOwned = pObjectData.get(PATHFINDING_OBJECT_IS_GROUP_OWNED_FIELD).asBoolean();
+	}
+
+	llassert(pObjectData.has(PATHFINDING_OBJECT_POSITION_FIELD));
+	llassert(pObjectData.get(PATHFINDING_OBJECT_POSITION_FIELD).isArray());
+	mLocation.setValue(pObjectData.get(PATHFINDING_OBJECT_POSITION_FIELD));
+}
+
+void LLPathfindingObject::fetchOwnerName()
+{
+	mHasOwnerName = false;
+	if (hasOwner())
+	{
+		mHasOwnerName = LLAvatarNameCache::get(mOwnerUUID, &mOwnerName);
+		if (!mHasOwnerName)
+		{
+			LLAvatarNameCache::get(mOwnerUUID, boost::bind(&LLPathfindingObject::handleAvatarNameFetch, this, _1, _2));
+		}
+	}
+}
+
+void LLPathfindingObject::handleAvatarNameFetch(const LLUUID &pOwnerUUID, const LLAvatarName &pAvatarName)
+{
+	llassert(mOwnerUUID == pOwnerUUID);
+	mOwnerName = pAvatarName;
+	mHasOwnerName = true;
+}
diff --git a/indra/newview/llpathfindingobject.h b/indra/newview/llpathfindingobject.h
new file mode 100644
index 000000000..d45cc554f
--- /dev/null
+++ b/indra/newview/llpathfindingobject.h
@@ -0,0 +1,80 @@
+/** 
+* @file   llpathfindingobject.h
+* @brief  Header file for llpathfindingobject
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+#ifndef LL_LLPATHFINDINGOBJECT_H
+#define LL_LLPATHFINDINGOBJECT_H
+
+#include <string>
+
+#include <boost/shared_ptr.hpp>
+
+#include "llavatarname.h"
+#include "lluuid.h"
+#include "v3math.h"
+
+class LLPathfindingObject;
+class LLSD;
+
+typedef boost::shared_ptr<LLPathfindingObject> LLPathfindingObjectPtr;
+
+class LLPathfindingObject
+{
+public:
+	LLPathfindingObject();
+	LLPathfindingObject(const std::string &pUUID, const LLSD &pObjectData);
+	LLPathfindingObject(const LLPathfindingObject& pOther);
+	virtual ~LLPathfindingObject();
+
+	LLPathfindingObject& operator =(const LLPathfindingObject& pOther);
+
+	inline const LLUUID&      getUUID() const        {return mUUID;};
+	inline const std::string& getName() const        {return mName;};
+	inline const std::string& getDescription() const {return mDescription;};
+	inline BOOL               hasOwner() const       {return mOwnerUUID.notNull();};
+	inline bool               hasOwnerName() const   {return mHasOwnerName;};
+	std::string               getOwnerName() const;
+	inline BOOL               isGroupOwned() const   {return mIsGroupOwned;};
+	inline const LLVector3&   getLocation() const    {return mLocation;};
+
+protected:
+
+private:
+	void parseObjectData(const LLSD &pObjectData);
+
+	void fetchOwnerName();
+	void handleAvatarNameFetch(const LLUUID &pOwnerUUID, const LLAvatarName &pAvatarName);
+
+	LLUUID       mUUID;
+	std::string  mName;
+	std::string  mDescription;
+	LLUUID       mOwnerUUID;
+	bool         mHasOwnerName;
+	LLAvatarName mOwnerName;
+	BOOL         mIsGroupOwned;
+	LLVector3    mLocation;
+};
+
+#endif // LL_LLPATHFINDINGOBJECT_H
diff --git a/indra/newview/llpathfindingobjectlist.cpp b/indra/newview/llpathfindingobjectlist.cpp
new file mode 100644
index 000000000..68a7e736e
--- /dev/null
+++ b/indra/newview/llpathfindingobjectlist.cpp
@@ -0,0 +1,112 @@
+/** 
+* @file llpathfindingobjectlist.cpp
+* @brief Implementation of llpathfindingobjectlist
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llpathfindingobjectlist.h"
+
+#include <string>
+#include <map>
+
+#include "llpathfindingobject.h"
+
+//---------------------------------------------------------------------------
+// LLPathfindingObjectList
+//---------------------------------------------------------------------------
+
+LLPathfindingObjectList::LLPathfindingObjectList()
+	: mObjectMap()
+{
+}
+
+LLPathfindingObjectList::~LLPathfindingObjectList()
+{
+}
+
+bool LLPathfindingObjectList::isEmpty() const
+{
+	return mObjectMap.empty();
+}
+
+void LLPathfindingObjectList::update(LLPathfindingObjectPtr pUpdateObjectPtr)
+{
+	if (pUpdateObjectPtr != NULL)
+	{
+		std::string updateObjectId = pUpdateObjectPtr->getUUID().asString();
+
+		LLPathfindingObjectMap::iterator foundObjectIter = mObjectMap.find(updateObjectId);
+		if (foundObjectIter == mObjectMap.end())
+		{
+			mObjectMap.insert(std::pair<std::string, LLPathfindingObjectPtr>(updateObjectId, pUpdateObjectPtr));
+		}
+		else
+		{
+			foundObjectIter->second = pUpdateObjectPtr;
+		}
+	}
+}
+
+void LLPathfindingObjectList::update(LLPathfindingObjectListPtr pUpdateObjectListPtr)
+{
+	if ((pUpdateObjectListPtr != NULL) && !pUpdateObjectListPtr->isEmpty())
+	{
+		for (LLPathfindingObjectMap::const_iterator updateObjectIter = pUpdateObjectListPtr->begin();
+			updateObjectIter != pUpdateObjectListPtr->end(); ++updateObjectIter)
+		{
+			const LLPathfindingObjectPtr updateObjectPtr = updateObjectIter->second;
+			update(updateObjectPtr);
+		}
+	}
+}
+
+LLPathfindingObjectPtr LLPathfindingObjectList::find(const std::string &pObjectId) const
+{
+	LLPathfindingObjectPtr objectPtr;
+
+	LLPathfindingObjectMap::const_iterator objectIter = mObjectMap.find(pObjectId);
+	if (objectIter != mObjectMap.end())
+	{
+		objectPtr = objectIter->second;
+	}
+
+	return objectPtr;
+}
+
+LLPathfindingObjectList::const_iterator LLPathfindingObjectList::begin() const
+{
+	return mObjectMap.begin();
+}
+
+LLPathfindingObjectList::const_iterator LLPathfindingObjectList::end() const
+{
+	return mObjectMap.end();
+}
+
+LLPathfindingObjectMap &LLPathfindingObjectList::getObjectMap()
+{
+	return mObjectMap;
+}
diff --git a/indra/newview/llpathfindingobjectlist.h b/indra/newview/llpathfindingobjectlist.h
new file mode 100644
index 000000000..3ad8e8b09
--- /dev/null
+++ b/indra/newview/llpathfindingobjectlist.h
@@ -0,0 +1,67 @@
+/** 
+* @file   llpathfindingobjectlist.h
+* @brief  Header file for llpathfindingobjectlist
+* @author Stinson@lindenlab.com
+*
+* $LicenseInfo:firstyear=2012&license=viewerlgpl$
+* Second Life Viewer Source Code
+* Copyright (C) 2012, Linden Research, Inc.
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation;
+* version 2.1 of the License only.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*
+* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+* $/LicenseInfo$
+*/
+#ifndef LL_LLPATHFINDINGOBJECTLIST_H
+#define LL_LLPATHFINDINGOBJECTLIST_H
+
+#include <string>
+#include <map>
+
+#include <boost/shared_ptr.hpp>
+
+#include "llpathfindingobject.h"
+
+class LLPathfindingObjectList;
+
+typedef boost::shared_ptr<LLPathfindingObjectList> LLPathfindingObjectListPtr;
+typedef std::map<std::string, LLPathfindingObjectPtr> LLPathfindingObjectMap;
+
+class LLPathfindingObjectList
+{
+public:
+	LLPathfindingObjectList();
+	virtual ~LLPathfindingObjectList();
+
+	bool isEmpty() const;
+
+	void update(LLPathfindingObjectPtr pUpdateObjectPtr);
+	void update(LLPathfindingObjectListPtr pUpdateObjectListPtr);
+
+	LLPathfindingObjectPtr find(const std::string &pObjectId) const;
+
+	typedef LLPathfindingObjectMap::const_iterator const_iterator;
+	const_iterator begin() const;
+	const_iterator end() const;
+
+
+protected:
+	LLPathfindingObjectMap &getObjectMap();
+
+private:
+	LLPathfindingObjectMap mObjectMap;
+};
+
+#endif // LL_LLPATHFINDINGOBJECTLIST_H
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 18aaabef4..c6bde8c05 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -221,6 +221,8 @@
 #include "shfloatermediaticker.h"
 // </edit>
 
+#include "llpathfindingmanager.h"
+
 #include "llavatarnamecache.h"
 #include "lgghunspell_wrapper.h"
 
@@ -2729,6 +2731,10 @@ bool idle_startup()
 		// reset timers now that we are running "logged in" logic
 		LLFastTimer::reset();
 		display_startup();
+
+		llassert(LLPathfindingManager::getInstance() != NULL);
+		LLPathfindingManager::getInstance()->initSystem();
+
 		return TRUE;
 	}
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 452081724..6279e130f 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -260,6 +260,7 @@
 #include "slfloatermediafilter.h"
 #include "llviewerobjectbackup.h"
 #include "llagentui.h"
+#include "llpathfindingmanager.h"
 
 #include "hippogridmanager.h"
 
@@ -2742,6 +2743,16 @@ class LLObjectMeasure : public view_listener_t
 	}
 };
 
+bool enable_object_select_in_pathfinding_linksets()
+{
+	return LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() && LLSelectMgr::getInstance()->selectGetEditableLinksets();
+}
+
+bool enable_object_select_in_pathfinding_characters()
+{
+	return LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() &&  LLSelectMgr::getInstance()->selectGetViewableCharacters();
+}
+
 class LLAvatarAnims : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -5192,6 +5203,7 @@ class LLToolsSaveToInventory : public view_listener_t
 		return true;
 	}
 };
+
 class LLToolsSaveToObjectInventory : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -5206,6 +5218,22 @@ class LLToolsSaveToObjectInventory : public view_listener_t
 	}
 };
 
+class LLToolsEnablePathfinding : public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		return (LLPathfindingManager::getInstance() != NULL) && LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion();
+	}
+};
+
+class LLToolsEnablePathfindingView : public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		return (LLPathfindingManager::getInstance() != NULL) && LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() && LLPathfindingManager::getInstance()->isPathfindingViewEnabled();
+	}
+};
+
 // Round the position of all root objects to the grid
 class LLToolsSnapObjectXY : public view_listener_t
 {
@@ -9380,6 +9408,9 @@ void initialize_menus()
 	addMenu(new LLToolsEnableTakeCopy(), "Tools.EnableTakeCopy");
 	addMenu(new LLToolsEnableSaveToObjectInventory(), "Tools.SaveToObjectInventory");
 
+	addMenu(new LLToolsEnablePathfinding(), "Tools.EnablePathfinding");
+	addMenu(new LLToolsEnablePathfindingView(), "Tools.EnablePathfindingView");
+
 	/*addMenu(new LLToolsVisibleBuyObject(), "Tools.VisibleBuyObject");
 	addMenu(new LLToolsVisibleTakeObject(), "Tools.VisibleTakeObject");*/
 
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 153bd2f67..11e47bd77 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1562,8 +1562,10 @@ void LLViewerRegion::unpackRegionHandshake()
 
 void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 {
+	capabilityNames.append("AgentState");
 	//capabilityNames.append("AttachmentResources"); //Script limits (llfloaterscriptlimits.cpp)
 	//capabilityNames.append("AvatarPickerSearch"); //Display name/SLID lookup (llfloateravatarpicker.cpp)
+	capabilityNames.append("CharacterProperties");
 	capabilityNames.append("ChatSessionRequest");
 	capabilityNames.append("CopyInventoryFromNotecard");
 	capabilityNames.append("CreateInventoryCategory");
@@ -1596,7 +1598,9 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 #if MESH_IMPORT
 	capabilityNames.append("MeshUploadFlag");
 #endif //MESH_IMPORT
+	capabilityNames.append("NavMeshGenerationStatus");
 	capabilityNames.append("NewFileAgentInventory");
+	capabilityNames.append("ObjectNavMeshProperties");
 	capabilityNames.append("ParcelPropertiesUpdate");
 	capabilityNames.append("ParcelNavigateMedia");
 	capabilityNames.append("ParcelVoiceInfoRequest");
@@ -1605,6 +1609,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("RemoteParcelRequest");
 	capabilityNames.append("RequestTextureDownload");
 	capabilityNames.append("ResourceCostSelected"); //Unreferenced?
+	capabilityNames.append("RetrieveNavMeshSrc");
 	capabilityNames.append("SearchStatRequest");
 	capabilityNames.append("SearchStatTracking");
 	capabilityNames.append("SendPostcard");
@@ -1616,6 +1621,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("SetDisplayName");
 	capabilityNames.append("SimConsoleAsync");
 	capabilityNames.append("StartGroupProposal");
+	capabilityNames.append("TerrainNavMeshProperties");
 	capabilityNames.append("TextureStats");
 	capabilityNames.append("UntrustedSimulatorMessage");
 	capabilityNames.append("UpdateAgentInformation");
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index abf2ebee2..2b23e2735 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -128,6 +128,7 @@
 #include "llmodaldialog.h"
 #include "llmorphview.h"
 #include "llmoveview.h"
+#include "llpanelpathfindingrebakenavmesh.h"
 #include "llnotify.h"
 #include "lloverlaybar.h"
 #include "llpreviewtexture.h"
@@ -1955,6 +1956,10 @@ void LLViewerWindow::initWorldUI()
 		// put behind everything else in the UI
 		mRootView->addChildInBack(gHUDView);
 	}
+	
+	LLPanel* panel_ssf_container = getRootView()->getChild<LLPanel>("state_management_buttons_container");
+	LLPanelPathfindingRebakeNavmesh *panel_rebake_navmesh = LLPanelPathfindingRebakeNavmesh::getInstance();
+	panel_ssf_container->addChild(panel_rebake_navmesh);
 }
 
 // initWorldUI that wasn't before logging in. Some of this may require the access the 'LindenUserDir'.
diff --git a/indra/newview/skins/default/xui/en-us/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/en-us/panel_navmesh_rebake.xml
new file mode 100644
index 000000000..680f7691c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en-us/panel_navmesh_rebake.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+    height="25"
+    layout="topleft"
+    name="panel_navmesh_rebake"
+    mouse_opaque="false"
+    visible="true"
+    follows="none"
+    width="133">
+  <button
+      follows="none"
+      height="20"
+      label="Rebake region"
+      layout="topleft"
+      left="10"
+      name="navmesh_btn"
+      tool_tip="Click to rebake the region&apos;s navmesh."
+      bottom="-25"
+      visible="false"
+      enabled="true"
+      width="120" />
+  <button
+      follows="none"
+      height="20"
+      label="Requesting rebake"
+      layout="topleft"
+      left="10"
+      name="navmesh_btn_sending"
+      tool_tip="Sending rebake request to the server."
+      bottom="-25"
+      visible="false"
+      enabled="false"
+      width="120" />
+  <button
+      follows="left|bottom"
+      height="20"
+      label="Region is rebaking"
+      layout="topleft"
+      left="10"
+      name="navmesh_btn_baking"
+      tool_tip="Region is being rebaked.  When completed, this button will disappear."
+      bottom="-25"
+      visible="false"
+      enabled="false"
+      width="120" />
+</panel>
diff --git a/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml b/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
index 090a164d8..d5dfff175 100644
--- a/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
@@ -14,8 +14,8 @@
 				     name="padding" use_bounding_rect="true" user_resize="false" width="420" />
 				<layout_panel auto_resize="false" bottom="0" follows="left|bottom|right|top" height="20"
 				     left="0" min_height="20" min_width="100" mouse_opaque="false"
-				     name="state_buttons" use_bounding_rect="true" user_resize="false"
-				     width="420">
+				     name="state_management_buttons_container" use_bounding_rect="true" user_resize="false"
+				     width="799">
 					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
 					     label="New IM" label_selected="New IM" left="0"
 					     name="New IM" scale_image="true"
@@ -25,7 +25,7 @@
 					     label="Set Not Busy" label_selected="Set Not Busy" left="114"
 					     name="Set Not Busy" scale_image="true"
 					     tool_tip="Chat and IM is hidden for you. Click here to set yourself not busy."
-					     width="102" />
+					     width="112" />
 					<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
 					     label="Flycam" label_selected="Flycam" left="229" name="Flycam" scale_image="true"
 					     tool_tip="Your camera is under joystick control, click here to release it."
diff --git a/indra/newview/skins/default/xui/fr/panel_overlaybar.xml b/indra/newview/skins/default/xui/fr/panel_overlaybar.xml
index e94bf0704..7a020274c 100644
--- a/indra/newview/skins/default/xui/fr/panel_overlaybar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_overlaybar.xml
@@ -4,7 +4,7 @@
 		<layout_panel min_width="410" name="main_panel" width="410">
 			<layout_stack name="chatbar_and_buttons" right="410">
 				<layout_panel name="padding" width="410"/>
-				<layout_panel name="state_buttons" width="410">
+				<layout_panel name="state_management_buttons_container" width="410">
 					
 					<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="Flycam" label_selected="Flycam" name="Flycam" tool_tip="Votre caméra est contrôlée par le joystick, cliquez ici pour la libérer."/>

From 1a6c00ca8b6f1c4e4cbfd2c2def8bc27aa663795 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Mon, 6 Aug 2012 12:26:28 -0500
Subject: [PATCH 146/199] Display pathfinding attributes in build floater.

---
 indra/newview/llpanelpermissions.cpp          | 37 +++++++++++-
 indra/newview/llpanelvolume.cpp               | 30 ++++++++--
 indra/newview/llpanelvolume.h                 |  4 +-
 .../skins/default/xui/en-us/floater_tools.xml | 60 +++++++++++++++----
 .../skins/default/xui/en-us/notifications.xml | 28 +++++++++
 .../skins/default/xui/en-us/strings.xml       |  7 +++
 6 files changed, 149 insertions(+), 17 deletions(-)

diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index c62d2b370..c501e9de0 100644
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -66,6 +66,7 @@
 #include "llviewercontrol.h"
 #include "lluictrlfactory.h"
 #include "roles_constants.h"
+#include "lltrans.h"
 
 #include "hippogridmanager.h"
 
@@ -291,12 +292,18 @@ void LLPanelPermissions::refresh()
 		getString("text modify info 1"),
 		getString("text modify info 2"),
 		getString("text modify info 3"),
-		getString("text modify info 4")
+		getString("text modify info 4"),
+		getString("text modify info 5"),
+		getString("text modify info 6")
 	};
 	if(!is_perm_modify)
 	{
 		string_index += 2;
 	}
+	else if (!is_nonpermanent_enforced)
+	{
+		string_index += 4;
+	}
 	if(!is_one_object)
 	{
 		++string_index;
@@ -304,6 +311,34 @@ void LLPanelPermissions::refresh()
 	childSetEnabled("perm_modify",true);
 	childSetText("perm_modify",MODIFY_INFO_STRINGS[string_index]);
 
+	std::string pfAttrName;
+
+	if ((LLSelectMgr::getInstance()->getSelection()->getFirstRootNode() 
+		&& LLSelectMgr::getInstance()->selectGetRootsNonPathfinding())
+		|| LLSelectMgr::getInstance()->selectGetNonPathfinding())
+	{
+		pfAttrName = "Pathfinding_Object_Attr_None";
+	}
+	else if ((LLSelectMgr::getInstance()->getSelection()->getFirstRootNode() 
+		&& LLSelectMgr::getInstance()->selectGetRootsPermanent())
+		|| LLSelectMgr::getInstance()->selectGetPermanent())
+	{
+		pfAttrName = "Pathfinding_Object_Attr_Permanent";
+	}
+	else if ((LLSelectMgr::getInstance()->getSelection()->getFirstRootNode() 
+		&& LLSelectMgr::getInstance()->selectGetRootsCharacter())
+		|| LLSelectMgr::getInstance()->selectGetCharacter())
+	{
+		pfAttrName = "Pathfinding_Object_Attr_Character";
+	}
+	else
+	{
+		pfAttrName = "Pathfinding_Object_Attr_MultiSelect";
+	}
+
+	getChildView("pathfinding_attributes_value")->setEnabled(TRUE);
+	getChild<LLUICtrl>("pathfinding_attributes_value")->setValue(LLTrans::getString(pfAttrName));
+
 	childSetEnabled("Permissions:",true);
 	
 	// Update creator text field
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp
index 262a89bc4..ac0085757 100644
--- a/indra/newview/llpanelvolume.cpp
+++ b/indra/newview/llpanelvolume.cpp
@@ -83,13 +83,17 @@
 #include "llviewercontrol.h"
 #include "llmeshrepository.h"
 
+#include "llnotificationsutil.h"
+
+#include <boost/bind.hpp>
+
 // "Features" Tab
 
 BOOL	LLPanelVolume::postBuild()
 {
 	// Flexible Objects Parameters
 	{
-		childSetCommitCallback("Flexible1D Checkbox Ctrl",onCommitIsFlexible,this);
+		getChild<LLCheckboxCtrl>("Flexible1D Checkbox Ctrl")->setCommitCallback(boost::bind(&LLPanelVolume::onCommitIsFlexible, this, _1, _2), NULL);
 		childSetCommitCallback("FlexNumSections",onCommitFlexible,this);
 		getChild<LLUICtrl>("FlexNumSections")->setValidateBeforeCommit(precommitValidate);
 		childSetCommitCallback("FlexGravity",onCommitFlexible,this);
@@ -810,10 +814,26 @@ void LLPanelVolume::onCommitFlexible( LLUICtrl* ctrl, void* userdata )
 	self->refresh();
 }
 
-// static
-void LLPanelVolume::onCommitIsFlexible( LLUICtrl* ctrl, void* userdata )
+void LLPanelVolume::onCommitIsFlexible(LLUICtrl *, void*)
 {
-	LLPanelVolume* self = (LLPanelVolume*) userdata;
-	self->sendIsFlexible();
+	if (mObject->flagObjectPermanent())
+	{
+		LLNotificationsUtil::add("PathfindingLinksets_ChangeToFlexiblePath", LLSD(), LLSD(), boost::bind(&LLPanelVolume::handleResponseChangeToFlexible, this, _1, _2));
+	}
+	else
+	{
+		sendIsFlexible();
+	}
 }
 
+void LLPanelVolume::handleResponseChangeToFlexible(const LLSD &pNotification, const LLSD &pResponse)
+{
+	if (LLNotificationsUtil::getSelectedOption(pNotification, pResponse) == 0)
+	{
+		sendIsFlexible();
+	}
+	else
+	{
+		getChild<LLUICtrl>("Flexible1D Checkbox Ctrl")->setValue(FALSE);
+	}
+}
diff --git a/indra/newview/llpanelvolume.h b/indra/newview/llpanelvolume.h
index abf460dd0..1446c72db 100644
--- a/indra/newview/llpanelvolume.h
+++ b/indra/newview/llpanelvolume.h
@@ -68,7 +68,7 @@ public:
 	
 	static void 	onCommitIsLight(		LLUICtrl* ctrl, void* userdata);
 	static void 	onCommitLight(			LLUICtrl* ctrl, void* userdata);
-	static void 	onCommitIsFlexible(		LLUICtrl* ctrl, void* userdata);
+	void			onCommitIsFlexible(		LLUICtrl* ctrl, void* userdata);
 	static void 	onCommitFlexible(		LLUICtrl* ctrl, void* userdata);
 	static void     onCommitPhysicsParam(       LLUICtrl* ctrl, void* userdata);
 
@@ -89,6 +89,8 @@ protected:
 	void            sendPhysicsFriction(LLUICtrl* ctrl, void* userdata);
 	void            sendPhysicsRestitution(LLUICtrl* ctrl, void* userdata);
 	void            sendPhysicsDensity(LLUICtrl* ctrl, void* userdata);
+
+	void            handleResponseChangeToFlexible(const LLSD &pNotification, const LLSD &pResponse);
 /*
 	LLTextBox*		mLabelSelectSingleMessage;
 	// Light
diff --git a/indra/newview/skins/default/xui/en-us/floater_tools.xml b/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 2480a0440..76c2b02ac 100644
--- a/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -409,7 +409,7 @@
 			    mouse_opaque="true" name="perm_modify" v_pad="0" width="250">
 				You can modify this object.
 			</text>
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			<check_box bottom_delta="-16" follows="left|top" font="SansSerifSmall" height="16"
 			    initial_value="false" label="Share with group" left="10"
 			    mouse_opaque="true" name="checkbox share with group"
 			    tool_tip="Allow all members of the set group to share and use your permissions for this object. You must Deed to enable role restrictions."
@@ -420,21 +420,21 @@
 			<string name="text deed">
 				Deed
 			</string>
-			<button bottom="-186" follows="top|right" font="SansSerifSmall" halign="center"
+			<button bottom_delta="0" follows="top|right" font="SansSerifSmall" halign="center"
 			     height="20" label="Deed..." label_selected="Deed..." left_delta="172"
 			     mouse_opaque="true" name="button deed" scale_image="TRUE"
 			     tool_tip="Group shared objects can be deeded by a group officer."
 			     width="78" />
-			<check_box bottom="-206" follows="left|top" font="SansSerifSmall" height="16"
+			<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
 			     initial_value="false" label="Allow anyone to move" left="10"
 			     mouse_opaque="true" name="checkbox allow everyone move" width="142" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
 			     initial_value="false" label="Allow anyone to copy" left="10"
 			     mouse_opaque="true" name="checkbox allow everyone copy" width="141" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
 			     initial_value="false" label="Show in search" left="10" name="search_check"
 			     tool_tip="Let people see this object in search results" width="78" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
+			<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
 			     initial_value="false" label="For Sale" left="10" mouse_opaque="true"
 			     name="checkbox for sale" width="78" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -446,7 +446,7 @@
 			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
 			     follows="left|top|right" font="SansSerifSmall" height="16" left_delta="80"
 			     max_length="25" mouse_opaque="true" name="Edit Cost" width="75" />
-			<radio_group bottom="-286" draw_border="false" follows="left|top|right" height="16"
+			<radio_group bottom_delta="-18" draw_border="false" follows="left|top|right" height="16"
 			     left="42" mouse_opaque="true" name="sale type" width="218">
 				<radio_item bottom="-16" follows="left|top" height="16" left="0" mouse_opaque="true"
 				     name="Original" width="70">
@@ -462,7 +462,7 @@
 				</radio_item>
 			</radio_group>
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-298" drop_shadow_visible="true" follows="left|top|right"
+			     bottom_delta="-5" drop_shadow_visible="true" follows="left|top|right"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
 			     mouse_opaque="true" name="Next owner can:" v_pad="0" width="250">
 				Next owner can:
@@ -477,12 +477,12 @@
 			     initial_value="false" label="Resell/Give away" left_delta="60"
 			     mouse_opaque="true" name="checkbox next owner can transfer" width="130" />
 			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-332" drop_shadow_visible="true" follows="left|top"
+			     bottom="-334" drop_shadow_visible="true" follows="left|top"
 			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
 			     mouse_opaque="true" name="label click action" v_pad="0" width="150">
 				When Left-Clicked:
 			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-25" follows="left|top" height="18"
+			<combo_box bottom_delta="-24" allow_text_entry="false" follows="left|top" height="20"
 			     left="10" max_chars="20" mouse_opaque="true" name="clickaction" width="150">
 			     <!-- Do not reorder these items, the index numbers are
 					used internally. JC -->
@@ -549,6 +549,40 @@
 			     mouse_opaque="true" name="F:" v_pad="0" width="74">
 				F:
 			</text>
+      <panel bottom="-302" border="true" height="155" left="5" width="260" />
+      <panel
+     bottom="-328"
+     border="false"
+     follows="left|top"
+     layout="topleft"
+     mouse_opaque="false"
+     name="pathfinding_attrs_panel"
+     left="0"
+     top_pad="0"
+     height="25"
+     width="290">
+        <text
+           type="string"
+           follows="left|top"
+           name="pathfinding_attributes_label"
+           top_pad="4"
+           width="150"
+           left="10">
+          Pathfinding attributes:
+        </text>
+        <text
+           bottom_delta="0"
+           left_delta="120"
+           type="string"
+           text_color="TextLinkColor"
+           follows="left|top"
+           name="pathfinding_attributes_value"
+           width="130"
+           word_wrap="false"
+           left_pad="0">
+          Test
+        </text>
+      </panel>
 			<string name="text modify info 1">
 				You can modify this object.
 			</string>
@@ -561,6 +595,12 @@
 			<string name="text modify info 4">
 				You cannot modify these objects.
 			</string>
+      <string name="text modify info 5">
+        You can't modify this object across a region boundary
+      </string>
+      <string name="text modify info 6">
+        You can't modify these objects across a region boundary
+      </string>
 			<string name="text modify warning">
 				Must select entire object to set permissions.
 			</string>
diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml
index 02e4d5bc8..b8a543f8c 100644
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -102,6 +102,21 @@
     </form>
   </template>
 
+  <template name="okhelpignore">
+    <form>
+      <button
+       default="true"
+       index="0"
+       name="OK"
+       text="$yestext"/>
+      <button
+       index="1"
+       name="Help"
+       text="$helptext"/>
+      <ignore text="$ignoretext"/>
+    </form>
+  </template>
+
   <template name="yesnocancelbuttons">
     <form>
       <button
@@ -7126,6 +7141,19 @@ You locally updated a [RESOLUTION] baked texture for '[BODYREGION]' after [TIME]
 - Your CPU speed does not meet the minimum requirements.
   </global>
 
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingLinksets_ChangeToFlexiblePath"
+   type="alertmodal">
+    The selected object affects the navmesh.  Changing it to a Flexible Path will remove it from the navmesh.
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="The selected object affects the navmesh.  Changing it to a Flexible Path will remove it from the navmesh."
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
   <global name="UnsupportedGLRequirements">
     You do not appear to have the proper hardware requirements for [APP_NAME]. The viewer requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.
   </global>
diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index 863827baa..71b0db7db 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -1966,6 +1966,13 @@ Try enclosing path to the editor with double quotes.
  <string name="ExternalEditorCommandParseError">Error parsing the external editor command.</string>
  <string name="ExternalEditorFailedToRun">External editor failed to run.</string>
 
+  <!-- Pathfinding -->
+  <string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
+  <string name="Pathfinding_Object_Attr_None">None</string>
+  <string name="Pathfinding_Object_Attr_Permanent">Affects navmesh</string>
+  <string name="Pathfinding_Object_Attr_Character">Character</string>
+  <string name="Pathfinding_Object_Attr_MultiSelect">(Multiple)</string>
+
 <!-- Addition of OSSL commands for use in OpenSimulator based regions, including Aurora -->
   <string name="LSLTipText_osSetRegionWaterHeight">
 osSetRegionWaterHeight(float height)

From f9b3561ca8e02d8f5b4230b49b75e6d6b56f5a16 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Mon, 6 Aug 2012 17:24:01 -0400
Subject: [PATCH 147/199] Typo fix

---
 indra/newview/llviewermessage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index bd5932ad4..6803d044f 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1424,7 +1424,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 				+ " " + LLTrans::getString("'") + group_name + LLTrans::getString("'");
 
 				chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByGroup")
-				+ " " + group_name +  + LLTrans::getString("'") + LLTrans::getString(".");
+				+ " " + group_name + LLTrans::getString("'") + LLTrans::getString(".");
 			}
 			else
 			{

From e14be5c8c24d4a63ac3d8b4823e336b96c1905e1 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Tue, 7 Aug 2012 01:33:29 +0200
Subject: [PATCH 148/199] Make debug_libcurl.cc compile with libcurl 7.21 and
 higher

---
 indra/cwdebug/debug_libcurl.cc | 37 ++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/indra/cwdebug/debug_libcurl.cc b/indra/cwdebug/debug_libcurl.cc
index 10aa0f28e..0858ded92 100644
--- a/indra/cwdebug/debug_libcurl.cc
+++ b/indra/cwdebug/debug_libcurl.cc
@@ -8,6 +8,13 @@
 #include "debug_libcurl.h"
 #include "../llcommon/llerror.h"
 
+#define CURL_VERSION(major, minor, patch)	\
+    (LIBCURL_VERSION_MAJOR > major ||		\
+	 (LIBCURL_VERSION_MAJOR == major &&		\
+	  LIBCURL_VERSION_MINOR > minor ||		\
+	  (LIBCURL_VERSION_MINOR == minor &&	\
+	   LIBCURL_VERSION_PATCH >= patch)))
+
 static struct curl_slist unchanged_slist;
 
 std::ostream& operator<<(std::ostream& os, struct curl_slist const& slist)
@@ -93,15 +100,21 @@ std::ostream& operator<<(std::ostream& os, CURLcode code)
 	CASEPRINT(CURLE_UNSUPPORTED_PROTOCOL);
 	CASEPRINT(CURLE_FAILED_INIT);
 	CASEPRINT(CURLE_URL_MALFORMAT);
+#if CURL_VERSION(7, 21, 5)
 	CASEPRINT(CURLE_NOT_BUILT_IN);
+#endif
 	CASEPRINT(CURLE_COULDNT_RESOLVE_PROXY);
 	CASEPRINT(CURLE_COULDNT_RESOLVE_HOST);
 	CASEPRINT(CURLE_COULDNT_CONNECT);
 	CASEPRINT(CURLE_FTP_WEIRD_SERVER_REPLY);
 	CASEPRINT(CURLE_REMOTE_ACCESS_DENIED);
+#if 0
 	CASEPRINT(CURLE_FTP_ACCEPT_FAILED);
+#endif
 	CASEPRINT(CURLE_FTP_WEIRD_PASS_REPLY);
+#if 0
 	CASEPRINT(CURLE_FTP_ACCEPT_TIMEOUT);
+#endif
 	CASEPRINT(CURLE_FTP_WEIRD_PASV_REPLY);
 	CASEPRINT(CURLE_FTP_WEIRD_227_FORMAT);
 	CASEPRINT(CURLE_FTP_CANT_GET_HOST);
@@ -137,7 +150,11 @@ std::ostream& operator<<(std::ostream& os, CURLcode code)
 	CASEPRINT(CURLE_INTERFACE_FAILED);
 	CASEPRINT(CURLE_OBSOLETE46);
 	CASEPRINT(CURLE_TOO_MANY_REDIRECTS );
+#if CURL_VERSION(7, 21, 5)
 	CASEPRINT(CURLE_UNKNOWN_OPTION);
+#else
+	CASEPRINT(CURLE_UNKNOWN_TELNET_OPTION);
+#endif
 	CASEPRINT(CURLE_TELNET_OPTION_SYNTAX );
 	CASEPRINT(CURLE_OBSOLETE50);
 	CASEPRINT(CURLE_PEER_FAILED_VERIFICATION);
@@ -294,7 +311,11 @@ std::ostream& operator<<(std::ostream& os, CURLoption option)
 	CASEPRINT(CURLOPT_NOSIGNAL);
 	CASEPRINT(CURLOPT_SHARE);
 	CASEPRINT(CURLOPT_PROXYTYPE);
+#if CURL_VERSION(7, 21, 6)
 	CASEPRINT(CURLOPT_ACCEPT_ENCODING);
+#else
+	CASEPRINT(CURLOPT_ENCODING);
+#endif
 	CASEPRINT(CURLOPT_PRIVATE);
 	CASEPRINT(CURLOPT_HTTP200ALIASES);
 	CASEPRINT(CURLOPT_UNRESTRICTED_AUTH);
@@ -386,21 +407,37 @@ std::ostream& operator<<(std::ostream& os, CURLoption option)
 	CASEPRINT(CURLOPT_FNMATCH_FUNCTION);
 	CASEPRINT(CURLOPT_CHUNK_DATA);
 	CASEPRINT(CURLOPT_FNMATCH_DATA);
+#if CURL_VERSION(7, 21, 3)
 	CASEPRINT(CURLOPT_RESOLVE);
+#endif
+#if CURL_VERSION(7, 21, 4)
 	CASEPRINT(CURLOPT_TLSAUTH_USERNAME);
 	CASEPRINT(CURLOPT_TLSAUTH_PASSWORD);
 	CASEPRINT(CURLOPT_TLSAUTH_TYPE);
+#endif
+#if CURL_VERSION(7, 21, 6)
 	CASEPRINT(CURLOPT_TRANSFER_ENCODING);
+#endif
+#if CURL_VERSION(7, 21, 7)
 	CASEPRINT(CURLOPT_CLOSESOCKETFUNCTION);
 	CASEPRINT(CURLOPT_CLOSESOCKETDATA);
+#endif
+#if CURL_VERSION(7, 22, 0)
 	CASEPRINT(CURLOPT_GSSAPI_DELEGATION);
+#endif
+#if CURL_VERSION(7, 24, 0)
 	CASEPRINT(CURLOPT_DNS_SERVERS);
 	CASEPRINT(CURLOPT_ACCEPTTIMEOUT_MS);
+#endif
+#if CURL_VERSION(7, 25, 0)
 	CASEPRINT(CURLOPT_TCP_KEEPALIVE);
 	CASEPRINT(CURLOPT_TCP_KEEPIDLE);
 	CASEPRINT(CURLOPT_TCP_KEEPINTVL);
+#endif
 	CASEPRINT(CURLOPT_SSL_OPTIONS);
+#if CURL_VERSION(7, 25, 0)
 	CASEPRINT(CURLOPT_MAIL_AUTH);
+#endif
 	default:
       os << "<unknown CURLoption value (" << (int)option << ")>";
   }

From d2210414bc746148b64935b7c0c25a182c8f6f31 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Mon, 6 Aug 2012 23:15:50 -0400
Subject: [PATCH 149/199] Misplaced closing parenthesis...

---
 indra/newview/llviewermessage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index 6803d044f..afe003e0a 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -1430,7 +1430,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 			{
 				from_string = LLTrans::getString("InvOfferAnObjectNamed") + " " + LLTrans::getString("'")
 				+ mFromName + LLTrans::getString("'") + " " + LLTrans::getString("InvOfferOwnedByUnknownGroup");
-				chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByUnknownGroup" + LLTrans::getString("."));
+				chatHistory_string = mFromName + " " + LLTrans::getString("InvOfferOwnedByUnknownGroup") + LLTrans::getString(".");
 			}
 		}
 		else

From 93416e40a44e6b9fdcab040235394802d4f849c9 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Tue, 7 Aug 2012 05:16:59 +0200
Subject: [PATCH 150/199] Compile fix: CURLOPT_SSL_OPTIONS was also added since
 7.25.0

---
 indra/cwdebug/debug_libcurl.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/cwdebug/debug_libcurl.cc b/indra/cwdebug/debug_libcurl.cc
index 0858ded92..05df113c8 100644
--- a/indra/cwdebug/debug_libcurl.cc
+++ b/indra/cwdebug/debug_libcurl.cc
@@ -434,8 +434,8 @@ std::ostream& operator<<(std::ostream& os, CURLoption option)
 	CASEPRINT(CURLOPT_TCP_KEEPIDLE);
 	CASEPRINT(CURLOPT_TCP_KEEPINTVL);
 #endif
-	CASEPRINT(CURLOPT_SSL_OPTIONS);
 #if CURL_VERSION(7, 25, 0)
+	CASEPRINT(CURLOPT_SSL_OPTIONS);
 	CASEPRINT(CURLOPT_MAIL_AUTH);
 #endif
 	default:

From 68ad5411c94b38b1821a86c866091d51ddaa6943 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 7 Aug 2012 13:12:56 +0200
Subject: [PATCH 151/199] Shyotl's old llcurl

---
 indra/llmessage/llcurl.cpp            | 763 +++++++-------------------
 indra/llmessage/llcurl.h              | 165 ++----
 indra/llmessage/llhttpclient.cpp      |  52 +-
 indra/llmessage/llhttpclient.h        |   6 +-
 indra/llmessage/llurlrequest.cpp      |  55 +-
 indra/llmessage/llurlrequest.h        |  11 +-
 indra/newview/llappviewer.cpp         |   5 +-
 indra/newview/llxmlrpctransaction.cpp |  14 +-
 8 files changed, 290 insertions(+), 781 deletions(-)

diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index 617d43980..fc057d969 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -72,9 +72,10 @@
 
 static const U32 EASY_HANDLE_POOL_SIZE		= 5;
 static const S32 MULTI_PERFORM_CALL_REPEAT	= 5;
-static const S32 CURL_REQUEST_TIMEOUT = 30; // seconds per operation
+static const S32 CURL_REQUEST_TIMEOUT = 30; // seconds
 static const S32 MAX_ACTIVE_REQUEST_COUNT = 100;
 
+static 
 // DEBUG //
 S32 gCurlEasyCount = 0;
 S32 gCurlMultiCount = 0;
@@ -85,12 +86,9 @@ S32 gCurlMultiCount = 0;
 std::vector<LLMutex*> LLCurl::sSSLMutex;
 std::string LLCurl::sCAPath;
 std::string LLCurl::sCAFile;
-LLCurlThread* LLCurl::sCurlThread = NULL ;
-LLMutex* LLCurl::sHandleMutexp = NULL ;
-S32      LLCurl::sTotalHandles = 0 ;
-bool     LLCurl::sNotQuitting = true;
-F32      LLCurl::sCurlRequestTimeOut = 120.f; //seonds
-S32      LLCurl::sMaxHandles = 256; //max number of handles, (multi handles and easy handles combined).
+
+bool LLCurl::sMultiThreaded = false;
+static U32 sMainThreadID = 0;
 
 void check_curl_code(CURLcode code)
 {
@@ -179,7 +177,6 @@ void LLCurl::Responder::completedRaw(
 	{
 		llinfos << "Failed to deserialize LLSD. " << mURL << " [" << status << "]: " << reason << llendl;
 	}
-
 	completed(status, reason, content);
 }
 
@@ -202,8 +199,8 @@ void LLCurl::Responder::completedHeader(U32 status, const std::string& reason, c
 
 }
 
-//namespace boost
-//{
+namespace boost
+{
 	void intrusive_ptr_add_ref(LLCurl::Responder* p)
 	{
 		++p->mReferenceCount;
@@ -211,32 +208,29 @@ void LLCurl::Responder::completedHeader(U32 status, const std::string& reason, c
 	
 	void intrusive_ptr_release(LLCurl::Responder* p)
 	{
-		if (p && 0 == --p->mReferenceCount)
+		if(p && 0 == --p->mReferenceCount)
 		{
 			delete p;
 		}
 	}
-//};
+};
 
 
 //////////////////////////////////////////////////////////////////////////////
 
 std::set<CURL*> LLCurl::Easy::sFreeHandles;
 std::set<CURL*> LLCurl::Easy::sActiveHandles;
-LLMutex* LLCurl::Easy::sHandleMutexp = NULL ;
+LLMutex* LLCurl::Easy::sHandleMutex = NULL;
+LLMutex* LLCurl::Easy::sMultiMutex = NULL;
 
 //static
 CURL* LLCurl::Easy::allocEasyHandle()
 {
-	llassert(LLCurl::getCurlThread()) ;
-
 	CURL* ret = NULL;
-
-	LLMutexLock lock(sHandleMutexp) ;
-
+	LLMutexLock lock(sHandleMutex);
 	if (sFreeHandles.empty())
 	{
-		ret = LLCurl::newEasyHandle();
+		ret = curl_easy_init();
 	}
 	else
 	{
@@ -256,29 +250,19 @@ CURL* LLCurl::Easy::allocEasyHandle()
 //static
 void LLCurl::Easy::releaseEasyHandle(CURL* handle)
 {
-	static const S32 MAX_NUM_FREE_HANDLES = 32 ;
-
 	if (!handle)
 	{
-		return ; //handle allocation failed.
-		//llerrs << "handle cannot be NULL!" << llendl;
+		llerrs << "handle cannot be NULL!" << llendl;
 	}
 
-	LLMutexLock lock(sHandleMutexp) ;
+	LLMutexLock lock(sHandleMutex);
+	
 	if (sActiveHandles.find(handle) != sActiveHandles.end())
 	{
 		sActiveHandles.erase(handle);
-
-		if(sFreeHandles.size() < MAX_NUM_FREE_HANDLES)
-		{
 		sFreeHandles.insert(handle);
 	}
 	else
-	{
-			LLCurl::deleteEasyHandle(handle) ;
-		}
-	}
-	else
 	{
 		llerrs << "Invalid handle." << llendl;
 	}
@@ -308,7 +292,7 @@ LLCurl::Easy* LLCurl::Easy::getEasy()
 	// multi handles cache if they are added to one.
 	CURLcode result = curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_DNS_CACHE_TIMEOUT, 0);
 	check_curl_code(result);
-	
+
 	// Disable SSL/TLS session caching. Some servers refuse to talk to us when session ids are enabled.
 	// id.secondlife.com is such a server, when greeted with a SSL HELLO and a session id, it immediatly returns a RST packet and closes
 	// the connections.
@@ -316,7 +300,6 @@ LLCurl::Easy* LLCurl::Easy::getEasy()
 	result = curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_SSL_SESSIONID_CACHE, 0);
 	check_curl_code(result);
 
-
 	++gCurlEasyCount;
 	return easy;
 }
@@ -327,14 +310,6 @@ LLCurl::Easy::~Easy()
 	--gCurlEasyCount;
 	curl_slist_free_all(mHeaders);
 	for_each(mStrings.begin(), mStrings.end(), DeletePointerArray());
-
-	if (mResponder && LLCurl::sNotQuitting) //aborted
-	{	
-		std::string reason("Request timeout, aborted.") ;
-		mResponder->completedRaw(408, //HTTP_REQUEST_TIME_OUT, timeout, abort
-			reason, mChannels, mOutput);		
-	}
-	mResponder = NULL;
 }
 
 void LLCurl::Easy::resetState()
@@ -373,11 +348,11 @@ const char* LLCurl::Easy::getErrorBuffer()
 
 void LLCurl::Easy::setCA()
 {
-	if (!sCAPath.empty())
+	if(!sCAPath.empty())
 	{
 		setoptString(CURLOPT_CAPATH, sCAPath);
 	}
-	if (!sCAFile.empty())
+	if(!sCAFile.empty())
 	{
 		setoptString(CURLOPT_CAINFO, sCAFile);
 	}
@@ -403,7 +378,7 @@ U32 LLCurl::Easy::report(CURLcode code)
 	if (code == CURLE_OK)
 	{
 		check_curl_code(curl_easy_getinfo(mCurlEasyHandle, CURLINFO_RESPONSE_CODE, &responseCode));
-		//*TODO: get reason from first line of mHeaderOutput
+		// *TODO: get reason from first line of mHeaderOutput
 	}
 	else
 	{
@@ -411,7 +386,7 @@ U32 LLCurl::Easy::report(CURLcode code)
 		responseReason = strerror(code) + " : " + mErrorBuffer;
 		setopt(CURLOPT_FRESH_CONNECT, TRUE);
 	}
-
+		
 	if (mResponder)
 	{	
 		mResponder->completedRaw(responseCode, responseReason, mChannels, mOutput);
@@ -507,7 +482,6 @@ void LLCurl::Easy::prepRequest(const std::string& url,
 	LLProxy::getInstance()->applyProxySettings(this);
 
 	mOutput.reset(new LLBufferArray);
-	mOutput->setThreaded(true);
 	setopt(CURLOPT_WRITEFUNCTION, (void*)&curlWriteCallback);
 	setopt(CURLOPT_WRITEDATA, (void*)this);
 
@@ -516,9 +490,8 @@ void LLCurl::Easy::prepRequest(const std::string& url,
 	
 	setopt(CURLOPT_HEADERFUNCTION, (void*)&curlHeaderCallback);
 	setopt(CURLOPT_HEADERDATA, (void*)this);
-
 	// Allow up to five redirects
-	if (responder && responder->followRedir())
+	if(responder && responder->followRedir())
 	{
 		setopt(CURLOPT_FOLLOWLOCATION, 1);
 		setopt(CURLOPT_MAXREDIRS, MAX_REDIRECTS);
@@ -551,74 +524,54 @@ void LLCurl::Easy::prepRequest(const std::string& url,
 }
 
 ////////////////////////////////////////////////////////////////////////////
-LLCurl::Multi::Multi(F32 idle_time_out)
-	: mQueued(0),
+
+LLCurl::Multi::Multi()
+	: LLThread("Curl Multi"),
+	  mQueued(0),
 	  mErrorCount(0),
-	  mState(STATE_READY),
-	  mDead(FALSE),
-	  mValid(TRUE),
-	  mMutexp(NULL),
-	  mDeletionMutexp(NULL),
-	  mEasyMutexp(NULL)
+	  mPerformState(PERFORM_STATE_READY)
 {
-	mCurlMultiHandle = LLCurl::newMultiHandle();
+	mQuitting = false;
+
+	mThreaded = LLCurl::sMultiThreaded && LLThread::currentID() == sMainThreadID;
+	if (mThreaded)
+	{
+		mSignal = new LLCondition;
+	}
+	else
+	{
+		mSignal = NULL;
+	}
+
+	mCurlMultiHandle = curl_multi_init();
 	if (!mCurlMultiHandle)
 	{
 		llwarns << "curl_multi_init() returned NULL! Easy handles: " << gCurlEasyCount << " Multi handles: " << gCurlMultiCount << llendl;
-		mCurlMultiHandle = LLCurl::newMultiHandle();
+		mCurlMultiHandle = curl_multi_init();
 	}
 	
-	//llassert_always(mCurlMultiHandle);	
-
-	if(mCurlMultiHandle)
-	{
-	if(LLCurl::getCurlThread()->getThreaded())
-	{
-		mMutexp = new LLMutex() ;
-		mDeletionMutexp = new LLMutex() ;
-		mEasyMutexp = new LLMutex() ;
-	}
-	LLCurl::getCurlThread()->addMulti(this) ;
-
-		mIdleTimeOut = idle_time_out ;
-		if(mIdleTimeOut < LLCurl::sCurlRequestTimeOut)
-		{
-			mIdleTimeOut = LLCurl::sCurlRequestTimeOut ;
-		}
-
+	llassert_always(mCurlMultiHandle);
 	++gCurlMultiCount;
 }
-}
 
 LLCurl::Multi::~Multi()
 {
-	cleanup(true) ;	
-	
-	delete mDeletionMutexp ;
-	mDeletionMutexp = NULL ;	
-}
+	llassert(isStopped());
 
-void LLCurl::Multi::cleanup(bool deleted)
-{
-	if(!mCurlMultiHandle)
+	if (LLCurl::sMultiThreaded)
 	{
-		return ; //nothing to clean.
+		LLCurl::Easy::sMultiMutex->lock();
 	}
-	llassert_always(deleted || !mValid) ;
 
-	LLMutexLock lock(mDeletionMutexp);
-	
+	delete mSignal;
+	mSignal = NULL;
+
 	// Clean up active
 	for(easy_active_list_t::iterator iter = mEasyActiveList.begin();
 		iter != mEasyActiveList.end(); ++iter)
 	{
 		Easy* easy = *iter;
 		check_curl_multi_code(curl_multi_remove_handle(mCurlMultiHandle, easy->getCurlHandle()));
-
-		if(deleted)
-		{
-			easy->mResponder = NULL ; //avoid triggering mResponder.
-		}
 		delete easy;
 	}
 	mEasyActiveList.clear();
@@ -628,169 +581,84 @@ void LLCurl::Multi::cleanup(bool deleted)
 	for_each(mEasyFreeList.begin(), mEasyFreeList.end(), DeletePointer());	
 	mEasyFreeList.clear();
 
-	check_curl_multi_code(LLCurl::deleteMultiHandle(mCurlMultiHandle));
-	mCurlMultiHandle = NULL ;
-	
-	delete mMutexp ;
-	mMutexp = NULL ;
-	delete mEasyMutexp ;
-	mEasyMutexp = NULL ;
-
-	mQueued = 0 ;
-	mState = STATE_COMPLETED;
-	
+	check_curl_multi_code(curl_multi_cleanup(mCurlMultiHandle));
 	--gCurlMultiCount;
 
-	return ;
-}
-
-void LLCurl::Multi::lock()
-{
-	if(mMutexp)
+	if (LLCurl::sMultiThreaded)
 	{
-		mMutexp->lock() ;
+		LLCurl::Easy::sMultiMutex->unlock();
 	}
 }
 
-void LLCurl::Multi::unlock()
-{
-	if(mMutexp)
-	{
-		mMutexp->unlock() ;
-	}
-}
-
-void LLCurl::Multi::markDead()
-{
-	{
-		LLMutexLock lock(mDeletionMutexp) ;
-	
-		if(mCurlMultiHandle != NULL)
-		{
-			mDead = TRUE ;
-			LLCurl::getCurlThread()->setPriority(mHandle, LLQueuedThread::PRIORITY_URGENT) ; 
-
-			return;
-		}
-	}
-	
-	//not valid, delete it.
-	delete this;	
-}
-
-void LLCurl::Multi::setState(LLCurl::Multi::ePerformState state)
-{
-	lock() ;
-	mState = state ;
-	unlock() ;
-
-	if(mState == STATE_READY)
-	{
-		LLCurl::getCurlThread()->setPriority(mHandle, LLQueuedThread::PRIORITY_NORMAL) ;
-	}	
-}
-
-LLCurl::Multi::ePerformState LLCurl::Multi::getState()
-{
-	return mState;
-}
-	
-bool LLCurl::Multi::isCompleted() 
-{
-	return STATE_COMPLETED == getState() ;
-}
-
-bool LLCurl::Multi::waitToComplete()
-{
-	if(!isValid())
-	{
-		return true ;
-	}
-
-	if(!mMutexp) //not threaded
-	{
-		doPerform() ;
-		return true ;
-	}
-
-	bool completed = (STATE_COMPLETED == mState) ;
-	if(!completed)
-	{
-		LLCurl::getCurlThread()->setPriority(mHandle, LLQueuedThread::PRIORITY_HIGH) ;
-	}
-	
-	return completed;
-}
-
 CURLMsg* LLCurl::Multi::info_read(S32* msgs_in_queue)
 {
-	LLMutexLock lock(mMutexp) ;
-
 	CURLMsg* curlmsg = curl_multi_info_read(mCurlMultiHandle, msgs_in_queue);
 	return curlmsg;
 }
 
-//return true if dead
-bool LLCurl::Multi::doPerform()
+void LLCurl::Multi::perform()
 {
-	LLMutexLock lock(mDeletionMutexp) ;
-	
-	bool dead = mDead ;
-
-	if(mDead)
+	if (mThreaded)
 	{
-		setState(STATE_COMPLETED);
-		mQueued = 0 ;
-	}
-	else if(getState() != STATE_COMPLETED)
-	{		
-		setState(STATE_PERFORMING);
-
-		S32 q = 0;
-		for (S32 call_count = 0;
-				call_count < MULTI_PERFORM_CALL_REPEAT;
-				call_count++)
+		mSignal->lock();
+		if (mPerformState == PERFORM_STATE_READY)
 		{
-			LLMutexLock lock(mMutexp) ;
-
-			//WARNING: curl_multi_perform will block for many hundreds of milliseconds
-			// NEVER call this from the main thread, and NEVER allow the main thread to 
-			// wait on a mutex held by this thread while curl_multi_perform is executing
-			CURLMcode code = curl_multi_perform(mCurlMultiHandle, &q);
-			if (CURLM_CALL_MULTI_PERFORM != code || q == 0)
-			{
-				check_curl_multi_code(code);
-			
-				break;
-			}
+			mSignal->signal();
 		}
-
-		mQueued = q;	
-		setState(STATE_COMPLETED) ;
-		mIdleTimer.reset() ;
+		mSignal->unlock();
 	}
-	else if(!mValid && mIdleTimer.getElapsedTimeF32() > mIdleTimeOut) //idle for too long, remove it.
+	else
 	{
-		dead = true ;
-	}
-	else if(mValid && mIdleTimer.getElapsedTimeF32() > mIdleTimeOut - 1.f) //idle for too long, mark it invalid.
-	{
-		mValid = FALSE ;
-	}
+		doPerform();
+	}	
+}
 
-	return dead ;
+void LLCurl::Multi::run()
+{
+	llassert(mThreaded);
+	
+	mSignal->lock();
+	while (!mQuitting)
+	{
+		mSignal->wait();
+		mPerformState = PERFORM_STATE_PERFORMING;
+		if (!mQuitting)
+		{
+			LLMutexLock lock(LLCurl::Easy::sMultiMutex);
+			doPerform();
+		}
+	}
+	mSignal->unlock();
+}
+
+void LLCurl::Multi::doPerform()
+{
+	S32 q = 0;
+	if (mThreaded)
+		mSignal->unlock();
+	for (S32 call_count = 0;
+			call_count < MULTI_PERFORM_CALL_REPEAT;
+			call_count += 1)
+	{
+		CURLMcode code = curl_multi_perform(mCurlMultiHandle, &q);
+		if (CURLM_CALL_MULTI_PERFORM != code || q == 0)
+		{
+			check_curl_multi_code(code);
+			break;
+		}
+	
+	}
+	if (mThreaded)
+		mSignal->lock();
+	mQueued = q;
+	mPerformState = PERFORM_STATE_COMPLETED;
 }
 
 S32 LLCurl::Multi::process()
 {
-	if(!isValid())
-	{
-		return 0 ;
-	}
+	perform();
 
-	waitToComplete() ;
-
-	if (getState() != STATE_COMPLETED)
+	if (mPerformState != PERFORM_STATE_COMPLETED)
 	{
 		return 0;
 	}
@@ -805,26 +673,17 @@ S32 LLCurl::Multi::process()
 		if (msg->msg == CURLMSG_DONE)
 		{
 			U32 response = 0;
-			Easy* easy = NULL ;
-
-			{
-				LLMutexLock lock(mEasyMutexp) ;
-				easy_active_map_t::iterator iter = mEasyActiveMap.find(msg->easy_handle);
-				if (iter != mEasyActiveMap.end())
-				{
-					easy = iter->second;
-				}
-			}
-
-			if(easy)
+			easy_active_map_t::iterator iter = mEasyActiveMap.find(msg->easy_handle);
+			if (iter != mEasyActiveMap.end())
 			{
+				Easy* easy = iter->second;
 				response = easy->report(msg->data.result);
 				removeEasy(easy);
 			}
 			else
 			{
 				response = 499;
-				//*TODO: change to llwarns
+				// *TODO: change to llwarns
 				llerrs << "cleaned up curl request completed!" << llendl;
 			}
 			if (response >= 400)
@@ -835,28 +694,25 @@ S32 LLCurl::Multi::process()
 		}
 	}
 
-	setState(STATE_READY);
-
+	mPerformState = PERFORM_STATE_READY;
 	return processed;
 }
 
 LLCurl::Easy* LLCurl::Multi::allocEasy()
 {
-	Easy* easy = 0;	
+	Easy* easy = 0;
 
 	if (mEasyFreeList.empty())
-	{		
+	{
 		easy = Easy::getEasy();
 	}
 	else
 	{
-		LLMutexLock lock(mEasyMutexp) ;
 		easy = *(mEasyFreeList.begin());
 		mEasyFreeList.erase(easy);
 	}
 	if (easy)
 	{
-		LLMutexLock lock(mEasyMutexp) ;
 		mEasyActiveList.insert(easy);
 		mEasyActiveMap[easy->getCurlHandle()] = easy;
 	}
@@ -865,7 +721,6 @@ LLCurl::Easy* LLCurl::Multi::allocEasy()
 
 bool LLCurl::Multi::addEasy(Easy* easy)
 {
-	LLMutexLock lock(mMutexp) ;
 	CURLMcode mcode = curl_multi_add_handle(mCurlMultiHandle, easy->getCurlHandle());
 	check_curl_multi_code(mcode);
 	//if (mcode != CURLM_OK)
@@ -878,153 +733,25 @@ bool LLCurl::Multi::addEasy(Easy* easy)
 
 void LLCurl::Multi::easyFree(Easy* easy)
 {
-	if(mEasyMutexp)
-	{
-		mEasyMutexp->lock() ;
-	}
-
 	mEasyActiveList.erase(easy);
 	mEasyActiveMap.erase(easy->getCurlHandle());
-
 	if (mEasyFreeList.size() < EASY_HANDLE_POOL_SIZE)
-	{		
-		mEasyFreeList.insert(easy);
-		
-		if(mEasyMutexp)
-		{
-			mEasyMutexp->unlock() ;
-		}
-
+	{
 		easy->resetState();
+		mEasyFreeList.insert(easy);
 	}
 	else
 	{
-		if(mEasyMutexp)
-		{
-			mEasyMutexp->unlock() ;
-		}
 		delete easy;
 	}
 }
 
 void LLCurl::Multi::removeEasy(Easy* easy)
 {
-	{
-		LLMutexLock lock(mMutexp) ;
-		check_curl_multi_code(curl_multi_remove_handle(mCurlMultiHandle, easy->getCurlHandle()));
-	}
+	check_curl_multi_code(curl_multi_remove_handle(mCurlMultiHandle, easy->getCurlHandle()));
 	easyFree(easy);
 }
 
-//------------------------------------------------------------
-//LLCurlThread
-LLCurlThread::CurlRequest::CurlRequest(handle_t handle, LLCurl::Multi* multi, LLCurlThread* curl_thread) :
-	LLQueuedThread::QueuedRequest(handle, LLQueuedThread::PRIORITY_NORMAL, FLAG_AUTO_COMPLETE),
-	mMulti(multi),
-	mCurlThread(curl_thread)
-{	
-}
-
-LLCurlThread::CurlRequest::~CurlRequest()
-{	
-	if(mMulti)
-	{
-		mCurlThread->deleteMulti(mMulti) ;
-		mMulti = NULL ;
-	}
-}
-
-bool LLCurlThread::CurlRequest::processRequest()
-{
-	bool completed = true ;
-	if(mMulti)
-	{
-		completed = mCurlThread->doMultiPerform(mMulti) ;
-
-		if(!completed)
-		{
-		setPriority(LLQueuedThread::PRIORITY_LOW) ;
-	}
-	}
-
-	return completed ;
-}
-
-void LLCurlThread::CurlRequest::finishRequest(bool completed)
-{
-	if(mMulti->isDead())
-	{
-	mCurlThread->deleteMulti(mMulti) ;
-	}
-	else
-	{
-		mCurlThread->cleanupMulti(mMulti) ; //being idle too long, remove the request.
-	}
-
-	mMulti = NULL ;
-}
-	
-LLCurlThread::LLCurlThread(bool threaded) :
-	LLQueuedThread("curlthread", threaded)
-{
-}
-	
-//virtual 
-LLCurlThread::~LLCurlThread() 
-{
-}
-
-S32 LLCurlThread::update(F32 max_time_ms)
-{	
-	return LLQueuedThread::update(max_time_ms);
-}
-
-void LLCurlThread::addMulti(LLCurl::Multi* multi)
-{
-	multi->mHandle = generateHandle() ;
-
-	CurlRequest* req = new CurlRequest(multi->mHandle, multi, this) ;
-
-	if (!addRequest(req))
-	{
-		llwarns << "curl request added when the thread is quitted" << llendl;
-	}
-}
-	
-void LLCurlThread::killMulti(LLCurl::Multi* multi)
-{
-	if(!multi)
-	{
-		return ;
-	}
-
-	multi->markDead() ;
-}
-
-//private
-bool LLCurlThread::doMultiPerform(LLCurl::Multi* multi) 
-{
-	return multi->doPerform() ;
-}
-
-//private
-void LLCurlThread::deleteMulti(LLCurl::Multi* multi) 
-{
-	delete multi ;
-}
-
-//private
-void LLCurlThread::cleanupMulti(LLCurl::Multi* multi) 
-{
-	multi->cleanup() ;
-	if(multi->isDead()) //check if marked dead during cleaning up.
-	{
-		deleteMulti(multi) ;
-	}
-}
-
-//------------------------------------------------------------
-
 //static
 std::string LLCurl::strerror(CURLcode errorcode)
 {
@@ -1039,30 +766,45 @@ LLCurlRequest::LLCurlRequest() :
 	mActiveMulti(NULL),
 	mActiveRequestCount(0)
 {
+	mThreadID = LLThread::currentID();
 	mProcessing = FALSE;
 }
 
 LLCurlRequest::~LLCurlRequest()
 {
+	llassert_always(mThreadID == LLThread::currentID());
+
 	//stop all Multi handle background threads
 	for (curlmulti_set_t::iterator iter = mMultiSet.begin(); iter != mMultiSet.end(); ++iter)
 	{
-		LLCurl::getCurlThread()->killMulti(*iter) ;
+		LLCurl::Multi* multi = *iter;
+		if (multi->mThreaded)
+			multi->mSignal->lock();
+		multi->mQuitting = true;
+		if (multi->mThreaded)
+		{
+			while (!multi->isStopped())
+			{
+				multi->mSignal->signal();
+				multi->mSignal->unlock();
+				apr_sleep(1000);
+				multi->mSignal->lock();
+			}
+		}
+		if (multi->mThreaded)
+			multi->mSignal->unlock();
 	}
-	mMultiSet.clear() ;
+	for_each(mMultiSet.begin(), mMultiSet.end(), DeletePointer());
 }
 
 void LLCurlRequest::addMulti()
 {
+	llassert_always(mThreadID == LLThread::currentID());
 	LLCurl::Multi* multi = new LLCurl::Multi();
-	if(!multi->isValid())
+	if (multi->mThreaded)
 	{
-		LLCurl::getCurlThread()->killMulti(multi) ;
-		mActiveMulti = NULL ;
-		mActiveRequestCount = 0 ;
-		return;
+		multi->start();
 	}
-	
 	mMultiSet.insert(multi);
 	mActiveMulti = multi;
 	mActiveRequestCount = 0;
@@ -1076,12 +818,7 @@ LLCurl::Easy* LLCurlRequest::allocEasy()
 	{
 		addMulti();
 	}
-	if(!mActiveMulti)
-	{
-		return NULL ;
-	}
-
-	//llassert_always(mActiveMulti);
+	llassert_always(mActiveMulti);
 	++mActiveRequestCount;
 	LLCurl::Easy* easy = mActiveMulti->allocEasy();
 	return easy;
@@ -1183,6 +920,7 @@ bool LLCurlRequest::post(const std::string& url,
 // Note: call once per frame
 S32 LLCurlRequest::process()
 {
+	llassert_always(mThreadID == LLThread::currentID());
 	S32 res = 0;
 
 	mProcessing = TRUE;
@@ -1191,25 +929,28 @@ S32 LLCurlRequest::process()
 	{
 		curlmulti_set_t::iterator curiter = iter++;
 		LLCurl::Multi* multi = *curiter;
-
-		if(!multi->isValid())
-		{
-			if(multi == mActiveMulti)
-			{				
-				mActiveMulti = NULL ;
-				mActiveRequestCount = 0 ;
-			}
-			mMultiSet.erase(curiter) ;
-			LLCurl::getCurlThread()->killMulti(multi) ;
-			continue ;
-		}
-
 		S32 tres = multi->process();
 		res += tres;
 		if (multi != mActiveMulti && tres == 0 && multi->mQueued == 0)
 		{
 			mMultiSet.erase(curiter);
-			LLCurl::getCurlThread()->killMulti(multi);
+			if (multi->mThreaded)
+				multi->mSignal->lock();
+			multi->mQuitting = true;
+			if (multi->mThreaded)
+			{
+				while (!multi->isStopped())
+				{
+					multi->mSignal->signal();
+					multi->mSignal->unlock();
+					apr_sleep(1000);
+					multi->mSignal->unlock();
+				}
+			}
+			if (multi->mThreaded)
+				multi->mSignal->unlock();
+
+			delete multi;
 		}
 	}
 	mProcessing = FALSE;
@@ -1218,27 +959,15 @@ S32 LLCurlRequest::process()
 
 S32 LLCurlRequest::getQueued()
 {
+	llassert_always(mThreadID == LLThread::currentID());
 	S32 queued = 0;
 	for (curlmulti_set_t::iterator iter = mMultiSet.begin();
 		 iter != mMultiSet.end(); )
 	{
 		curlmulti_set_t::iterator curiter = iter++;
 		LLCurl::Multi* multi = *curiter;
-		
-		if(!multi->isValid())
-		{
-			if(multi == mActiveMulti)
-			{				
-				mActiveMulti = NULL ;
-				mActiveRequestCount = 0 ;
-			}
-			LLCurl::getCurlThread()->killMulti(multi);
-			mMultiSet.erase(curiter) ;
-			continue ;
-		}
-
 		queued += multi->mQueued;
-		if (multi->getState() != LLCurl::Multi::STATE_READY)
+		if (multi->mPerformState != LLCurl::Multi::PERFORM_STATE_READY)
 		{
 			++queued;
 		}
@@ -1255,34 +984,41 @@ LLCurlEasyRequest::LLCurlEasyRequest()
 	  mResultReturned(false)
 {
 	mMulti = new LLCurl::Multi();
-	
-	if(mMulti->isValid())
+	if (mMulti->mThreaded)
 	{
+		mMulti->start();
+	}
 	mEasy = mMulti->allocEasy();
 	if (mEasy)
 	{
 		mEasy->setErrorBuffer();
 		mEasy->setCA();
-		// Set proxy settings if configured to do so.
-		LLProxy::getInstance()->applyProxySettings(mEasy);
-	}
-}
-	else
-	{
-		LLCurl::getCurlThread()->killMulti(mMulti) ;
-		mEasy = NULL ;
-		mMulti = NULL ;
 	}
 }
 
 LLCurlEasyRequest::~LLCurlEasyRequest()
 {
-	LLCurl::getCurlThread()->killMulti(mMulti) ;
+	if (mMulti->mThreaded)
+		mMulti->mSignal->lock();
+	mMulti->mQuitting = true;
+	if (mMulti->mThreaded)
+	{
+		while (!mMulti->isStopped())
+		{
+			mMulti->mSignal->signal();
+			mMulti->mSignal->unlock();
+			apr_sleep(1000);
+			mMulti->mSignal->lock();
+		}
+	}
+	if (mMulti->mThreaded)
+		mMulti->mSignal->unlock();
+	delete mMulti;
 }
 	
 void LLCurlEasyRequest::setopt(CURLoption option, S32 value)
 {
-	if (isValid() && mEasy)
+	if (mEasy)
 	{
 		mEasy->setopt(option, value);
 	}
@@ -1290,7 +1026,7 @@ void LLCurlEasyRequest::setopt(CURLoption option, S32 value)
 
 void LLCurlEasyRequest::setoptString(CURLoption option, const std::string& value)
 {
-	if (isValid() && mEasy)
+	if (mEasy)
 	{
 		mEasy->setoptString(option, value);
 	}
@@ -1298,7 +1034,7 @@ void LLCurlEasyRequest::setoptString(CURLoption option, const std::string& value
 
 void LLCurlEasyRequest::setPost(char* postdata, S32 size)
 {
-	if (isValid() && mEasy)
+	if (mEasy)
 	{
 		mEasy->setopt(CURLOPT_POST, 1);
 		mEasy->setopt(CURLOPT_POSTFIELDS, postdata);
@@ -1308,7 +1044,7 @@ void LLCurlEasyRequest::setPost(char* postdata, S32 size)
 
 void LLCurlEasyRequest::setHeaderCallback(curl_header_callback callback, void* userdata)
 {
-	if (isValid() && mEasy)
+	if (mEasy)
 	{
 		mEasy->setopt(CURLOPT_HEADERFUNCTION, (void*)callback);
 		mEasy->setopt(CURLOPT_HEADERDATA, userdata); // aka CURLOPT_WRITEHEADER
@@ -1317,7 +1053,7 @@ void LLCurlEasyRequest::setHeaderCallback(curl_header_callback callback, void* u
 
 void LLCurlEasyRequest::setWriteCallback(curl_write_callback callback, void* userdata)
 {
-	if (isValid() && mEasy)
+	if (mEasy)
 	{
 		mEasy->setopt(CURLOPT_WRITEFUNCTION, (void*)callback);
 		mEasy->setopt(CURLOPT_WRITEDATA, userdata);
@@ -1326,7 +1062,7 @@ void LLCurlEasyRequest::setWriteCallback(curl_write_callback callback, void* use
 
 void LLCurlEasyRequest::setReadCallback(curl_read_callback callback, void* userdata)
 {
-	if (isValid() && mEasy)
+	if (mEasy)
 	{
 		mEasy->setopt(CURLOPT_READFUNCTION, (void*)callback);
 		mEasy->setopt(CURLOPT_READDATA, userdata);
@@ -1335,7 +1071,7 @@ void LLCurlEasyRequest::setReadCallback(curl_read_callback callback, void* userd
 
 void LLCurlEasyRequest::setSSLCtxCallback(curl_ssl_ctx_callback callback, void* userdata)
 {
-	if (isValid() && mEasy)
+	if (mEasy)
 	{
 		mEasy->setopt(CURLOPT_SSL_CTX_FUNCTION, (void*)callback);
 		mEasy->setopt(CURLOPT_SSL_CTX_DATA, userdata);
@@ -1344,7 +1080,7 @@ void LLCurlEasyRequest::setSSLCtxCallback(curl_ssl_ctx_callback callback, void*
 
 void LLCurlEasyRequest::slist_append(const char* str)
 {
-	if (isValid() && mEasy)
+	if (mEasy)
 	{
 		mEasy->slist_append(str);
 	}
@@ -1355,7 +1091,7 @@ void LLCurlEasyRequest::sendRequest(const std::string& url)
 	llassert_always(!mRequestSent);
 	mRequestSent = true;
 	lldebugs << url << llendl;
-	if (isValid() && mEasy)
+	if (mEasy)
 	{
 		mEasy->setHeaders();
 		mEasy->setoptString(CURLOPT_URL, url);
@@ -1367,24 +1103,25 @@ void LLCurlEasyRequest::requestComplete()
 {
 	llassert_always(mRequestSent);
 	mRequestSent = false;
-	if (isValid() && mEasy)
+	if (mEasy)
 	{
 		mMulti->removeEasy(mEasy);
 	}
 }
 
+void LLCurlEasyRequest::perform()
+{
+	mMulti->perform();
+}
+
 // Usage: Call getRestult until it returns false (no more messages)
 bool LLCurlEasyRequest::getResult(CURLcode* result, LLCurl::TransferInfo* info)
 {
-	if(!isValid())
-	{
-		return false ;
-	}
-	if (!mMulti->isCompleted())
+	if (mMulti->mPerformState != LLCurl::Multi::PERFORM_STATE_COMPLETED)
 	{ //we're busy, try again later
 		return false;
 	}
-	mMulti->setState(LLCurl::Multi::STATE_READY) ;
+	mMulti->mPerformState = LLCurl::Multi::PERFORM_STATE_READY;
 
 	if (!mEasy)
 	{
@@ -1444,7 +1181,7 @@ CURLMsg* LLCurlEasyRequest::info_read(S32* q, LLCurl::TransferInfo* info)
 
 std::string LLCurlEasyRequest::getErrorString()
 {
-	return isValid() &&  mEasy ? std::string(mEasy->getErrorBuffer()) : std::string();
+	return mEasy ? std::string(mEasy->getErrorBuffer()) : std::string();
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -1470,11 +1207,10 @@ unsigned long LLCurl::ssl_thread_id(void)
 }
 #endif
 
-void LLCurl::initClass(F32 curl_reuest_timeout, S32 max_number_handles, bool multi_threaded)
+void LLCurl::initClass(bool multi_threaded)
 {
-	sCurlRequestTimeOut = curl_reuest_timeout ; //seconds
-	sMaxHandles = max_number_handles ; //max number of handles, (multi handles and easy handles combined).
-
+	sMainThreadID = LLThread::currentID();
+	sMultiThreaded = multi_threaded;
 	// Do not change this "unless you are familiar with and mean to control 
 	// internal operations of libcurl"
 	// - http://curl.haxx.se/libcurl/c/curl_global_init.html
@@ -1482,126 +1218,41 @@ void LLCurl::initClass(F32 curl_reuest_timeout, S32 max_number_handles, bool mul
 
 	check_curl_code(code);
 	
+	Easy::sHandleMutex = new LLMutex;
+	Easy::sMultiMutex = new LLMutex;
+
 #if SAFE_SSL
 	S32 mutex_count = CRYPTO_num_locks();
 	for (S32 i=0; i<mutex_count; i++)
 	{
-		sSSLMutex.push_back(new LLMutex());
+		sSSLMutex.push_back(new LLMutex);
 	}
 	CRYPTO_set_id_callback(&LLCurl::ssl_thread_id);
 	CRYPTO_set_locking_callback(&LLCurl::ssl_locking_callback);
 #endif
-
-	sCurlThread = new LLCurlThread(multi_threaded) ;
-	if(multi_threaded)
-	{
-		sHandleMutexp = new LLMutex() ;
-		Easy::sHandleMutexp = new LLMutex() ;
-	}
 }
 
 void LLCurl::cleanupClass()
 {
-	sNotQuitting = false; //set quitting
-
-	//shut down curl thread
-	while(1)
-	{
-		if(!sCurlThread->update(1)) //finish all tasks
-		{
-			break ;
-		}
-	}
-	sCurlThread->shutdown() ;
-	delete sCurlThread ;
-	sCurlThread = NULL ;
-
 #if SAFE_SSL
 	CRYPTO_set_locking_callback(NULL);
 	for_each(sSSLMutex.begin(), sSSLMutex.end(), DeletePointer());
 #endif
 
+	delete Easy::sHandleMutex;
+	Easy::sHandleMutex = NULL;
+	delete Easy::sMultiMutex;
+	Easy::sMultiMutex = NULL;
+
 	for (std::set<CURL*>::iterator iter = Easy::sFreeHandles.begin(); iter != Easy::sFreeHandles.end(); ++iter)
 	{
 		CURL* curl = *iter;
-		LLCurl::deleteEasyHandle(curl);
+		curl_easy_cleanup(curl);
 	}
 
 	Easy::sFreeHandles.clear();
 
-	delete Easy::sHandleMutexp ;
-	Easy::sHandleMutexp = NULL ;
-
-	delete sHandleMutexp ;
-	sHandleMutexp = NULL ;
-
-	// removed as per https://jira.secondlife.com/browse/SH-3115
-	//llassert(Easy::sActiveHandles.empty());
-}
-
-//static 
-CURLM* LLCurl::newMultiHandle()
-{
-	LLMutexLock lock(sHandleMutexp) ;
-
-	if(sTotalHandles + 1 > sMaxHandles)
-	{
-		llwarns << "no more handles available." << llendl ;
-		return NULL ; //failed
-	}
-	sTotalHandles++;
-
-	CURLM* ret = curl_multi_init() ;
-	if(!ret)
-	{
-		llwarns << "curl_multi_init failed." << llendl ;
-	}
-
-	return ret ;
-}
-
-//static 
-CURLMcode  LLCurl::deleteMultiHandle(CURLM* handle)
-{
-	if(handle)
-	{
-		LLMutexLock lock(sHandleMutexp) ;		
-		sTotalHandles-- ;
-		return curl_multi_cleanup(handle) ;
-	}
-	return CURLM_OK ;
-}
-
-//static 
-CURL*  LLCurl::newEasyHandle()
-{
-	LLMutexLock lock(sHandleMutexp) ;
-
-	if(sTotalHandles + 1 > sMaxHandles)
-	{
-		llwarns << "no more handles available." << llendl ;
-		return NULL ; //failed
-	}
-	sTotalHandles++;
-
-	CURL* ret = curl_easy_init() ;
-	if(!ret)
-	{
-		llwarns << "curl_easy_init failed." << llendl ;
-	}
-
-	return ret ;
-}
-
-//static 
-void  LLCurl::deleteEasyHandle(CURL* handle)
-{
-	if(handle)
-	{
-		LLMutexLock lock(sHandleMutexp) ;
-		curl_easy_cleanup(handle) ;
-		sTotalHandles-- ;
-	}
+	llassert(Easy::sActiveHandles.empty());
 }
 
 const unsigned int LLCurl::MAX_REDIRECTS = 5;
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h
index 42ab93e58..76ef595e9 100644
--- a/indra/llmessage/llcurl.h
+++ b/indra/llmessage/llcurl.h
@@ -42,11 +42,8 @@
 #include "lliopipe.h"
 #include "llsd.h"
 #include "llthread.h"
-#include "llqueuedthread.h"
-#include "llframetimer.h"
 
 class LLMutex;
-class LLCurlThread;
 
 // For whatever reason, this is not typedef'd in curl.h
 typedef size_t (*curl_header_callback)(void *ptr, size_t size, size_t nmemb, void *stream);
@@ -59,6 +56,8 @@ public:
 	class Easy;
 	class Multi;
 
+	static bool sMultiThreaded;
+
 	struct TransferInfo
 	{
 		TransferInfo() : mSizeDownload(0.0), mTotalTime(0.0), mSpeedDownload(0.0) {}
@@ -125,7 +124,6 @@ public:
 			{
 				return false;
 			}
-
 	public: /* but not really -- don't touch this */
 		U32 mReferenceCount;
 
@@ -163,7 +161,7 @@ public:
 	/**
 	 * @ brief Initialize LLCurl class
 	 */
-	static void initClass(F32 curl_reuest_timeout = 120.f, S32 max_number_handles = 256, bool multi_threaded = false);
+	static void initClass(bool multi_threaded = false);
 
 	/**
 	 * @ brief Cleanup LLCurl class
@@ -182,25 +180,10 @@ public:
 	static void ssl_locking_callback(int mode, int type, const char *file, int line);
 	static unsigned long ssl_thread_id(void);
 
-	static LLCurlThread* getCurlThread() { return sCurlThread ;}
-
-	static CURLM* newMultiHandle() ;
-	static CURLMcode deleteMultiHandle(CURLM* handle) ;
-	static CURL*  newEasyHandle() ;
-	static void   deleteEasyHandle(CURL* handle) ;
-
 private:
 	static std::string sCAPath;
 	static std::string sCAFile;
 	static const unsigned int MAX_REDIRECTS;
-	static LLCurlThread* sCurlThread;
-
-	static LLMutex* sHandleMutexp ;
-	static S32      sTotalHandles ;
-	static S32      sMaxHandles;
-public:
-	static bool     sNotQuitting;
-	static F32      sCurlRequestTimeOut;	
 };
 
 class LLCurl::Easy
@@ -209,7 +192,7 @@ class LLCurl::Easy
 
 private:
 	Easy();
-
+	
 public:
 	static Easy* getEasy();
 	~Easy();
@@ -218,41 +201,41 @@ public:
 
 	void setErrorBuffer();
 	void setCA();
-
+	
 	void setopt(CURLoption option, S32 value);
 	// These assume the setter does not free value!
 	void setopt(CURLoption option, void* value);
 	void setopt(CURLoption option, char* value);
-	// Copies the string so that it is guaranteed to stick around
+	// Copies the string so that it is gauranteed to stick around
 	void setoptString(CURLoption option, const std::string& value);
-
+	
 	void slist_append(const char* str);
 	void setHeaders();
-
+	
 	U32 report(CURLcode);
 	void getTransferInfo(LLCurl::TransferInfo* info);
 
-	void prepRequest(const std::string& url, const std::vector<std::string>& headers, LLCurl::ResponderPtr, S32 time_out = 0, bool post = false);
-
+	void prepRequest(const std::string& url, const std::vector<std::string>& headers, ResponderPtr, S32 time_out = 0, bool post = false);
+	
 	const char* getErrorBuffer();
 
 	std::stringstream& getInput() { return mInput; }
 	std::stringstream& getHeaderOutput() { return mHeaderOutput; }
 	LLIOPipe::buffer_ptr_t& getOutput() { return mOutput; }
 	const LLChannelDescriptors& getChannels() { return mChannels; }
-
+	
 	void resetState();
 
 	static CURL* allocEasyHandle();
 	static void releaseEasyHandle(CURL* handle);
 
-private:
+private:	
 	friend class LLCurl;
 	friend class LLCurl::Multi;
 
 	CURL*				mCurlEasyHandle;
 	struct curl_slist*	mHeaders;
-
+	
 	std::stringstream	mRequest;
 	LLChannelDescriptors mChannels;
 	LLIOPipe::buffer_ptr_t mOutput;
@@ -262,125 +245,70 @@ private:
 
 	// Note: char*'s not strings since we pass pointers to curl
 	std::vector<char*>	mStrings;
-
-	LLCurl::ResponderPtr		mResponder;
+	
+	ResponderPtr		mResponder;
 
 	static std::set<CURL*> sFreeHandles;
 	static std::set<CURL*> sActiveHandles;
-	static LLMutex*        sHandleMutexp ;
+	static LLMutex* sHandleMutex;
+	static LLMutex* sMultiMutex;
 };
 
-class LLCurl::Multi
+class LLCurl::Multi : public LLThread
 {
 	LOG_CLASS(Multi);
-
-	friend class LLCurlThread ;
-
-private:
-	~Multi();
-
-	void markDead() ;
-	bool doPerform();
-
 public:
 
 	typedef enum
 	{
-		STATE_READY=0,
-		STATE_PERFORMING=1,
-		STATE_COMPLETED=2
+		PERFORM_STATE_READY=0,
+		PERFORM_STATE_PERFORMING=1,
+		PERFORM_STATE_COMPLETED=2
 	} ePerformState;
 
-	Multi(F32 idle_time_out = 0.f);	
+	Multi();
+	~Multi();
 
-	LLCurl::Easy* allocEasy();
-	bool addEasy(LLCurl::Easy* easy);	
-	void removeEasy(LLCurl::Easy* easy);
+	Easy* allocEasy();
+	bool addEasy(Easy* easy);
 	
-	void lock() ;
-	void unlock() ;
-
-	void setState(ePerformState state) ;
-	ePerformState getState() ;
-	
-	bool isCompleted() ;
-	bool isValid() {return mCurlMultiHandle != NULL && mValid;}
-	bool isDead() {return mDead;}
-
-	bool waitToComplete() ;
+	void removeEasy(Easy* easy);
 
 	S32 process();
+	void perform();
+	void doPerform();
 	
+	virtual void run();
+
 	CURLMsg* info_read(S32* msgs_in_queue);
 
 	S32 mQueued;
 	S32 mErrorCount;
 	
+	S32 mPerformState;
+
+	LLCondition* mSignal;
+	bool mQuitting;
+	bool mThreaded;
+
 private:
-	void easyFree(LLCurl::Easy*);
-	void cleanup(bool deleted = false) ;
+	void easyFree(Easy*);
 	
 	CURLM* mCurlMultiHandle;
 
-	typedef std::set<LLCurl::Easy*> easy_active_list_t;
+	typedef std::set<Easy*> easy_active_list_t;
 	easy_active_list_t mEasyActiveList;
-	typedef std::map<CURL*, LLCurl::Easy*> easy_active_map_t;
+	typedef std::map<CURL*, Easy*> easy_active_map_t;
 	easy_active_map_t mEasyActiveMap;
-	typedef std::set<LLCurl::Easy*> easy_free_list_t;
+	typedef std::set<Easy*> easy_free_list_t;
 	easy_free_list_t mEasyFreeList;
-
-	LLQueuedThread::handle_t mHandle ;
-	ePerformState mState;
-
-	BOOL mDead ;
-	BOOL mValid ;
-	LLMutex* mMutexp ;
-	LLMutex* mDeletionMutexp ;
-	LLMutex* mEasyMutexp ;
-	LLFrameTimer mIdleTimer ;
-	F32 mIdleTimeOut;
 };
 
-class LLCurlThread : public LLQueuedThread
+namespace boost
 {
-public:
-
-	class CurlRequest : public LLQueuedThread::QueuedRequest
-	{
-	protected:
-		virtual ~CurlRequest(); // use deleteRequest()
-		
-	public:
-		CurlRequest(handle_t handle, LLCurl::Multi* multi, LLCurlThread* curl_thread);
-
-		/*virtual*/ bool processRequest();
-		/*virtual*/ void finishRequest(bool completed);
-
-	private:
-		// input
-		LLCurl::Multi* mMulti;
-		LLCurlThread*  mCurlThread;
-	};
-	friend class CurlRequest;
-
-public:
-	LLCurlThread(bool threaded = true) ;
-	virtual ~LLCurlThread() ;
-
-	S32 update(F32 max_time_ms);
-
-	void addMulti(LLCurl::Multi* multi) ;
-	void killMulti(LLCurl::Multi* multi) ;
-
-private:
-	bool doMultiPerform(LLCurl::Multi* multi) ;
-	void deleteMulti(LLCurl::Multi* multi) ;
-	void cleanupMulti(LLCurl::Multi* multi) ;
-} ;
-
-
-void intrusive_ptr_add_ref(LLCurl::Responder* p);
-void intrusive_ptr_release(LLCurl::Responder* p);
+	void intrusive_ptr_add_ref(LLCurl::Responder* p);
+	void intrusive_ptr_release(LLCurl::Responder* p);
+};
 
 
 class LLCurlRequest
@@ -410,6 +338,7 @@ private:
 	LLCurl::Multi* mActiveMulti;
 	S32 mActiveRequestCount;
 	BOOL mProcessing;
+	U32 mThreadID; // debug
 };
 
 class LLCurlEasyRequest
@@ -427,11 +356,9 @@ public:
 	void slist_append(const char* str);
 	void sendRequest(const std::string& url);
 	void requestComplete();
+	void perform();
 	bool getResult(CURLcode* result, LLCurl::TransferInfo* info = NULL);
 	std::string getErrorString();
-	bool isCompleted() {return mMulti->isCompleted() ;}
-	bool wait() { return mMulti->waitToComplete(); }
-	bool isValid() {return mMulti && mMulti->isValid(); }
 
 	LLCurl::Easy* getEasy() const { return mEasy; }
 
diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp
index 75ccc3818..38b02c52c 100644
--- a/indra/llmessage/llhttpclient.cpp
+++ b/indra/llmessage/llhttpclient.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "linden_common.h"
-#include <openssl/x509_vfy.h>
+
 #include "llhttpclient.h"
 
 #include "llassetstorage.h"
@@ -40,10 +40,8 @@
 #include "message.h"
 #include <curl/curl.h>
 
-
 const F32 HTTP_REQUEST_EXPIRY_SECS = 60.0f;
 LLURLRequest::SSLCertVerifyCallback LLHTTPClient::mCertVerifyCallback = NULL;
-
 ////////////////////////////////////////////////////////////////////////////
 
 // Responder class moved to LLCurl
@@ -160,7 +158,7 @@ namespace
 				fstream.seekg(0, std::ios::end);
 				U32 fileSize = (U32)fstream.tellg();
 				fstream.seekg(0, std::ios::beg);
-				std::vector<char> fileBuffer(fileSize);
+				std::vector<char> fileBuffer(fileSize); //Mem leak fix'd
 				fstream.read(&fileBuffer[0], fileSize);
 				ostream.write(&fileBuffer[0], fileSize);
 				fstream.close();
@@ -189,11 +187,9 @@ namespace
 			
 			LLVFile vfile(gVFS, mUUID, mAssetType, LLVFile::READ);
 			S32 fileSize = vfile.getSize();
-			U8* fileBuffer;
-			fileBuffer = new U8 [fileSize];
-            vfile.read(fileBuffer, fileSize);
-            ostream.write((char*)fileBuffer, fileSize);
-			delete [] fileBuffer;
+			std::vector<U8> fileBuffer(fileSize);
+			vfile.read(&fileBuffer[0], fileSize);
+			ostream.write((char*)&fileBuffer[0], fileSize);
 			eos = true;
 			return STATUS_DONE;
 		}
@@ -202,7 +198,6 @@ namespace
 		LLAssetType::EType mAssetType;
 	};
 
-	
 	LLPumpIO* theClientPump = NULL;
 }
 
@@ -217,8 +212,7 @@ static void request(
 	Injector* body_injector,
 	LLCurl::ResponderPtr responder,
 	const F32 timeout = HTTP_REQUEST_EXPIRY_SECS,
-	const LLSD& headers = LLSD()
-    )
+	const LLSD& headers = LLSD())
 {
 	if (!LLHTTPClient::hasPump())
 	{
@@ -228,26 +222,12 @@ static void request(
 	LLPumpIO::chain_t chain;
 
 	LLURLRequest* req = new LLURLRequest(method, url);
-	if(!req->isValid())//failed
-	{
-		delete req ;
-		return ;
-	}
 
 	req->setSSLVerifyCallback(LLHTTPClient::getCertVerifyCallback(), (void *)req);
 
-	
-	lldebugs << LLURLRequest::actionAsVerb(method) << " " << url << " "
-		<< headers << llendl;
-
-	// Insert custom headers if the caller sent any
-	if (headers.isMap())
-	{
-		if (headers.has("Cookie"))
-		{
-			req->allowCookies();
-		}
-
+    // Insert custom headers is the caller sent any
+    if (headers.isMap())
+    {
         LLSD::map_const_iterator iter = headers.beginMap();
         LLSD::map_const_iterator end  = headers.endMap();
 
@@ -429,16 +409,11 @@ static LLSD blocking_request(
 {
 	lldebugs << "blockingRequest of " << url << llendl;
 	char curl_error_buffer[CURL_ERROR_SIZE] = "\0";
-	CURL* curlp = LLCurl::newEasyHandle();
-	llassert_always(curlp != NULL) ;
-
+	CURL* curlp = curl_easy_init();
 	LLHTTPBuffer http_buffer;
 	std::string body_str;
 	
 	// other request method checks root cert first, we skip?
-
-	// Apply configured proxy settings
-	LLProxy::getInstance()->applyProxySettings(curlp);
 	
 	// * Set curl handle options
 	curl_easy_setopt(curlp, CURLOPT_NOSIGNAL, 1);	// don't use SIGALRM for timeouts
@@ -447,7 +422,7 @@ static LLSD blocking_request(
 	curl_easy_setopt(curlp, CURLOPT_WRITEDATA, &http_buffer);
 	curl_easy_setopt(curlp, CURLOPT_URL, url.c_str());
 	curl_easy_setopt(curlp, CURLOPT_ERRORBUFFER, curl_error_buffer);
-
+	
 	// * Setup headers (don't forget to free them after the call!)
 	curl_slist* headers_list = NULL;
 	if (headers.isMap())
@@ -525,7 +500,7 @@ static LLSD blocking_request(
 	}
 
 	// * Cleanup
-	LLCurl::deleteEasyHandle(curlp);
+	curl_easy_cleanup(curlp);
 	return response;
 }
 
@@ -625,8 +600,7 @@ bool LLHTTPClient::hasPump()
 	return theClientPump != NULL;
 }
 
-//static
-LLPumpIO& LLHTTPClient::getPump()
+LLPumpIO &LLHTTPClient::getPump()
 {
 	return *theClientPump;
 }
diff --git a/indra/llmessage/llhttpclient.h b/indra/llmessage/llhttpclient.h
index dda7d550f..2732b51b7 100644
--- a/indra/llmessage/llhttpclient.h
+++ b/indra/llmessage/llhttpclient.h
@@ -34,10 +34,11 @@
 #include <string>
 
 #include <boost/intrusive_ptr.hpp>
-#include "llurlrequest.h"
+
 #include "llassettype.h"
 #include "llcurl.h"
 #include "lliopipe.h"
+#include "llurlrequest.h"
 
 extern const F32 HTTP_REQUEST_EXPIRY_SECS;
 
@@ -55,7 +56,6 @@ public:
 	typedef LLCurl::Responder Responder;
 	typedef LLCurl::ResponderPtr ResponderPtr;
 
-	
 	/** @name non-blocking API */
 	//@{
 	static void head(
@@ -155,7 +155,7 @@ public:
 		///< Hippo special
 
 	static void setCertVerifyCallback(LLURLRequest::SSLCertVerifyCallback callback);
-	static  LLURLRequest::SSLCertVerifyCallback getCertVerifyCallback() { return mCertVerifyCallback; }
+	static LLURLRequest::SSLCertVerifyCallback getCertVerifyCallback() { return mCertVerifyCallback; }
 
 protected:
 	static LLURLRequest::SSLCertVerifyCallback mCertVerifyCallback;
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp
index f5e08f393..f351873df 100644
--- a/indra/llmessage/llurlrequest.cpp
+++ b/indra/llmessage/llurlrequest.cpp
@@ -32,17 +32,17 @@
 #include <algorithm>
 #include <openssl/x509_vfy.h>
 #include <openssl/ssl.h>
+
 #include "llcurl.h"
-#include "llfasttimer.h"
 #include "llioutil.h"
 #include "llmemtype.h"
-#include "llproxy.h"
 #include "llpumpio.h"
 #include "llsd.h"
 #include "llstring.h"
 #include "apr_env.h"
 #include "llapr.h"
 #include "llscopedvolatileaprpool.h"
+#include "llfasttimer.h"
 static const U32 HTTP_STATUS_PIPE_ERROR = 499;
 
 /**
@@ -66,7 +66,7 @@ public:
 	~LLURLRequestDetail();
 	std::string mURL;
 	LLCurlEasyRequest* mCurlRequest;
-	LLIOPipe::buffer_ptr_t mResponseBuffer;
+	LLBufferArray* mResponseBuffer;
 	LLChannelDescriptors mChannels;
 	U8* mLastRead;
 	U32 mBodyLimit;
@@ -77,26 +77,21 @@ public:
 
 LLURLRequestDetail::LLURLRequestDetail() :
 	mCurlRequest(NULL),
+	mResponseBuffer(NULL),
 	mLastRead(NULL),
 	mBodyLimit(0),
 	mByteAccumulator(0),
-	mIsBodyLimitSet(false),
-    mSSLVerifyCallback(NULL)
+	mIsBodyLimitSet(false)
 {
 	LLMemType m1(LLMemType::MTYPE_IO_URL_REQUEST);
 	mCurlRequest = new LLCurlEasyRequest();
-	
-	if(!mCurlRequest->isValid()) //failed.
-	{
-		delete mCurlRequest ;
-		mCurlRequest = NULL ;
-	}
 }
 
 LLURLRequestDetail::~LLURLRequestDetail()
 {
 	LLMemType m1(LLMemType::MTYPE_IO_URL_REQUEST);
 	delete mCurlRequest;
+	mResponseBuffer = NULL;
 	mLastRead = NULL;
 }
 
@@ -105,7 +100,7 @@ void LLURLRequest::setSSLVerifyCallback(SSLCertVerifyCallback callback, void *pa
 	mDetail->mSSLVerifyCallback = callback;
 	mDetail->mCurlRequest->setSSLCtxCallback(LLURLRequest::_sslCtxCallback, (void *)this);
 	mDetail->mCurlRequest->setopt(CURLOPT_SSL_VERIFYPEER, true);
-	mDetail->mCurlRequest->setopt(CURLOPT_SSL_VERIFYHOST, 2);	
+	mDetail->mCurlRequest->setopt(CURLOPT_SSL_VERIFYHOST, 2);
 }
 
 
@@ -114,7 +109,7 @@ void LLURLRequest::setSSLVerifyCallback(SSLCertVerifyCallback callback, void *pa
 // used to configure the context for custom cert validation
 
 CURLcode LLURLRequest::_sslCtxCallback(CURL * curl, void *sslctx, void *param)
-{	
+{
 	LLURLRequest *req = (LLURLRequest *)param;
 	if(req == NULL || req->mDetail->mSSLVerifyCallback == NULL)
 	{
@@ -128,7 +123,6 @@ CURLcode LLURLRequest::_sslCtxCallback(CURL * curl, void *sslctx, void *param)
 	SSL_CTX_set_cert_verify_callback(ctx, req->mDetail->mSSLVerifyCallback, (void *)req);
 	// the calls are void
 	return CURLE_OK;
-	
 }
 
 /**
@@ -189,7 +183,6 @@ std::string LLURLRequest::getURL() const
 {
 	return mDetail->mURL;
 }
-
 void LLURLRequest::addHeader(const char* header)
 {
 	LLMemType m1(LLMemType::MTYPE_IO_URL_REQUEST);
@@ -240,9 +233,9 @@ void LLURLRequest::useProxy(bool use_proxy)
 		}
     }
 
-    lldebugs << "use_proxy = " << (use_proxy?'Y':'N') << ", env_proxy = \"" << env_proxy << "\"" << llendl;
+    LL_DEBUGS("Proxy") << "use_proxy = " << (use_proxy?'Y':'N') << ", env_proxy = " << (!env_proxy.empty() ? env_proxy : "(null)") << LL_ENDL;
 
-    if (use_proxy)
+    if (use_proxy && !env_proxy.empty())
     {
 		mDetail->mCurlRequest->setoptString(CURLOPT_PROXY, env_proxy);
     }
@@ -262,24 +255,12 @@ void LLURLRequest::allowCookies()
 	mDetail->mCurlRequest->setoptString(CURLOPT_COOKIEFILE, "");
 }
 
-//virtual 
-bool LLURLRequest::isValid() 
-{
-	return mDetail->mCurlRequest && mDetail->mCurlRequest->isValid(); 
-}
-
 // virtual
 LLIOPipe::EStatus LLURLRequest::handleError(
 	LLIOPipe::EStatus status,
 	LLPumpIO* pump)
 {
 	LLMemType m1(LLMemType::MTYPE_IO_URL_REQUEST);
-	
-	if(!isValid())
-	{
-		return STATUS_EXPIRED ;
-	}
-
 	if(mCompletionCallback && pump)
 	{
 		LLURLRequestComplete* complete = NULL;
@@ -309,7 +290,8 @@ LLIOPipe::EStatus LLURLRequest::process_impl(
 	LLMemType m1(LLMemType::MTYPE_IO_URL_REQUEST);
 	//llinfos << "LLURLRequest::process_impl()" << llendl;
 	if (!buffer) return STATUS_ERROR;
-	
+	if (!mDetail) return STATUS_ERROR; //Seems to happen on occasion. Need to hunt down why.
+
 	// we're still waiting or prcessing, check how many
 	// bytes we have accumulated.
 	const S32 MIN_ACCUMULATION = 100000;
@@ -348,7 +330,7 @@ LLIOPipe::EStatus LLURLRequest::process_impl(
 
 		// *FIX: bit of a hack, but it should work. The configure and
 		// callback method expect this information to be ready.
-		mDetail->mResponseBuffer = buffer;
+		mDetail->mResponseBuffer = buffer.get();
 		mDetail->mChannels = channels;
 		if(!configure())
 		{
@@ -367,10 +349,7 @@ LLIOPipe::EStatus LLURLRequest::process_impl(
 		static LLFastTimer::DeclareTimer FTM_URL_PERFORM("Perform");
 		{
 			LLFastTimer t(FTM_URL_PERFORM);
-			if(!mDetail->mCurlRequest->wait())
-			{
-				return status ;
-			}
+			mDetail->mCurlRequest->perform();
 		}
 
 		while(1)
@@ -465,12 +444,6 @@ void LLURLRequest::initialize()
 	LLMemType m1(LLMemType::MTYPE_IO_URL_REQUEST);
 	mState = STATE_INITIALIZED;
 	mDetail = new LLURLRequestDetail;
-
-	if(!isValid())
-	{
-		return ;
-	}
-
 	mDetail->mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1);
 	mDetail->mCurlRequest->setWriteCallback(&downCallback, (void*)this);
 	mDetail->mCurlRequest->setReadCallback(&upCallback, (void*)this);
diff --git a/indra/llmessage/llurlrequest.h b/indra/llmessage/llurlrequest.h
index 1ba51a5ac..6e16067dc 100644
--- a/indra/llmessage/llurlrequest.h
+++ b/indra/llmessage/llurlrequest.h
@@ -40,7 +40,6 @@
 #include "llerror.h"
 #include "llcurl.h"
 
-
 extern const std::string CONTEXT_REQUEST;
 extern const std::string CONTEXT_DEST_URI_SD_LABEL;
 extern const std::string CONTEXT_RESPONSE;
@@ -145,7 +144,6 @@ public:
 	 */
 	void setSSLVerifyCallback(SSLCertVerifyCallback callback, void * param);
 
-	
 	/**
 	 * @brief Return at most size bytes of body.
 	 *
@@ -190,14 +188,11 @@ public:
 	 */
 	void allowCookies();
 
-	/*virtual*/ bool isValid() ;
-
 public:
 	/** 
 	 * @brief Give this pipe a chance to handle a generated error
 	 */
 	virtual EStatus handleError(EStatus status, LLPumpIO* pump);
-
 	
 protected:
 	/** 
@@ -223,11 +218,11 @@ protected:
 	ERequestAction mAction;
 	LLURLRequestDetail* mDetail;
 	LLIOPipe::ptr_t mCompletionCallback;
-	 S32 mRequestTransferedBytes;
-	 S32 mResponseTransferedBytes;
+	S32 mRequestTransferedBytes;
+	S32 mResponseTransferedBytes;
 
 	static CURLcode _sslCtxCallback(CURL * curl, void *sslctx, void *param);
-	
+
 private:
 	/** 
 	 * @brief Initialize the object. Called during construction.
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index c0bb21085..26b224eda 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -637,9 +637,8 @@ bool LLAppViewer::init()
     mAlloc.setProfilingEnabled(gSavedSettings.getBOOL("MemProfiling"));
     // *NOTE:Mani - LLCurl::initClass is not thread safe. 
     // Called before threads are created.
-    LLCurl::initClass(gSavedSettings.getF32("CurlRequestTimeOut"), 
-						gSavedSettings.getS32("CurlMaximumNumberOfHandles"), 
-						gSavedSettings.getBOOL("CurlUseMultipleThreads"));
+    LLCurl::initClass(gSavedSettings.getF32("CurlRequestTimeOut"));
+
 	LL_INFOS("InitInfo") << "LLCurl initialized." << LL_ENDL ;
 
     initThreads();
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp
index af5e977b2..11dc653aa 100644
--- a/indra/newview/llxmlrpctransaction.cpp
+++ b/indra/newview/llxmlrpctransaction.cpp
@@ -227,16 +227,6 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip)
 		mCurlRequest = new LLCurlEasyRequest();
 	}
 
-	if(!mCurlRequest->isValid())
-	{
-		llwarns << "mCurlRequest is invalid." << llendl ;
-
-		delete mCurlRequest ;
-		mCurlRequest = NULL ;
-		return ;
-	}
-
-
 	LLProxy::getInstance()->applyProxySettings(mCurlRequest);
 
 //	mCurlRequest->setopt(CURLOPT_VERBOSE, 1); // usefull for debugging
@@ -292,7 +282,7 @@ LLXMLRPCTransaction::Impl::~Impl()
 
 bool LLXMLRPCTransaction::Impl::process()
 {
-	if(!mCurlRequest || !mCurlRequest->isValid())
+	if(!mCurlRequest || !mCurlRequest->getEasy())
 	{
 		llwarns << "transaction failed." << llendl ;
 
@@ -326,7 +316,7 @@ bool LLXMLRPCTransaction::Impl::process()
 	//const F32 MAX_PROCESSING_TIME = 0.05f;
 	//LLTimer timer;
 
-	mCurlRequest->wait();
+	mCurlRequest->perform();
 
 	/*while (mCurlRequest->perform() > 0)
 	{

From 96a4e16a4b4503204d6cb1275bb7c05bc7c63b16 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 7 Aug 2012 16:48:22 +0200
Subject: [PATCH 152/199] Don't feed empty, non-working callback to CURL

---
 indra/llmessage/llhttpclient.cpp   |  9 +------
 indra/llmessage/llhttpclient.h     |  6 -----
 indra/llmessage/llurlrequest.cpp   | 38 ++++++------------------------
 indra/llmessage/llurlrequest.h     |  4 +---
 indra/newview/hipporestrequest.cpp |  2 +-
 5 files changed, 10 insertions(+), 49 deletions(-)

diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp
index 75ccc3818..b1a744cef 100644
--- a/indra/llmessage/llhttpclient.cpp
+++ b/indra/llmessage/llhttpclient.cpp
@@ -42,8 +42,6 @@
 
 
 const F32 HTTP_REQUEST_EXPIRY_SECS = 60.0f;
-LLURLRequest::SSLCertVerifyCallback LLHTTPClient::mCertVerifyCallback = NULL;
-
 ////////////////////////////////////////////////////////////////////////////
 
 // Responder class moved to LLCurl
@@ -206,11 +204,6 @@ namespace
 	LLPumpIO* theClientPump = NULL;
 }
 
-void LLHTTPClient::setCertVerifyCallback(LLURLRequest::SSLCertVerifyCallback callback)
-{
-	LLHTTPClient::mCertVerifyCallback = callback;
-}
-
 static void request(
 	const std::string& url,
 	LLURLRequest::ERequestAction method,
@@ -234,7 +227,7 @@ static void request(
 		return ;
 	}
 
-	req->setSSLVerifyCallback(LLHTTPClient::getCertVerifyCallback(), (void *)req);
+	req->checkRootCertificate(true);
 
 	
 	lldebugs << LLURLRequest::actionAsVerb(method) << " " << url << " "
diff --git a/indra/llmessage/llhttpclient.h b/indra/llmessage/llhttpclient.h
index dda7d550f..bb5e27534 100644
--- a/indra/llmessage/llhttpclient.h
+++ b/indra/llmessage/llhttpclient.h
@@ -153,12 +153,6 @@ public:
 		///< for testing
 	static LLPumpIO &getPump();
 		///< Hippo special
-
-	static void setCertVerifyCallback(LLURLRequest::SSLCertVerifyCallback callback);
-	static  LLURLRequest::SSLCertVerifyCallback getCertVerifyCallback() { return mCertVerifyCallback; }
-
-protected:
-	static LLURLRequest::SSLCertVerifyCallback mCertVerifyCallback;
 };
 
 #endif // LL_LLHTTPCLIENT_H
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp
index f5e08f393..60c663cc3 100644
--- a/indra/llmessage/llurlrequest.cpp
+++ b/indra/llmessage/llurlrequest.cpp
@@ -100,37 +100,6 @@ LLURLRequestDetail::~LLURLRequestDetail()
 	mLastRead = NULL;
 }
 
-void LLURLRequest::setSSLVerifyCallback(SSLCertVerifyCallback callback, void *param)
-{
-	mDetail->mSSLVerifyCallback = callback;
-	mDetail->mCurlRequest->setSSLCtxCallback(LLURLRequest::_sslCtxCallback, (void *)this);
-	mDetail->mCurlRequest->setopt(CURLOPT_SSL_VERIFYPEER, true);
-	mDetail->mCurlRequest->setopt(CURLOPT_SSL_VERIFYHOST, 2);	
-}
-
-
-// _sslCtxFunction
-// Callback function called when an SSL Context is created via CURL
-// used to configure the context for custom cert validation
-
-CURLcode LLURLRequest::_sslCtxCallback(CURL * curl, void *sslctx, void *param)
-{	
-	LLURLRequest *req = (LLURLRequest *)param;
-	if(req == NULL || req->mDetail->mSSLVerifyCallback == NULL)
-	{
-		SSL_CTX_set_cert_verify_callback((SSL_CTX *)sslctx, NULL, NULL);
-		return CURLE_OK;
-	}
-	SSL_CTX * ctx = (SSL_CTX *) sslctx;
-	// disable any default verification for server certs
-	SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, NULL);
-	// set the verification callback.
-	SSL_CTX_set_cert_verify_callback(ctx, req->mDetail->mSSLVerifyCallback, (void *)req);
-	// the calls are void
-	return CURLE_OK;
-	
-}
-
 /**
  * class LLURLRequest
  */
@@ -196,6 +165,13 @@ void LLURLRequest::addHeader(const char* header)
 	mDetail->mCurlRequest->slist_append(header);
 }
 
+void LLURLRequest::checkRootCertificate(bool check)
+{
+	mDetail->mCurlRequest->setopt(CURLOPT_SSL_VERIFYPEER, (check? TRUE : FALSE));
+	mDetail->mCurlRequest->setoptString(CURLOPT_ENCODING, "");
+}
+
+
 void LLURLRequest::setBodyLimit(U32 size)
 {
 	mDetail->mBodyLimit = size;
diff --git a/indra/llmessage/llurlrequest.h b/indra/llmessage/llurlrequest.h
index 1ba51a5ac..218dd6248 100644
--- a/indra/llmessage/llurlrequest.h
+++ b/indra/llmessage/llurlrequest.h
@@ -143,7 +143,7 @@ public:
 	 * Set whether request will check that remote server
 	 * certificates are signed by a known root CA when using HTTPS.
 	 */
-	void setSSLVerifyCallback(SSLCertVerifyCallback callback, void * param);
+	void checkRootCertificate(bool check);
 
 	
 	/**
@@ -226,8 +226,6 @@ protected:
 	 S32 mRequestTransferedBytes;
 	 S32 mResponseTransferedBytes;
 
-	static CURLcode _sslCtxCallback(CURL * curl, void *sslctx, void *param);
-	
 private:
 	/** 
 	 * @brief Initialize the object. Called during construction.
diff --git a/indra/newview/hipporestrequest.cpp b/indra/newview/hipporestrequest.cpp
index 7b64b35d8..8953dec87 100644
--- a/indra/newview/hipporestrequest.cpp
+++ b/indra/newview/hipporestrequest.cpp
@@ -256,7 +256,7 @@ static void request(const std::string &url,
 	LLPumpIO::chain_t chain;
 
 	LLURLRequest *req = new LLURLRequest(method, url);
-	req->setSSLVerifyCallback(LLHTTPClient::getCertVerifyCallback(), (void *)req);
+	req->checkRootCertificate(true);
 
 	/*
 	// Insert custom headers if the caller sent any

From 5caeccc007b942eb74f27b910a2c5f1914f0847f Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Tue, 7 Aug 2012 20:57:39 +0200
Subject: [PATCH 153/199] Final compile/link bug fixes for debug_libcurl code.

renamed cwdebug/debug_libcurl.cc -> llmessage/debug_libcurl.cpp
    and cwdebug/debug_libcurl.h  -> llmessage/debug_libcurl.h,
because debug_libcurl.cpp does curl calls that do ares and
openssl calls, so we need to link with those libraries.
llmessage is already linking with those libraries, and contains
the main entry point aicurl.h, so it's a suitable place to put
this.

Bug fix: must always include llpreprocessor.h before including
curl/curl.h.

Bug fix: Added #include "debug_libcurl.h" to hipporestrequest.cpp
and llurlsimstring.cpp which I missed before because they
included "curl/curl.h" instead of <curl/curl.h>. Same in
llwaterparammanager.cpp, but removed include there because it
isn't needed.

Now test DEBUG_CURLIO before including debug_curlio, that
seems better, because otherwise it would make more sense to
replace all #include <curl/curl.h> with #include "mycurl.h"
and then do it there-- but I didn't want to do that.

Bug fix: we undef-ed CURLOPT_DNS_USE_GLOBAL_CACHE, while really
that is an enum, not a macro.

Fixed DEBUG_WINDOWS_CODE_ON_LINUX again by adding a hack for
ioctlsocket(), not instantiating dumb_socketpair unless
DEBUG_WINDOWS_CODE_ON_LINUX is defined and removing again ^M's
introduced with the new windows non-blocking code.
Also changed the type of flags passed to fcntl to int (was long).
---
 indra/cmake/Cwdebug.cmake                     |  2 -
 indra/llmessage/CMakeLists.txt                |  2 +
 indra/llmessage/aicurl.h                      |  5 +++
 indra/llmessage/aicurlthread.cpp              | 41 ++++++++++++-------
 .../debug_libcurl.cpp}                        |  7 +++-
 indra/{cwdebug => llmessage}/debug_libcurl.h  | 16 ++++++--
 indra/newview/hipporestrequest.cpp            | 12 +++---
 indra/newview/llurlsimstring.cpp              |  5 ++-
 indra/newview/llwaterparammanager.cpp         |  2 -
 9 files changed, 62 insertions(+), 30 deletions(-)
 rename indra/{cwdebug/debug_libcurl.cc => llmessage/debug_libcurl.cpp} (99%)
 rename indra/{cwdebug => llmessage}/debug_libcurl.h (91%)

diff --git a/indra/cmake/Cwdebug.cmake b/indra/cmake/Cwdebug.cmake
index f68c7a897..d469386e1 100644
--- a/indra/cmake/Cwdebug.cmake
+++ b/indra/cmake/Cwdebug.cmake
@@ -2,7 +2,6 @@ include_directories (${CMAKE_SOURCE_DIR}/cwdebug)
 
 set(cwdebug_SOURCE_FILES
     ${CMAKE_SOURCE_DIR}/cwdebug/debug.cc
-    ${CMAKE_SOURCE_DIR}/cwdebug/debug_libcurl.cc
     )
 
 set(cwdebug_HEADER_FILES
@@ -10,7 +9,6 @@ set(cwdebug_HEADER_FILES
     ${CMAKE_SOURCE_DIR}/cwdebug/sys.h
     ${CMAKE_SOURCE_DIR}/cwdebug/debug.h
     ${CMAKE_SOURCE_DIR}/cwdebug/debug_ostream_operators.h
-    ${CMAKE_SOURCE_DIR}/cwdebug/debug_libcurl.h
     )
 
 set_source_files_properties(${cwdebug_HEADER_FILES}
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index b2b8eb4ec..aac669137 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -30,6 +30,7 @@ set(llmessage_SOURCE_FILES
     llcircuit.cpp
     llclassifiedflags.cpp
     aicurl.cpp
+    debug_libcurl.cpp
     aicurlthread.cpp
     lldatapacker.cpp
     lldispatcher.cpp
@@ -117,6 +118,7 @@ set(llmessage_HEADER_FILES
     llclassifiedflags.h
     llcurl.h
     aicurl.h
+    debug_libcurl.h
     aicurlprivate.h
     aicurlthread.h
     lldatapacker.h
diff --git a/indra/llmessage/aicurl.h b/indra/llmessage/aicurl.h
index 4752d1b45..895650ec8 100644
--- a/indra/llmessage/aicurl.h
+++ b/indra/llmessage/aicurl.h
@@ -37,11 +37,16 @@
 #include <stdexcept>
 #include <boost/intrusive_ptr.hpp>
 #include <boost/utility.hpp>
+
+#include "llpreprocessor.h"
 #include <curl/curl.h>		// Needed for files that include this header (also for aicurlprivate.h).
+#ifdef DEBUG_CURLIO
 #include "debug_libcurl.h"
+#endif
 
 // Make sure we don't use this option: it is not thread-safe.
 #undef CURLOPT_DNS_USE_GLOBAL_CACHE
+#define CURLOPT_DNS_USE_GLOBAL_CACHE do_not_use_CURLOPT_DNS_USE_GLOBAL_CACHE
 
 #include "stdtypes.h"		// U32
 #include "lliopipe.h"		// LLIOPipe::buffer_ptr_t
diff --git a/indra/llmessage/aicurlthread.cpp b/indra/llmessage/aicurlthread.cpp
index c03a0f309..4d56a0622 100644
--- a/indra/llmessage/aicurlthread.cpp
+++ b/indra/llmessage/aicurlthread.cpp
@@ -177,6 +177,19 @@ int closesocket(curl_socket_t fd)
   return close(fd);
 }
 
+int const FIONBIO = 0;
+
+int ioctlsocket(int fd, int, unsigned long* nonblocking_enable)
+{
+  int res = fcntl(fd, F_GETFL, 0);
+  llassert_always(res != -1);
+  if (*nonblocking_enable)
+	res |= O_NONBLOCK;
+  else
+	res &= ~O_NONBLOCK;
+  return fcntl(fd, F_SETFD, res);
+}
+
 #endif // DEBUG_WINDOWS_CODE_ON_LINUX
 
 #define WINDOWS_CODE (LL_WINDOWS || DEBUG_WINDOWS_CODE_ON_LINUX)
@@ -894,7 +907,7 @@ static int dumb_socketpair(SOCKET socks[2], bool make_overlapped)
     WSASetLastError(e);
     return SOCKET_ERROR;
 }
-#else
+#elif WINDOWS_CODE
 int dumb_socketpair(int socks[2], int dummy)
 {
     (void) dummy;
@@ -913,18 +926,18 @@ void AICurlThread::create_wakeup_fds(void)
 		llerrs << "Failed to generate wake-up socket pair" << formatWSAError() << llendl;
 		return;
 	}
-	u_long nonblocking_enable = TRUE;
-	int error = ioctlsocket(socks[0], FIONBIO, &nonblocking_enable);
-	if(error)
-	{
-		llerrs << "Failed to set wake-up socket nonblocking: " << formatWSAError() << llendl;
-	}
-	llassert(nonblocking_enable);
-	error = ioctlsocket(socks[1], FIONBIO, &nonblocking_enable);
-	if(error)
-	{
-		llerrs << "Failed to set wake-up input socket nonblocking: " << formatWSAError() << llendl;
-	}
+	u_long nonblocking_enable = TRUE;
+	int error = ioctlsocket(socks[0], FIONBIO, &nonblocking_enable);
+	if(error)
+	{
+		llerrs << "Failed to set wake-up socket nonblocking: " << formatWSAError() << llendl;
+	}
+	llassert(nonblocking_enable);
+	error = ioctlsocket(socks[1], FIONBIO, &nonblocking_enable);
+	if(error)
+	{
+		llerrs << "Failed to set wake-up input socket nonblocking: " << formatWSAError() << llendl;
+	}
 	mWakeUpFd = socks[0];
 	mWakeUpFd_in = socks[1];
 #else
@@ -933,7 +946,7 @@ void AICurlThread::create_wakeup_fds(void)
   {
 	llerrs << "Failed to create wakeup pipe: " << strerror(errno) << llendl;
   }
-  long flags = O_NONBLOCK;
+  int const flags = O_NONBLOCK;
   for (int i = 0; i < 2; ++i)
   {
 	if (fcntl(pipefd[i], F_SETFL, flags))
diff --git a/indra/cwdebug/debug_libcurl.cc b/indra/llmessage/debug_libcurl.cpp
similarity index 99%
rename from indra/cwdebug/debug_libcurl.cc
rename to indra/llmessage/debug_libcurl.cpp
index 05df113c8..b2bdd6f64 100644
--- a/indra/cwdebug/debug_libcurl.cc
+++ b/indra/llmessage/debug_libcurl.cpp
@@ -4,6 +4,8 @@
 #include <iostream>
 #include <iomanip>
 #include <stdarg.h>
+#include "llpreprocessor.h"
+#include <curl/curl.h>
 #define COMPILING_DEBUG_LIBCURL_CC
 #include "debug_libcurl.h"
 #include "../llcommon/llerror.h"
@@ -801,6 +803,7 @@ char* debug_curl_version(void)
 
 }
 
-#else
+#else	// DEBUG_CURLIO
 int debug_libcurl_dummy;	// I thought some OS didn't like empty source files.
-#endif
+#endif	// DEBUG_CURLIO
+
diff --git a/indra/cwdebug/debug_libcurl.h b/indra/llmessage/debug_libcurl.h
similarity index 91%
rename from indra/cwdebug/debug_libcurl.h
rename to indra/llmessage/debug_libcurl.h
index bcf15e0f0..98884f077 100644
--- a/indra/cwdebug/debug_libcurl.h
+++ b/indra/llmessage/debug_libcurl.h
@@ -1,9 +1,19 @@
 #ifndef DEBUG_LIBCURL
 #define DEBUG_LIBCURL
 
-#ifdef DEBUG_CURLIO
+#ifndef DEBUG_CURLIO
+#error "Don't include debug_libcurl.h unless DEBUG_CURLIO is defined."
+#endif
+
+#ifndef CURLINFO_TYPEMASK
+#error "<curl/curl.h> must be included before including debug_libcurl.h!"
+#endif
+
+#ifndef LLPREPROCESSOR_H
+// CURL_STATICLIB is needed on windows namely, which is defined in llpreprocessor.h (but only on windows).
+#error "llpreprocessor.h must be included before <curl/curl.h>."
+#endif
 
-#include <curl/curl.h>
 #include "debug.h"
 
 extern "C" {
@@ -78,6 +88,4 @@ extern CWD_API char* debug_curl_version(void);
 
 #endif // !COMPILING_DEBUG_LIBCURL_CC
 
-#endif // DEBUG_CURLIO
-
 #endif // DEBUG_LIBCURL
diff --git a/indra/newview/hipporestrequest.cpp b/indra/newview/hipporestrequest.cpp
index 4cd0cc34c..60d7770a1 100644
--- a/indra/newview/hipporestrequest.cpp
+++ b/indra/newview/hipporestrequest.cpp
@@ -8,14 +8,16 @@
 #endif
 
 #include <stdtypes.h>
-#include <llbufferstream.h>
-#include <llerror.h>
-#include <llhttpclient.h>
-#include <llurlrequest.h>
-#include <llxmltree.h>
+#include "llbufferstream.h"
+#include "llerror.h"
+#include "llhttpclient.h"
+#include "llurlrequest.h"
+#include "llxmltree.h"
 
 #include <curl/curl.h>
+#ifdef DEBUG_CURLIO
 #include "debug_libcurl.h"
+#endif
 
 // ********************************************************************
  
diff --git a/indra/newview/llurlsimstring.cpp b/indra/newview/llurlsimstring.cpp
index a28988db5..200345cae 100644
--- a/indra/newview/llurlsimstring.cpp
+++ b/indra/newview/llurlsimstring.cpp
@@ -38,7 +38,10 @@
 #include "llpanellogin.h"
 #include "llviewercontrol.h"
 
-#include "curl/curl.h"
+#include <curl/curl.h>			// curl_unescape, curl_free
+#ifdef DEBUG_CURLIO
+#include "debug_libcurl.h"
+#endif
 
 //static
 LLURLSimString LLURLSimString::sInstance;
diff --git a/indra/newview/llwaterparammanager.cpp b/indra/newview/llwaterparammanager.cpp
index ab95ee14d..307edffdd 100644
--- a/indra/newview/llwaterparammanager.cpp
+++ b/indra/newview/llwaterparammanager.cpp
@@ -76,8 +76,6 @@
 
 #include "llagentcamera.h"
 
-#include "curl/curl.h"
-
 LLWaterParamManager::LLWaterParamManager() :
 	mFogColor(22.f/255.f, 43.f/255.f, 54.f/255.f, 0.0f, 0.0f, "waterFogColor", "WaterFogColor"),
 	mFogDensity(4, "waterFogDensity", 2),

From b84f470fcaf70f0c0134a8ad7ad0177c07ffa6d0 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Wed, 8 Aug 2012 00:40:01 +0200
Subject: [PATCH 154/199] Bug fix: curl_off_t has a different size than void*
 on 32 bit.

---
 indra/llmessage/debug_libcurl.cpp | 34 +++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/indra/llmessage/debug_libcurl.cpp b/indra/llmessage/debug_libcurl.cpp
index b2bdd6f64..750187d38 100644
--- a/indra/llmessage/debug_libcurl.cpp
+++ b/indra/llmessage/debug_libcurl.cpp
@@ -609,11 +609,24 @@ CURLcode debug_curl_easy_setopt(CURL* handle, CURLoption option, ...)
 	void* ptr;
 	curl_off_t offset;
   } param;
+  unsigned int param_type = (option / 10000) * 10000;
   va_start(ap, option);
-  param.ptr = va_arg(ap, void*);
+  switch (param_type)
+  {
+	case CURLOPTTYPE_LONG:
+	  param.along = va_arg(ap, long);
+	  break;
+	case CURLOPTTYPE_OBJECTPOINT:
+	case CURLOPTTYPE_FUNCTIONPOINT:
+	  param.ptr = va_arg(ap, void*);
+	  break;
+	case CURLOPTTYPE_OFF_T:
+	  param.offset = va_arg(ap, curl_off_t);
+	  break;
+  }
   va_end(ap);
   ret = curl_easy_setopt(handle, option, param.ptr);
-  switch ((option / 10000) * 10000)
+  switch (param_type)
   {
 	case CURLOPTTYPE_LONG:
 	  Dout(dc::curl, "curl_easy_setopt(" << (AICURL*)handle << ", " << option << ", " << param.along << "L) = " << ret);
@@ -732,11 +745,24 @@ CURLMcode debug_curl_multi_setopt(CURLM* multi_handle, CURLMoption option, ...)
 	void* ptr;
 	curl_off_t offset;
   } param;
+  unsigned int param_type = (option / 10000) * 10000;
   va_start(ap, option);
-  param.ptr = va_arg(ap, void*);
+  switch (param_type)
+  {
+	case CURLOPTTYPE_LONG:
+	  param.along = va_arg(ap, long);
+	  break;
+	case CURLOPTTYPE_OBJECTPOINT:
+	case CURLOPTTYPE_FUNCTIONPOINT:
+	  param.ptr = va_arg(ap, void*);
+	  break;
+	case CURLOPTTYPE_OFF_T:
+	  param.offset = va_arg(ap, curl_off_t);
+	  break;
+  }
   va_end(ap);
   ret = curl_multi_setopt(multi_handle, option, param.ptr);
-  switch ((option / 10000) * 10000)
+  switch (param_type)
   {
 	case CURLOPTTYPE_LONG:
 	  Dout(dc::curl, "curl_easy_setopt(" << (AICURLM*)multi_handle << ", " << option << ", " << param.along << "L) = " << ret);

From 80eb0851d9cc8fbb98d82fee7b20d4c041ca20ff Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Wed, 8 Aug 2012 01:02:08 +0200
Subject: [PATCH 155/199] Fix stupidity

---
 indra/llmessage/debug_libcurl.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/indra/llmessage/debug_libcurl.cpp b/indra/llmessage/debug_libcurl.cpp
index 750187d38..d1abc3837 100644
--- a/indra/llmessage/debug_libcurl.cpp
+++ b/indra/llmessage/debug_libcurl.cpp
@@ -625,19 +625,22 @@ CURLcode debug_curl_easy_setopt(CURL* handle, CURLoption option, ...)
 	  break;
   }
   va_end(ap);
-  ret = curl_easy_setopt(handle, option, param.ptr);
   switch (param_type)
   {
 	case CURLOPTTYPE_LONG:
+	  ret = curl_easy_setopt(handle, option, param.along);
 	  Dout(dc::curl, "curl_easy_setopt(" << (AICURL*)handle << ", " << option << ", " << param.along << "L) = " << ret);
 	  break;
 	case CURLOPTTYPE_OBJECTPOINT:
+	  ret = curl_easy_setopt(handle, option, param.ptr);
 	  Dout(dc::curl, "curl_easy_setopt(" << (AICURL*)handle << ", " << option << ", (object*)0x" << std::hex << (size_t)param.ptr << std::dec << ") = " << ret);
 	  break;
 	case CURLOPTTYPE_FUNCTIONPOINT:
+	  ret = curl_easy_setopt(handle, option, param.ptr);
 	  Dout(dc::curl, "curl_easy_setopt(" << (AICURL*)handle << ", " << option << ", (function*)0x" << std::hex << (size_t)param.ptr << std::dec << ") = " << ret);
 	  break;
 	case CURLOPTTYPE_OFF_T:
+	  ret = curl_easy_setopt(handle, option, param.offset);
 	  Dout(dc::curl, "curl_easy_setopt(" << (AICURL*)handle << ", " << option << ", (curl_off_t)" << param.offset << ") = " << ret);
 	  break;
   }
@@ -761,19 +764,22 @@ CURLMcode debug_curl_multi_setopt(CURLM* multi_handle, CURLMoption option, ...)
 	  break;
   }
   va_end(ap);
-  ret = curl_multi_setopt(multi_handle, option, param.ptr);
   switch (param_type)
   {
 	case CURLOPTTYPE_LONG:
+	  ret = curl_multi_setopt(multi_handle, option, param.along);
 	  Dout(dc::curl, "curl_easy_setopt(" << (AICURLM*)multi_handle << ", " << option << ", " << param.along << "L) = " << ret);
 	  break;
 	case CURLOPTTYPE_OBJECTPOINT:
+	  ret = curl_multi_setopt(multi_handle, option, param.ptr);
 	  Dout(dc::curl, "curl_easy_setopt(" << (AICURLM*)multi_handle << ", " << option << ", (object*)0x" << std::hex << (size_t)param.ptr << std::dec << ") = " << ret);
 	  break;
 	case CURLOPTTYPE_FUNCTIONPOINT:
+	  ret = curl_multi_setopt(multi_handle, option, param.ptr);
 	  Dout(dc::curl, "curl_easy_setopt(" << (AICURLM*)multi_handle << ", " << option << ", (function*)0x" << std::hex << (size_t)param.ptr << std::dec << ") = " << ret);
 	  break;
 	case CURLOPTTYPE_OFF_T:
+	  ret = curl_easy_setopt(handle, option, param.offset);
 	  Dout(dc::curl, "curl_easy_setopt(" << (AICURLM*)multi_handle << ", " << option << ", (curl_off_t)" << param.offset << ") = " << ret);
 	  break;
   }

From ccd135b2a650ee47825bb48b2930ce4bafd37f57 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Wed, 8 Aug 2012 01:04:27 +0200
Subject: [PATCH 156/199] and again

---
 indra/llmessage/debug_libcurl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llmessage/debug_libcurl.cpp b/indra/llmessage/debug_libcurl.cpp
index d1abc3837..6d586f8c5 100644
--- a/indra/llmessage/debug_libcurl.cpp
+++ b/indra/llmessage/debug_libcurl.cpp
@@ -779,7 +779,7 @@ CURLMcode debug_curl_multi_setopt(CURLM* multi_handle, CURLMoption option, ...)
 	  Dout(dc::curl, "curl_easy_setopt(" << (AICURLM*)multi_handle << ", " << option << ", (function*)0x" << std::hex << (size_t)param.ptr << std::dec << ") = " << ret);
 	  break;
 	case CURLOPTTYPE_OFF_T:
-	  ret = curl_easy_setopt(handle, option, param.offset);
+	  ret = curl_multi_setopt(multi_handle, option, param.offset);
 	  Dout(dc::curl, "curl_easy_setopt(" << (AICURLM*)multi_handle << ", " << option << ", (curl_off_t)" << param.offset << ") = " << ret);
 	  break;
   }

From 89ef06fd3fea5de3626db245a79c45000f80d3e7 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Wed, 8 Aug 2012 01:58:49 +0200
Subject: [PATCH 157/199] Compiler warning fixes. Take into account that
 debug_libcurl.cpp is no longer linked dynamically.

---
 indra/llmessage/debug_libcurl.cpp | 14 +++++++-
 indra/llmessage/debug_libcurl.h   | 58 +++++++++++++++----------------
 2 files changed, 41 insertions(+), 31 deletions(-)

diff --git a/indra/llmessage/debug_libcurl.cpp b/indra/llmessage/debug_libcurl.cpp
index 6d586f8c5..a60e9f0e9 100644
--- a/indra/llmessage/debug_libcurl.cpp
+++ b/indra/llmessage/debug_libcurl.cpp
@@ -3,12 +3,14 @@
 #include "sys.h"
 #include <iostream>
 #include <iomanip>
+#include <cstdlib>
 #include <stdarg.h>
 #include "llpreprocessor.h"
 #include <curl/curl.h>
 #define COMPILING_DEBUG_LIBCURL_CC
 #include "debug_libcurl.h"
-#include "../llcommon/llerror.h"
+#include "debug.h"
+#include "llerror.h"
 
 #define CURL_VERSION(major, minor, patch)	\
     (LIBCURL_VERSION_MAJOR > major ||		\
@@ -623,6 +625,9 @@ CURLcode debug_curl_easy_setopt(CURL* handle, CURLoption option, ...)
 	case CURLOPTTYPE_OFF_T:
 	  param.offset = va_arg(ap, curl_off_t);
 	  break;
+	default:
+	  std::cerr << "Extracting param_type failed; option = " << option << "; param_type = " << param_type << std::endl;
+	  std::exit(EXIT_FAILURE);
   }
   va_end(ap);
   switch (param_type)
@@ -643,6 +648,8 @@ CURLcode debug_curl_easy_setopt(CURL* handle, CURLoption option, ...)
 	  ret = curl_easy_setopt(handle, option, param.offset);
 	  Dout(dc::curl, "curl_easy_setopt(" << (AICURL*)handle << ", " << option << ", (curl_off_t)" << param.offset << ") = " << ret);
 	  break;
+	default:
+	  break;
   }
   return ret;
 }
@@ -762,6 +769,9 @@ CURLMcode debug_curl_multi_setopt(CURLM* multi_handle, CURLMoption option, ...)
 	case CURLOPTTYPE_OFF_T:
 	  param.offset = va_arg(ap, curl_off_t);
 	  break;
+	default:
+	  std::cerr << "Extracting param_type failed; option = " << option << "; param_type = " << param_type << std::endl;
+	  std::exit(EXIT_FAILURE);
   }
   va_end(ap);
   switch (param_type)
@@ -782,6 +792,8 @@ CURLMcode debug_curl_multi_setopt(CURLM* multi_handle, CURLMoption option, ...)
 	  ret = curl_multi_setopt(multi_handle, option, param.offset);
 	  Dout(dc::curl, "curl_easy_setopt(" << (AICURLM*)multi_handle << ", " << option << ", (curl_off_t)" << param.offset << ") = " << ret);
 	  break;
+	default:	// Stop compiler complaining about no default.
+	  break;
   }
   return ret;
 }
diff --git a/indra/llmessage/debug_libcurl.h b/indra/llmessage/debug_libcurl.h
index 98884f077..27becb1c6 100644
--- a/indra/llmessage/debug_libcurl.h
+++ b/indra/llmessage/debug_libcurl.h
@@ -14,38 +14,36 @@
 #error "llpreprocessor.h must be included before <curl/curl.h>."
 #endif
 
-#include "debug.h"
-
 extern "C" {
 
-extern CWD_API void debug_curl_easy_cleanup(CURL* handle);
-extern CWD_API CURL* debug_curl_easy_duphandle(CURL* handle);
-extern CWD_API char* debug_curl_easy_escape(CURL* curl, char* url, int length);
-extern CWD_API CURLcode debug_curl_easy_getinfo(CURL* curl, CURLINFO info, ...);
-extern CWD_API CURL* debug_curl_easy_init(void);
-extern CWD_API CURLcode debug_curl_easy_pause(CURL* handle, int bitmask);
-extern CWD_API CURLcode debug_curl_easy_perform(CURL* handle);
-extern CWD_API void debug_curl_easy_reset(CURL* handle);
-extern CWD_API CURLcode debug_curl_easy_setopt(CURL* handle, CURLoption option, ...);
-extern CWD_API char const* debug_curl_easy_strerror(CURLcode errornum);
-extern CWD_API char* debug_curl_easy_unescape(CURL* curl, char* url, int inlength, int* outlength); 
-extern CWD_API void debug_curl_free(char* ptr);
-extern CWD_API time_t debug_curl_getdate(char const* datestring, time_t* now);
-extern CWD_API void debug_curl_global_cleanup(void);
-extern CWD_API CURLcode debug_curl_global_init(long flags);
-extern CWD_API CURLMcode debug_curl_multi_add_handle(CURLM* multi_handle, CURL* easy_handle); 
-extern CWD_API CURLMcode debug_curl_multi_assign(CURLM* multi_handle, curl_socket_t sockfd, void* sockptr);
-extern CWD_API CURLMcode debug_curl_multi_cleanup(CURLM* multi_handle);
-extern CWD_API CURLMsg* debug_curl_multi_info_read(CURLM* multi_handle, int* msgs_in_queue);
-extern CWD_API CURLM* debug_curl_multi_init(void);
-extern CWD_API CURLMcode debug_curl_multi_remove_handle(CURLM* multi_handle, CURL* easy_handle);
-extern CWD_API CURLMcode debug_curl_multi_setopt(CURLM* multi_handle, CURLMoption option, ...);
-extern CWD_API CURLMcode debug_curl_multi_socket_action(CURLM* multi_handle, curl_socket_t sockfd, int ev_bitmask, int* running_handles);
-extern CWD_API char const* debug_curl_multi_strerror(CURLMcode errornum);
-extern CWD_API struct curl_slist* debug_curl_slist_append(struct curl_slist* list, char const* string);
-extern CWD_API void debug_curl_slist_free_all(struct curl_slist* list);
-extern CWD_API char* debug_curl_unescape(char const* url, int length);
-extern CWD_API char* debug_curl_version(void);
+extern void debug_curl_easy_cleanup(CURL* handle);
+extern CURL* debug_curl_easy_duphandle(CURL* handle);
+extern char* debug_curl_easy_escape(CURL* curl, char* url, int length);
+extern CURLcode debug_curl_easy_getinfo(CURL* curl, CURLINFO info, ...);
+extern CURL* debug_curl_easy_init(void);
+extern CURLcode debug_curl_easy_pause(CURL* handle, int bitmask);
+extern CURLcode debug_curl_easy_perform(CURL* handle);
+extern void debug_curl_easy_reset(CURL* handle);
+extern CURLcode debug_curl_easy_setopt(CURL* handle, CURLoption option, ...);
+extern char const* debug_curl_easy_strerror(CURLcode errornum);
+extern char* debug_curl_easy_unescape(CURL* curl, char* url, int inlength, int* outlength); 
+extern void debug_curl_free(char* ptr);
+extern time_t debug_curl_getdate(char const* datestring, time_t* now);
+extern void debug_curl_global_cleanup(void);
+extern CURLcode debug_curl_global_init(long flags);
+extern CURLMcode debug_curl_multi_add_handle(CURLM* multi_handle, CURL* easy_handle); 
+extern CURLMcode debug_curl_multi_assign(CURLM* multi_handle, curl_socket_t sockfd, void* sockptr);
+extern CURLMcode debug_curl_multi_cleanup(CURLM* multi_handle);
+extern CURLMsg* debug_curl_multi_info_read(CURLM* multi_handle, int* msgs_in_queue);
+extern CURLM* debug_curl_multi_init(void);
+extern CURLMcode debug_curl_multi_remove_handle(CURLM* multi_handle, CURL* easy_handle);
+extern CURLMcode debug_curl_multi_setopt(CURLM* multi_handle, CURLMoption option, ...);
+extern CURLMcode debug_curl_multi_socket_action(CURLM* multi_handle, curl_socket_t sockfd, int ev_bitmask, int* running_handles);
+extern char const* debug_curl_multi_strerror(CURLMcode errornum);
+extern struct curl_slist* debug_curl_slist_append(struct curl_slist* list, char const* string);
+extern void debug_curl_slist_free_all(struct curl_slist* list);
+extern char* debug_curl_unescape(char const* url, int length);
+extern char* debug_curl_version(void);
 
 }
 

From f94f458922cafa487ce388a05a7379de3de55f8c Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Wed, 8 Aug 2012 04:10:34 +0200
Subject: [PATCH 158/199] Print CURL_SOCKET_TIMEOUT for that particular value.

---
 indra/llmessage/debug_libcurl.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/indra/llmessage/debug_libcurl.cpp b/indra/llmessage/debug_libcurl.cpp
index a60e9f0e9..c981ef38f 100644
--- a/indra/llmessage/debug_libcurl.cpp
+++ b/indra/llmessage/debug_libcurl.cpp
@@ -480,6 +480,20 @@ std::ostream& operator<<(std::ostream& os, CURLMsg* msg)
   return os;
 }
 
+struct Socket {
+  curl_socket_t mSocket;
+  Socket(curl_socket_t sockfd) : mSocket(sockfd) { }
+};
+
+std::ostream& operator<<(std::ostream& os, Socket const& sock)
+{
+  if (sock.mSocket == CURL_SOCKET_TIMEOUT)
+	os << "CURL_SOCKET_TIMEOUT";
+  else
+	os << sock.mSocket;
+  return os;
+}
+
 struct EvBitmask {
   int mBitmask;
   EvBitmask(int mask) : mBitmask(mask) { }
@@ -710,7 +724,7 @@ CURLMcode debug_curl_multi_assign(CURLM* multi_handle, curl_socket_t sockfd, voi
 {
   CURLMcode ret;
   ret = curl_multi_assign(multi_handle, sockfd, sockptr);
-  Dout(dc::curl, "curl_multi_assign(" << (AICURLM*)multi_handle << ", " << sockfd << ", " << sockptr << ") = " << ret);
+  Dout(dc::curl, "curl_multi_assign(" << (AICURLM*)multi_handle << ", " << Socket(sockfd) << ", " << sockptr << ") = " << ret);
   return ret;
 }
 
@@ -802,7 +816,7 @@ CURLMcode debug_curl_multi_socket_action(CURLM* multi_handle, curl_socket_t sock
 {
   CURLMcode ret;
   ret = curl_multi_socket_action(multi_handle, sockfd, ev_bitmask, running_handles);
-  Dout(dc::curl, "curl_multi_socket_action(" << (AICURLM*)multi_handle << ", " << sockfd <<
+  Dout(dc::curl, "curl_multi_socket_action(" << (AICURLM*)multi_handle << ", " << Socket(sockfd) <<
 	  ", " << EvBitmask(ev_bitmask) << ", {" << (ret == CURLM_OK ? *running_handles : 0) << "}) = " << ret);
   return ret;
 }

From 5ce8770dc3dbc5659ea2089548171b2033927ed7 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 8 Aug 2012 10:50:17 -0400
Subject: [PATCH 159/199] Fix Issue 304:	export texture in png too

code adapted from that bird that burnt to death...
---
 indra/llui/llfloater.h                        |  1 +
 indra/newview/llpreviewtexture.cpp            | 23 +++++++++++++++----
 indra/newview/llpreviewtexture.h              |  3 ++-
 indra/newview/llviewermenufile.cpp            | 14 +++++++++++
 .../default/xui/en-us/floater_about_land.xml  | 10 ++++----
 .../skins/default/xui/en-us/menu_viewer.xml   |  7 +++++-
 .../skins/default/xui/en-us/strings.xml       |  2 +-
 7 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index b61a567bb..e710fa6dc 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -217,6 +217,7 @@ public:
 	virtual BOOL	canSaveAs() const { return FALSE; }
 
 	virtual void	saveAs() {}
+	virtual void	saveAsType(BOOL type=false) {}
 	
 	// <edit>
 	virtual LLUUID  getItemID() { return LLUUID::null; }
diff --git a/indra/newview/llpreviewtexture.cpp b/indra/newview/llpreviewtexture.cpp
index 8bcf0dd2a..d4b0d7099 100644
--- a/indra/newview/llpreviewtexture.cpp
+++ b/indra/newview/llpreviewtexture.cpp
@@ -39,6 +39,7 @@
 #include "llcombobox.h"
 #include "statemachine/aifilepicker.h"
 #include "llfloaterinventory.h"
+#include "llimagepng.h"
 #include "llimagetga.h"
 #include "llinventory.h"
 #include "llnotificationsutil.h"
@@ -375,17 +376,27 @@ BOOL LLPreviewTexture::canSaveAs() const
 	return mIsCopyable && !mLoadingFullImage && mImage.notNull() && !mImage->isMissingAsset();
 }
 
+static bool sPng(false);
 
 // virtual
-void LLPreviewTexture::saveAs()
+void LLPreviewTexture::saveAsType(BOOL png)
 {
 	if( mLoadingFullImage )
 		return;
 
 	const LLViewerInventoryItem* item = getItem() ;
 	AIFilePicker* filepicker = AIFilePicker::create();
-	filepicker->open(item ? LLDir::getScrubbedFileName(item->getName()) + ".tga" : LLStringUtil::null, FFSAVE_TGA, "", "image");
-	filepicker->run(boost::bind(&LLPreviewTexture::saveAs_continued, this, item, filepicker));
+	sPng = png;
+	if(png)
+	{
+		filepicker->open(item ? LLDir::getScrubbedFileName(item->getName()) + ".png" : LLStringUtil::null, FFSAVE_PNG, "", "image");
+		filepicker->run(boost::bind(&LLPreviewTexture::saveAs_continued, this, item, filepicker));
+	}
+	else
+	{
+		filepicker->open(item ? LLDir::getScrubbedFileName(item->getName()) + ".tga" : LLStringUtil::null, FFSAVE_TGA, "", "image");
+		filepicker->run(boost::bind(&LLPreviewTexture::saveAs_continued, this, item, filepicker));
+	}
 }
 
 void LLPreviewTexture::saveAs_continued(LLViewerInventoryItem const* item, AIFilePicker* filepicker)
@@ -433,14 +444,16 @@ void LLPreviewTexture::onFileLoadedForSave(BOOL success,
 
 	if( self && final && success )
 	{
+		//FIXME: There has to be a better way
+		LLPointer<LLImagePNG> image_png = new LLImagePNG;
 		LLPointer<LLImageTGA> image_tga = new LLImageTGA;
-		if( !image_tga->encode( src ) )
+		if( sPng ? !image_png->encode( src, 0.0 ) : !image_tga->encode( src ) )
 		{
 			LLSD args;
 			args["FILE"] = self->mSaveFileName;
 			LLNotificationsUtil::add("CannotEncodeFile", args);
 		}
-		else if( !image_tga->save( self->mSaveFileName ) )
+		else if( sPng ? !image_png->save( self->mSaveFileName ) : !image_tga->save( self->mSaveFileName ) )
 		{
 			LLSD args;
 			args["FILE"] = self->mSaveFileName;
diff --git a/indra/newview/llpreviewtexture.h b/indra/newview/llpreviewtexture.h
index ce26d4dd4..bb20af473 100644
--- a/indra/newview/llpreviewtexture.h
+++ b/indra/newview/llpreviewtexture.h
@@ -64,7 +64,8 @@ public:
 	virtual void		draw();
 
 	virtual BOOL		canSaveAs() const;
-	virtual void		saveAs();
+	virtual void		saveAs(){ saveAsType(false); }
+	void				saveAsType(BOOL png);
 	void				saveAs_continued(LLViewerInventoryItem const* item, AIFilePicker* filepicker);
 	virtual LLUUID		getItemID();
 	virtual std::string	getItemCreatorName();
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index bb1ad75a4..8f3019121 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -504,6 +504,19 @@ class LLFileSavePreview : public view_listener_t
 	}
 };
 
+class LLFileSavePreviewPNG : public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		LLFloater* top = gFloaterView->getFrontmost();
+		if (top)
+		{
+			top->saveAsType(true);
+		}
+		return true;
+	}
+};
+
 class LLFileTakeSnapshot : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -1313,6 +1326,7 @@ void init_menu_file()
 	(new LLFileMinimizeAllWindows())->registerListener(gMenuHolder, "File.MinimizeAllWindows");
 	// </edit>
 	(new LLFileSavePreview())->registerListener(gMenuHolder, "File.SavePreview");
+	(new LLFileSavePreviewPNG())->registerListener(gMenuHolder, "File.SavePreviewPNG");
 	(new LLFileTakeSnapshot())->registerListener(gMenuHolder, "File.TakeSnapshot");
 	(new LLFileTakeSnapshotToDisk())->registerListener(gMenuHolder, "File.TakeSnapshotToDisk");
 	(new LLFileQuit())->registerListener(gMenuHolder, "File.Quit");
diff --git a/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index 41ffa8969..f40659986 100644
--- a/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -1345,11 +1345,11 @@ Select the thumbnail to choose a different texture.
 			<string name="estate_override">
 				One or more of these options is set at the estate level
 			</string>
-			<string name="minutes"/>minutes</string>
-			<string name="1_minute"/>1 minute</string>
-			<string name="1_second"/>1 second</string>
-			<string name="seconds"/>seconds</string>
-			<string name="remaining"/>remaining</string>
+			<string name="minutes">minutes</string>
+			<string name="1_minute">1 minute</string>
+			<string name="1_second">1 second</string>
+			<string name="seconds">seconds</string>
+			<string name="remaining">remaining</string>
 			<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall"
 			     height="16" initial_value="false" label="Allow Group Access: [GROUP]"
 			     left="8" mouse_opaque="true" name="GroupCheck" radio_style="false"
diff --git a/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 4836b0913..a895b85e2 100644
--- a/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -52,11 +52,16 @@
 		</menu_item_call>
 		<menu_item_separator bottom="-121" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator2" width="243" />
-		<menu_item_call bottom="-140" enabled="true" height="19" label="Save Preview As..." left="0"
+		<menu_item_call bottom="-140" enabled="true" height="19" label="Save Preview As (TGA)..." left="0"
 		     mouse_opaque="true" name="Save Preview As..." width="243">
 			<on_click function="File.SavePreview" userdata="" />
 			<on_enable function="File.EnableSaveAs" />
 		</menu_item_call>
+		<menu_item_call bottom="-140" enabled="true" height="19" label="Save Preview As (PNG)..." left="0"
+		     mouse_opaque="true" name="Save Preview AsPNG..." width="243">
+			<on_click function="File.SavePreviewPNG" userdata="" />
+			<on_enable function="File.EnableSaveAs" />
+		</menu_item_call>
 		<menu_item_separator bottom="-148" enabled="true" height="8" label="-----------" left="0"
 		     mouse_opaque="true" name="separator3" width="243" />
 		<menu_item_call bottom="-167" enabled="true" height="19" label="Take Snapshot" left="0"
diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index 59d5fb300..27ce90b7e 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -3569,7 +3569,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 	<string name="IM_autoresponded_to">Autoresponse sent to</string>
 	<string name="IM_autoresponse_sent_item">was sent auto-response item</string>
 	<string name="Unnamed">(Unnamed)</string>
-	<string name="Saved_message">(Saved [LONG_TIMESTAMP])</string>
+	<string name="Saved_message">(Saved [LONG_TIMESTAMP]) </string>
 	<string name="PowerUser1">You are bestowed with powers beyond mortal comprehension.</string>
 	<string name="PowerUser2">Use your newfound abilities wisely.</string>
 	<string name="Unlocked:">Unlocked:</string>

From efe3dd77fa3b2c36c98f41a818c69718ef5aa27e Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Wed, 8 Aug 2012 15:51:26 -0400
Subject: [PATCH 160/199] Address Issue 91: Estate ban button added to radar

Shift-Enter in radar now starts an IM with people selected.
Also, it seems Dark used black for texts and should... so... let's reverse that change.
---
 indra/newview/llfloateravatarlist.cpp         | 58 +++++++++++++++++--
 indra/newview/llfloateravatarlist.h           |  2 +
 indra/newview/skins/dark/colors.xml           |  1 -
 .../skins/default/xui/en-us/floater_radar.xml | 14 ++++-
 .../skins/default/xui/en-us/notifications.xml | 12 ++++
 5 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index 801633eaf..c038db2a0 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -319,11 +319,6 @@ BOOL LLFloaterAvatarList::postBuild()
 	mTracking = FALSE;
 	mUpdate = TRUE;
 
-	// Hide them until some other way is found
-	// Users may not expect to find a Ban feature on the Eject button
-	// Perhaps turn it into a FlyOutButton?
-	childSetVisible("estate_ban_btn", false);
-
 	// Set callbacks
 	childSetAction("profile_btn", onClickProfile, this);
 	childSetAction("im_btn", onClickIM, this);
@@ -344,6 +339,7 @@ BOOL LLFloaterAvatarList::postBuild()
 	childSetAction("ar_btn", onClickAR, this);
 	childSetAction("teleport_btn", onClickTeleport, this);
 	childSetAction("estate_eject_btn", onClickEjectFromEstate, this);
+	childSetAction("estate_ban_btn", onClickBanFromEstate, this);
 
 	childSetAction("send_keys_btn", onClickSendKeys, this);
 
@@ -1111,6 +1107,36 @@ BOOL LLFloaterAvatarList::handleKeyHere(KEY key, MASK mask)
 			return TRUE;
 		}
 	}
+
+	if (( KEY_RETURN == key ) && (MASK_SHIFT == mask))
+	{
+		LLDynamicArray<LLUUID> ids = self->mAvatarList->getSelectedIDs();
+		if (ids.size() > 0)
+		{
+			if (ids.size() == 1)
+			{
+				// Single avatar
+				LLUUID agent_id = ids[0];
+
+				// [Ansariel: Display name support]
+				LLAvatarName avatar_name;
+				if (LLAvatarNameCache::get(agent_id, &avatar_name))
+				{
+					gIMMgr->setFloaterOpen(TRUE);
+					gIMMgr->addSession(LLCacheName::cleanFullName(avatar_name.getLegacyName()),IM_NOTHING_SPECIAL,agent_id);
+				}
+				// [Ansariel: Display name support]
+			}
+			else
+			{
+				// Group IM
+				LLUUID session_id;
+				session_id.generate();
+				gIMMgr->setFloaterOpen(TRUE);
+				gIMMgr->addSession("Avatars Conference", IM_SESSION_CONFERENCE_START, ids[0], ids);
+			}
+		}
+	}
 	return LLPanel::handleKeyHere(key, mask);
 }
 
@@ -1499,6 +1525,7 @@ static void cmd_eject(const LLUUID& avatar, const std::string& name)       { sen
 static void cmd_ban(const LLUUID& avatar, const std::string& name)         { send_eject(avatar, true); }
 static void cmd_profile(const LLUUID& avatar, const std::string& name)     { LLFloaterAvatarInfo::showFromDirectory(avatar); }
 static void cmd_estate_eject(const LLUUID& avatar, const std::string& name){ send_estate_message("teleporthomeuser", avatar); }
+static void cmd_estate_ban(const LLUUID &avatar, const std::string &name)  { LLPanelEstateInfo::sendEstateAccessDelta(ESTATE_ACCESS_BANNED_AGENT_ADD | ESTATE_ACCESS_ALLOWED_AGENT_REMOVE | ESTATE_ACCESS_NO_REPLY, avatar); }
 
 void LLFloaterAvatarList::doCommand(void (*func)(const LLUUID& avatar, const std::string& name))
 {
@@ -1594,6 +1621,18 @@ void LLFloaterAvatarList::callbackEjectFromEstate(const LLSD& notification, cons
 	}
 }
 
+//static
+void LLFloaterAvatarList::callbackBanFromEstate(const LLSD& notification, const LLSD& response)
+{
+	S32 option = LLNotification::getSelectedOption(notification, response);
+
+	if (option == 0)
+	{
+		getInstance()->doCommand(cmd_estate_eject); //Eject first, just in case.
+		getInstance()->doCommand(cmd_estate_ban);
+	}
+}
+
 //static
 void LLFloaterAvatarList::callbackIdle(void* userdata)
 {
@@ -1663,6 +1702,15 @@ void LLFloaterAvatarList::onClickEjectFromEstate(void* userdata)
 	LLNotificationsUtil::add("EstateKickUser", args, payload, callbackEjectFromEstate);
 }
 
+//static
+void LLFloaterAvatarList::onClickBanFromEstate(void* userdata)
+{
+	LLSD args;
+	LLSD payload;
+	args["EVIL_USER"] = ((LLFloaterAvatarList*)userdata)->getSelectedNames();
+	LLNotificationsUtil::add("EstateBanUser", args, payload, callbackBanFromEstate);
+}
+
 //static
 void LLFloaterAvatarList::onClickAR(void* userdata)
 {
diff --git a/indra/newview/llfloateravatarlist.h b/indra/newview/llfloateravatarlist.h
index 6051a8b88..46bdd1a0f 100644
--- a/indra/newview/llfloateravatarlist.h
+++ b/indra/newview/llfloateravatarlist.h
@@ -282,11 +282,13 @@ private:
 	static void onClickAR(void *userdata);
 	static void onClickTeleport(void *userdata);
 	static void onClickEjectFromEstate(void *userdata);
+	static void onClickBanFromEstate(void *userdata);
 
 	static void callbackFreeze(const LLSD& notification, const LLSD& response);
 	static void callbackEject(const LLSD& notification, const LLSD& response);
 	static void callbackAR(void *userdata);
 	static void callbackEjectFromEstate(const LLSD& notification, const LLSD& response);
+	static void callbackBanFromEstate(const LLSD& notification, const LLSD& response);
 
 	static void onSelectName(LLUICtrl*, void *userdata);
 
diff --git a/indra/newview/skins/dark/colors.xml b/indra/newview/skins/dark/colors.xml
index 2766ba09b..032351a88 100644
--- a/indra/newview/skins/dark/colors.xml
+++ b/indra/newview/skins/dark/colors.xml
@@ -70,7 +70,6 @@
 <ScrollHighlightedColor value="183, 184, 188, 128"/>	<!-- Hover color -->
 <ScrollbarThumbColor value="100, 100, 100, 255"/>
 <ScrollbarTrackColor value="153, 154, 158, 255"/>
-<DefaultListText value="255, 255, 255, 255"/>           <!-- We are replacing all the hardcoded black text with this color so we can make skins with white text on dark background -->
 
 <!-- MENUS -->
 <MenuBarBgColor value="62, 62, 62, 255"/>
diff --git a/indra/newview/skins/default/xui/en-us/floater_radar.xml b/indra/newview/skins/default/xui/en-us/floater_radar.xml
index 75fe1898f..b3b32412e 100644
--- a/indra/newview/skins/default/xui/en-us/floater_radar.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_radar.xml
@@ -60,7 +60,7 @@
 			<button
 			       name="im_btn"
 			       label="IM"
-			       tool_tip="Open Instant Message session"
+			       tool_tip="Open Instant Message session (Shift-Enter)"
 			       left="10"
 			       bottom_delta="-22"
 			       width="80"
@@ -267,6 +267,18 @@
 			       font="SansSerifSmall"
 			       follows="bottom|left"
 			       />
+			<!-- Lowest row -->
+			<button
+			       name="estate_ban_btn"
+			       label="Eject And Ban From Estate"
+			       tool_tip="Eject and Ban this avatar from the estate"
+			       left="10"
+			       bottom_delta="-24"
+			       width="260"
+			       height="20"
+			       font="SansSerifSmall"
+			       follows="bottom|left"
+			       />
 		</panel>
 
 		<panel border="true" bottom_delta="-150" follows="left|top|right|bottom" height="255"
diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml
index 83da40766..4c0be8b3d 100644
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -3545,6 +3545,18 @@ Kick [EVIL_USER] from this estate?
      yestext="OK"/>
   </notification>
 
+  <notification
+   icon="alert.tga"
+   label="Confirm Kick and Ban"
+   name="EstateBanUser"
+   type="alert">
+Kick and Ban [EVIL_USER] from this estate?
+    <usetemplate
+     name="okcancelbuttons"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
   <notification
    icon="alertmodal.tga"
    name="EstateChangeCovenant"

From 46e57d4f1c7192cfe469e49639fe5f5bd6aecad9 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Thu, 9 Aug 2012 03:46:24 +0200
Subject: [PATCH 161/199] Package FMOD Ex on Linux

---
 indra/newview/CMakeLists.txt     |  9 +++++++++
 indra/newview/viewer_manifest.py | 10 ++++++++++
 2 files changed, 19 insertions(+)

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index d8514030f..d3c46bafb 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1595,6 +1595,14 @@ if (LINUX)
 
   set(product ${VIEWER_BRANDING_NAME_CAMELCASE}-${ARCH}-${viewer_VERSION})
 
+  if (FMODEX)
+    if(MANIFEST_LIBRARIES)
+      set(MANIFEST_LIBRARIES "${MANIFEST_LIBRARIES}|${FMODEX_LIBRARY}")
+    else(MANIFEST_LIBRARIES)
+      set(MANIFEST_LIBRARIES "--extra_libraries=${FMODEX_LIBRARY}")
+    endif(MANIFEST_LIBRARIES)
+  endif (FMODEX)
+
   add_custom_command(
       OUTPUT ${product}.tar.bz2
       COMMAND ${PYTHON_EXECUTABLE}
@@ -1613,6 +1621,7 @@ if (LINUX)
         --dest=${CMAKE_CURRENT_BINARY_DIR}/packaged
         --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
         --buildtype=${CMAKE_BUILD_TYPE}
+		  ${MANIFEST_LIBRARIES}
       DEPENDS secondlife-stripped ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
       )
 
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index e595d9e13..4775a72e9 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -809,6 +809,16 @@ class Linux_i686Manifest(LinuxManifest):
             self.end_prefix("lib")
 
 
+            if self.args['extra_libraries'] != None:
+                print self.args['extra_libraries']
+                path_list = self.args['extra_libraries'].split('|')
+                for path in path_list:
+                    path = os.path.realpath(path)
+                    path_pair = path.rsplit('/', 1)
+                    if self.prefix(src=path_pair[0], dst="lib"):
+                        self.path(path_pair[1])
+                        self.end_prefix()
+
             # Vivox runtimes
             if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
                     self.path("SLVoice")

From 26109ca8f9448c64220a32855d1d8654d7227d77 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Thu, 9 Aug 2012 04:50:48 +0200
Subject: [PATCH 162/199] Assert fix

---
 indra/newview/llappviewer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 0d5f752ca..955a420c6 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1659,7 +1659,8 @@ bool LLAppViewer::cleanup()
 	
 	writeDebugInfo();
 
-	LLViewerMedia::saveCookieFile();
+	if(!gDirUtilp->getLindenUserDir(true).empty())
+			LLViewerMedia::saveCookieFile();
 	// Stop the plugin read thread if it's running.
 	LLPluginProcessParent::setUseReadThread(false);
 

From e616b40c6f301bad2e8e4f28bb369e4e3d2a7ee5 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Thu, 9 Aug 2012 05:09:02 +0200
Subject: [PATCH 163/199] Autodetect music stream type properly

---
 indra/llaudio/llstreamingaudio_fmodex.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/indra/llaudio/llstreamingaudio_fmodex.cpp b/indra/llaudio/llstreamingaudio_fmodex.cpp
index 33fd30fee..d4e52d340 100644
--- a/indra/llaudio/llstreamingaudio_fmodex.cpp
+++ b/indra/llaudio/llstreamingaudio_fmodex.cpp
@@ -395,12 +395,12 @@ LLAudioStreamManagerFMODEX::LLAudioStreamManagerFMODEX(FMOD::System *system, con
 {
 	mInternetStreamURL = url;
 
-	FMOD_CREATESOUNDEXINFO exinfo;
+	/*FMOD_CREATESOUNDEXINFO exinfo;
 	memset(&exinfo,0,sizeof(exinfo));
 	exinfo.cbsize = sizeof(exinfo);
-	exinfo.suggestedsoundtype = FMOD_SOUND_TYPE_MPEG;	//Hint to speed up loading.
+	exinfo.suggestedsoundtype = FMOD_SOUND_TYPE_OGGVORBIS;	//Hint to speed up loading.*/
 
-	FMOD_RESULT result = mSystem->createStream(url.c_str(), FMOD_2D | FMOD_NONBLOCKING | FMOD_IGNORETAGS, &exinfo, &mInternetStream);
+	FMOD_RESULT result = mSystem->createStream(url.c_str(), FMOD_2D | FMOD_NONBLOCKING | FMOD_IGNORETAGS, 0, &mInternetStream);
 
 	if (result!= FMOD_OK)
 	{

From 37c8ea54ebfe28b0d84756b88fdf97600a096ea4 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Thu, 9 Aug 2012 06:30:31 +0200
Subject: [PATCH 164/199] Add AIThreadID - Cleanup of apr_os_thread* related
 code.

Apart from just really cleaning things up and moving
everything into one class regarding thread IDs (ie,
is_main_thread(), comparing ID's etc), this also
fixes an obscure bug where LL was casting thread ID's
to U32 and then compared those to find out if it
the same thread. It's theoretically possible that
such fails on a 64bit OS.

By generalizing the interface, I adopted the use
of a thread-local cache for the current thread ID
as used by LLMutex et al, so now all code benefits
from that. The idea was even extended to now also
be used for is_main_thread() tests and even resetting
a thread ID to the ID of the current thread.
---
 indra/cwdebug/debug.h                         | 15 +--
 indra/llcommon/CMakeLists.txt                 |  8 +-
 indra/llcommon/aithreadid.cpp                 | 70 ++++++++++++++
 indra/llcommon/aithreadid.h                   | 91 +++++++++++++++++++
 indra/llcommon/aithreadsafe.h                 |  6 +-
 indra/llcommon/llaprpool.cpp                  |  6 +-
 indra/llcommon/llaprpool.h                    | 16 ++--
 indra/llcommon/llerror.h                      |  4 -
 indra/llcommon/llframetimer.h                 |  3 +
 indra/llcommon/llthread.cpp                   | 83 ++++++++---------
 indra/llcommon/llthread.h                     | 38 ++------
 indra/newview/statemachine/aistatemachine.cpp | 10 +-
 indra/newview/statemachine/aistatemachine.h   |  6 +-
 13 files changed, 246 insertions(+), 110 deletions(-)
 create mode 100644 indra/llcommon/aithreadid.cpp
 create mode 100644 indra/llcommon/aithreadid.h

diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h
index 4161e18f7..b704c811d 100644
--- a/indra/cwdebug/debug.h
+++ b/indra/cwdebug/debug.h
@@ -49,6 +49,7 @@
 #else // LL_COMMON_LINK_SHARED
 #error LL_COMMON_LINK_SHARED not defined
 #endif // LL_COMMON_LINK_SHARED
+#include "aithreadid.h"
 
 // If CWDEBUG is not defined, but DEBUG_CURLIO is, then replace
 // some of the cwd macro's with something that generates viewer
@@ -104,23 +105,23 @@ struct fake_channel {
   void on() const { }
   void off() const { }
 };
-extern CWD_API fake_channel const warning;
-extern CWD_API fake_channel const curl;
-extern CWD_API fake_channel const curlio;
-extern CWD_API fake_channel const statemachine;
-extern CWD_API fake_channel const notice;
+extern LL_COMMON_API fake_channel const warning;
+extern LL_COMMON_API fake_channel const curl;
+extern LL_COMMON_API fake_channel const curlio;
+extern LL_COMMON_API fake_channel const statemachine;
+extern LL_COMMON_API fake_channel const notice;
 
 } // namespace dc
 } // namespace debug
 
 #define Debug(x) do { using namespace debug; x; } while(0)
-#define Dout(a, b) do { using namespace debug;  if ((a).mOn) { llinfos_nf << (a).mLabel << ": " << Indent::print << b << llendl; } } while(0)
+#define Dout(a, b) do { using namespace debug;  if ((a).mOn) { llinfos_nf << AIThreadID::DoutPrint << (a).mLabel << ": " << Indent::print << b << llendl; } } while(0)
 #define DoutEntering(a, b) \
   int __slviewer_debug_indentation = 2; \
   { \
 	using namespace debug; \
 	if ((a).mOn) \
-	  llinfos_nf << (a).mLabel << ": " << Indent::print << "Entering " << b << llendl; \
+	  llinfos_nf << AIThreadID::DoutPrint << (a).mLabel << ": " << Indent::print << "Entering " << b << llendl; \
     else \
 	  __slviewer_debug_indentation = 0; \
   } \
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 4be690734..cf1e564ae 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -15,8 +15,9 @@ include_directories(
     )
 
 set(llcommon_SOURCE_FILES
-	aiframetimer.cpp
-	imageids.cpp
+    aiframetimer.cpp
+    aithreadid.cpp
+    imageids.cpp
     indra_constants.cpp
     llallocator.cpp
     llallocator_heap_profile.cpp
@@ -24,7 +25,7 @@ set(llcommon_SOURCE_FILES
     llapr.cpp
     llaprpool.cpp
     llassettype.cpp
-	llavatarname.cpp
+    llavatarname.cpp
     llbase32.cpp
     llbase64.cpp
     llcommon.cpp
@@ -103,6 +104,7 @@ set(llcommon_HEADER_FILES
     CMakeLists.txt
 
     aiframetimer.h
+    aithreadid.h
     aithreadsafe.h
     bitpack.h
     ctype_workaround.h
diff --git a/indra/llcommon/aithreadid.cpp b/indra/llcommon/aithreadid.cpp
new file mode 100644
index 000000000..dfb4a2660
--- /dev/null
+++ b/indra/llcommon/aithreadid.cpp
@@ -0,0 +1,70 @@
+/**
+ * @file aithreadid.cpp
+ *
+ * Copyright (c) 2012, Aleric Inglewood.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * 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.
+ *
+ * CHANGELOG
+ *   and additional copyright holders.
+ *
+ *   08/08/2012
+ *   - Initial version, written by Aleric Inglewood @ SL
+ */
+
+#include "sys.h"
+#include <iostream>
+#include <iomanip>
+#include "aithreadid.h"
+
+AIThreadID const AIThreadID::sNone(AIThreadID::none);
+apr_os_thread_t AIThreadID::sMainThreadID;
+#ifndef LL_DARWIN
+apr_os_thread_t ll_thread_local AIThreadID::lCurrentThread = AIThreadID::undefinedID;
+#endif
+
+void AIThreadID::set_main_thread_id(void)
+{
+	sMainThreadID = apr_os_thread_current();
+}
+
+void AIThreadID::set_current_thread_id(void)
+{
+#ifndef LL_DARWIN
+	lCurrentThread = apr_os_thread_current();
+#endif
+}
+
+std::ostream& operator<<(std::ostream& os, AIThreadID const& id)
+{
+	return os << id.mID;
+}
+
+std::ostream& operator<<(std::ostream& os, AIThreadID::dout_print_t)
+{
+	if (!AIThreadID::in_main_thread())
+	{
+#ifdef LL_DARWIN
+		os << std::hex << (size_t)apr_os_thread_current() << std::dec << ' ';
+#else
+		os << std::hex << (size_t)AIThreadID::lCurrentThread << std::dec << ' ';
+#endif
+	}
+	return os;
+}
+
diff --git a/indra/llcommon/aithreadid.h b/indra/llcommon/aithreadid.h
new file mode 100644
index 000000000..c565b5913
--- /dev/null
+++ b/indra/llcommon/aithreadid.h
@@ -0,0 +1,91 @@
+/**
+ * @file aithreadid.h
+ * @brief Declaration of AIThreadID.
+ *
+ * Copyright (c) 2012, Aleric Inglewood.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * 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.
+ *
+ * CHANGELOG
+ *   and additional copyright holders.
+ *
+ *   08/08/2012
+ *   Initial version, written by Aleric Inglewood @ SL
+ */
+
+#ifndef AI_THREAD_ID
+#define AI_THREAD_ID
+
+#include <apr_portable.h>	// apr_os_thread_t, apr_os_thread_current(), apr_os_thread_equal().
+#include <iosfwd>			// std::ostream.
+#include "llpreprocessor.h"	// LL_COMMON_API
+#include "llerror.h"
+
+#if LL_WINDOWS
+#define ll_thread_local __declspec(thread)
+#else
+#define ll_thread_local __thread
+#endif
+
+// Lightweight wrapper around apr_os_thread_t.
+// This class introduces no extra assembly code after optimization; it's only intend is to provide type-safety.
+class LL_COMMON_API AIThreadID
+{
+private:
+	apr_os_thread_t mID;
+	static apr_os_thread_t sMainThreadID;
+	static apr_os_thread_t const undefinedID = (apr_os_thread_t)-1;
+#ifndef LL_DARWIN
+	static ll_thread_local apr_os_thread_t lCurrentThread;
+#endif
+public:
+	static AIThreadID const sNone;
+	enum undefined_thread_t { none };
+	enum dout_print_t { DoutPrint };
+
+public:
+	AIThreadID(void) : mID(apr_os_thread_current()) { }
+	explicit AIThreadID(undefined_thread_t) : mID(undefinedID) { }		// Used for sNone.
+	AIThreadID(AIThreadID const& id) : mID(id.mID) { }
+	AIThreadID& operator=(AIThreadID const& id) { mID = id.mID; return *this; }
+	bool is_main_thread(void) const { return apr_os_thread_equal(mID, sMainThreadID); }
+	bool is_no_thread(void) const { return apr_os_thread_equal(mID, sNone.mID); }
+	friend LL_COMMON_API bool operator==(AIThreadID const& id1, AIThreadID const& id2) { return apr_os_thread_equal(id1.mID, id2.mID); }
+	friend LL_COMMON_API bool operator!=(AIThreadID const& id1, AIThreadID const& id2) { return !apr_os_thread_equal(id1.mID, id2.mID); }
+	friend LL_COMMON_API std::ostream& operator<<(std::ostream& os, AIThreadID const& id);
+	friend LL_COMMON_API std::ostream& operator<<(std::ostream& os, dout_print_t);
+	static void set_main_thread_id(void);					// Called once to set sMainThreadID.
+	static void set_current_thread_id(void);				// Called once for every thread to set lCurrentThread.
+#ifdef LL_DARWIN
+	void reset(void) { mID = apr_os_thread_current(); }
+	bool equals_current_thread(void) const { return apr_os_thread_equal(mID, apr_os_thread_current()); }
+	static bool in_main_thread(void) { return apr_os_thread_equal(apr_os_thread_current(), sMainThreadID); }
+#else
+	void reset(void) { mID = lCurrentThread; }
+	bool equals_current_thread(void) const { return apr_os_thread_equal(mID, lCurrentThread); }
+	static bool in_main_thread(void) { return apr_os_thread_equal(lCurrentThread, sMainThreadID); }
+#endif
+};
+
+// Legacy function.
+inline bool is_main_thread(void)
+{
+  return AIThreadID::in_main_thread();
+}
+
+#endif // AI_THREAD_ID
diff --git a/indra/llcommon/aithreadsafe.h b/indra/llcommon/aithreadsafe.h
index b7d0045cb..02bfa8cd7 100644
--- a/indra/llcommon/aithreadsafe.h
+++ b/indra/llcommon/aithreadsafe.h
@@ -673,18 +673,18 @@ protected:
 
 #ifdef LL_DEBUG
 	mutable bool mAccessed;
-	mutable apr_os_thread_t mTheadID;
+	mutable AIThreadID mTheadID;
 
 	void accessed(void) const
 	{
 	  if (!mAccessed)
 	  {
 		mAccessed = true;
-		mTheadID = apr_os_thread_current();
+		mTheadID.reset();
 	  }
 	  else
 	  {
-		llassert_always(apr_os_thread_equal(mTheadID, apr_os_thread_current()));
+		llassert_always(mTheadID.equals_current_thread());
 	  }
 	}
 #endif
diff --git a/indra/llcommon/llaprpool.cpp b/indra/llcommon/llaprpool.cpp
index 3559ff430..de5761157 100644
--- a/indra/llcommon/llaprpool.cpp
+++ b/indra/llcommon/llaprpool.cpp
@@ -60,10 +60,10 @@ void LLAPRPool::create(LLAPRPool& parent)
 	//
 	// In other words, it's safe for any thread to create a (sub)pool, independent of who
 	// owns the parent pool.
-	mOwner = apr_os_thread_current();
+	mOwner.reset();
 #else
 	mOwner = mParent->mOwner;
-	llassert(apr_os_thread_equal(mOwner, apr_os_thread_current()));
+	llassert(mOwner.equals_current_thread());
 #endif
 	apr_status_t const apr_pool_create_status = apr_pool_create(&mPool, mParent->mPool);
 	llassert_always(apr_pool_create_status == APR_SUCCESS);
@@ -83,7 +83,7 @@ void LLAPRPool::destroy(void)
 		// of course. Otherwise, if we are a subpool, only the thread that owns
 		// the parent may destruct us, since that is the pool that is still alive,
 		// possibly being used by others and being altered here.
-		llassert(!mParent || apr_os_thread_equal(mParent->mOwner, apr_os_thread_current()));
+		llassert(!mParent || mParent->mOwner.equals_current_thread());
 #endif
 		apr_pool_t* pool = mPool;
 		mPool = NULL;				// Mark that we are BEING destructed.
diff --git a/indra/llcommon/llaprpool.h b/indra/llcommon/llaprpool.h
index dc123e942..4c9f36893 100644
--- a/indra/llcommon/llaprpool.h
+++ b/indra/llcommon/llaprpool.h
@@ -62,22 +62,22 @@ class LL_COMMON_API LLAPRPool
 protected:
 	apr_pool_t* mPool;			//!< Pointer to the underlaying pool. NULL if not initialized.
 	LLAPRPool* mParent;			//!< Pointer to the parent pool, if any. Only valid when mPool is non-zero.
-	apr_os_thread_t mOwner;		//!< The thread that owns this memory pool. Only valid when mPool is non-zero.
+	AIThreadID mOwner;			//!< The thread that owns this memory pool. Only valid when mPool is non-zero.
 
 public:
 	//! Construct an uninitialized (destructed) pool.
-	LLAPRPool(void) : mPool(NULL) { }
+	LLAPRPool(void) : mPool(NULL), mOwner(AIThreadID::none) { }
 
     //! Construct a subpool from an existing pool.
 	// This is not a copy-constructor, this class doesn't have one!
-	LLAPRPool(LLAPRPool& parent) : mPool(NULL) { create(parent); }
+	LLAPRPool(LLAPRPool& parent) : mPool(NULL), mOwner(AIThreadID::none) { create(parent); }
 
 	//! Destruct the memory pool (free all of it's subpools and allocated memory).
 	~LLAPRPool() { destroy(); }
 
 protected:
 	// Create a pool that is allocated from the Operating System. Only used by LLAPRRootPool.
-	LLAPRPool(int) : mPool(NULL), mParent(NULL), mOwner(apr_os_thread_current())
+	LLAPRPool(int) : mPool(NULL), mParent(NULL)
 	{
 		apr_status_t const apr_pool_create_status = apr_pool_create(&mPool, NULL);
 		llassert_always(apr_pool_create_status == APR_SUCCESS);
@@ -104,7 +104,7 @@ public:
 	apr_pool_t* operator()(void) const
 	{
 		llassert(mPool);
-		llassert(apr_os_thread_equal(mOwner, apr_os_thread_current()));
+		llassert(mOwner.equals_current_thread());
 		return mPool;
 	}
 
@@ -112,7 +112,7 @@ public:
 	void clear(void)
 	{
 		llassert(mPool);
-		llassert(apr_os_thread_equal(mOwner, apr_os_thread_current()));
+		llassert(mOwner.equals_current_thread());
 		apr_pool_clear(mPool);
 	}
 
@@ -124,13 +124,13 @@ public:
 	void* palloc(size_t size)
 	{
 		llassert(mPool);
-		llassert(apr_os_thread_equal(mOwner, apr_os_thread_current()));
+		llassert(mOwner.equals_current_thread());
 		return apr_palloc(mPool, size);
 	}
 	void* pcalloc(size_t size)
 	{
 		llassert(mPool);
-		llassert(apr_os_thread_equal(mOwner, apr_os_thread_current()));
+		llassert(mOwner.equals_current_thread());
 		return apr_pcalloc(mPool, size);
 	}
 #endif
diff --git a/indra/llcommon/llerror.h b/indra/llcommon/llerror.h
index d0279f866..c4865e947 100644
--- a/indra/llcommon/llerror.h
+++ b/indra/llcommon/llerror.h
@@ -308,8 +308,4 @@ typedef LLError::NoClassInfo _LL_CLASS_TO_LOG;
 		Such computation is done iff the message will be logged.
 	*/
 
-#ifdef SHOW_ASSERT
-extern LL_COMMON_API bool is_main_thread();
-#endif
-
 #endif // LL_LLERROR_H
diff --git a/indra/llcommon/llframetimer.h b/indra/llcommon/llframetimer.h
index bae3e5615..2bb1943c8 100644
--- a/indra/llcommon/llframetimer.h
+++ b/indra/llcommon/llframetimer.h
@@ -44,6 +44,9 @@
 #include "lltimer.h"
 #include "timing.h"
 #include <apr_thread_mutex.h>
+#ifdef SHOW_ASSERT
+#include "aithreadid.h"			// is_main_thread()
+#endif
 
 class LL_COMMON_API LLFrameTimer
 {
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
index dd0efb422..c8d0be2f4 100644
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -67,18 +67,12 @@
 // 
 //----------------------------------------------------------------------------
 
-#if !LL_DARWIN
-U32 ll_thread_local local_thread_ID = 0;
-#endif 
-
-U32 LLThread::sIDIter = 0;
 LLAtomicS32	LLThread::sCount = 0;
 LLAtomicS32	LLThread::sRunning = 0;
 
 LL_COMMON_API void assert_main_thread()
 {
-	static U32 s_thread_id = LLThread::currentID();
-	if (LLThread::currentID() != s_thread_id)
+	if (!AIThreadID::in_main_thread())
 	{
 		llerrs << "Illegal execution outside main thread." << llendl;
 	}
@@ -95,9 +89,8 @@ void *APR_THREAD_FUNC LLThread::staticRun(apr_thread_t *apr_threadp, void *datap
 
 	LLThread *threadp = (LLThread *)datap;
 
-#if !LL_DARWIN
-	local_thread_ID = threadp->mID;
-#endif
+	// Initialize thread-local cache of current thread ID (if supported).
+	AIThreadID::set_current_thread_id();
 
 	// Create a thread local data.
 	LLThreadLocalData::create(threadp);
@@ -137,7 +130,6 @@ LLThread::LLThread(std::string const& name) :
 	mStatus(STOPPED),
 	mThreadLocalData(NULL)
 {
-	mID = ++sIDIter;
 	sCount++;
 	llassert(sCount <= 50);
 	mRunCondition = new LLCondition;
@@ -281,12 +273,6 @@ void LLThread::setQuitting()
 	wake();
 }
 
-// static
-U32 LLThread::currentID()
-{
-	return (U32)apr_os_thread_current();
-}
-
 // static
 void LLThread::yield()
 {
@@ -315,14 +301,6 @@ void LLThread::wakeLocked()
 	}
 }
 
-//static
-apr_os_thread_t LLThread::sMainThreadID;
-
-void LLThread::set_main_thread_id(void)
-{
-	sMainThreadID = apr_os_thread_current();
-}
-
 // The thread private handle to access the LLThreadLocalData instance.
 apr_threadkey_t* LLThreadLocalData::sThreadLocalDataKey;
 
@@ -345,6 +323,10 @@ void LLThreadLocalData::init(void)
 		return;
 	}
 
+	// This function is called by the main thread (these values are also needed in the next line).
+	AIThreadID::set_main_thread_id();
+	AIThreadID::set_current_thread_id();
+
 	apr_status_t status = apr_threadkey_private_create(&sThreadLocalDataKey, &LLThreadLocalData::destroy, LLAPRRootPool::get()());
 	ll_apr_assert_status(status);   // Or out of memory, or system-imposed limit on the
 									// total number of keys per process {PTHREAD_KEYS_MAX}
@@ -352,9 +334,6 @@ void LLThreadLocalData::init(void)
 
 	// Create the thread-local data for the main thread (this function is called by the main thread).
 	LLThreadLocalData::create(NULL);
-
-	// This function is called by the main thread.
-	LLThread::set_main_thread_id();
 }
 
 // This is called once for every thread when the thread is destructed.
@@ -421,27 +400,19 @@ void LLCondition::broadcast()
 
 //============================================================================
 LLMutexBase::LLMutexBase() :
-	mLockingThread(NO_THREAD),
+	mLockingThread(AIThreadID::sNone),
 	mCount(0)
 {
 }
 
 bool LLMutexBase::isSelfLocked() const
 {
-#if LL_DARWIN
-	return mLockingThread == LLThread::currentID();
-#else
-	return mLockingThread == local_thread_ID;
-#endif
+	return mLockingThread.equals_current_thread();
 }
 
 void LLMutexBase::lock() 
 { 
-#if LL_DARWIN
-	if (mLockingThread == LLThread::currentID())
-#else
-	if (mLockingThread == local_thread_ID)
-#endif
+	if (mLockingThread.equals_current_thread())
 	{ //redundant lock
 		mCount++;
 		return;
@@ -449,11 +420,33 @@ void LLMutexBase::lock()
 
 	apr_thread_mutex_lock(mAPRMutexp);
 	
-#if LL_DARWIN
-	mLockingThread = LLThread::currentID();
-#else
-	mLockingThread = local_thread_ID;
-#endif
+	mLockingThread.reset();
+}
+
+bool LLMutexBase::tryLock()
+{
+	if (mLockingThread.equals_current_thread())
+	{ //redundant lock
+		mCount++;
+		return true;
+	}
+	bool success = !APR_STATUS_IS_EBUSY(apr_thread_mutex_trylock(mAPRMutexp));
+	if (success)
+	{
+		mLockingThread.reset();
+	}
+	return success;
+}
+
+// non-blocking, but does do a lock/unlock so not free
+bool LLMutexBase::isLocked() const
+{
+	if (mLockingThread.equals_current_thread())
+	  return false;		// A call to lock() won't block.
+	if (APR_STATUS_IS_EBUSY(apr_thread_mutex_trylock(mAPRMutexp)))
+	  return true;
+	apr_thread_mutex_unlock(mAPRMutexp);
+	return false;
 }
 
 void LLMutexBase::unlock()
@@ -463,7 +456,7 @@ void LLMutexBase::unlock()
 		mCount--;
 		return;
 	}
-	mLockingThread = NO_THREAD;
+	mLockingThread = AIThreadID::sNone;
 
 	apr_thread_mutex_unlock(mAPRMutexp);
 }
diff --git a/indra/llcommon/llthread.h b/indra/llcommon/llthread.h
index ef4303a02..549a090ec 100644
--- a/indra/llcommon/llthread.h
+++ b/indra/llcommon/llthread.h
@@ -45,17 +45,12 @@
 #include "apr_thread_cond.h"
 #include "llaprpool.h"
 #include "llatomic.h"
+#include "aithreadid.h"
 
 class LLThread;
 class LLMutex;
 class LLCondition;
 
-#if LL_WINDOWS
-#define ll_thread_local __declspec(thread)
-#else
-#define ll_thread_local __thread
-#endif
-
 class LL_COMMON_API LLThreadLocalDataMember
 {
 public:
@@ -85,10 +80,12 @@ private:
 	~LLThreadLocalData();
 };
 
+// Print to llerrs if the current thread is not the main thread.
+LL_COMMON_API void assert_main_thread();
+
 class LL_COMMON_API LLThread
 {
 private:
-	static apr_os_thread_t sMainThreadID;
 	static U32 sIDIter;
 	static LLAtomicS32	sCount;
 	static LLAtomicS32	sRunning;
@@ -108,11 +105,9 @@ public:
 	bool isQuitting() const { return (QUITTING == mStatus); }
 	bool isStopped() const { return (STOPPED == mStatus); }
 	
-	static U32 currentID(); // Return ID of current thread
 	static S32 getCount() { return sCount; }	
 	static S32 getRunning() { return sRunning; }
 	static void yield(); // Static because it can be called by the main thread, which doesn't have an LLThread data structure.
-	static bool is_main_thread(void) { return apr_os_thread_equal(LLThread::sMainThreadID, apr_os_thread_current()); }
 
 public:
 	// PAUSE / RESUME functionality. See source code for important usage notes.
@@ -136,11 +131,6 @@ public:
 	// Return thread-local data for the current thread.
 	static LLThreadLocalData& tldata(void) { return LLThreadLocalData::tldata(); }
 
-	// Called once, from LLThreadLocalData::init().
-	static void set_main_thread_id(void);
-
-	U32 getID() const { return mID; }
-
 private:
 	bool				mPaused;
 	
@@ -153,7 +143,6 @@ protected:
 
 	apr_thread_t		*mAPRThreadp;
 	volatile EThreadStatus		mStatus;
-	U32					mID;
 	
 	friend void LLThreadLocalData::create(LLThread* threadp);
 	LLThreadLocalData*  mThreadLocalData;
@@ -183,8 +172,7 @@ protected:
 };
 
 #ifdef SHOW_ASSERT
-LL_COMMON_API inline bool is_main_thread(void) { return LLThread::is_main_thread(); }
-#define ASSERT_SINGLE_THREAD do { static apr_os_thread_t first_thread_id = apr_os_thread_current(); llassert(apr_os_thread_equal(first_thread_id, apr_os_thread_current())); } while(0)
+#define ASSERT_SINGLE_THREAD do { static AIThreadID first_thread_id; llassert(first_thread_id.equals_current_thread()); } while(0)
 #else
 #define ASSERT_SINGLE_THREAD do { } while(0)
 #endif
@@ -204,32 +192,24 @@ LL_COMMON_API inline bool is_main_thread(void) { return LLThread::is_main_thread
 class LL_COMMON_API LLMutexBase
 {
 public:
-	typedef enum
-	{
-		NO_THREAD = 0xFFFFFFFF
-	} e_locking_thread;
-
 	LLMutexBase() ;
 	
 	void lock();		// blocks
 	void unlock();
 	// Returns true if lock was obtained successfully.
-	bool tryLock() { return !APR_STATUS_IS_EBUSY(apr_thread_mutex_trylock(mAPRMutexp)); }
+	bool tryLock();
 
-	// non-blocking, but does do a lock/unlock so not free
-	bool isLocked() { bool is_not_locked = tryLock(); if (is_not_locked) unlock(); return !is_not_locked; }
+	// Returns true if a call to lock() would block (returns false if self-locked()).
+	bool isLocked() const;
 
 	// Returns true if locked by this thread.
 	bool isSelfLocked() const;
 
-	// get ID of locking thread
-	U32 lockingThread() const { return mLockingThread; }
-
 protected:
 	// mAPRMutexp is initialized and uninitialized in the derived class.
 	apr_thread_mutex_t* mAPRMutexp;
 	mutable U32			mCount;
-	mutable U32			mLockingThread;
+	mutable AIThreadID	mLockingThread;
 
 private:
 	// Disallow copy construction and assignment.
diff --git a/indra/newview/statemachine/aistatemachine.cpp b/indra/newview/statemachine/aistatemachine.cpp
index 675317cb1..f008a4873 100644
--- a/indra/newview/statemachine/aistatemachine.cpp
+++ b/indra/newview/statemachine/aistatemachine.cpp
@@ -206,7 +206,7 @@ void AIStateMachine::locked_cont(void)
   // Atomic test mActive and change mIdle.
   mIdleActive.lock();
 #ifdef SHOW_ASSERT
-  mContThread = apr_os_thread_current();
+  mContThread.reset();
 #endif
   mIdle = false;
   bool not_active = mActive == as_idle;
@@ -253,7 +253,7 @@ void AIStateMachine::set_state(state_type state)
   mSetStateLock.lock();
 
   // Do not call set_state() unless running.
-  llassert(mState == bs_run || !LLThread::is_main_thread());
+  llassert(mState == bs_run || !is_main_thread());
 
   // If this function is called from another thread than the main thread, then we have to ignore
   // it if we're not idle and the state is less than the current state. The main thread must
@@ -279,12 +279,12 @@ void AIStateMachine::set_state(state_type state)
   // state is less than the current state, ignore it.
   // Also, if abort() or finish() was called, then we should just ignore it.
   if (mState != bs_run ||
-	  (!mIdle && state <= mRunState && !LLThread::is_main_thread()))
+	  (!mIdle && state <= mRunState && !AIThreadID::in_main_thread()))
   {
 #ifdef SHOW_ASSERT
 	// It's a bit weird if the same thread does two calls on a row where the second call
 	// has a smaller value: warn about that.
-	if (mState == bs_run && mContThread == apr_os_thread_current())
+	if (mState == bs_run && mContThread.equals_current_thread())
 	{
 	  llwarns << "Ignoring call to set_state(" << state_str(state) <<
 		  ") by non-main thread before main-thread could react on previous call, "
@@ -296,7 +296,7 @@ void AIStateMachine::set_state(state_type state)
   }
 
   // Do not call idle() when set_state is called from another thread; use idle(state_type) instead.
-  llassert(!mCalledThreadUnsafeIdle || LLThread::is_main_thread());
+  llassert(!mCalledThreadUnsafeIdle || is_main_thread());
 
   // Change mRunState to the requested value.
   if (mRunState != state)
diff --git a/indra/newview/statemachine/aistatemachine.h b/indra/newview/statemachine/aistatemachine.h
index 13da6fd3d..55028232b 100644
--- a/indra/newview/statemachine/aistatemachine.h
+++ b/indra/newview/statemachine/aistatemachine.h
@@ -208,7 +208,7 @@ class AIStateMachine {
 	S64 mSleep;									//!< Non-zero while the state machine is sleeping.
 	LLMutex mIdleActive;						//!< Used for atomic operations on the pair mIdle / mActive.
 #ifdef SHOW_ASSERT
-	apr_os_thread_t mContThread;				//!< Thread that last called locked_cont().
+	AIThreadID mContThread;						//!< Thread that last called locked_cont().
 	bool mCalledThreadUnsafeIdle;				//!< Set to true when idle() is called.
 #endif
 
@@ -242,7 +242,7 @@ class AIStateMachine {
 	//! Create a non-running state machine.
 	AIStateMachine(void) : mState(bs_initialize), mIdle(true), mAborted(true), mActive(as_idle), mSleep(0), mParent(NULL), mCallback(NULL)
 #ifdef SHOW_ASSERT
-		, mContThread(0), mCalledThreadUnsafeIdle(false)
+		, mContThread(AIThreadID::none), mCalledThreadUnsafeIdle(false)
 #endif
 		{ updateSettings(); }
 
@@ -269,7 +269,7 @@ class AIStateMachine {
 		mSetStateLock.lock();
 		// Ignore calls to cont() if the statemachine isn't idle. See comments in set_state().
 		// Calling cont() twice or after calling set_state(), without first calling idle(), is an error.
-		if (mState != bs_run || !mIdle) { llassert(mState != bs_run || mContThread != apr_os_thread_current()); mSetStateLock.unlock(); return; }
+		if (mState != bs_run || !mIdle) { llassert(mState != bs_run || !mContThread.equals_current_thread()); mSetStateLock.unlock(); return; }
 		locked_cont();
 	}
   private:

From b9673df961a3aa83f3edf382611ac8c0c55c9c32 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Thu, 9 Aug 2012 06:57:53 +0200
Subject: [PATCH 165/199] Clean up of debug.h: just use LL_COMMON_API.

---
 indra/cwdebug/debug.h | 39 ++++++++++-----------------------------
 1 file changed, 10 insertions(+), 29 deletions(-)

diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h
index b704c811d..f127da767 100644
--- a/indra/cwdebug/debug.h
+++ b/indra/cwdebug/debug.h
@@ -29,26 +29,6 @@
 
 #ifdef DEBUG_CURLIO
 
-#if LL_WINDOWS
-#define CWD_DLLEXPORT __declspec(dllexport)
-#define CWD_DLLIMPORT __declspec(dllimport)
-#elif LL_LINUX
-#define CWD_DLLEXPORT __attribute__ ((visibility("default")))
-#define CWD_DLLIMPORT
-#else
-#define CWD_DLLEXPORT
-#define CWD_DLLIMPORT
-#endif // LL_WINDOWS
-
-#if LL_COMMON_LINK_SHARED
-#if defined(llcommon_EXPORTS)
-#define CWD_API CWD_DLLEXPORT
-#else // cwdebug_EXPORTS
-#define CWD_API CWD_DLLIMPORT
-#endif // cwdebug_EXPORTS
-#else // LL_COMMON_LINK_SHARED
-#error LL_COMMON_LINK_SHARED not defined
-#endif // LL_COMMON_LINK_SHARED
 #include "aithreadid.h"
 
 // If CWDEBUG is not defined, but DEBUG_CURLIO is, then replace
@@ -59,10 +39,11 @@
 #include <string>
 
 #if LL_WINDOWS
-#define CWD_API_TLS __declspec(thread)
+// On windows, thread-local data is automatically exported.
+#define LL_COMMON_API_TLS __declspec(thread)
 #define CWD_TLS __declspec(thread)
 #else
-#define CWD_API_TLS CWD_API __thread
+#define LL_COMMON_API_TLS LL_COMMON_API __thread
 #define CWD_TLS __thread
 #endif
 
@@ -81,17 +62,17 @@ inline void init() { }
 struct libcwd_do_type {
  void on() const { }
 };
-extern CWD_API libcwd_do_type const libcw_do;
+extern LL_COMMON_API libcwd_do_type const libcw_do;
 struct Indent {
   int M_indent;
-  static CWD_API_TLS int S_indentation;
-  enum CWD_API print_nt { print };
-  CWD_API Indent(int indent) : M_indent(indent) { S_indentation += M_indent; }
-  CWD_API ~Indent() { S_indentation -= M_indent; }
+  static LL_COMMON_API_TLS int S_indentation;
+  enum LL_COMMON_API print_nt { print };
+  LL_COMMON_API Indent(int indent) : M_indent(indent) { S_indentation += M_indent; }
+  LL_COMMON_API ~Indent() { S_indentation -= M_indent; }
 };
 
-extern CWD_API std::ostream& operator<<(std::ostream& os, libcwd::buf2str const& b2s);
-extern CWD_API std::ostream& operator<<(std::ostream& os, Indent::print_nt);
+extern LL_COMMON_API std::ostream& operator<<(std::ostream& os, libcwd::buf2str const& b2s);
+extern LL_COMMON_API std::ostream& operator<<(std::ostream& os, Indent::print_nt);
 
 namespace dc {
 

From cd197a3807a503b248f1696d2cc78253739ea55d Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Thu, 9 Aug 2012 07:00:51 +0200
Subject: [PATCH 166/199] Fix LL_REF_COUNT_DEBUG debug code.

This code was broken with respect to LLAPRPool.
Fix that, and also fixed it for the new AIThreadID API.
---
 indra/llaudio/llaudiodecodemgr.cpp |  1 +
 indra/llcommon/llaprpool.h         |  1 +
 indra/llcommon/llmemory.h          |  1 -
 indra/llcommon/llrefcount.cpp      | 65 +++++-------------------------
 indra/llcommon/llrefcount.h        |  6 +--
 indra/llxml/llcontrol.h            |  1 +
 6 files changed, 17 insertions(+), 58 deletions(-)

diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp
index 5063cbe7a..596a6dcff 100644
--- a/indra/llaudio/llaudiodecodemgr.cpp
+++ b/indra/llaudio/llaudiodecodemgr.cpp
@@ -41,6 +41,7 @@
 #include "lldir.h"
 #include "llendianswizzle.h"
 #include "llassetstorage.h"
+#include "llrefcount.h"
 
 #include "vorbis/codec.h"
 #include "vorbis/vorbisfile.h"
diff --git a/indra/llcommon/llaprpool.h b/indra/llcommon/llaprpool.h
index 4c9f36893..74af351e4 100644
--- a/indra/llcommon/llaprpool.h
+++ b/indra/llcommon/llaprpool.h
@@ -48,6 +48,7 @@
 #include "apr_portable.h"
 #include "apr_pools.h"
 #include "llerror.h"
+#include "aithreadid.h"
 
 extern void ll_init_apr();
 
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index d01b43917..19cc720b0 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -523,7 +523,6 @@ void  LLPrivateMemoryPoolTester::operator delete[](void* addr)
 
 //EVENTUALLY REMOVE THESE:
 #include "llpointer.h"
-#include "llrefcount.h"
 #include "llsingleton.h"
 #include "llsafehandle.h"
 
diff --git a/indra/llcommon/llrefcount.cpp b/indra/llcommon/llrefcount.cpp
index e1876599f..d92735aac 100644
--- a/indra/llcommon/llrefcount.cpp
+++ b/indra/llcommon/llrefcount.cpp
@@ -38,14 +38,6 @@ LLRefCount::LLRefCount(const LLRefCount& other)
 :	mRef(0)
 {
 #if LL_REF_COUNT_DEBUG
-	if(gAPRPoolp)
-	{
-		mMutexp = new LLMutex(gAPRPoolp) ;
-	}
-	else
-	{
-		mMutexp = NULL ;
-	}
 	mCrashAtUnlock = FALSE ;
 #endif
 }
@@ -60,14 +52,6 @@ LLRefCount::LLRefCount() :
 	mRef(0)
 {
 #if LL_REF_COUNT_DEBUG
-	if(gAPRPoolp)
-	{
-		mMutexp = new LLMutex(gAPRPoolp) ;
-	}
-	else
-	{
-		mMutexp = NULL ;
-	}
 	mCrashAtUnlock = FALSE ;
 #endif
 }
@@ -78,29 +62,20 @@ LLRefCount::~LLRefCount()
 	{
 		llerrs << "deleting non-zero reference" << llendl;
 	}
-
-#if LL_REF_COUNT_DEBUG
-	if(gAPRPoolp)
-	{
-		delete mMutexp ;
-	}
-#endif
 }
 
 #if LL_REF_COUNT_DEBUG
 void LLRefCount::ref() const
 { 
-	if(mMutexp)
-	{
-		if(mMutexp->isLocked()) 
+		if(mMutex.isLocked()) 
 		{
 			mCrashAtUnlock = TRUE ;
 			llerrs << "the mutex is locked by the thread: " << mLockedThreadID 
-				<< " Current thread: " << LLThread::currentID() << llendl ;
+				<< " Current thread: " << AIThreadID() << llendl ;
 		}
 
-		mMutexp->lock() ;
-		mLockedThreadID = LLThread::currentID() ;
+		mMutex.lock() ;
+		mLockedThreadID.reset();
 
 		mRef++; 
 
@@ -108,27 +83,20 @@ void LLRefCount::ref() const
 		{
 			while(1); //crash here.
 		}
-		mMutexp->unlock() ;
-	}
-	else
-	{
-		mRef++; 
-	}
+		mMutex.unlock() ;
 } 
 
 S32 LLRefCount::unref() const
 {
-	if(mMutexp)
-	{
-		if(mMutexp->isLocked()) 
+		if(mMutex.isLocked()) 
 		{
 			mCrashAtUnlock = TRUE ;
 			llerrs << "the mutex is locked by the thread: " << mLockedThreadID 
-				<< " Current thread: " << LLThread::currentID() << llendl ;
+				<< " Current thread: " << AIThreadID() << llendl ;
 		}
 
-		mMutexp->lock() ;
-		mLockedThreadID = LLThread::currentID() ;
+		mMutex.lock() ;
+		mLockedThreadID.reset();
 		
 		llassert(mRef >= 1);
 		if (0 == --mRef) 
@@ -137,7 +105,7 @@ S32 LLRefCount::unref() const
 			{
 				while(1); //crash here.
 			}
-			mMutexp->unlock() ;
+			mMutex.unlock() ;
 
 			delete this; 
 			return 0;
@@ -147,18 +115,7 @@ S32 LLRefCount::unref() const
 		{
 			while(1); //crash here.
 		}
-		mMutexp->unlock() ;
+		mMutex.unlock() ;
 		return mRef;
-	}
-	else
-	{
-		llassert(mRef >= 1);
-		if (0 == --mRef) 
-		{
-			delete this; 
-			return 0;
-		}
-		return mRef;
-	}
 }	
 #endif
diff --git a/indra/llcommon/llrefcount.h b/indra/llcommon/llrefcount.h
index 8eb5d53f3..b7831e7fa 100644
--- a/indra/llcommon/llrefcount.h
+++ b/indra/llcommon/llrefcount.h
@@ -30,7 +30,7 @@
 
 #define LL_REF_COUNT_DEBUG 0
 #if LL_REF_COUNT_DEBUG
-class LLMutex ;
+#include "llthread.h"			// LLMutexRootPool
 #endif
 
 //----------------------------------------------------------------------------
@@ -80,8 +80,8 @@ private:
 	mutable S32	mRef; 
 
 #if LL_REF_COUNT_DEBUG
-	LLMutex*  mMutexp ;
-	mutable U32  mLockedThreadID ;
+	mutable LLMutexRootPool mMutex ;
+	mutable AIThreadID mLockedThreadID ;
 	mutable BOOL mCrashAtUnlock ; 
 #endif
 };
diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h
index 47df59d5e..6ce9745cc 100644
--- a/indra/llxml/llcontrol.h
+++ b/indra/llxml/llcontrol.h
@@ -42,6 +42,7 @@
 #include "v4color.h"
 #include "v4coloru.h"
 #include "llinstancetracker.h"
+#include "llrefcount.h"
 
 #include "llcontrolgroupreader.h"
 

From 76e30150b9abf4523de58969e594f1723dd3206d Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Thu, 9 Aug 2012 07:02:42 +0200
Subject: [PATCH 167/199] Removed superfluous debug output

---
 indra/llmessage/aicurlthread.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/indra/llmessage/aicurlthread.cpp b/indra/llmessage/aicurlthread.cpp
index 4d56a0622..0b1b85c0a 100644
--- a/indra/llmessage/aicurlthread.cpp
+++ b/indra/llmessage/aicurlthread.cpp
@@ -1011,7 +1011,6 @@ void AICurlThread::wakeup_thread(void)
   }
   llassert_always(len == 1);
   //SGTODO: handle EAGAIN if needed
-  llinfos << "Sent wakeup signal" << llendl;
 #else
   // If write() is interrupted by a signal before it writes any data, it shall return -1 with errno set to [EINTR].
   // If write() is interrupted by a signal after it successfully writes some data, it shall return the number of bytes written.

From 0054e6a3787bdc33864983a365b54b0f3548daa4 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Thu, 9 Aug 2012 07:04:23 +0200
Subject: [PATCH 168/199] Bug fix.

Fixes an exit crash when the user clicks on Login and immediately
on Quit, because termination of the LLAuth curl request statemachine
access the CurlRequestTimeOut debug setting.
---
 indra/newview/llappviewer.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index e2c395737..f4153efae 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1752,21 +1752,20 @@ bool LLAppViewer::cleanup()
 	delete gVFS;
 	gVFS = NULL;
 
-	// Cleanup settings last in case other clases reference them
-	gSavedSettings.cleanup();
-	gColors.cleanup();
-	gCrashSettings.cleanup();
-	
 	LLWatchdog::getInstance()->cleanup();
 
 	llinfos << "Shutting down message system" << llendflush;
 	end_messaging_system();
 	llinfos << "Message system deleted." << llendflush;
 
-	LLUserAuth::getInstance()->reset(); // Reset before AICurlInterface::cleanupCurl, else LLCURL::sHandleMutex == NULL
 	LLApp::stopErrorThread();			// The following call is not thread-safe. Have to stop all threads.
 	AICurlInterface::cleanupCurl();
 
+	// Cleanup settings last in case other classes reference them.
+	gSavedSettings.cleanup();
+	gColors.cleanup();
+	gCrashSettings.cleanup();
+	
 	// 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())

From ca630a106eb16251399aa8ea36cd48fcd8a23d4a Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Thu, 9 Aug 2012 15:21:38 +0200
Subject: [PATCH 169/199] Merge fix

---
 .../newview/skins/default/xui/en-us/strings.xml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index 8bf50b84b..deeb95f51 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -2877,12 +2877,19 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
 
   <string name="DefaultMimeType">none/none</string>
 
- <!-- External editor status codes -->
- <string name="ExternalEditorNotSet">Select an editor using the ExternalEditor setting.</string>
- <string name="ExternalEditorNotFound">Cannot find the external editor you specified.
+  <!-- External editor status codes -->
+  <string name="ExternalEditorNotSet">Select an editor using the ExternalEditor setting.</string>
+  <string name="ExternalEditorNotFound">Cannot find the external editor you specified.
 Try enclosing path to the editor with double quotes.
 (e.g. "/path to my/editor" "%s")</string>
- <string name="ExternalEditorCommandParseError">Error parsing the external editor command.</string>
- <string name="ExternalEditorFailedToRun">External editor failed to run.</string>
+  <string name="ExternalEditorCommandParseError">Error parsing the external editor command.</string>
+  <string name="ExternalEditorFailedToRun">External editor failed to run.</string>
+
+  <!-- Pathfinding -->
+  <string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
+  <string name="Pathfinding_Object_Attr_None">None</string>
+  <string name="Pathfinding_Object_Attr_Permanent">Affects navmesh</string>
+  <string name="Pathfinding_Object_Attr_Character">Character</string>
+  <string name="Pathfinding_Object_Attr_MultiSelect">(Multiple)</string>
 
 </strings>

From adc2921f387cdac0bf512c8a2998e9dcf65e6a46 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Thu, 9 Aug 2012 15:28:04 +0200
Subject: [PATCH 170/199] Fix push to talk lock

---
 indra/newview/llvoiceremotectrl.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llvoiceremotectrl.cpp b/indra/newview/llvoiceremotectrl.cpp
index f89a3cf27..f8d402a61 100644
--- a/indra/newview/llvoiceremotectrl.cpp
+++ b/indra/newview/llvoiceremotectrl.cpp
@@ -111,7 +111,7 @@ void LLVoiceRemoteCtrl::draw()
 	mTalkBtn->setEnabled(voice_active);
 	mTalkLockBtn->setEnabled(voice_active);
 
-	static LLCachedControl<bool> ptt_currently_enabled("PPTCurrentlyEnabled",false);
+	static LLCachedControl<bool> ptt_currently_enabled("PTTCurrentlyEnabled",false);
 	// propagate ptt state to button display,
 	if (!mTalkBtn->hasMouseCapture())
 	{

From f5923860fa692d2da05bda827c028d99aef48828 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Thu, 9 Aug 2012 15:39:22 +0200
Subject: [PATCH 171/199] Remove maximum selection limit of 20 friends, no
 longer present in viewer 2/3

---
 indra/newview/llfloaterfriends.cpp | 12 ------------
 indra/newview/llfloaterfriends.h   |  1 -
 2 files changed, 13 deletions(-)

diff --git a/indra/newview/llfloaterfriends.cpp b/indra/newview/llfloaterfriends.cpp
index d94c7cf8d..2b09b57d4 100644
--- a/indra/newview/llfloaterfriends.cpp
+++ b/indra/newview/llfloaterfriends.cpp
@@ -80,8 +80,6 @@
 // <dogmode> stuff for Contact groups
 #include "ascentfloatercontactgroups.h"
 
-//Maximum number of people you can select to do an operation on at once.
-#define MAX_FRIEND_SELECT 20
 #define DEFAULT_PERIOD 5.0
 #define RIGHTS_CHANGE_TIMEOUT 5.0
 #define OBSERVER_TIMEOUT 0.5
@@ -368,8 +366,6 @@ void LLPanelFriends::onChangeContactGroup(LLUICtrl* ctrl, void* user_data)
 BOOL LLPanelFriends::postBuild()
 {
 	mFriendsList = getChild<LLScrollListCtrl>("friend_list");
-	mFriendsList->setMaxSelectable(MAX_FRIEND_SELECT);
-	mFriendsList->setMaximumSelectCallback(onMaximumSelect);
 	mFriendsList->setCommitOnSelectionChange(TRUE);
 	childSetCommitCallback("friend_list", onSelectName, this);
 	childSetCommitCallback("buddy_group_combobox", onChangeContactGroup, this);
@@ -816,14 +812,6 @@ void LLPanelFriends::onSelectName(LLUICtrl* ctrl, void* user_data)
 	}
 }
 
-//static
-void LLPanelFriends::onMaximumSelect(void* user_data)
-{
-	LLSD args;
-	args["MAX_SELECT"] = llformat("%d", MAX_FRIEND_SELECT);
-	LLNotificationsUtil::add("MaxListSelectMessage", args);
-};
-
 // static
 void LLPanelFriends::onClickProfile(void* user_data)
 {
diff --git a/indra/newview/llfloaterfriends.h b/indra/newview/llfloaterfriends.h
index b930d6627..e97aecc0f 100644
--- a/indra/newview/llfloaterfriends.h
+++ b/indra/newview/llfloaterfriends.h
@@ -135,7 +135,6 @@ private:
 	static bool callbackAddFriend(const LLSD& notification, const LLSD& response);
 	static bool callbackAddFriendWithMessage(const LLSD& notification, const LLSD& response);
 	static void onPickAvatar(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* user_data);
-	static void onMaximumSelect(void* user_data);
 	static void onContactSearchEdit(const std::string& search_string, void* user_data);
 	static void onClickIM(void* user_data);
 	static void onClickAssign(void* user_data);

From 0be43cf1c2ba785bcab62c1a64c2e53d30dc6f5d Mon Sep 17 00:00:00 2001
From: Drake Arconis <lightdrake@gmail.com>
Date: Thu, 9 Aug 2012 10:56:29 -0400
Subject: [PATCH 172/199] Fixed GCC47 issues and fmodex copying

---
 indra/llmath/lloctree.h          |  2 +-
 indra/llmessage/llcurl.cpp       |  7 ++++---
 indra/llmessage/llcurl.h         |  7 ++++---
 indra/newview/viewer_manifest.py | 10 ++++++++++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h
index 07ca00913..cc1482b18 100644
--- a/indra/llmath/lloctree.h
+++ b/indra/llmath/lloctree.h
@@ -457,7 +457,7 @@ public:
 			mDataEnd = NULL;
 		}
 
-		notifyRemoval(data);
+		this->notifyRemoval(data);
 		checkAlive();
 	}
 
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp
index fc057d969..f7fde67be 100644
--- a/indra/llmessage/llcurl.cpp
+++ b/indra/llmessage/llcurl.cpp
@@ -199,8 +199,9 @@ void LLCurl::Responder::completedHeader(U32 status, const std::string& reason, c
 
 }
 
-namespace boost
-{
+// DONT UNCOMMENT THIS IT BREAKS GCC47
+//namespace boost
+//{
 	void intrusive_ptr_add_ref(LLCurl::Responder* p)
 	{
 		++p->mReferenceCount;
@@ -213,7 +214,7 @@ namespace boost
 			delete p;
 		}
 	}
-};
+//};
 
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/indra/llmessage/llcurl.h b/indra/llmessage/llcurl.h
index 76ef595e9..67abb30ff 100644
--- a/indra/llmessage/llcurl.h
+++ b/indra/llmessage/llcurl.h
@@ -304,11 +304,12 @@ private:
 	easy_free_list_t mEasyFreeList;
 };
 
-namespace boost
-{
+// DONT UNCOMMENT BREAKS GCC47
+//namespace boost
+//{
 	void intrusive_ptr_add_ref(LLCurl::Responder* p);
 	void intrusive_ptr_release(LLCurl::Responder* p);
-};
+//};
 
 
 class LLCurlRequest
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 4775a72e9..513b13589 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -854,6 +854,16 @@ class Linux_x86_64Manifest(LinuxManifest):
             self.path("libopenal.so*")
             self.path("libalut.so*")
 
+            if self.args['extra_libraries'] != None:
+                print self.args['extra_libraries']
+                path_list = self.args['extra_libraries'].split('|')
+                for path in path_list:
+                    path = os.path.realpath(path)
+                    path_pair = path.rsplit('/', 1)
+                    if self.prefix(src=path_pair[0], dst="lib64"):
+                        self.path(path_pair[1])
+                        self.end_prefix()
+
             self.end_prefix("lib64")
 
             # Vivox runtimes and libs

From b2c5a84964b84161b846200e94bbf1c872ca94e9 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Fri, 10 Aug 2012 04:18:04 +0200
Subject: [PATCH 173/199] Replace CURLOPT_POSTFIELDSIZE_LARGE with
 CURLOPT_POSTFIELDSIZE

Also adds a more robust interface for setopt that does
type checking based on the options used. This fixes one
bug where a F32 was passed and interpreted as long.
In many cases a U32 or S32 was passed as long, which
would fail (only) on a 64bit non-windows big endian machine.
---
 indra/llmessage/aicurl.cpp                    | 74 ++++++++++++++++++-
 indra/llmessage/aicurlprivate.h               | 71 ++++++++++++++----
 indra/llmessage/llhttpclient.cpp              |  2 +-
 indra/newview/llxmlrpctransaction.cpp         |  2 +-
 indra/plugins/webkit/linux_volume_catcher.cpp |  4 +-
 5 files changed, 133 insertions(+), 20 deletions(-)

diff --git a/indra/llmessage/aicurl.cpp b/indra/llmessage/aicurl.cpp
index 2f90b8e6e..d22408491 100644
--- a/indra/llmessage/aicurl.cpp
+++ b/indra/llmessage/aicurl.cpp
@@ -717,8 +717,78 @@ void intrusive_ptr_release(ThreadSafeCurlEasyRequest* threadsafe_curl_easy_reque
   }
 }
 
+CURLcode CurlEasyHandle::setopt(CURLoption option, long parameter)
+{
+  llassert((CURLOPTTYPE_LONG  <= option && option < CURLOPTTYPE_LONG  + 1000) ||
+		   (sizeof(curl_off_t) == sizeof(long) &&
+			CURLOPTTYPE_OFF_T <= option && option < CURLOPTTYPE_OFF_T + 1000));
+  llassert(!mActiveMultiHandle);
+  setErrorBuffer();
+  return check_easy_code(curl_easy_setopt(mEasyHandle, option, parameter));
+}
+
+// The standard requires that sizeof(long) < sizeof(long long), so it's safe to overload like this.
+// We assume that one of them is 64 bit, the size of curl_off_t.
+CURLcode CurlEasyHandle::setopt(CURLoption option, long long parameter)
+{
+  llassert(sizeof(curl_off_t) == sizeof(long long) &&
+		   CURLOPTTYPE_OFF_T <= option && option < CURLOPTTYPE_OFF_T + 1000);
+  llassert(!mActiveMultiHandle);
+  setErrorBuffer();
+  return check_easy_code(curl_easy_setopt(mEasyHandle, option, parameter));
+}
+
+CURLcode CurlEasyHandle::setopt(CURLoption option, void const* parameter)
+{
+  llassert(CURLOPTTYPE_OBJECTPOINT <= option && option < CURLOPTTYPE_OBJECTPOINT + 1000);
+  setErrorBuffer();
+  return check_easy_code(curl_easy_setopt(mEasyHandle, option, parameter));
+}
+
+#define DEFINE_FUNCTION_SETOPT1(function_type, opt1) \
+	CURLcode CurlEasyHandle::setopt(CURLoption option, function_type parameter) \
+	{ \
+	  llassert(option == opt1); \
+	  setErrorBuffer(); \
+	  return check_easy_code(curl_easy_setopt(mEasyHandle, option, parameter)); \
+	}
+
+#define DEFINE_FUNCTION_SETOPT3(function_type, opt1, opt2, opt3) \
+	CURLcode CurlEasyHandle::setopt(CURLoption option, function_type parameter) \
+	{ \
+	  llassert(option == opt1 || option == opt2 || option == opt3); \
+	  setErrorBuffer(); \
+	  return check_easy_code(curl_easy_setopt(mEasyHandle, option, parameter)); \
+	}
+
+#define DEFINE_FUNCTION_SETOPT4(function_type, opt1, opt2, opt3, opt4) \
+	CURLcode CurlEasyHandle::setopt(CURLoption option, function_type parameter) \
+	{ \
+	  llassert(option == opt1 || option == opt2 || option == opt3 || option == opt4); \
+	  setErrorBuffer(); \
+	  return check_easy_code(curl_easy_setopt(mEasyHandle, option, parameter)); \
+	}
+
+DEFINE_FUNCTION_SETOPT1(curl_debug_callback, CURLOPT_DEBUGFUNCTION)
+DEFINE_FUNCTION_SETOPT4(curl_write_callback, CURLOPT_HEADERFUNCTION, CURLOPT_WRITEFUNCTION, CURLOPT_INTERLEAVEFUNCTION, CURLOPT_READFUNCTION)
+//DEFINE_FUNCTION_SETOPT1(curl_read_callback, CURLOPT_READFUNCTION)
+DEFINE_FUNCTION_SETOPT1(curl_ssl_ctx_callback, CURLOPT_SSL_CTX_FUNCTION)
+DEFINE_FUNCTION_SETOPT3(curl_conv_callback, CURLOPT_CONV_FROM_NETWORK_FUNCTION, CURLOPT_CONV_TO_NETWORK_FUNCTION, CURLOPT_CONV_FROM_UTF8_FUNCTION)
+#if 0 // Not used by the viewer.
+DEFINE_FUNCTION_SETOPT1(curl_progress_callback, CURLOPT_PROGRESSFUNCTION)
+DEFINE_FUNCTION_SETOPT1(curl_seek_callback, CURLOPT_SEEKFUNCTION)
+DEFINE_FUNCTION_SETOPT1(curl_ioctl_callback, CURLOPT_IOCTLFUNCTION)
+DEFINE_FUNCTION_SETOPT1(curl_sockopt_callback, CURLOPT_SOCKOPTFUNCTION)
+DEFINE_FUNCTION_SETOPT1(curl_opensocket_callback, CURLOPT_OPENSOCKETFUNCTION)
+DEFINE_FUNCTION_SETOPT1(curl_closesocket_callback, CURLOPT_CLOSESOCKETFUNCTION)
+DEFINE_FUNCTION_SETOPT1(curl_sshkeycallback, CURLOPT_SSH_KEYFUNCTION)
+DEFINE_FUNCTION_SETOPT1(curl_chunk_bgn_callback, CURLOPT_CHUNK_BGN_FUNCTION)
+DEFINE_FUNCTION_SETOPT1(curl_chunk_end_callback, CURLOPT_CHUNK_END_FUNCTION)
+DEFINE_FUNCTION_SETOPT1(curl_fnmatch_callback, CURLOPT_FNMATCH_FUNCTION)
+#endif
+
 //-----------------------------------------------------------------------------
-// CurlEasyReqest
+// CurlEasyRequest
 
 void CurlEasyRequest::setoptString(CURLoption option, std::string const& value)
 {
@@ -729,8 +799,8 @@ void CurlEasyRequest::setoptString(CURLoption option, std::string const& value)
 void CurlEasyRequest::setPost(char const* postdata, S32 size)
 {
   setopt(CURLOPT_POST, 1L);
-  setopt(CURLOPT_POSTFIELDS, static_cast<void*>(const_cast<char*>(postdata)));
   setopt(CURLOPT_POSTFIELDSIZE, size);
+  setopt(CURLOPT_POSTFIELDS, postdata);
 }
 
 ThreadSafeCurlEasyRequest* CurlEasyRequest::get_lockobj(void)
diff --git a/indra/llmessage/aicurlprivate.h b/indra/llmessage/aicurlprivate.h
index 14a8b0fa2..ead30e82e 100644
--- a/indra/llmessage/aicurlprivate.h
+++ b/indra/llmessage/aicurlprivate.h
@@ -59,6 +59,9 @@ void stopCurlThread(void);
 class ThreadSafeCurlEasyRequest;
 class ThreadSafeBufferedCurlEasyRequest;
 
+#define DECLARE_SETOPT(param_type) \
+	CURLcode setopt(CURLoption option, param_type parameter)
+
 // This class wraps CURL*'s.
 // It guarantees that a pointer is cleaned up when no longer needed, as required by libcurl.
 class CurlEasyHandle : public boost::noncopyable, protected AICurlEasyHandleEvents {
@@ -75,8 +78,31 @@ class CurlEasyHandle : public boost::noncopyable, protected AICurlEasyHandleEven
 	void reset(void) { llassert(!mActiveMultiHandle); curl_easy_reset(mEasyHandle); }
 
 	// Set options for a curl easy handle.
-	template<typename BUILTIN>
-	  CURLcode setopt(CURLoption option, BUILTIN parameter);
+	DECLARE_SETOPT(long);
+	DECLARE_SETOPT(long long);
+	DECLARE_SETOPT(void const*);
+	DECLARE_SETOPT(curl_debug_callback);
+	DECLARE_SETOPT(curl_write_callback);
+	//DECLARE_SETOPT(curl_read_callback);	Same type as curl_write_callback
+	DECLARE_SETOPT(curl_ssl_ctx_callback);
+	DECLARE_SETOPT(curl_conv_callback);
+#if 0	// Not used by the viewer.
+	DECLARE_SETOPT(curl_progress_callback);
+	DECLARE_SETOPT(curl_seek_callback);
+	DECLARE_SETOPT(curl_ioctl_callback);
+	DECLARE_SETOPT(curl_sockopt_callback);
+	DECLARE_SETOPT(curl_opensocket_callback);
+	DECLARE_SETOPT(curl_closesocket_callback);
+	DECLARE_SETOPT(curl_sshkeycallback);
+	DECLARE_SETOPT(curl_chunk_bgn_callback);
+	DECLARE_SETOPT(curl_chunk_end_callback);
+	DECLARE_SETOPT(curl_fnmatch_callback);
+#endif
+#if __LP64__	// sizeof(long) > sizeof(S32), see http://en.cppreference.com/w/cpp/language/types
+	// Automatically cast small int types to a long if they differ in size.
+	CURLcode setopt(CURLoption option, U32 parameter) { return setopt(option, (long)parameter); }
+	CURLcode setopt(CURLoption option, S32 parameter) { return setopt(option, (long)parameter); }
+#endif
 
 	// Clone a libcurl session handle using all the options previously set.
 	//CurlEasyHandle(CurlEasyHandle const& orig);
@@ -160,14 +186,6 @@ class CurlEasyHandle : public boost::noncopyable, protected AICurlEasyHandleEven
 	static char* getTLErrorBuffer(void);
 };
 
-template<typename BUILTIN>
-CURLcode CurlEasyHandle::setopt(CURLoption option, BUILTIN parameter)
-{
-  llassert(!mActiveMultiHandle);
-  setErrorBuffer();
-  return check_easy_code(curl_easy_setopt(mEasyHandle, option, parameter));
-}
-
 // CurlEasyRequest adds a slightly more powerful interface that can be used
 // to set the options on a curl easy handle.
 //
@@ -397,16 +415,41 @@ class CurlMultiHandle : public boost::noncopyable {
 
   public:
 	// Set options for a curl multi handle.
-	template<typename BUILTIN>
-	  CURLMcode setopt(CURLMoption option, BUILTIN parameter);
+	CURLMcode setopt(CURLMoption option, long parameter);
+	CURLMcode setopt(CURLMoption option, curl_socket_callback parameter);
+	CURLMcode setopt(CURLMoption option, curl_multi_timer_callback parameter);
+	CURLMcode setopt(CURLMoption option, void* parameter);
 
 	// Returns total number of existing CURLM* handles (excluding ones created outside this class).
 	static U32 getTotalMultiHandles(void) { return sTotalMultiHandles; }
 };
 
-template<typename BUILTIN>
-CURLMcode CurlMultiHandle::setopt(CURLMoption option, BUILTIN parameter)
+// Overload the setopt methods in order to enforce the correct types (ie, convert an int to a long).
+
+// curl_multi_setopt may only be passed a long,
+inline CURLMcode CurlMultiHandle::setopt(CURLMoption option, long parameter)
 {
+  llassert(option == CURLMOPT_MAXCONNECTS || option == CURLMOPT_PIPELINING);
+  return check_multi_code(curl_multi_setopt(mMultiHandle, option, parameter));
+}
+
+// ... or a function pointer,
+inline CURLMcode CurlMultiHandle::setopt(CURLMoption option, curl_socket_callback parameter)
+{
+  llassert(option == CURLMOPT_SOCKETFUNCTION);
+  return check_multi_code(curl_multi_setopt(mMultiHandle, option, parameter));
+}
+
+inline CURLMcode CurlMultiHandle::setopt(CURLMoption option, curl_multi_timer_callback parameter)
+{
+  llassert(option == CURLMOPT_TIMERFUNCTION);
+  return check_multi_code(curl_multi_setopt(mMultiHandle, option, parameter));
+}
+
+// ... or an object pointer.
+inline CURLMcode CurlMultiHandle::setopt(CURLMoption option, void* parameter)
+{
+  llassert(option == CURLMOPT_SOCKETDATA || option == CURLMOPT_TIMERDATA);
   return check_multi_code(curl_multi_setopt(mMultiHandle, option, parameter));
 }
 
diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp
index 7320ccb0e..9c58bc466 100644
--- a/indra/llmessage/llhttpclient.cpp
+++ b/indra/llmessage/llhttpclient.cpp
@@ -446,7 +446,7 @@ static LLSD blocking_request(
 		std::string body_str;
 		
 		// * Set curl handle options
-		curlEasyRequest_w->setopt(CURLOPT_TIMEOUT, timeout);	// seconds, see warning at top of function.
+		curlEasyRequest_w->setopt(CURLOPT_TIMEOUT, (long)timeout);	// seconds, see warning at top of function.
 		curlEasyRequest_w->setWriteCallback(&LLHTTPBuffer::curl_write, &http_buffer);
 
 		// * Setup headers.
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp
index 9d729b8da..b1bb2ee0f 100644
--- a/indra/newview/llxmlrpctransaction.cpp
+++ b/indra/newview/llxmlrpctransaction.cpp
@@ -263,7 +263,7 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip)
 		if (mRequestText)
 		{
 			Dout(dc::curl, "Writing " << mRequestTextSize << " bytes: \"" << libcwd::buf2str(mRequestText, mRequestTextSize) << "\".");;
-			curlEasyRequest_w->setopt(CURLOPT_POSTFIELDSIZE_LARGE, (curl_off_t)mRequestTextSize);
+			curlEasyRequest_w->setopt(CURLOPT_POSTFIELDSIZE, mRequestTextSize);
 			curlEasyRequest_w->setoptString(CURLOPT_COPYPOSTFIELDS, mRequestText);
 		}
 		else
diff --git a/indra/plugins/webkit/linux_volume_catcher.cpp b/indra/plugins/webkit/linux_volume_catcher.cpp
index 0cb73ca1e..5298056fd 100644
--- a/indra/plugins/webkit/linux_volume_catcher.cpp
+++ b/indra/plugins/webkit/linux_volume_catcher.cpp
@@ -36,9 +36,10 @@
  */
 
 #include "linden_common.h"
-# include <set>
+#include <set>
 
 #include "volume_catcher.h"
+#include "llaprpool.h"
 
 #ifndef LL_WINDOWS
 #include <unistd.h>
@@ -53,7 +54,6 @@ extern "C" {
 #include <pulse/subscribe.h>
 #include <pulse/glib-mainloop.h> // There's no special reason why we want the *glib* PA mainloop, but the generic polling implementation seems broken.
 
-#include "llaprpool.h"
 #include "apr_dso.h"
 #ifdef LL_STANDALONE
 #include <dlfcn.h>

From ffb55f482a9a460c12bcf9362e4c0061820cfd26 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Fri, 10 Aug 2012 05:35:11 +0200
Subject: [PATCH 174/199] Compile fixes for windows.

---
 indra/cwdebug/debug.h           |  9 ---------
 indra/llcommon/aithreadid.cpp   |  3 ++-
 indra/llcommon/aithreadid.h     | 18 ++++++------------
 indra/llcommon/llpreprocessor.h | 12 ++++++++++++
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h
index f127da767..9e832a44c 100644
--- a/indra/cwdebug/debug.h
+++ b/indra/cwdebug/debug.h
@@ -38,15 +38,6 @@
 
 #include <string>
 
-#if LL_WINDOWS
-// On windows, thread-local data is automatically exported.
-#define LL_COMMON_API_TLS __declspec(thread)
-#define CWD_TLS __declspec(thread)
-#else
-#define LL_COMMON_API_TLS LL_COMMON_API __thread
-#define CWD_TLS __thread
-#endif
-
 namespace debug {
 namespace libcwd {
 
diff --git a/indra/llcommon/aithreadid.cpp b/indra/llcommon/aithreadid.cpp
index dfb4a2660..7d179e8e3 100644
--- a/indra/llcommon/aithreadid.cpp
+++ b/indra/llcommon/aithreadid.cpp
@@ -34,8 +34,9 @@
 
 AIThreadID const AIThreadID::sNone(AIThreadID::none);
 apr_os_thread_t AIThreadID::sMainThreadID;
+apr_os_thread_t const undefinedID = (apr_os_thread_t)-1;
 #ifndef LL_DARWIN
-apr_os_thread_t ll_thread_local AIThreadID::lCurrentThread = AIThreadID::undefinedID;
+apr_os_thread_t CWD_TLS AIThreadID::lCurrentThread;
 #endif
 
 void AIThreadID::set_main_thread_id(void)
diff --git a/indra/llcommon/aithreadid.h b/indra/llcommon/aithreadid.h
index c565b5913..9f7893c66 100644
--- a/indra/llcommon/aithreadid.h
+++ b/indra/llcommon/aithreadid.h
@@ -33,28 +33,22 @@
 
 #include <apr_portable.h>	// apr_os_thread_t, apr_os_thread_current(), apr_os_thread_equal().
 #include <iosfwd>			// std::ostream.
-#include "llpreprocessor.h"	// LL_COMMON_API
+#include "llpreprocessor.h"	// LL_COMMON_API, LL_COMMON_API_TLS
 #include "llerror.h"
 
-#if LL_WINDOWS
-#define ll_thread_local __declspec(thread)
-#else
-#define ll_thread_local __thread
-#endif
-
 // Lightweight wrapper around apr_os_thread_t.
 // This class introduces no extra assembly code after optimization; it's only intend is to provide type-safety.
-class LL_COMMON_API AIThreadID
+class AIThreadID
 {
 private:
 	apr_os_thread_t mID;
-	static apr_os_thread_t sMainThreadID;
-	static apr_os_thread_t const undefinedID = (apr_os_thread_t)-1;
+	static LL_COMMON_API apr_os_thread_t sMainThreadID;
+	static LL_COMMON_API apr_os_thread_t const undefinedID;
 #ifndef LL_DARWIN
-	static ll_thread_local apr_os_thread_t lCurrentThread;
+	static LL_COMMON_API_TLS apr_os_thread_t lCurrentThread;
 #endif
 public:
-	static AIThreadID const sNone;
+	static LL_COMMON_API AIThreadID const sNone;
 	enum undefined_thread_t { none };
 	enum dout_print_t { DoutPrint };
 
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h
index 009871908..be0ec94a3 100644
--- a/indra/llcommon/llpreprocessor.h
+++ b/indra/llcommon/llpreprocessor.h
@@ -195,4 +195,16 @@
 # define LL_COMMON_API
 #endif // LL_COMMON_LINK_SHARED
 
+// Darwin does not support thread-local data.
+#ifndef LL_DARWIN
+#if LL_WINDOWS
+// On windows, thread-local data is automatically exported.
+#define LL_COMMON_API_TLS __declspec(thread)
+#define CWD_TLS __declspec(thread)
+#else // Linux
+#define LL_COMMON_API_TLS LL_COMMON_API __thread
+#define CWD_TLS __thread
+#endif
+#endif
+
 #endif	//	not LL_LINDEN_PREPROCESSOR_H

From 91df8446b0ec20700787af739384075b8c89fb46 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Fri, 10 Aug 2012 05:37:41 +0200
Subject: [PATCH 175/199] Oops bug fix for last commit.

---
 indra/llcommon/aithreadid.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llcommon/aithreadid.cpp b/indra/llcommon/aithreadid.cpp
index 7d179e8e3..4eea7d37d 100644
--- a/indra/llcommon/aithreadid.cpp
+++ b/indra/llcommon/aithreadid.cpp
@@ -34,7 +34,7 @@
 
 AIThreadID const AIThreadID::sNone(AIThreadID::none);
 apr_os_thread_t AIThreadID::sMainThreadID;
-apr_os_thread_t const undefinedID = (apr_os_thread_t)-1;
+apr_os_thread_t const AIThreadID::undefinedID = (apr_os_thread_t)-1;
 #ifndef LL_DARWIN
 apr_os_thread_t CWD_TLS AIThreadID::lCurrentThread;
 #endif

From eef51e0bd033188c3d3288be0f769d8c39c2dc25 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Thu, 9 Aug 2012 22:50:05 -0500
Subject: [PATCH 176/199] Pulled llpacketring.h and llhttpclient.h out of the
 precompiled header.

---
 indra/llmessage/llcircuit.cpp              |  3 ++-
 indra/llmessage/llpacketring.h             |  2 +-
 indra/llmessage/message.cpp                | 19 ++++++++++++-------
 indra/llmessage/message.h                  | 14 ++++++++++----
 indra/newview/llstartup.cpp                | 10 +++++-----
 indra/newview/llviewermenu.cpp             |  2 +-
 indra/newview/llviewerprecompiledheaders.h |  2 +-
 indra/newview/llworld.cpp                  |  4 ++--
 indra/newview/scriptcounter.cpp            | 12 ++++++------
 9 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/indra/llmessage/llcircuit.cpp b/indra/llmessage/llcircuit.cpp
index 4b41abd45..56249db41 100644
--- a/indra/llmessage/llcircuit.cpp
+++ b/indra/llmessage/llcircuit.cpp
@@ -56,6 +56,7 @@
 #include "llstl.h"
 #include "lltransfermanager.h"
 #include "llmodularmath.h"
+#include "llpacketring.h"
 
 const S32 PING_START_BLOCK = 3;		// How many pings behind we have to be to consider ourself blocked.
 const S32 PING_RELEASE_BLOCK = 2;	// How many pings behind we have to be to consider ourself unblocked.
@@ -346,7 +347,7 @@ S32 LLCircuitData::resendUnackedPackets(const F64 now)
 
 			packetp->mBuffer[0] |= LL_RESENT_FLAG;  // tag packet id as being a resend	
 
-			gMessageSystem->mPacketRing.sendPacket(packetp->mSocket, 
+			gMessageSystem->mPacketRing->sendPacket(packetp->mSocket, 
 											   (char *)packetp->mBuffer, packetp->mBufferLength, 
 											   packetp->mHost);
 
diff --git a/indra/llmessage/llpacketring.h b/indra/llmessage/llpacketring.h
index b214271e7..63d272308 100644
--- a/indra/llmessage/llpacketring.h
+++ b/indra/llmessage/llpacketring.h
@@ -32,7 +32,7 @@
 
 #include "llhost.h"
 #include "llpacketbuffer.h"
-#include "llproxy.h"
+//#include "llproxy.h"
 #include "llthrottle.h"
 #include "net.h"
 
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index 7d21e35f9..7abfea8ef 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -81,6 +81,7 @@
 #include "v4math.h"
 #include "lltransfertargetvfile.h"
 #include "llmemtype.h"
+#include "llpacketring.h"
 
 // Constants
 //const char* MESSAGE_LOG_FILENAME = "message.log";
@@ -245,7 +246,8 @@ LLMessageSystem::LLMessageSystem(const std::string& filename, U32 port,
 								 bool failure_is_fatal,
 								 const F32 circuit_heartbeat_interval, const F32 circuit_timeout) :
 	mCircuitInfo(circuit_heartbeat_interval, circuit_timeout),
-	mLastMessageFromTrustedMessageService(false)
+	mLastMessageFromTrustedMessageService(false),
+	mPacketRing(new LLPacketRing)
 {
 	init();
 
@@ -383,6 +385,9 @@ LLMessageSystem::~LLMessageSystem()
 	delete mPollInfop;
 	mPollInfop = NULL;
 
+	delete mPacketRing;
+	mPacketRing = NULL;
+
 	mIncomingCompressedSize = 0;
 	mCurrentRecvPacketID = 0;
 }
@@ -548,13 +553,13 @@ BOOL LLMessageSystem::checkMessages( S64 frame_count )
 
 		U8* buffer = mTrueReceiveBuffer;
 		
-		mTrueReceiveSize = mPacketRing.receivePacket(mSocket, (char *)mTrueReceiveBuffer);
+		mTrueReceiveSize = mPacketRing->receivePacket(mSocket, (char *)mTrueReceiveBuffer);
 		// If you want to dump all received packets into SecondLife.log, uncomment this
 		//dumpPacketToLog();
 		
 		receive_size = mTrueReceiveSize;
-		mLastSender = mPacketRing.getLastSender();
-		mLastReceivingIF = mPacketRing.getLastReceivingInterface();
+		mLastSender = mPacketRing->getLastSender();
+		mLastReceivingIF = mPacketRing->getLastReceivingInterface();
 		
 		if (receive_size < (S32) LL_MINIMUM_VALID_PACKET_SIZE)
 		{
@@ -1129,7 +1134,7 @@ S32 LLMessageSystem::flushReliable(const LLHost &host)
 	return send_bytes;
 }
 
-LLHTTPClient::ResponderPtr LLMessageSystem::createResponder(const std::string& name)
+LLFnPtrResponder* LLMessageSystem::createResponder(const std::string& name)
 {
 	if(mSendReliable)
 	{
@@ -1328,7 +1333,7 @@ S32 LLMessageSystem::sendMessage(const LLHost &host)
 	}
 
 	BOOL success;
-	success = mPacketRing.sendPacket(mSocket, (char *)buf_ptr, buffer_length, host);
+	success = mPacketRing->sendPacket(mSocket, (char *)buf_ptr, buffer_length, host);
 
 	if (!success)
 	{
@@ -3361,7 +3366,7 @@ void LLMessageSystem::establishBidirectionalTrust(const LLHost &host, S64 frame_
 
 void LLMessageSystem::dumpPacketToLog()
 {
-	LL_WARNS("Messaging") << "Packet Dump from:" << mPacketRing.getLastSender() << llendl;
+	LL_WARNS("Messaging") << "Packet Dump from:" << mPacketRing->getLastSender() << llendl;
 	LL_WARNS("Messaging") << "Packet Size:" << mTrueReceiveSize << llendl;
 	char line_buffer[256];		/* Flawfinder: ignore */
 	S32 i;
diff --git a/indra/llmessage/message.h b/indra/llmessage/message.h
index 1589ea29c..dee687d47 100644
--- a/indra/llmessage/message.h
+++ b/indra/llmessage/message.h
@@ -48,9 +48,9 @@
 #include "string_table.h"
 #include "llcircuit.h"
 #include "lltimer.h"
-#include "llpacketring.h"
+//#include "llpacketring.h"
 #include "llhost.h"
-#include "llhttpclient.h"
+//#include "llhttpclient.h"
 #include "llhttpnode.h"
 #include "llpacketack.h"
 #include "llsingleton.h"
@@ -61,6 +61,12 @@
 
 #include "llstoredmessage.h"
 
+class LLPacketRing;
+namespace
+{
+	class LLFnPtrResponder;
+}
+
 const U32 MESSAGE_MAX_STRINGS_LENGTH = 64;
 const U32 MESSAGE_NUMBER_OF_HASH_BUCKETS = 8192;
 
@@ -213,7 +219,7 @@ class LLMessageSystem : public LLMessageSenderInterface
 	LLHost				mUntrustedInterface;
 
  public:
-	LLPacketRing				mPacketRing;
+	LLPacketRing*				mPacketRing;
 	LLReliablePacketParams			mReliablePacketParams;
 
 	// Set this flag to TRUE when you want *very* verbose logs.
@@ -494,7 +500,7 @@ public:
 		void (*callback)(void **,S32), 
 		void ** callback_data);
 
-	LLHTTPClient::ResponderPtr createResponder(const std::string& name);
+	LLFnPtrResponder* createResponder(const std::string& name);
 	S32		sendMessage(const LLHost &host);
 	S32		sendMessage(const U32 circuit);
 private:
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 1400da474..fcd46b82e 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -627,21 +627,21 @@ bool idle_startup()
 
 
 			F32 dropPercent = gSavedSettings.getF32("PacketDropPercentage");
-			msg->mPacketRing.setDropPercentage(dropPercent);
+			msg->mPacketRing->setDropPercentage(dropPercent);
 
             F32 inBandwidth = gSavedSettings.getF32("InBandwidth"); 
             F32 outBandwidth = gSavedSettings.getF32("OutBandwidth"); 
 			if (inBandwidth != 0.f)
 			{
 				LL_DEBUGS("AppInit") << "Setting packetring incoming bandwidth to " << inBandwidth << LL_ENDL;
-				msg->mPacketRing.setUseInThrottle(TRUE);
-				msg->mPacketRing.setInBandwidth(inBandwidth);
+				msg->mPacketRing->setUseInThrottle(TRUE);
+				msg->mPacketRing->setInBandwidth(inBandwidth);
 			}
 			if (outBandwidth != 0.f)
 			{
 				LL_DEBUGS("AppInit") << "Setting packetring outgoing bandwidth to " << outBandwidth << LL_ENDL;
-				msg->mPacketRing.setUseOutThrottle(TRUE);
-				msg->mPacketRing.setOutBandwidth(outBandwidth);
+				msg->mPacketRing->setUseOutThrottle(TRUE);
+				msg->mPacketRing->setOutBandwidth(outBandwidth);
 			}
 		}
 
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 669c57d43..5d6134412 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -4035,7 +4035,7 @@ void print_packets_lost(void*)
 
 void drop_packet(void*)
 {
-	gMessageSystem->mPacketRing.dropPackets(1);
+	gMessageSystem->mPacketRing->dropPackets(1);
 }
 
 
diff --git a/indra/newview/llviewerprecompiledheaders.h b/indra/newview/llviewerprecompiledheaders.h
index 031e5fa6a..e838eaadd 100644
--- a/indra/newview/llviewerprecompiledheaders.h
+++ b/indra/newview/llviewerprecompiledheaders.h
@@ -169,7 +169,7 @@
 #include "llnamevalue.h"
 #include "llpacketack.h"
 #include "llpacketbuffer.h"
-#include "llpacketring.h"
+//#include "llpacketring.h"
 #include "llpartdata.h"
 //#include "llqueryflags.h"
 //#include "llregionflags.h"
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 6f92bedf9..ef77a099d 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -779,8 +779,8 @@ void LLWorld::updateNetStats()
 	S32 packets_out = gMessageSystem->mPacketsOut - mLastPacketsOut;
 	S32 packets_lost = gMessageSystem->mDroppedPackets - mLastPacketsLost;
 
-	S32 actual_in_bits = gMessageSystem->mPacketRing.getAndResetActualInBits();
-	S32 actual_out_bits = gMessageSystem->mPacketRing.getAndResetActualOutBits();
+	S32 actual_in_bits = gMessageSystem->mPacketRing->getAndResetActualInBits();
+	S32 actual_out_bits = gMessageSystem->mPacketRing->getAndResetActualOutBits();
 	LLViewerStats::getInstance()->mActualInKBitStat.addValue(actual_in_bits/1024.f);
 	LLViewerStats::getInstance()->mActualOutKBitStat.addValue(actual_out_bits/1024.f);
 	LLViewerStats::getInstance()->mKBitStat.addValue(bits/1024.f);
diff --git a/indra/newview/scriptcounter.cpp b/indra/newview/scriptcounter.cpp
index 37acc1e37..f58d26b34 100644
--- a/indra/newview/scriptcounter.cpp
+++ b/indra/newview/scriptcounter.cpp
@@ -201,8 +201,8 @@ void ScriptCounter::serializeSelection(bool delScript)
 		F32 throttle = gSavedSettings.getF32("OutBandwidth");
 		if((throttle == 0.f) || (throttle > 128000.f))
 		{
-			gMessageSystem->mPacketRing.setOutBandwidth(128000);
-			gMessageSystem->mPacketRing.setUseOutThrottle(TRUE);
+			gMessageSystem->mPacketRing->setOutBandwidth(128000);
+			gMessageSystem->mPacketRing->setUseOutThrottle(TRUE);
 		}
 		showResult(llformat("Counting scripts, please wait..."));
 		if((objectCount == 1) && !(foo->isAvatar()))
@@ -340,13 +340,13 @@ void ScriptCounter::completechk()
 			F32 throttle = gSavedSettings.getF32("OutBandwidth");
 			if(throttle != 0.f)
 			{
-				gMessageSystem->mPacketRing.setOutBandwidth(throttle);
-				gMessageSystem->mPacketRing.setUseOutThrottle(TRUE);
+				gMessageSystem->mPacketRing->setOutBandwidth(throttle);
+				gMessageSystem->mPacketRing->setUseOutThrottle(TRUE);
 			}
 			else
 			{
-				gMessageSystem->mPacketRing.setOutBandwidth(0.0);
-				gMessageSystem->mPacketRing.setUseOutThrottle(FALSE);
+				gMessageSystem->mPacketRing->setOutBandwidth(0.0);
+				gMessageSystem->mPacketRing->setUseOutThrottle(FALSE);
 			}
 			llinfos << "Sending readout to chat..." << llendl;
 			showResult(user_msg);

From 94ebcdeb6b2a318d826c548eeff13dcb52bd184d Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Fri, 10 Aug 2012 07:23:29 +0200
Subject: [PATCH 177/199] Add eight missing headers...

How did you ever get this to compile if those
headers were removed from the precompiled header?
---
 indra/newview/llfloaterurlentry.cpp      | 1 +
 indra/newview/llstartup.cpp              | 1 +
 indra/newview/lltexturestatsuploader.cpp | 1 +
 indra/newview/lluserauth.cpp             | 4 ++++
 indra/newview/llviewermedia.cpp          | 1 +
 indra/newview/llviewermenu.cpp           | 1 +
 indra/newview/llworld.cpp                | 1 +
 indra/newview/scriptcounter.cpp          | 1 +
 8 files changed, 11 insertions(+)

diff --git a/indra/newview/llfloaterurlentry.cpp b/indra/newview/llfloaterurlentry.cpp
index 35dc9ddda..c56e49206 100644
--- a/indra/newview/llfloaterurlentry.cpp
+++ b/indra/newview/llfloaterurlentry.cpp
@@ -43,6 +43,7 @@
 #include "lluictrlfactory.h"
 #include "llwindow.h"
 #include "llviewerwindow.h"
+#include "llhttpclient.h"
 
 static LLFloaterURLEntry* sInstance = NULL;
 
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index fcd46b82e..328ccf2dc 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -219,6 +219,7 @@
 #include "llfloaterblacklist.h"
 #include "scriptcounter.h"
 #include "shfloatermediaticker.h"
+#include "llpacketring.h"
 // </edit>
 
 #include "llavatarnamecache.h"
diff --git a/indra/newview/lltexturestatsuploader.cpp b/indra/newview/lltexturestatsuploader.cpp
index e0358e1fc..7f14a4254 100644
--- a/indra/newview/lltexturestatsuploader.cpp
+++ b/indra/newview/lltexturestatsuploader.cpp
@@ -33,6 +33,7 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "lltexturestatsuploader.h"
+#include "llhttpclient.h"
 
 LLTextureStatsUploader::LLTextureStatsUploader()
 {
diff --git a/indra/newview/lluserauth.cpp b/indra/newview/lluserauth.cpp
index 29930a96e..a10c66fca 100644
--- a/indra/newview/lluserauth.cpp
+++ b/indra/newview/lluserauth.cpp
@@ -49,6 +49,10 @@
 // NOTE: MUST include these after otherincludes since queue gets redefined!?!!
 #include <xmlrpc-epi/xmlrpc.h>
 
+#include <curl/curl.h>
+#ifdef DEBUG_CURLIO
+#include "debug_libcurl.h"
+#endif
 
 // Don't define PLATFORM_STRING for unknown platforms - they need
 // to get added to the login cgi script, so we want this to cause an
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 56f0403e9..7d83e718d 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -48,6 +48,7 @@
 #include "llnotificationsutil.h"
 #include "lluuid.h"
 #include "llkeyboard.h"
+#include "llhttpclient.h"
 
 // Merov: Temporary definitions while porting the new viewer media code to Snowglobe
 const int LEFT_BUTTON  = 0;
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 5d6134412..a30508522 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -250,6 +250,7 @@
 #include "llfloatervfs.h"
 #include "llfloatervfsexplorer.h"
 #include "shfloatermediaticker.h"
+#include "llpacketring.h"
 // </edit>
 
 #include "scriptcounter.h"
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index ef77a099d..a265b3613 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -61,6 +61,7 @@
 #include "message.h"
 #include "pipeline.h"
 #include "llappviewer.h"		// for do_disconnect()
+#include "llpacketring.h"
 
 #include <deque>
 #include <queue>
diff --git a/indra/newview/scriptcounter.cpp b/indra/newview/scriptcounter.cpp
index f58d26b34..3da258c28 100644
--- a/indra/newview/scriptcounter.cpp
+++ b/indra/newview/scriptcounter.cpp
@@ -43,6 +43,7 @@
 #include "llviewercontrol.h"
 #include "llviewernetwork.h"
 #include "llviewerobject.h"
+#include "llpacketring.h"
 #include <sstream>
 
 ScriptCounter* ScriptCounter::sInstance;

From 70717cb6c897f6f0babfa3596f4d7a59efa88a8d Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Fri, 10 Aug 2012 14:49:34 +0200
Subject: [PATCH 178/199] Compile bug fix for windows.

---
 indra/llmessage/aicurlprivate.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/indra/llmessage/aicurlprivate.h b/indra/llmessage/aicurlprivate.h
index ead30e82e..a39120faa 100644
--- a/indra/llmessage/aicurlprivate.h
+++ b/indra/llmessage/aicurlprivate.h
@@ -98,11 +98,10 @@ class CurlEasyHandle : public boost::noncopyable, protected AICurlEasyHandleEven
 	DECLARE_SETOPT(curl_chunk_end_callback);
 	DECLARE_SETOPT(curl_fnmatch_callback);
 #endif
-#if __LP64__	// sizeof(long) > sizeof(S32), see http://en.cppreference.com/w/cpp/language/types
-	// Automatically cast small int types to a long if they differ in size.
+	// Automatically cast int types to a long. Note that U32/S32 are int and
+	// that you can overload int and long even if they have the same size.
 	CURLcode setopt(CURLoption option, U32 parameter) { return setopt(option, (long)parameter); }
 	CURLcode setopt(CURLoption option, S32 parameter) { return setopt(option, (long)parameter); }
-#endif
 
 	// Clone a libcurl session handle using all the options previously set.
 	//CurlEasyHandle(CurlEasyHandle const& orig);

From 486536f92d78e605dd830af520ef74c9545adbc8 Mon Sep 17 00:00:00 2001
From: Lirusaito <Inusaito@gmail.com>
Date: Fri, 10 Aug 2012 18:41:50 -0400
Subject: [PATCH 179/199] Allow antispam time to be set to 0, for disabling
 Antispam.

---
 .../skins/default/xui/en-us/panel_preferences_ascent_chat.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
index 1680634f5..439d12eec 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
@@ -70,7 +70,7 @@
     <panel border="true" left="1" bottom="-408" height="408" width="500" label="Spam" name="Spam">
       <check_box control_name="_NACL_AntiSpamGlobalQueue" label="No messagetype-specific spam queues" name="spammsg_checkbox" width="256" left="6"/>
       <button height="23" label="Reset antispam queues" label_selected="Reset antispam queues" name="reset_antispam" width="230" bottom_delta="0" left="260"/>
-      <spinner control_name="_NACL_AntiSpamTime" decimal_digits="0" increment="1" min_val="1" max_val="60" label="Antispam time(seconds):" label_width="330" tool_tip="Lower is less sensitive" name="antispamtime" width="390" left="10"/>
+      <spinner control_name="_NACL_AntiSpamTime" decimal_digits="0" increment="1" min_val="0" max_val="60" label="Antispam time(seconds):" label_width="330" tool_tip="Lower is less sensitive, 0 will turn off Antispam, but not Dialog Blocking." name="antispamtime" width="390" left="10"/>
       <spinner control_name="_NACL_AntiSpamAmount" decimal_digits="0" increment="1" min_val="5" max_val="99999" label="Antispam amount:" label_width="330" tool_tip="Higher is less sensitive" name="antispamamount" width="390"/>
       <spinner control_name="_NACL_AntiSpamSoundMulti" decimal_digits="0" increment="1" min_val="1" max_val="99999" label="Amount multiplicatior for sound antispam:" label_width="330" tool_tip="Higher is less sensitive" left="10" name="antispamsoundmulti" width="390"/>
       <spinner control_name="_NACL_AntiSpamSoundPreloadMulti" decimal_digits="0" increment="1" min_val="1" max_val="99999" label="Amount multiplicatior for sound preload antispam:" label_width="330" tool_tip="Higher is less sensitive" name="antispamsoundpreloadmulti" width="390"/>

From 3469d65f9514de3d4779031cb9e1839e3a904887 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Sat, 11 Aug 2012 03:23:31 +0200
Subject: [PATCH 180/199] Windows compile and linker fixes.

* Do not include aithreadid.h from debug.h, because the latter is
  included everywhere (from linden_common.h) and aithreadid.h is
  heavy (includes among others windows.h).
* On windows, thread local members cannot be exported.
---
 indra/cwdebug/debug.cc          | 26 ++++++++++++++++++++++-
 indra/cwdebug/debug.h           | 15 ++++++-------
 indra/llcommon/aithreadid.cpp   | 37 +++++++++++++++++++--------------
 indra/llcommon/aithreadid.h     | 17 ++++++++-------
 indra/llcommon/llaprpool.cpp    |  6 +++---
 indra/llcommon/llpreprocessor.h |  7 ++-----
 indra/llcommon/llrefcount.cpp   |  4 ++--
 indra/llcommon/llthread.cpp     | 14 ++++++-------
 8 files changed, 78 insertions(+), 48 deletions(-)

diff --git a/indra/cwdebug/debug.cc b/indra/cwdebug/debug.cc
index 18b51aad0..92ffc0d13 100644
--- a/indra/cwdebug/debug.cc
+++ b/indra/cwdebug/debug.cc
@@ -416,12 +416,23 @@ void cwdebug_backtrace(int n)
 #elif defined(DEBUG_CURLIO)
 
 #include "debug.h"
+#include "aithreadid.h"
 
 namespace debug
 {
 
 libcwd_do_type const libcw_do;
-CWD_TLS int Indent::S_indentation;
+ll_thread_local int Indent::S_indentation;
+
+Indent::Indent(int indent) : M_indent(indent)
+{
+	S_indentation += M_indent;
+}
+
+Indent::~Indent()
+{
+	S_indentation -= M_indent;
+}
 
 std::ostream& operator<<(std::ostream& os, Indent::print_nt)
 {
@@ -430,6 +441,19 @@ std::ostream& operator<<(std::ostream& os, Indent::print_nt)
   return os;
 }
 
+std::ostream& operator<<(std::ostream& os, print_thread_id_t)
+{
+	if (!AIThreadID::in_main_thread_inline())
+	{
+#ifdef LL_DARWIN
+		os << std::hex << (size_t)apr_os_thread_current() << std::dec << ' ';
+#else
+		os << std::hex << (size_t)AIThreadID::getCurrentThread_inline() << std::dec << ' ';
+#endif
+	}
+	return os;
+}
+
 std::ostream& operator<<(std::ostream& os, libcwd::buf2str const& b2s)
 {
   static char const c2s_tab[7] = { 'a', 'b', 't', 'n', 'v', 'f', 'r' };
diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h
index 9e832a44c..c8f15cfb9 100644
--- a/indra/cwdebug/debug.h
+++ b/indra/cwdebug/debug.h
@@ -29,14 +29,13 @@
 
 #ifdef DEBUG_CURLIO
 
-#include "aithreadid.h"
-
 // If CWDEBUG is not defined, but DEBUG_CURLIO is, then replace
 // some of the cwd macro's with something that generates viewer
 // specific debug output. Note that this generates a LOT of
 // output and should not normally be defined.
 
 #include <string>
+#include "llpreprocessor.h"
 
 namespace debug {
 namespace libcwd {
@@ -49,6 +48,7 @@ struct buf2str {
 
 } // namespace libcwd
 
+enum print_thread_id_t { print_thread_id };
 inline void init() { }
 struct libcwd_do_type {
  void on() const { }
@@ -56,14 +56,15 @@ struct libcwd_do_type {
 extern LL_COMMON_API libcwd_do_type const libcw_do;
 struct Indent {
   int M_indent;
-  static LL_COMMON_API_TLS int S_indentation;
+  static ll_thread_local int S_indentation;
   enum LL_COMMON_API print_nt { print };
-  LL_COMMON_API Indent(int indent) : M_indent(indent) { S_indentation += M_indent; }
-  LL_COMMON_API ~Indent() { S_indentation -= M_indent; }
+  LL_COMMON_API Indent(int indent);
+  LL_COMMON_API ~Indent();
 };
 
 extern LL_COMMON_API std::ostream& operator<<(std::ostream& os, libcwd::buf2str const& b2s);
 extern LL_COMMON_API std::ostream& operator<<(std::ostream& os, Indent::print_nt);
+extern LL_COMMON_API std::ostream& operator<<(std::ostream& os, print_thread_id_t);
 
 namespace dc {
 
@@ -87,13 +88,13 @@ extern LL_COMMON_API fake_channel const notice;
 } // namespace debug
 
 #define Debug(x) do { using namespace debug; x; } while(0)
-#define Dout(a, b) do { using namespace debug;  if ((a).mOn) { llinfos_nf << AIThreadID::DoutPrint << (a).mLabel << ": " << Indent::print << b << llendl; } } while(0)
+#define Dout(a, b) do { using namespace debug;  if ((a).mOn) { llinfos_nf << print_thread_id << (a).mLabel << ": " << Indent::print << b << llendl; } } while(0)
 #define DoutEntering(a, b) \
   int __slviewer_debug_indentation = 2; \
   { \
 	using namespace debug; \
 	if ((a).mOn) \
-	  llinfos_nf << AIThreadID::DoutPrint << (a).mLabel << ": " << Indent::print << "Entering " << b << llendl; \
+	  llinfos_nf << print_thread_id << (a).mLabel << ": " << Indent::print << "Entering " << b << llendl; \
     else \
 	  __slviewer_debug_indentation = 0; \
   } \
diff --git a/indra/llcommon/aithreadid.cpp b/indra/llcommon/aithreadid.cpp
index 4eea7d37d..64a8dd21a 100644
--- a/indra/llcommon/aithreadid.cpp
+++ b/indra/llcommon/aithreadid.cpp
@@ -27,7 +27,6 @@
  *   - Initial version, written by Aleric Inglewood @ SL
  */
 
-#include "sys.h"
 #include <iostream>
 #include <iomanip>
 #include "aithreadid.h"
@@ -36,7 +35,7 @@ AIThreadID const AIThreadID::sNone(AIThreadID::none);
 apr_os_thread_t AIThreadID::sMainThreadID;
 apr_os_thread_t const AIThreadID::undefinedID = (apr_os_thread_t)-1;
 #ifndef LL_DARWIN
-apr_os_thread_t CWD_TLS AIThreadID::lCurrentThread;
+apr_os_thread_t ll_thread_local AIThreadID::lCurrentThread;
 #endif
 
 void AIThreadID::set_main_thread_id(void)
@@ -51,21 +50,27 @@ void AIThreadID::set_current_thread_id(void)
 #endif
 }
 
+void AIThreadID::reset(void)
+{
+	mID = lCurrentThread;
+}
+
+bool AIThreadID::equals_current_thread(void) const
+{
+	return apr_os_thread_equal(mID, lCurrentThread);
+}
+
+bool AIThreadID::in_main_thread(void)
+{
+	return apr_os_thread_equal(lCurrentThread, sMainThreadID);
+}
+
+apr_os_thread_t AIThreadID::getCurrentThread(void)
+{
+	return lCurrentThread;
+}
+
 std::ostream& operator<<(std::ostream& os, AIThreadID const& id)
 {
 	return os << id.mID;
 }
-
-std::ostream& operator<<(std::ostream& os, AIThreadID::dout_print_t)
-{
-	if (!AIThreadID::in_main_thread())
-	{
-#ifdef LL_DARWIN
-		os << std::hex << (size_t)apr_os_thread_current() << std::dec << ' ';
-#else
-		os << std::hex << (size_t)AIThreadID::lCurrentThread << std::dec << ' ';
-#endif
-	}
-	return os;
-}
-
diff --git a/indra/llcommon/aithreadid.h b/indra/llcommon/aithreadid.h
index 9f7893c66..2bb3f1dac 100644
--- a/indra/llcommon/aithreadid.h
+++ b/indra/llcommon/aithreadid.h
@@ -34,7 +34,6 @@
 #include <apr_portable.h>	// apr_os_thread_t, apr_os_thread_current(), apr_os_thread_equal().
 #include <iosfwd>			// std::ostream.
 #include "llpreprocessor.h"	// LL_COMMON_API, LL_COMMON_API_TLS
-#include "llerror.h"
 
 // Lightweight wrapper around apr_os_thread_t.
 // This class introduces no extra assembly code after optimization; it's only intend is to provide type-safety.
@@ -45,12 +44,11 @@ private:
 	static LL_COMMON_API apr_os_thread_t sMainThreadID;
 	static LL_COMMON_API apr_os_thread_t const undefinedID;
 #ifndef LL_DARWIN
-	static LL_COMMON_API_TLS apr_os_thread_t lCurrentThread;
+	static ll_thread_local apr_os_thread_t lCurrentThread;
 #endif
 public:
 	static LL_COMMON_API AIThreadID const sNone;
 	enum undefined_thread_t { none };
-	enum dout_print_t { DoutPrint };
 
 public:
 	AIThreadID(void) : mID(apr_os_thread_current()) { }
@@ -62,7 +60,6 @@ public:
 	friend LL_COMMON_API bool operator==(AIThreadID const& id1, AIThreadID const& id2) { return apr_os_thread_equal(id1.mID, id2.mID); }
 	friend LL_COMMON_API bool operator!=(AIThreadID const& id1, AIThreadID const& id2) { return !apr_os_thread_equal(id1.mID, id2.mID); }
 	friend LL_COMMON_API std::ostream& operator<<(std::ostream& os, AIThreadID const& id);
-	friend LL_COMMON_API std::ostream& operator<<(std::ostream& os, dout_print_t);
 	static void set_main_thread_id(void);					// Called once to set sMainThreadID.
 	static void set_current_thread_id(void);				// Called once for every thread to set lCurrentThread.
 #ifdef LL_DARWIN
@@ -70,9 +67,15 @@ public:
 	bool equals_current_thread(void) const { return apr_os_thread_equal(mID, apr_os_thread_current()); }
 	static bool in_main_thread(void) { return apr_os_thread_equal(apr_os_thread_current(), sMainThreadID); }
 #else
-	void reset(void) { mID = lCurrentThread; }
-	bool equals_current_thread(void) const { return apr_os_thread_equal(mID, lCurrentThread); }
-	static bool in_main_thread(void) { return apr_os_thread_equal(lCurrentThread, sMainThreadID); }
+	LL_COMMON_API void reset(void);
+	LL_COMMON_API bool equals_current_thread(void) const;
+	LL_COMMON_API static bool in_main_thread(void);
+	LL_COMMON_API static apr_os_thread_t getCurrentThread(void);
+	// The *_inline variants cannot be exported because they access a thread-local member.
+	void reset_inline(void) { mID = lCurrentThread; }
+	bool equals_current_thread_inline(void) const { return apr_os_thread_equal(mID, lCurrentThread); }
+	static bool in_main_thread_inline(void) { return apr_os_thread_equal(lCurrentThread, sMainThreadID); }
+	static apr_os_thread_t getCurrentThread_inline(void) { return lCurrentThread; }
 #endif
 };
 
diff --git a/indra/llcommon/llaprpool.cpp b/indra/llcommon/llaprpool.cpp
index de5761157..3dffa8300 100644
--- a/indra/llcommon/llaprpool.cpp
+++ b/indra/llcommon/llaprpool.cpp
@@ -60,10 +60,10 @@ void LLAPRPool::create(LLAPRPool& parent)
 	//
 	// In other words, it's safe for any thread to create a (sub)pool, independent of who
 	// owns the parent pool.
-	mOwner.reset();
+	mOwner.reset_inline();
 #else
 	mOwner = mParent->mOwner;
-	llassert(mOwner.equals_current_thread());
+	llassert(mOwner.equals_current_thread_inline());
 #endif
 	apr_status_t const apr_pool_create_status = apr_pool_create(&mPool, mParent->mPool);
 	llassert_always(apr_pool_create_status == APR_SUCCESS);
@@ -83,7 +83,7 @@ void LLAPRPool::destroy(void)
 		// of course. Otherwise, if we are a subpool, only the thread that owns
 		// the parent may destruct us, since that is the pool that is still alive,
 		// possibly being used by others and being altered here.
-		llassert(!mParent || mParent->mOwner.equals_current_thread());
+		llassert(!mParent || mParent->mOwner.equals_current_thread_inline());
 #endif
 		apr_pool_t* pool = mPool;
 		mPool = NULL;				// Mark that we are BEING destructed.
diff --git a/indra/llcommon/llpreprocessor.h b/indra/llcommon/llpreprocessor.h
index be0ec94a3..a1f598d4a 100644
--- a/indra/llcommon/llpreprocessor.h
+++ b/indra/llcommon/llpreprocessor.h
@@ -198,12 +198,9 @@
 // Darwin does not support thread-local data.
 #ifndef LL_DARWIN
 #if LL_WINDOWS
-// On windows, thread-local data is automatically exported.
-#define LL_COMMON_API_TLS __declspec(thread)
-#define CWD_TLS __declspec(thread)
+#define ll_thread_local __declspec(thread)
 #else // Linux
-#define LL_COMMON_API_TLS LL_COMMON_API __thread
-#define CWD_TLS __thread
+#define ll_thread_local __thread
 #endif
 #endif
 
diff --git a/indra/llcommon/llrefcount.cpp b/indra/llcommon/llrefcount.cpp
index d92735aac..0956e1628 100644
--- a/indra/llcommon/llrefcount.cpp
+++ b/indra/llcommon/llrefcount.cpp
@@ -75,7 +75,7 @@ void LLRefCount::ref() const
 		}
 
 		mMutex.lock() ;
-		mLockedThreadID.reset();
+		mLockedThreadID.reset_inline();
 
 		mRef++; 
 
@@ -96,7 +96,7 @@ S32 LLRefCount::unref() const
 		}
 
 		mMutex.lock() ;
-		mLockedThreadID.reset();
+		mLockedThreadID.reset_inline();
 		
 		llassert(mRef >= 1);
 		if (0 == --mRef) 
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp
index c8d0be2f4..5c1a29f24 100644
--- a/indra/llcommon/llthread.cpp
+++ b/indra/llcommon/llthread.cpp
@@ -72,7 +72,7 @@ LLAtomicS32	LLThread::sRunning = 0;
 
 LL_COMMON_API void assert_main_thread()
 {
-	if (!AIThreadID::in_main_thread())
+	if (!AIThreadID::in_main_thread_inline())
 	{
 		llerrs << "Illegal execution outside main thread." << llendl;
 	}
@@ -407,12 +407,12 @@ LLMutexBase::LLMutexBase() :
 
 bool LLMutexBase::isSelfLocked() const
 {
-	return mLockingThread.equals_current_thread();
+	return mLockingThread.equals_current_thread_inline();
 }
 
 void LLMutexBase::lock() 
 { 
-	if (mLockingThread.equals_current_thread())
+	if (mLockingThread.equals_current_thread_inline())
 	{ //redundant lock
 		mCount++;
 		return;
@@ -420,12 +420,12 @@ void LLMutexBase::lock()
 
 	apr_thread_mutex_lock(mAPRMutexp);
 	
-	mLockingThread.reset();
+	mLockingThread.reset_inline();
 }
 
 bool LLMutexBase::tryLock()
 {
-	if (mLockingThread.equals_current_thread())
+	if (mLockingThread.equals_current_thread_inline())
 	{ //redundant lock
 		mCount++;
 		return true;
@@ -433,7 +433,7 @@ bool LLMutexBase::tryLock()
 	bool success = !APR_STATUS_IS_EBUSY(apr_thread_mutex_trylock(mAPRMutexp));
 	if (success)
 	{
-		mLockingThread.reset();
+		mLockingThread.reset_inline();
 	}
 	return success;
 }
@@ -441,7 +441,7 @@ bool LLMutexBase::tryLock()
 // non-blocking, but does do a lock/unlock so not free
 bool LLMutexBase::isLocked() const
 {
-	if (mLockingThread.equals_current_thread())
+	if (mLockingThread.equals_current_thread_inline())
 	  return false;		// A call to lock() won't block.
 	if (APR_STATUS_IS_EBUSY(apr_thread_mutex_trylock(mAPRMutexp)))
 	  return true;

From 8e1bbfe938e79ff4c37fcf60ca9493a56da08218 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Sat, 11 Aug 2012 03:29:46 +0200
Subject: [PATCH 181/199] Amend last commit

---
 indra/cwdebug/debug.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/cwdebug/debug.cc b/indra/cwdebug/debug.cc
index 92ffc0d13..b202a8ac6 100644
--- a/indra/cwdebug/debug.cc
+++ b/indra/cwdebug/debug.cc
@@ -441,6 +441,7 @@ std::ostream& operator<<(std::ostream& os, Indent::print_nt)
   return os;
 }
 
+#ifdef DEBUG_CURLIO
 std::ostream& operator<<(std::ostream& os, print_thread_id_t)
 {
 	if (!AIThreadID::in_main_thread_inline())
@@ -453,6 +454,7 @@ std::ostream& operator<<(std::ostream& os, print_thread_id_t)
 	}
 	return os;
 }
+#endif
 
 std::ostream& operator<<(std::ostream& os, libcwd::buf2str const& b2s)
 {

From 8e12f110891e5bfc17925d0e091b6edcae7d623a Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sat, 11 Aug 2012 00:09:09 -0400
Subject: [PATCH 182/199] Forgot to commit this include

---
 indra/newview/llfloateravatarlist.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index c038db2a0..6d25b887c 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -35,6 +35,7 @@
 #include "llfloaterreporter.h"
 #include "llagent.h"
 #include "llagentcamera.h"
+#include "llfloaterregioninfo.h"
 #include "llviewerregion.h"
 #include "lltracker.h"
 #include "llviewerstats.h"

From 80b100f135e35007bf664d10002432f1a10738de Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sat, 11 Aug 2012 00:48:36 -0400
Subject: [PATCH 183/199] Fix "KeyError: 'extra_libraries'" when compiling
 without FMOD Ex.

---
 indra/newview/viewer_manifest.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index de6d97ccb..3acd7f429 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -809,7 +809,7 @@ class Linux_i686Manifest(LinuxManifest):
             self.end_prefix("lib")
 
 
-            if self.args['extra_libraries'] != None:
+            if 'extra_libraries' in self.args:
                 print self.args['extra_libraries']
                 path_list = self.args['extra_libraries'].split('|')
                 for path in path_list:
@@ -854,7 +854,7 @@ class Linux_x86_64Manifest(LinuxManifest):
             self.path("libopenal.so*")
             self.path("libalut.so*")
 
-            if self.args['extra_libraries'] != None:
+            if 'extra_libraries' in self.args:
                 print self.args['extra_libraries']
                 path_list = self.args['extra_libraries'].split('|')
                 for path in path_list:

From ca6fd89700eb6cd002b88b9a686212c85cbade4a Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sat, 11 Aug 2012 01:49:15 -0400
Subject: [PATCH 184/199] Initial gpu_table retabbing, nothing important.

---
 indra/newview/gpu_table.txt | 412 ++++++++++++++++++------------------
 1 file changed, 206 insertions(+), 206 deletions(-)

diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index afb812699..e3a47978d 100644
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -1,96 +1,97 @@
-// 
+//
 // Categorizes graphics chips into various classes by name
 //
 // The table contains chip names regular expressions to match
 // against driver strings, a class number, and whether we claim
 // to support them or not.
 //
+// Format:
+//	 Fields are separated by one or more tab (not space) characters
+//	 <chip name>	<regular expression>	<class>		<supported>
+//
 // Class Numbers:
-//		0 - Defaults to low graphics settings.  No shaders on by default
-//		1 - Defaults to mid graphics settings.  Basic shaders on by default
-//		2 - Defaults to high graphics settings.  Atmospherics on by default.
+//		0 - Defaults to low graphics settings.	No shaders on by default
+//		1 - Defaults to mid graphics settings.	Basic shaders on by default
+//		2 - Defaults to high graphics settings.	 Atmospherics on by default.
 //		3 - Same as class 2 for now.
 //
 // Supported Number:
 //		0 - We claim to not support this card.
 //		1 - We claim to support this card.
 //
-// Format:
-//   <chip name>	<regexp>	<class>		<supported>
-//	
 
-3Dfx							.*3Dfx.*							0		0
-3Dlabs							.*3Dlabs.*							0		0
-ATI 3D-Analyze					.*ATI.*3D-Analyze.*					0		0
-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
-ATI All-in-Wonder X1900			.*ATI.*All-in-Wonder X19.*			3		1
-ATI All-in-Wonder PCI-E			.*ATI.*All-in-Wonder.*PCI-E.*		1		1
-ATI All-in-Wonder Radeon 		.*ATI.*All-in-Wonder Radeon.*		0		1
+3Dfx							.*3Dfx.*									0		0
+3Dlabs							.*3Dlabs.*									0		0
+ATI 3D-Analyze					.*ATI.*3D-Analyze.*							0		0
+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
+ATI All-in-Wonder X1900			.*ATI.*All-in-Wonder X19.*					3		1
+ATI All-in-Wonder PCI-E			.*ATI.*All-in-Wonder.*PCI-E.*				1		1
+ATI All-in-Wonder Radeon		.*ATI.*All-in-Wonder Radeon.*				0		1
 ATI ASUS ARES					.*ATI.*ASUS.*ARES.*							3		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
-ATI ASUS EAH24xx				.*ATI.*ASUS.*EAH24.*				2		1
-ATI ASUS EAH26xx				.*ATI.*ASUS.*EAH26.*				3		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
+ATI ASUS EAH24xx				.*ATI.*ASUS.*EAH24.*						2		1
+ATI ASUS EAH26xx				.*ATI.*ASUS.*EAH26.*						3		1
 ATI ASUS EAH29xx				.*ATI.*ASUS.*EAH29.*						3		1
-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 EAH43xx				.*ATI.*ASUS.*EAH43.*				1		1
-ATI ASUS EAH45xx				.*ATI.*ASUS.*EAH45.*				1		1
-ATI ASUS EAH48xx				.*ATI.*ASUS.*EAH48.*				3		1
+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 EAH43xx				.*ATI.*ASUS.*EAH43.*						1		1
+ATI ASUS EAH45xx				.*ATI.*ASUS.*EAH45.*						1		1
+ATI ASUS EAH48xx				.*ATI.*ASUS.*EAH48.*						3		1
 ATI ASUS EAH57xx				.*ATI.*ASUS.*EAH57.*						3		1
 ATI ASUS EAH58xx				.*ATI.*ASUS.*EAH58.*						3		1
 ATI ASUS EAH6xxx				.*ATI.*ASUS.*EAH6.*							3		1
-ATI ASUS Radeon X1xxx				.*ATI.*ASUS.*X1.*							3		1
+ATI ASUS Radeon X1xxx			.*ATI.*ASUS.*X1.*							3		1
 ATI Radeon X7xx					.*ATI.*ASUS.*X7.*							1		1
-ATI Radeon X19xx				.*ATI.*X19.*						3		1
-ATI Radeon X18xx				.*ATI.*X18.*						3		1
-ATI Radeon X17xx				.*ATI.*X17.*						2		1
-ATI Radeon X16xx				.*ATI.*X16.*						2		1
-ATI Radeon X15xx				.*ATI.*X15.*						2		1
-ATI Radeon X13xx				.*ATI.*X13.*						1		1
-ATI Radeon X1xxx				.*ATI.*X1.*						1		1
-ATI Radeon X2xxx				.*ATI.*X2.*						1		1
-ATI Radeon X500					.*ATI.*X5.*							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 Radeon X19xx				.*ATI.*X19.*								3		1
+ATI Radeon X18xx				.*ATI.*X18.*								3		1
+ATI Radeon X17xx				.*ATI.*X17.*								2		1
+ATI Radeon X16xx				.*ATI.*X16.*								2		1
+ATI Radeon X15xx				.*ATI.*X15.*								2		1
+ATI Radeon X13xx				.*ATI.*X13.*								1		1
+ATI Radeon X1xxx				.*ATI.*X1.*									1		1
+ATI Radeon X2xxx				.*ATI.*X2.*									1		1
+ATI Radeon X500					.*ATI.*X5.*									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
 ATI FirePro M3900				.*ATI.*FirePro.*M39.*						2		1
 ATI FirePro M5800				.*ATI.*FirePro.*M58.*						3		1
 ATI FirePro M7740				.*ATI.*FirePro.*M77.*						3		1
 ATI FirePro M7820				.*ATI.*FirePro.*M78.*						3		1
 ATI FireMV						.*ATI.*FireMV.*								0		1
-ATI Generic						.*ATI.*Generic.*					0		0
-ATI Hercules 9800				.*ATI.*Hercules.*9800.*				1		1
-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 Generic						.*ATI.*Generic.*							0		0
+ATI Hercules 9800				.*ATI.*Hercules.*9800.*						1		1
+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 Radeon HD 64xx				.*ATI.*AMD Radeon.* HD [67]4..[MG]			3		1
 ATI Radeon HD 65xx				.*ATI.*AMD Radeon.* HD [67]5..[MG]			3		1
 ATI Radeon HD 66xx				.*ATI.*AMD Radeon.* HD [67]6..[MG]			3		1
 ATI Mobility Radeon 4100		.*ATI.*Mobility.*41..						1		1
-ATI Mobility Radeon 7xxx		.*ATI.*Mobility.*Radeon 7.*			0		1
-ATI Mobility Radeon 8xxx		.*ATI.*Mobility.*Radeon 8.*			0		1
-ATI Mobility Radeon 9800		.*ATI.*Mobility.*98.*				1		1
+ATI Mobility Radeon 7xxx		.*ATI.*Mobility.*Radeon 7.*					0		1
+ATI Mobility Radeon 8xxx		.*ATI.*Mobility.*Radeon 8.*					0		1
+ATI Mobility Radeon 9800		.*ATI.*Mobility.*98.*						1		1
 ATI Mobility Radeon 9700		.*ATI.*Mobility.*97.*						1		1
 ATI Mobility Radeon 9600		.*ATI.*Mobility.*96.*						0		1
 ATI Mobility Radeon HD 530v		.*ATI.*Mobility.*HD *530v.*					1		1
@@ -119,7 +120,7 @@ ATI Mobility Radeon HD 5400		.*ATI.*Mobility.*HD *54.*					3		1
 ATI Mobility Radeon HD 5500		.*ATI.*Mobility.*HD *55.*					3		1
 ATI Mobility Radeon HD 5600		.*ATI.*Mobility.*HD *56.*					3		1
 ATI Mobility Radeon HD 5700		.*ATI.*Mobility.*HD *57.*					3		1
-ATI Mobility Radeon HD 5800		.*ATI.*Mobility *HD *58.*			3		1
+ATI Mobility Radeon HD 5800		.*ATI.*Mobility *HD *58.*					3		1
 ATI Mobility Radeon HD 6200		.*ATI.*Mobility.*HD *62.*					3		1
 ATI Mobility Radeon HD 6300		.*ATI.*Mobility.*HD *63.*					3		1
 ATI Mobility Radeon HD 6400M	.*ATI.*Mobility.*HD *64.*					3		1
@@ -134,13 +135,13 @@ ATI Mobility Radeon HD 7600M	.*ATI.*Mobility.*HD *76.*					3		1
 ATI Mobility Radeon HD 7700M	.*ATI.*Mobility.*HD *77.*					3		1
 ATI Mobility Radeon HD 7800M	.*ATI.*Mobility.*HD *78.*					3		1
 ATI Mobility Radeon HD 7900M	.*ATI.*Mobility.*HD *79.*					3		1
-ATI Mobility Radeon X1xxx		.*ATI.*Mobility.*X1.*				0		1
-ATI Mobility Radeon X2xxx		.*ATI.*Mobility.*X2.*				0		1
-ATI Mobility Radeon X3xx		.*ATI.*Mobility.*X3.*				1		1
-ATI Mobility Radeon X6xx		.*ATI.*Mobility.*X6.*				1		1
-ATI Mobility Radeon X7xx		.*ATI.*Mobility.*X7.*				1		1
-ATI Mobility Radeon Xxxx		.*ATI.*Mobility.*X.*				0		1
-ATI Mobility Radeon				.*ATI.*Mobility.*					0		1
+ATI Mobility Radeon X1xxx		.*ATI.*Mobility.*X1.*						0		1
+ATI Mobility Radeon X2xxx		.*ATI.*Mobility.*X2.*						0		1
+ATI Mobility Radeon X3xx		.*ATI.*Mobility.*X3.*						1		1
+ATI Mobility Radeon X6xx		.*ATI.*Mobility.*X6.*						1		1
+ATI Mobility Radeon X7xx		.*ATI.*Mobility.*X7.*						1		1
+ATI Mobility Radeon Xxxx		.*ATI.*Mobility.*X.*						0		1
+ATI Mobility Radeon				.*ATI.*Mobility.*							0		1
 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
@@ -169,10 +170,10 @@ ATI Radeon HD 5700				.*ATI.*Radeon HD *57..						3		1
 ATI Radeon HD 5800				.*ATI.*Radeon HD *58..						3		1
 ATI Radeon HD 5900				.*ATI.*Radeon HD *59..						3		1
 ATI Radeon HD 6200				.*ATI.*Radeon HD *62..						3		1
-ATI Radeon HD 6300M				.*ATI.*Radeon.*HD.*6300M.*			3		1
+ATI Radeon HD 6300M				.*ATI.*Radeon.*HD.*6300M.*					3		1
 ATI Radeon HD 6300				.*ATI.*Radeon HD *63..						3		1
 ATI Radeon HD 6400				.*ATI.*Radeon HD *64..						3		1
-ATI Radeon HD 6500M				.*ATI.*Radeon.*HD.*6500M.*			3		1
+ATI Radeon HD 6500M				.*ATI.*Radeon.*HD.*6500M.*					3		1
 ATI Radeon HD 6500				.*ATI.*Radeon HD *65..						3		1
 ATI Radeon HD 6600				.*ATI.*Radeon HD *66..						3		1
 ATI Radeon HD 6700				.*ATI.*Radeon HD *67..						3		1
@@ -198,22 +199,22 @@ ATI Radeon 9500					.*ATI.*Radeon 95..							0		1
 ATI Radeon 9600					.*ATI.*Radeon 96..							0		1
 ATI Radeon 9700					.*ATI.*Radeon 97..							1		1
 ATI Radeon 9800					.*ATI.*Radeon 98..							1		1
-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 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 RS880M						.*ATI.*RS880M								1		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 X1700				.*ATI.*Radeon ?X17.*					1		1
-ATI Radeon X1800				.*ATI.*Radeon ?X18.*					3		1
-ATI Radeon X1900				.*ATI.*Radeon ?X19.*					3		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 X1700				.*ATI.*Radeon ?X17.*						1		1
+ATI Radeon X1800				.*ATI.*Radeon ?X18.*						3		1
+ATI Radeon X1900				.*ATI.*Radeon ?X19.*						3		1
 ATI Radeon X300					.*ATI.*Radeon *X3.*							0		1
 ATI Radeon X400					.*ATI.*Radeon ?X4.*							0		1
 ATI Radeon X500					.*ATI.*Radeon ?X5.*							0		1
@@ -390,10 +391,10 @@ NVIDIA GTX 580					.*NVIDIA .*GTX *58.*						3		1
 NVIDIA GTX 590					.*NVIDIA .*GTX *59.*						3		1
 NVIDIA C51						.*NVIDIA .*C51.*							0		1
 NVIDIA G72						.*NVIDIA .*G72.*							1		1
-NVIDIA G73						.*NVIDIA.*G73.*						1		1
+NVIDIA G73						.*NVIDIA .*G73.*							1		1
 NVIDIA G84						.*NVIDIA .*G84.*							2		1
-NVIDIA G86						.*NVIDIA.*G86.*						3		1
-NVIDIA G92						.*NVIDIA.*G92.*						3		1
+NVIDIA G86						.*NVIDIA .*G86.*							3		1
+NVIDIA G92						.*NVIDIA .*G92.*							3		1
 NVIDIA GeForce					.*GeForce 256.*								0		0
 NVIDIA GeForce 2				.*GeForce ?2 ?.*							0		1
 NVIDIA GeForce 3				.*GeForce ?3 ?.*							0		1
@@ -404,80 +405,80 @@ NVIDIA GeForce 4 MX				.*NVIDIA .*GeForce ?4 MX.*					0		1
 NVIDIA GeForce 4 PCX			.*NVIDIA .*GeForce ?4 PCX.*					0		1
 NVIDIA GeForce 4 Ti				.*NVIDIA .*GeForce ?4 Ti.*					0		1
 NVIDIA GeForce 6100				.*NVIDIA .*GeForce 61.*						0		1
-NVIDIA GeForce 6200				.*NVIDIA.*GeForce 62.*				0		1
-NVIDIA GeForce 6500				.*NVIDIA.*GeForce 65.*				0		1
-NVIDIA GeForce 6600				.*NVIDIA.*GeForce 66.*				1		1
-NVIDIA GeForce 6700				.*NVIDIA.*GeForce 67.*				2		1
-NVIDIA GeForce 6800				.*NVIDIA.*GeForce 68.*				2		1
-NVIDIA GeForce 7000M			.*NVIDIA.*GeForce 7000M.*			0		1
-NVIDIA GeForce 7100M			.*NVIDIA.*GeForce 7100M.*			0		1
-NVIDIA GeForce 7000				.*NVIDIA.*GeForce 70.*				0		1
-NVIDIA GeForce 7100				.*NVIDIA.*GeForce 71.*				0		1
-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 7900				.*NVIDIA.*GeForce.*79.*				2		1
-NVIDIA GeForce 8100				.*NVIDIA.*GeForce 81.*				1		1
-NVIDIA GeForce 8200M			.*NVIDIA.*GeForce 8200M.*				1		1
-NVIDIA GeForce 8200				.*NVIDIA.*GeForce 82.*				1		1
-NVIDIA GeForce 8300				.*NVIDIA.*GeForce 83.*				1		1
-NVIDIA GeForce 8400M			.*NVIDIA.*GeForce 8400M.*			1		1
-NVIDIA GeForce 8400				.*NVIDIA.*GeForce 84.*				1		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 8700M			.*NVIDIA.*GeForce 8700M.*			3		1
-NVIDIA GeForce 8700				.*NVIDIA.*GeForce 87.*				3		1
-NVIDIA GeForce 8800				.*NVIDIA.*GeForce 88.*				3		1
-NVIDIA GeForce 8800M			.*NVIDIA.*GeForce 8800M.*			3		1
-NVIDIA GeForce 9100M			.*NVIDIA.*GeForce 9100M.*			0		1
-NVIDIA GeForce 9100				.*NVIDIA.*GeForce 91.*				0		1
-NVIDIA GeForce 9200M			.*NVIDIA.*GeForce 9200M.*			1		1
-NVIDIA GeForce 9200				.*NVIDIA.*GeForce 92.*				1		1
-NVIDIA GeForce 9300M			.*NVIDIA.*GeForce 9300M.*			1		1
-NVIDIA GeForce 9300				.*NVIDIA.*GeForce 93.*				1		1
-NVIDIA GeForce 9400M			.*NVIDIA.*GeForce 9400M.*			1		1
-NVIDIA GeForce 9400				.*NVIDIA.*GeForce 94.*				1		1
-NVIDIA GeForce 9500				.*NVIDIA.*GeForce 95.*				2		1
-NVIDIA GeForce 9500M			.*NVIDIA.*GeForce 9500M.*			2		1
-NVIDIA GeForce 9600				.*NVIDIA.*GeForce.*96.*				2		1
-NVIDIA GeForce 9600M			.*NVIDIA.*GeForce 9600M.*			2		1
-NVIDIA GeForce 9700M			.*NVIDIA.*GeForce 9700M.*			2		1
-NVIDIA GeForce 9800M			.*NVIDIA.*GeForce 9800M.*			3		1
-NVIDIA GeForce 9800				.*NVIDIA.*GeForce.*98.*				3		1
-NVIDIA GeForce FX 5100			.*NVIDIA.*GeForce FX 51.*			0		1
-NVIDIA GeForce FX 5200			.*NVIDIA.*GeForce FX 52.*			0		1
-NVIDIA GeForce FX 5300			.*NVIDIA.*GeForce FX 53.*			0		1
-NVIDIA GeForce FX 5500			.*NVIDIA.*GeForce FX 55.*			0		1
-NVIDIA GeForce FX 5600			.*NVIDIA.*GeForce FX 56.*			0		1
-NVIDIA GeForce FX 5700			.*NVIDIA.*GeForce FX 57.*			1		1
-NVIDIA GeForce FX 5800			.*NVIDIA.*GeForce FX 58.*			1		1
-NVIDIA GeForce FX 5900			.*NVIDIA.*GeForce FX 59.*			1		1
-NVIDIA GeForce FX Go5100		.*NVIDIA.*GeForce FX Go51.*			0		1
-NVIDIA GeForce FX Go5200		.*NVIDIA.*GeForce FX Go52.*			0		1
-NVIDIA GeForce FX Go5300		.*NVIDIA.*GeForce FX Go53.*			0		1
-NVIDIA GeForce FX Go5500		.*NVIDIA.*GeForce FX Go55.*			0		1
-NVIDIA GeForce FX Go5600		.*NVIDIA.*GeForce FX Go56.*			0		1
-NVIDIA GeForce FX Go5700		.*NVIDIA.*GeForce FX Go57.*			1		1
-NVIDIA GeForce FX Go5800		.*NVIDIA.*GeForce FX Go58.*			1		1
+NVIDIA GeForce 6200				.*NVIDIA.*GeForce 62.*						0		1
+NVIDIA GeForce 6500				.*NVIDIA.*GeForce 65.*						0		1
+NVIDIA GeForce 6600				.*NVIDIA.*GeForce 66.*						1		1
+NVIDIA GeForce 6700				.*NVIDIA.*GeForce 67.*						2		1
+NVIDIA GeForce 6800				.*NVIDIA.*GeForce 68.*						2		1
+NVIDIA GeForce 7000M			.*NVIDIA.*GeForce 7000M.*					0		1
+NVIDIA GeForce 7100M			.*NVIDIA.*GeForce 7100M.*					0		1
+NVIDIA GeForce 7000				.*NVIDIA.*GeForce 70.*						0		1
+NVIDIA GeForce 7100				.*NVIDIA.*GeForce 71.*						0		1
+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 7900				.*NVIDIA.*GeForce.*79.*						2		1
+NVIDIA GeForce 8100				.*NVIDIA.*GeForce 81.*						1		1
+NVIDIA GeForce 8200M			.*NVIDIA.*GeForce 8200M.*					1		1
+NVIDIA GeForce 8200				.*NVIDIA.*GeForce 82.*						1		1
+NVIDIA GeForce 8300				.*NVIDIA.*GeForce 83.*						1		1
+NVIDIA GeForce 8400M			.*NVIDIA.*GeForce 8400M.*					1		1
+NVIDIA GeForce 8400				.*NVIDIA.*GeForce 84.*						1		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 8700M			.*NVIDIA.*GeForce 8700M.*					3		1
+NVIDIA GeForce 8700				.*NVIDIA.*GeForce 87.*						3		1
+NVIDIA GeForce 8800				.*NVIDIA.*GeForce 88.*						3		1
+NVIDIA GeForce 8800M			.*NVIDIA.*GeForce 8800M.*					3		1
+NVIDIA GeForce 9100M			.*NVIDIA.*GeForce 9100M.*					0		1
+NVIDIA GeForce 9100				.*NVIDIA.*GeForce 91.*						0		1
+NVIDIA GeForce 9200M			.*NVIDIA.*GeForce 9200M.*					1		1
+NVIDIA GeForce 9200				.*NVIDIA.*GeForce 92.*						1		1
+NVIDIA GeForce 9300M			.*NVIDIA.*GeForce 9300M.*					1		1
+NVIDIA GeForce 9300				.*NVIDIA.*GeForce 93.*						1		1
+NVIDIA GeForce 9400M			.*NVIDIA.*GeForce 9400M.*					1		1
+NVIDIA GeForce 9400				.*NVIDIA.*GeForce 94.*						1		1
+NVIDIA GeForce 9500				.*NVIDIA.*GeForce 95.*						2		1
+NVIDIA GeForce 9500M			.*NVIDIA.*GeForce 9500M.*					2		1
+NVIDIA GeForce 9600				.*NVIDIA.*GeForce.*96.*						2		1
+NVIDIA GeForce 9600M			.*NVIDIA.*GeForce 9600M.*					2		1
+NVIDIA GeForce 9700M			.*NVIDIA.*GeForce 9700M.*					2		1
+NVIDIA GeForce 9800M			.*NVIDIA.*GeForce 9800M.*					3		1
+NVIDIA GeForce 9800				.*NVIDIA.*GeForce.*98.*						3		1
+NVIDIA GeForce FX 5100			.*NVIDIA.*GeForce FX 51.*					0		1
+NVIDIA GeForce FX 5200			.*NVIDIA.*GeForce FX 52.*					0		1
+NVIDIA GeForce FX 5300			.*NVIDIA.*GeForce FX 53.*					0		1
+NVIDIA GeForce FX 5500			.*NVIDIA.*GeForce FX 55.*					0		1
+NVIDIA GeForce FX 5600			.*NVIDIA.*GeForce FX 56.*					0		1
+NVIDIA GeForce FX 5700			.*NVIDIA.*GeForce FX 57.*					1		1
+NVIDIA GeForce FX 5800			.*NVIDIA.*GeForce FX 58.*					1		1
+NVIDIA GeForce FX 5900			.*NVIDIA.*GeForce FX 59.*					1		1
+NVIDIA GeForce FX Go5100		.*NVIDIA.*GeForce FX Go51.*					0		1
+NVIDIA GeForce FX Go5200		.*NVIDIA.*GeForce FX Go52.*					0		1
+NVIDIA GeForce FX Go5300		.*NVIDIA.*GeForce FX Go53.*					0		1
+NVIDIA GeForce FX Go5500		.*NVIDIA.*GeForce FX Go55.*					0		1
+NVIDIA GeForce FX Go5600		.*NVIDIA.*GeForce FX Go56.*					0		1
+NVIDIA GeForce FX Go5700		.*NVIDIA.*GeForce FX Go57.*					1		1
+NVIDIA GeForce FX Go5800		.*NVIDIA.*GeForce FX Go58.*					1		1
 NVIDIA GeForce FX Go5900		.*NVIDIA .*GeForce FX Go59.*				1		1
 NVIDIA GeForce FX Go5xxx		.*NVIDIA .*GeForce FX Go.*					0		1
-NVIDIA GeForce Go 6100			.*NVIDIA.*GeForce Go 61.*			0		1
-NVIDIA GeForce Go 6200			.*NVIDIA.*GeForce Go 62.*			0		1
-NVIDIA GeForce Go 6400			.*NVIDIA.*GeForce Go 64.*			1		1
-NVIDIA GeForce Go 6500			.*NVIDIA.*GeForce Go 65.*			1		1
-NVIDIA GeForce Go 6600			.*NVIDIA.*GeForce Go 66.*			1		1
-NVIDIA GeForce Go 6700			.*NVIDIA.*GeForce Go 67.*			1		1
-NVIDIA GeForce Go 6800			.*NVIDIA.*GeForce Go 68.*			1		1
+NVIDIA GeForce Go 6100			.*NVIDIA.*GeForce Go 61.*					0		1
+NVIDIA GeForce Go 6200			.*NVIDIA.*GeForce Go 62.*					0		1
+NVIDIA GeForce Go 6400			.*NVIDIA.*GeForce Go 64.*					1		1
+NVIDIA GeForce Go 6500			.*NVIDIA.*GeForce Go 65.*					1		1
+NVIDIA GeForce Go 6600			.*NVIDIA.*GeForce Go 66.*					1		1
+NVIDIA GeForce Go 6700			.*NVIDIA.*GeForce Go 67.*					1		1
+NVIDIA GeForce Go 6800			.*NVIDIA.*GeForce Go 68.*					1		1
 NVIDIA GeForce Go 7200			.*NVIDIA .*GeForce Go 72.*					1		1
 NVIDIA GeForce Go 7300 LE		.*NVIDIA .*GeForce Go 73.*LE.*				0		1
 NVIDIA GeForce Go 7300			.*NVIDIA .*GeForce Go 73.*					1		1
 NVIDIA GeForce Go 7400			.*NVIDIA .*GeForce Go 74.*					1		1
 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 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 D9M						.*NVIDIA .*D9M.*							1		1
 NVIDIA G94						.*NVIDIA .*G94.*							3		1
@@ -520,40 +521,39 @@ NVIDIA Quadro 6000				.*Quadro.*6000.*							3		1
 NVIDIA Quadro 400				.*Quadro.*400.*								2		1
 NVIDIA Quadro 600				.*Quadro.*600.*								2		1
 NVIDIA Quadro4					.*Quadro4.*									0		1
-NVIDIA Quadro DCC				.*Quadro DCC.*						0		1
+NVIDIA Quadro DCC				.*Quadro DCC.*								0		1
 NVIDIA Quadro CX				.*Quadro.*CX.*								3		1
-NVIDIA Quadro FX 770				.*Quadro.*FX *770(M)?.*						2		1
-NVIDIA Quadro FX 880				.*Quadro.*FX *880(M)?.*						2		1
-NVIDIA Quadro FX 1400				.*Quadro.*FX.*1400(M)?.*			1		1
-NVIDIA Quadro FX 1500				.*Quadro.*FX.*1500(M)?.*			1		1
-NVIDIA Quadro FX 1600				.*Quadro.*FX *1600(M)?.*			2		1
-NVIDIA Quadro FX 1700				.*Quadro.*FX.*1700(M)?.*			2		1
-NVIDIA Quadro FX 1800				.*Quadro.*FX.*1800(M)?.*			2		1
-NVIDIA Quadro FX 3400				.*Quadro.*FX.*3400(M)?.*			1		1
-NVIDIA Quadro FX 3450				.*Quadro.*FX.*3450(M)?.*			1		1
-NVIDIA Quadro FX 3500				.*Quadro.*FX.*3500(M)?.*			1		1
-NVIDIA Quadro FX 3700				.*Quadro.*FX.*3700(M)?.*			2		1
-NVIDIA Quadro FX 3800				.*Quadro.*FX.*3800(M)?.*			2		1
-NVIDIA Quadro FX 370				.*Quadro.*FX.*370(M)?.*			2		1
-NVIDIA Quadro FX 380				.*Quadro.*FX.*380(M)?.*			2		1
-NVIDIA Quadro FX 4000				.*Quadro.*FX.*4000(M)?.*			1		1
-NVIDIA Quadro FX 4500				.*Quadro.*FX.*4500(M)?.*			1		1
-NVIDIA Quadro FX 4600				.*Quadro.*FX.*4600(M)?.*			2		1
-NVIDIA Quadro FX 4700				.*Quadro.*FX.*4700(M)?.*			2		1
-NVIDIA Quadro FX 4800				.*Quadro.*FX.*4800(M)?.*			2		1
-NVIDIA Quadro FX 470				.*Quadro.*FX.*470(M)?.*			3		1
-NVIDIA Quadro FX 5500				.*Quadro.*FX.*5500(M)?.*			1		1
-NVIDIA Quadro FX 5600				.*Quadro.*FX.*5600(M)?.*			2		1
-NVIDIA Quadro FX 5700				.*Quadro.*FX.*5700(M)?.*			2		1
-NVIDIA Quadro FX 5800				.*Quadro.*FX.*5800(M)?.*			2		1
-NVIDIA Quadro FX 540				.*Quadro.*FX.*540(M)?.*			3		1
-NVIDIA Quadro FX 550				.*Quadro.*FX.*550(M)?.*			3		1
-NVIDIA Quadro FX 560				.*Quadro.*FX.*560(M)?.*			3		1
-NVIDIA Quadro FX 570				.*Quadro.*FX.*570(M)?.*			3		1
-NVIDIA Quadro FX 580				.*Quadro.*FX.*580(M)?.*			3		1
-NVIDIA Quadro FX				.*Quadro FX.*						1		1
-NVIDIA Quadro NVS 1xxM			.*Quadro NVS *1.[05]M.*						0		1
-NVIDIA Quadro VX 200				.*Quadro VX.*200.*			2		1
+NVIDIA Quadro FX 770			.*Quadro.*FX *770(M)?.*						2		1
+NVIDIA Quadro FX 880			.*Quadro.*FX *880(M)?.*						2		1
+NVIDIA Quadro FX 1400			.*Quadro.*FX.*1400(M)?.*					1		1
+NVIDIA Quadro FX 1500			.*Quadro.*FX.*1500(M)?.*					1		1
+NVIDIA Quadro FX 1600			.*Quadro.*FX *1600(M)?.*					2		1
+NVIDIA Quadro FX 1700			.*Quadro.*FX.*1700(M)?.*					2		1
+NVIDIA Quadro FX 1800			.*Quadro.*FX.*1800(M)?.*					2		1
+NVIDIA Quadro FX 3400			.*Quadro.*FX.*3400(M)?.*					1		1
+NVIDIA Quadro FX 3450			.*Quadro.*FX.*3450(M)?.*					1		1
+NVIDIA Quadro FX 3500			.*Quadro.*FX.*3500(M)?.*					1		1
+NVIDIA Quadro FX 3700			.*Quadro.*FX.*3700(M)?.*					2		1
+NVIDIA Quadro FX 3800			.*Quadro.*FX.*3800(M)?.*					2		1
+NVIDIA Quadro FX 370			.*Quadro.*FX.*370(M)?.*						2		1
+NVIDIA Quadro FX 380			.*Quadro.*FX.*380(M)?.*						2		1
+NVIDIA Quadro FX 4000			.*Quadro.*FX.*4000(M)?.*					1		1
+NVIDIA Quadro FX 4500			.*Quadro.*FX.*4500(M)?.*					1		1
+NVIDIA Quadro FX 4600			.*Quadro.*FX.*4600(M)?.*					2		1
+NVIDIA Quadro FX 4700			.*Quadro.*FX.*4700(M)?.*					2		1
+NVIDIA Quadro FX 4800			.*Quadro.*FX.*4800(M)?.*					2		1
+NVIDIA Quadro FX 470			.*Quadro.*FX.*470(M)?.*						3		1
+NVIDIA Quadro FX 5500			.*Quadro.*FX.*5500(M)?.*					1		1
+NVIDIA Quadro FX 5600			.*Quadro.*FX.*5600(M)?.*					2		1
+NVIDIA Quadro FX 5700			.*Quadro.*FX.*5700(M)?.*					2		1
+NVIDIA Quadro FX 5800			.*Quadro.*FX.*5800(M)?.*					2		1
+NVIDIA Quadro FX 540			.*Quadro.*FX.*540(M)?.*						3		1
+NVIDIA Quadro FX 550			.*Quadro.*FX.*550(M)?.*						3		1
+NVIDIA Quadro FX 560			.*Quadro.*FX.*560(M)?.*						3		1
+NVIDIA Quadro FX 570			.*Quadro.*FX.*570(M)?.*						3		1
+NVIDIA Quadro FX 580			.*Quadro.*FX.*580(M)?.*						3		1
+NVIDIA Quadro FX				.*Quadro FX.*								1		1
+NVIDIA Quadro VX 200			.*Quadro VX.*200.*							2		1
 NVIDIA Quadro NVS 1xxM			.*Quadro NVS *1.[05]M.*						0		1
 NVIDIA Quadro NVS 300M			.*NVIDIA .*NVS *300M.*						2		1
 NVIDIA Quadro NVS 320M			.*NVIDIA .*NVS *320M.*						2		1
@@ -561,21 +561,21 @@ NVIDIA Quadro NVS 2100M			.*NVIDIA .*NVS *2100M.*						2		1
 NVIDIA Quadro NVS 3100M			.*NVIDIA .*NVS *3100M.*						2		1
 NVIDIA Quadro NVS 4200M			.*NVIDIA .*NVS *4200M.*						2		1
 NVIDIA Quadro NVS 5100M			.*NVIDIA .*NVS *5100M.*						2		1
-NVIDIA Quadro 2000				.*Quadro.*2000.*			2		1
-NVIDIA Quadro 4000				.*Quadro.*4000.*			2		1
-NVIDIA Quadro 5000				.*Quadro.*5000.*			2		1
-NVIDIA Quadro 6000				.*Quadro.*6000.*			2		1
-NVIDIA Quadro 600				.*Quadro.*600.*				2		1
+NVIDIA Quadro 2000				.*Quadro.*2000.*							2		1
+NVIDIA Quadro 4000				.*Quadro.*4000.*							2		1
+NVIDIA Quadro 5000				.*Quadro.*5000.*							2		1
+NVIDIA Quadro 6000				.*Quadro.*6000.*							2		1
+NVIDIA Quadro 600				.*Quadro.*600.*								2		1
 NVIDIA Quadro NVS				.*(Quadro|NVIDIA) 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
-Microsoft RemoteFX Graphics Device - WDDM		Microsoft.*RemoteFX.*	0		0
+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
+Microsoft RemoteFX Graphics Device - WDDM		Microsoft.*RemoteFX.*		0		0
 Humper							Humper.*									0		1

From 92c9311a4c6e3378ede1477a1cc943dfe591133a Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sat, 11 Aug 2012 02:51:49 -0400
Subject: [PATCH 185/199] gpu_table update!

---
 indra/newview/gpu_table.txt | 190 ++++++++++++++++++++----------------
 1 file changed, 108 insertions(+), 82 deletions(-)

diff --git a/indra/newview/gpu_table.txt b/indra/newview/gpu_table.txt
index e3a47978d..ce8e013f0 100644
--- a/indra/newview/gpu_table.txt
+++ b/indra/newview/gpu_table.txt
@@ -76,6 +76,9 @@ ATI FirePro M5800				.*ATI.*FirePro.*M58.*						3		1
 ATI FirePro M7740				.*ATI.*FirePro.*M77.*						3		1
 ATI FirePro M7820				.*ATI.*FirePro.*M78.*						3		1
 ATI FireMV						.*ATI.*FireMV.*								0		1
+ATI Geforce 9500 GT				.*ATI.*Geforce 9500 *GT.*					2		1
+ATI Geforce 9600 GT				.*ATI.*Geforce 9600 *GT.*					2		1
+ATI Geforce 9800 GT				.*ATI.*Geforce 9800 *GT.*					2		1
 ATI Generic						.*ATI.*Generic.*							0		0
 ATI Hercules 9800				.*ATI.*Hercules.*9800.*						1		1
 ATI IGP 340M					.*ATI.*IGP.*340M.*							0		0
@@ -100,8 +103,8 @@ ATI Mobility Radeon HD 545v		.*ATI.*Mobility.*HD *545v.*					2		1
 ATI Mobility Radeon HD 550v		.*ATI.*Mobility.*HD *550v.*					2		1
 ATI Mobility Radeon HD 560v		.*ATI.*Mobility.*HD *560v.*					2		1
 ATI Mobility Radeon HD 565v		.*ATI.*Mobility.*HD *565v.*					2		1
-ATI Mobility Radeon HD 2300		.*ATI.*Mobility.*HD *23.*					1		1
-ATI Mobility Radeon HD 2400		.*ATI.*Mobility.*HD *24.*					1		1
+ATI Mobility Radeon HD 2300		.*ATI.*Mobility.*HD *23.*					2		1
+ATI Mobility Radeon HD 2400		.*ATI.*Mobility.*HD *24.*					2		1
 ATI Mobility Radeon HD 2600		.*ATI.*Mobility.*HD *26.*					3		1
 ATI Mobility Radeon HD 2700		.*ATI.*Mobility.*HD *27.*					3		1
 ATI Mobility Radeon HD 3100		.*ATI.*Mobility.*HD *31.*					0		1
@@ -142,23 +145,23 @@ ATI Mobility Radeon X6xx		.*ATI.*Mobility.*X6.*						1		1
 ATI Mobility Radeon X7xx		.*ATI.*Mobility.*X7.*						1		1
 ATI Mobility Radeon Xxxx		.*ATI.*Mobility.*X.*						0		1
 ATI Mobility Radeon				.*ATI.*Mobility.*							0		1
-ATI Radeon HD 2300				.*ATI.*Radeon HD *23..						0		1
-ATI Radeon HD 2400				.*ATI.*Radeon HD *24..						1		1
+ATI Radeon HD 2300				.*ATI.*Radeon HD *23..						2		1
+ATI Radeon HD 2400				.*ATI.*Radeon HD *24..						2		1
 ATI Radeon HD 2600				.*ATI.*Radeon HD *26..						2		1
 ATI Radeon HD 2900				.*ATI.*Radeon HD *29..						3		1
 ATI Radeon HD 3000				.*ATI.*Radeon HD *30..						0		1
 ATI Radeon HD 3100				.*ATI.*Radeon HD *31..						1		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 3500				.*ATI.*Radeon HD *35..						1		1
+ATI Radeon HD 3300				.*ATI.*Radeon HD *33..						2		1
+ATI Radeon HD 3400				.*ATI.*Radeon HD *34..						2		1
+ATI Radeon HD 3500				.*ATI.*Radeon HD *35..						2		1
 ATI Radeon HD 3600				.*ATI.*Radeon HD *36..						3		1
 ATI Radeon HD 3700				.*ATI.*Radeon HD *37..						3		1
 ATI Radeon HD 3800				.*ATI.*Radeon HD *38..						3		1
 ATI Radeon HD 4100				.*ATI.*Radeon HD *41..						1		1
 ATI Radeon HD 4200				.*ATI.*Radeon HD *42..						1		1
-ATI Radeon HD 4300				.*ATI.*Radeon HD *43..						1		1
-ATI Radeon HD 4400				.*ATI.*Radeon HD *44..						1		1
+ATI Radeon HD 4300				.*ATI.*Radeon HD *43..						2		1
+ATI Radeon HD 4400				.*ATI.*Radeon HD *44..						2		1
 ATI Radeon HD 4500				.*ATI.*Radeon HD *45..						3		1
 ATI Radeon HD 4600				.*ATI.*Radeon HD *46..						3		1
 ATI Radeon HD 4700				.*ATI.*Radeon HD *47..						3		1
@@ -179,6 +182,7 @@ ATI Radeon HD 6600				.*ATI.*Radeon HD *66..						3		1
 ATI Radeon HD 6700				.*ATI.*Radeon HD *67..						3		1
 ATI Radeon HD 6800				.*ATI.*Radeon HD *68..						3		1
 ATI Radeon HD 6900				.*ATI.*Radeon HD *69..						3		1
+ATI Radeon HD 7300				.*ATI.*Radeon HD *73..						3		1
 ATI Radeon HD 7400				.*ATI.*Radeon HD *74..						3		1
 ATI Radeon HD 7500				.*ATI.*Radeon HD *75..						3		1
 ATI Radeon HD 7600				.*ATI.*Radeon HD *76..						3		1
@@ -298,8 +302,11 @@ Intel Brookdale					.*Intel.*Brookdale.*						0		0
 Intel Cantiga					.*Intel.*Cantiga.*							0		1
 Intel Eaglelake					.*Intel.*Eaglelake.*						0		1
 Intel Graphics Media HD			.*Intel.*Graphics Media.*HD.*				0		1
+Intel HD Graphics 2000			.*Intel.*HD Graphics 2000.*					1		1
+Intel HD Graphics 3000			.*Intel.*HD Graphics 3000.*					2		1
+Intel HD Graphics 4000			.*Intel.*HD Graphics 4000.*					2		1
 Intel HD Graphics				.*Intel.*HD Graphics.*						2		1
-Intel Mobile 4 Series			.*Intel.*Mobile *4 Series.*					0		1
+Intel Mobile 4 Series			.*Intel.*Mobile.* 4 Series.*				0		1
 Intel Media Graphics HD			.*Intel.*Media Graphics HD.*				0		1
 Intel Montara					.*Intel.*Montara.*							0		0
 Intel Pineview					.*Intel.*Pineview.*							0		1
@@ -315,6 +322,8 @@ NVIDIA 310						.*NVIDIA .*GeForce 310.*					3		1
 NVIDIA 315M						.*NVIDIA .*GeForce 315M.*					2		1
 NVIDIA 315						.*NVIDIA .*GeForce 315.*					3		1
 NVIDIA 320M						.*NVIDIA .*GeForce 320M.*					2		1
+NVIDIA 605M						.*NVIDIA .*GeForce 605M.*					2		1
+NVIDIA 610M						.*NVIDIA .*GeForce 610M.*					2		1
 NVIDIA G100M					.*NVIDIA .*100M.*							0		1
 NVIDIA G100						.*NVIDIA .*100.*							0		1
 NVIDIA G102M					.*NVIDIA .*102M.*							0		1
@@ -360,6 +369,10 @@ NVIDIA GT 530M					.*NVIDIA .*GT *530(M)?.*					3		1
 NVIDIA GT 540M					.*NVIDIA .*GT *54.(M)?.*					3		1
 NVIDIA GT 550M					.*NVIDIA .*GT *550(M)?.*					3		1
 NVIDIA GT 555M					.*NVIDIA .*GT *555(M)?.*					3		1
+NVIDIA GT 620M					.*NVIDIA .*GT *620(M)?.*					3		1
+NVIDIA GT 630M					.*NVIDIA .*GT *630(M)?.*					3		1
+NVIDIA GT 635M					.*NVIDIA .*GT *635(M)?.*					3		1
+NVIDIA GT 640M					.*NVIDIA .*GT *640(M)?.*					3		1
 NVIDIA GTS 160M					.*NVIDIA .*GT(S)? *160(M)?.*				2		1
 NVIDIA GTS 240					.*NVIDIA .*GTS *24.*						3		1
 NVIDIA GTS 250					.*NVIDIA .*GTS *25.*						3		1
@@ -389,6 +402,14 @@ NVIDIA GTX 570					.*NVIDIA .*GTX *57.*						3		1
 NVIDIA GTX 580M					.*NVIDIA .*GTX *580M.*						3		1
 NVIDIA GTX 580					.*NVIDIA .*GTX *58.*						3		1
 NVIDIA GTX 590					.*NVIDIA .*GTX *59.*						3		1
+NVIDIA GTX 650					.*NVIDIA .*GTX *65.*						3		1
+NVIDIA GTX 660					.*NVIDIA .*GTX *66.*						3		1
+NVIDIA GTX 670M					.*NVIDIA .*GTX *670M.*						3		1
+NVIDIA GTX 675M					.*NVIDIA .*GTX *675M.*						3		1
+NVIDIA GTX 670					.*NVIDIA .*GTX *67.*						3		1
+NVIDIA GTX 680M					.*NVIDIA .*GTX *680M.*						3		1
+NVIDIA GTX 680					.*NVIDIA .*GTX *68.*						3		1
+NVIDIA GTX 690					.*NVIDIA .*GTX *69.*						3		1
 NVIDIA C51						.*NVIDIA .*C51.*							0		1
 NVIDIA G72						.*NVIDIA .*G72.*							1		1
 NVIDIA G73						.*NVIDIA .*G73.*							1		1
@@ -405,80 +426,80 @@ NVIDIA GeForce 4 MX				.*NVIDIA .*GeForce ?4 MX.*					0		1
 NVIDIA GeForce 4 PCX			.*NVIDIA .*GeForce ?4 PCX.*					0		1
 NVIDIA GeForce 4 Ti				.*NVIDIA .*GeForce ?4 Ti.*					0		1
 NVIDIA GeForce 6100				.*NVIDIA .*GeForce 61.*						0		1
-NVIDIA GeForce 6200				.*NVIDIA.*GeForce 62.*						0		1
-NVIDIA GeForce 6500				.*NVIDIA.*GeForce 65.*						0		1
-NVIDIA GeForce 6600				.*NVIDIA.*GeForce 66.*						1		1
-NVIDIA GeForce 6700				.*NVIDIA.*GeForce 67.*						2		1
-NVIDIA GeForce 6800				.*NVIDIA.*GeForce 68.*						2		1
+NVIDIA GeForce 6200				.*NVIDIA .*GeForce 62.*						0		1
+NVIDIA GeForce 6500				.*NVIDIA .*GeForce 65.*						0		1
+NVIDIA GeForce 6600				.*NVIDIA .*GeForce 66.*						1		1
+NVIDIA GeForce 6700				.*NVIDIA .*GeForce 67.*						2		1
+NVIDIA GeForce 6800				.*NVIDIA .*GeForce 68.*						2		1
 NVIDIA GeForce 7000M			.*NVIDIA.*GeForce 7000M.*					0		1
+NVIDIA GeForce 7000				.*NVIDIA .*GeForce 70.*						0		1
 NVIDIA GeForce 7100M			.*NVIDIA.*GeForce 7100M.*					0		1
-NVIDIA GeForce 7000				.*NVIDIA.*GeForce 70.*						0		1
-NVIDIA GeForce 7100				.*NVIDIA.*GeForce 71.*						0		1
-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 7900				.*NVIDIA.*GeForce.*79.*						2		1
-NVIDIA GeForce 8100				.*NVIDIA.*GeForce 81.*						1		1
-NVIDIA GeForce 8200M			.*NVIDIA.*GeForce 8200M.*					1		1
-NVIDIA GeForce 8200				.*NVIDIA.*GeForce 82.*						1		1
-NVIDIA GeForce 8300				.*NVIDIA.*GeForce 83.*						1		1
-NVIDIA GeForce 8400M			.*NVIDIA.*GeForce 8400M.*					1		1
-NVIDIA GeForce 8400				.*NVIDIA.*GeForce 84.*						1		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 8700M			.*NVIDIA.*GeForce 8700M.*					3		1
-NVIDIA GeForce 8700				.*NVIDIA.*GeForce 87.*						3		1
-NVIDIA GeForce 8800				.*NVIDIA.*GeForce 88.*						3		1
-NVIDIA GeForce 8800M			.*NVIDIA.*GeForce 8800M.*					3		1
-NVIDIA GeForce 9100M			.*NVIDIA.*GeForce 9100M.*					0		1
-NVIDIA GeForce 9100				.*NVIDIA.*GeForce 91.*						0		1
-NVIDIA GeForce 9200M			.*NVIDIA.*GeForce 9200M.*					1		1
-NVIDIA GeForce 9200				.*NVIDIA.*GeForce 92.*						1		1
-NVIDIA GeForce 9300M			.*NVIDIA.*GeForce 9300M.*					1		1
-NVIDIA GeForce 9300				.*NVIDIA.*GeForce 93.*						1		1
-NVIDIA GeForce 9400M			.*NVIDIA.*GeForce 9400M.*					1		1
-NVIDIA GeForce 9400				.*NVIDIA.*GeForce 94.*						1		1
-NVIDIA GeForce 9500				.*NVIDIA.*GeForce 95.*						2		1
-NVIDIA GeForce 9500M			.*NVIDIA.*GeForce 9500M.*					2		1
-NVIDIA GeForce 9600				.*NVIDIA.*GeForce.*96.*						2		1
-NVIDIA GeForce 9600M			.*NVIDIA.*GeForce 9600M.*					2		1
-NVIDIA GeForce 9700M			.*NVIDIA.*GeForce 9700M.*					2		1
-NVIDIA GeForce 9800M			.*NVIDIA.*GeForce 9800M.*					3		1
-NVIDIA GeForce 9800				.*NVIDIA.*GeForce.*98.*						3		1
-NVIDIA GeForce FX 5100			.*NVIDIA.*GeForce FX 51.*					0		1
-NVIDIA GeForce FX 5200			.*NVIDIA.*GeForce FX 52.*					0		1
-NVIDIA GeForce FX 5300			.*NVIDIA.*GeForce FX 53.*					0		1
-NVIDIA GeForce FX 5500			.*NVIDIA.*GeForce FX 55.*					0		1
-NVIDIA GeForce FX 5600			.*NVIDIA.*GeForce FX 56.*					0		1
-NVIDIA GeForce FX 5700			.*NVIDIA.*GeForce FX 57.*					1		1
-NVIDIA GeForce FX 5800			.*NVIDIA.*GeForce FX 58.*					1		1
-NVIDIA GeForce FX 5900			.*NVIDIA.*GeForce FX 59.*					1		1
-NVIDIA GeForce FX Go5100		.*NVIDIA.*GeForce FX Go51.*					0		1
-NVIDIA GeForce FX Go5200		.*NVIDIA.*GeForce FX Go52.*					0		1
-NVIDIA GeForce FX Go5300		.*NVIDIA.*GeForce FX Go53.*					0		1
-NVIDIA GeForce FX Go5500		.*NVIDIA.*GeForce FX Go55.*					0		1
-NVIDIA GeForce FX Go5600		.*NVIDIA.*GeForce FX Go56.*					0		1
-NVIDIA GeForce FX Go5700		.*NVIDIA.*GeForce FX Go57.*					1		1
-NVIDIA GeForce FX Go5800		.*NVIDIA.*GeForce FX Go58.*					1		1
+NVIDIA GeForce 7100				.*NVIDIA .*GeForce 71.*						0		1
+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 7900				.*NVIDIA .*GeForce 79.*						2		1
+NVIDIA GeForce 8100				.*NVIDIA .*GeForce 81.*						1		1
+NVIDIA GeForce 8200M			.*NVIDIA .*GeForce 8200M.*					1		1
+NVIDIA GeForce 8200				.*NVIDIA .*GeForce 82.*						1		1
+NVIDIA GeForce 8300				.*NVIDIA .*GeForce 83.*						2		1
+NVIDIA GeForce 8400M			.*NVIDIA .*GeForce 8400M.*					2		1
+NVIDIA GeForce 8400				.*NVIDIA .*GeForce 84.*						2		1
+NVIDIA GeForce 8500				.*NVIDIA .*GeForce 85.*						3		1
+NVIDIA GeForce 8600M			.*NVIDIA .*GeForce 8600M.*					2		1
+NVIDIA GeForce 8600				.*NVIDIA .*GeForce 86.*						3		1
+NVIDIA GeForce 8700M			.*NVIDIA .*GeForce 8700M.*					3		1
+NVIDIA GeForce 8700				.*NVIDIA .*GeForce 87.*						3		1
+NVIDIA GeForce 8800M			.*NVIDIA .*GeForce 8800M.*					3		1
+NVIDIA GeForce 8800				.*NVIDIA .*GeForce 88.*						3		1
+NVIDIA GeForce 9100M			.*NVIDIA .*GeForce 9100M.*					0		1
+NVIDIA GeForce 9100				.*NVIDIA .*GeForce 91.*						0		1
+NVIDIA GeForce 9200M			.*NVIDIA .*GeForce 9200M.*					1		1
+NVIDIA GeForce 9200				.*NVIDIA .*GeForce 92.*						1		1
+NVIDIA GeForce 9300M			.*NVIDIA .*GeForce 9300M.*					2		1
+NVIDIA GeForce 9300				.*NVIDIA .*GeForce 93.*						2		1
+NVIDIA GeForce 9400M			.*NVIDIA .*GeForce 9400M.*					2		1
+NVIDIA GeForce 9400				.*NVIDIA .*GeForce 94.*						2		1
+NVIDIA GeForce 9500M			.*NVIDIA .*GeForce 9500M.*					2		1
+NVIDIA GeForce 9500				.*NVIDIA .*GeForce 95.*						2		1
+NVIDIA GeForce 9600M			.*NVIDIA .*GeForce 9600M.*					3		1
+NVIDIA GeForce 9600				.*NVIDIA .*GeForce 96.*						2		1
+NVIDIA GeForce 9700M			.*NVIDIA .*GeForce 9700M.*					2		1
+NVIDIA GeForce 9800M			.*NVIDIA .*GeForce 9800M.*					3		1
+NVIDIA GeForce 9800				.*NVIDIA .*GeForce 98.*						3		1
+NVIDIA GeForce FX 5100			.*NVIDIA .*GeForce FX 51.*					0		1
+NVIDIA GeForce FX 5200			.*NVIDIA .*GeForce FX 52.*					0		1
+NVIDIA GeForce FX 5300			.*NVIDIA .*GeForce FX 53.*					0		1
+NVIDIA GeForce FX 5500			.*NVIDIA .*GeForce FX 55.*					0		1
+NVIDIA GeForce FX 5600			.*NVIDIA .*GeForce FX 56.*					0		1
+NVIDIA GeForce FX 5700			.*NVIDIA .*GeForce FX 57.*					1		1
+NVIDIA GeForce FX 5800			.*NVIDIA .*GeForce FX 58.*					1		1
+NVIDIA GeForce FX 5900			.*NVIDIA .*GeForce FX 59.*					1		1
+NVIDIA GeForce FX Go5100		.*NVIDIA .*GeForce FX Go51.*				0		1
+NVIDIA GeForce FX Go5200		.*NVIDIA .*GeForce FX Go52.*				0		1
+NVIDIA GeForce FX Go5300		.*NVIDIA .*GeForce FX Go53.*				0		1
+NVIDIA GeForce FX Go5500		.*NVIDIA .*GeForce FX Go55.*				0		1
+NVIDIA GeForce FX Go5600		.*NVIDIA .*GeForce FX Go56.*				0		1
+NVIDIA GeForce FX Go5700		.*NVIDIA .*GeForce FX Go57.*				1		1
+NVIDIA GeForce FX Go5800		.*NVIDIA .*GeForce FX Go58.*				1		1
 NVIDIA GeForce FX Go5900		.*NVIDIA .*GeForce FX Go59.*				1		1
 NVIDIA GeForce FX Go5xxx		.*NVIDIA .*GeForce FX Go.*					0		1
-NVIDIA GeForce Go 6100			.*NVIDIA.*GeForce Go 61.*					0		1
-NVIDIA GeForce Go 6200			.*NVIDIA.*GeForce Go 62.*					0		1
-NVIDIA GeForce Go 6400			.*NVIDIA.*GeForce Go 64.*					1		1
-NVIDIA GeForce Go 6500			.*NVIDIA.*GeForce Go 65.*					1		1
-NVIDIA GeForce Go 6600			.*NVIDIA.*GeForce Go 66.*					1		1
-NVIDIA GeForce Go 6700			.*NVIDIA.*GeForce Go 67.*					1		1
-NVIDIA GeForce Go 6800			.*NVIDIA.*GeForce Go 68.*					1		1
+NVIDIA GeForce Go 6100			.*NVIDIA .*GeForce Go 61.*					0		1
+NVIDIA GeForce Go 6200			.*NVIDIA .*GeForce Go 62.*					0		1
+NVIDIA GeForce Go 6400			.*NVIDIA .*GeForce Go 64.*					1		1
+NVIDIA GeForce Go 6500			.*NVIDIA .*GeForce Go 65.*					1		1
+NVIDIA GeForce Go 6600			.*NVIDIA .*GeForce Go 66.*					1		1
+NVIDIA GeForce Go 6700			.*NVIDIA .*GeForce Go 67.*					1		1
+NVIDIA GeForce Go 6800			.*NVIDIA .*GeForce Go 68.*					1		1
 NVIDIA GeForce Go 7200			.*NVIDIA .*GeForce Go 72.*					1		1
 NVIDIA GeForce Go 7300 LE		.*NVIDIA .*GeForce Go 73.*LE.*				0		1
 NVIDIA GeForce Go 7300			.*NVIDIA .*GeForce Go 73.*					1		1
 NVIDIA GeForce Go 7400			.*NVIDIA .*GeForce Go 74.*					1		1
 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 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 D9M						.*NVIDIA .*D9M.*							1		1
 NVIDIA G94						.*NVIDIA .*G94.*							3		1
@@ -524,24 +545,28 @@ NVIDIA Quadro4					.*Quadro4.*									0		1
 NVIDIA Quadro DCC				.*Quadro DCC.*								0		1
 NVIDIA Quadro CX				.*Quadro.*CX.*								3		1
 NVIDIA Quadro FX 770			.*Quadro.*FX *770(M)?.*						2		1
-NVIDIA Quadro FX 880			.*Quadro.*FX *880(M)?.*						2		1
 NVIDIA Quadro FX 1400			.*Quadro.*FX.*1400(M)?.*					1		1
-NVIDIA Quadro FX 1500			.*Quadro.*FX.*1500(M)?.*					1		1
+NVIDIA Quadro FX 1500			.*Quadro.*FX *1500(M)?.*					1		1
 NVIDIA Quadro FX 1600			.*Quadro.*FX *1600(M)?.*					2		1
 NVIDIA Quadro FX 1700			.*Quadro.*FX.*1700(M)?.*					2		1
 NVIDIA Quadro FX 1800			.*Quadro.*FX.*1800(M)?.*					2		1
+NVIDIA Quadro FX 2500M			.*Quadro.*FX *2500M.*						2		1
+NVIDIA Quadro FX 2700M			.*Quadro.*FX *2700M.*						3		1
+NVIDIA Quadro FX 2800M			.*Quadro.*FX *2800M.*						3		1
 NVIDIA Quadro FX 3400			.*Quadro.*FX.*3400(M)?.*					1		1
 NVIDIA Quadro FX 3450			.*Quadro.*FX.*3450(M)?.*					1		1
-NVIDIA Quadro FX 3500			.*Quadro.*FX.*3500(M)?.*					1		1
-NVIDIA Quadro FX 3700			.*Quadro.*FX.*3700(M)?.*					2		1
-NVIDIA Quadro FX 3800			.*Quadro.*FX.*3800(M)?.*					2		1
+NVIDIA Quadro FX 3500			.*Quadro.*FX *3500.*						2		1
+NVIDIA Quadro FX 3600			.*Quadro.*FX *3600.*						3		1
+NVIDIA Quadro FX 3700			.*Quadro.*FX *3700.*						3		1
+NVIDIA Quadro FX 3800			.*Quadro.*FX *3800.*						3		1
 NVIDIA Quadro FX 370			.*Quadro.*FX.*370(M)?.*						2		1
 NVIDIA Quadro FX 380			.*Quadro.*FX.*380(M)?.*						2		1
 NVIDIA Quadro FX 4000			.*Quadro.*FX.*4000(M)?.*					1		1
-NVIDIA Quadro FX 4500			.*Quadro.*FX.*4500(M)?.*					1		1
+NVIDIA Quadro FX 4500			.*Quadro.*FX *45.*							3		1
+NVIDIA Quadro FX 880			.*Quadro.*FX *880(M)?.*						3		1
 NVIDIA Quadro FX 4600			.*Quadro.*FX.*4600(M)?.*					2		1
 NVIDIA Quadro FX 4700			.*Quadro.*FX.*4700(M)?.*					2		1
-NVIDIA Quadro FX 4800			.*Quadro.*FX.*4800(M)?.*					2		1
+NVIDIA Quadro FX 4800			.*NVIDIA .*Quadro *FX *4800.*				3		1
 NVIDIA Quadro FX 470			.*Quadro.*FX.*470(M)?.*						3		1
 NVIDIA Quadro FX 5500			.*Quadro.*FX.*5500(M)?.*					1		1
 NVIDIA Quadro FX 5600			.*Quadro.*FX.*5600(M)?.*					2		1
@@ -561,6 +586,7 @@ NVIDIA Quadro NVS 2100M			.*NVIDIA .*NVS *2100M.*						2		1
 NVIDIA Quadro NVS 3100M			.*NVIDIA .*NVS *3100M.*						2		1
 NVIDIA Quadro NVS 4200M			.*NVIDIA .*NVS *4200M.*						2		1
 NVIDIA Quadro NVS 5100M			.*NVIDIA .*NVS *5100M.*						2		1
+NVIDIA Quadro NVS				.*NVIDIA .*NVS								0		1
 NVIDIA Quadro 2000				.*Quadro.*2000.*							2		1
 NVIDIA Quadro 4000				.*Quadro.*4000.*							2		1
 NVIDIA Quadro 5000				.*Quadro.*5000.*							2		1

From 4f572695180ef824558e46d0516491d21365089d Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sat, 11 Aug 2012 22:26:31 +0200
Subject: [PATCH 186/199] Fix show muted text in chat

---
 indra/newview/llfloaterchat.cpp   |  2 +-
 indra/newview/llviewermessage.cpp | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/indra/newview/llfloaterchat.cpp b/indra/newview/llfloaterchat.cpp
index 1a097aabb..22281826d 100644
--- a/indra/newview/llfloaterchat.cpp
+++ b/indra/newview/llfloaterchat.cpp
@@ -319,7 +319,7 @@ void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file)
 	{
 		// desaturate muted chat
 		LLColor4 muted_color = lerp(color, LLColor4::grey, 0.5f);
-		add_timestamped_line(history_editor_with_mute, chat, color);
+		add_timestamped_line(history_editor_with_mute, chat, muted_color);
 	}
 	
 	// add objects as transient speakers that can be muted
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index abd25368d..bebc154b1 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -3857,24 +3857,16 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 			chat.mPosAgent = chatter->getPositionAgent();
 		}
 
-		// truth table:
-		// LINDEN	MUTED	BUSY	OWNED_BY_YOU	TASK		DISPLAY		STORE IN HISTORY
-		// F		T		*		*				*			No			No
-		// F		F		T		F				*			No			Yes
-		// *		F		F		*				*			Yes			Yes
-		// *		F		*		T				*			Yes			Yes
-		// T		*		*		*				F			Yes			Yes
-
 		chat.mMuted = is_muted && !is_linden;
+		bool only_history = visible_in_chat_bubble || (!is_linden && !is_owned_by_me && is_busy);
+#if 0	// Google translate doesn't work anymore
 		if (!chat.mMuted)
 		{
-			bool only_history = visible_in_chat_bubble || (!is_linden && !is_owned_by_me && is_busy);
-#if 0	// Google translate doesn't work anymore
 			check_translate_chat(mesg, chat, only_history);
-#else
-			add_floater_chat(chat, only_history);
-#endif
 		}
+#else
+		add_floater_chat(chat, only_history);
+#endif
 	}
 }
 

From 164799e4c48f77c4266ae3b464fbc08fca924a10 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Sun, 12 Aug 2012 03:33:33 +0200
Subject: [PATCH 187/199] Curl debug output improvements and minor fixes.

---
 indra/cwdebug/debug.cc            |  3 +-
 indra/cwdebug/debug.h             | 16 ++++--
 indra/llmessage/aicurl.cpp        | 10 +---
 indra/llmessage/debug_libcurl.cpp | 90 ++++++++++++++++++++++++++++---
 4 files changed, 97 insertions(+), 22 deletions(-)

diff --git a/indra/cwdebug/debug.cc b/indra/cwdebug/debug.cc
index b202a8ac6..cad6da46d 100644
--- a/indra/cwdebug/debug.cc
+++ b/indra/cwdebug/debug.cc
@@ -421,7 +421,8 @@ void cwdebug_backtrace(int n)
 namespace debug
 {
 
-libcwd_do_type const libcw_do;
+namespace libcwd { libcwd_do_type const libcw_do; }
+
 ll_thread_local int Indent::S_indentation;
 
 Indent::Indent(int indent) : M_indent(indent)
diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h
index c8f15cfb9..862ea263c 100644
--- a/indra/cwdebug/debug.h
+++ b/indra/cwdebug/debug.h
@@ -46,14 +46,15 @@ struct buf2str {
   int mSize;
 };
 
-} // namespace libcwd
-
-enum print_thread_id_t { print_thread_id };
-inline void init() { }
 struct libcwd_do_type {
  void on() const { }
 };
 extern LL_COMMON_API libcwd_do_type const libcw_do;
+
+} // namespace libcwd
+
+enum print_thread_id_t { print_thread_id };
+inline void init() { }
 struct Indent {
   int M_indent;
   static ll_thread_local int S_indentation;
@@ -87,8 +88,13 @@ extern LL_COMMON_API fake_channel const notice;
 } // namespace dc
 } // namespace debug
 
+#define LIBCWD_DEBUG_CHANNELS debug
+#define LibcwDoutScopeBegin(a, b, c) do { using namespace debug; llinfos_nf << print_thread_id << (c).mLabel << ": " << Indent::print;
+#define LibcwDoutStream llcont
+#define LibcwDoutScopeEnd llcont << llendl; } while(0)
+
 #define Debug(x) do { using namespace debug; x; } while(0)
-#define Dout(a, b) do { using namespace debug;  if ((a).mOn) { llinfos_nf << print_thread_id << (a).mLabel << ": " << Indent::print << b << llendl; } } while(0)
+#define Dout(a, b) do { using namespace debug; if ((a).mOn) { llinfos_nf << print_thread_id << (a).mLabel << ": " << Indent::print << b << llendl; } } while(0)
 #define DoutEntering(a, b) \
   int __slviewer_debug_indentation = 2; \
   { \
diff --git a/indra/llmessage/aicurl.cpp b/indra/llmessage/aicurl.cpp
index d22408491..edbcfec83 100644
--- a/indra/llmessage/aicurl.cpp
+++ b/indra/llmessage/aicurl.cpp
@@ -958,13 +958,6 @@ void CurlEasyRequest::addHeader(char const* header)
 
 #if defined(CWDEBUG) || defined(DEBUG_CURLIO)
 
-#ifndef CWDEBUG
-#define LIBCWD_DEBUGCHANNELS 0
-#define LibcwDoutScopeBegin(a, b, c) do { using namespace debug; llinfos_nf << dc::curlio.mLabel << ": ";
-#define LibcwDoutStream llcont
-#define LibcwDoutScopeEnd llcont << llendl; } while(0)
-#endif
-
 static int curl_debug_cb(CURL*, curl_infotype infotype, char* buf, size_t size, void* user_ptr)
 {
 #ifdef CWDEBUG
@@ -977,14 +970,15 @@ static int curl_debug_cb(CURL*, curl_infotype infotype, char* buf, size_t size,
   libcw_do.marker().assign(marker.str().data(), marker.str().size());
   if (!debug::channels::dc::curlio.is_on())
 	debug::channels::dc::curlio.on();
+  LibcwDoutScopeBegin(LIBCWD_DEBUGCHANNELS, libcwd::libcw_do, dc::curlio|cond_nonewline_cf(infotype == CURLINFO_TEXT))
 #else
   if (infotype == CURLINFO_TEXT)
   {
 	while (size > 0 && (buf[size - 1] == '\r' ||  buf[size - 1] == '\n'))
 	  --size;
   }
+  LibcwDoutScopeBegin(LIBCWD_DEBUGCHANNELS, libcwd::libcw_do, dc::curlio)
 #endif
-  LibcwDoutScopeBegin(LIBCWD_DEBUGCHANNELS, libcw_do, dc::curlio|cond_nonewline_cf(infotype == CURLINFO_TEXT))
   switch (infotype)
   {
 	case CURLINFO_TEXT:
diff --git a/indra/llmessage/debug_libcurl.cpp b/indra/llmessage/debug_libcurl.cpp
index c981ef38f..3f85dcc2d 100644
--- a/indra/llmessage/debug_libcurl.cpp
+++ b/indra/llmessage/debug_libcurl.cpp
@@ -11,6 +11,9 @@
 #include "debug_libcurl.h"
 #include "debug.h"
 #include "llerror.h"
+#ifdef CWDEBUG
+#include <libcwd/buf2str.h>
+#endif
 
 #define CURL_VERSION(major, minor, patch)	\
     (LIBCURL_VERSION_MAJOR > major ||		\
@@ -277,6 +280,7 @@ std::ostream& operator<<(std::ostream& os, CURLoption option)
 	CASEPRINT(CURLOPT_PROGRESSDATA);
 	CASEPRINT(CURLOPT_AUTOREFERER);
 	CASEPRINT(CURLOPT_PROXYPORT);
+	CASEPRINT(CURLOPT_POSTFIELDSIZE);
 	CASEPRINT(CURLOPT_HTTPPROXYTUNNEL);
 	CASEPRINT(CURLOPT_INTERFACE);
 	CASEPRINT(CURLOPT_KRBLEVEL);
@@ -552,25 +556,26 @@ CURLcode debug_curl_easy_getinfo(CURL* curl, CURLINFO info, ...)
   CURLcode ret;
   va_list ap;
   union param_type {
+	void* some_ptr;
 	long* long_ptr;
-	char* char_ptr;
-	curl_slist* curl_slist_ptr;
+	char** char_ptr;
+	curl_slist** curl_slist_ptr;
 	double* double_ptr;
   } param;
   va_start(ap, info);
-  param.long_ptr = va_arg(ap, long*);
+  param.some_ptr = va_arg(ap, void*);
   va_end(ap);
-  ret = curl_easy_getinfo(curl, info, param.long_ptr);
+  ret = curl_easy_getinfo(curl, info, param.some_ptr);
   if (info == CURLINFO_PRIVATE)
   {
-	Dout(dc::curl, "curl_easy_getinfo(" << curl << ", " << info << ", 0x" << std::hex << (size_t)param.char_ptr << std::dec << ") = " << ret);
+	Dout(dc::curl, "curl_easy_getinfo(" << curl << ", " << info << ", 0x" << std::hex << (size_t)param.some_ptr << std::dec << ") = " << ret);
   }
   else
   {
 	switch((info & CURLINFO_TYPEMASK))
 	{
 	  case CURLINFO_STRING:
-		Dout(dc::curl, "curl_easy_getinfo(" << curl << ", " << info << ", (char*){ \"" << (ret == CURLE_OK ? param.char_ptr : " <unchanged> ") << "\" }) = " << ret);
+		Dout(dc::curl, "curl_easy_getinfo(" << curl << ", " << info << ", (char**){ \"" << (ret == CURLE_OK ? *param.char_ptr : " <unchanged> ") << "\" }) = " << ret);
 		break;
 	  case CURLINFO_LONG:
 		Dout(dc::curl, "curl_easy_getinfo(" << curl << ", " << info << ", (long*){ " << (ret == CURLE_OK ? *param.long_ptr : 0L) << "L }) = " << ret);
@@ -579,7 +584,7 @@ CURLcode debug_curl_easy_getinfo(CURL* curl, CURLINFO info, ...)
 		Dout(dc::curl, "curl_easy_getinfo(" << curl << ", " << info << ", (double*){" << (ret == CURLE_OK ? *param.double_ptr : 0.) << "}) = " << ret);
 		break;
 	  case CURLINFO_SLIST:
-		Dout(dc::curl, "curl_easy_getinfo(" << curl << ", " << info << ", (curl_slist*){ " << (ret == CURLE_OK ? *param.curl_slist_ptr : unchanged_slist) << " }) = " << ret);
+		Dout(dc::curl, "curl_easy_getinfo(" << curl << ", " << info << ", (curl_slist**){ " << (ret == CURLE_OK ? **param.curl_slist_ptr : unchanged_slist) << " }) = " << ret);
 		break;
 	}
   }
@@ -644,24 +649,93 @@ CURLcode debug_curl_easy_setopt(CURL* handle, CURLoption option, ...)
 	  std::exit(EXIT_FAILURE);
   }
   va_end(ap);
+  static long postfieldsize;					// Cache. Assumes only one thread sets CURLOPT_POSTFIELDSIZE.
   switch (param_type)
   {
 	case CURLOPTTYPE_LONG:
+	{
 	  ret = curl_easy_setopt(handle, option, param.along);
 	  Dout(dc::curl, "curl_easy_setopt(" << (AICURL*)handle << ", " << option << ", " << param.along << "L) = " << ret);
+	  if (option == CURLOPT_POSTFIELDSIZE)
+	  {
+		postfieldsize = param.along;
+	  }
 	  break;
+	}
 	case CURLOPTTYPE_OBJECTPOINT:
+	{
 	  ret = curl_easy_setopt(handle, option, param.ptr);
-	  Dout(dc::curl, "curl_easy_setopt(" << (AICURL*)handle << ", " << option << ", (object*)0x" << std::hex << (size_t)param.ptr << std::dec << ") = " << ret);
+	  LibcwDoutScopeBegin(LIBCWD_DEBUGCHANNELS, libcwd::libcw_do, dc::curl)
+	  LibcwDoutStream << "curl_easy_setopt(" << (AICURL*)handle << ", " << option << ", ";
+	  // For a subset of all options that take a char*, print the string passed.
+	  if (option == CURLOPT_PROXY ||			// Set HTTP proxy to use. The parameter should be a char* to a zero terminated string holding the host name or dotted IP address.
+		  option == CURLOPT_PROXYUSERPWD ||		// Pass a char* as parameter, which should be [user name]:[password] to use for the connection to the HTTP proxy.
+		  option == CURLOPT_CAINFO ||			// Pass a char * to a zero terminated string naming a file holding one or more certificates to verify the peer with.
+		  option == CURLOPT_URL ||				// Pass in a pointer to the actual URL to deal with. The parameter should be a char * to a zero terminated string [...]
+		  option == CURLOPT_COOKIEFILE ||		// Pass a pointer to a zero terminated string as parameter. It should contain the name of your file holding cookie data to read.
+		  option == CURLOPT_CUSTOMREQUEST ||	// Pass a pointer to a zero terminated string as parameter. It can be used to specify the request instead of GET or HEAD when performing HTTP based requests
+		  option == CURLOPT_ENCODING ||			// Sets the contents of the Accept-Encoding: header sent in a HTTP request, and enables decoding of a response when a Content-Encoding: header is received.
+		  option == CURLOPT_POSTFIELDS ||
+		  option == CURLOPT_COPYPOSTFIELDS)		// Full data to post in a HTTP POST operation.
+	  {
+		bool const is_postfield = option == CURLOPT_POSTFIELDS || option == CURLOPT_COPYPOSTFIELDS;
+		char* str = (char*)param.ptr;
+		long size;
+		LibcwDoutStream << "(char*)0x" << std::hex << (size_t)param.ptr << std::dec << ")";
+		if (is_postfield)
+		{
+		  size = postfieldsize < 32 ? postfieldsize : 32;	// Only print first 32 characters (this was already written to debug output before).
+		}
+		else
+		{
+		  size = strlen(str);
+		}
+		LibcwDoutStream << "[";
+		if (str)
+		{
+		  LibcwDoutStream << libcwd::buf2str(str, size);
+		  if (is_postfield && postfieldsize > 32)
+			LibcwDoutStream << "...";
+		}
+		else
+		{
+		  LibcwDoutStream << "NULL";
+		}
+		LibcwDoutStream << "](" << (is_postfield ? postfieldsize : size) << " bytes))";
+	  }
+	  else
+	  {
+		LibcwDoutStream << "(object*)0x" << std::hex << (size_t)param.ptr << std::dec << ")";
+	  }
+	  LibcwDoutStream << " = " << ret;
+	  LibcwDoutScopeEnd;
+	  if (option == CURLOPT_HTTPHEADER && param.ptr)
+	  {
+		debug::Indent indent(2);
+		Dout(dc::curl, "HTTP Headers:");
+		struct curl_slist* list = (struct curl_slist*)param.ptr;
+		while (list)
+		{
+		  Dout(dc::curl, '"' << list->data << '"');
+		  list = list->next;
+		}
+	  }
 	  break;
+	}
 	case CURLOPTTYPE_FUNCTIONPOINT:
 	  ret = curl_easy_setopt(handle, option, param.ptr);
 	  Dout(dc::curl, "curl_easy_setopt(" << (AICURL*)handle << ", " << option << ", (function*)0x" << std::hex << (size_t)param.ptr << std::dec << ") = " << ret);
 	  break;
 	case CURLOPTTYPE_OFF_T:
+	{
 	  ret = curl_easy_setopt(handle, option, param.offset);
 	  Dout(dc::curl, "curl_easy_setopt(" << (AICURL*)handle << ", " << option << ", (curl_off_t)" << param.offset << ") = " << ret);
+	  if (option == CURLOPT_POSTFIELDSIZE_LARGE)
+	  {
+		postfieldsize = (long)param.offset;
+	  }
 	  break;
+    }
 	default:
 	  break;
   }

From 2fbe7ab6ce2c06975bc7e4cec19867bc90e67d61 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Sun, 12 Aug 2012 03:38:45 +0200
Subject: [PATCH 188/199] Only accept pointers to valid types for getinfo().

---
 indra/llmessage/aicurl.cpp      |  2 +-
 indra/llmessage/aicurlprivate.h | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/indra/llmessage/aicurl.cpp b/indra/llmessage/aicurl.cpp
index edbcfec83..daba6f923 100644
--- a/indra/llmessage/aicurl.cpp
+++ b/indra/llmessage/aicurl.cpp
@@ -657,7 +657,7 @@ void CurlEasyHandle::setErrorBuffer(void)
   }
 }
 
-CURLcode CurlEasyHandle::getinfo(CURLINFO info, void* data)
+CURLcode CurlEasyHandle::getinfo_priv(CURLINFO info, void* data)
 {
   setErrorBuffer();
   return check_easy_code(curl_easy_getinfo(mEasyHandle, info, data));
diff --git a/indra/llmessage/aicurlprivate.h b/indra/llmessage/aicurlprivate.h
index a39120faa..309992973 100644
--- a/indra/llmessage/aicurlprivate.h
+++ b/indra/llmessage/aicurlprivate.h
@@ -111,11 +111,21 @@ class CurlEasyHandle : public boost::noncopyable, protected AICurlEasyHandleEven
 	char* unescape(char* url, int inlength , int* outlength);
 
 	// Extract information from a curl handle.
-	CURLcode getinfo(CURLINFO info, void* data);
-#if _WIN64 || __x86_64__ || __ppc64__
+  private:
+	CURLcode getinfo_priv(CURLINFO info, void* data);
+  public:
+	// The rest are inlines to provide some type-safety.
+	CURLcode getinfo(CURLINFO info, char** data) { return getinfo_priv(info, data); }
+	CURLcode getinfo(CURLINFO info, curl_slist** data) { return getinfo_priv(info, data); }
+	CURLcode getinfo(CURLINFO info, double* data) { return getinfo_priv(info, data); }
+	CURLcode getinfo(CURLINFO info, long* data) { return getinfo_priv(info, data); }
+#ifdef __LP64__	// sizeof(long) > sizeof(int) ?
 	// Overload for integer types that are too small (libcurl demands a long).
-	CURLcode getinfo(CURLINFO info, S32* data) { long ldata; CURLcode res = getinfo(info, &ldata); *data = static_cast<S32>(ldata); return res; }
-	CURLcode getinfo(CURLINFO info, U32* data) { long ldata; CURLcode res = getinfo(info, &ldata); *data = static_cast<U32>(ldata); return res; }
+	CURLcode getinfo(CURLINFO info, S32* data) { long ldata; CURLcode res = getinfo_priv(info, &ldata); *data = static_cast<S32>(ldata); return res; }
+	CURLcode getinfo(CURLINFO info, U32* data) { long ldata; CURLcode res = getinfo_priv(info, &ldata); *data = static_cast<U32>(ldata); return res; }
+#else
+	CURLcode getinfo(CURLINFO info, S32* data) { return getinfo_priv(info, static_cast<long*>(data)); }
+	CURLcode getinfo(CURLINFO info, U32* data) { return getinfo_priv(info, static_cast<long*>(data)); }
 #endif
 
 	// Perform a file transfer (blocking).

From d2c3e50a3fe069122447fdcc7ab3db100a88134f Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sun, 12 Aug 2012 13:15:42 +0200
Subject: [PATCH 189/199] Fix LLTrans for Unknown

---
 indra/newview/skins/default/xui/en-us/strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/indra/newview/skins/default/xui/en-us/strings.xml b/indra/newview/skins/default/xui/en-us/strings.xml
index deeb95f51..efcf9bcb3 100644
--- a/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/indra/newview/skins/default/xui/en-us/strings.xml
@@ -119,6 +119,8 @@
 	<!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
 	<string name="LoadingData">Loading...</string>
 
+	<!-- TODO: port other "IM system messages" from V3 -->
+	<string name="Unnamed">(Unnamed)</string>
 
 	<!-- namecache -->
 	<!-- Avatar name: text shown for LLUUID::null -->

From 73785af730c5b9bed944f9e9135c27999f1f50ba Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sun, 12 Aug 2012 13:33:27 +0200
Subject: [PATCH 190/199] Fix permission panel unclickable

---
 indra/newview/llfloatertools.cpp                        | 1 -
 indra/newview/llfloatertools.h                          | 2 --
 indra/newview/skins/default/xui/en-us/floater_tools.xml | 2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 74f82e884..4ef0cfbf3 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -416,7 +416,6 @@ LLFloaterTools::LLFloaterTools()
 	mPanelFace(NULL),
 	mPanelLandInfo(NULL),
 
-	mTabLand(NULL),
 	mDirty(TRUE)
 {
 	setAutoFocus(FALSE);
diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h
index 4a8078a44..7e8c5ef54 100644
--- a/indra/newview/llfloatertools.h
+++ b/indra/newview/llfloatertools.h
@@ -186,8 +186,6 @@ public:
 	LLPanelFace				*mPanelFace;
 	LLPanelLandInfo			*mPanelLandInfo;
 
-	LLTabContainer*			mTabLand;
-
 	LLParcelSelectionHandle	mParcelSelection;
 	LLObjectSelectionHandle	mObjectSelection;
 
diff --git a/indra/newview/skins/default/xui/en-us/floater_tools.xml b/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 76c2b02ac..e2c6803dd 100644
--- a/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -549,7 +549,7 @@
 			     mouse_opaque="true" name="F:" v_pad="0" width="74">
 				F:
 			</text>
-      <panel bottom="-302" border="true" height="155" left="5" width="260" />
+      <panel mouse_opaque="false" bottom="-302" border="true" height="155" left="5" width="260"/>
       <panel
      bottom="-328"
      border="false"

From 304fa05094932cae7ebc0a9de0fd8c3950e0ce59 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Sun, 12 Aug 2012 16:34:20 +0200
Subject: [PATCH 191/199] Suppress "Expect:" header for POST and PUT. No longer
 use CURLOPT_COPYPOSTFIELDS.

For POST and PUT, libcurl adds by default a "Expect: 100-continue"
header and wait for the server to reply with a 100 response.
However, since the server never does that (LL comment in the
code "I'm not sure what it means") it's up to libcurl to continue
anyway after a while and that part is apparently bugged, causing
people not to be able to login sometimes. But suppressing the
header, libcurl doesn't wait for it and we worked around this bug.

The commit introduces a much improved CurlEasyRequest::setPost
method that enforces the above for POST, but that also no longer
uses CURLOPT_COPYPOSTFIELDS (but CURLOPT_POSTFIELDS), no longer
making a copy of the body of what we are going to send to the server.
Instead it uses a new object, derived from AIPostField, to keep track
of this data and to dispose of it once the transaction is complete
(and no sooner).

Copied from llcorehttp, we now also always set a "Connection:
keep-alive" and "Keep-alive: 300" header for POST.
This was already done for texture downloads (HttpOpRequest),
but now we do it always :p. Might need to be changed in the
future, but currently those headers are ignored by the server
anyway.
---
 indra/llmessage/aicurl.cpp            | 53 +++++++++++++++++++++++----
 indra/llmessage/aicurl.h              | 15 ++++++++
 indra/llmessage/aicurlprivate.h       | 10 ++++-
 indra/llmessage/llhttpclient.cpp      | 21 +++--------
 indra/llmessage/llurlrequest.cpp      | 14 ++-----
 indra/newview/llcurlrequest.cpp       |  4 +-
 indra/newview/llxmlrpctransaction.cpp | 27 ++++++--------
 7 files changed, 91 insertions(+), 53 deletions(-)

diff --git a/indra/llmessage/aicurl.cpp b/indra/llmessage/aicurl.cpp
index daba6f923..ceb1000d5 100644
--- a/indra/llmessage/aicurl.cpp
+++ b/indra/llmessage/aicurl.cpp
@@ -701,6 +701,7 @@ CURLMcode CurlEasyHandle::remove_handle_from_multi(AICurlEasyRequest_wat& curl_e
   mActiveMultiHandle = NULL;
   CURLMcode res = check_multi_code(curl_multi_remove_handle(multi, mEasyHandle));
   removed_from_multi_handle(curl_easy_request_w);
+  mPostField = NULL;
   return res;
 }
 
@@ -796,11 +797,33 @@ void CurlEasyRequest::setoptString(CURLoption option, std::string const& value)
   setopt(option, value.c_str());
 }
 
-void CurlEasyRequest::setPost(char const* postdata, S32 size)
+void CurlEasyRequest::setPost(AIPostFieldPtr const& postdata, S32 size)
 {
-  setopt(CURLOPT_POST, 1L);
+  llassert_always(postdata->data());
+
+  Dout(dc::curl, "POST size is " << size << " bytes: \"" << libcwd::buf2str(postdata->data(), size) << "\".");
+  setPostField(postdata);		// Make sure the data stays around until we don't need it anymore.
+
+  setPost_raw(size, postdata->data());
+}
+
+void CurlEasyRequest::setPost_raw(S32 size, char const* data)
+{
+  if (!data)
+  {
+	// data == NULL when we're going to read the data using CURLOPT_READFUNCTION.
+	Dout(dc::curl, "POST size is " << size << " bytes.");
+  }
+
+  // The server never replies with 100-continue, so suppress the "Expect: 100-continue" header that libcurl adds by default.
+  addHeader("Expect:");
+  if (size > 0)
+  {
+	addHeader("Connection: keep-alive");
+	addHeader("Keep-alive: 300");
+  }
   setopt(CURLOPT_POSTFIELDSIZE, size);
-  setopt(CURLOPT_POSTFIELDS, postdata);
+  setopt(CURLOPT_POSTFIELDS, data);
 }
 
 ThreadSafeCurlEasyRequest* CurlEasyRequest::get_lockobj(void)
@@ -1133,8 +1156,23 @@ void CurlEasyRequest::finalizeRequest(std::string const& url)
 {
   llassert(!mRequestFinalized);
   mResult = CURLE_FAILED_INIT;		// General error code, the final code is written here in MultiHandle::check_run_count when msg is CURLMSG_DONE.
-  mRequestFinalized = true;
   lldebugs << url << llendl;
+#ifdef SHOW_ASSERT
+  // Do a sanity check on the headers.
+  int content_type_count = 0;
+  for (curl_slist* list = mHeaders; list; list = list->next)
+  {
+	if (strncmp(list->data, "Content-Type:", 13) == 0)
+	{
+	  ++content_type_count;
+	}
+  }
+  if (content_type_count > 1)
+  {
+	llwarns << content_type_count << " Content-Type: headers!" << llendl;
+  }
+#endif
+  mRequestFinalized = true;
   setopt(CURLOPT_HTTPHEADER, mHeaders);
   setoptString(CURLOPT_URL, url);
   // The following line is a bit tricky: we store a pointer to the object without increasing its reference count.
@@ -1270,7 +1308,8 @@ void CurlResponderBuffer::prepRequest(AICurlEasyRequest_wat& curl_easy_request_w
 {
   if (post)
   {
-	curl_easy_request_w->setoptString(CURLOPT_ENCODING, "");
+	// Accept everything (send an Accept-Encoding header containing all encodings we support (zlib and gzip)).
+	curl_easy_request_w->setoptString(CURLOPT_ENCODING, "");	// CURLOPT_ACCEPT_ENCODING
   }
 
   mInput.reset(new LLBufferArray);
@@ -1303,9 +1342,7 @@ void CurlResponderBuffer::prepRequest(AICurlEasyRequest_wat& curl_easy_request_w
 
   if (!post)
   {
-	curl_easy_request_w->addHeader("Connection: keep-alive");
-	curl_easy_request_w->addHeader("Keep-alive: 300");
-	// Add other headers.
+	// Add extra headers.
 	for (std::vector<std::string>::const_iterator iter = headers.begin(); iter != headers.end(); ++iter)
 	{
 	  curl_easy_request_w->addHeader((*iter).c_str());
diff --git a/indra/llmessage/aicurl.h b/indra/llmessage/aicurl.h
index 895650ec8..26491da67 100644
--- a/indra/llmessage/aicurl.h
+++ b/indra/llmessage/aicurl.h
@@ -247,6 +247,21 @@ struct AICurlEasyHandleEvents {
 	virtual ~AICurlEasyHandleEvents() { }
 };
 
+// Pointer to data we're going to POST.
+class AIPostField : public LLThreadSafeRefCount {
+  protected:
+	char const* mData;
+
+  public:
+	AIPostField(char const* data) : mData(data) { }
+	char const* data(void) const { return mData; }
+};
+
+// The pointer to the data that we have to POST is passed around as AIPostFieldPtr,
+// which causes it to automatically clean up when there are no pointers left
+// pointing to it.
+typedef LLPointer<AIPostField> AIPostFieldPtr;
+
 #include "aicurlprivate.h"
 
 // AICurlPrivate::CurlEasyRequestPtr, a boost::intrusive_ptr, is no more threadsafe than a
diff --git a/indra/llmessage/aicurlprivate.h b/indra/llmessage/aicurlprivate.h
index 309992973..a475504b1 100644
--- a/indra/llmessage/aicurlprivate.h
+++ b/indra/llmessage/aicurlprivate.h
@@ -143,6 +143,7 @@ class CurlEasyHandle : public boost::noncopyable, protected AICurlEasyHandleEven
 	CURL* mEasyHandle;
 	CURLM* mActiveMultiHandle;
 	char* mErrorBuffer;
+	AIPostFieldPtr mPostField;		// This keeps the POSTFIELD data alive for as long as the easy handle exists.
 	bool mQueuedForRemoval;			// Set if the easy handle is (probably) added to the multi handle, but is queued for removal.
 #ifdef SHOW_ASSERT
   public:
@@ -190,6 +191,9 @@ class CurlEasyHandle : public boost::noncopyable, protected AICurlEasyHandleEven
 	// Return the underlying curl easy handle.
 	CURL* getEasyHandle(void) const { return mEasyHandle; }
 
+	// Keep POSTFIELD data alive.
+	void setPostField(AIPostFieldPtr const& post_field_ptr) { mPostField = post_field_ptr; }
+
   private:
 	// Return, and possibly create, the curl (easy) error buffer used by the current thread.
 	static char* getTLErrorBuffer(void);
@@ -208,9 +212,13 @@ class CurlEasyHandle : public boost::noncopyable, protected AICurlEasyHandleEven
 // AICurlEasyRequest is deleted, then also the ThreadSafeCurlEasyRequest is deleted
 // and the CurlEasyRequest destructed.
 class CurlEasyRequest : public CurlEasyHandle {
+  private:
+	void setPost_raw(S32 size, char const* data);
   public:
+	void setPost(S32 size) { setPost_raw(size, NULL); }
+	void setPost(AIPostFieldPtr const& postdata, S32 size);
+	void setPost(char const* data, S32 size) { setPost(new AIPostField(data), size); }
 	void setoptString(CURLoption option, std::string const& value);
-	void setPost(char const* postdata, S32 size);
 	void addHeader(char const* str);
 
   private:
diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp
index 9c58bc466..5e201710f 100644
--- a/indra/llmessage/llhttpclient.cpp
+++ b/indra/llmessage/llhttpclient.cpp
@@ -443,7 +443,6 @@ static LLSD blocking_request(
 		AICurlEasyRequest_wat curlEasyRequest_w(*easy_request);
 
 		LLHTTPBuffer http_buffer;
-		std::string body_str;
 		
 		// * Set curl handle options
 		curlEasyRequest_w->setopt(CURLOPT_TIMEOUT, (long)timeout);	// seconds, see warning at top of function.
@@ -463,6 +462,9 @@ static LLSD blocking_request(
 			}
 		}
 		
+		// Needs to stay alive until after the call to perform().
+		std::ostringstream ostr;
+
 		// * Setup specific method / "verb" for the URI (currently only GET and POST supported + poppy)
 		if (method == LLURLRequest::HTTP_GET)
 		{
@@ -470,24 +472,13 @@ static LLSD blocking_request(
 		}
 		else if (method == LLURLRequest::HTTP_POST)
 		{
-			curlEasyRequest_w->setopt(CURLOPT_POST, 1);
-			//serialize to ostr then copy to str - need to because ostr ptr is unstable :(
-			std::ostringstream ostr;
-			LLSDSerialize::toXML(body, ostr);
-			body_str = ostr.str();
-			curlEasyRequest_w->setopt(CURLOPT_POSTFIELDS, body_str.c_str());
 			//copied from PHP libs, correct?
 			curlEasyRequest_w->addHeader("Content-Type: application/llsd+xml");
-
-			// copied from llurlrequest.cpp
-			// it appears that apache2.2.3 or django in etch is busted. If
-			// we do not clear the expect header, we get a 500. May be
-			// limited to django/mod_wsgi.
-			curlEasyRequest_w->addHeader("Expect:");
+			LLSDSerialize::toXML(body, ostr);
+			curlEasyRequest_w->setPost(ostr.str().c_str(), ostr.str().length());
 		}
 		
 		// * Do the action using curl, handle results
-		lldebugs << "HTTP body: " << body_str << llendl;
 		curlEasyRequest_w->addHeader("Accept: application/llsd+xml");
 		curlEasyRequest_w->finalizeRequest(url);
 
@@ -500,7 +491,7 @@ static LLSD blocking_request(
 			llwarns << "CURL REQ URL: " << url << llendl;
 			llwarns << "CURL REQ METHOD TYPE: " << method << llendl;
 			llwarns << "CURL REQ HEADERS: " << headers.asString() << llendl;
-			llwarns << "CURL REQ BODY: " << body_str << llendl;
+			llwarns << "CURL REQ BODY: " << ostr.str() << llendl;
 			llwarns << "CURL HTTP_STATUS: " << http_status << llendl;
 			llwarns << "CURL ERROR: " << curlEasyRequest_w->getErrorString() << llendl;
 			llwarns << "CURL ERROR BODY: " << http_buffer.asString() << llendl;
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp
index 91021186f..c59c5bb3a 100644
--- a/indra/llmessage/llurlrequest.cpp
+++ b/indra/llmessage/llurlrequest.cpp
@@ -526,6 +526,7 @@ bool LLURLRequest::configure()
 			curlEasyRequest_w->setopt(CURLOPT_FOLLOWLOCATION, 1);
 			rv = true;
 			break;
+
 		case HTTP_GET:
 			curlEasyRequest_w->setopt(CURLOPT_HTTPGET, 1);
 			curlEasyRequest_w->setopt(CURLOPT_FOLLOWLOCATION, 1);
@@ -538,24 +539,15 @@ bool LLURLRequest::configure()
 		case HTTP_PUT:
 			// Disable the expect http 1.1 extension. POST and PUT default
 			// to turning this on, and I am not too sure what it means.
-			addHeader("Expect:");
-
+			curlEasyRequest_w->addHeader("Expect:");
 			curlEasyRequest_w->setopt(CURLOPT_UPLOAD, 1);
 			curlEasyRequest_w->setopt(CURLOPT_INFILESIZE, bytes);
 			rv = true;
 			break;
 
 		case HTTP_POST:
-			// Disable the expect http 1.1 extension. POST and PUT default
-			// to turning this on, and I am not too sure what it means.
-			addHeader("Expect:");
-
-			// Disable the content type http header.
-			// *FIX: what should it be?
-			addHeader("Content-Type:");
-
 			// Set the handle for an http post
-			curlEasyRequest_w->setPost(NULL, bytes);
+			curlEasyRequest_w->setPost(bytes);
 
 			// Set Accept-Encoding to allow response compression
 			curlEasyRequest_w->setoptString(CURLOPT_ENCODING, "");
diff --git a/indra/newview/llcurlrequest.cpp b/indra/newview/llcurlrequest.cpp
index 0c566fed2..4084b729f 100644
--- a/indra/newview/llcurlrequest.cpp
+++ b/indra/newview/llcurlrequest.cpp
@@ -101,7 +101,7 @@ bool Request::post(std::string const& url, headers_t const& headers, std::string
 	llassert_always(success);	// AIFIXME: Maybe throw an error.
 	if (!success)
 	  return false;
-	buffered_easy_request_w->setPost(NULL, bytes);
+	buffered_easy_request_w->setPost(bytes);
 	buffered_easy_request_w->addHeader("Content-Type: application/octet-stream");
 	buffered_easy_request_w->finalizeRequest(url);
 
@@ -129,7 +129,7 @@ bool Request::post(std::string const& url, headers_t const& headers, LLSD const&
 	LLBufferStream buffer_stream(buffer_w->sChannels, buffer_w->getInput().get());
 	LLSDSerialize::toXML(data, buffer_stream);
 	S32 bytes = buffer_w->getInput()->countAfter(buffer_w->sChannels.out(), NULL);
-	buffered_easy_request_w->setPost(NULL, bytes);
+	buffered_easy_request_w->setPost(bytes);
 	buffered_easy_request_w->addHeader("Content-Type: application/llsd+xml");
 	buffered_easy_request_w->finalizeRequest(url);
 
diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp
index b1bb2ee0f..227904f90 100644
--- a/indra/newview/llxmlrpctransaction.cpp
+++ b/indra/newview/llxmlrpctransaction.cpp
@@ -168,8 +168,6 @@ public:
 	LLCurl::TransferInfo mTransferInfo;
 	
 	std::string			mURI;
-	char*				mRequestText;
-	int					mRequestTextSize;
 	
 	std::string			mProxyAddress;
 
@@ -200,7 +198,6 @@ LLXMLRPCTransaction::Impl::Impl(const std::string& uri,
 	: mCurlEasyRequestStateMachinePtr(NULL),
 	  mStatus(LLXMLRPCTransaction::StatusNotStarted),
 	  mURI(uri),
-	  mRequestText(0), 
 	  mResponse(0)
 {
 	init(request, useGzip);
@@ -212,7 +209,6 @@ LLXMLRPCTransaction::Impl::Impl(const std::string& uri,
 	: mCurlEasyRequestStateMachinePtr(NULL),
 	  mStatus(LLXMLRPCTransaction::StatusNotStarted),
 	  mURI(uri),
-	  mRequestText(0), 
 	  mResponse(0)
 {
 	XMLRPC_REQUEST request = XMLRPC_RequestNew();
@@ -223,8 +219,13 @@ LLXMLRPCTransaction::Impl::Impl(const std::string& uri,
 	init(request, useGzip);
 }
 
-
-
+// Store pointer to data allocated with XMLRPC_REQUEST_ToXML and call XMLRPC_Free to free it upon destruction.
+class AIXMLRPCData : public AIPostField
+{
+  public:
+	AIXMLRPCData(char const* allocated_data) : AIPostField(allocated_data) { }
+	/*virtual*/ ~AIXMLRPCData() { XMLRPC_Free(const_cast<char*>(mData)); mData = NULL; }
+};
 
 void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip)
 {
@@ -259,12 +260,11 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip)
 			curlEasyRequest_w->setoptString(CURLOPT_ENCODING, "");
 		}
 		
-		mRequestText = XMLRPC_REQUEST_ToXML(request, &mRequestTextSize);
-		if (mRequestText)
+		int requestTextSize;
+		char* requestText = XMLRPC_REQUEST_ToXML(request, &requestTextSize);
+		if (requestText)
 		{
-			Dout(dc::curl, "Writing " << mRequestTextSize << " bytes: \"" << libcwd::buf2str(mRequestText, mRequestTextSize) << "\".");;
-			curlEasyRequest_w->setopt(CURLOPT_POSTFIELDSIZE, mRequestTextSize);
-			curlEasyRequest_w->setoptString(CURLOPT_COPYPOSTFIELDS, mRequestText);
+			curlEasyRequest_w->setPost(new AIXMLRPCData(requestText), requestTextSize);
 		}
 		else
 		{
@@ -298,11 +298,6 @@ LLXMLRPCTransaction::Impl::~Impl()
 	{
 		XMLRPC_RequestFree(mResponse, 1);
 	}
-	
-	if (mRequestText)
-	{
-		XMLRPC_Free(mRequestText);
-	}
 }
 
 bool LLXMLRPCTransaction::Impl::is_finished(void) const

From 039f665af1b7876ae7e349ec507f2bf4d551f6a8 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sun, 12 Aug 2012 16:38:25 +0200
Subject: [PATCH 192/199] Hopefully fix FMOD Ex packaging this time

---
 indra/newview/viewer_manifest.py | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 3acd7f429..f118a68a6 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -806,18 +806,15 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libopenal.so.1")
             self.path("libtcmalloc_minimal.so.0")
             self.path("libtcmalloc_minimal.so.0.2.2")
-            self.end_prefix("lib")
-
 
             if 'extra_libraries' in self.args:
-                print self.args['extra_libraries']
                 path_list = self.args['extra_libraries'].split('|')
                 for path in path_list:
-                    path = os.path.realpath(path)
-                    path_pair = path.rsplit('/', 1)
-                    if self.prefix(src=path_pair[0], dst="lib"):
-                        self.path(path_pair[1])
-                        self.end_prefix()
+                    src_path = os.path.realpath(path)
+                    dst_path = os.path.basename(path)
+                    self.path(src_path, dst_path)
+
+            self.end_prefix("lib")
 
             # Vivox runtimes
             if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
@@ -855,14 +852,11 @@ class Linux_x86_64Manifest(LinuxManifest):
             self.path("libalut.so*")
 
             if 'extra_libraries' in self.args:
-                print self.args['extra_libraries']
                 path_list = self.args['extra_libraries'].split('|')
                 for path in path_list:
-                    path = os.path.realpath(path)
-                    path_pair = path.rsplit('/', 1)
-                    if self.prefix(src=path_pair[0], dst="lib64"):
-                        self.path(path_pair[1])
-                        self.end_prefix()
+                    src_path = os.path.realpath(path)
+                    dst_path = os.path.basename(path)
+                    self.path(src_path, dst_path)
 
             self.end_prefix("lib64")
 

From fa10ce28d28b01f8d59e88840d0cae41131aeedc Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Sun, 12 Aug 2012 17:10:44 +0200
Subject: [PATCH 193/199] Missing header

---
 indra/llmessage/debug_libcurl.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/llmessage/debug_libcurl.cpp b/indra/llmessage/debug_libcurl.cpp
index 3f85dcc2d..40b75d200 100644
--- a/indra/llmessage/debug_libcurl.cpp
+++ b/indra/llmessage/debug_libcurl.cpp
@@ -5,6 +5,7 @@
 #include <iomanip>
 #include <cstdlib>
 #include <stdarg.h>
+#include <cstring>
 #include "llpreprocessor.h"
 #include <curl/curl.h>
 #define COMPILING_DEBUG_LIBCURL_CC

From 263a25fb870815eb898e34050b7eec779fe1a150 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Sun, 12 Aug 2012 17:42:30 +0200
Subject: [PATCH 194/199] Compile fix for DEBUG_CURLIO

---
 indra/cwdebug/debug.h      | 7 ++++---
 indra/llmessage/aicurl.cpp | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/indra/cwdebug/debug.h b/indra/cwdebug/debug.h
index 862ea263c..a52837411 100644
--- a/indra/cwdebug/debug.h
+++ b/indra/cwdebug/debug.h
@@ -89,16 +89,17 @@ extern LL_COMMON_API fake_channel const notice;
 } // namespace debug
 
 #define LIBCWD_DEBUG_CHANNELS debug
-#define LibcwDoutScopeBegin(a, b, c) do { using namespace debug; llinfos_nf << print_thread_id << (c).mLabel << ": " << Indent::print;
+#define LibcwDoutScopeBegin(a, b, c) do { using namespace debug; using namespace debug::libcwd; llinfos_nf << print_thread_id << (c).mLabel << ": " << Indent::print;
 #define LibcwDoutStream llcont
 #define LibcwDoutScopeEnd llcont << llendl; } while(0)
 
-#define Debug(x) do { using namespace debug; x; } while(0)
-#define Dout(a, b) do { using namespace debug; if ((a).mOn) { llinfos_nf << print_thread_id << (a).mLabel << ": " << Indent::print << b << llendl; } } while(0)
+#define Debug(x) do { using namespace debug; using namespace debug::libcwd; x; } while(0)
+#define Dout(a, b) do { using namespace debug; using namespace debug::libcwd; if ((a).mOn) { llinfos_nf << print_thread_id << (a).mLabel << ": " << Indent::print << b << llendl; } } while(0)
 #define DoutEntering(a, b) \
   int __slviewer_debug_indentation = 2; \
   { \
 	using namespace debug; \
+	using namespace debug::libcwd; \
 	if ((a).mOn) \
 	  llinfos_nf << print_thread_id << (a).mLabel << ": " << Indent::print << "Entering " << b << llendl; \
     else \
diff --git a/indra/llmessage/aicurl.cpp b/indra/llmessage/aicurl.cpp
index ceb1000d5..71d9397d5 100644
--- a/indra/llmessage/aicurl.cpp
+++ b/indra/llmessage/aicurl.cpp
@@ -993,14 +993,14 @@ static int curl_debug_cb(CURL*, curl_infotype infotype, char* buf, size_t size,
   libcw_do.marker().assign(marker.str().data(), marker.str().size());
   if (!debug::channels::dc::curlio.is_on())
 	debug::channels::dc::curlio.on();
-  LibcwDoutScopeBegin(LIBCWD_DEBUGCHANNELS, libcwd::libcw_do, dc::curlio|cond_nonewline_cf(infotype == CURLINFO_TEXT))
+  LibcwDoutScopeBegin(LIBCWD_DEBUGCHANNELS, libcw_do, dc::curlio|cond_nonewline_cf(infotype == CURLINFO_TEXT))
 #else
   if (infotype == CURLINFO_TEXT)
   {
 	while (size > 0 && (buf[size - 1] == '\r' ||  buf[size - 1] == '\n'))
 	  --size;
   }
-  LibcwDoutScopeBegin(LIBCWD_DEBUGCHANNELS, libcwd::libcw_do, dc::curlio)
+  LibcwDoutScopeBegin(LIBCWD_DEBUGCHANNELS, libcw_do, dc::curlio)
 #endif
   switch (infotype)
   {

From ee0bd9ee7679b6d4ebc212fc2127d5f068444234 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Sun, 12 Aug 2012 20:52:57 +0200
Subject: [PATCH 195/199] De-uglify graphics preferences

---
 indra/llui/lltabcontainer.cpp                 |  2 +-
 indra/newview/llpaneldisplay.cpp              |  2 +-
 .../default/xui/en-us/floater_preferences.xml | 14 ++---
 .../skins/default/xui/en-us/notifications.xml | 25 --------
 .../xui/en-us/panel_preferences_graphics1.xml | 57 +++++++++----------
 5 files changed, 37 insertions(+), 63 deletions(-)

diff --git a/indra/llui/lltabcontainer.cpp b/indra/llui/lltabcontainer.cpp
index 7d3bb20c4..24ccd848f 100644
--- a/indra/llui/lltabcontainer.cpp
+++ b/indra/llui/lltabcontainer.cpp
@@ -751,7 +751,7 @@ void LLTabContainer::addTabPanel(LLPanel* child,
 		else
 		{
 			tab_panel_top = getRect().getHeight() - getTopBorderHeight();
-			tab_panel_bottom = (TABCNTR_TAB_HEIGHT - TABCNTR_BUTTON_PANEL_OVERLAP);  // Run to the edge, covering up the border
+			tab_panel_bottom = (TABCNTR_TAB_HEIGHT + LLPANEL_BORDER_WIDTH*2 - TABCNTR_BUTTON_PANEL_OVERLAP);  // Run to the edge, covering up the border
 		}
 	}
 	else
diff --git a/indra/newview/llpaneldisplay.cpp b/indra/newview/llpaneldisplay.cpp
index d5a888d12..1e2eccdca 100644
--- a/indra/newview/llpaneldisplay.cpp
+++ b/indra/newview/llpaneldisplay.cpp
@@ -1178,7 +1178,7 @@ void LLPanelDisplay::updateMeterText(LLUICtrl* ctrl, void* user_data)
 	LLTextBox* m1 = panel->getChild<LLTextBox>("DrawDistanceMeterText1");
 	LLTextBox* m2 = panel->getChild<LLTextBox>("DrawDistanceMeterText2");
 
-	// toggle the two text boxes based on whether we have 1 or two digits
+	// toggle the two text boxes based on whether we have 2 or 3 digits
 	F32 val = slider->getValueF32();
 	bool two_digits = val < 100;
 	m1->setVisible(two_digits);
diff --git a/indra/newview/skins/default/xui/en-us/floater_preferences.xml b/indra/newview/skins/default/xui/en-us/floater_preferences.xml
index ea850207c..e737f6144 100644
--- a/indra/newview/skins/default/xui/en-us/floater_preferences.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_preferences.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-666" can_close="true" can_drag_on_left="false" can_minimize="true"
+<floater can_close="true" can_drag_on_left="false" can_minimize="true"
      can_resize="false" can_tear_off="true" default_tab_group="1" enabled="true"
-     height="510" left="330" min_height="213" min_width="324"
+     height="494" left="330" min_height="213" min_width="324"
      mouse_opaque="true" name="Preferences" title="Preferences" width="620">
-	<button bottom="-505" enabled="true" follows="right|bottom" font="SansSerif"
+	<button bottom="4" enabled="true" follows="right|bottom" font="SansSerif"
 	     halign="center" height="20" label="OK" label_selected="OK" left="335"
 	     mouse_opaque="true" name="OK" scale_image="true" width="90" />
-	<button bottom="-505" enabled="true" follows="right|bottom" font="SansSerif"
+	<button bottom="4" enabled="true" follows="right|bottom" font="SansSerif"
 	     halign="center" height="20" label="Cancel" label_selected="Cancel"
 	     left_delta="93" mouse_opaque="true" name="Cancel" scale_image="true"
 	     width="90" />
-	<button bottom="-505" enabled="true" follows="right|bottom" font="SansSerif"
+	<button bottom="4" enabled="true" follows="right|bottom" font="SansSerif"
 	     halign="center" height="20" label="Apply" label_selected="Apply"
 	     left_delta="93" mouse_opaque="true" name="Apply" scale_image="true"
 	     width="90" />
-	<button bottom="-505" enabled="true" follows="left|bottom" font="SansSerif"
+	<button bottom="4" enabled="true" follows="left|bottom" font="SansSerif"
 	     halign="center" height="20" label="About" label_selected="About" left="9"
 	     mouse_opaque="true" name="About..." scale_image="true" width="90" />
-	<button bottom="-505" enabled="true" follows="left|bottom" font="SansSerif"
+	<button bottom="4" enabled="true" follows="left|bottom" font="SansSerif"
 	     halign="center" height="20"
 	     help_url="http://secondlife.com/app/help/technical/preferences.php"
 	     label="Help" label_selected="Help" left_delta="93" mouse_opaque="true"
diff --git a/indra/newview/skins/default/xui/en-us/notifications.xml b/indra/newview/skins/default/xui/en-us/notifications.xml
index efe9ef5da..ca7169b88 100644
--- a/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -4816,31 +4816,6 @@ Put it in a web page to give others easy access to this location or try it out y
     </form>
   </notification>
 
-  <notification
-   icon="alertmodal.tga"
-   name="GraphicsPreferencesHelp"
-   type="alertmodal">
-This panel controls window size and resolution and the quality of the client&apos;s graphics.  The Preferences &gt; Graphics interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. You may also customize your graphics settings by checking the Custom checkbox and manipulating the following settings:
-
-Shaders: Enable or disable various types of pixel shaders.
-
-Reflection Detail: Sets the types of objects that water can reflect.
-
-Avatar Rendering: Sets options that affect how the client renders avatars.
-
-Draw Distance: Affects how far out from your viewpoint objects will be rendered in the scene.
-
-Max Particle Count: Sets the maximum number of particles you are able to see on your screen at once.
-
-Post Process Quality: Sets the resolution with which Glow is rendered.
-
-Mesh Detail: Sets the amount of detail or number of triangles used in rendering certain objects. A higher value takes longer to render, but makes these objects appear with more detail.
-
-Lighting Detail: Selects what types of lights you would like to render.
-
-Terrain Detail: Sets the amount of detail you would like to see for the terrain texture.
-  </notification>
-
   <notification
    icon="alertmodal.tga"
    name="WLSavePresetAlert"
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
index 7625c82f1..e81eedfe1 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="-449" height="438" label="Graphics" name="Display panel" width="517">
+<panel border="true" bottom="-449" height="438" label="Graphics" name="Display panel" width="517">
 	<check_box bottom="-23" height="16" initial_value="false" label="Run viewer in a window" left="10" name="windowed mode" width="120" tool_tip="If unchecked, viewer will display full-screen when logged in."/>
-	<text bottom="-62" height="12" name="WindowSizeLabel">Window Size:</text>
+	<button bottom_delta="4" height="20" left="-210" label="Reset to Defaults" tool_tip="Reset to recommended graphics settings" name="Defaults" width="200"/>
+	<text bottom="-62" left="10" height="12" name="WindowSizeLabel">Window Size:</text>
 	<combo_box bottom="-67" height="18" left="165" name="windowsize combo" width="150">
 		<combo_item name="800x600" value="800 x 600">800x600</combo_item>
 		<combo_item name="720x480" value="720 x 480">720x480 (NTSC)</combo_item>
@@ -20,11 +21,9 @@
 		<combo_item name="8:5(Widescreen)" value="1.6">16:10 (Widescreen PC)</combo_item>
 		<combo_item name="16:9(Widescreen)" value="1.7777777">16:9 (Widescreen TV)</combo_item>
 	</combo_box>
-    <button bottom_delta="-20" height="20" label="Default" tool_tip="Reset to recommended graphics settings" left="355" name="Defaults" scale_image="true" width="100"/>
 	<check_box bottom="-44" control_name="FullScreenAutoDetectAspectRatio" height="16" initial_value="false" label="Auto-detect ratio" left="350" name="aspect_auto_detect" width="256"/>
- <tab_container follows="all" bottom="0" border="false" left="0" height="360" width="518" name="graphics_tab" tab_position="bottom">
-	 <panel border="true" bottom="-439" height="438" label="Main" left="102" name="Main" width="517">
-	<button bottom="327" height="18" label="?" left="470" name="GraphicsPreferencesHelpButton" width="22"/>
+ <tab_container follows="all" bottom="0" border="false" left="2" height="360" right="-2" name="graphics_tab" tab_position="bottom">
+	<panel border="true" bottom="-439" height="438" label="Main" left="102" name="Main" width="517">
 	<text bottom="330"  height="12" left="10" name="QualityText">Quality &amp; Performance:</text>
 	<text bottom_delta="0"  height="12" left="135" name="FasterText">Faster</text>
 	<text bottom_delta="-16" height="12" left_delta="23" name="ShadersPrefText">Low</text>
@@ -39,7 +38,7 @@
 	<icon bottom="-89" height="14" image_name="rounded_square.tga" left_delta="44" name="UltraDivet" width="2"/>
 -->
 	<slider bottom_delta="0" control_name="RenderQualityPerformance" increment="1" initial_val="0" left="165" max_val="3" min_val="0" name="QualityPerformanceSelection" show_text="false" width="150" />
-	<check_box bottom_delta="-5" control_name="RenderCustomSettings" label="Custom" left="395" initial_value="true" name="CustomSettings"/>
+	<check_box bottom_delta="-10" control_name="RenderCustomSettings" label="Custom" left="410" initial_value="true" name="CustomSettings"/>
 	<!--view_border bevel_style="none" bottom="-395" height="280" left="5" name="GraphicsBorder" width="485"/-->
 	<text bottom="300" height="12" left="10" name="ShadersText">Shaders:</text>
     <check_box bottom_delta="-23" control_name="RenderTransparentWater" height="16" initial_value="true" label="Transparent water" left="10" name="TransparentWater"/>
@@ -74,35 +73,35 @@
 
     <slider bottom_delta="-20" left="5" control_name="RenderAvatarPhysicsLODFactor" increment="0.1" label="  Avatar Physics:" label_width="79" max_val="1" min_val="0" name="AvatarPhysicsDetail" show_text="false" width="160"/>
     <text bottom_delta="-2" left="170" height="12" name="AvatarPhysicsDetailText">Off</text>
-    <text bottom="299" left="470" height="12" name="DrawDistanceMeterText1">m</text>
-    <text bottom="299" left="470" height="12" name="DrawDistanceMeterText2">m</text>
-    <slider bottom="295" left="215" control_name="RenderFarClip" decimal_digits="0" height="16" increment="8" initial_val="160" label="Draw Distance:" label_width="101" max_val="1024" min_val="64" name="DrawDistance" width="262"/>
-    <slider bottom_delta="-15" control_name="RenderMaxPartCount" decimal_digits="0" height="16" increment="256" initial_val="4096"	  label="Max. Particle Count:" label_width="101"	  max_val="8192" min_val="0" name="MaxParticleCount" width="262"/>
-    <slider bottom_delta="-15" control_name="RenderAvatarMaxVisible" decimal_digits="0" increment="1" initial_val="35" label="Max non-impostors" label_width="101" max_val="50" min_val="1" name="AvatarMaxVisible" width="250"/>
-    <slider bottom_delta="-25" control_name="RenderGlowResolutionPow" decimal_digits="0" height="16" increment="1" initial_val="8" label="Post Process Quality:"	  label_width="101" max_val="9" min_val="8" name="RenderPostProcess" show_text="false" width="226"/>
-    <text bottom_delta="-15" height="12" left="215" name="MeshDetailText">Level of Detail:</text>
-    <slider bottom_delta="-20" control_name="RenderVolumeLODFactor" increment="0.09375" label="  Objects:" label_width="79" max_val="2" min_val="0.5" name="ObjectMeshDetail" show_text="false" width="223"/>
-    <slider bottom_delta="-20" control_name="RenderFlexTimeFactor" increment="0.1" label="  Flexiprims:" label_width="79" max_val="1" min_val="0" name="FlexibleMeshDetail" show_text="false" width="223"/>
-    <slider bottom_delta="-20" control_name="RenderTreeLODFactor"	increment="0.125" label="  Trees:" label_width="79" max_val="1" min_val="0" name="TreeMeshDetail" show_text="false" width="223"/>
-    <slider bottom_delta="-20" control_name="RenderAvatarLODFactor" increment="0.125" label="  Avatars:" label_width="79" max_val="1" min_val="0" name="AvatarMeshDetail" show_text="false" width="223"/>
-    <slider bottom_delta="-20" control_name="RenderTerrainLODFactor" increment="0.125" label="  Terrain:" label_width="79" max_val="2" min_val="1" name="TerrainMeshDetail" show_text="false" width="223"/>
-    <slider bottom_delta="-20" control_name="WLSkyDetail"	decimal_digits="0" increment="8" label="  Sky:" label_width="79" max_val="128" min_val="16" name="SkyMeshDetail"   show_text="false" width="223"/>
-    <text bottom_delta="100" left_delta="229" height="12" name="ObjectMeshDetailText">Low</text>
-    <text bottom_delta="-20" height="12" name="FlexibleMeshDetailText">Low</text>
-    <text bottom_delta="-20" height="12" name="TreeMeshDetailText">Low</text>
-    <text bottom_delta="-20" height="12" name="AvatarMeshDetailText">Low</text>
-    <text bottom_delta="-20" height="12" name="TerrainMeshDetailText">Low</text>
-    <text bottom_delta="-20" height="12" name="SkyMeshDetailText">Low</text>
-    <text bottom_delta="-30" height="12" left="230" name="AvatarRenderingText">Avatar Rendering:</text>
+    <text bottom="284" left="460" height="12" name="DrawDistanceMeterText1">m</text>
+    <text bottom="284" left="470" height="12" name="DrawDistanceMeterText2">m</text>
+    <slider bottom="280" left="215" control_name="RenderFarClip" decimal_digits="0" height="16" increment="32" initial_val="160" label="Draw Distance:" label_width="101" max_val="1024" min_val="64" name="DrawDistance" width="262"/>
+    <slider bottom_delta="-18" control_name="RenderMaxPartCount" decimal_digits="0" height="16" increment="256" initial_val="4096" label="Max. Particle Count:" label_width="101" max_val="8192" min_val="0" name="MaxParticleCount" width="262"/>
+    <slider bottom_delta="-18" control_name="RenderAvatarMaxVisible" decimal_digits="0" height="16" increment="1" initial_val="35" label="Max. non-impostors:" label_width="101" max_val="50" min_val="1" name="AvatarMaxVisible" width="250"/>
+    <slider bottom_delta="-18" control_name="RenderGlowResolutionPow" decimal_digits="0" height="16" increment="1" initial_val="8" label="Post Process Quality:" label_width="101" max_val="9" min_val="8" name="RenderPostProcess" show_text="false" width="226"/>
+    <text bottom_delta="4" height="12" left="444" name="PostProcessText">Low</text>
+    <text bottom_delta="-25" height="12" left="215" name="MeshDetailText">Level of Detail:</text>
+    <slider bottom_delta="-22" control_name="RenderVolumeLODFactor" height="16" increment="0.09375" label="  Objects:" label_width="79" max_val="2" min_val="0.5" name="ObjectMeshDetail" show_text="false" width="223"/>
+    <slider bottom_delta="-18" control_name="RenderFlexTimeFactor" height="16" increment="0.1" label="  Flexiprims:" label_width="79" max_val="1" min_val="0" name="FlexibleMeshDetail" show_text="false" width="223"/>
+    <slider bottom_delta="-18" control_name="RenderTreeLODFactor" height="16" increment="0.125" label="  Trees:" label_width="79" max_val="1" min_val="0" name="TreeMeshDetail" show_text="false" width="223"/>
+    <slider bottom_delta="-18" control_name="RenderAvatarLODFactor" height="16" increment="0.125" label="  Avatars:" label_width="79" max_val="1" min_val="0" name="AvatarMeshDetail" show_text="false" width="223"/>
+    <slider bottom_delta="-18" control_name="RenderTerrainLODFactor" height="16" increment="0.125" label="  Terrain:" label_width="79" max_val="2" min_val="1" name="TerrainMeshDetail" show_text="false" width="223"/>
+    <slider bottom_delta="-18" control_name="WLSkyDetail" height="16" decimal_digits="0" increment="8" label="  Sky:" label_width="79" max_val="128" min_val="16" name="SkyMeshDetail" show_text="false" width="223"/>
+    <text bottom_delta="90" left_delta="229" height="12" name="ObjectMeshDetailText">Low</text>
+    <text bottom_delta="-18" height="12" name="FlexibleMeshDetailText">Low</text>
+    <text bottom_delta="-18" height="12" name="TreeMeshDetailText">Low</text>
+    <text bottom_delta="-18" height="12" name="AvatarMeshDetailText">Low</text>
+    <text bottom_delta="-18" height="12" name="TerrainMeshDetailText">Low</text>
+    <text bottom_delta="-18" height="12" name="SkyMeshDetailText">Low</text>
+    <text bottom_delta="-25" height="12" left="230" name="AvatarRenderingText">Avatar Rendering:</text>
     <check_box bottom_delta="-20" control_name="RenderUseImpostors" initial_value="true" label="Avatar impostors" name="AvatarImpostors"/>
     <check_box bottom_delta="-16" control_name="RenderAvatarVP" initial_value="true" label="Hardware skinning" name="AvatarVertexProgram"/>
     <check_box bottom_delta="-16" control_name="RenderAvatarCloth" initial_value="true" label="Avatar cloth" name="AvatarCloth"/>
-    <text bottom_delta="53" height="12" left="395" name="TerrainDetailText">Terrain detail:</text>
+    <text bottom_delta="50" height="12" left="395" name="TerrainDetailText">Terrain detail:</text>
     <radio_group bottom_delta="-44" control_name="RenderTerrainDetail" draw_border="false" height="38" name="TerrainDetailRadio" width="321">
 	  <radio_item bottom="-15" height="16" left="3" name="0" width="315">Low</radio_item>
 	  <radio_item bottom="-31" height="16" name="2" width="315">High</radio_item>
     </radio_group>
-    <text bottom="-106" height="12" left="444" name="PostProcessText">Low</text>
   </panel>
   <panel border="true" bottom="-400" height="244" left="50" name="Hardware" label="Hardware" width="500">
 	<check_box bottom="-22" control_name="RenderAnisotropic" height="16" initial_value="false" label="Anisotropic Filtering (slower when enabled)" left="5" name="ani" width="256"/>

From 169670a58b18b10455af2399de7cc9942eb1da9a Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Mon, 13 Aug 2012 19:30:35 +0200
Subject: [PATCH 196/199] Refurbish last merge. Fix compile for standalone and
 libcwd.

---
 indra/llimage/llpngwrapper.h                 | 5 +++++
 indra/llmessage/llares.cpp                   | 1 +
 indra/plugins/webkit/media_plugin_webkit.cpp | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/indra/llimage/llpngwrapper.h b/indra/llimage/llpngwrapper.h
index 7def0c713..276709d1a 100644
--- a/indra/llimage/llpngwrapper.h
+++ b/indra/llimage/llpngwrapper.h
@@ -32,7 +32,12 @@
 #ifndef LL_LLPNGWRAPPER_H
 #define LL_LLPNGWRAPPER_H
 
+#ifdef LL_STANDALONE
+#include <png.h>
+#else
+// Workaround for wrongly packaged prebuilt.
 #include "libpng15/png.h"
+#endif
 #include "llimage.h"
 
 class LLPngWrapper
diff --git a/indra/llmessage/llares.cpp b/indra/llmessage/llares.cpp
index 48d3f9108..91d13dac3 100644
--- a/indra/llmessage/llares.cpp
+++ b/indra/llmessage/llares.cpp
@@ -37,6 +37,7 @@
 #include "apr_poll.h"
 
 #include "llapr.h"
+#include "llaprpool.h"
 #include "llareslistener.h"
 
 #if defined(LL_WINDOWS)
diff --git a/indra/plugins/webkit/media_plugin_webkit.cpp b/indra/plugins/webkit/media_plugin_webkit.cpp
index 9809a9e5e..e64a89d88 100644
--- a/indra/plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/plugins/webkit/media_plugin_webkit.cpp
@@ -25,8 +25,8 @@
  * $/LicenseInfo$
  * @endcond
  */
-#include "llqtwebkit.h"
 #include "linden_common.h"
+#include "llqtwebkit.h"
 #include "indra_constants.h" // for indra keyboard codes
 
 #include "lltimer.h"

From 35a53ef1d76c193c3a0031d5d8eb5fa2037b69d0 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Mon, 13 Aug 2012 21:59:57 +0200
Subject: [PATCH 197/199] Bug fix (needed for libcwd with memory allocation
 debugging)

---
 indra/llmessage/llhttpclient.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp
index 5e201710f..c8e706f44 100644
--- a/indra/llmessage/llhttpclient.cpp
+++ b/indra/llmessage/llhttpclient.cpp
@@ -123,7 +123,7 @@ namespace
 	{
 	public:
 		RawInjector(const U8* data, S32 size) : mData(data), mSize(size) {}
-		virtual ~RawInjector() {delete mData;}
+		virtual ~RawInjector() {delete [] mData;}
 
 		const char* contentType() { return "application/octet-stream"; }
 

From 36ff4dcd11b4e0fe7250fe2bc88ad50053ffb09d Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Tue, 7 Aug 2012 16:48:22 +0200
Subject: [PATCH 198/199] Don't feed empty, non-working callback to CURL

Cherry-Pick of 96a4e16a

Conflicts:
	indra/llmessage/llurlrequest.cpp
	indra/llmessage/llurlrequest.h
	indra/newview/hipporestrequest.cpp

Clear reasons for conflicts, resolved.
---
 indra/llmessage/llhttpclient.cpp   |  9 +------
 indra/llmessage/llhttpclient.h     |  6 -----
 indra/llmessage/llurlrequest.cpp   | 40 ++++++------------------------
 indra/llmessage/llurlrequest.h     |  4 +--
 indra/newview/hipporestrequest.cpp |  2 +-
 5 files changed, 10 insertions(+), 51 deletions(-)

diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp
index c8e706f44..d611a6b5f 100644
--- a/indra/llmessage/llhttpclient.cpp
+++ b/indra/llmessage/llhttpclient.cpp
@@ -41,8 +41,6 @@
 
 
 const F32 HTTP_REQUEST_EXPIRY_SECS = 60.0f;
-LLURLRequest::SSLCertVerifyCallback LLHTTPClient::mCertVerifyCallback = NULL;
-
 ////////////////////////////////////////////////////////////////////////////
 
 // Responder class moved to LLCurl
@@ -205,11 +203,6 @@ namespace
 	LLPumpIO* theClientPump = NULL;
 }
 
-void LLHTTPClient::setCertVerifyCallback(LLURLRequest::SSLCertVerifyCallback callback)
-{
-	LLHTTPClient::mCertVerifyCallback = callback;
-}
-
 static void request(
 	const std::string& url,
 	LLURLRequest::ERequestAction method,
@@ -244,7 +237,7 @@ static void request(
 		return ;
 	}
 
-	req->setSSLVerifyCallback(LLHTTPClient::getCertVerifyCallback(), (void *)req);
+	req->checkRootCertificate(true);
 
 	
 	lldebugs << LLURLRequest::actionAsVerb(method) << " " << url << " "
diff --git a/indra/llmessage/llhttpclient.h b/indra/llmessage/llhttpclient.h
index 39a6498d8..d371290db 100644
--- a/indra/llmessage/llhttpclient.h
+++ b/indra/llmessage/llhttpclient.h
@@ -155,12 +155,6 @@ public:
 		///< for testing
 	static LLPumpIO &getPump();
 		///< Hippo special
-
-	static void setCertVerifyCallback(LLURLRequest::SSLCertVerifyCallback callback);
-	static  LLURLRequest::SSLCertVerifyCallback getCertVerifyCallback() { return mCertVerifyCallback; }
-
-protected:
-	static LLURLRequest::SSLCertVerifyCallback mCertVerifyCallback;
 };
 
 #endif // LL_LLHTTPCLIENT_H
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp
index c59c5bb3a..ba0d24ce3 100644
--- a/indra/llmessage/llurlrequest.cpp
+++ b/indra/llmessage/llurlrequest.cpp
@@ -91,39 +91,6 @@ LLURLRequestDetail::~LLURLRequestDetail()
 	mLastRead = NULL;
 }
 
-void LLURLRequest::setSSLVerifyCallback(SSLCertVerifyCallback callback, void *param)
-{
-	LLMemType m1(LLMemType::MTYPE_IO_URL_REQUEST);
-	mDetail->mSSLVerifyCallback = callback;
-	AICurlEasyRequest_wat curlEasyRequest_w(*mDetail->mCurlEasyRequest);
-	curlEasyRequest_w->setSSLCtxCallback(LLURLRequest::_sslCtxCallback, (void *)this);
-	curlEasyRequest_w->setopt(CURLOPT_SSL_VERIFYPEER, true);
-	curlEasyRequest_w->setopt(CURLOPT_SSL_VERIFYHOST, 2);	
-}
-
-
-// _sslCtxFunction
-// Callback function called when an SSL Context is created via CURL
-// used to configure the context for custom cert validation
-
-CURLcode LLURLRequest::_sslCtxCallback(CURL * curl, void *sslctx, void *param)
-{	
-	LLURLRequest *req = (LLURLRequest *)param;
-	if(req == NULL || req->mDetail->mSSLVerifyCallback == NULL)
-	{
-		SSL_CTX_set_cert_verify_callback((SSL_CTX *)sslctx, NULL, NULL);
-		return CURLE_OK;
-	}
-	SSL_CTX * ctx = (SSL_CTX *) sslctx;
-	// disable any default verification for server certs
-	SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, NULL);
-	// set the verification callback.
-	SSL_CTX_set_cert_verify_callback(ctx, req->mDetail->mSSLVerifyCallback, (void *)req);
-	// the calls are void
-	return CURLE_OK;
-	
-}
-
 /**
  * class LLURLRequest
  */
@@ -195,6 +162,13 @@ void LLURLRequest::addHeader(const char* header)
 	curlEasyRequest_w->addHeader(header);
 }
 
+void LLURLRequest::checkRootCertificate(bool check)
+{
+	mDetail->mCurlRequest->setopt(CURLOPT_SSL_VERIFYPEER, (check? TRUE : FALSE));
+	mDetail->mCurlRequest->setoptString(CURLOPT_ENCODING, "");
+}
+
+
 void LLURLRequest::setBodyLimit(U32 size)
 {
 	mDetail->mBodyLimit = size;
diff --git a/indra/llmessage/llurlrequest.h b/indra/llmessage/llurlrequest.h
index aee8a1a84..10ad50f28 100644
--- a/indra/llmessage/llurlrequest.h
+++ b/indra/llmessage/llurlrequest.h
@@ -142,7 +142,7 @@ public:
 	 * Set whether request will check that remote server
 	 * certificates are signed by a known root CA when using HTTPS.
 	 */
-	void setSSLVerifyCallback(SSLCertVerifyCallback callback, void * param);
+	void checkRootCertificate(bool check);
 
 	
 	/**
@@ -227,8 +227,6 @@ protected:
 	 S32 mRequestTransferedBytes;
 	 S32 mResponseTransferedBytes;
 
-	static CURLcode _sslCtxCallback(CURL * curl, void *sslctx, void *param);
-	
 	// mRemoved is used instead of changing mState directly, because I'm not convinced the latter is atomic.
 	// Set to false before adding curl request and then only tested.
 	// Reset in removed_from_multi_handle (by another thread), this is thread-safe.
diff --git a/indra/newview/hipporestrequest.cpp b/indra/newview/hipporestrequest.cpp
index 60d7770a1..12e112bcf 100644
--- a/indra/newview/hipporestrequest.cpp
+++ b/indra/newview/hipporestrequest.cpp
@@ -268,7 +268,7 @@ static void request(const std::string &url,
 		llwarns << "Failed to create LLURLRequest: " << error.what() << llendl;
 		return;
 	}
-	req->setSSLVerifyCallback(LLHTTPClient::getCertVerifyCallback(), (void *)req);
+	req->checkRootCertificate(true);
 
 	/*
 	// Insert custom headers if the caller sent any

From 19293601b32bd5b2499c12daab280856664c4f8c Mon Sep 17 00:00:00 2001
From: Aleric Inglewood <Aleric.Inglewood@gmail.com>
Date: Tue, 14 Aug 2012 00:45:49 +0200
Subject: [PATCH 199/199] Manual pick of stuff from 'shycurl' (68ad5411) that
 seemed to make sense.

---
 indra/llmessage/llhttpclient.cpp | 14 ++++----------
 indra/llmessage/llhttpclient.h   |  2 +-
 indra/llmessage/llurlrequest.cpp | 22 +++++++++++-----------
 indra/llmessage/llurlrequest.h   |  7 ++-----
 4 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp
index d611a6b5f..c04bad5e4 100644
--- a/indra/llmessage/llhttpclient.cpp
+++ b/indra/llmessage/llhttpclient.cpp
@@ -25,7 +25,6 @@
  */
 
 #include "linden_common.h"
-#include <openssl/x509_vfy.h>
 #include "llhttpclient.h"
 
 #include "llassetstorage.h"
@@ -39,7 +38,6 @@
 
 #include "message.h"
 
-
 const F32 HTTP_REQUEST_EXPIRY_SECS = 60.0f;
 ////////////////////////////////////////////////////////////////////////////
 
@@ -186,11 +184,9 @@ namespace
 			
 			LLVFile vfile(gVFS, mUUID, mAssetType, LLVFile::READ);
 			S32 fileSize = vfile.getSize();
-			U8* fileBuffer;
-			fileBuffer = new U8 [fileSize];
-            vfile.read(fileBuffer, fileSize);
-            ostream.write((char*)fileBuffer, fileSize);
-			delete [] fileBuffer;
+			std::vector<U8> fileBuffer(fileSize);
+			vfile.read(&fileBuffer[0], fileSize);
+			ostream.write((char*)&fileBuffer[0], fileSize);
 			eos = true;
 			return STATUS_DONE;
 		}
@@ -199,7 +195,6 @@ namespace
 		LLAssetType::EType mAssetType;
 	};
 
-	
 	LLPumpIO* theClientPump = NULL;
 }
 
@@ -209,8 +204,7 @@ static void request(
 	Injector* body_injector,
 	LLCurl::ResponderPtr responder,
 	const F32 timeout = HTTP_REQUEST_EXPIRY_SECS,
-	const LLSD& headers = LLSD()
-    )
+	const LLSD& headers = LLSD())
 {
 	if (responder)
 	{
diff --git a/indra/llmessage/llhttpclient.h b/indra/llmessage/llhttpclient.h
index d371290db..ae22fd30a 100644
--- a/indra/llmessage/llhttpclient.h
+++ b/indra/llmessage/llhttpclient.h
@@ -34,10 +34,10 @@
 #include <string>
 
 #include <boost/intrusive_ptr.hpp>
-#include "llurlrequest.h"
 #include "llassettype.h"
 #include "llcurl.h"
 #include "lliopipe.h"
+#include "llurlrequest.h"
 
 extern const F32 HTTP_REQUEST_EXPIRY_SECS;
 
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp
index ba0d24ce3..4948f10d6 100644
--- a/indra/llmessage/llurlrequest.cpp
+++ b/indra/llmessage/llurlrequest.cpp
@@ -36,17 +36,17 @@
 #include <algorithm>
 #include <openssl/x509_vfy.h>
 #include <openssl/ssl.h>
+
 #include "llcurl.h"
-#include "llfasttimer.h"
 #include "llioutil.h"
 #include "llmemtype.h"
-#include "llproxy.h"
 #include "llpumpio.h"
 #include "llsd.h"
 #include "llstring.h"
 #include "apr_env.h"
 #include "llapr.h"
 #include "llscopedvolatileaprpool.h"
+#include "llfasttimer.h"
 static const U32 HTTP_STATUS_PIPE_ERROR = 499;
 
 /**
@@ -73,7 +73,6 @@ public:
 	U32 mBodyLimit;
 	S32 mByteAccumulator;
 	bool mIsBodyLimitSet;
-	LLURLRequest::SSLCertVerifyCallback mSSLVerifyCallback;
 };
 
 LLURLRequestDetail::LLURLRequestDetail() :
@@ -81,8 +80,7 @@ LLURLRequestDetail::LLURLRequestDetail() :
 	mLastRead(NULL),
 	mBodyLimit(0),
 	mByteAccumulator(0),
-	mIsBodyLimitSet(false),
-    mSSLVerifyCallback(NULL)
+	mIsBodyLimitSet(false)
 {
 }
 
@@ -164,11 +162,11 @@ void LLURLRequest::addHeader(const char* header)
 
 void LLURLRequest::checkRootCertificate(bool check)
 {
-	mDetail->mCurlRequest->setopt(CURLOPT_SSL_VERIFYPEER, (check? TRUE : FALSE));
-	mDetail->mCurlRequest->setoptString(CURLOPT_ENCODING, "");
+	AICurlEasyRequest_wat curlEasyRequest_w(*mDetail->mCurlEasyRequest);
+	curlEasyRequest_w->setopt(CURLOPT_SSL_VERIFYPEER, check ? 1L : 0L);
+	curlEasyRequest_w->setoptString(CURLOPT_ENCODING, "");
 }
 
-
 void LLURLRequest::setBodyLimit(U32 size)
 {
 	mDetail->mBodyLimit = size;
@@ -214,10 +212,10 @@ void LLURLRequest::useProxy(bool use_proxy)
 		}
     }
 
-    lldebugs << "use_proxy = " << (use_proxy?'Y':'N') << ", env_proxy = \"" << env_proxy << "\"" << llendl;
+	LL_DEBUGS("Proxy") << "use_proxy = " << (use_proxy?'Y':'N') << ", env_proxy = " << (!env_proxy.empty() ? env_proxy : "(null)") << LL_ENDL;
 
 	AICurlEasyRequest_wat curlEasyRequest_w(*mDetail->mCurlEasyRequest);
-	curlEasyRequest_w->setoptString(CURLOPT_PROXY, use_proxy ? env_proxy : std::string(""));
+	curlEasyRequest_w->setoptString(CURLOPT_PROXY, (use_proxy && !env_proxy.empty()) ? env_proxy : std::string(""));
 }
 
 void LLURLRequest::useProxy(const std::string &proxy)
@@ -319,7 +317,9 @@ LLIOPipe::EStatus LLURLRequest::process_impl(
 	LLMemType m1(LLMemType::MTYPE_IO_URL_REQUEST);
 	//llinfos << "LLURLRequest::process_impl()" << llendl;
 	if (!buffer) return STATUS_ERROR;
-	
+
+	if (!mDetail) return STATUS_ERROR; //Seems to happen on occasion. Need to hunt down why.
+
 	// we're still waiting or processing, check how many
 	// bytes we have accumulated.
 	const S32 MIN_ACCUMULATION = 100000;
diff --git a/indra/llmessage/llurlrequest.h b/indra/llmessage/llurlrequest.h
index 10ad50f28..fdf7d873e 100644
--- a/indra/llmessage/llurlrequest.h
+++ b/indra/llmessage/llurlrequest.h
@@ -40,7 +40,6 @@
 #include "llerror.h"
 #include "llcurl.h"
 
-
 extern const std::string CONTEXT_REQUEST;
 extern const std::string CONTEXT_RESPONSE;
 extern const std::string CONTEXT_TRANSFERED_BYTES;
@@ -144,7 +143,6 @@ public:
 	 */
 	void checkRootCertificate(bool check);
 
-	
 	/**
 	 * @brief Return at most size bytes of body.
 	 *
@@ -197,7 +195,6 @@ public:
 	 * @brief Give this pipe a chance to handle a generated error
 	 */
 	virtual EStatus handleError(EStatus status, LLPumpIO* pump);
-
 	
 protected:
 	/** 
@@ -224,8 +221,8 @@ protected:
 	ERequestAction mAction;
 	LLURLRequestDetail* mDetail;
 	LLIOPipe::ptr_t mCompletionCallback;
-	 S32 mRequestTransferedBytes;
-	 S32 mResponseTransferedBytes;
+	S32 mRequestTransferedBytes;
+	S32 mResponseTransferedBytes;
 
 	// mRemoved is used instead of changing mState directly, because I'm not convinced the latter is atomic.
 	// Set to false before adding curl request and then only tested.